fix: 🐛 target sessions should update on poll
This commit is contained in:
4 files changed
+15
-22
No files matched your search
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user