From b6f8e001f07e709f340a6caa3e5fb7d65cb9e267 Mon Sep 17 00:00:00 2001 From: dharini Date: Thu, 10 Feb 2022 18:22:14 -0800 Subject: [PATCH 1/5] =?UTF-8?q?chore:=20=F0=9F=A4=96=20hide=20actions=20fo?= =?UTF-8?q?r=20plugin=20host?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../host-catalogs/host-catalog/host-sets/host-set/hosts.hbs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs index 80ba8a4f8..ae8b4183d 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs @@ -1,14 +1,15 @@ {{page-title (t 'resources.host.title_plural')}} {{#if @model.hosts}} - {{t 'form.name.label'}} {{t 'form.type.label'}} {{t 'form.id.label'}} - {{t 'titles.actions'}} + {{#if @model.isStatic}} + {{t 'titles.actions'}} + {{/if}} From 0776ec1af9f8a71d26c8e62be40a208ac1a0033f Mon Sep 17 00:00:00 2001 From: Dharini Jeeva Date: Thu, 10 Feb 2022 18:24:30 -0800 Subject: [PATCH 2/5] Update hosts.hbs --- .../host-catalogs/host-catalog/host-sets/host-set/hosts.hbs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs index ae8b4183d..d78229fe4 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs @@ -1,6 +1,7 @@ {{page-title (t 'resources.host.title_plural')}} {{#if @model.hosts}} + @@ -79,4 +80,4 @@ --}} -{{/unless}} \ No newline at end of file +{{/unless}} From 2459f97e4a794a8d60121ec48a967d0e521f6fdf Mon Sep 17 00:00:00 2001 From: dharini Date: Thu, 10 Feb 2022 18:33:51 -0800 Subject: [PATCH 3/5] consolidate provider translations --- addons/core/translations/form/en-us.yaml | 14 +++++++++---- .../form/host-catalog/aws/index.hbs | 10 +++++----- .../form/host-catalog/azure/index.hbs | 20 ++++++++----------- .../form/host-catalog/static/index.hbs | 6 +++--- .../host-catalogs/host-sets/hosts-test.js | 3 +++ 5 files changed, 29 insertions(+), 24 deletions(-) diff --git a/addons/core/translations/form/en-us.yaml b/addons/core/translations/form/en-us.yaml index 227029c9b..8f7563fd6 100644 --- a/addons/core/translations/form/en-us.yaml +++ b/addons/core/translations/form/en-us.yaml @@ -136,7 +136,13 @@ secret_access_key: link-text: Learn more region: label: Region -provider_client_id: - label: Client ID - link-text : Learn more - help: The client ID for the client you want Boundary to use. \ No newline at end of file +provider: + label: Provider Details + description: This is the provider for this host catalog. The format of the host set filters are specific to each provider. + client: + label: Client ID + help: The client ID for the client you want Boundary to use. + link-text : Learn more + choose_a_provider: + label: Choose a provider + description: There are several built-in plugins for the most common providers. You can choose from on of the included plugins or use a custom plugin. diff --git a/ui/admin/app/components/form/host-catalog/aws/index.hbs b/ui/admin/app/components/form/host-catalog/aws/index.hbs index 0470f3515..110d1efd5 100644 --- a/ui/admin/app/components/form/host-catalog/aws/index.hbs +++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs @@ -74,15 +74,15 @@ - <:title>{{t 'resources.host-catalog.form.provider.label'}} + <:title>{{t 'form.provider.label'}} <:title>{{t - 'resources.host-catalog.form.provider.choose_a_provider.label' + 'form.provider.choose_a_provider.label' }} <:description>{{t - 'resources.host-catalog.form.provider.choose_a_provider.description' + 'form.provider.choose_a_provider.description' }} <:body> @@ -109,9 +109,9 @@ {{else}} - <:title>{{t 'resources.host-catalog.form.provider.label'}} + <:title>{{t 'form.provider.label'}} <:description>{{t - 'resources.host-catalog.form.provider.description' + 'form.provider.description' }} <:body> {{#if @model.isNew}} - {{!-- {{t - 'resources.host-catalog.form.provider.label' - }} --}} - <:title>{{t 'form.type.label'}} <:body> @@ -78,14 +74,14 @@ - <:title>{{t 'resources.host-catalog.form.provider.label'}} + <:title>{{t 'form.provider.label'}} <:title>{{t - 'resources.host-catalog.form.provider.choose_a_provider.label' + 'form.provider.choose_a_provider.label' }} <:description>{{t - 'resources.host-catalog.form.provider.choose_a_provider.description' + 'form.provider.choose_a_provider.description' }} <:body> @@ -113,9 +109,9 @@ {{else}} - <:title>{{t 'resources.host-catalog.form.provider.label'}} + <:title>{{t 'form.provider.label'}} <:description>{{t - 'resources.host-catalog.form.provider.description' + 'form.provider.description' }} <:body> @@ -162,9 +158,9 @@ @name='client_id' @type='client_id' @value={{@model.client_id}} - @label={{t 'form.provider_client_id.label'}} - @helperText={{t 'form.provider_client_id.help'}} - @linkText={{t 'form.provider_client_id.link-text'}} + @label={{t 'form.provider.client.label'}} + @helperText={{t 'form.provider.client.help'}} + @linkText={{t 'form.provider.client.link-text'}} @link='https://learn.hashicorp.com/tutorials/boundary/cloud-host-catalogs#set-up-cloud-hosts' readonly={{false}} /> diff --git a/ui/admin/app/components/form/host-catalog/static/index.hbs b/ui/admin/app/components/form/host-catalog/static/index.hbs index bc0ac2421..5d637065c 100644 --- a/ui/admin/app/components/form/host-catalog/static/index.hbs +++ b/ui/admin/app/components/form/host-catalog/static/index.hbs @@ -75,15 +75,15 @@ {{#if @model.isPlugin}} - <:title>{{t 'resources.host-catalog.form.provider.label'}} + <:title>{{t 'form.provider.label'}} <:title>{{t - 'resources.host-catalog.form.provider.choose_a_provider.label' + 'form.provider.choose_a_provider.label' }} <:description>{{t - 'resources.host-catalog.form.provider.choose_a_provider.description' + 'form.provider.choose_a_provider.description' }} <:body> diff --git a/ui/admin/tests/acceptance/host-catalogs/host-sets/hosts-test.js b/ui/admin/tests/acceptance/host-catalogs/host-sets/hosts-test.js index 2423c62ca..5461031ef 100644 --- a/ui/admin/tests/acceptance/host-catalogs/host-sets/hosts-test.js +++ b/ui/admin/tests/acceptance/host-catalogs/host-sets/hosts-test.js @@ -228,7 +228,10 @@ module('Acceptance | host-catalogs | host-sets | hosts', function (hooks) { test('create and cancel host add to host set', async function (assert) { assert.expect(1); await visit(urls.createAndAddHost); + console.log(urls.createAndAddHost, 'CREATE AND HST') await click('form [type="button"]'); + console.log( urls.hostSetHosts, '222CREATE AND HST') + assert.equal(currentURL(), urls.hostSetHosts); }); From 591f05d72f9e6e5640fa244a5f3460cacb5a55d2 Mon Sep 17 00:00:00 2001 From: dharini Date: Thu, 10 Feb 2022 18:34:41 -0800 Subject: [PATCH 4/5] consolidate provider translations --- .../tests/acceptance/host-catalogs/host-sets/hosts-test.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/ui/admin/tests/acceptance/host-catalogs/host-sets/hosts-test.js b/ui/admin/tests/acceptance/host-catalogs/host-sets/hosts-test.js index 5461031ef..2423c62ca 100644 --- a/ui/admin/tests/acceptance/host-catalogs/host-sets/hosts-test.js +++ b/ui/admin/tests/acceptance/host-catalogs/host-sets/hosts-test.js @@ -228,10 +228,7 @@ module('Acceptance | host-catalogs | host-sets | hosts', function (hooks) { test('create and cancel host add to host set', async function (assert) { assert.expect(1); await visit(urls.createAndAddHost); - console.log(urls.createAndAddHost, 'CREATE AND HST') await click('form [type="button"]'); - console.log( urls.hostSetHosts, '222CREATE AND HST') - assert.equal(currentURL(), urls.hostSetHosts); }); From 449181390e575474be93e66b1198f36dd0d2bede Mon Sep 17 00:00:00 2001 From: dharini Date: Thu, 10 Feb 2022 18:44:40 -0800 Subject: [PATCH 5/5] lint --- .../host-catalogs/host-catalog/host-sets/host-set/hosts.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs index d78229fe4..9bcbe0fd4 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs @@ -80,4 +80,4 @@ --}} -{{/unless}} +{{/unless}} \ No newline at end of file