From 03963579a1066e5b16c98d2039d93895b6058e73 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Fri, 26 Feb 2021 16:17:30 -0500 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20filter=20desktop=20t?= =?UTF-8?q?argets=20by=20authorize-session=20action?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/desktop/app/routes/scopes/scope/projects/targets.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ui/desktop/app/routes/scopes/scope/projects/targets.js b/ui/desktop/app/routes/scopes/scope/projects/targets.js index 867011648..f16ccb61e 100644 --- a/ui/desktop/app/routes/scopes/scope/projects/targets.js +++ b/ui/desktop/app/routes/scopes/scope/projects/targets.js @@ -52,7 +52,11 @@ export default class ScopesScopeProjectsTargetsRoute extends Route { async model() { const { id: scope_id } = this.modelFor('scopes.scope'); await this.refreshSessions(); - return this.store.query('target', { recursive: true, scope_id }); + return this.store.query('target', { + filter: '"authorize-session" in "/item/authorized_actions"', + recursive: true, + scope_id + }); } /** From 13a8b531a7e14c6f6a56943982c359e187753f49 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Fri, 26 Feb 2021 16:37:12 -0500 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20filter=20top-level?= =?UTF-8?q?=20sessions=20by=20current=20user=20ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/scopes/scope/projects/sessions/index.js | 8 -------- ui/desktop/app/routes/scopes/scope/projects/sessions.js | 7 ++++++- 2 files changed, 6 insertions(+), 9 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 0cfb61dbf..bafa6a171 100644 --- a/ui/desktop/app/controllers/scopes/scope/projects/sessions/index.js +++ b/ui/desktop/app/controllers/scopes/scope/projects/sessions/index.js @@ -1,12 +1,7 @@ import Controller from '@ember/controller'; -import { inject as service } from '@ember/service'; export default class ScopesScopeProjectsSessionsIndexController extends Controller { - // =sessions - - @service session; - // =attributes /** @@ -15,11 +10,8 @@ export default class ScopesScopeProjectsSessionsIndexController extends Controll * @type {SessionModel[]} */ get sorted() { - const userId = this.session.data.authenticated.user_id; const sessions = this.model; const sortedSessions = sessions - // filter sessions by current user - .filter(session => session.user_id === userId) // sort by created time .sortBy('session.created_time').reverse(); return [ diff --git a/ui/desktop/app/routes/scopes/scope/projects/sessions.js b/ui/desktop/app/routes/scopes/scope/projects/sessions.js index 149aedb7f..466a42767 100644 --- a/ui/desktop/app/routes/scopes/scope/projects/sessions.js +++ b/ui/desktop/app/routes/scopes/scope/projects/sessions.js @@ -48,8 +48,13 @@ export default class ScopesScopeProjectsSessionsRoute extends Route { */ async model() { const { id: scope_id } = this.modelFor('scopes.scope'); + const { user_id } = this.session.data.authenticated; await this.store.query('target', { recursive: true, scope_id }); - return await this.store.query('session', { recursive: true, scope_id }); + return await this.store.query('session', { + filter: `"/item/user_id" == "${user_id}"`, + recursive: true, + scope_id + }); } /**