From 6ae3067dd93004af8b05e8f7691ae3409acbf058 Mon Sep 17 00:00:00 2001 From: Lisbet Alvarez <107949262+lisbet-alvarez@users.noreply.github.com> Date: Fri, 17 Nov 2023 09:19:33 -0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20remove=20unnecessary?= =?UTF-8?q?=20sorting=20due=20to=20pagination=20change=20(#1996)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ✅ Closes: https://hashicorp.atlassian.net/browse/ICU-11787 --- ui/admin/app/routes/scopes/scope/sessions.js | 16 ++++++---------- .../scopes/scope/projects/sessions/index.js | 7 ++----- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/ui/admin/app/routes/scopes/scope/sessions.js b/ui/admin/app/routes/scopes/scope/sessions.js index 353d6aafd..1883dfe34 100644 --- a/ui/admin/app/routes/scopes/scope/sessions.js +++ b/ui/admin/app/routes/scopes/scope/sessions.js @@ -11,7 +11,7 @@ import runEvery from 'ember-pollster/decorators/route/run-every'; import { notifySuccess, notifyError } from 'core/decorators/notify'; import config from '../../../config/environment'; import { resourceFilter } from 'core/decorators/resource-filter'; -import sortBy from 'lodash/sortBy'; + const POLL_TIMEOUT_SECONDS = config.sessionPollingTimeoutSeconds; export default class ScopesScopeSessionsRoute extends Route { @@ -78,17 +78,13 @@ export default class ScopesScopeSessionsRoute extends Route { }), ), ); - // Sort sessions by time created... - let sortedSessionAggregates = sortBy( - sessionAggregates, - 'session.created_time', - ).reverse(); - // Then move active sessions to the top... - sortedSessionAggregates = [ - ...sortedSessionAggregates.filter( + + // Move active sessions to the top... + const sortedSessionAggregates = [ + ...sessionAggregates.filter( (aggregate) => aggregate.session.status === 'active', ), - ...sortedSessionAggregates.filter( + ...sessionAggregates.filter( (aggregate) => aggregate.session.status !== 'active', ), ]; diff --git a/ui/desktop/app/controllers/scopes/scope/projects/sessions/index.js b/ui/desktop/app/controllers/scopes/scope/projects/sessions/index.js index c50d3569b..17bf44ceb 100644 --- a/ui/desktop/app/controllers/scopes/scope/projects/sessions/index.js +++ b/ui/desktop/app/controllers/scopes/scope/projects/sessions/index.js @@ -4,7 +4,6 @@ */ import Controller from '@ember/controller'; -import sortBy from 'lodash/sortBy'; export default class ScopesScopeProjectsSessionsIndexController extends Controller { // =attributes @@ -16,13 +15,11 @@ export default class ScopesScopeProjectsSessionsIndexController extends Controll */ get sorted() { const sessions = this.model; - // sort by created time - const sortedSessions = sortBy(sessions, 'session.created_time').reverse(); return [ // then move active sessions to the top - ...sortedSessions.filter((session) => session.isAvailable), + ...sessions.filter((session) => session.isAvailable), // and all others to the end - ...sortedSessions.filter((session) => !session.isAvailable), + ...sessions.filter((session) => !session.isAvailable), ]; } }