Merge pull request #438 from hashicorp/active-sessions-in-a-target

Show active sessions in a target
2021-02-05 16:56:14 -05:00
commit 55e74c5492
@@ -104,6 +104,7 @@ host:
 session:
  title: Session
  title_plural: Sessions
+  active_plural: Active Sessions
  description: A session is a connection to a target initiated through Boundary.
  messages:
    none:
@@ -16,6 +16,7 @@ Router.map(function () {
        this.route('targets', function () {
          this.route('target', { path: ':target_id' }, function() {
            this.route('hosts');
+            this.route('sessions');
          });
        });
        this.route('sessions', function() {});
@@ -25,4 +25,5 @@ export default class ScopesScopeProjectsRoute extends Route {
      scope_id: currentScope.id,
    });
  }
+
 }
@@ -4,6 +4,8 @@ import { all, hash } from 'rsvp';
 import { task, timeout } from 'ember-concurrency';
 import { A } from '@ember/array';
 import config from '../../../../config/environment';
+import { action } from '@ember/object';
+import { notifySuccess, notifyError } from 'core/decorators/notify';

 const POLL_TIMEOUT_SECONDS = config.sessionPollingTimeoutSeconds;

@@ -99,4 +101,17 @@ export default class ScopesScopeProjectsSessionsRoute extends Route {
  deactivate() {
    this.poller.cancelAll();
  }
+
+  // =actions
+
+  /**
+   * Cancels the specified session and notifies user of success or error.
+   * @param {SessionModel}
+   */
+  @action
+  @notifyError(({ message }) => message, { catch: true })
+  @notifySuccess('notifications.canceled-success')
+  async cancelSession(session) {
+    await session.cancelSession();
+  }
 }
@@ -1,16 +1,36 @@
 import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+import { A } from '@ember/array';

 export default class ScopesScopeProjectsTargetsTargetRoute extends Route {
+
+  // =services
+
+  @service session;
+
  // =methods

  /**
-   * Load a target.
+   * Load a target and it's active sessions
   * @param {object} params
   * @param {string} params.target_id
-   * @return {TargetModel}
+   * @return {{TargetModel, [SessionModel]}}
   */
  async model({ target_id }) {
-    return this.store.findRecord('target', target_id, { reload: true });
+    const userId = this.session.data.authenticated.user_id;
+    const target = await this.store.findRecord('target', target_id, { reload: true });
+    const sessions = await this.store.query('session', { scope_id: target.scopeID });
+
+    // Filter to current user, current target, and active state
+    const filteredSessions = sessions.filter(
+      session => session.user_id === userId &&
+        session.target_id === target.id &&
+        session.isCancelable
+    )
+    // Sort sessions by time created
+    const sortedSessions =
+      A(filteredSessions).sortBy('session.created_time').reverse();
+    return { target, sessions: sortedSessions };
  }

  /**
@@ -9,10 +9,10 @@ export default class ScopesScopeProjectsTargetsTargetHostsRoute extends Route {
   * @return {Promise{[HostModel]}}
   */
  async model() {
-    const { host_sets } = this.modelFor('scopes.scope.projects.targets.target');
+    const { target } = this.modelFor('scopes.scope.projects.targets.target');
    // Load all host-sets
    const hostSets = await all(
-      host_sets.map(({ host_set_id }) => 
+      target.host_sets.map(({ host_set_id }) => 
        this.store.findRecord('host-set', host_set_id)
      )
    );
@@ -7,7 +7,7 @@ export default class ScopesScopeProjectsTargetsTargetIndexRoute extends Route {
   * Navigate to hosts within a target.
   */
  afterModel() {
-    this.transitionTo('scopes.scope.projects.targets.target.hosts');
+    this.transitionTo('scopes.scope.projects.targets.target.sessions');
  }

 }
@@ -0,0 +1,28 @@
+import Route from '@ember/routing/route';
+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
+
+  /**
+   * Cancels the specified session and notifies user of success or error.
+   * @param {SessionModel}
+   */
+  @action
+  @notifyError(({ message }) => message, { catch: true })
+  @notifySuccess('notifications.canceled-success')
+  async cancelSession(session) {
+    await session.cancelSession();
+  }
+}
@@ -16,6 +16,7 @@
            <row.headerCell>{{t "form.proxy.label"}}</row.headerCell>
            <row.headerCell>{{t "form.started.label"}}</row.headerCell>
            <row.headerCell>{{t "form.status.label"}}</row.headerCell>
+            <row.headerCell />
          </header.row>
        </table.header>
        <table.body as |body|>
@@ -61,6 +62,13 @@
              <row.cell>
                <Rose::Badge>{{sessionAggregate.session.status}}</Rose::Badge>
              </row.cell>
+              <row.cell>
+                {{#if sessionAggregate.session.isCancelable}}
+                  <Rose::Button @style="secondary" {{on "click" (route-action "cancelSession" sessionAggregate.session)}}>
+                    {{t "actions.cancel"}}
+                  </Rose::Button>
+                {{/if}}
+              </row.cell>
            </body.row>
          {{/each}}
        </table.body>
@@ -1,4 +1,4 @@
-{{page-title @model.displayName}}
+{{page-title @model.target.displayName}}

 <Rose::Layout::Page as |page|>

@@ -1,4 +1,4 @@
 <h2>
-  {{@model.displayName}}
+  {{@model.target.displayName}}
 </h2>
-<p>{{@model.description}}</p>
+<p>{{@model.target.description}}</p>
@@ -1,4 +1,7 @@
 <Rose::Nav::Tabs as |nav|>
+  <nav.link @route='scopes.scope.projects.targets.target.sessions'>
+    {{t 'resources.session.active_plural'}}
+  </nav.link>
  <nav.link @route='scopes.scope.projects.targets.target.hosts'>
    {{t 'resources.host.title_plural'}}
  </nav.link>
@@ -0,0 +1,30 @@
+<Rose::Table as |table|>
+  <table.body as |body|>
+    {{#each @model as |session|}}
+      <body.row as |row|>
+        <row.cell class="nowrap">
+          <Rose::Icon
+            class={{concat "session-status-" session.status}}
+            @name="app-icons/action-session"
+            @size="medium" />
+          {{session.id}}
+        </row.cell>
+        <row.cell>
+          <time datetime={{format-date-iso session.created_time}}>
+            {{format-date-iso-human session.created_time}}
+          </time>
+        </row.cell>
+        <row.cell>
+          <Rose::Badge>{{session.status}}</Rose::Badge>
+        </row.cell>
+        <row.cell>
+          {{#if session.isCancelable}}
+            <Rose::Button @style="secondary" {{on "click" (route-action "cancelSession" session)}}>
+              {{t "actions.cancel"}}
+            </Rose::Button>
+          {{/if}}
+        </row.cell>
+      </body.row>
+    {{/each}}
+  </table.body>
+</Rose::Table>
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | scopes/scope/projects/targets/target/sessions', function(hooks) {
+  setupTest(hooks);
+
+  test('it exists', function(assert) {
+    let route = this.owner.lookup('route:scopes/scope/projects/targets/target/sessions');
+    assert.ok(route);
+  });
+});