From 39ec40d488012bee1f0f432e549db31970e998ec Mon Sep 17 00:00:00 2001 From: dharini Date: Tue, 17 Aug 2021 15:16:28 -0700 Subject: [PATCH 1/5] desktop target read capability --- .../scopes/scope/projects/targets/index.hbs | 14 +++++++++----- .../tests/acceptance/projects/targets-test.js | 8 ++++++++ 2 files changed, 17 insertions(+), 5 deletions(-) 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 99ca234d9..f7fd23120 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs @@ -24,12 +24,16 @@ {{#each @model as |model|}} - + {{#if (can 'read model' model)}} + + {{model.displayName}} + + {{else}} {{model.displayName}} - + {{/if}} {{#if model.target.description}}

{{model.target.description}}

{{/if}} diff --git a/ui/desktop/tests/acceptance/projects/targets-test.js b/ui/desktop/tests/acceptance/projects/targets-test.js index 2fb027eec..898a04222 100644 --- a/ui/desktop/tests/acceptance/projects/targets-test.js +++ b/ui/desktop/tests/acceptance/projects/targets-test.js @@ -209,6 +209,14 @@ module('Acceptance | projects | targets', function (hooks) { await visit(urls.targets); }); + test('cannot navigate to an account form without proper authorization', async function (assert) { + assert.expect(1); + instances.target.authorized_actions = + instances.target.authorized_actions.filter((item) => item !== 'read'); + await visit(urls.target); + assert.notOk(find('main tbody .rose-table-header-cell:nth-child(1) a')); + }); + test('connecting to a target', async function (assert) { assert.expect(4); stubs.ipcService.withArgs('cliExists').returns(true); From 025297c619524a637b96f16298173e6acc381ea6 Mon Sep 17 00:00:00 2001 From: dharini Date: Tue, 17 Aug 2021 15:23:23 -0700 Subject: [PATCH 2/5] desktop target read capability --- .../scopes/scope/users/user/-actions.hbs | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ui/admin/app/templates/scopes/scope/users/user/-actions.hbs b/ui/admin/app/templates/scopes/scope/users/user/-actions.hbs index 280fd98bb..4f993d425 100644 --- a/ui/admin/app/templates/scopes/scope/users/user/-actions.hbs +++ b/ui/admin/app/templates/scopes/scope/users/user/-actions.hbs @@ -1,12 +1,12 @@ - - - {{t 'resources.user.actions.add-accounts'}} - - {{#if (can 'delete model' @model)}} +{{#if (can 'delete model' @model)}} + + + {{t 'resources.user.actions.add-accounts'}} + {{t 'resources.user.actions.delete'}} - {{/if}} - \ No newline at end of file + +{{/if}} \ No newline at end of file From c1654180c4fb07a3fe577b6ba76d7ae2f5331a8f Mon Sep 17 00:00:00 2001 From: Dharini Jeeva Date: Tue, 17 Aug 2021 16:15:37 -0700 Subject: [PATCH 3/5] Update targets-test.js --- ui/desktop/tests/acceptance/projects/targets-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/desktop/tests/acceptance/projects/targets-test.js b/ui/desktop/tests/acceptance/projects/targets-test.js index 898a04222..6e1429884 100644 --- a/ui/desktop/tests/acceptance/projects/targets-test.js +++ b/ui/desktop/tests/acceptance/projects/targets-test.js @@ -209,7 +209,7 @@ module('Acceptance | projects | targets', function (hooks) { await visit(urls.targets); }); - test('cannot navigate to an account form without proper authorization', async function (assert) { + test('cannot navigate to a target without proper authorization', async function (assert) { assert.expect(1); instances.target.authorized_actions = instances.target.authorized_actions.filter((item) => item !== 'read'); From 2545753c2cb7637285dcf183cfb192f095b42ad5 Mon Sep 17 00:00:00 2001 From: dharini Date: Tue, 17 Aug 2021 23:27:45 -0700 Subject: [PATCH 4/5] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20add=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/desktop/tests/acceptance/projects/targets-test.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ui/desktop/tests/acceptance/projects/targets-test.js b/ui/desktop/tests/acceptance/projects/targets-test.js index 898a04222..b19ec797a 100644 --- a/ui/desktop/tests/acceptance/projects/targets-test.js +++ b/ui/desktop/tests/acceptance/projects/targets-test.js @@ -209,12 +209,15 @@ module('Acceptance | projects | targets', function (hooks) { await visit(urls.targets); }); - test('cannot navigate to an account form without proper authorization', async function (assert) { + test('cannot navigate to a target form without proper authorization', async function (assert) { assert.expect(1); - instances.target.authorized_actions = - instances.target.authorized_actions.filter((item) => item !== 'read'); + later(async () => { + run.cancelTimers(); + instances.target.authorized_actions = + instances.target.authorized_actions.filter((item) => item !== 'read'); + assert.notOk(find('main tbody .rose-table-header-cell:nth-child(1) a')); + }, 750); await visit(urls.target); - assert.notOk(find('main tbody .rose-table-header-cell:nth-child(1) a')); }); test('connecting to a target', async function (assert) { From 884a0ebbc5728c87ea49e25832dfdea62e58e84f Mon Sep 17 00:00:00 2001 From: dharini Date: Thu, 19 Aug 2021 14:19:03 -0700 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=F0=9F=90=9B=20update=20route?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/desktop/tests/acceptance/projects/targets-test.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/desktop/tests/acceptance/projects/targets-test.js b/ui/desktop/tests/acceptance/projects/targets-test.js index b5b241788..bb253dd45 100644 --- a/ui/desktop/tests/acceptance/projects/targets-test.js +++ b/ui/desktop/tests/acceptance/projects/targets-test.js @@ -211,13 +211,13 @@ module('Acceptance | projects | targets', function (hooks) { test('cannot navigate to a target without proper authorization', async function (assert) { assert.expect(1); + instances.target.authorized_actions = + instances.target.authorized_actions.filter((item) => item !== 'read'); later(async () => { run.cancelTimers(); - instances.target.authorized_actions = - instances.target.authorized_actions.filter((item) => item !== 'read'); assert.notOk(find('main tbody .rose-table-header-cell:nth-child(1) a')); }, 750); - await visit(urls.target); + await visit(urls.targets); }); test('connecting to a target', async function (assert) {