From 70be930f8ec631956c2639c51fea70498f68364d Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Tue, 4 Jan 2022 10:50:09 -0500 Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20remove=20renderT?= =?UTF-8?q?emplate=20in=20favor=20of=20components?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../targets/target/actions/index.hbs} | 0 .../targets/target/header/index.hbs} | 0 .../targets/target/nav/index.hbs} | 0 .../targets/target/add-credential-sources.js | 18 ++ .../app/routes/scopes/scope/targets/target.js | 24 --- .../targets/target/add-credential-sources.js | 23 --- .../scope/targets/target/add-host-sources.js | 23 --- .../templates/scopes/scope/targets/target.hbs | 24 +-- .../targets/target/add-credential-sources.hbs | 65 +++--- .../target/add-credential-sources/-header.hbs | 4 - .../scope/targets/target/add-host-sources.hbs | 68 +++--- .../target/add-host-sources/-header.hbs | 5 - .../targets/target/credential-sources.hbs | 195 ++++++++++-------- .../scope/targets/target/host-sources.hbs | 166 ++++++++------- .../scopes/scope/targets/target/index.hbs | 32 ++- 15 files changed, 336 insertions(+), 311 deletions(-) rename ui/admin/app/{templates/scopes/scope/targets/target/-actions.hbs => components/targets/target/actions/index.hbs} (100%) rename ui/admin/app/{templates/scopes/scope/targets/target/-header.hbs => components/targets/target/header/index.hbs} (100%) rename ui/admin/app/{templates/scopes/scope/targets/target/-navigation.hbs => components/targets/target/nav/index.hbs} (100%) create mode 100644 ui/admin/app/controllers/scopes/scope/targets/target/add-credential-sources.js delete mode 100644 ui/admin/app/templates/scopes/scope/targets/target/add-credential-sources/-header.hbs delete mode 100644 ui/admin/app/templates/scopes/scope/targets/target/add-host-sources/-header.hbs diff --git a/ui/admin/app/templates/scopes/scope/targets/target/-actions.hbs b/ui/admin/app/components/targets/target/actions/index.hbs similarity index 100% rename from ui/admin/app/templates/scopes/scope/targets/target/-actions.hbs rename to ui/admin/app/components/targets/target/actions/index.hbs diff --git a/ui/admin/app/templates/scopes/scope/targets/target/-header.hbs b/ui/admin/app/components/targets/target/header/index.hbs similarity index 100% rename from ui/admin/app/templates/scopes/scope/targets/target/-header.hbs rename to ui/admin/app/components/targets/target/header/index.hbs diff --git a/ui/admin/app/templates/scopes/scope/targets/target/-navigation.hbs b/ui/admin/app/components/targets/target/nav/index.hbs similarity index 100% rename from ui/admin/app/templates/scopes/scope/targets/target/-navigation.hbs rename to ui/admin/app/components/targets/target/nav/index.hbs diff --git a/ui/admin/app/controllers/scopes/scope/targets/target/add-credential-sources.js b/ui/admin/app/controllers/scopes/scope/targets/target/add-credential-sources.js new file mode 100644 index 000000000..9bda83b4f --- /dev/null +++ b/ui/admin/app/controllers/scopes/scope/targets/target/add-credential-sources.js @@ -0,0 +1,18 @@ +import Controller from '@ember/controller'; +import { inject as service } from '@ember/service'; + +export default class ScopesScopeTargetsTargetAddCredentialSourcesController extends Controller { + // =services + + @service intl; + + // =attributes + + /** + * Translated roles breadcrumb + * @type {string} + */ + get breadCrumb() { + return this.intl.t('resources.target.actions.add-credential-sources'); + } +} diff --git a/ui/admin/app/routes/scopes/scope/targets/target.js b/ui/admin/app/routes/scopes/scope/targets/target.js index 4702bb059..e8f81e451 100644 --- a/ui/admin/app/routes/scopes/scope/targets/target.js +++ b/ui/admin/app/routes/scopes/scope/targets/target.js @@ -12,28 +12,4 @@ export default class ScopesScopeTargetsTargetRoute extends Route { async model({ target_id }) { return this.store.findRecord('target', target_id, { reload: true }); } - - /** - * Renders the target-specific templates for header, navigation, - * and actions page sections. - * @override - */ - renderTemplate() { - super.renderTemplate(...arguments); - - this.render('scopes/scope/targets/target/-header', { - into: 'scopes/scope/targets/target', - outlet: 'header', - }); - - this.render('scopes/scope/targets/target/-navigation', { - into: 'scopes/scope/targets/target', - outlet: 'navigation', - }); - - this.render('scopes/scope/targets/target/-actions', { - into: 'scopes/scope/targets/target', - outlet: 'actions', - }); - } } diff --git a/ui/admin/app/routes/scopes/scope/targets/target/add-credential-sources.js b/ui/admin/app/routes/scopes/scope/targets/target/add-credential-sources.js index ed884719e..59a5a6e4a 100644 --- a/ui/admin/app/routes/scopes/scope/targets/target/add-credential-sources.js +++ b/ui/admin/app/routes/scopes/scope/targets/target/add-credential-sources.js @@ -43,29 +43,6 @@ export default class ScopesScopeTargetsTargetAddCredentialSourcesRoute extends R }; } - /** - * Renders credential libraries specific header template. - * @override - */ - renderTemplate() { - super.renderTemplate(...arguments); - - this.render('scopes/scope/targets/target/add-credential-sources/-header', { - into: 'scopes/scope/targets/target', - outlet: 'header', - }); - - this.render('-empty', { - into: 'scopes/scope/targets/target', - outlet: 'navigation', - }); - - this.render('-empty', { - into: 'scopes/scope/targets/target', - outlet: 'actions', - }); - } - // =actions /** diff --git a/ui/admin/app/routes/scopes/scope/targets/target/add-host-sources.js b/ui/admin/app/routes/scopes/scope/targets/target/add-host-sources.js index 4a2987bb5..e6ac82e32 100644 --- a/ui/admin/app/routes/scopes/scope/targets/target/add-host-sources.js +++ b/ui/admin/app/routes/scopes/scope/targets/target/add-host-sources.js @@ -42,29 +42,6 @@ export default class ScopesScopeTargetsTargetAddHostSourcesRoute extends Route { }; } - /** - * Renders the add-host-sources-specific header template. - * @override - */ - renderTemplate() { - super.renderTemplate(...arguments); - - this.render('scopes/scope/targets/target/add-host-sources/-header', { - into: 'scopes/scope/targets/target', - outlet: 'header', - }); - - this.render('-empty', { - into: 'scopes/scope/targets/target', - outlet: 'navigation', - }); - - this.render('-empty', { - into: 'scopes/scope/targets/target', - outlet: 'actions', - }); - } - // =actions @action diff --git a/ui/admin/app/templates/scopes/scope/targets/target.hbs b/ui/admin/app/templates/scopes/scope/targets/target.hbs index 837d1f984..7d32ecb0d 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target.hbs @@ -1,25 +1,3 @@ {{page-title @model.displayName}} - - - - - - - - {{outlet 'header'}} - - - - {{outlet 'navigation'}} - - - - {{outlet 'actions'}} - - - - {{outlet}} - - - \ No newline at end of file +{{outlet}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/targets/target/add-credential-sources.hbs b/ui/admin/app/templates/scopes/scope/targets/target/add-credential-sources.hbs index cc0992c50..90d3bdcc5 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/add-credential-sources.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/add-credential-sources.hbs @@ -1,27 +1,44 @@ {{page-title (t 'resources.target.actions.add-credential-sources')}} -{{#if @model.credentialLibraries}} - -{{/if}} + -{{#unless @model.credentialLibraries}} - - - - {{t 'resources.target.credential-source.messages.none.description'}} - - - - {{t 'actions.back'}} - - - -{{/unless}} \ No newline at end of file + + + + + +

+ {{t 'resources.target.credential-source.messages.add.title'}} +

+

{{t 'resources.target.credential-source.messages.add.description'}}

+ + + + {{#if @model.credentialLibraries}} + + {{/if}} + + {{#unless @model.credentialLibraries}} + + + + {{t 'resources.target.credential-source.messages.none.description'}} + + + + {{t 'actions.back'}} + + + + {{/unless}} + + + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/targets/target/add-credential-sources/-header.hbs b/ui/admin/app/templates/scopes/scope/targets/target/add-credential-sources/-header.hbs deleted file mode 100644 index 699536650..000000000 --- a/ui/admin/app/templates/scopes/scope/targets/target/add-credential-sources/-header.hbs +++ /dev/null @@ -1,4 +0,0 @@ -

- {{t 'resources.target.credential-source.messages.add.title'}} -

-

{{t 'resources.target.credential-source.messages.add.description'}}

\ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/targets/target/add-host-sources.hbs b/ui/admin/app/templates/scopes/scope/targets/target/add-host-sources.hbs index f846930c6..a9ff15c12 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/add-host-sources.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/add-host-sources.hbs @@ -1,28 +1,46 @@ {{page-title (t 'resources.target.actions.add-host-sources')}} -{{#if @model.hostSets}} - -{{/if}} + -{{#unless @model.hostSets}} - - - - {{t 'resources.target.host-source.messages.none.description'}} - - - - {{t 'actions.back'}} - - - -{{/unless}} \ No newline at end of file + + + + + +

+ {{t 'resources.target.host-source.messages.add.title'}} + +

+

{{t 'resources.target.host-source.messages.add.description'}}

+ + + + {{#if @model.hostSets}} + + {{/if}} + + {{#unless @model.hostSets}} + + + + {{t 'resources.target.host-source.messages.none.description'}} + + + + {{t 'actions.back'}} + + + + {{/unless}} + + + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/targets/target/add-host-sources/-header.hbs b/ui/admin/app/templates/scopes/scope/targets/target/add-host-sources/-header.hbs deleted file mode 100644 index abbb353fa..000000000 --- a/ui/admin/app/templates/scopes/scope/targets/target/add-host-sources/-header.hbs +++ /dev/null @@ -1,5 +0,0 @@ -

- {{t 'resources.target.host-source.messages.add.title'}} - -

-

{{t 'resources.target.host-source.messages.add.description'}}

\ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/targets/target/credential-sources.hbs b/ui/admin/app/templates/scopes/scope/targets/target/credential-sources.hbs index c1c06cfef..31abd9a7d 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/credential-sources.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/credential-sources.hbs @@ -1,91 +1,120 @@ {{page-title (t 'resources.target.credential-source.title_plural')}} -{{#if @model.credentialLibraries}} + - - - - {{t 'form.name.label'}} - {{t 'form.type.label'}} - {{t 'form.id.label'}} - {{t 'titles.actions'}} - - - - {{#each @model.credentialLibraries as |credentialLibrary|}} - - - - {{credentialLibrary.displayName}} - -

{{credentialLibrary.description}}

- - - {{t - (concat - 'resources.credential-library.types.' credentialLibrary.type - ) - }} - - - - {{credentialLibrary.id}} - - - - {{#if (can 'removeCredentialSources target' @model)}} - - + + + + + + + + + + + + + + + + + {{#if @model.credentialLibraries}} + + + + + {{t 'form.name.label'}} + {{t 'form.type.label'}} + {{t 'form.id.label'}} + {{t 'titles.actions'}} + + + + {{#each @model.credentialLibraries as |credentialLibrary|}} + + + - {{t 'actions.remove'}} - - - {{/if}} - - - {{/each}} - - + {{credentialLibrary.displayName}} + +

{{credentialLibrary.description}}

+ + + {{t + (concat + 'resources.credential-library.types.' + credentialLibrary.type + ) + }} + + + + {{credentialLibrary.id}} + + + + {{#if (can 'removeCredentialSources target' @model)}} + + + {{t 'actions.remove'}} + + + {{/if}} + + + {{/each}} + + -{{else}} + {{else}} - - - - {{t 'resources.target.credential-source.messages.welcome.description'}} - - - - {{t 'resources.target.actions.add-credential-sources'}} - - - + + + + {{t + 'resources.target.credential-source.messages.welcome.description' + }} + + + + {{t 'resources.target.actions.add-credential-sources'}} + + + -{{/if}} \ No newline at end of file + {{/if}} + + + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/targets/target/host-sources.hbs b/ui/admin/app/templates/scopes/scope/targets/target/host-sources.hbs index 00e74bd55..9a7c0ce5b 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/host-sources.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/host-sources.hbs @@ -1,79 +1,101 @@ {{page-title (t 'resources.target.host-source.title_plural')}} -{{#if @model.hostSets}} + - - - - {{t 'form.name.label'}} - {{t 'form.type.label'}} - {{t 'form.id.label'}} - {{t 'titles.actions'}} - - - - {{#each @model.hostSets as |hostSet|}} - - - {{hostSet.model.displayName}} -

{{hostSet.model.description}}

- - - {{t - (concat 'resources.host-set.types.' hostSet.model.type) - }} - - - - {{hostSet.model.id}} - - - - {{#if (can 'removeHostSources target' @model)}} - - + + + + + + + + + + + + + + + + + {{#if @model.hostSets}} + + + + + {{t 'form.name.label'}} + {{t 'form.type.label'}} + {{t 'form.id.label'}} + {{t 'titles.actions'}} + + + + {{#each @model.hostSets as |hostSet|}} + + + {{hostSet.model.displayName}} +

{{hostSet.model.description}}

+ + + {{t + (concat 'resources.host-set.types.' hostSet.model.type) + }} + + + - {{t 'actions.remove'}} - - - {{/if}} - - - {{/each}} - - + {{hostSet.model.id}} + + + + {{#if (can 'removeHostSources target' @model)}} + + + {{t 'actions.remove'}} + + + {{/if}} + + + {{/each}} + + -{{else}} + {{else}} - - - - {{t 'resources.target.host-source.messages.welcome.description'}} - - - - {{t 'resources.target.actions.add-host-sources'}} - - - + + + + {{t 'resources.target.host-source.messages.welcome.description'}} + + + + {{t 'resources.target.actions.add-host-sources'}} + + + -{{/if}} \ No newline at end of file + {{/if}} + + + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/targets/target/index.hbs b/ui/admin/app/templates/scopes/scope/targets/target/index.hbs index ae63ba2b2..164acd745 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/index.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/index.hbs @@ -1,5 +1,27 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 9df6b56ae9eeeddfe393ef1c90ec6cca8867ad2e Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Mon, 10 Jan 2022 11:27:00 -0500 Subject: [PATCH 2/3] =?UTF-8?q?chore:=20=F0=9F=A4=96=20specify=20only=20LT?= =?UTF-8?q?S=20node=20versions=20in=20packages?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/api/package.json | 2 +- addons/auth/package.json | 2 +- addons/core/package.json | 2 +- addons/rose/package.json | 2 +- package.json | 2 +- ui/admin/package.json | 2 +- ui/desktop/package.json | 2 +- yarn.lock | 27 +++++---------------------- 8 files changed, 12 insertions(+), 29 deletions(-) diff --git a/addons/api/package.json b/addons/api/package.json index 864d511f7..0c254f75f 100644 --- a/addons/api/package.json +++ b/addons/api/package.json @@ -73,7 +73,7 @@ "qunit-dom": "^2.0.0" }, "engines": { - "node": ">=12 <=17" + "node": "12.* || 14.* || 16.*" }, "ember": { "edition": "octane" diff --git a/addons/auth/package.json b/addons/auth/package.json index af32036c3..0160ff741 100644 --- a/addons/auth/package.json +++ b/addons/auth/package.json @@ -66,7 +66,7 @@ "qunit-dom": "^2.0.0" }, "engines": { - "node": ">=12 <=17" + "node": "12.* || 14.* || 16.*" }, "ember": { "edition": "octane" diff --git a/addons/core/package.json b/addons/core/package.json index 5e1ec1f37..b32efab90 100644 --- a/addons/core/package.json +++ b/addons/core/package.json @@ -81,7 +81,7 @@ "qunit-dom": "^2.0.0" }, "engines": { - "node": ">=12 <=17" + "node": "12.* || 14.* || 16.*" }, "ember": { "edition": "octane" diff --git a/addons/rose/package.json b/addons/rose/package.json index 2eb343050..1814040ea 100644 --- a/addons/rose/package.json +++ b/addons/rose/package.json @@ -97,7 +97,7 @@ "webpack": "^5.59.1" }, "engines": { - "node": ">=12 <=17" + "node": "12.* || 14.* || 16.*" }, "ember": { "edition": "octane" diff --git a/package.json b/package.json index d024df837..fff545633 100755 --- a/package.json +++ b/package.json @@ -92,6 +92,6 @@ } }, "engines": { - "node": ">=12 <=17" + "node": "12.* || 14.* || 16.*" } } diff --git a/ui/admin/package.json b/ui/admin/package.json index 1ad98308e..7ea4f4f9c 100644 --- a/ui/admin/package.json +++ b/ui/admin/package.json @@ -95,7 +95,7 @@ "sinon": "^11.1.2" }, "engines": { - "node": ">=12 <=17" + "node": "12.* || 14.* || 16.*" }, "ember": { "edition": "octane" diff --git a/ui/desktop/package.json b/ui/desktop/package.json index 602f518b1..5f3207d25 100755 --- a/ui/desktop/package.json +++ b/ui/desktop/package.json @@ -119,7 +119,7 @@ "stylelint-config-sass-guidelines": "^8.0.0" }, "engines": { - "node": ">=12 <=17" + "node": "12.* || 14.* || 16.*" }, "ember": { "edition": "octane" diff --git a/yarn.lock b/yarn.lock index fe3290e7e..6df2d8cc5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9375,7 +9375,7 @@ debug@^3.0.0, debug@^3.0.1, debug@^3.1.0, debug@^3.1.1, debug@^3.2.6: dependencies: ms "^2.1.1" -debuglog@*, debuglog@^1.0.1: +debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI= @@ -14266,7 +14266,7 @@ import-lazy@^4.0.0: resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153" integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw== -imurmurhash@*, imurmurhash@^0.1.4: +imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= @@ -16080,11 +16080,6 @@ lodash._baseflatten@^3.0.0: lodash.isarguments "^3.0.0" lodash.isarray "^3.0.0" -lodash._baseindexof@*: - version "3.1.0" - resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c" - integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw= - lodash._baseuniq@~4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8" @@ -16093,16 +16088,11 @@ lodash._baseuniq@~4.6.0: lodash._createset "~4.0.0" lodash._root "~3.0.0" -lodash._bindcallback@*, lodash._bindcallback@^3.0.0: +lodash._bindcallback@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4= -lodash._cacheindexof@*: - version "3.0.2" - resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92" - integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI= - lodash._createassigner@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11" @@ -16112,19 +16102,12 @@ lodash._createassigner@^3.0.0: lodash._isiterateecall "^3.0.0" lodash.restparam "^3.0.0" -lodash._createcache@*: - version "3.1.2" - resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093" - integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM= - dependencies: - lodash._getnative "^3.0.0" - lodash._createset@~4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26" integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY= -lodash._getnative@*, lodash._getnative@^3.0.0: +lodash._getnative@^3.0.0: version "3.9.1" resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= @@ -16342,7 +16325,7 @@ lodash.pick@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM= -lodash.restparam@*, lodash.restparam@^3.0.0: +lodash.restparam@^3.0.0: version "3.6.1" resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU= From b1ea3af02a472f001cca91e630d354b0a65ba892 Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Corvo Date: Tue, 11 Jan 2022 09:09:16 -0800 Subject: [PATCH 3/3] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Update=20ember=20re?= =?UTF-8?q?nder=20modifiers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update Ember render modifiers --- ui/admin/app/styles/app.scss | 2 + ui/admin/package.json | 2 +- ui/desktop/package.json | 2 +- yarn.lock | 87 +++++++++++++++++++++++------------- 4 files changed, 61 insertions(+), 32 deletions(-) diff --git a/ui/admin/app/styles/app.scss b/ui/admin/app/styles/app.scss index 4112bd921..0264fc62a 100644 --- a/ui/admin/app/styles/app.scss +++ b/ui/admin/app/styles/app.scss @@ -150,6 +150,7 @@ 0% { background-position: -100% 0; } + 100% { background-position: -200% 0; } @@ -197,6 +198,7 @@ 0% { background-color: var(--action-subtler-1); } + 100% { background-color: transparent; } diff --git a/ui/admin/package.json b/ui/admin/package.json index 1ad98308e..6148037fe 100644 --- a/ui/admin/package.json +++ b/ui/admin/package.json @@ -37,7 +37,7 @@ "devDependencies": { "@babel/core": "^7.16.5", "@ember/optional-features": "^2.0.0", - "@ember/render-modifiers": "^1.0.2", + "@ember/render-modifiers": "^2.0.2", "@ember/test-helpers": "^2.4.2", "@glimmer/component": "^1.0.4", "@glimmer/tracking": "^1.0.4", diff --git a/ui/desktop/package.json b/ui/desktop/package.json index 602f518b1..b39b1d67c 100755 --- a/ui/desktop/package.json +++ b/ui/desktop/package.json @@ -55,7 +55,7 @@ "devDependencies": { "@doyensec/electronegativity": "^1.9.1", "@ember/optional-features": "^2.0.0", - "@ember/render-modifiers": "^1.0.2", + "@ember/render-modifiers": "^2.0.2", "@ember/test-helpers": "^2.4.2", "@glimmer/component": "^1.0.4", "@glimmer/tracking": "^1.0.4", diff --git a/yarn.lock b/yarn.lock index fe3290e7e..2fdf55c4c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2851,13 +2851,14 @@ ember-cli-babel "^7.22.1" ember-compatibility-helpers "^1.1.1" -"@ember/render-modifiers@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@ember/render-modifiers/-/render-modifiers-1.0.2.tgz#2e87c48db49d922ce4850d707215caaac60d8444" - integrity sha512-6tEnHl5+62NTSAG2mwhGMFPhUrJQjoVqV+slsn+rlTknm2Zik+iwxBQEbwaiQOU1FUYxkS8RWcieovRNMR8inQ== +"@ember/render-modifiers@^2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@ember/render-modifiers/-/render-modifiers-2.0.2.tgz#a5a84c7d1481ac4936ba03695ba98776f1274afd" + integrity sha512-TURKkO+ihsgVAw1gql/76DILs2VbJZGWeB4pUsGFxFEeC8SFRD9N58Wlh+uJS3Q8vg6oZZa16dw1rFiTv0q43Q== dependencies: - ember-cli-babel "^7.10.0" - ember-modifier-manager-polyfill "^1.1.0" + "@embroider/macros" ">= 0.48.1 < 2.0.0-alpha.1" + ember-cli-babel "^7.26.6" + ember-modifier-manager-polyfill "^1.2.0" "@ember/string@^1.0.0": version "1.0.0" @@ -3019,6 +3020,19 @@ resolve "^1.8.1" semver "^7.3.2" +"@embroider/macros@>= 0.48.1 < 2.0.0-alpha.1": + version "0.50.0" + resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.50.0.tgz#7a3676f2fe983316b9470c5422c099d7cfeebfb2" + integrity sha512-9yek4uRrWPd/pvQg1amAr8GJSTv1tcGhsbvLXjUnAaJfHZQ4OlycfpXUsSGujqPI3DkOOL6TvPl0jQaEooE6cQ== + dependencies: + "@embroider/shared-internals" "0.50.0" + assert-never "^1.2.1" + ember-cli-babel "^7.26.6" + find-up "^5.0.0" + lodash "^4.17.21" + resolve "^1.20.0" + semver "^7.3.2" + "@embroider/macros@^0.40.0": version "0.40.0" resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.40.0.tgz#f58763b4cfb9b4089679b478a28627595341bc5a" @@ -3069,6 +3083,19 @@ semver "^7.3.2" typescript-memoize "^1.0.0-alpha.3" +"@embroider/shared-internals@0.50.0": + version "0.50.0" + resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.50.0.tgz#e8f7474af6b8896a91da4ec700810587fa61f7c2" + integrity sha512-pu4YQGyoTsz+KWGTKwMyCMzhoJkUI9PuWiivRilKsywiFt8Ke4ns+nFNnHtPqPKChR72xY2qFjWOP5yAqZq3kw== + dependencies: + babel-import-util "^1.1.0" + ember-rfc176-data "^0.3.17" + fs-extra "^9.1.0" + lodash "^4.17.21" + resolve-package-path "^4.0.1" + semver "^7.3.5" + typescript-memoize "^1.0.1" + "@emotion/cache@^10.0.27", "@emotion/cache@^10.0.9": version "10.0.29" resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.29.tgz#87e7e64f412c060102d589fe7c6dc042e6f9d1e0" @@ -6278,7 +6305,7 @@ asn1@~0.2.3: dependencies: safer-buffer "~2.1.0" -assert-never@^1.1.0: +assert-never@^1.1.0, assert-never@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/assert-never/-/assert-never-1.2.1.tgz#11f0e363bf146205fb08193b5c7b90f4d1cf44fe" integrity sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw== @@ -6505,6 +6532,11 @@ babel-import-util@^0.2.0: resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-0.2.0.tgz#b468bb679919601a3570f9e317536c54f2862e23" integrity sha512-CtWYYHU/MgK88rxMrLfkD356dApswtR/kWZ/c6JifG1m10e7tBBrs/366dFzWMAoqYmG5/JSh+94tUSpIwh+ag== +babel-import-util@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-1.1.0.tgz#4156b16ef090c4f0d3cdb869ff799202f24aeb93" + integrity sha512-sfzgAiJsUT1es9yrHAuJZuJfBkkOE7Og6rovAIwK/gNJX6MjDfWTprbPngdJZTd5ye4F3FvpvpQmvKXObRzVYA== + babel-loader@^8.0.6, babel-loader@^8.2.2: version "8.2.2" resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81" @@ -9375,7 +9407,7 @@ debug@^3.0.0, debug@^3.0.1, debug@^3.1.0, debug@^3.1.1, debug@^3.2.6: dependencies: ms "^2.1.1" -debuglog@*, debuglog@^1.0.1: +debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI= @@ -10922,7 +10954,7 @@ ember-maybe-import-regenerator@^1.0.0: ember-cli-babel "^7.26.6" regenerator-runtime "^0.13.2" -ember-modifier-manager-polyfill@^1.1.0, ember-modifier-manager-polyfill@^1.2.0: +ember-modifier-manager-polyfill@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/ember-modifier-manager-polyfill/-/ember-modifier-manager-polyfill-1.2.0.tgz#cf4444e11a42ac84f5c8badd85e635df57565dda" integrity sha512-bnaKF1LLKMkBNeDoetvIJ4vhwRPKIIumWr6dbVuW6W6p4QV8ZiO+GdF8J7mxDNlog9CeL9Z/7wam4YS86G8BYA== @@ -14266,7 +14298,7 @@ import-lazy@^4.0.0: resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153" integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw== -imurmurhash@*, imurmurhash@^0.1.4: +imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= @@ -16080,11 +16112,6 @@ lodash._baseflatten@^3.0.0: lodash.isarguments "^3.0.0" lodash.isarray "^3.0.0" -lodash._baseindexof@*: - version "3.1.0" - resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c" - integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw= - lodash._baseuniq@~4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8" @@ -16093,16 +16120,11 @@ lodash._baseuniq@~4.6.0: lodash._createset "~4.0.0" lodash._root "~3.0.0" -lodash._bindcallback@*, lodash._bindcallback@^3.0.0: +lodash._bindcallback@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4= -lodash._cacheindexof@*: - version "3.0.2" - resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92" - integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI= - lodash._createassigner@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11" @@ -16112,19 +16134,12 @@ lodash._createassigner@^3.0.0: lodash._isiterateecall "^3.0.0" lodash.restparam "^3.0.0" -lodash._createcache@*: - version "3.1.2" - resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093" - integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM= - dependencies: - lodash._getnative "^3.0.0" - lodash._createset@~4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26" integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY= -lodash._getnative@*, lodash._getnative@^3.0.0: +lodash._getnative@^3.0.0: version "3.9.1" resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= @@ -16342,7 +16357,7 @@ lodash.pick@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM= -lodash.restparam@*, lodash.restparam@^3.0.0: +lodash.restparam@^3.0.0: version "3.6.1" resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU= @@ -20445,6 +20460,13 @@ resolve-package-path@^4.0.0: dependencies: path-root "^0.1.1" +resolve-package-path@^4.0.1: + version "4.0.3" + resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-4.0.3.tgz#31dab6897236ea6613c72b83658d88898a9040aa" + integrity sha512-SRpNAPW4kewOaNUt8VPqhJ0UMxawMwzJD8V7m1cJfdSTK9ieZwS6K7Dabsm4bmLFM96Z5Y/UznrpG5kt1im8yA== + dependencies: + path-root "^0.1.1" + resolve-package@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/resolve-package/-/resolve-package-1.0.1.tgz#686f70b188bd7d675f5bbc4282ccda060abb9d27" @@ -22694,6 +22716,11 @@ typescript-memoize@^1.0.0-alpha.3: resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.0.1.tgz#0a8199aa28f6fe18517f6e9308ef7bfbe9a98d59" integrity sha512-oJNge1qUrOK37d5Y6Ly2txKeuelYVsFtNF6U9kXIN7juudcQaHJQg2MxLOy0CqtkW65rVDYuTCOjnSIVPd8z3w== +typescript-memoize@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.1.0.tgz#4a8f512d06fc995167c703a3592219901db8bc79" + integrity sha512-LQPKVXK8QrBBkL/zclE6YgSWn0I8ew5m0Lf+XL00IwMhlotqRLlzHV+BRrljVQIc+NohUAuQP7mg4HQwrx5Xbg== + typescript@~4.2.4: version "4.2.4" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961"