Merge from main (#305)

Merge from main
This commit is contained in:
Zhihe Li authored and GitHub committed 2023-05-31 17:13:56 -07:00
1 parent d130a019d7
commit e36ee56de1
12 files changed
+103 -40

No files matched your search

@@ -69,7 +69,7 @@
</G.RadioCard>
{{/each}}
</Hds::Form::RadioCard::Group>
<Hds::Form::RadioCard::Group @name='type' @alignment='center' as |G|>
<Hds::Form::RadioCard::Group @name='plugin_type' @alignment='center' as |G|>
<G.Legend>{{t 'titles.provider'}}</G.Legend>
<G.Legend>{{t 'titles.choose-a-provider'}}</G.Legend>
<G.HelperText>{{t 'descriptions.choose-a-provider'}}</G.HelperText>
@@ -68,7 +68,7 @@
</G.RadioCard>
{{/each}}
</Hds::Form::RadioCard::Group>
<Hds::Form::RadioCard::Group @name='type' @alignment='center' as |G|>
<Hds::Form::RadioCard::Group @name='plugin_type' @alignment='center' as |G|>
<G.Legend>{{t 'titles.provider'}}</G.Legend>
<G.Legend>{{t 'titles.choose-a-provider'}}</G.Legend>
<G.HelperText>{{concat
@@ -71,32 +71,6 @@
</G.RadioCard>
{{/each}}
</Hds::Form::RadioCard::Group>
{{#if @model.isPlugin}}
<Hds::Form::RadioCard::Group @name='type' as |G|>
<G.Legend>{{t 'titles.provider'}}</G.Legend>
<G.Legend>{{t 'titles.choose-a-provider'}}</G.Legend>
<G.HelperText>{{t 'descriptions.choose-a-provider'}}</G.HelperText>
{{#each-in this.mapResourceTypeWithIcon as |pluginType|}}
<G.RadioCard
@value={{pluginType}}
@checked={{eq pluginType @model.type}}
@maxWidth='20rem'
{{on 'input' (fn @changeType pluginType)}}
as |R|
>
<R.Label>{{t
(concat 'resources.host-catalog.types.' pluginType)
}}</R.Label>
<R.Description>{{t
(concat 'resources.host-catalog.help.' pluginType)
}}</R.Description>
</G.RadioCard>
{{/each-in}}
</Hds::Form::RadioCard::Group>
{{/if}}
{{/if}}
{{#if (can 'save model' @model)}}
@@ -123,9 +123,9 @@
as |F|
>
<F.Label data-test-default-port-label>{{t
'form.default_port.label'
'resources.target.form.default_port.label'
}}</F.Label>
<F.HelperText>{{t 'form.default_port.help'}}</F.HelperText>
<F.HelperText>{{t 'resources.target.form.default_port.help'}}</F.HelperText>
{{#if @model.errors.default_port}}
<F.Error as |E|>
{{#each @model.errors.default_port as |error|}}
@@ -135,6 +135,29 @@
{{/if}}
</Hds::Form::TextInput::Field>
<Hds::Form::TextInput::Field
@isOptional={{true}}
@value={{@model.default_client_port}}
@isInvalid={{@model.errors.default_client_port}}
@type='text'
name='default_client_port'
disabled={{form.disabled}}
{{on 'input' (set-from-event @model 'default_client_port')}}
as |F|
>
<F.Label>{{t 'resources.target.form.default_client_port.label'}}</F.Label>
<F.HelperText>{{t
'resources.target.form.default_client_port.help'
}}</F.HelperText>
{{#if @model.errors.default_client_port}}
<F.Error as |E|>
{{#each @model.errors.default_client_port as |error|}}
<E.Message>{{error.message}}</E.Message>
{{/each}}
</F.Error>
{{/if}}
</Hds::Form::TextInput::Field>
<Hds::Form::TextInput::Field
@isOptional={{true}}
@value={{@model.session_max_seconds}}