From 3e87ea6c1b2029f95b2a4d539d6591afb7717ad0 Mon Sep 17 00:00:00 2001 From: dharini Date: Tue, 16 Nov 2021 10:30:00 -0800 Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20add=20toolbar=20to=20des?= =?UTF-8?q?ktop=20sessions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../routes/scopes/scope/projects/sessions.js | 2 +- .../scopes/scope/projects/sessions/index.hbs | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ui/desktop/app/routes/scopes/scope/projects/sessions.js b/ui/desktop/app/routes/scopes/scope/projects/sessions.js index 0ba42ce3e..a7ce4bff7 100644 --- a/ui/desktop/app/routes/scopes/scope/projects/sessions.js +++ b/ui/desktop/app/routes/scopes/scope/projects/sessions.js @@ -57,7 +57,7 @@ export default class ScopesScopeProjectsSessionsRoute extends Route { 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.resourceFilterStore.queryBy('session', { user: user_id , status }, { + return await this.resourceFilterStore.queryBy('session', { user_id , status }, { recursive: true, scope_id }); diff --git a/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs b/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs index 5c12e8f32..2ebe5491b 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs @@ -12,7 +12,10 @@ {{#if (feature-flag 'filter')}} {{#if (or - @model (has-resource-filter-param-selections 'scopes.scope.projects.sessions') + @model + (has-resource-filter-param-selections + 'scopes.scope.projects.sessions' + ) ) }} @@ -47,7 +50,9 @@ {{/with}} {{#if - (has-resource-filter-param-selections 'scopes.scope.projects.sessions') + (has-resource-filter-param-selections + 'scopes.scope.projects.sessions' + ) }} {{/if}} {{/if}} - {{#if @model}} - {{#if this.sorted}} + {{#if this.sorted}} @@ -138,7 +142,9 @@ {{/each}} - {{else if (has-resource-filter-param-selections 'scopes.scope.projects.sessions')}} + {{else if (has-resource-filter-param-selections + 'scopes.scope.projects.sessions' + )}} @@ -147,7 +153,6 @@ {{else}} - - - {{/if}} {{/if}}