From 5cdc7af5882ec400cf34891b0092b5ebe7a2a14c Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 18 Aug 2021 13:33:40 -0400 Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20remove=20last=20usage?= =?UTF-8?q?=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"