From 24a99d0fb70efc6fa0aa98110fc270e578463b37 Mon Sep 17 00:00:00 2001 From: Dharini Jeeva Date: Tue, 20 Sep 2022 09:51:29 -0700 Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Host=20Set=20Updates=20?= =?UTF-8?q?(#1333)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit host set text updates --- addons/core/translations/form/en-us.yaml | 2 +- addons/core/translations/resources/en-us.yaml | 7 +++++-- ui/admin/app/components/form/host-set/aws/index.hbs | 13 ++++++++----- .../app/components/form/host-set/azure/index.hbs | 13 ++++++++----- ui/admin/config/environment.js | 2 ++ 5 files changed, 24 insertions(+), 13 deletions(-) diff --git a/addons/core/translations/form/en-us.yaml b/addons/core/translations/form/en-us.yaml index bf3de7a46..64236bfab 100644 --- a/addons/core/translations/form/en-us.yaml +++ b/addons/core/translations/form/en-us.yaml @@ -160,6 +160,6 @@ ip_addresses: label: Latest IP Addresses sync-interval: label: Sync Interval - help: Number of seconds between the time Boundary syncs hosts in this set. + help: Optional. Number of seconds between the time Boundary syncs hosts in this set. tags: label: Tags diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml index bd8cb8da1..e384dcbaa 100644 --- a/addons/core/translations/resources/en-us.yaml +++ b/addons/core/translations/resources/en-us.yaml @@ -110,10 +110,13 @@ host-set: form: filter: label: Filter - help: Create a filter to select resources using values such as tag name or tag value. Filter format is specific to each provider + aws: + help: Create a filter to select resources using values such as tag name or tag value. The AWS filter format is tag:=. For example:tag:application=production + azure: + help: Create a filter to select resources using values such as tag name or tag value. The Azure filter format is:tagName eq ‘’ and tagValue eq ‘'. For example:tagName eq 'application' and tagValue eq 'production' preferred_endpoints: label: Preferred Endpoints - help: Selects addresses of hosts, in cidr: or dns: format + help: Optional. Selects addresses of hosts, in cidr: or dns: format messages: welcome: title: Welcome to Host Sets diff --git a/ui/admin/app/components/form/host-set/aws/index.hbs b/ui/admin/app/components/form/host-set/aws/index.hbs index cba3d41b8..aae7247da 100644 --- a/ui/admin/app/components/form/host-set/aws/index.hbs +++ b/ui/admin/app/components/form/host-set/aws/index.hbs @@ -74,11 +74,12 @@ - + <:title>{{t 'resources.host-set.form.preferred_endpoints.label'}} - <:description>{{t - 'resources.host-set.form.preferred_endpoints.help' - }} <:body> {{#if @model.errors.preferred_endpoints}} @@ -164,7 +165,7 @@ <:title>{{t 'resources.host-set.form.filter.label'}} - <:description>{{t 'resources.host-set.form.filter.help'}} + <:description>{{t 'resources.host-set.form.filter.aws.help'}} <:body> {{#if @model.errors.filters}} @@ -243,6 +244,8 @@ @label={{t 'form.sync-interval.label'}} @error={{@model.errors.sync_interval_seconds}} @helperText={{t 'form.sync-interval.help'}} + @link={{doc-url 'host-set.sync-interval-seconds'}} + @linkText={{t 'actions.learn-more'}} min='0' step='1' as |field| diff --git a/ui/admin/app/components/form/host-set/azure/index.hbs b/ui/admin/app/components/form/host-set/azure/index.hbs index de4f7e1a7..c0423e4d0 100644 --- a/ui/admin/app/components/form/host-set/azure/index.hbs +++ b/ui/admin/app/components/form/host-set/azure/index.hbs @@ -74,11 +74,12 @@ - + <:title>{{t 'resources.host-set.form.preferred_endpoints.label'}} - <:description>{{t - 'resources.host-set.form.preferred_endpoints.help' - }} <:body> {{#if @model.errors.preferred_endpoints}} @@ -167,7 +168,7 @@ @type='filter' @value={{@model.filter}} @label={{t 'resources.host-set.form.filter.label'}} - @helperText={{t 'resources.host-set.form.filter.help'}} + @helperText={{t 'resources.host-set.form.filter.azure.help'}} @linkText={{t 'actions.learn-more'}} @error={{@model.errors.description}} disabled={{@model.isSaving}} @@ -189,6 +190,8 @@ @label={{t 'form.sync-interval.label'}} @error={{@model.errors.sync_interval_seconds}} @helperText={{t 'form.sync-interval.help'}} + @link={{doc-url 'host-set.sync-interval-seconds'}} + @linkText={{t 'actions.learn-more'}} min='0' step='1' as |field| diff --git a/ui/admin/config/environment.js b/ui/admin/config/environment.js index f9c746d22..37bc5386d 100644 --- a/ui/admin/config/environment.js +++ b/ui/admin/config/environment.js @@ -79,6 +79,8 @@ module.exports = function (environment) { 'host-set': '/host-sets', 'host-set.new': '/host-sets/new', 'host-set.add-hosts': '/host-sets/add-hosts', + 'host-set.preferred-endpoints': '/host-set.preferred-endpoints', + 'host-set.sync-interval-seconds': '/host-set.sync-interval-seconds', 'credential-store': '/credential-stores', 'credential-library': '/credential-libraries', credential: '/credentials',