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); });