From 03963579a1066e5b16c98d2039d93895b6058e73 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Fri, 26 Feb 2021 16:17:30 -0500 Subject: [PATCH 1/6] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20filter=20desktop=20t?= =?UTF-8?q?argets=20by=20authorize-session=20action?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/desktop/app/routes/scopes/scope/projects/targets.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ui/desktop/app/routes/scopes/scope/projects/targets.js b/ui/desktop/app/routes/scopes/scope/projects/targets.js index 867011648..f16ccb61e 100644 --- a/ui/desktop/app/routes/scopes/scope/projects/targets.js +++ b/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 + }); } /** From 13a8b531a7e14c6f6a56943982c359e187753f49 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Fri, 26 Feb 2021 16:37:12 -0500 Subject: [PATCH 2/6] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20filter=20top-level?= =?UTF-8?q?=20sessions=20by=20current=20user=20ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/scopes/scope/projects/sessions/index.js | 8 -------- ui/desktop/app/routes/scopes/scope/projects/sessions.js | 7 ++++++- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/ui/desktop/app/controllers/scopes/scope/projects/sessions/index.js b/ui/desktop/app/controllers/scopes/scope/projects/sessions/index.js index 0cfb61dbf..bafa6a171 100644 --- a/ui/desktop/app/controllers/scopes/scope/projects/sessions/index.js +++ b/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 [ diff --git a/ui/desktop/app/routes/scopes/scope/projects/sessions.js b/ui/desktop/app/routes/scopes/scope/projects/sessions.js index 149aedb7f..466a42767 100644 --- a/ui/desktop/app/routes/scopes/scope/projects/sessions.js +++ b/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 + }); } /** From 06c6b18f330d8d261cae2628127743c4eb7d1d79 Mon Sep 17 00:00:00 2001 From: 99 Date: Fri, 26 Feb 2021 15:23:31 -0800 Subject: [PATCH 3/6] debug tag --- .github/workflows/ui-release-trigger.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ui-release-trigger.yml b/.github/workflows/ui-release-trigger.yml index 324d04801..2d20572ea 100644 --- a/.github/workflows/ui-release-trigger.yml +++ b/.github/workflows/ui-release-trigger.yml @@ -9,12 +9,12 @@ 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 }} run: | + 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 + From 71148c3f77495fe6852e2cc733943bbf4c9ac664 Mon Sep 17 00:00:00 2001 From: 99 Date: Fri, 26 Feb 2021 17:43:20 -0800 Subject: [PATCH 4/6] debug tag --- .github/workflows/ui-release-trigger.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ui-release-trigger.yml b/.github/workflows/ui-release-trigger.yml index 2d20572ea..02e107c99 100644 --- a/.github/workflows/ui-release-trigger.yml +++ b/.github/workflows/ui-release-trigger.yml @@ -17,4 +17,3 @@ jobs: curl -u ${{ secrets.CIRCLE_TOKEN }}: -X POST --header "Content-Type: application/json" \ -d '{ "branch": "main", "parameters": {"TAG": "${GITHUB_REF#refs/tags/}" }}' \ https://circleci.com/api/v2/project/github/hashicorp/boundary-ui-releases/pipeline - From c8a843e843a2cd39cb54234d12d80df4266bbea6 Mon Sep 17 00:00:00 2001 From: 99 Date: Sat, 27 Feb 2021 11:01:26 -0800 Subject: [PATCH 5/6] Fix a tag parameter for the release pipeline --- .github/workflows/ui-release-trigger.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ui-release-trigger.yml b/.github/workflows/ui-release-trigger.yml index 02e107c99..06dd46c0f 100644 --- a/.github/workflows/ui-release-trigger.yml +++ b/.github/workflows/ui-release-trigger.yml @@ -15,5 +15,5 @@ jobs: 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": "${GITHUB_REF#refs/tags/}" }}' \ + -d '{ "branch": "main", "parameters": {"TAG": ${GITHUB_REF#refs/tags/} }}' \ https://circleci.com/api/v2/project/github/hashicorp/boundary-ui-releases/pipeline From 6ed036a35e1611004f0f30afe68c39f9b548ab5c Mon Sep 17 00:00:00 2001 From: 99 <5048814+99@users.noreply.github.com> Date: Mon, 1 Mar 2021 14:38:10 -0800 Subject: [PATCH 6/6] Update .github/workflows/ui-release-trigger.yml Co-authored-by: Sam Salisbury --- .github/workflows/ui-release-trigger.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ui-release-trigger.yml b/.github/workflows/ui-release-trigger.yml index 06dd46c0f..10683ba54 100644 --- a/.github/workflows/ui-release-trigger.yml +++ b/.github/workflows/ui-release-trigger.yml @@ -15,5 +15,5 @@ jobs: 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": ${GITHUB_REF#refs/tags/} }}' \ + -d '{ "branch": "main", "parameters": {"TAG": "'${GITHUB_REF#refs/tags/}'" }}' \ https://circleci.com/api/v2/project/github/hashicorp/boundary-ui-releases/pipeline