From 87c91d5d62092cee420e77fbc27f03d90c217e20 Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Thu, 11 Feb 2021 15:48:46 -0500
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20target=20sessions=20shoul?=
 =?UTF-8?q?d=20update=20on=20poll?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scopes/scope/projects/sessions/index.js   |  2 --
 .../scope/projects/targets/target/sessions.js | 22 ++++++++++---------
 .../scope/projects/targets/target/sessions.js | 10 +--------
 .../projects/targets/target/sessions.hbs      |  3 ++-
 4 files changed, 15 insertions(+), 22 deletions(-)

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 babe28f5f..0cfb61dbf 100644
--- a/ui/desktop/app/controllers/scopes/scope/projects/sessions/index.js
+++ b/ui/desktop/app/controllers/scopes/scope/projects/sessions/index.js
@@ -1,5 +1,4 @@
 import Controller from '@ember/controller';
-import { computed } from '@ember/object';
 import { inject as service } from '@ember/service';
 
 export default class ScopesScopeProjectsSessionsIndexController extends Controller {
@@ -15,7 +14,6 @@ export default class ScopesScopeProjectsSessionsIndexController extends Controll
    * and active/pending.
    * @type {SessionModel[]}
    */
-  @computed('model.@each.{created_time,active}', 'session.data.authenticated.user_id')
   get sorted() {
     const userId = this.session.data.authenticated.user_id;
     const sessions = this.model;
diff --git a/ui/desktop/app/controllers/scopes/scope/projects/targets/target/sessions.js b/ui/desktop/app/controllers/scopes/scope/projects/targets/target/sessions.js
index dfab20739..9b10b7e0d 100644
--- a/ui/desktop/app/controllers/scopes/scope/projects/targets/target/sessions.js
+++ b/ui/desktop/app/controllers/scopes/scope/projects/targets/target/sessions.js
@@ -1,5 +1,4 @@
 import Controller from '@ember/controller';
-import { computed } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { A } from '@ember/array';
 
@@ -9,14 +8,21 @@ export default class ScopesScopeProjectsTargetsTargetSessionsController extends
   @service session;
 
   /**
-   * Sort and filter to active sessions of current user
+   * Sessions belonging to the target.
+   * @type {SessionModel[]}
+   */
+  get sessions() {
+    return this.model.sessions;
+  }
+
+  /**
+   * Sort and filter to active sessions of current user.
    * @param {[SessionModel]} model
    * @param {object} session
    * @type {[SessionModel]}
    */
-  @computed('model.@each.{created_time,active}', 'session.data.authenticated.user_id')
-  get selfActiveSessions() {
-    const sessions = this.model;
+  get cancelableUserSessions() {
+    const sessions = this.sessions;
     const userId = this.session.data.authenticated.user_id;
     const filteredSessions =
       sessions.filter(session =>
@@ -27,10 +33,6 @@ export default class ScopesScopeProjectsTargetsTargetSessionsController extends
     // Sort sessions
     const sortedSessions = A(filteredSessions).sortBy('created_time').reverse();
 
-    // Move active sessions to top
-    return [
-      ...sortedSessions.filter(session => session.isActive),
-      ...sortedSessions.filter(session => !session.isActive)
-    ]
+    return sortedSessions;
   }
 }
diff --git a/ui/desktop/app/routes/scopes/scope/projects/targets/target/sessions.js b/ui/desktop/app/routes/scopes/scope/projects/targets/target/sessions.js
index 203b74d62..9306118c7 100644
--- a/ui/desktop/app/routes/scopes/scope/projects/targets/target/sessions.js
+++ b/ui/desktop/app/routes/scopes/scope/projects/targets/target/sessions.js
@@ -4,15 +4,6 @@ import { notifySuccess, notifyError } from 'core/decorators/notify';
 
 export default class ScopesScopeProjectsTargetsTargetSessionsRoute extends Route {
 
-  // =methods
-
-  /**
-   * @return {[SessionModel]}
-   */
-  model() {
-    return this.modelFor('scopes.scope.projects.targets.target').sessions;
-  }
-
   // =actions
 
   /**
@@ -25,4 +16,5 @@ export default class ScopesScopeProjectsTargetsTargetSessionsRoute extends Route
   async cancelSession(session) {
     await session.cancelSession();
   }
+
 }
diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets/target/sessions.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets/target/sessions.hbs
index 008e5dfb0..e99a67ec1 100644
--- a/ui/desktop/app/templates/scopes/scope/projects/targets/target/sessions.hbs
+++ b/ui/desktop/app/templates/scopes/scope/projects/targets/target/sessions.hbs
@@ -1,6 +1,7 @@
 <Rose::Table as |table|>
   <table.body as |body|>
-    {{#each this.selfActiveSessions as |session|}}
+    {{this.sessions.length}} / {{this.cancelableUserSessions.length}}
+    {{#each this.cancelableUserSessions as |session|}}
       <body.row as |row|>
         <row.cell class="nowrap">
           <Rose::Icon