Merge branch 'main' into chore-support-cli-json-updates

.github/workflows/ui-release-trigger.yml

@@ -9,14 +9,11 @@ jobs:
   trigger-circleci-release:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@master
+      - uses: actions/checkout@v2
       - name: Trigger Release job
-        env:
-          TAG: ${{ github.event.release.tag_name }}
-          TEST_REF: ${{ github.ref }}
         run: |
-          echo "($TAG), ($TEST_REF)"
+          echo "Triggering release with a TAG ${GITHUB_REF#refs/tags/}"
+
           curl -u ${{ secrets.CIRCLE_TOKEN }}: -X POST --header "Content-Type: application/json" \
-          -d '{ "branch": "main", "parameters": {"TAG": "'${TAG}'" }}' \
+          -d '{ "branch": "main", "parameters": {"TAG": "'${GITHUB_REF#refs/tags/}'" }}' \
           https://circleci.com/api/v2/project/github/hashicorp/boundary-ui-releases/pipeline

ui/desktop/app/controllers/scopes/scope/projects/sessions/index.js

@@ -1,12 +1,7 @@
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
 
 export default class ScopesScopeProjectsSessionsIndexController extends Controller {
 
-  // =sessions
-
-  @service session;
-
   // =attributes
 
   /**
@@ -15,11 +10,8 @@ export default class ScopesScopeProjectsSessionsIndexController extends Controll
    * @type {SessionModel[]}
    */
   get sorted() {
-    const userId = this.session.data.authenticated.user_id;
     const sessions = this.model;
     const sortedSessions = sessions
-      // filter sessions by current user
-      .filter(session => session.user_id === userId)
       // sort by created time
       .sortBy('session.created_time').reverse();
     return [

ui/desktop/app/routes/scopes/scope/projects/sessions.js

@@ -48,8 +48,13 @@ export default class ScopesScopeProjectsSessionsRoute extends Route {
    */
   async model() {
     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.store.query('session', { recursive: true, scope_id });
+    return await this.store.query('session', {
+      filter: `"/item/user_id" == "${user_id}"`,
+      recursive: true,
+      scope_id
+    });
   }
 
   /**

ui/desktop/app/routes/scopes/scope/projects/targets.js

@@ -52,7 +52,11 @@ export default class ScopesScopeProjectsTargetsRoute extends Route {
   async model() {
     const { id: scope_id } = this.modelFor('scopes.scope');
     await this.refreshSessions();
-    return this.store.query('target', { recursive: true, scope_id });
+    return this.store.query('target', {
+      filter: '"authorize-session" in "/item/authorized_actions"',
+      recursive: true,
+      scope_id
+    });
   }
 
   /**