From dc0e86679693bbcdf8f4bd360a7fc0e6e2de7849 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Tue, 17 Aug 2021 15:53:21 -0400 Subject: [PATCH 01/25] =?UTF-8?q?chore:=20=F0=9F=A4=96=20upgrade=20global,?= =?UTF-8?q?=20org,=20and=20project=20icons=20to=20flight?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/core/public/app-icons/global.svg | 8 +++++--- addons/core/public/app-icons/org.svg | 15 ++++++++++++--- addons/core/public/app-icons/project.svg | 11 ++++++++--- .../addon/components/rose/badge/index.stories.mdx | 8 ++++---- .../components/rose/card/link/index.stories.mdx | 6 +++--- .../addon/components/rose/cards/index.stories.mdx | 14 +++++++------- .../components/rose/dropdown/index.stories.mdx | 4 ++-- .../rose/form/radio/group/index.stories.mdx | 4 ++-- .../rose/form/radio/radio/index.stories.mdx | 6 +++--- addons/rose/public/flight/globe-16.svg | 5 +++++ addons/rose/public/flight/grid-16.svg | 8 ++++++++ addons/rose/public/flight/org-16.svg | 12 ++++++++++++ ui/admin/app/components/form/role/index.hbs | 6 ++---- ui/admin/app/templates/scopes/scope.hbs | 10 +++++----- .../app/templates/scopes/scope/-header-nav.hbs | 6 +++--- .../app/templates/scopes/scope/authenticate.hbs | 2 +- .../app/templates/scopes/scope/scopes/index.hbs | 2 +- ui/admin/ember-cli-build.js | 2 +- .../app/templates/scopes/scope/-header-nav.hbs | 4 ++-- .../app/templates/scopes/scope/authenticate.hbs | 2 +- ui/desktop/ember-cli-build.js | 2 +- 21 files changed, 88 insertions(+), 49 deletions(-) create mode 100644 addons/rose/public/flight/globe-16.svg create mode 100644 addons/rose/public/flight/grid-16.svg create mode 100644 addons/rose/public/flight/org-16.svg diff --git a/addons/core/public/app-icons/global.svg b/addons/core/public/app-icons/global.svg index 0e5b84d47..0c5298171 100644 --- a/addons/core/public/app-icons/global.svg +++ b/addons/core/public/app-icons/global.svg @@ -1,3 +1,5 @@ - - - + + + + + \ No newline at end of file diff --git a/addons/core/public/app-icons/org.svg b/addons/core/public/app-icons/org.svg index 238cc8435..213323766 100644 --- a/addons/core/public/app-icons/org.svg +++ b/addons/core/public/app-icons/org.svg @@ -1,3 +1,12 @@ - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/core/public/app-icons/project.svg b/addons/core/public/app-icons/project.svg index 5b9515d08..b65333af2 100644 --- a/addons/core/public/app-icons/project.svg +++ b/addons/core/public/app-icons/project.svg @@ -1,3 +1,8 @@ - - - + + + + + + + + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/badge/index.stories.mdx b/addons/rose/addon/components/rose/badge/index.stories.mdx index 1f91c7beb..0011927a7 100644 --- a/addons/rose/addon/components/rose/badge/index.stories.mdx +++ b/addons/rose/addon/components/rose/badge/index.stories.mdx @@ -13,7 +13,7 @@ When style definition isn't supplied, a default style will be supplied. Styles: outline, dark, informational, informational-outline, success, success-outline, error, error-outline, warning, warning-outline, alert, alert-outline ```html -Badge +Badge ``` @@ -43,11 +43,11 @@ Styles: outline, dark, informational, informational-outline, success, success-ou 'none' ), icon: select('icon', { - 'user-organization': 'user-organization', + 'flight/org-16': 'flight/org-16', 'partner': 'partner', 'gift-fill': 'gift-fill', }, - 'user-organization' + 'flight/org-16' ), } }} @@ -58,7 +58,7 @@ Styles: outline, dark, informational, informational-outline, success, success-ou template: hbs` default style outline - default style with icon + default style with icon dark informational informational-outline diff --git a/addons/rose/addon/components/rose/card/link/index.stories.mdx b/addons/rose/addon/components/rose/card/link/index.stories.mdx index 57171eaf6..960fc709f 100644 --- a/addons/rose/addon/components/rose/card/link/index.stories.mdx +++ b/addons/rose/addon/components/rose/card/link/index.stories.mdx @@ -13,7 +13,7 @@ Card link component wraps content with `LinkTo` component. Supports title and de @title='Card title' @description='Card description' @id='resource_id_1234' - @icon='user-organization' + @icon='flight/org-16' @route='about'/> ``` @@ -32,11 +32,11 @@ Card link component wraps content with `LinkTo` component. Supports title and de description: text('description', 'Card description'), id: text('id', 'resource_id_1234'), icon: select('icon', { - 'user-organization': 'user-organization', + 'flight/org-16': 'flight/org-16', 'partner': 'partner', 'gift-fill': 'gift-fill', }, - 'user-organization' + 'flight/org-16' ), }, }} diff --git a/addons/rose/addon/components/rose/cards/index.stories.mdx b/addons/rose/addon/components/rose/cards/index.stories.mdx index 166d8fd83..72c503e85 100644 --- a/addons/rose/addon/components/rose/cards/index.stories.mdx +++ b/addons/rose/addon/components/rose/cards/index.stories.mdx @@ -18,35 +18,35 @@ A set of cards arranged side-by-side. @title="Card Title" @description="Description" @id="resource_id_1234" - @icon="user-organization" + @icon="flight/org-16" /> `, @@ -62,14 +62,14 @@ A set of cards arranged side-by-side. @title="Card Title" @description="Description" @id="resource_id_1234" - @icon="user-organization" + @icon="flight/org-16" /> ``` diff --git a/addons/rose/addon/components/rose/dropdown/index.stories.mdx b/addons/rose/addon/components/rose/dropdown/index.stories.mdx index 58a0575bf..8ca5ff6dc 100644 --- a/addons/rose/addon/components/rose/dropdown/index.stories.mdx +++ b/addons/rose/addon/components/rose/dropdown/index.stories.mdx @@ -11,7 +11,7 @@ A simple dropdown component with support for links and buttons. {{ template: hbs` - + Menu item Menu item @@ -31,7 +31,7 @@ A simple dropdown component with support for links and buttons. {{ template: hbs` - + Menu item Menu item diff --git a/addons/rose/addon/components/rose/form/radio/group/index.stories.mdx b/addons/rose/addon/components/rose/form/radio/group/index.stories.mdx index 515c7ca35..6c81d2f94 100644 --- a/addons/rose/addon/components/rose/form/radio/group/index.stories.mdx +++ b/addons/rose/addon/components/rose/form/radio/group/index.stories.mdx @@ -68,12 +68,12 @@ Renders a form radiofield group. firstFieldIcon: select( 'first icon', { - 'user-organization': 'user-organization', + 'flight/org-16': 'flight/org-16', 'copy-action': 'copy-action', 'unfold-more': 'unfold-more', 'unfold-less': 'unfold-less', }, - 'user-organization' + 'flight/org-16' ), secondFieldLabel: text('second label', 'Maybe'), secondFieldValue: text('second value', 'maybe'), diff --git a/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx b/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx index 4d6a4153e..2d1585c38 100644 --- a/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx +++ b/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx @@ -44,7 +44,7 @@ Renders a form radiofield. 'icon', { 'none': null, - 'user-organization': 'user-organization', + 'flight/org-16': 'flight/org-16', 'copy-action': 'copy-action', 'unfold-more': 'unfold-more', 'unfold-less': 'unfold-less', @@ -111,7 +111,7 @@ Renders a form radiofield. 'icon', { 'none': null, - 'user-organization': 'user-organization', + 'flight/org-16': 'flight/org-16', 'copy-action': 'copy-action', 'unfold-more': 'unfold-more', 'unfold-less': 'unfold-less', @@ -121,4 +121,4 @@ Renders a form radiofield. inline: boolean('inline', false) } }} - \ No newline at end of file + diff --git a/addons/rose/public/flight/globe-16.svg b/addons/rose/public/flight/globe-16.svg new file mode 100644 index 000000000..0c5298171 --- /dev/null +++ b/addons/rose/public/flight/globe-16.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/addons/rose/public/flight/grid-16.svg b/addons/rose/public/flight/grid-16.svg new file mode 100644 index 000000000..b65333af2 --- /dev/null +++ b/addons/rose/public/flight/grid-16.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/addons/rose/public/flight/org-16.svg b/addons/rose/public/flight/org-16.svg new file mode 100644 index 000000000..213323766 --- /dev/null +++ b/addons/rose/public/flight/org-16.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/ui/admin/app/components/form/role/index.hbs b/ui/admin/app/components/form/role/index.hbs index 169621362..dde4c73d5 100644 --- a/ui/admin/app/components/form/role/index.hbs +++ b/ui/admin/app/components/form/role/index.hbs @@ -69,10 +69,8 @@ @text={{this.selectedGrantScope.displayName}} @icon={{if this.selectedGrantScope.isProject - 'app-icons/project' - (if - this.selectedGrantScope.isOrg 'app-icons/org' 'app-icons/global' - ) + 'flight/grid-16' + (if this.selectedGrantScope.isOrg 'flight/org-16' 'flight/globe-16') }} as |dropdown| > diff --git a/ui/admin/app/templates/scopes/scope.hbs b/ui/admin/app/templates/scopes/scope.hbs index 65e456c51..8385f4759 100644 --- a/ui/admin/app/templates/scopes/scope.hbs +++ b/ui/admin/app/templates/scopes/scope.hbs @@ -18,7 +18,7 @@ {{#if @model.isGlobal}} - + {{t 'resources.org.title_plural'}} @@ -28,12 +28,12 @@ {{#if this.session.data.authenticated.isGlobal}} - + {{t 'resources.org.title_plural'}} {{/if}} - + {{t 'resources.project.title_plural'}} @@ -43,12 +43,12 @@ {{#if this.session.data.authenticated.isGlobal}} - + {{t 'resources.org.title_plural'}} {{/if}} - + {{t 'resources.project.title_plural'}} diff --git a/ui/admin/app/templates/scopes/scope/-header-nav.hbs b/ui/admin/app/templates/scopes/scope/-header-nav.hbs index ebfc3ffad..0a0f9c3b9 100644 --- a/ui/admin/app/templates/scopes/scope/-header-nav.hbs +++ b/ui/admin/app/templates/scopes/scope/-header-nav.hbs @@ -2,8 +2,8 @@ @text={{this.scopes.selectedOrg.displayName}} @icon={{if this.scopes.selectedOrg.isGlobal - 'app-icons/global' - 'app-icons/org' + 'flight/globe-16' + 'flight/org-16' }} as |dropdown| > @@ -23,7 +23,7 @@ {{#if this.scopes.selectedProject}} {{#each this.scopes.projects as |scope|}} diff --git a/ui/admin/app/templates/scopes/scope/authenticate.hbs b/ui/admin/app/templates/scopes/scope/authenticate.hbs index 55977a188..847987db3 100644 --- a/ui/admin/app/templates/scopes/scope/authenticate.hbs +++ b/ui/admin/app/templates/scopes/scope/authenticate.hbs @@ -16,7 +16,7 @@ }}

diff --git a/ui/admin/app/templates/scopes/scope/scopes/index.hbs b/ui/admin/app/templates/scopes/scope/scopes/index.hbs index 93df2c2cd..c4fce49b5 100644 --- a/ui/admin/app/templates/scopes/scope/scopes/index.hbs +++ b/ui/admin/app/templates/scopes/scope/scopes/index.hbs @@ -43,7 +43,7 @@ @title={{scope.name}} @description={{scope.description}} @id={{scope.id}} - @icon={{if scope.isOrg 'app-icons/org' 'app-icons/project'}} + @icon={{if scope.isOrg 'flight/org-16' 'flight/grid-16'}} @route='scopes.scope' @model={{scope.id}} /> diff --git a/ui/admin/ember-cli-build.js b/ui/admin/ember-cli-build.js index a7b391110..ab3b6e0f1 100644 --- a/ui/admin/ember-cli-build.js +++ b/ui/admin/ember-cli-build.js @@ -23,7 +23,7 @@ module.exports = function (defaults) { importCss: false, }, svg: { - paths: ['../../addons/core/public'], + paths: ['../../addons/core/public', '../../addons/rose/public'], }, }); diff --git a/ui/desktop/app/templates/scopes/scope/-header-nav.hbs b/ui/desktop/app/templates/scopes/scope/-header-nav.hbs index cbb597ea5..d8baa5042 100644 --- a/ui/desktop/app/templates/scopes/scope/-header-nav.hbs +++ b/ui/desktop/app/templates/scopes/scope/-header-nav.hbs @@ -2,8 +2,8 @@ @text={{this.scopes.selectedOrg.displayName}} @icon={{if this.scopes.selectedOrg.isGlobal - 'app-icons/global' - 'app-icons/org' + 'flight/globe-16' + 'flight/org-16' }} as |dropdown| > diff --git a/ui/desktop/app/templates/scopes/scope/authenticate.hbs b/ui/desktop/app/templates/scopes/scope/authenticate.hbs index 60ccaefa0..0472b5fce 100644 --- a/ui/desktop/app/templates/scopes/scope/authenticate.hbs +++ b/ui/desktop/app/templates/scopes/scope/authenticate.hbs @@ -11,7 +11,7 @@ diff --git a/ui/desktop/ember-cli-build.js b/ui/desktop/ember-cli-build.js index 91b6adad0..c1ba1af03 100644 --- a/ui/desktop/ember-cli-build.js +++ b/ui/desktop/ember-cli-build.js @@ -23,7 +23,7 @@ module.exports = function (defaults) { importCss: false, }, svg: { - paths: ['../../addons/core/public'], + paths: ['../../addons/core/public', '../../addons/rose/public'], }, }); From 3a1416e2ff5ce23caf27757affeaaa129cf83e5a Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Tue, 17 Aug 2021 16:13:36 -0400 Subject: [PATCH 02/25] =?UTF-8?q?chore:=20=F0=9F=A4=96=20update=20user=20p?= =?UTF-8?q?rofile=20icon=20to=20flight?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/rose/addon/components/rose/header/index.stories.mdx | 6 +++--- addons/rose/public/flight/user-circle-16.svg | 6 ++++++ addons/rose/tests/dummy/app/templates/playground.hbs | 2 +- .../rose/tests/integration/components/rose/dropdown-test.js | 2 +- .../integration/components/rose/form/radio/radio-test.js | 4 +++- ui/admin/app/templates/application.hbs | 2 +- ui/desktop/app/templates/application.hbs | 2 +- 7 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 addons/rose/public/flight/user-circle-16.svg diff --git a/addons/rose/addon/components/rose/header/index.stories.mdx b/addons/rose/addon/components/rose/header/index.stories.mdx index bffd410b7..c7e0149a8 100644 --- a/addons/rose/addon/components/rose/header/index.stories.mdx +++ b/addons/rose/addon/components/rose/header/index.stories.mdx @@ -27,7 +27,7 @@ A header component that allows three distinct sections to be configured: brand, Menu item Menu item @@ -69,13 +69,13 @@ A header component that allows three distinct sections to be configured: brand, dropdownIcon: select( 'dropdownIcon', { - 'user-square-fill': 'user-square-fill', + 'flight/user-circle-16': 'flight/user-circle-16', 'check-circle-outline': 'check-circle-outline', 'copy-action': 'copy-action', 'unfold-more': 'unfold-more', 'unfold-less': 'unfold-less', }, - 'user-square-fill' + 'flight/user-circle-16' ), }, }} diff --git a/addons/rose/public/flight/user-circle-16.svg b/addons/rose/public/flight/user-circle-16.svg new file mode 100644 index 000000000..b74c95d07 --- /dev/null +++ b/addons/rose/public/flight/user-circle-16.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/addons/rose/tests/dummy/app/templates/playground.hbs b/addons/rose/tests/dummy/app/templates/playground.hbs index e9ace3c02..1ff6dcc6f 100644 --- a/addons/rose/tests/dummy/app/templates/playground.hbs +++ b/addons/rose/tests/dummy/app/templates/playground.hbs @@ -19,7 +19,7 @@ Menu item Menu item diff --git a/addons/rose/tests/integration/components/rose/dropdown-test.js b/addons/rose/tests/integration/components/rose/dropdown-test.js index 24d4d7758..a80d5d365 100644 --- a/addons/rose/tests/integration/components/rose/dropdown-test.js +++ b/addons/rose/tests/integration/components/rose/dropdown-test.js @@ -24,7 +24,7 @@ module('Integration | Component | rose/dropdown', function (hooks) { }); test('it supports an icon', async function (assert) { - await render(hbs``); + await render(hbs``); assert.ok(find('svg')); }); diff --git a/addons/rose/tests/integration/components/rose/form/radio/radio-test.js b/addons/rose/tests/integration/components/rose/form/radio/radio-test.js index 9f1677571..15547dab8 100644 --- a/addons/rose/tests/integration/components/rose/form/radio/radio-test.js +++ b/addons/rose/tests/integration/components/rose/form/radio/radio-test.js @@ -18,7 +18,9 @@ module('Integration | Component | rose/form/radio/radio', function (hooks) { }); test('it supports an icon', async function (assert) { - await render(hbs``); + await render( + hbs`` + ); assert.ok(find('svg')); }); diff --git a/ui/admin/app/templates/application.hbs b/ui/admin/app/templates/application.hbs index 9408904ce..e0bf5a1e5 100644 --- a/ui/admin/app/templates/application.hbs +++ b/ui/admin/app/templates/application.hbs @@ -16,7 +16,7 @@ diff --git a/ui/desktop/app/templates/application.hbs b/ui/desktop/app/templates/application.hbs index 50c65b475..c7f3fbccc 100644 --- a/ui/desktop/app/templates/application.hbs +++ b/ui/desktop/app/templates/application.hbs @@ -43,7 +43,7 @@ {{#if this.session.isAuthenticated}} From 4ed0178c7a75276bb50489d11f627ebe97f6f10b Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Tue, 17 Aug 2021 17:12:45 -0400 Subject: [PATCH 03/25] =?UTF-8?q?chore:=20=F0=9F=A4=96=20upgrade=20resourc?= =?UTF-8?q?e=20icons=20to=20flight?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../public/flight/arrow-right-circle-16.svg | 6 ++++++ addons/rose/public/flight/collections-16.svg | 7 +++++++ addons/rose/public/flight/crosshair-16.svg | 5 +++++ addons/rose/public/flight/folder-users-16.svg | 9 +++++++++ .../rose/public/flight/identity-user-16.svg | 7 +++++++ addons/rose/public/flight/key-16.svg | 6 ++++++ addons/rose/public/flight/lock-16.svg | 6 ++++++ addons/rose/public/flight/users-16.svg | 8 ++++++++ ui/admin/app/templates/scopes/scope.hbs | 20 +++++++++---------- .../app/templates/scopes/scope/-sidebar.hbs | 8 ++++---- .../templates/scopes/scope/sessions/index.hbs | 2 +- .../app/templates/scopes/scope/projects.hbs | 4 ++-- .../scopes/scope/projects/sessions/index.hbs | 2 +- .../scopes/scope/projects/targets.hbs | 2 +- .../projects/targets/target/sessions.hbs | 2 +- 15 files changed, 74 insertions(+), 20 deletions(-) create mode 100644 addons/rose/public/flight/arrow-right-circle-16.svg create mode 100644 addons/rose/public/flight/collections-16.svg create mode 100644 addons/rose/public/flight/crosshair-16.svg create mode 100644 addons/rose/public/flight/folder-users-16.svg create mode 100644 addons/rose/public/flight/identity-user-16.svg create mode 100644 addons/rose/public/flight/key-16.svg create mode 100644 addons/rose/public/flight/lock-16.svg create mode 100644 addons/rose/public/flight/users-16.svg diff --git a/addons/rose/public/flight/arrow-right-circle-16.svg b/addons/rose/public/flight/arrow-right-circle-16.svg new file mode 100644 index 000000000..24003e7de --- /dev/null +++ b/addons/rose/public/flight/arrow-right-circle-16.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/addons/rose/public/flight/collections-16.svg b/addons/rose/public/flight/collections-16.svg new file mode 100644 index 000000000..cb96ffef0 --- /dev/null +++ b/addons/rose/public/flight/collections-16.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/addons/rose/public/flight/crosshair-16.svg b/addons/rose/public/flight/crosshair-16.svg new file mode 100644 index 000000000..facad35a7 --- /dev/null +++ b/addons/rose/public/flight/crosshair-16.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/addons/rose/public/flight/folder-users-16.svg b/addons/rose/public/flight/folder-users-16.svg new file mode 100644 index 000000000..bb81c2b6c --- /dev/null +++ b/addons/rose/public/flight/folder-users-16.svg @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/addons/rose/public/flight/identity-user-16.svg b/addons/rose/public/flight/identity-user-16.svg new file mode 100644 index 000000000..47cb2ba13 --- /dev/null +++ b/addons/rose/public/flight/identity-user-16.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/addons/rose/public/flight/key-16.svg b/addons/rose/public/flight/key-16.svg new file mode 100644 index 000000000..e3ec42abd --- /dev/null +++ b/addons/rose/public/flight/key-16.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/addons/rose/public/flight/lock-16.svg b/addons/rose/public/flight/lock-16.svg new file mode 100644 index 000000000..5b5dba1c1 --- /dev/null +++ b/addons/rose/public/flight/lock-16.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/addons/rose/public/flight/users-16.svg b/addons/rose/public/flight/users-16.svg new file mode 100644 index 000000000..0648faa9f --- /dev/null +++ b/addons/rose/public/flight/users-16.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope.hbs b/ui/admin/app/templates/scopes/scope.hbs index 8385f4759..f896df85a 100644 --- a/ui/admin/app/templates/scopes/scope.hbs +++ b/ui/admin/app/templates/scopes/scope.hbs @@ -58,13 +58,13 @@ {{t "resources.group.title_plural"}} {{t "resources.role.title_plural"}} @@ -72,20 +72,20 @@ --}} - + {{t 'resources.session.title_plural'}} - + {{t 'resources.target.title_plural'}} - + {{t 'resources.host-catalog.title_plural'}} {{#if (feature-flag 'credential-store')}} - + {{t 'resources.credential-store.title_plural'}} {{/if}} @@ -95,19 +95,19 @@ {{#unless @model.isProject}} - + {{t 'resources.user.title_plural'}} - + {{t 'resources.group.title_plural'}} - + {{t 'resources.role.title_plural'}} - + {{t 'resources.auth-method.title_plural'}} diff --git a/ui/admin/app/templates/scopes/scope/-sidebar.hbs b/ui/admin/app/templates/scopes/scope/-sidebar.hbs index 3b06e303e..f592804ce 100644 --- a/ui/admin/app/templates/scopes/scope/-sidebar.hbs +++ b/ui/admin/app/templates/scopes/scope/-sidebar.hbs @@ -1,18 +1,18 @@ - + {{t 'resources.user.title_plural'}} - + {{t 'resources.group.title_plural'}} - + {{t 'resources.role.title_plural'}} - + {{t 'resources.auth-method.title_plural'}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/sessions/index.hbs b/ui/admin/app/templates/scopes/scope/sessions/index.hbs index d97fc2fd0..e1844e23b 100644 --- a/ui/admin/app/templates/scopes/scope/sessions/index.hbs +++ b/ui/admin/app/templates/scopes/scope/sessions/index.hbs @@ -36,7 +36,7 @@ 'session-status-' sessionAggregate.session.status }} - @name='app-icons/action-session' + @name='flight/arrow-right-circle-16' @size='medium' /> - + {{t 'resources.target.title_plural'}} - + {{t 'resources.session.title_plural'}} diff --git a/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs b/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs index 58abacbc3..5aeffbf98 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs @@ -29,7 +29,7 @@ <:header> Date: Wed, 18 Aug 2021 10:03:16 -0400 Subject: [PATCH 04/25] =?UTF-8?q?chore:=20=F0=9F=A4=96=20upgrade=20clipboa?= =?UTF-8?q?rd=20copy=20icons=20to=20flight?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rose/addon/components/rose/button/index.stories.mdx | 8 ++++---- .../rose/addon/components/rose/dialog/index.stories.mdx | 2 +- .../components/rose/form/radio/group/index.stories.mdx | 2 +- .../components/rose/form/radio/radio/index.stories.mdx | 4 ++-- .../rose/addon/components/rose/header/index.stories.mdx | 2 +- addons/rose/addon/components/rose/icon/index.stories.mdx | 2 +- .../addon/components/rose/link-button/index.stories.mdx | 6 +++--- addons/rose/public/flight/clipboard-checked-16.svg | 5 +++++ addons/rose/public/flight/clipboard-copy-16.svg | 9 +++++++++ ui/admin/app/components/copyable/index.js | 4 ++-- ui/desktop/app/components/copyable/index.js | 4 ++-- 11 files changed, 31 insertions(+), 17 deletions(-) create mode 100644 addons/rose/public/flight/clipboard-checked-16.svg create mode 100644 addons/rose/public/flight/clipboard-copy-16.svg diff --git a/addons/rose/addon/components/rose/button/index.stories.mdx b/addons/rose/addon/components/rose/button/index.stories.mdx index 7617f0ba3..81cdb5ce2 100644 --- a/addons/rose/addon/components/rose/button/index.stories.mdx +++ b/addons/rose/addon/components/rose/button/index.stories.mdx @@ -50,7 +50,7 @@ other routes. For accessibility, use links instead. 'iconLeft', { 'check-circle-outline': 'check-circle-outline', - 'copy-action': 'copy-action', + 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', 'unfold-more': 'unfold-more', 'unfold-less': 'unfold-less', }, @@ -60,8 +60,8 @@ other routes. For accessibility, use links instead. 'iconRight', { 'check-circle-outline': 'check-circle-outline', - 'copy-action': 'chevron-right', - 'copy-action': 'copy-action', + 'chevron-right': 'chevron-right', + 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', 'unfold-more': 'unfold-more', 'unfold-less': 'unfold-less', }, @@ -87,7 +87,7 @@ button in this case for accessibility. 'iconOnly', { 'check-circle-outline': 'check-circle-outline', - 'copy-action': 'copy-action', + 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', 'unfold-more': 'unfold-more', 'unfold-less': 'unfold-less', }, diff --git a/addons/rose/addon/components/rose/dialog/index.stories.mdx b/addons/rose/addon/components/rose/dialog/index.stories.mdx index 9ea81df93..500fe17eb 100644 --- a/addons/rose/addon/components/rose/dialog/index.stories.mdx +++ b/addons/rose/addon/components/rose/dialog/index.stories.mdx @@ -37,7 +37,7 @@ A dialog component with optional modal capabilities. 'icon', { 'check-circle-outline': 'check-circle-outline', - 'copy-action': 'copy-action', + 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', 'unfold-more': 'unfold-more', 'unfold-less': 'unfold-less' }, diff --git a/addons/rose/addon/components/rose/form/radio/group/index.stories.mdx b/addons/rose/addon/components/rose/form/radio/group/index.stories.mdx index 6c81d2f94..d6119ea5f 100644 --- a/addons/rose/addon/components/rose/form/radio/group/index.stories.mdx +++ b/addons/rose/addon/components/rose/form/radio/group/index.stories.mdx @@ -69,7 +69,7 @@ Renders a form radiofield group. 'first icon', { 'flight/org-16': 'flight/org-16', - 'copy-action': 'copy-action', + 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', 'unfold-more': 'unfold-more', 'unfold-less': 'unfold-less', }, diff --git a/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx b/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx index 2d1585c38..7eeec093e 100644 --- a/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx +++ b/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx @@ -45,7 +45,7 @@ Renders a form radiofield. { 'none': null, 'flight/org-16': 'flight/org-16', - 'copy-action': 'copy-action', + 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', 'unfold-more': 'unfold-more', 'unfold-less': 'unfold-less', }, @@ -112,7 +112,7 @@ Renders a form radiofield. { 'none': null, 'flight/org-16': 'flight/org-16', - 'copy-action': 'copy-action', + 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', 'unfold-more': 'unfold-more', 'unfold-less': 'unfold-less', }, diff --git a/addons/rose/addon/components/rose/header/index.stories.mdx b/addons/rose/addon/components/rose/header/index.stories.mdx index c7e0149a8..75eb07d5e 100644 --- a/addons/rose/addon/components/rose/header/index.stories.mdx +++ b/addons/rose/addon/components/rose/header/index.stories.mdx @@ -71,7 +71,7 @@ A header component that allows three distinct sections to be configured: brand, { 'flight/user-circle-16': 'flight/user-circle-16', 'check-circle-outline': 'check-circle-outline', - 'copy-action': 'copy-action', + 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', 'unfold-more': 'unfold-more', 'unfold-less': 'unfold-less', }, diff --git a/addons/rose/addon/components/rose/icon/index.stories.mdx b/addons/rose/addon/components/rose/icon/index.stories.mdx index ffb0e32ca..a25fb7997 100644 --- a/addons/rose/addon/components/rose/icon/index.stories.mdx +++ b/addons/rose/addon/components/rose/icon/index.stories.mdx @@ -25,7 +25,7 @@ Renders a simple icon from [Structure Icons][structure-icons]. 'name', { 'check-circle-outline': 'check-circle-outline', - 'copy-action': 'copy-action', + 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', 'unfold-more': 'unfold-more', 'unfold-less': 'unfold-less', }, diff --git a/addons/rose/addon/components/rose/link-button/index.stories.mdx b/addons/rose/addon/components/rose/link-button/index.stories.mdx index 0ca00a2ee..e6c717d8a 100644 --- a/addons/rose/addon/components/rose/link-button/index.stories.mdx +++ b/addons/rose/addon/components/rose/link-button/index.stories.mdx @@ -46,17 +46,17 @@ Disabling link button is not supported as it is an action on form components onl 'iconLeft', { 'check-circle-outline': 'check-circle-outline', - 'copy-action': 'copy-action', + 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', 'unfold-more': 'unfold-more', }, - 'copy-action' + 'flight/clipboard-copy-16' ), iconRight: select( 'iconRight', { 'check-circle-outline': 'check-circle-outline', 'chevron-right': 'chevron-right', - 'copy-action': 'copy-action', + 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', 'search': 'search', }, 'chevron-right' diff --git a/addons/rose/public/flight/clipboard-checked-16.svg b/addons/rose/public/flight/clipboard-checked-16.svg new file mode 100644 index 000000000..04db58a2c --- /dev/null +++ b/addons/rose/public/flight/clipboard-checked-16.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/addons/rose/public/flight/clipboard-copy-16.svg b/addons/rose/public/flight/clipboard-copy-16.svg new file mode 100644 index 000000000..865e5d45d --- /dev/null +++ b/addons/rose/public/flight/clipboard-copy-16.svg @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/ui/admin/app/components/copyable/index.js b/ui/admin/app/components/copyable/index.js index 09da77365..6f13e6ce7 100644 --- a/ui/admin/app/components/copyable/index.js +++ b/ui/admin/app/components/copyable/index.js @@ -12,8 +12,8 @@ export default class CopyableComponent extends Component { id = generateComponentID(); copyableButtonId = `copyable-button-${this.id}`; - actionIcon = 'copy-action'; - successIcon = 'copy-success'; + actionIcon = 'flight/clipboard-copy-16'; + successIcon = 'flight/clipboard-checked-16'; actionText = this.args.buttonText; successText = this.args.acknowledgeText; diff --git a/ui/desktop/app/components/copyable/index.js b/ui/desktop/app/components/copyable/index.js index a30ff3aca..8af16d028 100644 --- a/ui/desktop/app/components/copyable/index.js +++ b/ui/desktop/app/components/copyable/index.js @@ -13,8 +13,8 @@ export default class CopyableComponent extends Component { id = generateComponentID(); copyableButtonId = `copyable-button-${this.id}`; - actionIcon = 'copy-action'; - successIcon = 'copy-success'; + actionIcon = 'flight/clipboard-copy-16'; + successIcon = 'flight/clipboard-checked-16'; actionText = this.args.buttonText; successText = this.args.acknowledgeText; From 2d32726207962ad59a0f5cbf82c5a78ef56e57bd Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 18 Aug 2021 10:46:11 -0400 Subject: [PATCH 05/25] =?UTF-8?q?chore:=20=F0=9F=A4=96=20upgrade=20trash?= =?UTF-8?q?=20icon=20to=20flight?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/rose/list/key-value/index.stories.mdx | 4 ++-- .../rose/addon/components/rose/table/index.stories.mdx | 2 +- addons/rose/public/flight/trash-16.svg | 7 +++++++ addons/rose/tests/dummy/app/templates/playground.hbs | 2 +- .../app/components/form/auth-method/oidc/index.hbs | 10 +++++----- ui/admin/app/components/form/role/grants/index.hbs | 2 +- 6 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 addons/rose/public/flight/trash-16.svg diff --git a/addons/rose/addon/components/rose/list/key-value/index.stories.mdx b/addons/rose/addon/components/rose/list/key-value/index.stories.mdx index b37e554ff..cded0db99 100644 --- a/addons/rose/addon/components/rose/list/key-value/index.stories.mdx +++ b/addons/rose/addon/components/rose/list/key-value/index.stories.mdx @@ -46,7 +46,7 @@ A simple key/value list with support for embedded form fields and buttons. - Remove + Remove @@ -94,7 +94,7 @@ A simple key/value list with support for embedded form fields and buttons. - Remove + Remove diff --git a/addons/rose/addon/components/rose/table/index.stories.mdx b/addons/rose/addon/components/rose/table/index.stories.mdx index 444419be4..0b786556a 100644 --- a/addons/rose/addon/components/rose/table/index.stories.mdx +++ b/addons/rose/addon/components/rose/table/index.stories.mdx @@ -122,7 +122,7 @@ Cell shrink should be applied to all the cells in a row. Otherwise the bigger ce - Remove + Remove diff --git a/addons/rose/public/flight/trash-16.svg b/addons/rose/public/flight/trash-16.svg new file mode 100644 index 000000000..9686f6d23 --- /dev/null +++ b/addons/rose/public/flight/trash-16.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/addons/rose/tests/dummy/app/templates/playground.hbs b/addons/rose/tests/dummy/app/templates/playground.hbs index 1ff6dcc6f..dc477136d 100644 --- a/addons/rose/tests/dummy/app/templates/playground.hbs +++ b/addons/rose/tests/dummy/app/templates/playground.hbs @@ -82,7 +82,7 @@ - Remove + Remove diff --git a/ui/admin/app/components/form/auth-method/oidc/index.hbs b/ui/admin/app/components/form/auth-method/oidc/index.hbs index 7d43d2e67..33e29d67e 100644 --- a/ui/admin/app/components/form/auth-method/oidc/index.hbs +++ b/ui/admin/app/components/form/auth-method/oidc/index.hbs @@ -178,7 +178,7 @@ From 7f022fc64c559bdc1079d1cb98bac6f7f9702fa7 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 18 Aug 2021 11:53:44 -0400 Subject: [PATCH 06/25] =?UTF-8?q?chore:=20=F0=9F=A4=96=20upgrade=20help=20?= =?UTF-8?q?and=20alert=20icons=20to=20flight?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/addon/components/doc-link/index.hbs | 2 +- .../addon/components/error/message/index.js | 7 ++-- addons/core/index.js | 39 +++++++++++++++++++ .../rose/link-button/index.stories.mdx | 6 +-- .../components/rose/message/index.stories.mdx | 9 ++--- addons/rose/public/flight/alert-circle-16.svg | 7 ++++ addons/rose/public/flight/help-16.svg | 7 ++++ .../components/rose/card/link-test.js | 2 +- .../components/rose/link-button-test.js | 2 +- ui/admin/app/templates/scopes/index.hbs | 2 +- .../templates/scopes/scope/authenticate.hbs | 2 +- .../scopes/scope/authenticate/index.hbs | 2 +- .../templates/scopes/scope/authenticate.hbs | 2 +- .../scopes/scope/authenticate/index.hbs | 2 +- 14 files changed, 71 insertions(+), 20 deletions(-) create mode 100644 addons/rose/public/flight/alert-circle-16.svg create mode 100644 addons/rose/public/flight/help-16.svg diff --git a/addons/core/addon/components/doc-link/index.hbs b/addons/core/addon/components/doc-link/index.hbs index e654aac4a..c7b7e1a8e 100644 --- a/addons/core/addon/components/doc-link/index.hbs +++ b/addons/core/addon/components/doc-link/index.hbs @@ -4,5 +4,5 @@ target="_blank" rel="noreferrer noopener" title={{t "actions.get-topic-help"}}> - + diff --git a/addons/core/addon/components/error/message/index.js b/addons/core/addon/components/error/message/index.js index 22c587595..f121d7d7b 100644 --- a/addons/core/addon/components/error/message/index.js +++ b/addons/core/addon/components/error/message/index.js @@ -27,13 +27,12 @@ export default class ErrorMessageComponent extends MessageComponent { @computed('args.status') get icon() { switch (this.args.status) { + case '404': + return 'flight/help-16'; case '401': case '403': - return 'disabled'; - case '404': - return 'help-circle-outline'; default: - return 'alert-circle-outline'; + return 'flight/alert-circle-16'; } } diff --git a/addons/core/index.js b/addons/core/index.js index fa6be2662..f1a668631 100644 --- a/addons/core/index.js +++ b/addons/core/index.js @@ -1,4 +1,43 @@ 'use strict'; + +var path = require('path'); + module.exports = { name: require('./package').name, + + included(app) { + this._super.included.apply(this, arguments); + this.includePublic(app); + this.setupSVGO(app); + }, + + /** + * Finds the public folder and includes it into the ember-inline-svg addon. + */ + includePublic(app) { + const publicPath = path.resolve('public'); + const rosePublicPath = path.resolve('../rose/public'); + const dummyPublicPath = path.resolve('tests/dummy/public'); + + app.options.svg = app.options.svg || {}; + app.options.svg.paths = app.options.svg.paths || []; + + app.options.svg.paths.push(publicPath); + app.options.svg.paths.push(rosePublicPath); + if (this.isDevelopingAddon()) app.options.svg.paths.push(dummyPublicPath); + + this.addons.forEach((addon) => { + if (addon.name === 'ember-inline-svg') addon.included(app); + }); + }, + + /** + * Adjust SVG optimizer defaults (used by ember-inline-svg). + */ + setupSVGO(app) { + app.options.svg = app.options.svg || {}; + app.options.svg.optimize = app.options.svg.optimize || {}; + app.options.svg.optimize.plugins = app.options.svg.optimize.plugins || []; + app.options.svg.optimize.plugins.push({ removeViewBox: false }); + }, }; diff --git a/addons/rose/addon/components/rose/link-button/index.stories.mdx b/addons/rose/addon/components/rose/link-button/index.stories.mdx index e6c717d8a..f4e850bf9 100644 --- a/addons/rose/addon/components/rose/link-button/index.stories.mdx +++ b/addons/rose/addon/components/rose/link-button/index.stories.mdx @@ -68,7 +68,7 @@ Disabling link button is not supported as it is an action on form components onl Similar to `Rose::Button`, icon only link button is supported. ```html - + ``` @@ -92,11 +92,11 @@ Similar to `Rose::Button`, icon only link button is supported. 'iconOnly', { 'check-circle-outline': 'check-circle-outline', - 'help-circle-outline': 'help-circle-outline', + 'flight/help-16': 'flight/help-16', 'plus-circle-fill': 'plus-circle-fill', 'user-square-outline': 'user-square-outline', }, - 'help-circle-outline' + 'flight/help-16' ), }, }} diff --git a/addons/rose/addon/components/rose/message/index.stories.mdx b/addons/rose/addon/components/rose/message/index.stories.mdx index 89447aca1..c11095d2a 100644 --- a/addons/rose/addon/components/rose/message/index.stories.mdx +++ b/addons/rose/addon/components/rose/message/index.stories.mdx @@ -33,18 +33,17 @@ Title can be configured with optional icon and subtitle. icon: select( 'icon', { - 'alert-circle-outline': 'alert-circle-outline', - 'help-circle-outline': 'help-circle-outline', - 'disabled': 'disabled', + 'flight/alert-circle-16': 'flight/alert-circle-16', + 'flight/help-16': 'flight/help-16', }, - 'help-circle-outline' + 'flight/help-16' ), }, }} ```html - + You must be granted permissions to view this data. Ask your administrator if you think you should have access. diff --git a/addons/rose/public/flight/alert-circle-16.svg b/addons/rose/public/flight/alert-circle-16.svg new file mode 100644 index 000000000..55d000d4c --- /dev/null +++ b/addons/rose/public/flight/alert-circle-16.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/addons/rose/public/flight/help-16.svg b/addons/rose/public/flight/help-16.svg new file mode 100644 index 000000000..acaf4b376 --- /dev/null +++ b/addons/rose/public/flight/help-16.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/addons/rose/tests/integration/components/rose/card/link-test.js b/addons/rose/tests/integration/components/rose/card/link-test.js index af9003ef3..f4eb10074 100644 --- a/addons/rose/tests/integration/components/rose/card/link-test.js +++ b/addons/rose/tests/integration/components/rose/card/link-test.js @@ -42,7 +42,7 @@ module('Integration | Component | rose/card/link', function (hooks) { test('it renders with @icon', async function (assert) { await render( - hbs`` + hbs`` ); assert.ok(find('.rose-icon')); }); diff --git a/addons/rose/tests/integration/components/rose/link-button-test.js b/addons/rose/tests/integration/components/rose/link-button-test.js index ac2be94aa..243a4fbc5 100644 --- a/addons/rose/tests/integration/components/rose/link-button-test.js +++ b/addons/rose/tests/integration/components/rose/link-button-test.js @@ -51,7 +51,7 @@ module('Integration | Component | rose/link-button', function (hooks) { test('it supports only icon with @iconOnly', async function (assert) { await render( - hbs`` + hbs`` ); assert.ok(find('.rose-icon')); assert.ok(find('.has-icon-only')); diff --git a/ui/admin/app/templates/scopes/index.hbs b/ui/admin/app/templates/scopes/index.hbs index f4a0d7cfe..4ef9a35e2 100644 --- a/ui/admin/app/templates/scopes/index.hbs +++ b/ui/admin/app/templates/scopes/index.hbs @@ -8,7 +8,7 @@ diff --git a/ui/admin/app/templates/scopes/scope/authenticate.hbs b/ui/admin/app/templates/scopes/scope/authenticate.hbs index 847987db3..755b72578 100644 --- a/ui/admin/app/templates/scopes/scope/authenticate.hbs +++ b/ui/admin/app/templates/scopes/scope/authenticate.hbs @@ -79,7 +79,7 @@ diff --git a/ui/admin/app/templates/scopes/scope/authenticate/index.hbs b/ui/admin/app/templates/scopes/scope/authenticate/index.hbs index b8dbc824f..014f21a9a 100644 --- a/ui/admin/app/templates/scopes/scope/authenticate/index.hbs +++ b/ui/admin/app/templates/scopes/scope/authenticate/index.hbs @@ -2,7 +2,7 @@ diff --git a/ui/desktop/app/templates/scopes/scope/authenticate.hbs b/ui/desktop/app/templates/scopes/scope/authenticate.hbs index 0472b5fce..da49bb798 100644 --- a/ui/desktop/app/templates/scopes/scope/authenticate.hbs +++ b/ui/desktop/app/templates/scopes/scope/authenticate.hbs @@ -67,7 +67,7 @@ diff --git a/ui/desktop/app/templates/scopes/scope/authenticate/index.hbs b/ui/desktop/app/templates/scopes/scope/authenticate/index.hbs index b8dbc824f..014f21a9a 100644 --- a/ui/desktop/app/templates/scopes/scope/authenticate/index.hbs +++ b/ui/desktop/app/templates/scopes/scope/authenticate/index.hbs @@ -2,7 +2,7 @@ From c9b90db36d9e3db4689d95ad7b94e7b41c0675b9 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 18 Aug 2021 12:01:31 -0400 Subject: [PATCH 07/25] =?UTF-8?q?chore:=20=F0=9F=A4=96=20upgrade=20more-ho?= =?UTF-8?q?rizontal=20icon=20to=20flight?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rose/addon/components/rose/dropdown/index.stories.mdx | 2 +- addons/rose/public/flight/more-horizontal-16.svg | 7 +++++++ ui/admin/app/templates/scopes/scope/auth-methods/index.hbs | 2 +- .../app/templates/scopes/scope/groups/group/members.hbs | 2 +- .../host-catalog/host-sets/host-set/hosts.hbs | 2 +- .../app/templates/scopes/scope/roles/role/principals.hbs | 2 +- .../scopes/scope/targets/target/credential-libraries.hbs | 2 +- .../templates/scopes/scope/targets/target/host-sets.hbs | 2 +- .../app/templates/scopes/scope/users/user/accounts.hbs | 2 +- 9 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 addons/rose/public/flight/more-horizontal-16.svg diff --git a/addons/rose/addon/components/rose/dropdown/index.stories.mdx b/addons/rose/addon/components/rose/dropdown/index.stories.mdx index 8ca5ff6dc..8ac807a63 100644 --- a/addons/rose/addon/components/rose/dropdown/index.stories.mdx +++ b/addons/rose/addon/components/rose/dropdown/index.stories.mdx @@ -117,7 +117,7 @@ Dropdown supports `danger` styling through `style` attribute. Dropdown indicator can be hidden using `showCaret` attribute. ```html - + Menu item Button menu item diff --git a/addons/rose/public/flight/more-horizontal-16.svg b/addons/rose/public/flight/more-horizontal-16.svg new file mode 100644 index 000000000..79143ccd4 --- /dev/null +++ b/addons/rose/public/flight/more-horizontal-16.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs index 6d4460c1e..0dd6e167f 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs @@ -123,7 +123,7 @@ @dropdownRight={{true}} @iconOnly={{true}} @showCaret={{false}} - @icon='more-horizontal' + @icon='flight/more-horizontal-16' as |dropdown| > {{#unless authMethod.isPrimary}} diff --git a/ui/admin/app/templates/scopes/scope/groups/group/members.hbs b/ui/admin/app/templates/scopes/scope/groups/group/members.hbs index a6512ef59..ee394abb1 100644 --- a/ui/admin/app/templates/scopes/scope/groups/group/members.hbs +++ b/ui/admin/app/templates/scopes/scope/groups/group/members.hbs @@ -27,7 +27,7 @@ Date: Wed, 18 Aug 2021 12:09:20 -0400 Subject: [PATCH 08/25] =?UTF-8?q?chore:=20=F0=9F=A4=96=20upgrade=20auth=20?= =?UTF-8?q?method=20state=20icons=20to=20flight?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../addon/components/rose/button/index.stories.mdx | 10 +++++----- .../addon/components/rose/dialog/index.stories.mdx | 6 +++--- .../addon/components/rose/header/index.stories.mdx | 2 +- .../rose/addon/components/rose/icon/index.stories.mdx | 4 ++-- .../components/rose/link-button/index.stories.mdx | 6 +++--- addons/rose/public/flight/check-circle-16.svg | 6 ++++++ addons/rose/public/flight/x-circle-16.svg | 6 ++++++ .../scopes/scope/auth-methods/auth-method/-actions.hbs | 4 ++-- 8 files changed, 28 insertions(+), 16 deletions(-) create mode 100644 addons/rose/public/flight/check-circle-16.svg create mode 100644 addons/rose/public/flight/x-circle-16.svg diff --git a/addons/rose/addon/components/rose/button/index.stories.mdx b/addons/rose/addon/components/rose/button/index.stories.mdx index 81cdb5ce2..5e00e39aa 100644 --- a/addons/rose/addon/components/rose/button/index.stories.mdx +++ b/addons/rose/addon/components/rose/button/index.stories.mdx @@ -49,17 +49,17 @@ other routes. For accessibility, use links instead. iconLeft: select( 'iconLeft', { - 'check-circle-outline': 'check-circle-outline', + 'flight/check-circle-16': 'flight/check-circle-16', 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', 'unfold-more': 'unfold-more', 'unfold-less': 'unfold-less', }, - 'check-circle-outline' + 'flight/check-circle-16' ), iconRight: select( 'iconRight', { - 'check-circle-outline': 'check-circle-outline', + 'flight/check-circle-16': 'flight/check-circle-16', 'chevron-right': 'chevron-right', 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', 'unfold-more': 'unfold-more', @@ -86,12 +86,12 @@ button in this case for accessibility. iconOnly: select( 'iconOnly', { - 'check-circle-outline': 'check-circle-outline', + 'flight/check-circle-16': 'flight/check-circle-16', 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', 'unfold-more': 'unfold-more', 'unfold-less': 'unfold-less', }, - 'check-circle-outline' + 'flight/check-circle-16' ), }, }} diff --git a/addons/rose/addon/components/rose/dialog/index.stories.mdx b/addons/rose/addon/components/rose/dialog/index.stories.mdx index 500fe17eb..70a0a1f0e 100644 --- a/addons/rose/addon/components/rose/dialog/index.stories.mdx +++ b/addons/rose/addon/components/rose/dialog/index.stories.mdx @@ -36,12 +36,12 @@ A dialog component with optional modal capabilities. icon: select( 'icon', { - 'check-circle-outline': 'check-circle-outline', + 'flight/check-circle-16': 'flight/check-circle-16', 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', 'unfold-more': 'unfold-more', 'unfold-less': 'unfold-less' }, - 'check-circle-outline' + 'flight/check-circle-16' ), style: select( 'style', @@ -60,7 +60,7 @@ A dialog component with optional modal capabilities. diff --git a/addons/rose/addon/components/rose/header/index.stories.mdx b/addons/rose/addon/components/rose/header/index.stories.mdx index 75eb07d5e..629644e10 100644 --- a/addons/rose/addon/components/rose/header/index.stories.mdx +++ b/addons/rose/addon/components/rose/header/index.stories.mdx @@ -70,7 +70,7 @@ A header component that allows three distinct sections to be configured: brand, 'dropdownIcon', { 'flight/user-circle-16': 'flight/user-circle-16', - 'check-circle-outline': 'check-circle-outline', + 'flight/check-circle-16': 'flight/check-circle-16', 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', 'unfold-more': 'unfold-more', 'unfold-less': 'unfold-less', diff --git a/addons/rose/addon/components/rose/icon/index.stories.mdx b/addons/rose/addon/components/rose/icon/index.stories.mdx index a25fb7997..8027e7352 100644 --- a/addons/rose/addon/components/rose/icon/index.stories.mdx +++ b/addons/rose/addon/components/rose/icon/index.stories.mdx @@ -24,12 +24,12 @@ Renders a simple icon from [Structure Icons][structure-icons]. name: select( 'name', { - 'check-circle-outline': 'check-circle-outline', + 'flight/check-circle-16': 'flight/check-circle-16', 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', 'unfold-more': 'unfold-more', 'unfold-less': 'unfold-less', }, - 'check-circle-outline' + 'flight/check-circle-16' ), } }} diff --git a/addons/rose/addon/components/rose/link-button/index.stories.mdx b/addons/rose/addon/components/rose/link-button/index.stories.mdx index f4e850bf9..94ca8d54d 100644 --- a/addons/rose/addon/components/rose/link-button/index.stories.mdx +++ b/addons/rose/addon/components/rose/link-button/index.stories.mdx @@ -45,7 +45,7 @@ Disabling link button is not supported as it is an action on form components onl iconLeft: select( 'iconLeft', { - 'check-circle-outline': 'check-circle-outline', + 'flight/check-circle-16': 'flight/check-circle-16', 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', 'unfold-more': 'unfold-more', }, @@ -54,7 +54,7 @@ Disabling link button is not supported as it is an action on form components onl iconRight: select( 'iconRight', { - 'check-circle-outline': 'check-circle-outline', + 'flight/check-circle-16': 'flight/check-circle-16', 'chevron-right': 'chevron-right', 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', 'search': 'search', @@ -91,7 +91,7 @@ Similar to `Rose::Button`, icon only link button is supported. iconOnly: select( 'iconOnly', { - 'check-circle-outline': 'check-circle-outline', + 'flight/check-circle-16': 'flight/check-circle-16', 'flight/help-16': 'flight/help-16', 'plus-circle-fill': 'plus-circle-fill', 'user-square-outline': 'user-square-outline', diff --git a/addons/rose/public/flight/check-circle-16.svg b/addons/rose/public/flight/check-circle-16.svg new file mode 100644 index 000000000..4d296da62 --- /dev/null +++ b/addons/rose/public/flight/check-circle-16.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/addons/rose/public/flight/x-circle-16.svg b/addons/rose/public/flight/x-circle-16.svg new file mode 100644 index 000000000..5b0aa3f78 --- /dev/null +++ b/addons/rose/public/flight/x-circle-16.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs index 2d6e7d9a9..200cc9912 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs @@ -3,8 +3,8 @@ @text={{t (concat 'states.' @model.attributes.state)}} @icon={{if @model.isInactive - 'disabled' - (if @model.isPrivate 'lock-closed-outline' 'check-circle-outline') + 'flight/x-circle-16' + (if @model.isPrivate 'flight/lock-16' 'flight/check-circle-16') }} @dropdownRight={{true}} as |dropdown| From e248bbe2008c07e318de0a2508ca467440f3bfee Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 18 Aug 2021 12:38:17 -0400 Subject: [PATCH 09/25] =?UTF-8?q?chore:=20=F0=9F=A4=96=20upgrade=20alert?= =?UTF-8?q?=20and=20cancel=20icons=20to=20flight?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/rose/addon/components/rose/dialog/index.hbs | 4 ++-- .../addon/components/rose/form/errors/message/index.hbs | 2 +- addons/rose/addon/components/rose/notification/index.hbs | 2 +- addons/rose/addon/components/rose/notification/index.js | 8 ++++---- addons/rose/public/flight/alert-triangle-16.svg | 7 +++++++ addons/rose/public/flight/info-16.svg | 7 +++++++ addons/rose/public/flight/x-16.svg | 5 +++++ addons/rose/public/flight/x-square-16.svg | 6 ++++++ ui/admin/app/templates/application.hbs | 4 ++-- ui/desktop/app/templates/application.hbs | 6 +++--- 10 files changed, 38 insertions(+), 13 deletions(-) create mode 100644 addons/rose/public/flight/alert-triangle-16.svg create mode 100644 addons/rose/public/flight/info-16.svg create mode 100644 addons/rose/public/flight/x-16.svg create mode 100644 addons/rose/public/flight/x-square-16.svg diff --git a/addons/rose/addon/components/rose/dialog/index.hbs b/addons/rose/addon/components/rose/dialog/index.hbs index aa03d38de..7876f5349 100644 --- a/addons/rose/addon/components/rose/dialog/index.hbs +++ b/addons/rose/addon/components/rose/dialog/index.hbs @@ -27,7 +27,7 @@ title={{@dismissButtonText}} {{on "click" (fn this.dismiss @dismiss)}} > - + @@ -62,7 +62,7 @@ title={{@dismissButtonText}} {{on "click" (fn this.dismiss @dismiss)}} > - + diff --git a/addons/rose/addon/components/rose/form/errors/message/index.hbs b/addons/rose/addon/components/rose/form/errors/message/index.hbs index fb4b2ebe0..443829171 100644 --- a/addons/rose/addon/components/rose/form/errors/message/index.hbs +++ b/addons/rose/addon/components/rose/form/errors/message/index.hbs @@ -1,4 +1,4 @@

- + {{yield}}

diff --git a/addons/rose/addon/components/rose/notification/index.hbs b/addons/rose/addon/components/rose/notification/index.hbs index 04d60df5f..3d9290695 100644 --- a/addons/rose/addon/components/rose/notification/index.hbs +++ b/addons/rose/addon/components/rose/notification/index.hbs @@ -26,7 +26,7 @@ {{on "click" @dismiss}} > {{@dismissText}} diff --git a/addons/rose/addon/components/rose/notification/index.js b/addons/rose/addon/components/rose/notification/index.js index 881d11355..c3c23b44b 100644 --- a/addons/rose/addon/components/rose/notification/index.js +++ b/addons/rose/addon/components/rose/notification/index.js @@ -8,17 +8,17 @@ export default class RoseNotificationComponent extends Component { */ @computed('style') get icon() { - let icon = 'info-circle-fill'; + let icon = 'flight/info-16'; switch (this.style) { case 'error': - icon = 'cancel-square-fill'; + icon = 'flight/x-square-16'; break; case 'success': - icon = 'check-circle-fill'; + icon = 'flight/check-circle-16'; break; case 'warning': - icon = 'alert-triangle'; + icon = 'flight/alert-triangle-16'; break; } diff --git a/addons/rose/public/flight/alert-triangle-16.svg b/addons/rose/public/flight/alert-triangle-16.svg new file mode 100644 index 000000000..9367dbd4c --- /dev/null +++ b/addons/rose/public/flight/alert-triangle-16.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/addons/rose/public/flight/info-16.svg b/addons/rose/public/flight/info-16.svg new file mode 100644 index 000000000..1c7f58c50 --- /dev/null +++ b/addons/rose/public/flight/info-16.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/addons/rose/public/flight/x-16.svg b/addons/rose/public/flight/x-16.svg new file mode 100644 index 000000000..f41d39dd5 --- /dev/null +++ b/addons/rose/public/flight/x-16.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/addons/rose/public/flight/x-square-16.svg b/addons/rose/public/flight/x-square-16.svg new file mode 100644 index 000000000..9bf270d7e --- /dev/null +++ b/addons/rose/public/flight/x-square-16.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/ui/admin/app/templates/application.hbs b/ui/admin/app/templates/application.hbs index e0bf5a1e5..7413d948e 100644 --- a/ui/admin/app/templates/application.hbs +++ b/ui/admin/app/templates/application.hbs @@ -100,7 +100,7 @@ {{#if this.isWindowsOS}} Date: Wed, 18 Aug 2021 12:49:51 -0400 Subject: [PATCH 10/25] chore: remove storybook usage of non-flight icons --- .../rose/addon/components/rose/badge/index.stories.mdx | 2 -- .../rose/addon/components/rose/button/index.stories.mdx | 9 +-------- .../addon/components/rose/card/link/index.stories.mdx | 2 -- .../rose/addon/components/rose/dialog/index.stories.mdx | 2 -- .../components/rose/form/radio/group/index.stories.mdx | 2 -- .../components/rose/form/radio/radio/index.stories.mdx | 4 ---- .../rose/addon/components/rose/header/index.stories.mdx | 2 -- .../addon/components/rose/link-button/index.stories.mdx | 7 +------ 8 files changed, 2 insertions(+), 28 deletions(-) diff --git a/addons/rose/addon/components/rose/badge/index.stories.mdx b/addons/rose/addon/components/rose/badge/index.stories.mdx index 0011927a7..1d65b3d0a 100644 --- a/addons/rose/addon/components/rose/badge/index.stories.mdx +++ b/addons/rose/addon/components/rose/badge/index.stories.mdx @@ -44,8 +44,6 @@ Styles: outline, dark, informational, informational-outline, success, success-ou ), icon: select('icon', { 'flight/org-16': 'flight/org-16', - 'partner': 'partner', - 'gift-fill': 'gift-fill', }, 'flight/org-16' ), diff --git a/addons/rose/addon/components/rose/button/index.stories.mdx b/addons/rose/addon/components/rose/button/index.stories.mdx index 5e00e39aa..0e9380eaa 100644 --- a/addons/rose/addon/components/rose/button/index.stories.mdx +++ b/addons/rose/addon/components/rose/button/index.stories.mdx @@ -51,8 +51,6 @@ other routes. For accessibility, use links instead. { 'flight/check-circle-16': 'flight/check-circle-16', 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', - 'unfold-more': 'unfold-more', - 'unfold-less': 'unfold-less', }, 'flight/check-circle-16' ), @@ -60,12 +58,9 @@ other routes. For accessibility, use links instead. 'iconRight', { 'flight/check-circle-16': 'flight/check-circle-16', - 'chevron-right': 'chevron-right', 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', - 'unfold-more': 'unfold-more', - 'unfold-less': 'unfold-less', }, - 'chevron-right' + 'flight/clipboard-copy-16' ), onClick: action('clicked'), }, @@ -88,8 +83,6 @@ button in this case for accessibility. { 'flight/check-circle-16': 'flight/check-circle-16', 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', - 'unfold-more': 'unfold-more', - 'unfold-less': 'unfold-less', }, 'flight/check-circle-16' ), diff --git a/addons/rose/addon/components/rose/card/link/index.stories.mdx b/addons/rose/addon/components/rose/card/link/index.stories.mdx index 960fc709f..8aaf7e693 100644 --- a/addons/rose/addon/components/rose/card/link/index.stories.mdx +++ b/addons/rose/addon/components/rose/card/link/index.stories.mdx @@ -33,8 +33,6 @@ Card link component wraps content with `LinkTo` component. Supports title and de id: text('id', 'resource_id_1234'), icon: select('icon', { 'flight/org-16': 'flight/org-16', - 'partner': 'partner', - 'gift-fill': 'gift-fill', }, 'flight/org-16' ), diff --git a/addons/rose/addon/components/rose/dialog/index.stories.mdx b/addons/rose/addon/components/rose/dialog/index.stories.mdx index 70a0a1f0e..0315a3c87 100644 --- a/addons/rose/addon/components/rose/dialog/index.stories.mdx +++ b/addons/rose/addon/components/rose/dialog/index.stories.mdx @@ -38,8 +38,6 @@ A dialog component with optional modal capabilities. { 'flight/check-circle-16': 'flight/check-circle-16', 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', - 'unfold-more': 'unfold-more', - 'unfold-less': 'unfold-less' }, 'flight/check-circle-16' ), diff --git a/addons/rose/addon/components/rose/form/radio/group/index.stories.mdx b/addons/rose/addon/components/rose/form/radio/group/index.stories.mdx index d6119ea5f..be4aa2b3f 100644 --- a/addons/rose/addon/components/rose/form/radio/group/index.stories.mdx +++ b/addons/rose/addon/components/rose/form/radio/group/index.stories.mdx @@ -70,8 +70,6 @@ Renders a form radiofield group. { 'flight/org-16': 'flight/org-16', 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', - 'unfold-more': 'unfold-more', - 'unfold-less': 'unfold-less', }, 'flight/org-16' ), diff --git a/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx b/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx index 7eeec093e..e2f15d63a 100644 --- a/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx +++ b/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx @@ -46,8 +46,6 @@ Renders a form radiofield. 'none': null, 'flight/org-16': 'flight/org-16', 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', - 'unfold-more': 'unfold-more', - 'unfold-less': 'unfold-less', }, null ), @@ -113,8 +111,6 @@ Renders a form radiofield. 'none': null, 'flight/org-16': 'flight/org-16', 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', - 'unfold-more': 'unfold-more', - 'unfold-less': 'unfold-less', }, null ), diff --git a/addons/rose/addon/components/rose/header/index.stories.mdx b/addons/rose/addon/components/rose/header/index.stories.mdx index 629644e10..be894c503 100644 --- a/addons/rose/addon/components/rose/header/index.stories.mdx +++ b/addons/rose/addon/components/rose/header/index.stories.mdx @@ -72,8 +72,6 @@ A header component that allows three distinct sections to be configured: brand, 'flight/user-circle-16': 'flight/user-circle-16', 'flight/check-circle-16': 'flight/check-circle-16', 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', - 'unfold-more': 'unfold-more', - 'unfold-less': 'unfold-less', }, 'flight/user-circle-16' ), diff --git a/addons/rose/addon/components/rose/link-button/index.stories.mdx b/addons/rose/addon/components/rose/link-button/index.stories.mdx index 94ca8d54d..381beb8cd 100644 --- a/addons/rose/addon/components/rose/link-button/index.stories.mdx +++ b/addons/rose/addon/components/rose/link-button/index.stories.mdx @@ -47,7 +47,6 @@ Disabling link button is not supported as it is an action on form components onl { 'flight/check-circle-16': 'flight/check-circle-16', 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', - 'unfold-more': 'unfold-more', }, 'flight/clipboard-copy-16' ), @@ -55,11 +54,9 @@ Disabling link button is not supported as it is an action on form components onl 'iconRight', { 'flight/check-circle-16': 'flight/check-circle-16', - 'chevron-right': 'chevron-right', 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', - 'search': 'search', }, - 'chevron-right' + 'flight/clipboard-copy-16' ), }, }} @@ -93,8 +90,6 @@ Similar to `Rose::Button`, icon only link button is supported. { 'flight/check-circle-16': 'flight/check-circle-16', 'flight/help-16': 'flight/help-16', - 'plus-circle-fill': 'plus-circle-fill', - 'user-square-outline': 'user-square-outline', }, 'flight/help-16' ), From 6b9c8192a95aae80127b7f1bece3c2d05bdf2422 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 18 Aug 2021 12:51:40 -0400 Subject: [PATCH 11/25] chore: convert test icon usage to flight --- ui/desktop/tests/integration/components/card-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/desktop/tests/integration/components/card-test.js b/ui/desktop/tests/integration/components/card-test.js index fdb37919b..e0d627d13 100644 --- a/ui/desktop/tests/integration/components/card-test.js +++ b/ui/desktop/tests/integration/components/card-test.js @@ -30,7 +30,7 @@ module('Integration | Component | card', function (hooks) { await render(hbs` + @icon='flight/key-16'> <:header> <:body> <:footer> From 5cdc7af5882ec400cf34891b0092b5ebe7a2a14c Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 18 Aug 2021 13:33:40 -0400 Subject: [PATCH 12/25] =?UTF-8?q?chore:=20=F0=9F=A4=96=20remove=20last=20u?= =?UTF-8?q?sage=20of=20structure-icons?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/rose/button/index.stories.mdx | 2 +- .../components/rose/icon/index.stories.mdx | 6 +----- .../rose/link-button/index.stories.mdx | 2 +- addons/rose/index.js | 19 ------------------- addons/rose/package.json | 1 - addons/rose/public/chevron-left.svg | 3 +++ addons/rose/public/chevron-right.svg | 3 +++ addons/rose/public/flight/chevron-left-16.svg | 5 +++++ addons/rose/public/flight/eye-16.svg | 6 ++++++ addons/rose/public/flight/eye-off-16.svg | 6 ++++++ addons/rose/public/flight/plus-circle-16.svg | 6 ++++++ .../integration/components/rose/badge-test.js | 2 +- .../integration/components/rose/icon-test.js | 4 ++-- .../components/rose/link-button-test.js | 2 +- .../auth-method/accounts/index.hbs | 2 +- .../scopes/scope/auth-methods/index.hbs | 2 +- .../credential-libraries/index.hbs | 2 +- .../scopes/scope/credential-stores/index.hbs | 2 +- .../scopes/scope/groups/group/members.hbs | 2 +- .../templates/scopes/scope/groups/index.hbs | 2 +- .../host-catalog/host-sets/host-set/hosts.hbs | 2 +- .../host-catalog/host-sets/index.hbs | 2 +- .../host-catalog/hosts/index.hbs | 2 +- .../scopes/scope/host-catalogs/index.hbs | 2 +- .../templates/scopes/scope/roles/index.hbs | 2 +- .../scopes/scope/roles/role/principals.hbs | 2 +- .../templates/scopes/scope/scopes/index.hbs | 4 ++-- .../templates/scopes/scope/targets/index.hbs | 2 +- .../targets/target/credential-libraries.hbs | 2 +- .../scopes/scope/targets/target/host-sets.hbs | 2 +- .../templates/scopes/scope/users/index.hbs | 2 +- .../scopes/scope/users/user/accounts.hbs | 2 +- .../app/components/hidden-secret/index.hbs | 2 +- yarn.lock | 5 ----- 34 files changed, 56 insertions(+), 56 deletions(-) create mode 100644 addons/rose/public/chevron-left.svg create mode 100644 addons/rose/public/chevron-right.svg create mode 100644 addons/rose/public/flight/chevron-left-16.svg create mode 100644 addons/rose/public/flight/eye-16.svg create mode 100644 addons/rose/public/flight/eye-off-16.svg create mode 100644 addons/rose/public/flight/plus-circle-16.svg diff --git a/addons/rose/addon/components/rose/button/index.stories.mdx b/addons/rose/addon/components/rose/button/index.stories.mdx index 0e9380eaa..76010a51c 100644 --- a/addons/rose/addon/components/rose/button/index.stories.mdx +++ b/addons/rose/addon/components/rose/button/index.stories.mdx @@ -12,7 +12,7 @@ to trigger actions or to submit forms. Avoid using buttons as simple links to other routes. For accessibility, use links instead. ```htmlbars - + Action ``` diff --git a/addons/rose/addon/components/rose/icon/index.stories.mdx b/addons/rose/addon/components/rose/icon/index.stories.mdx index 8027e7352..d22b1bcac 100644 --- a/addons/rose/addon/components/rose/icon/index.stories.mdx +++ b/addons/rose/addon/components/rose/icon/index.stories.mdx @@ -7,9 +7,7 @@ import { text, boolean, select } from '@storybook/addon-knobs'; # Icon -Renders a simple icon from [Structure Icons][structure-icons]. - -[structure-icons]: https://github.com/hashicorp/structure-icons +Renders a simple icon. ```htmlbars @@ -26,8 +24,6 @@ Renders a simple icon from [Structure Icons][structure-icons]. { 'flight/check-circle-16': 'flight/check-circle-16', 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', - 'unfold-more': 'unfold-more', - 'unfold-less': 'unfold-less', }, 'flight/check-circle-16' ), diff --git a/addons/rose/addon/components/rose/link-button/index.stories.mdx b/addons/rose/addon/components/rose/link-button/index.stories.mdx index 381beb8cd..9f8831694 100644 --- a/addons/rose/addon/components/rose/link-button/index.stories.mdx +++ b/addons/rose/addon/components/rose/link-button/index.stories.mdx @@ -12,7 +12,7 @@ Styles supported: primary, secondary, warning, and ghost. Disabling link button is not supported as it is an action on form components only. ```html - + Content ``` diff --git a/addons/rose/index.js b/addons/rose/index.js index 6de73c3ca..4da13fee7 100644 --- a/addons/rose/index.js +++ b/addons/rose/index.js @@ -10,7 +10,6 @@ module.exports = { this._super.included.apply(this, arguments); this.includeStyles(app); - this.includeIcons(app); this.includePublic(app); this.setupSVGO(app); }, @@ -41,24 +40,6 @@ module.exports = { app.options.sassOptions.includePaths.push(styleTree); }, - /** - * Finds the structure-icons folder and includes it into the - * ember-inline-svg addon. - */ - includeIcons(app) { - const iconPackagePath = require.resolve('@hashicorp/structure-icons'); - const iconsPath = path.resolve(iconPackagePath, '..'); - - app.options.svg = app.options.svg || {}; - app.options.svg.paths = app.options.svg.paths || []; - - app.options.svg.paths.push(iconsPath); - - this.addons.forEach((addon) => { - if (addon.name === 'ember-inline-svg') addon.included(app); - }); - }, - /** * Finds the public folder and includes it into the ember-inline-svg addon. */ diff --git a/addons/rose/package.json b/addons/rose/package.json index 6e1f5fadb..88718fbbd 100644 --- a/addons/rose/package.json +++ b/addons/rose/package.json @@ -43,7 +43,6 @@ "@ember/test-helpers": "^2.2.8", "@glimmer/component": "^1.0.3", "@glimmer/tracking": "^1.0.3", - "@hashicorp/structure-icons": "^1.9.0-0", "@storybook/addon-actions": "^6.3.1", "@storybook/addon-docs": "^6.3.1", "@storybook/addon-knobs": "^6.3.0", diff --git a/addons/rose/public/chevron-left.svg b/addons/rose/public/chevron-left.svg new file mode 100644 index 000000000..6b6f3a0ea --- /dev/null +++ b/addons/rose/public/chevron-left.svg @@ -0,0 +1,3 @@ + + + diff --git a/addons/rose/public/chevron-right.svg b/addons/rose/public/chevron-right.svg new file mode 100644 index 000000000..be0fbc667 --- /dev/null +++ b/addons/rose/public/chevron-right.svg @@ -0,0 +1,3 @@ + + + diff --git a/addons/rose/public/flight/chevron-left-16.svg b/addons/rose/public/flight/chevron-left-16.svg new file mode 100644 index 000000000..62fda4d33 --- /dev/null +++ b/addons/rose/public/flight/chevron-left-16.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/addons/rose/public/flight/eye-16.svg b/addons/rose/public/flight/eye-16.svg new file mode 100644 index 000000000..8eb2e59a7 --- /dev/null +++ b/addons/rose/public/flight/eye-16.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/addons/rose/public/flight/eye-off-16.svg b/addons/rose/public/flight/eye-off-16.svg new file mode 100644 index 000000000..105f1d3e3 --- /dev/null +++ b/addons/rose/public/flight/eye-off-16.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/addons/rose/public/flight/plus-circle-16.svg b/addons/rose/public/flight/plus-circle-16.svg new file mode 100644 index 000000000..6cef57c52 --- /dev/null +++ b/addons/rose/public/flight/plus-circle-16.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/addons/rose/tests/integration/components/rose/badge-test.js b/addons/rose/tests/integration/components/rose/badge-test.js index 8665085e7..7b5a62abe 100644 --- a/addons/rose/tests/integration/components/rose/badge-test.js +++ b/addons/rose/tests/integration/components/rose/badge-test.js @@ -17,7 +17,7 @@ module('Integration | Component | rose/badge', function (hooks) { }); test('it renders an icon using @icon', async function (assert) { - await render(hbs``); + await render(hbs``); assert.ok(find('.rose-icon')); }); diff --git a/addons/rose/tests/integration/components/rose/icon-test.js b/addons/rose/tests/integration/components/rose/icon-test.js index 43a429077..2caad0943 100644 --- a/addons/rose/tests/integration/components/rose/icon-test.js +++ b/addons/rose/tests/integration/components/rose/icon-test.js @@ -7,12 +7,12 @@ module('Integration | Component | rose/icon', function (hooks) { setupRenderingTest(hooks); test('it renders', async function (assert) { - await render(hbs``); + await render(hbs``); assert.ok(find('svg')); }); test('it supports optional @size', async function (assert) { - await render(hbs``); + await render(hbs``); assert.ok(find('.small')); }); }); diff --git a/addons/rose/tests/integration/components/rose/link-button-test.js b/addons/rose/tests/integration/components/rose/link-button-test.js index 243a4fbc5..0312d94ea 100644 --- a/addons/rose/tests/integration/components/rose/link-button-test.js +++ b/addons/rose/tests/integration/components/rose/link-button-test.js @@ -43,7 +43,7 @@ module('Integration | Component | rose/link-button', function (hooks) { test('it supports left icon with @iconRight', async function (assert) { await render( - hbs`` + hbs`` ); assert.ok(find('.rose-icon')); assert.ok(find('.has-icon-right')); diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs index c35071bf7..ee9b1091d 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs @@ -115,7 +115,7 @@ {{t 'resources.account.messages.welcome.description'}} - + {{t 'resources.account.actions.create'}} diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs index 0dd6e167f..0a4fbd8d8 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs @@ -165,7 +165,7 @@ @route='scopes.scope.auth-methods.new' @query={{hash type='password'}} > - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/index.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/index.hbs index 2bb3101c2..60d720c91 100644 --- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/index.hbs +++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/index.hbs @@ -58,7 +58,7 @@ - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs index e614dd097..cf059f762 100644 --- a/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs +++ b/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs @@ -78,7 +78,7 @@ {{t 'resources.credential-store.description'}} - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/groups/group/members.hbs b/ui/admin/app/templates/scopes/scope/groups/group/members.hbs index ee394abb1..07503d0d3 100644 --- a/ui/admin/app/templates/scopes/scope/groups/group/members.hbs +++ b/ui/admin/app/templates/scopes/scope/groups/group/members.hbs @@ -58,7 +58,7 @@ {{t 'resources.group.messages.members.description'}} - + {{t 'resources.group.actions.add-members'}} diff --git a/ui/admin/app/templates/scopes/scope/groups/index.hbs b/ui/admin/app/templates/scopes/scope/groups/index.hbs index cb59fde2e..c290f9948 100644 --- a/ui/admin/app/templates/scopes/scope/groups/index.hbs +++ b/ui/admin/app/templates/scopes/scope/groups/index.hbs @@ -72,7 +72,7 @@ {{t 'resources.group.description'}} - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs index 07392abcb..1b1f21949 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs @@ -70,7 +70,7 @@ {{!-- - + {{t "resources.host-set.actions.create-and-add-host"}} --}} diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs index 4f0c433bf..defdee52e 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs @@ -52,7 +52,7 @@ - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs index c7079adec..3079c54c2 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs @@ -54,7 +54,7 @@ {{t 'resources.host.description'}} - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs index dcc1f811c..6affad96b 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs @@ -81,7 +81,7 @@ {{t 'resources.host-catalog.description'}} - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/roles/index.hbs b/ui/admin/app/templates/scopes/scope/roles/index.hbs index 7fb62530c..30cc00e38 100644 --- a/ui/admin/app/templates/scopes/scope/roles/index.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/index.hbs @@ -67,7 +67,7 @@ {{t 'resources.role.description'}} - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs b/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs index 9767bab5e..b67e32aa7 100644 --- a/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs @@ -62,7 +62,7 @@ {{t 'resources.role.principal.messages.welcome.description'}} - + {{t 'resources.role.principal.actions.add-principals'}} diff --git a/ui/admin/app/templates/scopes/scope/scopes/index.hbs b/ui/admin/app/templates/scopes/scope/scopes/index.hbs index c4fce49b5..542404b4e 100644 --- a/ui/admin/app/templates/scopes/scope/scopes/index.hbs +++ b/ui/admin/app/templates/scopes/scope/scopes/index.hbs @@ -62,7 +62,7 @@ {{t 'resources.org.description'}} - + {{t 'titles.new'}} @@ -79,7 +79,7 @@ {{t 'resources.project.description'}} - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/targets/index.hbs b/ui/admin/app/templates/scopes/scope/targets/index.hbs index f8dcec9b4..a3cf56314 100644 --- a/ui/admin/app/templates/scopes/scope/targets/index.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/index.hbs @@ -82,7 +82,7 @@ {{t 'resources.target.description'}} - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/targets/target/credential-libraries.hbs b/ui/admin/app/templates/scopes/scope/targets/target/credential-libraries.hbs index 38b00b4c0..b62c5d4d2 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/credential-libraries.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/credential-libraries.hbs @@ -82,7 +82,7 @@ - + {{t 'resources.target.actions.add-credential-libraries'}} diff --git a/ui/admin/app/templates/scopes/scope/targets/target/host-sets.hbs b/ui/admin/app/templates/scopes/scope/targets/target/host-sets.hbs index d013f5fd9..5f0f96421 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/host-sets.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/host-sets.hbs @@ -68,7 +68,7 @@ {{t 'resources.target.host-set.messages.welcome.description'}} - + {{t 'resources.target.actions.add-host-sets'}} diff --git a/ui/admin/app/templates/scopes/scope/users/index.hbs b/ui/admin/app/templates/scopes/scope/users/index.hbs index ab31bc1cf..b282a6993 100644 --- a/ui/admin/app/templates/scopes/scope/users/index.hbs +++ b/ui/admin/app/templates/scopes/scope/users/index.hbs @@ -71,7 +71,7 @@ {{t 'resources.user.description'}} - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/users/user/accounts.hbs b/ui/admin/app/templates/scopes/scope/users/user/accounts.hbs index 1ab874bcd..ec8d3704e 100644 --- a/ui/admin/app/templates/scopes/scope/users/user/accounts.hbs +++ b/ui/admin/app/templates/scopes/scope/users/user/accounts.hbs @@ -68,7 +68,7 @@ {{t 'resources.user.messages.accounts.description'}} - + {{t 'resources.user.actions.add-accounts'}} diff --git a/ui/desktop/app/components/hidden-secret/index.hbs b/ui/desktop/app/components/hidden-secret/index.hbs index 6660a77e5..afca5e4d3 100644 --- a/ui/desktop/app/components/hidden-secret/index.hbs +++ b/ui/desktop/app/components/hidden-secret/index.hbs @@ -1,7 +1,7 @@
{{t 'actions.toggle-secret'}} diff --git a/yarn.lock b/yarn.lock index d398e26ee..d35304465 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2066,11 +2066,6 @@ resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-1.1.0.tgz#d6dbc7574774b238114582410e8fee0dc3532bdf" integrity sha512-rR7tJoSwJ2eooOpYGxGGW95sLq6GXUaS1UtWvN7pei6n2/okYvCGld9vsUTvkl2migxbkszsycwtMf/GEc1k1A== -"@hashicorp/structure-icons@^1.9.0-0": - version "1.9.2" - resolved "https://registry.yarnpkg.com/@hashicorp/structure-icons/-/structure-icons-1.9.2.tgz#c75f955b2eec414ecb92f3926c79b4ca01731d3c" - integrity sha512-AffJv0V9npr1EWlM1XrpaKPG9PzddV48OE+jspqy7aRoFZB5++oNnPx4MZQKmFInOljnzNwfktVRkJiQHy7haw== - "@humanwhocodes/config-array@^0.5.0": version "0.5.0" resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9" From bdb38a5324677fdc3c3a42510791d6bc021d71b7 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Fri, 20 Aug 2021 13:51:45 -0400 Subject: [PATCH 13/25] =?UTF-8?q?chore:=20=F0=9F=A4=96=20upgrade=20to=20ch?= =?UTF-8?q?evron-left=20from=20flight?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/rose/addon/components/rose/message/index.stories.mdx | 4 ++-- addons/rose/public/chevron-left.svg | 3 --- addons/rose/public/chevron-right.svg | 3 --- addons/rose/public/flight/chevron-left-16.svg | 4 ++-- .../rose/tests/integration/components/rose/button-test.js | 6 +++--- .../integration/components/rose/dropdown/button-test.js | 4 +++- .../tests/integration/components/rose/link-button-test.js | 2 +- ui/admin/app/components/form/group/add-members/index.hbs | 2 +- ui/admin/app/components/form/host-set/add-hosts/index.hbs | 2 +- ui/admin/app/components/form/role/add-principals/index.hbs | 2 +- .../form/target/add-credential-libraries/index.hbs | 2 +- ui/admin/app/components/form/target/add-host-sets/index.hbs | 2 +- ui/admin/app/components/form/user/add-accounts/index.hbs | 2 +- .../scope/targets/target/add-credential-libraries.hbs | 2 +- .../templates/scopes/scope/targets/target/add-host-sets.hbs | 2 +- .../app/templates/scopes/scope/users/user/add-accounts.hbs | 2 +- 16 files changed, 20 insertions(+), 24 deletions(-) delete mode 100644 addons/rose/public/chevron-left.svg delete mode 100644 addons/rose/public/chevron-right.svg diff --git a/addons/rose/addon/components/rose/message/index.stories.mdx b/addons/rose/addon/components/rose/message/index.stories.mdx index c11095d2a..60fa1b9f0 100644 --- a/addons/rose/addon/components/rose/message/index.stories.mdx +++ b/addons/rose/addon/components/rose/message/index.stories.mdx @@ -18,7 +18,7 @@ Title can be configured with optional icon and subtitle. {{description}} - + Go back @@ -49,7 +49,7 @@ Title can be configured with optional icon and subtitle. if you think you should have access. - + Go back Need help? diff --git a/addons/rose/public/chevron-left.svg b/addons/rose/public/chevron-left.svg deleted file mode 100644 index 6b6f3a0ea..000000000 --- a/addons/rose/public/chevron-left.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/addons/rose/public/chevron-right.svg b/addons/rose/public/chevron-right.svg deleted file mode 100644 index be0fbc667..000000000 --- a/addons/rose/public/chevron-right.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/addons/rose/public/flight/chevron-left-16.svg b/addons/rose/public/flight/chevron-left-16.svg index 62fda4d33..eeb214c72 100644 --- a/addons/rose/public/flight/chevron-left-16.svg +++ b/addons/rose/public/flight/chevron-left-16.svg @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/addons/rose/tests/integration/components/rose/button-test.js b/addons/rose/tests/integration/components/rose/button-test.js index d313e9b0a..f41d8b686 100644 --- a/addons/rose/tests/integration/components/rose/button-test.js +++ b/addons/rose/tests/integration/components/rose/button-test.js @@ -34,14 +34,14 @@ module('Integration | Component | rose/button', function (hooks) { }); test('it supports left and right icons', async function (assert) { - await render(hbs``); + await render(hbs``); assert.ok(find('.has-icon-left .rose-icon')); - await render(hbs``); + await render(hbs``); assert.ok(find('.has-icon-right .rose-icon')); }); test('it supports an icon-only type', async function (assert) { - await render(hbs``); + await render(hbs``); assert.ok(find('.has-icon-only .rose-icon')); }); }); diff --git a/addons/rose/tests/integration/components/rose/dropdown/button-test.js b/addons/rose/tests/integration/components/rose/dropdown/button-test.js index 971e378d6..11ef9ed53 100644 --- a/addons/rose/tests/integration/components/rose/dropdown/button-test.js +++ b/addons/rose/tests/integration/components/rose/dropdown/button-test.js @@ -32,7 +32,9 @@ module('Integration | Component | rose/dropdown/button', function (hooks) { }); test('it supports an icon-only type', async function (assert) { - await render(hbs``); + await render( + hbs`` + ); assert.ok(find('.has-icon-only .rose-icon')); }); }); diff --git a/addons/rose/tests/integration/components/rose/link-button-test.js b/addons/rose/tests/integration/components/rose/link-button-test.js index 0312d94ea..49ba9d843 100644 --- a/addons/rose/tests/integration/components/rose/link-button-test.js +++ b/addons/rose/tests/integration/components/rose/link-button-test.js @@ -35,7 +35,7 @@ module('Integration | Component | rose/link-button', function (hooks) { test('it supports left icon with @iconLeft', async function (assert) { await render( - hbs`` + hbs`` ); assert.ok(find('.rose-icon')); assert.ok(find('.has-icon-left')); diff --git a/ui/admin/app/components/form/group/add-members/index.hbs b/ui/admin/app/components/form/group/add-members/index.hbs index 341d0e03f..e4321b138 100644 --- a/ui/admin/app/components/form/group/add-members/index.hbs +++ b/ui/admin/app/components/form/group/add-members/index.hbs @@ -49,7 +49,7 @@ {{t 'resources.group.messages.no-members.description'}} - + {{t 'actions.back'}} diff --git a/ui/admin/app/components/form/host-set/add-hosts/index.hbs b/ui/admin/app/components/form/host-set/add-hosts/index.hbs index 7c851e376..7cb2fb625 100644 --- a/ui/admin/app/components/form/host-set/add-hosts/index.hbs +++ b/ui/admin/app/components/form/host-set/add-hosts/index.hbs @@ -55,7 +55,7 @@ - + {{t 'actions.back'}} diff --git a/ui/admin/app/components/form/role/add-principals/index.hbs b/ui/admin/app/components/form/role/add-principals/index.hbs index dc6ad4f5a..eeb567f68 100644 --- a/ui/admin/app/components/form/role/add-principals/index.hbs +++ b/ui/admin/app/components/form/role/add-principals/index.hbs @@ -58,7 +58,7 @@ {{t 'resources.role.principal.messages.none.description'}} - + {{t 'actions.back'}} diff --git a/ui/admin/app/components/form/target/add-credential-libraries/index.hbs b/ui/admin/app/components/form/target/add-credential-libraries/index.hbs index f7f05cf42..a99390058 100644 --- a/ui/admin/app/components/form/target/add-credential-libraries/index.hbs +++ b/ui/admin/app/components/form/target/add-credential-libraries/index.hbs @@ -55,7 +55,7 @@ {{t 'resources.target.credential-library.messages.none.description'}} - + {{t 'actions.back'}} diff --git a/ui/admin/app/components/form/target/add-host-sets/index.hbs b/ui/admin/app/components/form/target/add-host-sets/index.hbs index 0ad80f766..238ab3e42 100644 --- a/ui/admin/app/components/form/target/add-host-sets/index.hbs +++ b/ui/admin/app/components/form/target/add-host-sets/index.hbs @@ -59,7 +59,7 @@ {{t 'resources.target.host-set.messages.none.description'}} - + {{t 'actions.back'}} diff --git a/ui/admin/app/components/form/user/add-accounts/index.hbs b/ui/admin/app/components/form/user/add-accounts/index.hbs index ac93847f7..afb2c43f8 100644 --- a/ui/admin/app/components/form/user/add-accounts/index.hbs +++ b/ui/admin/app/components/form/user/add-accounts/index.hbs @@ -59,7 +59,7 @@ {{t 'resources.user.messages.no-accounts.description'}} - + {{t 'actions.back'}} diff --git a/ui/admin/app/templates/scopes/scope/targets/target/add-credential-libraries.hbs b/ui/admin/app/templates/scopes/scope/targets/target/add-credential-libraries.hbs index e4573894c..59a046f11 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/add-credential-libraries.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/add-credential-libraries.hbs @@ -19,7 +19,7 @@ {{t 'resources.target.credential-library.messages.none.description'}} - + {{t 'actions.back'}} diff --git a/ui/admin/app/templates/scopes/scope/targets/target/add-host-sets.hbs b/ui/admin/app/templates/scopes/scope/targets/target/add-host-sets.hbs index ddf08b109..d49f9f75e 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/add-host-sets.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/add-host-sets.hbs @@ -20,7 +20,7 @@ {{t 'resources.target.host-set.messages.none.description'}} - + {{t 'actions.back'}} diff --git a/ui/admin/app/templates/scopes/scope/users/user/add-accounts.hbs b/ui/admin/app/templates/scopes/scope/users/user/add-accounts.hbs index 5d79b28c8..418f49822 100644 --- a/ui/admin/app/templates/scopes/scope/users/user/add-accounts.hbs +++ b/ui/admin/app/templates/scopes/scope/users/user/add-accounts.hbs @@ -20,7 +20,7 @@ {{t 'resources.user.messages.no-accounts.description'}} - + {{t 'actions.back'}} From 1165d21ef66ea7b8dbe701e0d04d539d41f10c95 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 25 Aug 2021 10:52:20 -0400 Subject: [PATCH 14/25] =?UTF-8?q?chore:=20=F0=9F=A4=96=20consume=20flight?= =?UTF-8?q?=20icons=20from=20npm=20package?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/addon/components/doc-link/index.hbs | 2 +- .../addon/components/error/message/index.js | 4 +-- addons/core/index.js | 2 -- .../components/rose/badge/index.stories.mdx | 8 ++--- .../components/rose/button/index.stories.mdx | 20 +++++------ .../rose/card/link/index.stories.mdx | 6 ++-- .../components/rose/cards/index.stories.mdx | 14 ++++---- .../addon/components/rose/dialog/index.hbs | 4 +-- .../components/rose/dialog/index.stories.mdx | 8 ++--- .../rose/dropdown/index.stories.mdx | 6 ++-- .../rose/form/errors/message/index.hbs | 2 +- .../rose/form/radio/group/index.stories.mdx | 6 ++-- .../rose/form/radio/radio/index.stories.mdx | 8 ++--- .../components/rose/header/index.stories.mdx | 10 +++--- .../components/rose/icon/index.stories.mdx | 6 ++-- .../rose/link-button/index.stories.mdx | 22 ++++++------- .../rose/list/key-value/index.stories.mdx | 4 +-- .../components/rose/message/index.stories.mdx | 12 +++---- .../components/rose/notification/index.hbs | 2 +- .../components/rose/notification/index.js | 8 ++--- .../components/rose/table/index.stories.mdx | 2 +- addons/rose/index.js | 21 ++++++++++++ addons/rose/package.json | 1 + addons/rose/public/flight/alert-circle-16.svg | 7 ---- .../rose/public/flight/alert-triangle-16.svg | 7 ---- .../public/flight/arrow-right-circle-16.svg | 6 ---- addons/rose/public/flight/check-circle-16.svg | 6 ---- addons/rose/public/flight/chevron-left-16.svg | 5 --- .../public/flight/clipboard-checked-16.svg | 5 --- .../rose/public/flight/clipboard-copy-16.svg | 9 ----- addons/rose/public/flight/collections-16.svg | 7 ---- addons/rose/public/flight/crosshair-16.svg | 5 --- addons/rose/public/flight/eye-16.svg | 6 ---- addons/rose/public/flight/eye-off-16.svg | 6 ---- addons/rose/public/flight/folder-users-16.svg | 9 ----- addons/rose/public/flight/globe-16.svg | 5 --- addons/rose/public/flight/grid-16.svg | 8 ----- addons/rose/public/flight/help-16.svg | 7 ---- .../rose/public/flight/identity-user-16.svg | 7 ---- addons/rose/public/flight/info-16.svg | 7 ---- addons/rose/public/flight/key-16.svg | 6 ---- addons/rose/public/flight/lock-16.svg | 6 ---- .../rose/public/flight/more-horizontal-16.svg | 7 ---- addons/rose/public/flight/org-16.svg | 12 ------- addons/rose/public/flight/plus-circle-16.svg | 6 ---- addons/rose/public/flight/trash-16.svg | 7 ---- addons/rose/public/flight/user-circle-16.svg | 6 ---- addons/rose/public/flight/users-16.svg | 8 ----- addons/rose/public/flight/x-16.svg | 5 --- addons/rose/public/flight/x-circle-16.svg | 6 ---- addons/rose/public/flight/x-square-16.svg | 6 ---- .../tests/dummy/app/templates/playground.hbs | 4 +-- .../integration/components/rose/badge-test.js | 4 ++- .../components/rose/button-test.js | 12 +++++-- .../components/rose/card/link-test.js | 2 +- .../components/rose/dropdown-test.js | 2 +- .../components/rose/dropdown/button-test.js | 2 +- .../components/rose/form/radio/radio-test.js | 2 +- .../integration/components/rose/icon-test.js | 6 ++-- .../components/rose/link-button-test.js | 6 ++-- ui/admin/app/components/copyable/index.js | 4 +-- .../form/auth-method/oidc/index.hbs | 10 +++--- .../form/group/add-members/index.hbs | 2 +- .../form/host-set/add-hosts/index.hbs | 2 +- .../form/role/add-principals/index.hbs | 2 +- .../app/components/form/role/grants/index.hbs | 2 +- ui/admin/app/components/form/role/index.hbs | 8 +++-- .../target/add-credential-libraries/index.hbs | 2 +- .../form/target/add-host-sets/index.hbs | 2 +- .../form/user/add-accounts/index.hbs | 2 +- ui/admin/app/templates/application.hbs | 6 ++-- ui/admin/app/templates/scopes/index.hbs | 2 +- ui/admin/app/templates/scopes/scope.hbs | 33 ++++++++++--------- .../templates/scopes/scope/-header-nav.hbs | 6 ++-- .../app/templates/scopes/scope/-sidebar.hbs | 8 ++--- .../auth-methods/auth-method/-actions.hbs | 6 ++-- .../auth-method/accounts/index.hbs | 2 +- .../scopes/scope/auth-methods/index.hbs | 4 +-- .../templates/scopes/scope/authenticate.hbs | 4 +-- .../scopes/scope/authenticate/index.hbs | 2 +- .../credential-libraries/index.hbs | 2 +- .../scopes/scope/credential-stores/index.hbs | 2 +- .../scopes/scope/groups/group/members.hbs | 4 +-- .../templates/scopes/scope/groups/index.hbs | 2 +- .../host-catalog/host-sets/host-set/hosts.hbs | 4 +-- .../host-catalog/host-sets/index.hbs | 2 +- .../host-catalog/hosts/index.hbs | 2 +- .../scopes/scope/host-catalogs/index.hbs | 2 +- .../templates/scopes/scope/roles/index.hbs | 2 +- .../scopes/scope/roles/role/principals.hbs | 4 +-- .../templates/scopes/scope/scopes/index.hbs | 10 ++++-- .../templates/scopes/scope/sessions/index.hbs | 2 +- .../templates/scopes/scope/targets/index.hbs | 2 +- .../target/add-credential-libraries.hbs | 2 +- .../scope/targets/target/add-host-sets.hbs | 2 +- .../targets/target/credential-libraries.hbs | 4 +-- .../scopes/scope/targets/target/host-sets.hbs | 4 +-- .../templates/scopes/scope/users/index.hbs | 2 +- .../scopes/scope/users/user/accounts.hbs | 4 +-- .../scopes/scope/users/user/add-accounts.hbs | 2 +- ui/admin/ember-cli-build.js | 2 +- ui/desktop/app/components/copyable/index.js | 4 +-- .../app/components/hidden-secret/index.hbs | 6 +++- ui/desktop/app/templates/application.hbs | 8 ++--- .../templates/scopes/scope/-header-nav.hbs | 4 +-- .../templates/scopes/scope/authenticate.hbs | 4 +-- .../scopes/scope/authenticate/index.hbs | 2 +- .../app/templates/scopes/scope/projects.hbs | 4 +-- .../scopes/scope/projects/sessions/index.hbs | 2 +- .../scopes/scope/projects/targets.hbs | 2 +- .../projects/targets/target/sessions.hbs | 2 +- ui/desktop/ember-cli-build.js | 2 +- .../tests/integration/components/card-test.js | 2 +- yarn.lock | 5 +++ 114 files changed, 244 insertions(+), 379 deletions(-) delete mode 100644 addons/rose/public/flight/alert-circle-16.svg delete mode 100644 addons/rose/public/flight/alert-triangle-16.svg delete mode 100644 addons/rose/public/flight/arrow-right-circle-16.svg delete mode 100644 addons/rose/public/flight/check-circle-16.svg delete mode 100644 addons/rose/public/flight/chevron-left-16.svg delete mode 100644 addons/rose/public/flight/clipboard-checked-16.svg delete mode 100644 addons/rose/public/flight/clipboard-copy-16.svg delete mode 100644 addons/rose/public/flight/collections-16.svg delete mode 100644 addons/rose/public/flight/crosshair-16.svg delete mode 100644 addons/rose/public/flight/eye-16.svg delete mode 100644 addons/rose/public/flight/eye-off-16.svg delete mode 100644 addons/rose/public/flight/folder-users-16.svg delete mode 100644 addons/rose/public/flight/globe-16.svg delete mode 100644 addons/rose/public/flight/grid-16.svg delete mode 100644 addons/rose/public/flight/help-16.svg delete mode 100644 addons/rose/public/flight/identity-user-16.svg delete mode 100644 addons/rose/public/flight/info-16.svg delete mode 100644 addons/rose/public/flight/key-16.svg delete mode 100644 addons/rose/public/flight/lock-16.svg delete mode 100644 addons/rose/public/flight/more-horizontal-16.svg delete mode 100644 addons/rose/public/flight/org-16.svg delete mode 100644 addons/rose/public/flight/plus-circle-16.svg delete mode 100644 addons/rose/public/flight/trash-16.svg delete mode 100644 addons/rose/public/flight/user-circle-16.svg delete mode 100644 addons/rose/public/flight/users-16.svg delete mode 100644 addons/rose/public/flight/x-16.svg delete mode 100644 addons/rose/public/flight/x-circle-16.svg delete mode 100644 addons/rose/public/flight/x-square-16.svg diff --git a/addons/core/addon/components/doc-link/index.hbs b/addons/core/addon/components/doc-link/index.hbs index c7b7e1a8e..67a788936 100644 --- a/addons/core/addon/components/doc-link/index.hbs +++ b/addons/core/addon/components/doc-link/index.hbs @@ -4,5 +4,5 @@ target="_blank" rel="noreferrer noopener" title={{t "actions.get-topic-help"}}> - + diff --git a/addons/core/addon/components/error/message/index.js b/addons/core/addon/components/error/message/index.js index f121d7d7b..9d9e435db 100644 --- a/addons/core/addon/components/error/message/index.js +++ b/addons/core/addon/components/error/message/index.js @@ -28,11 +28,11 @@ export default class ErrorMessageComponent extends MessageComponent { get icon() { switch (this.args.status) { case '404': - return 'flight/help-16'; + return 'flight-icons/help-16'; case '401': case '403': default: - return 'flight/alert-circle-16'; + return 'flight-icons/alert-circle-16'; } } diff --git a/addons/core/index.js b/addons/core/index.js index f1a668631..3646d4641 100644 --- a/addons/core/index.js +++ b/addons/core/index.js @@ -16,14 +16,12 @@ module.exports = { */ includePublic(app) { const publicPath = path.resolve('public'); - const rosePublicPath = path.resolve('../rose/public'); const dummyPublicPath = path.resolve('tests/dummy/public'); app.options.svg = app.options.svg || {}; app.options.svg.paths = app.options.svg.paths || []; app.options.svg.paths.push(publicPath); - app.options.svg.paths.push(rosePublicPath); if (this.isDevelopingAddon()) app.options.svg.paths.push(dummyPublicPath); this.addons.forEach((addon) => { diff --git a/addons/rose/addon/components/rose/badge/index.stories.mdx b/addons/rose/addon/components/rose/badge/index.stories.mdx index 1d65b3d0a..d109810c6 100644 --- a/addons/rose/addon/components/rose/badge/index.stories.mdx +++ b/addons/rose/addon/components/rose/badge/index.stories.mdx @@ -13,7 +13,7 @@ When style definition isn't supplied, a default style will be supplied. Styles: outline, dark, informational, informational-outline, success, success-outline, error, error-outline, warning, warning-outline, alert, alert-outline ```html -Badge +Badge ``` @@ -43,9 +43,9 @@ Styles: outline, dark, informational, informational-outline, success, success-ou 'none' ), icon: select('icon', { - 'flight/org-16': 'flight/org-16', + 'flight-icons/org-16': 'flight-icons/org-16', }, - 'flight/org-16' + 'flight-icons/org-16' ), } }} @@ -56,7 +56,7 @@ Styles: outline, dark, informational, informational-outline, success, success-ou template: hbs` default style outline - default style with icon + default style with icon dark informational informational-outline diff --git a/addons/rose/addon/components/rose/button/index.stories.mdx b/addons/rose/addon/components/rose/button/index.stories.mdx index 76010a51c..3b2841c8a 100644 --- a/addons/rose/addon/components/rose/button/index.stories.mdx +++ b/addons/rose/addon/components/rose/button/index.stories.mdx @@ -12,7 +12,7 @@ to trigger actions or to submit forms. Avoid using buttons as simple links to other routes. For accessibility, use links instead. ```htmlbars - + Action ``` @@ -49,18 +49,18 @@ other routes. For accessibility, use links instead. iconLeft: select( 'iconLeft', { - 'flight/check-circle-16': 'flight/check-circle-16', - 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', + 'flight-icons/check-circle-16': 'flight-icons/check-circle-16', + 'flight-icons/clipboard-copy-16': 'flight-icons/clipboard-copy-16', }, - 'flight/check-circle-16' + 'flight-icons/check-circle-16' ), iconRight: select( 'iconRight', { - 'flight/check-circle-16': 'flight/check-circle-16', - 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', + 'flight-icons/check-circle-16': 'flight-icons/check-circle-16', + 'flight-icons/clipboard-copy-16': 'flight-icons/clipboard-copy-16', }, - 'flight/clipboard-copy-16' + 'flight-icons/clipboard-copy-16' ), onClick: action('clicked'), }, @@ -81,10 +81,10 @@ button in this case for accessibility. iconOnly: select( 'iconOnly', { - 'flight/check-circle-16': 'flight/check-circle-16', - 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', + 'flight-icons/check-circle-16': 'flight-icons/check-circle-16', + 'flight-icons/clipboard-copy-16': 'flight-icons/clipboard-copy-16', }, - 'flight/check-circle-16' + 'flight-icons/check-circle-16' ), }, }} diff --git a/addons/rose/addon/components/rose/card/link/index.stories.mdx b/addons/rose/addon/components/rose/card/link/index.stories.mdx index 8aaf7e693..eaaa20293 100644 --- a/addons/rose/addon/components/rose/card/link/index.stories.mdx +++ b/addons/rose/addon/components/rose/card/link/index.stories.mdx @@ -13,7 +13,7 @@ Card link component wraps content with `LinkTo` component. Supports title and de @title='Card title' @description='Card description' @id='resource_id_1234' - @icon='flight/org-16' + @icon='flight-icons/org-16' @route='about'/> ``` @@ -32,9 +32,9 @@ Card link component wraps content with `LinkTo` component. Supports title and de description: text('description', 'Card description'), id: text('id', 'resource_id_1234'), icon: select('icon', { - 'flight/org-16': 'flight/org-16', + 'flight-icons/org-16': 'flight-icons/org-16', }, - 'flight/org-16' + 'flight-icons/org-16' ), }, }} diff --git a/addons/rose/addon/components/rose/cards/index.stories.mdx b/addons/rose/addon/components/rose/cards/index.stories.mdx index 72c503e85..bb2471b84 100644 --- a/addons/rose/addon/components/rose/cards/index.stories.mdx +++ b/addons/rose/addon/components/rose/cards/index.stories.mdx @@ -18,35 +18,35 @@ A set of cards arranged side-by-side. @title="Card Title" @description="Description" @id="resource_id_1234" - @icon="flight/org-16" + @icon="flight-icons/org-16" /> `, @@ -62,14 +62,14 @@ A set of cards arranged side-by-side. @title="Card Title" @description="Description" @id="resource_id_1234" - @icon="flight/org-16" + @icon="flight-icons/org-16" /> ``` diff --git a/addons/rose/addon/components/rose/dialog/index.hbs b/addons/rose/addon/components/rose/dialog/index.hbs index 7876f5349..4f762c6bc 100644 --- a/addons/rose/addon/components/rose/dialog/index.hbs +++ b/addons/rose/addon/components/rose/dialog/index.hbs @@ -27,7 +27,7 @@ title={{@dismissButtonText}} {{on "click" (fn this.dismiss @dismiss)}} > - + @@ -62,7 +62,7 @@ title={{@dismissButtonText}} {{on "click" (fn this.dismiss @dismiss)}} > - + diff --git a/addons/rose/addon/components/rose/dialog/index.stories.mdx b/addons/rose/addon/components/rose/dialog/index.stories.mdx index 0315a3c87..d5d05be52 100644 --- a/addons/rose/addon/components/rose/dialog/index.stories.mdx +++ b/addons/rose/addon/components/rose/dialog/index.stories.mdx @@ -36,10 +36,10 @@ A dialog component with optional modal capabilities. icon: select( 'icon', { - 'flight/check-circle-16': 'flight/check-circle-16', - 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', + 'flight-icons/check-circle-16': 'flight-icons/check-circle-16', + 'flight-icons/clipboard-copy-16': 'flight-icons/clipboard-copy-16', }, - 'flight/check-circle-16' + 'flight-icons/check-circle-16' ), style: select( 'style', @@ -58,7 +58,7 @@ A dialog component with optional modal capabilities. diff --git a/addons/rose/addon/components/rose/dropdown/index.stories.mdx b/addons/rose/addon/components/rose/dropdown/index.stories.mdx index 8ac807a63..fae413044 100644 --- a/addons/rose/addon/components/rose/dropdown/index.stories.mdx +++ b/addons/rose/addon/components/rose/dropdown/index.stories.mdx @@ -11,7 +11,7 @@ A simple dropdown component with support for links and buttons. {{ template: hbs` - + Menu item Menu item @@ -31,7 +31,7 @@ A simple dropdown component with support for links and buttons. {{ template: hbs` - + Menu item Menu item @@ -117,7 +117,7 @@ Dropdown supports `danger` styling through `style` attribute. Dropdown indicator can be hidden using `showCaret` attribute. ```html - + Menu item Button menu item diff --git a/addons/rose/addon/components/rose/form/errors/message/index.hbs b/addons/rose/addon/components/rose/form/errors/message/index.hbs index 443829171..eb2246b04 100644 --- a/addons/rose/addon/components/rose/form/errors/message/index.hbs +++ b/addons/rose/addon/components/rose/form/errors/message/index.hbs @@ -1,4 +1,4 @@

- + {{yield}}

diff --git a/addons/rose/addon/components/rose/form/radio/group/index.stories.mdx b/addons/rose/addon/components/rose/form/radio/group/index.stories.mdx index be4aa2b3f..026b9526c 100644 --- a/addons/rose/addon/components/rose/form/radio/group/index.stories.mdx +++ b/addons/rose/addon/components/rose/form/radio/group/index.stories.mdx @@ -68,10 +68,10 @@ Renders a form radiofield group. firstFieldIcon: select( 'first icon', { - 'flight/org-16': 'flight/org-16', - 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', + 'flight-icons/org-16': 'flight-icons/org-16', + 'flight-icons/clipboard-copy-16': 'flight-icons/clipboard-copy-16', }, - 'flight/org-16' + 'flight-icons/org-16' ), secondFieldLabel: text('second label', 'Maybe'), secondFieldValue: text('second value', 'maybe'), diff --git a/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx b/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx index e2f15d63a..a5540499b 100644 --- a/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx +++ b/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx @@ -44,8 +44,8 @@ Renders a form radiofield. 'icon', { 'none': null, - 'flight/org-16': 'flight/org-16', - 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', + 'flight-icons/org-16': 'flight-icons/org-16', + 'flight-icons/clipboard-copy-16': 'flight-icons/clipboard-copy-16', }, null ), @@ -109,8 +109,8 @@ Renders a form radiofield. 'icon', { 'none': null, - 'flight/org-16': 'flight/org-16', - 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', + 'flight-icons/org-16': 'flight-icons/org-16', + 'flight-icons/clipboard-copy-16': 'flight-icons/clipboard-copy-16', }, null ), diff --git a/addons/rose/addon/components/rose/header/index.stories.mdx b/addons/rose/addon/components/rose/header/index.stories.mdx index be894c503..e1990b552 100644 --- a/addons/rose/addon/components/rose/header/index.stories.mdx +++ b/addons/rose/addon/components/rose/header/index.stories.mdx @@ -27,7 +27,7 @@ A header component that allows three distinct sections to be configured: brand, Menu item Menu item @@ -69,11 +69,11 @@ A header component that allows three distinct sections to be configured: brand, dropdownIcon: select( 'dropdownIcon', { - 'flight/user-circle-16': 'flight/user-circle-16', - 'flight/check-circle-16': 'flight/check-circle-16', - 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', + 'flight-icons/user-circle-16': 'flight-icons/user-circle-16', + 'flight-icons/check-circle-16': 'flight-icons/check-circle-16', + 'flight-icons/clipboard-copy-16': 'flight-icons/clipboard-copy-16', }, - 'flight/user-circle-16' + 'flight-icons/user-circle-16' ), }, }} diff --git a/addons/rose/addon/components/rose/icon/index.stories.mdx b/addons/rose/addon/components/rose/icon/index.stories.mdx index d22b1bcac..946b7d1cf 100644 --- a/addons/rose/addon/components/rose/icon/index.stories.mdx +++ b/addons/rose/addon/components/rose/icon/index.stories.mdx @@ -22,10 +22,10 @@ Renders a simple icon. name: select( 'name', { - 'flight/check-circle-16': 'flight/check-circle-16', - 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', + 'flight-icons/check-circle-16': 'flight-icons/check-circle-16', + 'flight-icons/clipboard-copy-16': 'flight-icons/clipboard-copy-16', }, - 'flight/check-circle-16' + 'flight-icons/check-circle-16' ), } }} diff --git a/addons/rose/addon/components/rose/link-button/index.stories.mdx b/addons/rose/addon/components/rose/link-button/index.stories.mdx index 9f8831694..a5cc19106 100644 --- a/addons/rose/addon/components/rose/link-button/index.stories.mdx +++ b/addons/rose/addon/components/rose/link-button/index.stories.mdx @@ -12,7 +12,7 @@ Styles supported: primary, secondary, warning, and ghost. Disabling link button is not supported as it is an action on form components only. ```html - + Content ``` @@ -45,18 +45,18 @@ Disabling link button is not supported as it is an action on form components onl iconLeft: select( 'iconLeft', { - 'flight/check-circle-16': 'flight/check-circle-16', - 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', + 'flight-icons/check-circle-16': 'flight-icons/check-circle-16', + 'flight-icons/clipboard-copy-16': 'flight-icons/clipboard-copy-16', }, - 'flight/clipboard-copy-16' + 'flight-icons/clipboard-copy-16' ), iconRight: select( 'iconRight', { - 'flight/check-circle-16': 'flight/check-circle-16', - 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', + 'flight-icons/check-circle-16': 'flight-icons/check-circle-16', + 'flight-icons/clipboard-copy-16': 'flight-icons/clipboard-copy-16', }, - 'flight/clipboard-copy-16' + 'flight-icons/clipboard-copy-16' ), }, }} @@ -65,7 +65,7 @@ Disabling link button is not supported as it is an action on form components onl Similar to `Rose::Button`, icon only link button is supported. ```html - + ``` @@ -88,10 +88,10 @@ Similar to `Rose::Button`, icon only link button is supported. iconOnly: select( 'iconOnly', { - 'flight/check-circle-16': 'flight/check-circle-16', - 'flight/help-16': 'flight/help-16', + 'flight-icons/check-circle-16': 'flight-icons/check-circle-16', + 'flight-icons/help-16': 'flight-icons/help-16', }, - 'flight/help-16' + 'flight-icons/help-16' ), }, }} diff --git a/addons/rose/addon/components/rose/list/key-value/index.stories.mdx b/addons/rose/addon/components/rose/list/key-value/index.stories.mdx index cded0db99..74d65375f 100644 --- a/addons/rose/addon/components/rose/list/key-value/index.stories.mdx +++ b/addons/rose/addon/components/rose/list/key-value/index.stories.mdx @@ -46,7 +46,7 @@ A simple key/value list with support for embedded form fields and buttons. - Remove + Remove @@ -94,7 +94,7 @@ A simple key/value list with support for embedded form fields and buttons. - Remove + Remove diff --git a/addons/rose/addon/components/rose/message/index.stories.mdx b/addons/rose/addon/components/rose/message/index.stories.mdx index 60fa1b9f0..aeb5e042b 100644 --- a/addons/rose/addon/components/rose/message/index.stories.mdx +++ b/addons/rose/addon/components/rose/message/index.stories.mdx @@ -18,7 +18,7 @@ Title can be configured with optional icon and subtitle. {{description}} - + Go back @@ -33,23 +33,23 @@ Title can be configured with optional icon and subtitle. icon: select( 'icon', { - 'flight/alert-circle-16': 'flight/alert-circle-16', - 'flight/help-16': 'flight/help-16', + 'flight-icons/alert-circle-16': 'flight-icons/alert-circle-16', + 'flight-icons/help-16': 'flight-icons/help-16', }, - 'flight/help-16' + 'flight-icons/help-16' ), }, }} ```html - + You must be granted permissions to view this data. Ask your administrator if you think you should have access. - + Go back Need help? diff --git a/addons/rose/addon/components/rose/notification/index.hbs b/addons/rose/addon/components/rose/notification/index.hbs index 3d9290695..fc0acf33f 100644 --- a/addons/rose/addon/components/rose/notification/index.hbs +++ b/addons/rose/addon/components/rose/notification/index.hbs @@ -26,7 +26,7 @@ {{on "click" @dismiss}} > {{@dismissText}} diff --git a/addons/rose/addon/components/rose/notification/index.js b/addons/rose/addon/components/rose/notification/index.js index c3c23b44b..b036bec5d 100644 --- a/addons/rose/addon/components/rose/notification/index.js +++ b/addons/rose/addon/components/rose/notification/index.js @@ -8,17 +8,17 @@ export default class RoseNotificationComponent extends Component { */ @computed('style') get icon() { - let icon = 'flight/info-16'; + let icon = 'flight-icons/info-16'; switch (this.style) { case 'error': - icon = 'flight/x-square-16'; + icon = 'flight-icons/x-square-16'; break; case 'success': - icon = 'flight/check-circle-16'; + icon = 'flight-icons/check-circle-16'; break; case 'warning': - icon = 'flight/alert-triangle-16'; + icon = 'flight-icons/alert-triangle-16'; break; } diff --git a/addons/rose/addon/components/rose/table/index.stories.mdx b/addons/rose/addon/components/rose/table/index.stories.mdx index 0b786556a..2b56d4242 100644 --- a/addons/rose/addon/components/rose/table/index.stories.mdx +++ b/addons/rose/addon/components/rose/table/index.stories.mdx @@ -122,7 +122,7 @@ Cell shrink should be applied to all the cells in a row. Otherwise the bigger ce - Remove + Remove diff --git a/addons/rose/index.js b/addons/rose/index.js index 4da13fee7..ebc5a2673 100644 --- a/addons/rose/index.js +++ b/addons/rose/index.js @@ -10,6 +10,7 @@ module.exports = { this._super.included.apply(this, arguments); this.includeStyles(app); + this.includeFlightIcons(app); this.includePublic(app); this.setupSVGO(app); }, @@ -40,6 +41,26 @@ module.exports = { app.options.sassOptions.includePaths.push(styleTree); }, + /** + * Finds the structure-icons folder and includes it into the + * ember-inline-svg addon. + */ + includeFlightIcons(app) { + const iconPackagePath = path.resolve( + '../../node_modules/@hashicorp/flight-icons' + ); + const iconsPath = path.resolve(iconPackagePath, '..'); + + app.options.svg = app.options.svg || {}; + app.options.svg.paths = app.options.svg.paths || []; + + app.options.svg.paths.push(iconsPath); + + this.addons.forEach((addon) => { + if (addon.name === 'ember-inline-svg') addon.included(app); + }); + }, + /** * Finds the public folder and includes it into the ember-inline-svg addon. */ diff --git a/addons/rose/package.json b/addons/rose/package.json index 88718fbbd..cffa4b44b 100644 --- a/addons/rose/package.json +++ b/addons/rose/package.json @@ -43,6 +43,7 @@ "@ember/test-helpers": "^2.2.8", "@glimmer/component": "^1.0.3", "@glimmer/tracking": "^1.0.3", + "@hashicorp/flight-icons": "^0.0.3-beta", "@storybook/addon-actions": "^6.3.1", "@storybook/addon-docs": "^6.3.1", "@storybook/addon-knobs": "^6.3.0", diff --git a/addons/rose/public/flight/alert-circle-16.svg b/addons/rose/public/flight/alert-circle-16.svg deleted file mode 100644 index 55d000d4c..000000000 --- a/addons/rose/public/flight/alert-circle-16.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/addons/rose/public/flight/alert-triangle-16.svg b/addons/rose/public/flight/alert-triangle-16.svg deleted file mode 100644 index 9367dbd4c..000000000 --- a/addons/rose/public/flight/alert-triangle-16.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/arrow-right-circle-16.svg b/addons/rose/public/flight/arrow-right-circle-16.svg deleted file mode 100644 index 24003e7de..000000000 --- a/addons/rose/public/flight/arrow-right-circle-16.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/check-circle-16.svg b/addons/rose/public/flight/check-circle-16.svg deleted file mode 100644 index 4d296da62..000000000 --- a/addons/rose/public/flight/check-circle-16.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/chevron-left-16.svg b/addons/rose/public/flight/chevron-left-16.svg deleted file mode 100644 index eeb214c72..000000000 --- a/addons/rose/public/flight/chevron-left-16.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/clipboard-checked-16.svg b/addons/rose/public/flight/clipboard-checked-16.svg deleted file mode 100644 index 04db58a2c..000000000 --- a/addons/rose/public/flight/clipboard-checked-16.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/clipboard-copy-16.svg b/addons/rose/public/flight/clipboard-copy-16.svg deleted file mode 100644 index 865e5d45d..000000000 --- a/addons/rose/public/flight/clipboard-copy-16.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/collections-16.svg b/addons/rose/public/flight/collections-16.svg deleted file mode 100644 index cb96ffef0..000000000 --- a/addons/rose/public/flight/collections-16.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/crosshair-16.svg b/addons/rose/public/flight/crosshair-16.svg deleted file mode 100644 index facad35a7..000000000 --- a/addons/rose/public/flight/crosshair-16.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/eye-16.svg b/addons/rose/public/flight/eye-16.svg deleted file mode 100644 index 8eb2e59a7..000000000 --- a/addons/rose/public/flight/eye-16.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/eye-off-16.svg b/addons/rose/public/flight/eye-off-16.svg deleted file mode 100644 index 105f1d3e3..000000000 --- a/addons/rose/public/flight/eye-off-16.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/folder-users-16.svg b/addons/rose/public/flight/folder-users-16.svg deleted file mode 100644 index bb81c2b6c..000000000 --- a/addons/rose/public/flight/folder-users-16.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/globe-16.svg b/addons/rose/public/flight/globe-16.svg deleted file mode 100644 index 0c5298171..000000000 --- a/addons/rose/public/flight/globe-16.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/grid-16.svg b/addons/rose/public/flight/grid-16.svg deleted file mode 100644 index b65333af2..000000000 --- a/addons/rose/public/flight/grid-16.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/help-16.svg b/addons/rose/public/flight/help-16.svg deleted file mode 100644 index acaf4b376..000000000 --- a/addons/rose/public/flight/help-16.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/addons/rose/public/flight/identity-user-16.svg b/addons/rose/public/flight/identity-user-16.svg deleted file mode 100644 index 47cb2ba13..000000000 --- a/addons/rose/public/flight/identity-user-16.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/info-16.svg b/addons/rose/public/flight/info-16.svg deleted file mode 100644 index 1c7f58c50..000000000 --- a/addons/rose/public/flight/info-16.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/key-16.svg b/addons/rose/public/flight/key-16.svg deleted file mode 100644 index e3ec42abd..000000000 --- a/addons/rose/public/flight/key-16.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/lock-16.svg b/addons/rose/public/flight/lock-16.svg deleted file mode 100644 index 5b5dba1c1..000000000 --- a/addons/rose/public/flight/lock-16.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/more-horizontal-16.svg b/addons/rose/public/flight/more-horizontal-16.svg deleted file mode 100644 index 79143ccd4..000000000 --- a/addons/rose/public/flight/more-horizontal-16.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/org-16.svg b/addons/rose/public/flight/org-16.svg deleted file mode 100644 index 213323766..000000000 --- a/addons/rose/public/flight/org-16.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/plus-circle-16.svg b/addons/rose/public/flight/plus-circle-16.svg deleted file mode 100644 index 6cef57c52..000000000 --- a/addons/rose/public/flight/plus-circle-16.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/trash-16.svg b/addons/rose/public/flight/trash-16.svg deleted file mode 100644 index 9686f6d23..000000000 --- a/addons/rose/public/flight/trash-16.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/user-circle-16.svg b/addons/rose/public/flight/user-circle-16.svg deleted file mode 100644 index b74c95d07..000000000 --- a/addons/rose/public/flight/user-circle-16.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/users-16.svg b/addons/rose/public/flight/users-16.svg deleted file mode 100644 index 0648faa9f..000000000 --- a/addons/rose/public/flight/users-16.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/x-16.svg b/addons/rose/public/flight/x-16.svg deleted file mode 100644 index f41d39dd5..000000000 --- a/addons/rose/public/flight/x-16.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/x-circle-16.svg b/addons/rose/public/flight/x-circle-16.svg deleted file mode 100644 index 5b0aa3f78..000000000 --- a/addons/rose/public/flight/x-circle-16.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/x-square-16.svg b/addons/rose/public/flight/x-square-16.svg deleted file mode 100644 index 9bf270d7e..000000000 --- a/addons/rose/public/flight/x-square-16.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/addons/rose/tests/dummy/app/templates/playground.hbs b/addons/rose/tests/dummy/app/templates/playground.hbs index dc477136d..33694bdca 100644 --- a/addons/rose/tests/dummy/app/templates/playground.hbs +++ b/addons/rose/tests/dummy/app/templates/playground.hbs @@ -19,7 +19,7 @@ Menu item Menu item @@ -82,7 +82,7 @@ - Remove + Remove diff --git a/addons/rose/tests/integration/components/rose/badge-test.js b/addons/rose/tests/integration/components/rose/badge-test.js index 7b5a62abe..65f6f6b45 100644 --- a/addons/rose/tests/integration/components/rose/badge-test.js +++ b/addons/rose/tests/integration/components/rose/badge-test.js @@ -17,7 +17,9 @@ module('Integration | Component | rose/badge', function (hooks) { }); test('it renders an icon using @icon', async function (assert) { - await render(hbs``); + await render( + hbs`` + ); assert.ok(find('.rose-icon')); }); diff --git a/addons/rose/tests/integration/components/rose/button-test.js b/addons/rose/tests/integration/components/rose/button-test.js index f41d8b686..cebdc50c3 100644 --- a/addons/rose/tests/integration/components/rose/button-test.js +++ b/addons/rose/tests/integration/components/rose/button-test.js @@ -34,14 +34,20 @@ module('Integration | Component | rose/button', function (hooks) { }); test('it supports left and right icons', async function (assert) { - await render(hbs``); + await render( + hbs`` + ); assert.ok(find('.has-icon-left .rose-icon')); - await render(hbs``); + await render( + hbs`` + ); assert.ok(find('.has-icon-right .rose-icon')); }); test('it supports an icon-only type', async function (assert) { - await render(hbs``); + await render( + hbs`` + ); assert.ok(find('.has-icon-only .rose-icon')); }); }); diff --git a/addons/rose/tests/integration/components/rose/card/link-test.js b/addons/rose/tests/integration/components/rose/card/link-test.js index f4eb10074..fdbfb31ac 100644 --- a/addons/rose/tests/integration/components/rose/card/link-test.js +++ b/addons/rose/tests/integration/components/rose/card/link-test.js @@ -42,7 +42,7 @@ module('Integration | Component | rose/card/link', function (hooks) { test('it renders with @icon', async function (assert) { await render( - hbs`` + hbs`` ); assert.ok(find('.rose-icon')); }); diff --git a/addons/rose/tests/integration/components/rose/dropdown-test.js b/addons/rose/tests/integration/components/rose/dropdown-test.js index a80d5d365..e94b1f09d 100644 --- a/addons/rose/tests/integration/components/rose/dropdown-test.js +++ b/addons/rose/tests/integration/components/rose/dropdown-test.js @@ -24,7 +24,7 @@ module('Integration | Component | rose/dropdown', function (hooks) { }); test('it supports an icon', async function (assert) { - await render(hbs``); + await render(hbs``); assert.ok(find('svg')); }); diff --git a/addons/rose/tests/integration/components/rose/dropdown/button-test.js b/addons/rose/tests/integration/components/rose/dropdown/button-test.js index 11ef9ed53..3b1bc1193 100644 --- a/addons/rose/tests/integration/components/rose/dropdown/button-test.js +++ b/addons/rose/tests/integration/components/rose/dropdown/button-test.js @@ -33,7 +33,7 @@ module('Integration | Component | rose/dropdown/button', function (hooks) { test('it supports an icon-only type', async function (assert) { await render( - hbs`` + hbs`` ); assert.ok(find('.has-icon-only .rose-icon')); }); diff --git a/addons/rose/tests/integration/components/rose/form/radio/radio-test.js b/addons/rose/tests/integration/components/rose/form/radio/radio-test.js index 15547dab8..c7117a1e7 100644 --- a/addons/rose/tests/integration/components/rose/form/radio/radio-test.js +++ b/addons/rose/tests/integration/components/rose/form/radio/radio-test.js @@ -19,7 +19,7 @@ module('Integration | Component | rose/form/radio/radio', function (hooks) { test('it supports an icon', async function (assert) { await render( - hbs`` + hbs`` ); assert.ok(find('svg')); }); diff --git a/addons/rose/tests/integration/components/rose/icon-test.js b/addons/rose/tests/integration/components/rose/icon-test.js index 2caad0943..c51b16587 100644 --- a/addons/rose/tests/integration/components/rose/icon-test.js +++ b/addons/rose/tests/integration/components/rose/icon-test.js @@ -7,12 +7,14 @@ module('Integration | Component | rose/icon', function (hooks) { setupRenderingTest(hooks); test('it renders', async function (assert) { - await render(hbs``); + await render(hbs``); assert.ok(find('svg')); }); test('it supports optional @size', async function (assert) { - await render(hbs``); + await render( + hbs`` + ); assert.ok(find('.small')); }); }); diff --git a/addons/rose/tests/integration/components/rose/link-button-test.js b/addons/rose/tests/integration/components/rose/link-button-test.js index 49ba9d843..c49c66d20 100644 --- a/addons/rose/tests/integration/components/rose/link-button-test.js +++ b/addons/rose/tests/integration/components/rose/link-button-test.js @@ -35,7 +35,7 @@ module('Integration | Component | rose/link-button', function (hooks) { test('it supports left icon with @iconLeft', async function (assert) { await render( - hbs`` + hbs`` ); assert.ok(find('.rose-icon')); assert.ok(find('.has-icon-left')); @@ -43,7 +43,7 @@ module('Integration | Component | rose/link-button', function (hooks) { test('it supports left icon with @iconRight', async function (assert) { await render( - hbs`` + hbs`` ); assert.ok(find('.rose-icon')); assert.ok(find('.has-icon-right')); @@ -51,7 +51,7 @@ module('Integration | Component | rose/link-button', function (hooks) { test('it supports only icon with @iconOnly', async function (assert) { await render( - hbs`` + hbs`` ); assert.ok(find('.rose-icon')); assert.ok(find('.has-icon-only')); diff --git a/ui/admin/app/components/copyable/index.js b/ui/admin/app/components/copyable/index.js index 6f13e6ce7..0957798fe 100644 --- a/ui/admin/app/components/copyable/index.js +++ b/ui/admin/app/components/copyable/index.js @@ -12,8 +12,8 @@ export default class CopyableComponent extends Component { id = generateComponentID(); copyableButtonId = `copyable-button-${this.id}`; - actionIcon = 'flight/clipboard-copy-16'; - successIcon = 'flight/clipboard-checked-16'; + actionIcon = 'flight-icons/clipboard-copy-16'; + successIcon = 'flight-icons/clipboard-checked-16'; actionText = this.args.buttonText; successText = this.args.acknowledgeText; diff --git a/ui/admin/app/components/form/auth-method/oidc/index.hbs b/ui/admin/app/components/form/auth-method/oidc/index.hbs index 33e29d67e..d311a6887 100644 --- a/ui/admin/app/components/form/auth-method/oidc/index.hbs +++ b/ui/admin/app/components/form/auth-method/oidc/index.hbs @@ -178,7 +178,7 @@ - + {{t 'actions.back'}} diff --git a/ui/admin/app/components/form/host-set/add-hosts/index.hbs b/ui/admin/app/components/form/host-set/add-hosts/index.hbs index 7cb2fb625..72adf0902 100644 --- a/ui/admin/app/components/form/host-set/add-hosts/index.hbs +++ b/ui/admin/app/components/form/host-set/add-hosts/index.hbs @@ -55,7 +55,7 @@ - + {{t 'actions.back'}} diff --git a/ui/admin/app/components/form/role/add-principals/index.hbs b/ui/admin/app/components/form/role/add-principals/index.hbs index eeb567f68..1c60623be 100644 --- a/ui/admin/app/components/form/role/add-principals/index.hbs +++ b/ui/admin/app/components/form/role/add-principals/index.hbs @@ -58,7 +58,7 @@ {{t 'resources.role.principal.messages.none.description'}} - + {{t 'actions.back'}} diff --git a/ui/admin/app/components/form/role/grants/index.hbs b/ui/admin/app/components/form/role/grants/index.hbs index 86c994d25..f3a9e2f1e 100644 --- a/ui/admin/app/components/form/role/grants/index.hbs +++ b/ui/admin/app/components/form/role/grants/index.hbs @@ -74,7 +74,7 @@ diff --git a/ui/admin/app/components/form/role/index.hbs b/ui/admin/app/components/form/role/index.hbs index dde4c73d5..b5a9d6888 100644 --- a/ui/admin/app/components/form/role/index.hbs +++ b/ui/admin/app/components/form/role/index.hbs @@ -69,8 +69,12 @@ @text={{this.selectedGrantScope.displayName}} @icon={{if this.selectedGrantScope.isProject - 'flight/grid-16' - (if this.selectedGrantScope.isOrg 'flight/org-16' 'flight/globe-16') + 'flight-icons/grid-16' + (if + this.selectedGrantScope.isOrg + 'flight-icons/org-16' + 'flight-icons/globe-16' + ) }} as |dropdown| > diff --git a/ui/admin/app/components/form/target/add-credential-libraries/index.hbs b/ui/admin/app/components/form/target/add-credential-libraries/index.hbs index a99390058..628bed983 100644 --- a/ui/admin/app/components/form/target/add-credential-libraries/index.hbs +++ b/ui/admin/app/components/form/target/add-credential-libraries/index.hbs @@ -55,7 +55,7 @@ {{t 'resources.target.credential-library.messages.none.description'}} - + {{t 'actions.back'}} diff --git a/ui/admin/app/components/form/target/add-host-sets/index.hbs b/ui/admin/app/components/form/target/add-host-sets/index.hbs index 238ab3e42..ade5297a6 100644 --- a/ui/admin/app/components/form/target/add-host-sets/index.hbs +++ b/ui/admin/app/components/form/target/add-host-sets/index.hbs @@ -59,7 +59,7 @@ {{t 'resources.target.host-set.messages.none.description'}} - + {{t 'actions.back'}} diff --git a/ui/admin/app/components/form/user/add-accounts/index.hbs b/ui/admin/app/components/form/user/add-accounts/index.hbs index afb2c43f8..778fa7993 100644 --- a/ui/admin/app/components/form/user/add-accounts/index.hbs +++ b/ui/admin/app/components/form/user/add-accounts/index.hbs @@ -59,7 +59,7 @@ {{t 'resources.user.messages.no-accounts.description'}} - + {{t 'actions.back'}} diff --git a/ui/admin/app/templates/application.hbs b/ui/admin/app/templates/application.hbs index 7413d948e..daa6f8737 100644 --- a/ui/admin/app/templates/application.hbs +++ b/ui/admin/app/templates/application.hbs @@ -16,7 +16,7 @@ @@ -100,7 +100,7 @@ diff --git a/ui/admin/app/templates/scopes/scope.hbs b/ui/admin/app/templates/scopes/scope.hbs index f896df85a..d3abb701c 100644 --- a/ui/admin/app/templates/scopes/scope.hbs +++ b/ui/admin/app/templates/scopes/scope.hbs @@ -18,7 +18,7 @@ {{#if @model.isGlobal}} - + {{t 'resources.org.title_plural'}} @@ -28,12 +28,12 @@ {{#if this.session.data.authenticated.isGlobal}} - + {{t 'resources.org.title_plural'}} {{/if}} - + {{t 'resources.project.title_plural'}} @@ -43,12 +43,12 @@ {{#if this.session.data.authenticated.isGlobal}} - + {{t 'resources.org.title_plural'}} {{/if}} - + {{t 'resources.project.title_plural'}} @@ -58,13 +58,13 @@ {{t "resources.group.title_plural"}} {{t "resources.role.title_plural"}} @@ -72,20 +72,23 @@ --}} - + {{t 'resources.session.title_plural'}} - + {{t 'resources.target.title_plural'}} - + {{t 'resources.host-catalog.title_plural'}} {{#if (feature-flag 'credential-store')}} - + {{t 'resources.credential-store.title_plural'}} {{/if}} @@ -95,19 +98,19 @@ {{#unless @model.isProject}} - + {{t 'resources.user.title_plural'}} - + {{t 'resources.group.title_plural'}} - + {{t 'resources.role.title_plural'}} - + {{t 'resources.auth-method.title_plural'}} diff --git a/ui/admin/app/templates/scopes/scope/-header-nav.hbs b/ui/admin/app/templates/scopes/scope/-header-nav.hbs index 0a0f9c3b9..cd84e45cc 100644 --- a/ui/admin/app/templates/scopes/scope/-header-nav.hbs +++ b/ui/admin/app/templates/scopes/scope/-header-nav.hbs @@ -2,8 +2,8 @@ @text={{this.scopes.selectedOrg.displayName}} @icon={{if this.scopes.selectedOrg.isGlobal - 'flight/globe-16' - 'flight/org-16' + 'flight-icons/globe-16' + 'flight-icons/org-16' }} as |dropdown| > @@ -23,7 +23,7 @@ {{#if this.scopes.selectedProject}} {{#each this.scopes.projects as |scope|}} diff --git a/ui/admin/app/templates/scopes/scope/-sidebar.hbs b/ui/admin/app/templates/scopes/scope/-sidebar.hbs index f592804ce..08d4b6b46 100644 --- a/ui/admin/app/templates/scopes/scope/-sidebar.hbs +++ b/ui/admin/app/templates/scopes/scope/-sidebar.hbs @@ -1,18 +1,18 @@ - + {{t 'resources.user.title_plural'}} - + {{t 'resources.group.title_plural'}} - + {{t 'resources.role.title_plural'}} - + {{t 'resources.auth-method.title_plural'}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs index 200cc9912..9099abe02 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs @@ -3,8 +3,10 @@ @text={{t (concat 'states.' @model.attributes.state)}} @icon={{if @model.isInactive - 'flight/x-circle-16' - (if @model.isPrivate 'flight/lock-16' 'flight/check-circle-16') + 'flight-icons/x-circle-16' + (if + @model.isPrivate 'flight-icons/lock-16' 'flight-icons/check-circle-16' + ) }} @dropdownRight={{true}} as |dropdown| diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs index ee9b1091d..2006e7f52 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs @@ -115,7 +115,7 @@ {{t 'resources.account.messages.welcome.description'}} - + {{t 'resources.account.actions.create'}} diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs index 0a4fbd8d8..2b078d971 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs @@ -123,7 +123,7 @@ @dropdownRight={{true}} @iconOnly={{true}} @showCaret={{false}} - @icon='flight/more-horizontal-16' + @icon='flight-icons/more-horizontal-16' as |dropdown| > {{#unless authMethod.isPrimary}} @@ -165,7 +165,7 @@ @route='scopes.scope.auth-methods.new' @query={{hash type='password'}} > - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/authenticate.hbs b/ui/admin/app/templates/scopes/scope/authenticate.hbs index 755b72578..bf7f33f0a 100644 --- a/ui/admin/app/templates/scopes/scope/authenticate.hbs +++ b/ui/admin/app/templates/scopes/scope/authenticate.hbs @@ -16,7 +16,7 @@ }}

@@ -79,7 +79,7 @@ diff --git a/ui/admin/app/templates/scopes/scope/authenticate/index.hbs b/ui/admin/app/templates/scopes/scope/authenticate/index.hbs index 014f21a9a..fa5633bb1 100644 --- a/ui/admin/app/templates/scopes/scope/authenticate/index.hbs +++ b/ui/admin/app/templates/scopes/scope/authenticate/index.hbs @@ -2,7 +2,7 @@ diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/index.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/index.hbs index 60d720c91..56d73cdcb 100644 --- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/index.hbs +++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/index.hbs @@ -58,7 +58,7 @@ - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs index cf059f762..1727d0347 100644 --- a/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs +++ b/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs @@ -78,7 +78,7 @@ {{t 'resources.credential-store.description'}} - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/groups/group/members.hbs b/ui/admin/app/templates/scopes/scope/groups/group/members.hbs index 07503d0d3..3979e762a 100644 --- a/ui/admin/app/templates/scopes/scope/groups/group/members.hbs +++ b/ui/admin/app/templates/scopes/scope/groups/group/members.hbs @@ -27,7 +27,7 @@ - + {{t 'resources.group.actions.add-members'}} diff --git a/ui/admin/app/templates/scopes/scope/groups/index.hbs b/ui/admin/app/templates/scopes/scope/groups/index.hbs index c290f9948..7c25937c0 100644 --- a/ui/admin/app/templates/scopes/scope/groups/index.hbs +++ b/ui/admin/app/templates/scopes/scope/groups/index.hbs @@ -72,7 +72,7 @@ {{t 'resources.group.description'}} - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs index 1b1f21949..351fb19d7 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs @@ -37,7 +37,7 @@ {{!-- - + {{t "resources.host-set.actions.create-and-add-host"}} --}} diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs index defdee52e..57542b1d8 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs @@ -52,7 +52,7 @@ - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs index 3079c54c2..a29293dd8 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs @@ -54,7 +54,7 @@ {{t 'resources.host.description'}} - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs index 6affad96b..0ee13bee1 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs @@ -81,7 +81,7 @@ {{t 'resources.host-catalog.description'}} - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/roles/index.hbs b/ui/admin/app/templates/scopes/scope/roles/index.hbs index 30cc00e38..2b975a0f3 100644 --- a/ui/admin/app/templates/scopes/scope/roles/index.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/index.hbs @@ -67,7 +67,7 @@ {{t 'resources.role.description'}} - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs b/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs index b67e32aa7..5086502f0 100644 --- a/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs @@ -31,7 +31,7 @@ - + {{t 'resources.role.principal.actions.add-principals'}} diff --git a/ui/admin/app/templates/scopes/scope/scopes/index.hbs b/ui/admin/app/templates/scopes/scope/scopes/index.hbs index 542404b4e..19a4168d5 100644 --- a/ui/admin/app/templates/scopes/scope/scopes/index.hbs +++ b/ui/admin/app/templates/scopes/scope/scopes/index.hbs @@ -43,7 +43,11 @@ @title={{scope.name}} @description={{scope.description}} @id={{scope.id}} - @icon={{if scope.isOrg 'flight/org-16' 'flight/grid-16'}} + @icon={{if + scope.isOrg + 'flight-icons/org-16' + 'flight-icons/grid-16' + }} @route='scopes.scope' @model={{scope.id}} /> @@ -62,7 +66,7 @@ {{t 'resources.org.description'}} - + {{t 'titles.new'}} @@ -79,7 +83,7 @@ {{t 'resources.project.description'}} - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/sessions/index.hbs b/ui/admin/app/templates/scopes/scope/sessions/index.hbs index e1844e23b..552c50c88 100644 --- a/ui/admin/app/templates/scopes/scope/sessions/index.hbs +++ b/ui/admin/app/templates/scopes/scope/sessions/index.hbs @@ -36,7 +36,7 @@ 'session-status-' sessionAggregate.session.status }} - @name='flight/arrow-right-circle-16' + @name='flight-icons/arrow-right-circle-16' @size='medium' /> - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/targets/target/add-credential-libraries.hbs b/ui/admin/app/templates/scopes/scope/targets/target/add-credential-libraries.hbs index 59a046f11..a4188a78e 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/add-credential-libraries.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/add-credential-libraries.hbs @@ -19,7 +19,7 @@ {{t 'resources.target.credential-library.messages.none.description'}} - + {{t 'actions.back'}} diff --git a/ui/admin/app/templates/scopes/scope/targets/target/add-host-sets.hbs b/ui/admin/app/templates/scopes/scope/targets/target/add-host-sets.hbs index d49f9f75e..af5d5921a 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/add-host-sets.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/add-host-sets.hbs @@ -20,7 +20,7 @@ {{t 'resources.target.host-set.messages.none.description'}} - + {{t 'actions.back'}} diff --git a/ui/admin/app/templates/scopes/scope/targets/target/credential-libraries.hbs b/ui/admin/app/templates/scopes/scope/targets/target/credential-libraries.hbs index b62c5d4d2..87284cafe 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/credential-libraries.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/credential-libraries.hbs @@ -44,7 +44,7 @@ - + {{t 'resources.target.actions.add-credential-libraries'}} diff --git a/ui/admin/app/templates/scopes/scope/targets/target/host-sets.hbs b/ui/admin/app/templates/scopes/scope/targets/target/host-sets.hbs index 5f0f96421..b123d74d3 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/host-sets.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/host-sets.hbs @@ -34,7 +34,7 @@ - + {{t 'resources.target.actions.add-host-sets'}} diff --git a/ui/admin/app/templates/scopes/scope/users/index.hbs b/ui/admin/app/templates/scopes/scope/users/index.hbs index b282a6993..b0cf3e83b 100644 --- a/ui/admin/app/templates/scopes/scope/users/index.hbs +++ b/ui/admin/app/templates/scopes/scope/users/index.hbs @@ -71,7 +71,7 @@ {{t 'resources.user.description'}} - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/users/user/accounts.hbs b/ui/admin/app/templates/scopes/scope/users/user/accounts.hbs index ec8d3704e..369e3c08b 100644 --- a/ui/admin/app/templates/scopes/scope/users/user/accounts.hbs +++ b/ui/admin/app/templates/scopes/scope/users/user/accounts.hbs @@ -34,7 +34,7 @@ - + {{t 'resources.user.actions.add-accounts'}} diff --git a/ui/admin/app/templates/scopes/scope/users/user/add-accounts.hbs b/ui/admin/app/templates/scopes/scope/users/user/add-accounts.hbs index 418f49822..3ded8d49b 100644 --- a/ui/admin/app/templates/scopes/scope/users/user/add-accounts.hbs +++ b/ui/admin/app/templates/scopes/scope/users/user/add-accounts.hbs @@ -20,7 +20,7 @@ {{t 'resources.user.messages.no-accounts.description'}} - + {{t 'actions.back'}} diff --git a/ui/admin/ember-cli-build.js b/ui/admin/ember-cli-build.js index ab3b6e0f1..a7b391110 100644 --- a/ui/admin/ember-cli-build.js +++ b/ui/admin/ember-cli-build.js @@ -23,7 +23,7 @@ module.exports = function (defaults) { importCss: false, }, svg: { - paths: ['../../addons/core/public', '../../addons/rose/public'], + paths: ['../../addons/core/public'], }, }); diff --git a/ui/desktop/app/components/copyable/index.js b/ui/desktop/app/components/copyable/index.js index 8af16d028..6168b8c97 100644 --- a/ui/desktop/app/components/copyable/index.js +++ b/ui/desktop/app/components/copyable/index.js @@ -13,8 +13,8 @@ export default class CopyableComponent extends Component { id = generateComponentID(); copyableButtonId = `copyable-button-${this.id}`; - actionIcon = 'flight/clipboard-copy-16'; - successIcon = 'flight/clipboard-checked-16'; + actionIcon = 'flight-icons/clipboard-copy-16'; + successIcon = 'flight-icons/clipboard-checked-16'; actionText = this.args.buttonText; successText = this.args.acknowledgeText; diff --git a/ui/desktop/app/components/hidden-secret/index.hbs b/ui/desktop/app/components/hidden-secret/index.hbs index afca5e4d3..a3181b9a6 100644 --- a/ui/desktop/app/components/hidden-secret/index.hbs +++ b/ui/desktop/app/components/hidden-secret/index.hbs @@ -1,7 +1,11 @@
{{t 'actions.toggle-secret'}} diff --git a/ui/desktop/app/templates/application.hbs b/ui/desktop/app/templates/application.hbs index caab00131..0099725ed 100644 --- a/ui/desktop/app/templates/application.hbs +++ b/ui/desktop/app/templates/application.hbs @@ -21,7 +21,7 @@ {{#if this.isWindowsOS}} @@ -107,7 +107,7 @@ diff --git a/ui/desktop/app/templates/scopes/scope/authenticate.hbs b/ui/desktop/app/templates/scopes/scope/authenticate.hbs index da49bb798..2c48baf83 100644 --- a/ui/desktop/app/templates/scopes/scope/authenticate.hbs +++ b/ui/desktop/app/templates/scopes/scope/authenticate.hbs @@ -11,7 +11,7 @@ @@ -67,7 +67,7 @@ diff --git a/ui/desktop/app/templates/scopes/scope/authenticate/index.hbs b/ui/desktop/app/templates/scopes/scope/authenticate/index.hbs index 014f21a9a..fa5633bb1 100644 --- a/ui/desktop/app/templates/scopes/scope/authenticate/index.hbs +++ b/ui/desktop/app/templates/scopes/scope/authenticate/index.hbs @@ -2,7 +2,7 @@ diff --git a/ui/desktop/app/templates/scopes/scope/projects.hbs b/ui/desktop/app/templates/scopes/scope/projects.hbs index f3bde26b8..ab28a0a16 100644 --- a/ui/desktop/app/templates/scopes/scope/projects.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects.hbs @@ -2,12 +2,12 @@ - + {{t 'resources.target.title_plural'}} - + {{t 'resources.session.title_plural'}} diff --git a/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs b/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs index 5aeffbf98..126557d3f 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs @@ -29,7 +29,7 @@ <:header> + @icon='flight-icons/key-16'> <:header> <:body> <:footer> diff --git a/yarn.lock b/yarn.lock index d35304465..9a1ba9bf4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2066,6 +2066,11 @@ resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-1.1.0.tgz#d6dbc7574774b238114582410e8fee0dc3532bdf" integrity sha512-rR7tJoSwJ2eooOpYGxGGW95sLq6GXUaS1UtWvN7pei6n2/okYvCGld9vsUTvkl2migxbkszsycwtMf/GEc1k1A== +"@hashicorp/flight-icons@^0.0.3-beta": + version "0.0.3-beta" + resolved "https://registry.yarnpkg.com/@hashicorp/flight/-/flight-icons-0.0.3-beta.tgz#26b6b22e4c709559ed4c9ab0e87a0874c919b909" + integrity sha512-K+rS0p3YKPqNDHYP9Mz+7vmU5wsvm8wjI3h8rs/y6f84agC9LyhkmZQBy/RRAMXeyYsa3sq8cJc6jcj/nuR23g== + "@humanwhocodes/config-array@^0.5.0": version "0.5.0" resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9" From 4a0f1d04f252ff2f7d8cfce098e2b34ad81b282a Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 25 Aug 2021 10:57:47 -0400 Subject: [PATCH 15/25] fix: fix broken lockfile link --- yarn.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index 9a1ba9bf4..4309fdf56 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2068,7 +2068,7 @@ "@hashicorp/flight-icons@^0.0.3-beta": version "0.0.3-beta" - resolved "https://registry.yarnpkg.com/@hashicorp/flight/-/flight-icons-0.0.3-beta.tgz#26b6b22e4c709559ed4c9ab0e87a0874c919b909" + resolved "https://registry.yarnpkg.com/@hashicorp/flight-icons/-/flight-icons-0.0.3-beta.tgz#26b6b22e4c709559ed4c9ab0e87a0874c919b909" integrity sha512-K+rS0p3YKPqNDHYP9Mz+7vmU5wsvm8wjI3h8rs/y6f84agC9LyhkmZQBy/RRAMXeyYsa3sq8cJc6jcj/nuR23g== "@humanwhocodes/config-array@^0.5.0": From 59934559a5ef50f3a74a6c6a928bfefff1a9c301 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 25 Aug 2021 15:13:24 -0400 Subject: [PATCH 16/25] chore: bump flight-icons to 0.0.4-beta --- addons/rose/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/rose/package.json b/addons/rose/package.json index cffa4b44b..e35727834 100644 --- a/addons/rose/package.json +++ b/addons/rose/package.json @@ -43,7 +43,7 @@ "@ember/test-helpers": "^2.2.8", "@glimmer/component": "^1.0.3", "@glimmer/tracking": "^1.0.3", - "@hashicorp/flight-icons": "^0.0.3-beta", + "@hashicorp/flight-icons": "^0.0.4-beta", "@storybook/addon-actions": "^6.3.1", "@storybook/addon-docs": "^6.3.1", "@storybook/addon-knobs": "^6.3.0", diff --git a/yarn.lock b/yarn.lock index 4309fdf56..a172e38a5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2066,10 +2066,10 @@ resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-1.1.0.tgz#d6dbc7574774b238114582410e8fee0dc3532bdf" integrity sha512-rR7tJoSwJ2eooOpYGxGGW95sLq6GXUaS1UtWvN7pei6n2/okYvCGld9vsUTvkl2migxbkszsycwtMf/GEc1k1A== -"@hashicorp/flight-icons@^0.0.3-beta": - version "0.0.3-beta" - resolved "https://registry.yarnpkg.com/@hashicorp/flight-icons/-/flight-icons-0.0.3-beta.tgz#26b6b22e4c709559ed4c9ab0e87a0874c919b909" - integrity sha512-K+rS0p3YKPqNDHYP9Mz+7vmU5wsvm8wjI3h8rs/y6f84agC9LyhkmZQBy/RRAMXeyYsa3sq8cJc6jcj/nuR23g== +"@hashicorp/flight-icons@^0.0.4-beta": + version "0.0.4-beta" + resolved "https://registry.yarnpkg.com/@hashicorp/flight-icons/-/flight-icons-0.0.4-beta.tgz#b89cb3be3d226411c7bc2df34f732fb99e0f2e85" + integrity sha512-iMO7uycGzVP/Pp6m4KNlZB1fS0alrY6jx+p1HWM+EV63YjEbzmS/M6/1KMZ4hfoQRZCpui8EydqXclI5TL05nw== "@humanwhocodes/config-array@^0.5.0": version "0.5.0" From a54ae21858d99dbe199e6f5f4b69a54eeeedc950 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 25 Aug 2021 15:23:52 -0400 Subject: [PATCH 17/25] chore: revert to flight-icons 0.0.3-beta due to breaking change --- addons/rose/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/rose/package.json b/addons/rose/package.json index e35727834..cffa4b44b 100644 --- a/addons/rose/package.json +++ b/addons/rose/package.json @@ -43,7 +43,7 @@ "@ember/test-helpers": "^2.2.8", "@glimmer/component": "^1.0.3", "@glimmer/tracking": "^1.0.3", - "@hashicorp/flight-icons": "^0.0.4-beta", + "@hashicorp/flight-icons": "^0.0.3-beta", "@storybook/addon-actions": "^6.3.1", "@storybook/addon-docs": "^6.3.1", "@storybook/addon-knobs": "^6.3.0", diff --git a/yarn.lock b/yarn.lock index d2affa035..eef18daed 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2066,10 +2066,10 @@ resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-1.1.0.tgz#d6dbc7574774b238114582410e8fee0dc3532bdf" integrity sha512-rR7tJoSwJ2eooOpYGxGGW95sLq6GXUaS1UtWvN7pei6n2/okYvCGld9vsUTvkl2migxbkszsycwtMf/GEc1k1A== -"@hashicorp/flight-icons@^0.0.4-beta": - version "0.0.4-beta" - resolved "https://registry.yarnpkg.com/@hashicorp/flight-icons/-/flight-icons-0.0.4-beta.tgz#b89cb3be3d226411c7bc2df34f732fb99e0f2e85" - integrity sha512-iMO7uycGzVP/Pp6m4KNlZB1fS0alrY6jx+p1HWM+EV63YjEbzmS/M6/1KMZ4hfoQRZCpui8EydqXclI5TL05nw== +"@hashicorp/flight-icons@^0.0.3-beta": + version "0.0.3-beta" + resolved "https://registry.yarnpkg.com/@hashicorp/flight-icons/-/flight-icons-0.0.3-beta.tgz#26b6b22e4c709559ed4c9ab0e87a0874c919b909" + integrity sha512-K+rS0p3YKPqNDHYP9Mz+7vmU5wsvm8wjI3h8rs/y6f84agC9LyhkmZQBy/RRAMXeyYsa3sq8cJc6jcj/nuR23g== "@humanwhocodes/config-array@^0.5.0": version "0.5.0" From 1017295a8567d4bc51887249e6e409d4136b1ad4 Mon Sep 17 00:00:00 2001 From: Amy Lam Date: Wed, 25 Aug 2021 19:29:54 -0700 Subject: [PATCH 18/25] Update package --- addons/rose/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/rose/package.json b/addons/rose/package.json index cffa4b44b..6a62cb90f 100644 --- a/addons/rose/package.json +++ b/addons/rose/package.json @@ -43,7 +43,7 @@ "@ember/test-helpers": "^2.2.8", "@glimmer/component": "^1.0.3", "@glimmer/tracking": "^1.0.3", - "@hashicorp/flight-icons": "^0.0.3-beta", + "@hashicorp/flight-icons": "^0.0.6-beta", "@storybook/addon-actions": "^6.3.1", "@storybook/addon-docs": "^6.3.1", "@storybook/addon-knobs": "^6.3.0", diff --git a/yarn.lock b/yarn.lock index eef18daed..d354d0c09 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2066,10 +2066,10 @@ resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-1.1.0.tgz#d6dbc7574774b238114582410e8fee0dc3532bdf" integrity sha512-rR7tJoSwJ2eooOpYGxGGW95sLq6GXUaS1UtWvN7pei6n2/okYvCGld9vsUTvkl2migxbkszsycwtMf/GEc1k1A== -"@hashicorp/flight-icons@^0.0.3-beta": - version "0.0.3-beta" - resolved "https://registry.yarnpkg.com/@hashicorp/flight-icons/-/flight-icons-0.0.3-beta.tgz#26b6b22e4c709559ed4c9ab0e87a0874c919b909" - integrity sha512-K+rS0p3YKPqNDHYP9Mz+7vmU5wsvm8wjI3h8rs/y6f84agC9LyhkmZQBy/RRAMXeyYsa3sq8cJc6jcj/nuR23g== +"@hashicorp/flight-icons@^0.0.6-beta": + version "0.0.6-beta" + resolved "https://registry.yarnpkg.com/@hashicorp/flight-icons/-/flight-icons-0.0.6-beta.tgz#49da48d4966c13ef0636a9853dc208fccc8d5c88" + integrity sha512-GJHFPig7n26mMyMDPuUiD2Szp8wEskkcLKxWGAx0wyCGASYotLgAYHAGfa4uLlUOsIkibxKjc/7Y/0ttQeN9hQ== "@humanwhocodes/config-array@^0.5.0": version "0.5.0" From b4d36438a458f80387a6589d0c95ee66bcca8a2c Mon Sep 17 00:00:00 2001 From: Amy Lam Date: Wed, 25 Aug 2021 19:53:16 -0700 Subject: [PATCH 19/25] Update icon to 24 In the dev tools the viewBox should be 24. @hashicorp/flight-icons now uses 16 as default. --- addons/core/addon/components/doc-link/index.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/core/addon/components/doc-link/index.hbs b/addons/core/addon/components/doc-link/index.hbs index 67a788936..664e9d215 100644 --- a/addons/core/addon/components/doc-link/index.hbs +++ b/addons/core/addon/components/doc-link/index.hbs @@ -4,5 +4,5 @@ target="_blank" rel="noreferrer noopener" title={{t "actions.get-topic-help"}}> - + From dae42c7288c11873e394d1f34e4a091a12210ba1 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Thu, 26 Aug 2021 10:14:14 -0400 Subject: [PATCH 20/25] chore: pin flight-icons at 0.0.6-beta --- addons/rose/package.json | 2 +- yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/rose/package.json b/addons/rose/package.json index 6a62cb90f..b28297c51 100644 --- a/addons/rose/package.json +++ b/addons/rose/package.json @@ -43,7 +43,7 @@ "@ember/test-helpers": "^2.2.8", "@glimmer/component": "^1.0.3", "@glimmer/tracking": "^1.0.3", - "@hashicorp/flight-icons": "^0.0.6-beta", + "@hashicorp/flight-icons": "0.0.6-beta", "@storybook/addon-actions": "^6.3.1", "@storybook/addon-docs": "^6.3.1", "@storybook/addon-knobs": "^6.3.0", diff --git a/yarn.lock b/yarn.lock index d354d0c09..9255174ef 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2066,7 +2066,7 @@ resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-1.1.0.tgz#d6dbc7574774b238114582410e8fee0dc3532bdf" integrity sha512-rR7tJoSwJ2eooOpYGxGGW95sLq6GXUaS1UtWvN7pei6n2/okYvCGld9vsUTvkl2migxbkszsycwtMf/GEc1k1A== -"@hashicorp/flight-icons@^0.0.6-beta": +"@hashicorp/flight-icons@0.0.6-beta": version "0.0.6-beta" resolved "https://registry.yarnpkg.com/@hashicorp/flight-icons/-/flight-icons-0.0.6-beta.tgz#49da48d4966c13ef0636a9853dc208fccc8d5c88" integrity sha512-GJHFPig7n26mMyMDPuUiD2Szp8wEskkcLKxWGAx0wyCGASYotLgAYHAGfa4uLlUOsIkibxKjc/7Y/0ttQeN9hQ== From a400892790c4ee88787a54ed80ecfa18989e0ecc Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Thu, 26 Aug 2021 10:48:15 -0400 Subject: [PATCH 21/25] chore: tweak doc icon size; switch sessions icon --- addons/core/addon/components/doc-link/index.hbs | 2 +- .../rose/addon/components/rose/button/index.stories.mdx | 2 +- .../addon/components/rose/link-button/index.stories.mdx | 2 +- .../rose/tests/integration/components/rose/badge-test.js | 4 +--- .../tests/integration/components/rose/link-button-test.js | 2 +- ui/admin/app/styles/app.scss | 8 -------- ui/admin/app/templates/scopes/scope.hbs | 5 +---- ui/admin/app/templates/scopes/scope/sessions/index.hbs | 2 +- ui/desktop/app/styles/app.scss | 8 -------- ui/desktop/app/templates/scopes/scope/projects.hbs | 2 +- .../templates/scopes/scope/projects/sessions/index.hbs | 2 +- .../scopes/scope/projects/targets/target/sessions.hbs | 2 +- 12 files changed, 10 insertions(+), 31 deletions(-) diff --git a/addons/core/addon/components/doc-link/index.hbs b/addons/core/addon/components/doc-link/index.hbs index 664e9d215..67a788936 100644 --- a/addons/core/addon/components/doc-link/index.hbs +++ b/addons/core/addon/components/doc-link/index.hbs @@ -4,5 +4,5 @@ target="_blank" rel="noreferrer noopener" title={{t "actions.get-topic-help"}}> - + diff --git a/addons/rose/addon/components/rose/button/index.stories.mdx b/addons/rose/addon/components/rose/button/index.stories.mdx index 3b2841c8a..18235d3ce 100644 --- a/addons/rose/addon/components/rose/button/index.stories.mdx +++ b/addons/rose/addon/components/rose/button/index.stories.mdx @@ -12,7 +12,7 @@ to trigger actions or to submit forms. Avoid using buttons as simple links to other routes. For accessibility, use links instead. ```htmlbars - + Action ``` diff --git a/addons/rose/addon/components/rose/link-button/index.stories.mdx b/addons/rose/addon/components/rose/link-button/index.stories.mdx index a5cc19106..9b952f6b9 100644 --- a/addons/rose/addon/components/rose/link-button/index.stories.mdx +++ b/addons/rose/addon/components/rose/link-button/index.stories.mdx @@ -12,7 +12,7 @@ Styles supported: primary, secondary, warning, and ghost. Disabling link button is not supported as it is an action on form components only. ```html - + Content ``` diff --git a/addons/rose/tests/integration/components/rose/badge-test.js b/addons/rose/tests/integration/components/rose/badge-test.js index 65f6f6b45..f52964bba 100644 --- a/addons/rose/tests/integration/components/rose/badge-test.js +++ b/addons/rose/tests/integration/components/rose/badge-test.js @@ -17,9 +17,7 @@ module('Integration | Component | rose/badge', function (hooks) { }); test('it renders an icon using @icon', async function (assert) { - await render( - hbs`` - ); + await render(hbs``); assert.ok(find('.rose-icon')); }); diff --git a/addons/rose/tests/integration/components/rose/link-button-test.js b/addons/rose/tests/integration/components/rose/link-button-test.js index c49c66d20..b5d3dbb2f 100644 --- a/addons/rose/tests/integration/components/rose/link-button-test.js +++ b/addons/rose/tests/integration/components/rose/link-button-test.js @@ -43,7 +43,7 @@ module('Integration | Component | rose/link-button', function (hooks) { test('it supports left icon with @iconRight', async function (assert) { await render( - hbs`` + hbs`` ); assert.ok(find('.rose-icon')); assert.ok(find('.has-icon-right')); diff --git a/ui/admin/app/styles/app.scss b/ui/admin/app/styles/app.scss index 45d9b4bdc..e8f3d4987 100644 --- a/ui/admin/app/styles/app.scss +++ b/ui/admin/app/styles/app.scss @@ -189,14 +189,6 @@ } } -.doc-link { - .large { - svg { - transform: scale(0.8); - } - } -} - [class*='session-status-'] { color: var(--ui-gray-subtler-2); } diff --git a/ui/admin/app/templates/scopes/scope.hbs b/ui/admin/app/templates/scopes/scope.hbs index d3abb701c..9396f280d 100644 --- a/ui/admin/app/templates/scopes/scope.hbs +++ b/ui/admin/app/templates/scopes/scope.hbs @@ -72,10 +72,7 @@ --}} - + {{t 'resources.session.title_plural'}} diff --git a/ui/admin/app/templates/scopes/scope/sessions/index.hbs b/ui/admin/app/templates/scopes/scope/sessions/index.hbs index 552c50c88..4e00d0eff 100644 --- a/ui/admin/app/templates/scopes/scope/sessions/index.hbs +++ b/ui/admin/app/templates/scopes/scope/sessions/index.hbs @@ -36,7 +36,7 @@ 'session-status-' sessionAggregate.session.status }} - @name='flight-icons/arrow-right-circle-16' + @name='flight-icons/entry-point-16' @size='medium' /> - + {{t 'resources.session.title_plural'}} diff --git a/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs b/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs index 126557d3f..6c1fb5636 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs @@ -29,7 +29,7 @@ Date: Thu, 26 Aug 2021 10:49:29 -0400 Subject: [PATCH 22/25] chore: increase doc link icon size to 24 --- addons/core/addon/components/doc-link/index.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/core/addon/components/doc-link/index.hbs b/addons/core/addon/components/doc-link/index.hbs index 67a788936..664e9d215 100644 --- a/addons/core/addon/components/doc-link/index.hbs +++ b/addons/core/addon/components/doc-link/index.hbs @@ -4,5 +4,5 @@ target="_blank" rel="noreferrer noopener" title={{t "actions.get-topic-help"}}> - + From 99baefaffcb66722fe5263cfe63a67441bb00710 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Fri, 27 Aug 2021 13:37:46 -0400 Subject: [PATCH 23/25] =?UTF-8?q?chore:=20=F0=9F=A4=96=20switch=20doc=20li?= =?UTF-8?q?nk=20to=2016px=20style?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/core/addon/components/doc-link/index.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/core/addon/components/doc-link/index.hbs b/addons/core/addon/components/doc-link/index.hbs index 664e9d215..67a788936 100644 --- a/addons/core/addon/components/doc-link/index.hbs +++ b/addons/core/addon/components/doc-link/index.hbs @@ -4,5 +4,5 @@ target="_blank" rel="noreferrer noopener" title={{t "actions.get-topic-help"}}> - + From c82269c9608da9d3b8d560dec73f33d1daabd9ec Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Fri, 27 Aug 2021 15:31:30 -0400 Subject: [PATCH 24/25] chore: switch back to 24 --- addons/core/addon/components/doc-link/index.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/core/addon/components/doc-link/index.hbs b/addons/core/addon/components/doc-link/index.hbs index 67a788936..664e9d215 100644 --- a/addons/core/addon/components/doc-link/index.hbs +++ b/addons/core/addon/components/doc-link/index.hbs @@ -4,5 +4,5 @@ target="_blank" rel="noreferrer noopener" title={{t "actions.get-topic-help"}}> - + From e76bc73c118584ed5777173c2b394afb81351daf Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Date: Tue, 31 Aug 2021 17:10:11 -0700 Subject: [PATCH 25/25] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Update=20ember-cl?= =?UTF-8?q?i=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update ember-cli version to the latest stable version --- addons/api/package.json | 2 +- addons/auth/package.json | 2 +- addons/core/package.json | 2 +- addons/rose/package.json | 2 +- ui/admin/package.json | 2 +- ui/desktop/package.json | 2 +- yarn.lock | 20 ++++++++++---------- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/addons/api/package.json b/addons/api/package.json index be04185ab..5094a68e2 100644 --- a/addons/api/package.json +++ b/addons/api/package.json @@ -41,7 +41,7 @@ "broccoli-asset-rev": "^3.0.0", "doctoc": "^2.0.0", "ember-auto-import": "^1.10.1", - "ember-cli": "~3.27.0", + "ember-cli": "~3.28.0", "ember-cli-dependency-checker": "^3.2.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", diff --git a/addons/auth/package.json b/addons/auth/package.json index f656717be..0418515dc 100644 --- a/addons/auth/package.json +++ b/addons/auth/package.json @@ -35,7 +35,7 @@ "core": "*", "doctoc": "^2.0.0", "ember-auto-import": "^1.10.1", - "ember-cli": "~3.27.0", + "ember-cli": "~3.28.0", "ember-cli-dependency-checker": "^3.2.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", diff --git a/addons/core/package.json b/addons/core/package.json index 4ede3ce38..3b92f32c1 100644 --- a/addons/core/package.json +++ b/addons/core/package.json @@ -50,7 +50,7 @@ "broccoli-asset-rev": "^3.0.0", "doctoc": "^2.0.0", "ember-auto-import": "^1.10.1", - "ember-cli": "~3.27.0", + "ember-cli": "~3.28.0", "ember-cli-dependency-checker": "^3.2.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", diff --git a/addons/rose/package.json b/addons/rose/package.json index 6e1f5fadb..8fdf4eaf3 100644 --- a/addons/rose/package.json +++ b/addons/rose/package.json @@ -53,7 +53,7 @@ "broccoli-asset-rev": "^3.0.0", "doctoc": "^2.0.0", "ember-auto-import": "^1.10.1", - "ember-cli": "~3.27.0", + "ember-cli": "~3.28.0", "ember-cli-dependency-checker": "^3.2.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sass": "^10.0.1", diff --git a/ui/admin/package.json b/ui/admin/package.json index bc9e5b2b6..22cddb938 100644 --- a/ui/admin/package.json +++ b/ui/admin/package.json @@ -50,7 +50,7 @@ "ember-a11y-testing": "^4.0.7", "ember-auto-import": "^1.10.1", "ember-breadcrumbs": "^0.2.3", - "ember-cli": "~3.27.0", + "ember-cli": "~3.28.0", "ember-cli-app-version": "^5.0.0", "ember-cli-babel": "^7.23.0", "ember-cli-code-coverage": "^1.0.2", diff --git a/ui/desktop/package.json b/ui/desktop/package.json index 920d03e56..77482183b 100755 --- a/ui/desktop/package.json +++ b/ui/desktop/package.json @@ -65,7 +65,7 @@ "ember-a11y-testing": "^4.0.7", "ember-auto-import": "^1.10.1", "ember-autofocus-modifier": "^1.1.0", - "ember-cli": "~3.27.0", + "ember-cli": "~3.28.0", "ember-cli-app-version": "^5.0.0", "ember-cli-babel": "^7.23.0", "ember-cli-code-coverage": "^1.0.2", diff --git a/yarn.lock b/yarn.lock index e356bc3d3..7814f8021 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5604,7 +5604,7 @@ broccoli-funnel@^1.0.1: symlink-or-copy "^1.0.0" walk-sync "^0.3.1" -broccoli-funnel@^3.0.3, broccoli-funnel@^3.0.8: +broccoli-funnel@^3.0.3, broccoli-funnel@^3.0.5, broccoli-funnel@^3.0.8: version "3.0.8" resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-3.0.8.tgz#f5b62e2763c3918026a15a3c833edc889971279b" integrity sha512-ng4eIhPYiXqMw6SyGoxPHR3YAwEd2lr9FgBI1CyTbspl4txZovOsmzFkMkGAlu88xyvYXJqHiM2crfLa65T1BQ== @@ -8787,10 +8787,10 @@ ember-cli-version-checker@^5.0.1, ember-cli-version-checker@^5.1.1, ember-cli-ve semver "^7.3.4" silent-error "^1.1.1" -ember-cli@~3.27.0: - version "3.27.0" - resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.27.0.tgz#8ccf9db51d7b462f86210b853d086a4543605c34" - integrity sha512-vFLPFkplXn5v005fattHdOcs5AbSp7RG4w1wpHDWHzOSYpl2Dr+5zzZtqLS7V5IVaLf3XK4l24XwhSW9HpMfsQ== +ember-cli@~3.28.0: + version "3.28.0" + resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.28.0.tgz#0a0374c9a1d08386ddf56e8098a38b71dd4453bc" + integrity sha512-CrMs5edFQ2ingO2xfT33T4nUEl8SlvBQ7q+XO9L/GFTvFU07slHxYSvGur0cwgQfOiLnkSTnIaVF1oqBnEmfPQ== dependencies: "@babel/core" "^7.13.8" "@babel/plugin-transform-modules-amd" "^7.12.1" @@ -8806,7 +8806,7 @@ ember-cli@~3.27.0: broccoli-config-loader "^1.0.1" broccoli-config-replace "^1.1.2" broccoli-debug "^0.6.5" - broccoli-funnel "^2.0.2" + broccoli-funnel "^3.0.5" broccoli-funnel-reducer "^1.0.0" broccoli-merge-trees "^3.0.2" broccoli-middleware "^2.1.1" @@ -8872,7 +8872,7 @@ ember-cli@~3.27.0: sane "^4.1.0" semver "^7.3.4" silent-error "^1.1.1" - sort-package-json "^1.48.0" + sort-package-json "^1.49.0" symlink-or-copy "^1.3.1" temp "0.9.4" testem "^3.2.0" @@ -8881,7 +8881,7 @@ ember-cli@~3.27.0: uuid "^8.3.2" walk-sync "^2.2.0" watch-detector "^1.0.0" - workerpool "^6.0.3" + workerpool "^6.1.4" yam "^1.0.0" ember-compatibility-helpers@^1.1.1, ember-compatibility-helpers@^1.1.2, ember-compatibility-helpers@^1.2.0, ember-compatibility-helpers@^1.2.1, ember-compatibility-helpers@^1.2.4: @@ -19184,7 +19184,7 @@ sort-object-keys@^1.1.3: resolved "https://registry.yarnpkg.com/sort-object-keys/-/sort-object-keys-1.1.3.tgz#bff833fe85cab147b34742e45863453c1e190b45" integrity sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg== -sort-package-json@^1.48.0: +sort-package-json@^1.49.0: version "1.50.0" resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-1.50.0.tgz#19fc109fe23bd157bd03c8e572fa3251a52467d8" integrity sha512-qZpqhMU9XTntebgAgc4hv/D6Fzhh7kFnwvV6a7+q8y8J5JoaDqPYQnvXPf7BBqG95tdE8X6JVNo7/jDzcbdfUg== @@ -21580,7 +21580,7 @@ workerpool@^3.1.1: object-assign "4.1.1" rsvp "^4.8.4" -workerpool@^6.0.0, workerpool@^6.0.3, workerpool@^6.1.4: +workerpool@^6.0.0, workerpool@^6.1.4: version "6.1.5" resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.5.tgz#0f7cf076b6215fd7e1da903ff6f22ddd1886b581" integrity sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==