From e3400ec5abf3ae2033c4bb06fd91c5e1e1fc5a48 Mon Sep 17 00:00:00 2001 From: dharini Date: Wed, 23 Feb 2022 10:28:35 -0800 Subject: [PATCH 1/3] =?UTF-8?q?chore:=20=F0=9F=A4=96=20add=20doc=20links?= =?UTF-8?q?=20for=20aws=20and=20update=20azure=20doc=20key?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/admin/app/components/form/host-catalog/aws/index.hbs | 2 ++ ui/admin/app/components/form/host-catalog/azure/index.hbs | 8 ++++---- ui/admin/app/components/form/host-catalog/index.hbs | 3 ++- ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs | 3 ++- ui/admin/config/environment.js | 5 ++++- 5 files changed, 14 insertions(+), 7 deletions(-) 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 01cafbe7a..3e1f348b9 100644 --- a/ui/admin/app/components/form/host-catalog/aws/index.hbs +++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs @@ -138,6 +138,7 @@ @label={{t 'form.access_key_id.label'}} @helperText={{t 'form.access_key_id.help'}} @linkText={{t 'actions.learn-more'}} + @link={{doc-url @awsDoc}} readonly={{false}} /> @@ -148,6 +149,7 @@ @label={{t 'form.secret_access_key.label'}} @helperText={{t 'form.secret_access_key.help'}} @linkText={{t 'actions.learn-more'}} + @link={{doc-url @awsDoc}} readonly={{false}} /> diff --git a/ui/admin/app/components/form/host-catalog/azure/index.hbs b/ui/admin/app/components/form/host-catalog/azure/index.hbs index 930e9ec5e..aa7adf492 100644 --- a/ui/admin/app/components/form/host-catalog/azure/index.hbs +++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs @@ -131,7 +131,7 @@ @label={{t 'form.tenant_id.label'}} @helperText={{t 'form.tenant_id.help'}} @linkText={{t 'actions.learn-more'}} - @link={{doc-url @doc}} + @link={{doc-url @azureDoc}} readonly={{false}} /> @@ -142,7 +142,7 @@ @label={{t 'form.subscription_id.label'}} @helperText={{t 'form.subscription_id.help'}} @linkText={{t 'actions.learn-more'}} - @link={{doc-url @doc}} + @link={{doc-url @azureDoc}} readonly={{false}} /> @@ -153,7 +153,7 @@ @label={{t 'resources.host-catalog.form.azure_client_id.label'}} @helperText={{t 'resources.host-catalog.form.azure_client_id.help'}} @linkText={{t 'actions.learn-more'}} - @link={{doc-url @doc}} + @link={{doc-url @azureDoc}} readonly={{false}} /> @@ -164,7 +164,7 @@ @label={{t 'form.secret.label'}} @helperText={{t 'form.secret.help'}} @linkText={{t 'actions.learn-more'}} - @link={{doc-url @doc}} + @link={{doc-url @azureDoc}} readonly={{false}} /> diff --git a/ui/admin/app/components/form/host-catalog/index.hbs b/ui/admin/app/components/form/host-catalog/index.hbs index 2af0d78a5..c92b7fb2f 100644 --- a/ui/admin/app/components/form/host-catalog/index.hbs +++ b/ui/admin/app/components/form/host-catalog/index.hbs @@ -4,5 +4,6 @@ submit=@submit cancel=@cancel changeType=@changeType - doc=@doc + azureDoc=@azureDoc + awsDoc=@awsDoc }} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs index 682fc6026..e31441f5a 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs @@ -19,7 +19,8 @@ @submit={{route-action 'save' @model}} @cancel={{route-action 'cancel' @model}} @changeType={{route-action 'changeType'}} - @doc='host-catalog.set-up-cloud-hosts' + @azureDoc='host-catalog.set-up-cloud-hosts.azure' + @awsDoc='host-catalog.set-up-cloud-hosts.aws' /> diff --git a/ui/admin/config/environment.js b/ui/admin/config/environment.js index cd6e3a020..af15ca26c 100644 --- a/ui/admin/config/environment.js +++ b/ui/admin/config/environment.js @@ -53,7 +53,10 @@ module.exports = function (environment) { 'group.add-members': '/groups/add-members', 'host-catalog': '/host-catalogs', 'host-catalog.new': '/host-catalogs/new', - 'host-catalog.set-up-cloud-hosts': '/host-catalog-set-up-cloud-hosts', + 'host-catalog.set-up-cloud-hosts.azure': + '/host-catalog-set-up-cloud-hosts-azure', + 'host-catalog.set-up-cloud-hosts.aws': + '/host-catalog-set-up-cloud-hosts-aws', 'host-set': '/host-sets', 'host-set.new': '/host-sets/new', 'host-set.add-hosts': '/host-sets/add-hosts', From f72447f1e27d032dea677bb667209fbb66776229 Mon Sep 17 00:00:00 2001 From: dharini Date: Wed, 23 Feb 2022 10:50:20 -0800 Subject: [PATCH 2/3] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20azure/aws=20doc?= =?UTF-8?q?=20link=20keys?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs | 4 ++-- ui/admin/config/environment.js | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs index e31441f5a..867766d09 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs @@ -19,8 +19,8 @@ @submit={{route-action 'save' @model}} @cancel={{route-action 'cancel' @model}} @changeType={{route-action 'changeType'}} - @azureDoc='host-catalog.set-up-cloud-hosts.azure' - @awsDoc='host-catalog.set-up-cloud-hosts.aws' + @azureDoc='host-catalog.azure' + @awsDoc='host-catalog.aws' /> diff --git a/ui/admin/config/environment.js b/ui/admin/config/environment.js index af15ca26c..421e641e9 100644 --- a/ui/admin/config/environment.js +++ b/ui/admin/config/environment.js @@ -53,10 +53,8 @@ module.exports = function (environment) { 'group.add-members': '/groups/add-members', 'host-catalog': '/host-catalogs', 'host-catalog.new': '/host-catalogs/new', - 'host-catalog.set-up-cloud-hosts.azure': - '/host-catalog-set-up-cloud-hosts-azure', - 'host-catalog.set-up-cloud-hosts.aws': - '/host-catalog-set-up-cloud-hosts-aws', + 'host-catalog.azure': '/dynamic-host-catalogs-on-azure', + 'host-catalog.aws': '/dynamic-host-catalogs-on-aws', 'host-set': '/host-sets', 'host-set.new': '/host-sets/new', 'host-set.add-hosts': '/host-sets/add-hosts', From 8121b12386f3db82b863cd83cae782a2c8f307a4 Mon Sep 17 00:00:00 2001 From: dharini Date: Sun, 27 Feb 2022 16:02:53 -0800 Subject: [PATCH 3/3] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20simplify=20the?= =?UTF-8?q?=20way=20to=20pass=20doc=20links=20to=20components?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/admin/app/components/form/host-catalog/aws/index.hbs | 4 ++-- ui/admin/app/components/form/host-catalog/azure/index.hbs | 8 ++++---- ui/admin/app/components/form/host-catalog/index.hbs | 2 -- ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs | 2 -- 4 files changed, 6 insertions(+), 10 deletions(-) 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 3e1f348b9..35473f2f6 100644 --- a/ui/admin/app/components/form/host-catalog/aws/index.hbs +++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs @@ -138,7 +138,7 @@ @label={{t 'form.access_key_id.label'}} @helperText={{t 'form.access_key_id.help'}} @linkText={{t 'actions.learn-more'}} - @link={{doc-url @awsDoc}} + @link={{doc-url 'host-catalog.aws'}} readonly={{false}} /> @@ -149,7 +149,7 @@ @label={{t 'form.secret_access_key.label'}} @helperText={{t 'form.secret_access_key.help'}} @linkText={{t 'actions.learn-more'}} - @link={{doc-url @awsDoc}} + @link={{doc-url 'host-catalog.aws'}} readonly={{false}} /> diff --git a/ui/admin/app/components/form/host-catalog/azure/index.hbs b/ui/admin/app/components/form/host-catalog/azure/index.hbs index aa7adf492..7d29b41b1 100644 --- a/ui/admin/app/components/form/host-catalog/azure/index.hbs +++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs @@ -131,7 +131,7 @@ @label={{t 'form.tenant_id.label'}} @helperText={{t 'form.tenant_id.help'}} @linkText={{t 'actions.learn-more'}} - @link={{doc-url @azureDoc}} + @link={{doc-url 'host-catalog.azure'}} readonly={{false}} /> @@ -142,7 +142,7 @@ @label={{t 'form.subscription_id.label'}} @helperText={{t 'form.subscription_id.help'}} @linkText={{t 'actions.learn-more'}} - @link={{doc-url @azureDoc}} + @link={{doc-url 'host-catalog.azure'}} readonly={{false}} /> @@ -153,7 +153,7 @@ @label={{t 'resources.host-catalog.form.azure_client_id.label'}} @helperText={{t 'resources.host-catalog.form.azure_client_id.help'}} @linkText={{t 'actions.learn-more'}} - @link={{doc-url @azureDoc}} + @link={{doc-url 'host-catalog.azure'}} readonly={{false}} /> @@ -164,7 +164,7 @@ @label={{t 'form.secret.label'}} @helperText={{t 'form.secret.help'}} @linkText={{t 'actions.learn-more'}} - @link={{doc-url @azureDoc}} + @link={{doc-url 'host-catalog.azure'}} readonly={{false}} /> diff --git a/ui/admin/app/components/form/host-catalog/index.hbs b/ui/admin/app/components/form/host-catalog/index.hbs index c92b7fb2f..90cebebc9 100644 --- a/ui/admin/app/components/form/host-catalog/index.hbs +++ b/ui/admin/app/components/form/host-catalog/index.hbs @@ -4,6 +4,4 @@ submit=@submit cancel=@cancel changeType=@changeType - azureDoc=@azureDoc - awsDoc=@awsDoc }} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs index 867766d09..68fad6fd1 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs @@ -19,8 +19,6 @@ @submit={{route-action 'save' @model}} @cancel={{route-action 'cancel' @model}} @changeType={{route-action 'changeType'}} - @azureDoc='host-catalog.azure' - @awsDoc='host-catalog.aws' />