diff --git a/addons/rose/addon/components/rose/form/helper-text/index.hbs b/addons/rose/addon/components/rose/form/helper-text/index.hbs index 6e075ea98..7b803ae83 100644 --- a/addons/rose/addon/components/rose/form/helper-text/index.hbs +++ b/addons/rose/addon/components/rose/form/helper-text/index.hbs @@ -4,4 +4,9 @@ ...attributes > {{yield}} + {{#if @link}} + {{#if @linkText}} + {{@linkText}} + {{/if}} + {{/if}} diff --git a/addons/rose/addon/components/rose/form/helper-text/index.stories.mdx b/addons/rose/addon/components/rose/form/helper-text/index.stories.mdx index 68ae2906b..bddd52683 100644 --- a/addons/rose/addon/components/rose/form/helper-text/index.stories.mdx +++ b/addons/rose/addon/components/rose/form/helper-text/index.stories.mdx @@ -11,7 +11,7 @@ Displays helpful messages related to a form field. This component is used by form fields and should not be used directly. ```html - + Helper text ``` @@ -19,12 +19,14 @@ by form fields and should not be used directly. {{ template: hbs` - + Helper text `, context: { - error: boolean('error', false) + error: boolean('error', false), + link: text('link', 'http://www.example.net/'), + linkText: text('linkText', 'sample link text') }, }} diff --git a/addons/rose/addon/components/rose/form/input/index.hbs b/addons/rose/addon/components/rose/form/input/index.hbs index 889ca0639..524523bbb 100644 --- a/addons/rose/addon/components/rose/form/input/index.hbs +++ b/addons/rose/addon/components/rose/form/input/index.hbs @@ -29,7 +29,7 @@ {{#if @helperText}} - + {{@helperText}} {{/if}} diff --git a/addons/rose/addon/components/rose/form/input/index.stories.mdx b/addons/rose/addon/components/rose/form/input/index.stories.mdx index a0b6080f2..2eaeb2f99 100644 --- a/addons/rose/addon/components/rose/form/input/index.stories.mdx +++ b/addons/rose/addon/components/rose/form/input/index.stories.mdx @@ -16,6 +16,8 @@ Renders a simple form input. @value="info@example.com" @label="Email" @helperText="Enter your email" + @link='www.example.net' + @linkText='sample link text' @error={{false}} @disabled={{false}} @icon='flight-icons/svg/search-16' @@ -33,6 +35,8 @@ Or a fully contextual component without a wrapper, for maximum flexibility. @value="info@example.com" @label="Email" @helperText="Enter your email" + @link='www.example.net' + @linkText='sample link text' @error={{false}} @disabled={{false}} readonly={{false}} @@ -50,6 +54,8 @@ Or a fully contextual component without a wrapper, for maximum flexibility. @value={{value}} @label={{label}} @helperText={{helperText}} + @link={{link}} + @linkText={{linkText}} @error={{false}} @disabled={{disabled}} readonly={{read-only}} @@ -70,6 +76,8 @@ Or a fully contextual component without a wrapper, for maximum flexibility. value: text('value', 'Value'), label: text('label', 'Label'), helperText: text('helperText', 'Helper text'), + link: text('link', 'link goes here'), + linkText: text('linkText', 'link text'), disabled: boolean('disabled', false), 'read-only': boolean('readonly', false), icon: select( @@ -93,6 +101,8 @@ Or a fully contextual component without a wrapper, for maximum flexibility. @value={{value}} @label={{label}} @helperText={{helperText}} + @link={{link}} + @linkText={{linkText}} @error={{true}} @disabled={{disabled}} readonly={{read-only}} @@ -117,6 +127,8 @@ Or a fully contextual component without a wrapper, for maximum flexibility. value: text('value', 'Value'), label: text('label', 'Label'), helperText: text('helperText', 'Helper text'), + link: text('link', 'link goes here'), + linkText: text('linkText', 'link text'), disabled: boolean('disabled', false), 'read-only': boolean('readonly', false), } diff --git a/addons/rose/addon/components/rose/form/textarea/index.hbs b/addons/rose/addon/components/rose/form/textarea/index.hbs index 8bc67af1a..1ab92ac9d 100644 --- a/addons/rose/addon/components/rose/form/textarea/index.hbs +++ b/addons/rose/addon/components/rose/form/textarea/index.hbs @@ -28,7 +28,7 @@ {{#if @helperText}} - + {{@helperText}} {{/if}} diff --git a/addons/rose/addon/components/rose/form/textarea/index.stories.mdx b/addons/rose/addon/components/rose/form/textarea/index.stories.mdx index 5851d4b12..efb4dbacb 100644 --- a/addons/rose/addon/components/rose/form/textarea/index.stories.mdx +++ b/addons/rose/addon/components/rose/form/textarea/index.stories.mdx @@ -18,6 +18,8 @@ Renders a simple form textarea. @error={{false}} @disabled={{false}} readonly={{false}} + @link='www.example.net' + @linkText='link text goes here' /> ``` @@ -32,12 +34,16 @@ Renders a simple form textarea. @error={{false}} @disabled={{disabled}} readonly={{read-only}} + @link='www.example.net' + @linkText='link text goes here' /> `, context: { value: text('value', 'Value'), label: text('label', 'Label'), helperText: text('helperText', 'Helper text'), + link: text('link', 'link'), + linkText: text('linkText', 'link text goes here'), disabled: boolean('disabled', false), 'read-only': boolean('readonly', false), } diff --git a/ui/admin/app/templates/scopes/scope/sessions/index.hbs b/ui/admin/app/templates/scopes/scope/sessions/index.hbs index ec412bb5e..80b5671ef 100644 --- a/ui/admin/app/templates/scopes/scope/sessions/index.hbs +++ b/ui/admin/app/templates/scopes/scope/sessions/index.hbs @@ -16,7 +16,8 @@ {{#if (feature-flag 'filter')}} {{#if (or - @model (has-resource-filter-selections 'scopes.scope.sessions' 'type') + @model + (has-resource-filter-selections 'scopes.scope.sessions' 'status') ) }} @@ -51,7 +52,7 @@ {{/with}} {{#if - (has-resource-filter-selections 'scopes.scope.sessions' 'type') + (has-resource-filter-selections 'scopes.scope.sessions' 'status') }} - {{else if (has-resource-filter-selections 'scopes.scope.sessions' 'type')}} + {{else if (has-resource-filter-selections + 'scopes.scope.sessions' 'status' + )}}