diff --git a/ui/admin/app/routes/scopes/scope/sessions.js b/ui/admin/app/routes/scopes/scope/sessions.js index 0f002536f..749b26de6 100644 --- a/ui/admin/app/routes/scopes/scope/sessions.js +++ b/ui/admin/app/routes/scopes/scope/sessions.js @@ -48,11 +48,15 @@ export default class ScopesScopeSessionsRoute extends Route { */ async model() { const { id: scope_id } = this.modelFor('scopes.scope'); - const { status } = this; + const filters = { status: this.status }; + const options = { + scope_id, + include_terminated: filters.status?.includes('terminated'), + }; const sessions = await this.resourceFilterStore.queryBy( 'session', - { status }, - { scope_id } + filters, + options ); const sessionAggregates = await all( diff --git a/ui/desktop/app/routes/scopes/scope/projects/sessions.js b/ui/desktop/app/routes/scopes/scope/projects/sessions.js index 5d2c5227b..875bc234b 100644 --- a/ui/desktop/app/routes/scopes/scope/projects/sessions.js +++ b/ui/desktop/app/routes/scopes/scope/projects/sessions.js @@ -50,19 +50,18 @@ export default class ScopesScopeProjectsSessionsRoute extends Route { const { id: scope_id } = this.modelFor('scopes.scope'); const { user_id } = this.session.data.authenticated; const projects = this.project || []; + const filters = { + user_id, + status, + scope_id: projects.map(({ id }) => id), + }; + const options = { + recursive: true, + scope_id, + include_terminated: filters.status?.includes('terminated'), + }; await this.store.query('target', { recursive: true, scope_id }); - return await this.resourceFilterStore.queryBy( - 'session', - { - user_id, - status, - scope_id: projects.map(({ id }) => id), - }, - { - recursive: true, - scope_id, - } - ); + return await this.resourceFilterStore.queryBy('session', filters, options); } @runEvery(POLL_TIMEOUT_SECONDS * 1000)