status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

ui: Change wording used in the intention forms (#7831) 

1. When choosing Services/Nsmapces for intentions you can either choose
a service from autocomplete menus, or write any service name, existing
or not. We previous said this would be a 'Future' service, but it could
also be a service in another datacenter, or a 'virtual service'.

2. Reword the hints underneath the autocomplete menus to reflect point 1
This commit is contained in:
John Cowen 2020-05-11 15:06:07 +01:00 committed by John Cowen
parent 5b76cb7ddc
commit 0edbafd003
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui-v2/app/components/consul-intention-form/index.hbs
View File

@ -10,7 +10,7 @@
@searchField="Name" @searchField="Name"
@selected={{SourceName}} @selected={{SourceName}}
@searchPlaceholder="Type service name" @searchPlaceholder="Type service name"
@buildSuggestion={{action "createNewLabel" "Use a future Consul Service called '{{term}}'"}} @buildSuggestion={{action "createNewLabel" "Use a Consul Service called '{{term}}'"}}
@showCreateWhen={{action "isUnique"}} @showCreateWhen={{action "isUnique"}}
@onCreate={{action "change" "SourceName"}} @onCreate={{action "change" "SourceName"}}
@onChange={{action "change" "SourceName"}} as |service|> @onChange={{action "change" "SourceName"}} as |service|>
@ -20,7 +20,7 @@
{{service.Name}} {{service.Name}}
{{/if}} {{/if}}
</PowerSelectWithCreate> </PowerSelectWithCreate>
<em>Search for an existing service, write in a future one, or write in any Service URI.</em> <em>Search for an existing service, or enter any Service name.</em>
</label> </label>
{{#if (env 'CONSUL_NSPACES_ENABLED')}} {{#if (env 'CONSUL_NSPACES_ENABLED')}}
<label data-test-source-nspace class="type-text{{if _item.error.SourceNS ' has-error'}}"> <label data-test-source-nspace class="type-text{{if _item.error.SourceNS ' has-error'}}">
@ -30,7 +30,7 @@
@searchField="Name" @searchField="Name"
@selected={{SourceNS}} @selected={{SourceNS}}
@searchPlaceholder="Type namespace name" @searchPlaceholder="Type namespace name"
@buildSuggestion={{action "createNewLabel" "Use a future Consul Namespace called '{{term}}'"}} @buildSuggestion={{action "createNewLabel" "Use a Consul Namespace called '{{term}}'"}}
@showCreateWhen={{action "isUnique"}} @showCreateWhen={{action "isUnique"}}
@onCreate={{action "change" "SourceNS"}} @onCreate={{action "change" "SourceNS"}}
@onChange={{action "change" "SourceNS"}} as |nspace|> @onChange={{action "change" "SourceNS"}} as |nspace|>
@ -40,7 +40,7 @@
{{nspace.Name}} {{nspace.Name}}
{{/if}} {{/if}}
</PowerSelectWithCreate> </PowerSelectWithCreate>
<em>Search for an existing namespace, write in a future one.</em> <em>Search for an existing namespace, or enter any Namespace name.</em>
</label> </label>
{{/if}} {{/if}}
</fieldset> </fieldset>
@ -53,7 +53,7 @@
@searchField="Name" @searchField="Name"
@selected={{DestinationName}} @selected={{DestinationName}}
@searchPlaceholder="Type service name" @searchPlaceholder="Type service name"
@buildSuggestion={{action "createNewLabel" "Use a future Consul Service called '{{term}}'"}} @buildSuggestion={{action "createNewLabel" "Use a Consul Service called '{{term}}'"}}
@showCreateWhen={{action "isUnique"}} @showCreateWhen={{action "isUnique"}}
@onCreate={{action "change" "DestinationName"}} @onCreate={{action "change" "DestinationName"}}
@onChange={{action "change" "DestinationName"}} as |service|> @onChange={{action "change" "DestinationName"}} as |service|>
@ -63,7 +63,7 @@
{{service.Name}} {{service.Name}}
{{/if}} {{/if}}
</PowerSelectWithCreate> </PowerSelectWithCreate>
<em>Search for an existing service or write in a future one.</em> <em>Search for an existing service, or enter any Service name.</em>
</label> </label>
{{#if (env 'CONSUL_NSPACES_ENABLED')}} {{#if (env 'CONSUL_NSPACES_ENABLED')}}
<label data-test-destination-nspace class="type-text{{if _item.error.DestinationNS ' has-error'}}"> <label data-test-destination-nspace class="type-text{{if _item.error.DestinationNS ' has-error'}}">