diff --git a/addons/api/addon/models/connection-recording.js b/addons/api/addon/models/connection-recording.js
index 662df4bd6..ae0022191 100644
--- a/addons/api/addon/models/connection-recording.js
+++ b/addons/api/addon/models/connection-recording.js
@@ -1,12 +1,7 @@
import GeneratedConnectionRecordingModel from '../generated/models/connection-recording';
import { belongsTo, hasMany } from '@ember-data/model';
-import { sort } from '@ember/object/computed';
export default class ConnectionRecordingModel extends GeneratedConnectionRecordingModel {
@belongsTo('session-recording', { async: false }) session_recording;
@hasMany('channel-recording', { async: false }) channel_recordings;
-
- startTimeSortingDesc = ['start_time:desc'];
- @sort('channel_recordings', 'startTimeSortingDesc')
- sortedChannelsByStartTimeDesc;
}
diff --git a/addons/api/addon/models/session-recording.js b/addons/api/addon/models/session-recording.js
index 800f8c3af..093a5a398 100644
--- a/addons/api/addon/models/session-recording.js
+++ b/addons/api/addon/models/session-recording.js
@@ -1,7 +1,6 @@
import GeneratedSessionRecordingModel from '../generated/models/session-recording';
import { hasMany } from '@ember-data/model';
import { inject as service } from '@ember/service';
-import { sort } from '@ember/object/computed';
export const TYPE_SESSION_RECORDING_SSH = 'ssh';
export const TYPES_SESSION_RECORDING = Object.freeze([
@@ -17,10 +16,6 @@ export default class SessionRecordingModel extends GeneratedSessionRecordingMode
@service store;
- startTimeSortingDesc = ['start_time:desc'];
- @sort('connection_recordings', 'startTimeSortingDesc')
- sortedConnectionsByStartTimeDesc;
-
/**
* True if the session recording type is `ssh`.
* @type {boolean}
diff --git a/addons/api/tests/unit/models/connection-recording-test.js b/addons/api/tests/unit/models/connection-recording-test.js
index da0cf6209..30325bf4c 100644
--- a/addons/api/tests/unit/models/connection-recording-test.js
+++ b/addons/api/tests/unit/models/connection-recording-test.js
@@ -20,23 +20,4 @@ module('Unit | Model | connection-recording', function (hooks) {
const channel_recordings = await model.channel_recordings;
assert.strictEqual(channel_recordings.length, 1);
});
-
- test('it has sortedChannelsByStartTimeDesc property and returns the expected values', async function (assert) {
- assert.expect(3);
- const store = this.owner.lookup('service:store');
- const newestChannel = store.createRecord('channel-recording', {
- start_time: new Date('2023-01-02T00:00:00.999Z'),
- });
- const oldestChannel = store.createRecord('channel-recording', {
- start_time: new Date('2023-01-01T00:00:00.999Z'),
- });
- const model = store.createRecord('connection-recording', {
- channel_recordings: [oldestChannel, newestChannel],
- });
-
- const sortedChannels = await model.sortedChannelsByStartTimeDesc;
- assert.strictEqual(sortedChannels.length, 2);
- assert.strictEqual(sortedChannels[0].start_time, newestChannel.start_time);
- assert.strictEqual(sortedChannels[1].start_time, oldestChannel.start_time);
- });
});
diff --git a/addons/api/tests/unit/models/session-recording-test.js b/addons/api/tests/unit/models/session-recording-test.js
index c066ed2cc..8a88bb1b3 100644
--- a/addons/api/tests/unit/models/session-recording-test.js
+++ b/addons/api/tests/unit/models/session-recording-test.js
@@ -51,32 +51,6 @@ module('Unit | Model | session-recording', function (hooks) {
assert.strictEqual(connection_recordings.length, 1);
});
- test('it has sortedConnectionsByStartTimeDesc property and returns the expected values', async function (assert) {
- assert.expect(3);
- const store = this.owner.lookup('service:store');
- const newestConnection = store.createRecord('connection-recording', {
- start_time: new Date('2023-01-02T00:00:00.999Z'),
- });
- const oldestConnection = store.createRecord('connection-recording', {
- start_time: new Date('2023-01-01T00:00:00.999Z'),
- });
- const model = store.createRecord('session-recording', {
- type: TYPE_SESSION_RECORDING_SSH,
- connection_recordings: [oldestConnection, newestConnection],
- });
-
- const sortedConnections = await model.sortedConnectionsByStartTimeDesc;
- assert.strictEqual(sortedConnections.length, 2);
- assert.strictEqual(
- sortedConnections[0].start_time,
- newestConnection.start_time
- );
- assert.strictEqual(
- sortedConnections[1].start_time,
- oldestConnection.start_time
- );
- });
-
test('it has targetScopeDisplayName and returns the expected values', async function (assert) {
assert.expect(2);
const store = this.owner.lookup('service:store');
diff --git a/ui/admin/app/controllers/scopes/scope/session-recordings/session-recording/channels-by-connection/channel.js b/ui/admin/app/controllers/scopes/scope/session-recordings/session-recording/channels-by-connection/channel.js
index 9d06e0ba8..755d26751 100644
--- a/ui/admin/app/controllers/scopes/scope/session-recordings/session-recording/channels-by-connection/channel.js
+++ b/ui/admin/app/controllers/scopes/scope/session-recordings/session-recording/channels-by-connection/channel.js
@@ -14,8 +14,7 @@ export default class ScopesScopeSessionRecordingsSessionRecordingChannelsByConne
return indexedDisplayName(
this.intl,
'resources.session-recording.channel.title_index',
- this.model.channelRecording.connection_recording
- .sortedChannelsByStartTimeDesc,
+ this.model.channelRecording.connection_recording.channel_recordings,
this.model.channelRecording
);
}
diff --git a/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/channels-by-connection/channel.hbs b/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/channels-by-connection/channel.hbs
index 7966259da..6ba0b0ea1 100644
--- a/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/channels-by-connection/channel.hbs
+++ b/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/channels-by-connection/channel.hbs
@@ -9,7 +9,7 @@
{{indexed-display-name
'resources.session-recording.channel.title_index'
- @model.channelRecording.connection_recording.sortedChannelsByStartTimeDesc
+ @model.channelRecording.connection_recording.channel_recordings
@model.channelRecording
}}
diff --git a/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/channels-by-connection/index.hbs b/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/channels-by-connection/index.hbs
index 1061ba87e..1e4c2ee65 100644
--- a/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/channels-by-connection/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/channels-by-connection/index.hbs
@@ -12,14 +12,14 @@
{{#each
- @model.sessionRecording.sortedConnectionsByStartTimeDesc
+ @model.sessionRecording.connection_recordings
as |connection|
}}
{{indexed-display-name
'resources.session-recording.channel.title_index'
- connection.sortedChannelsByStartTimeDesc
+ connection.channel_recordings
B.data
}}