diff --git a/addons/api/addon/models/target.js b/addons/api/addon/models/target.js index dc997a97d..8924ffbb4 100644 --- a/addons/api/addon/models/target.js +++ b/addons/api/addon/models/target.js @@ -41,7 +41,8 @@ export default class TargetModel extends GeneratedTargetModel { * @type {SessionModel[]} */ get sessions() { - return this.store.peekAll('session').filter(s => s.target_id === this.id); + return this.store.peekAll('session') + .filter(s => s && (s.target_id === this.id)); } /** diff --git a/addons/core/translations/states/en-us.yaml b/addons/core/translations/states/en-us.yaml index 1edb1e6ce..db8c30478 100644 --- a/addons/core/translations/states/en-us.yaml +++ b/addons/core/translations/states/en-us.yaml @@ -1,3 +1,4 @@ +active: Active info: Info success: Success warning: Warning diff --git a/ui/desktop/app/routes/scopes/scope/projects/targets.js b/ui/desktop/app/routes/scopes/scope/projects/targets.js index e251e181a..a1563cceb 100644 --- a/ui/desktop/app/routes/scopes/scope/projects/targets.js +++ b/ui/desktop/app/routes/scopes/scope/projects/targets.js @@ -2,8 +2,14 @@ import Route from '@ember/routing/route'; import { inject as service } from '@ember/service'; import { all } from 'rsvp'; import { action } from '@ember/object'; +import { task, timeout } from 'ember-concurrency'; +import { later } from '@ember/runloop'; +import config from '../../../../config/environment'; + +const POLL_TIMEOUT_SECONDS = config.sessionPollingTimeoutSeconds; export default class ScopesScopeProjectsTargetsRoute extends Route { + // =services @service ipc; @@ -12,6 +18,25 @@ export default class ScopesScopeProjectsTargetsRoute extends Route { @service notify; @service confirm; + // =attributes + + /** + * A simple Ember Concurrency-based polling task that refreshes the route + * every POLL_TIMEOUT_SECONDS seconds. This is necessary to display changes + * to session `status` that may occur. + * + * NOTE: tasks are sort of attributes and sort of methods, but they are not + * language-level constructs. Thus we annotate this task as if it + * is an attribute. + * @type {Task} + */ + @task(function * () { + while(true) { + yield timeout(POLL_TIMEOUT_SECONDS * 1000); + yield this.refreshSessions(); + } + }).drop() poller; + // =methods /** @@ -33,6 +58,7 @@ export default class ScopesScopeProjectsTargetsRoute extends Route { ) ); let targets = projectTargets.map((target) => target.toArray()).flat(); + await this.refreshSessions(); return targets.map((target) => { return { target, @@ -41,6 +67,35 @@ export default class ScopesScopeProjectsTargetsRoute extends Route { }); } + /** + * Loads all sessions for all scopes in order to prime the store. + * Targets peek into the store to determine if they are active. + * TODO: query only for sessions associated with the current user. + */ + async refreshSessions() { + const projects = this.modelFor('scopes.scope.projects'); + //const userId = this.session.data.authenticated.user_id; + await all( + projects.map(({ id: scope_id }) => + this.store.query('session', { scope_id }) + ) + ); + } + + /** + * When this route is activated (entered), begin polling for changes. + */ + activate() { + this.poller.perform(); + } + + /** + * When this route is deactivated (exited), stop polling for changes. + */ + deactivate() { + this.poller.cancelAll(); + } + // =actions /** @@ -69,16 +124,18 @@ export default class ScopesScopeProjectsTargetsRoute extends Route { // so we use store.push here. In the future, it may make sense to push // this off to the API so that we don't have to manually persist the // proxy details. - this.store.push({ - data: { - id: session_id, - type: 'session', - attributes: { - proxy_address: address, - proxy_port: port + later(() => { + this.store.push({ + data: { + id: session_id, + type: 'session', + attributes: { + proxy_address: address, + proxy_port: port + } } - } - }); + }); + }, 150); // Show the user a modal with basic connection info. // We don't await because this modal is purely informational. 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 8b448bd47..4f0281e2f 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 @@ -3,16 +3,6 @@ import { action } from '@ember/object'; import { notifySuccess, notifyError } from 'core/decorators/notify'; export default class ScopesScopeProjectsTargetsTargetSessionsRoute extends Route { - // =methods - - /** - * Loads all sessions for current target. - * @return {Promise{[SessionModel]}} - */ - async model() { - return this.modelFor('scopes.scope.projects.targets.target').sessions; - } - // =actions /** diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs index b200db570..2651665a7 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs @@ -20,7 +20,13 @@
{{model.target.description}}
-{{@model.target.description}}
@@ -10,4 +15,4 @@
>
{{@model.target.id}}