From 52570b48fb2ac66bf0234c6d1cbd4fb8387c6705 Mon Sep 17 00:00:00 2001 From: dharini Date: Mon, 3 Jan 2022 15:32:36 -0800 Subject: [PATCH 01/12] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20add=20support=20fo?= =?UTF-8?q?r=20href?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rose/addon/components/rose/form/helper-text/index.hbs | 1 + .../components/rose/form/helper-text/index.stories.mdx | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) 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..92e716a2b 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,5 @@ ...attributes > {{yield}} +{{@linkTxt}} 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..19a65053c 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/'), + linkTxt: text('linkTxt', 'link text') }, }} From 47b0c87d89f29115e28ddd70a2fe1676b3a187a1 Mon Sep 17 00:00:00 2001 From: dharini Date: Mon, 3 Jan 2022 16:06:28 -0800 Subject: [PATCH 02/12] =?UTF-8?q?fix:=20=F0=9F=90=9B=20update=20field=20na?= =?UTF-8?q?me?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/admin/app/templates/scopes/scope/sessions/index.hbs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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' + )}} From 4410f32625a575580d5f6aeda9b848ff7c0cf162 Mon Sep 17 00:00:00 2001 From: dharini Date: Mon, 3 Jan 2022 17:22:40 -0800 Subject: [PATCH 03/12] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20fix=20lint?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../addon/components/rose/form/helper-text/index.stories.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 19a65053c..48a2070bb 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 ``` From cf1e5aa429b2ed863288c85e705dccaccf1a1fda Mon Sep 17 00:00:00 2001 From: dharini Date: Tue, 4 Jan 2022 15:12:19 -0800 Subject: [PATCH 04/12] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20add=20helper=20tex?= =?UTF-8?q?t=20support=20to=20inp=20&=20textarea?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../addon/components/rose/form/helper-text/index.hbs | 2 +- .../rose/form/helper-text/index.stories.mdx | 6 +++--- .../rose/addon/components/rose/form/input/index.hbs | 2 +- .../components/rose/form/input/index.stories.mdx | 12 ++++++++++++ .../addon/components/rose/form/textarea/index.hbs | 2 +- .../components/rose/form/textarea/index.stories.mdx | 6 ++++++ addons/rose/jsconfig.json | 1 + 7 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 addons/rose/jsconfig.json 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 92e716a2b..4dadb4d55 100644 --- a/addons/rose/addon/components/rose/form/helper-text/index.hbs +++ b/addons/rose/addon/components/rose/form/helper-text/index.hbs @@ -4,5 +4,5 @@ ...attributes > {{yield}} -{{@linkTxt}} +{{@linkText}} 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 48a2070bb..19d8e4fac 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,14 +19,14 @@ by form fields and should not be used directly. {{ template: hbs` - + Helper text `, context: { error: boolean('error', false), link: text('link', 'http://www.example.net/'), - linkTxt: text('linkTxt', 'link text') + linkText: text('linkText', '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/addons/rose/jsconfig.json b/addons/rose/jsconfig.json new file mode 100644 index 000000000..f408cac8c --- /dev/null +++ b/addons/rose/jsconfig.json @@ -0,0 +1 @@ +{"compilerOptions":{"target":"es6","experimentalDecorators":true},"exclude":["node_modules","bower_components","tmp","vendor",".git","dist"]} \ No newline at end of file From c7059ae2102b60067932b1998d34f74b3e358c73 Mon Sep 17 00:00:00 2001 From: Dharini Jeeva Date: Tue, 4 Jan 2022 15:25:03 -0800 Subject: [PATCH 05/12] Delete jsconfig.json --- addons/rose/jsconfig.json | 1 - 1 file changed, 1 deletion(-) delete mode 100644 addons/rose/jsconfig.json diff --git a/addons/rose/jsconfig.json b/addons/rose/jsconfig.json deleted file mode 100644 index f408cac8c..000000000 --- a/addons/rose/jsconfig.json +++ /dev/null @@ -1 +0,0 @@ -{"compilerOptions":{"target":"es6","experimentalDecorators":true},"exclude":["node_modules","bower_components","tmp","vendor",".git","dist"]} \ No newline at end of file From 2005a9f1bb00bcc3eba69afc039748e4cbad5656 Mon Sep 17 00:00:00 2001 From: Dharini Jeeva Date: Tue, 4 Jan 2022 15:31:29 -0800 Subject: [PATCH 06/12] Update index.hbs --- addons/rose/addon/components/rose/form/helper-text/index.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 92e716a2b..4dadb4d55 100644 --- a/addons/rose/addon/components/rose/form/helper-text/index.hbs +++ b/addons/rose/addon/components/rose/form/helper-text/index.hbs @@ -4,5 +4,5 @@ ...attributes > {{yield}} -{{@linkTxt}} +{{@linkText}} From 174b6246c767161ba4415f314e4af2dba43e4363 Mon Sep 17 00:00:00 2001 From: Dharini Jeeva Date: Tue, 4 Jan 2022 15:31:47 -0800 Subject: [PATCH 07/12] Update index.stories.mdx --- .../components/rose/form/helper-text/index.stories.mdx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 48a2070bb..a41cc98b6 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,14 +19,14 @@ by form fields and should not be used directly. {{ template: hbs` - + Helper text `, context: { error: boolean('error', false), link: text('link', 'http://www.example.net/'), - linkTxt: text('linkTxt', 'link text') + linkText: text('linkText', 'link text') }, }} From 7cd59dcf37a2d2f57f18709d2376402397c757e7 Mon Sep 17 00:00:00 2001 From: Dharini Jeeva Date: Tue, 4 Jan 2022 15:32:12 -0800 Subject: [PATCH 08/12] Update index.stories.mdx --- .../addon/components/rose/form/helper-text/index.stories.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a41cc98b6..19d8e4fac 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 @@ -19,7 +19,7 @@ by form fields and should not be used directly. {{ template: hbs` - + Helper text `, From f5f091613556cc61df1283a39021e20680e04691 Mon Sep 17 00:00:00 2001 From: Dharini Jeeva Date: Wed, 5 Jan 2022 11:36:41 -0800 Subject: [PATCH 09/12] Update index.stories.mdx --- .../addon/components/rose/form/helper-text/index.stories.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 19d8e4fac..05e7f2bc0 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 ``` From 6a140b5d21a47b7fe84a2e89117670b02bc60335 Mon Sep 17 00:00:00 2001 From: Dharini Jeeva Date: Wed, 5 Jan 2022 11:37:24 -0800 Subject: [PATCH 10/12] Update index.stories.mdx --- .../addon/components/rose/form/helper-text/index.stories.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 19d8e4fac..05e7f2bc0 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 ``` From a0a75e1e42a2aa74b691bf384082505c8d1cbb7f Mon Sep 17 00:00:00 2001 From: Dharini Jeeva Date: Wed, 5 Jan 2022 11:44:58 -0800 Subject: [PATCH 11/12] Update index.stories.mdx --- .../addon/components/rose/form/helper-text/index.stories.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 05e7f2bc0..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 @@ -26,7 +26,7 @@ by form fields and should not be used directly. context: { error: boolean('error', false), link: text('link', 'http://www.example.net/'), - linkText: text('linkText', 'link text') + linkText: text('linkText', 'sample link text') }, }} From 22700688b65b75cbc71ef49909d48242023025a6 Mon Sep 17 00:00:00 2001 From: dharini Date: Thu, 6 Jan 2022 10:42:06 -0800 Subject: [PATCH 12/12] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20show=20a=20tag=20o?= =?UTF-8?q?nly=20if=20href=20and=20link=20are=20present?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rose/addon/components/rose/form/helper-text/index.hbs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 4dadb4d55..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,5 +4,9 @@ ...attributes > {{yield}} -{{@linkText}} + {{#if @link}} + {{#if @linkText}} + {{@linkText}} + {{/if}} + {{/if}}