diff --git a/ui/desktop/app/routes/scopes/scope/projects/sessions/session.js b/ui/desktop/app/routes/scopes/scope/projects/sessions/session.js index 071310dcc..d1bf4d4de 100644 --- a/ui/desktop/app/routes/scopes/scope/projects/sessions/session.js +++ b/ui/desktop/app/routes/scopes/scope/projects/sessions/session.js @@ -17,9 +17,25 @@ export default class ScopesScopeProjectsSessionsSessionRoute extends Route { * Load a session * @param {object} params * @param {string} params.session_id - * @return {TargetModel} + * @return {{session: SessionModel, target: TargetModel}} */ - model({ session_id }) { - return this.store.findRecord('session', session_id, { reload: true }); + async model({ session_id }) { + let target = null; + const session = await this.store.findRecord('session', session_id, { + reload: true, + }); + + try { + if (session.target_id) { + target = await this.store.findRecord('target', session.target_id); + } + } catch (e) { + // no op + } + + return { + session, + target, + }; } } diff --git a/ui/desktop/app/styles/app.scss b/ui/desktop/app/styles/app.scss index e849ee1e9..dc98f392c 100644 --- a/ui/desktop/app/styles/app.scss +++ b/ui/desktop/app/styles/app.scss @@ -512,7 +512,7 @@ $chevron-down: url("data:image/svg+xml;utf-8, - {{@model.displayName}} + {{@model.session.displayName}} @@ -18,7 +18,7 @@ @text={{t 'resources.session.actions.end'}} @icon='x' @color='secondary' - {{on 'click' (route-action 'cancelSession' @model)}} + {{on 'click' (route-action 'cancelSession' @model.session)}} /> @@ -28,7 +28,49 @@ {{t 'resources.session.description'}} - {{@model.id}} + +
+
+ {{t 'resources.target.details'}} +
+ + {{! Target name }} + + {{@model.target.name}} + + {{! Project name }} + + {{@model.target.project.displayName}} + + {{! Target description }} + {{#if @model.target.description}} + + {{@model.target.description}} + + {{/if}} + {{! Target type }} + + {{#if @model.target.isSSH}} + {{t 'resources.target.types.ssh'}} + {{else}} + {{t 'resources.target.types.tcp'}} + {{/if}} + + {{! Target ID }} + + + {{@model.target.id}} + + + +
+ diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets/target.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets/target.hbs index 1c406bad2..d2b4d415e 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/targets/target.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/targets/target.hbs @@ -38,7 +38,7 @@ -
+