From a585fc7a9a8e8afab363c1f70698a297bcd87c78 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Tue, 8 Feb 2022 14:56:54 -0500 Subject: [PATCH 01/26] =?UTF-8?q?chore:=20=F0=9F=A4=96=20satisfy=20argumen?= =?UTF-8?q?t-less-helper-paren-less-invocation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/addon/components/doc-link/index.hbs | 2 +- package.json | 3 +- ui/admin/app/templates/application.hbs | 6 +- .../scope/authenticate/method/index.hbs | 4 +- ui/desktop/app/templates/application.hbs | 2 +- ui/desktop/app/templates/origin.hbs | 2 +- .../scope/authenticate/method/index.hbs | 4 +- yarn.lock | 106 ++++++++++-------- 8 files changed, 70 insertions(+), 59 deletions(-) diff --git a/addons/core/addon/components/doc-link/index.hbs b/addons/core/addon/components/doc-link/index.hbs index 86f028f73..18ecb8406 100644 --- a/addons/core/addon/components/doc-link/index.hbs +++ b/addons/core/addon/components/doc-link/index.hbs @@ -1,6 +1,6 @@ diff --git a/package.json b/package.json index eb0ba9c44..a08ade806 100755 --- a/package.json +++ b/package.json @@ -87,7 +87,8 @@ "json-schema": "^0.4.0", "follow-redirects": "^1.14.7", "node-fetch": "^2.6.7", - "shelljs": "^0.8.5" + "shelljs": "^0.8.5", + "ember-template-recast": "^6.0.0" }, "config": { "commitizen": { diff --git a/ui/admin/app/templates/application.hbs b/ui/admin/app/templates/application.hbs index 3514fd82a..0bb6628c4 100644 --- a/ui/admin/app/templates/application.hbs +++ b/ui/admin/app/templates/application.hbs @@ -4,7 +4,7 @@ - + {{#if this.session.isAuthenticated}} @@ -71,11 +71,11 @@ - + {{company-copyright}} {{app-name}} - + {{t 'titles.documentation'}} diff --git a/ui/admin/app/templates/scopes/scope/authenticate/method/index.hbs b/ui/admin/app/templates/scopes/scope/authenticate/method/index.hbs index 14266bf9c..2217bff0a 100644 --- a/ui/admin/app/templates/scopes/scope/authenticate/method/index.hbs +++ b/ui/admin/app/templates/scopes/scope/authenticate/method/index.hbs @@ -3,7 +3,7 @@ {{else}} {{! OIDC disabled: hide OIDC auth form}} @@ -11,7 +11,7 @@ {{/unless}} {{/if}} \ No newline at end of file diff --git a/ui/desktop/app/templates/application.hbs b/ui/desktop/app/templates/application.hbs index 085201768..76923c4c4 100644 --- a/ui/desktop/app/templates/application.hbs +++ b/ui/desktop/app/templates/application.hbs @@ -11,7 +11,7 @@ {{if this.hasMacOSChrome ' header-cushion'}}' as |header| > - +
diff --git a/ui/desktop/app/templates/origin.hbs b/ui/desktop/app/templates/origin.hbs index 5ecd70b94..fb953f0c8 100644 --- a/ui/desktop/app/templates/origin.hbs +++ b/ui/desktop/app/templates/origin.hbs @@ -7,7 +7,7 @@ class='full-width' @onSubmit={{route-action 'setOrigin' this.origin}} @cancel={{false}} - @disabled={{is-loading}} + @disabled={{(is-loading)}} as |form| > {{else}} {{! OIDC disabled: hide OIDC auth form}} @@ -11,7 +11,7 @@ {{/unless}} {{/if}} \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 7c0982189..a59e6ed86 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3361,17 +3361,17 @@ resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07" integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc= -"@glimmer/global-context@0.65.3": - version "0.65.3" - resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.65.3.tgz#38a88cf7a5fdeec88b48ccba9442b9175e8a9c22" - integrity sha512-XvO7EESyshbbMFfucrnLXDMRtlZvI9JIjpRLpVPa7MJAU9jRmIMtmjtXOX2cy/i9XMfnAHu/PGIgBN9L03HLzA== +"@glimmer/global-context@0.83.1": + version "0.83.1" + resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.83.1.tgz#3e2d97f10ff623bcfb5b7dc29a858d546a6c6d66" + integrity sha512-OwlgqpbOJU73EjZOZdftab0fKbtdJ4x/QQeJseL9cvaAUiK3+w52M5ONFxD1T/yPBp2Mf7NCYqA/uL8tRbzY2A== dependencies: "@glimmer/env" "^0.1.7" -"@glimmer/interfaces@0.65.3": - version "0.65.3" - resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.65.3.tgz#ef3df40b42ab8b6dc36efea81652abddda72f23c" - integrity sha512-DP38dx0ai3xBPdYXRxxv3Ix5CbQHJZwI8PPUkDXv0pyua7/XEsSkiv7heXaaXgihSOGGHgrUa96/Nu82R6UtYw== +"@glimmer/interfaces@0.83.1": + version "0.83.1" + resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.83.1.tgz#fb16f5f683ddc55f130887b6141f58c0751350fe" + integrity sha512-rjAztghzX97v8I4rk3+NguM3XGYcFjc/GbJ8qrEj19KF2lUDoDBW1sB7f0tov3BD5HlrGXei/vOh4+DHfjeB5w== dependencies: "@simple-dom/interface" "^1.4.0" @@ -3401,16 +3401,16 @@ dependencies: "@glimmer/util" "^0.42.2" -"@glimmer/reference@^0.65.0": - version "0.65.3" - resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.65.3.tgz#39031f2873551db01f3a2cfeb95f1d099644fb1b" - integrity sha512-Ew8QNXRu2BkK6g8A4T+0dMNvv3yampiPMO/SGYlyRpXK1Ehm7nWVC+lSi/gfKW1N8iWPwa3ClIIxDekS52/FFw== +"@glimmer/reference@^0.83.1": + version "0.83.1" + resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.83.1.tgz#0345b95431b5bb19843b308e6311d1ef81e36192" + integrity sha512-BThEwDlMkJB1WBPWDrww+VxgGyDbwxh5FFPvGhkovvCZnCb7fAMUCt9pi6CUZtviugkWOBFtE9P4eZZbOLkXeg== dependencies: "@glimmer/env" "^0.1.7" - "@glimmer/global-context" "0.65.3" - "@glimmer/interfaces" "0.65.3" - "@glimmer/util" "0.65.3" - "@glimmer/validator" "0.65.3" + "@glimmer/global-context" "0.83.1" + "@glimmer/interfaces" "0.83.1" + "@glimmer/util" "0.83.1" + "@glimmer/validator" "0.83.1" "@glimmer/runtime@^0.42.1": version "0.42.2" @@ -3435,15 +3435,15 @@ handlebars "^4.0.13" simple-html-tokenizer "^0.5.8" -"@glimmer/syntax@^0.65.0": - version "0.65.3" - resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.65.3.tgz#01fe7e20dc8ffd9263d51a22c4a95ac263133cea" - integrity sha512-2AdC5rJy+z1e6G29BXy2MLa9dXQgUTalH8qy1UkQ54stwQ8r3ZI6aO0IQYh5tiO0Hu2hAY/xy7UyjZc256zwQg== +"@glimmer/syntax@^0.83.1": + version "0.83.1" + resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.83.1.tgz#7e18dd445871c157ba0281f12a4fbf316fa49b41" + integrity sha512-n3vEd0GtjtgkOsd2gqkSimp8ecqq5KrHyana/s1XJZvVAPD5rMWT9WvAVWG8XAktns8BxjwLIUoj/vkOfA+eHg== dependencies: - "@glimmer/interfaces" "0.65.3" - "@glimmer/util" "0.65.3" - "@handlebars/parser" "^1.1.0" - simple-html-tokenizer "^0.5.10" + "@glimmer/interfaces" "0.83.1" + "@glimmer/util" "0.83.1" + "@handlebars/parser" "~2.0.0" + simple-html-tokenizer "^0.5.11" "@glimmer/tracking@^1.0.4": version "1.0.4" @@ -3453,13 +3453,13 @@ "@glimmer/env" "^0.1.7" "@glimmer/validator" "^0.44.0" -"@glimmer/util@0.65.3": - version "0.65.3" - resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.65.3.tgz#354760f7394bf016f41f6222a7937c1a394ff418" - integrity sha512-3qXYC9GpHipAXT0oVec6vQ3xsZaWIgLxyN62S0l/xHnIa5pXu3vnX73zan282IS6Mi0RetxwGNyEBT9OPsYkqQ== +"@glimmer/util@0.83.1": + version "0.83.1" + resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.83.1.tgz#cc7511b03164d658cf6e3262fce5a0fcb82edceb" + integrity sha512-amvjtl9dvrkxsoitXAly9W5NUaLIE3A2J2tWhBWIL1Z6DOFotfX7ytIosOIcPhJLZCtiXPHzMutQRv0G/MSMsA== dependencies: "@glimmer/env" "0.1.7" - "@glimmer/interfaces" "0.65.3" + "@glimmer/interfaces" "0.83.1" "@simple-dom/interface" "^1.4.0" "@glimmer/util@^0.42.2": @@ -3472,13 +3472,13 @@ resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.44.0.tgz#45df98d73812440206ae7bda87cfe04aaae21ed9" integrity sha512-duAsm30uVK9jSysElCbLyU6QQYO2X9iLDLBIBUcCqck9qN1o3tK2qWiHbGK5d6g8E2AJ4H88UrfElkyaJlGrwg== -"@glimmer/validator@0.65.3", "@glimmer/validator@^0.65.0": - version "0.65.3" - resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.65.3.tgz#4eb59548800affaaf3e301f4e2d0f131e614f2b2" - integrity sha512-XoQ+5fN4MLzbS5uhAnaQzbgC7du2rgznTlM7W4WH+97ijHZ8JU5j6+3LIrwwZPPgVPlLlg8z3y6Wv3gEIQMpNA== +"@glimmer/validator@0.83.1", "@glimmer/validator@^0.83.0": + version "0.83.1" + resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.83.1.tgz#7578cb2284f728c8e9302c51fc6e7660b570ac54" + integrity sha512-LaILSNnQgDHZpaUsfjVndbS1JfVn0xdTlJdFJblPbhoVklOBSReZVekens3EQ6xOr3BC612sRm1hBnEPixOY6A== dependencies: "@glimmer/env" "^0.1.7" - "@glimmer/global-context" "0.65.3" + "@glimmer/global-context" "0.83.1" "@glimmer/validator@^0.44.0": version "0.44.0" @@ -3508,10 +3508,10 @@ "@glimmer/interfaces" "^0.42.2" "@glimmer/util" "^0.42.2" -"@handlebars/parser@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-1.1.0.tgz#d6dbc7574774b238114582410e8fee0dc3532bdf" - integrity sha512-rR7tJoSwJ2eooOpYGxGGW95sLq6GXUaS1UtWvN7pei6n2/okYvCGld9vsUTvkl2migxbkszsycwtMf/GEc1k1A== +"@handlebars/parser@~2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-2.0.0.tgz#5e8b7298f31ff8f7b260e6b7363c7e9ceed7d9c5" + integrity sha512-EP9uEDZv/L5Qh9IWuMUGJRfwhXJ4h1dqKTT4/3+tY0eu7sPis7xh23j61SYUnNF4vqCQvvUXpDo9Bh/+q1zASA== "@hashicorp/flight-icons@^2.0.1": version "2.0.1" @@ -9115,6 +9115,11 @@ commander@^6.1.0, commander@^6.2.1: resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c" integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA== +commander@^8.3.0: + version "8.3.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" + integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== + commitizen@^4.0.3: version "4.2.4" resolved "https://registry.yarnpkg.com/commitizen/-/commitizen-4.2.4.tgz#a3e5b36bd7575f6bf6e7aa19dbbf06b0d8f37165" @@ -11601,22 +11606,22 @@ ember-template-lint@^3.7.0: v8-compile-cache "^2.3.0" yargs "^16.2.0" -ember-template-recast@^5.0.1, ember-template-recast@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/ember-template-recast/-/ember-template-recast-5.0.3.tgz#79df27a70bdce7be17f14db13886afde1e9d02d6" - integrity sha512-qsJYQhf29Dk6QMfviXhUPE+byMOs6iRQxUDHgkj8yqjeppvjHaFG96hZi/NAXJTm/M7o3PpfF5YlmeaKtI9UeQ== +ember-template-recast@^5.0.1, ember-template-recast@^5.0.3, ember-template-recast@^6.0.0: + version "6.1.3" + resolved "https://registry.yarnpkg.com/ember-template-recast/-/ember-template-recast-6.1.3.tgz#1e9b256ee9da24bcaa7c213088d01f32afc88001" + integrity sha512-45lkfjrWlrMPlOd5rLFeQeePZwAvcS//x1x15kaiQTlqQdYWiYNXwbpWHqV+p9fXY6bEjl6EbyPhG/zBkgh8MA== dependencies: - "@glimmer/reference" "^0.65.0" - "@glimmer/syntax" "^0.65.0" - "@glimmer/validator" "^0.65.0" + "@glimmer/reference" "^0.83.1" + "@glimmer/syntax" "^0.83.1" + "@glimmer/validator" "^0.83.0" async-promise-queue "^1.0.5" colors "^1.4.0" - commander "^6.2.1" + commander "^8.3.0" globby "^11.0.3" ora "^5.4.0" slash "^3.0.0" tmp "^0.2.1" - workerpool "^6.1.4" + workerpool "^6.1.5" ember-truth-helpers@^3.0.0: version "3.0.0" @@ -22012,7 +22017,7 @@ silent-error@^1.0.0, silent-error@^1.0.1, silent-error@^1.1.1: dependencies: debug "^2.2.0" -simple-html-tokenizer@^0.5.10, simple-html-tokenizer@^0.5.8: +simple-html-tokenizer@^0.5.11, simple-html-tokenizer@^0.5.8: version "0.5.11" resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.11.tgz#4c5186083c164ba22a7b477b7687ac056ad6b1d9" integrity sha512-C2WEK/Z3HoSFbYq8tI7ni3eOo/NneSPRoPpcM7WdLjFOArFuyXEjAoCdOC3DgMfRyziZQ1hCNR4mrNdWEvD0og== @@ -24751,6 +24756,11 @@ workerpool@^6.0.0, workerpool@^6.1.4: resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.5.tgz#0f7cf076b6215fd7e1da903ff6f22ddd1886b581" integrity sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw== +workerpool@^6.1.5: + version "6.2.0" + resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.0.tgz#827d93c9ba23ee2019c3ffaff5c27fccea289e8b" + integrity sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A== + wrap-ansi@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" From 44b5d7427a8a1285844c6276a4d1a3986bb9bf0b Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Tue, 8 Feb 2022 15:50:29 -0500 Subject: [PATCH 02/26] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20upgrade=20embe?= =?UTF-8?q?r-radio-button=20to=20fix=20deprecations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/rose/package.json | 2 +- .../components/rose/form/radio/group-test.js | 5 ++- .../acceptance/auth-methods/oidc-test.js | 2 +- yarn.lock | 33 ++++--------------- 4 files changed, 13 insertions(+), 29 deletions(-) diff --git a/addons/rose/package.json b/addons/rose/package.json index 292c1f3ca..8cdb6d1b2 100644 --- a/addons/rose/package.json +++ b/addons/rose/package.json @@ -34,7 +34,7 @@ "ember-composable-helpers": "^4.5.0", "ember-focus-trap": "^0.7.0", "ember-named-blocks-polyfill": "^0.2.4", - "ember-radio-button": "^2.0.1", + "ember-radio-button": "github:yapplabs/ember-radio-button.git#b2ab65f", "ember-uuid": "^2.1.0", "emberx-select": "github:adopted-ember-addons/emberx-select#bc5f774" }, diff --git a/addons/rose/tests/integration/components/rose/form/radio/group-test.js b/addons/rose/tests/integration/components/rose/form/radio/group-test.js index 4354004e7..c1706fe5e 100644 --- a/addons/rose/tests/integration/components/rose/form/radio/group-test.js +++ b/addons/rose/tests/integration/components/rose/form/radio/group-test.js @@ -54,7 +54,10 @@ module('Integration | Component | rose/form/radio/group', function (hooks) { test('it reflects active radiofield value in @selectedValue and triggers a @changed function', async function (assert) { assert.expect(5); - this.changed = (value) => assert.ok(value); + this.changed = (value) => { + this.selectedValue = value; + assert.ok(value); + }; await render(hbs` Date: Tue, 8 Feb 2022 16:47:49 -0500 Subject: [PATCH 03/26] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20resolve=20lega?= =?UTF-8?q?cy-attribute-arguments=20deprecations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/rose/nav/breadcrumbs/index.hbs | 2 +- .../addon/components/rose/nav/link/index.hbs | 9 ++++++++ .../rose/nav/link/index.stories.mdx | 23 +++++++++++++++++++ .../components/rose/nav/sidebar/index.hbs | 2 +- .../addon/components/rose/nav/tabs/index.hbs | 2 +- .../rose/components/nav/_breadcrumbs.scss | 2 +- addons/rose/app/components/rose/nav/link.js | 1 + .../components/rose/nav/breadcrumbs-test.js | 2 +- .../components/rose/nav/link-test.js | 18 +++++++++++++++ 9 files changed, 56 insertions(+), 5 deletions(-) create mode 100644 addons/rose/addon/components/rose/nav/link/index.hbs create mode 100644 addons/rose/addon/components/rose/nav/link/index.stories.mdx create mode 100644 addons/rose/app/components/rose/nav/link.js create mode 100644 addons/rose/tests/integration/components/rose/nav/link-test.js diff --git a/addons/rose/addon/components/rose/nav/breadcrumbs/index.hbs b/addons/rose/addon/components/rose/nav/breadcrumbs/index.hbs index 287e2cba3..2e67e42df 100644 --- a/addons/rose/addon/components/rose/nav/breadcrumbs/index.hbs +++ b/addons/rose/addon/components/rose/nav/breadcrumbs/index.hbs @@ -1,5 +1,5 @@ diff --git a/addons/rose/addon/components/rose/nav/link/index.hbs b/addons/rose/addon/components/rose/nav/link/index.hbs new file mode 100644 index 000000000..37df6a85b --- /dev/null +++ b/addons/rose/addon/components/rose/nav/link/index.hbs @@ -0,0 +1,9 @@ +{{#if @model}} + + {{yield}} + +{{else}} + + {{yield}} + +{{/if}} diff --git a/addons/rose/addon/components/rose/nav/link/index.stories.mdx b/addons/rose/addon/components/rose/nav/link/index.stories.mdx new file mode 100644 index 000000000..381997582 --- /dev/null +++ b/addons/rose/addon/components/rose/nav/link/index.stories.mdx @@ -0,0 +1,23 @@ +import { Meta, Story, Preview } from '@storybook/addon-docs/blocks'; +import { hbs } from 'ember-cli-htmlbars'; +import { action } from '@storybook/addon-actions'; +import { text, boolean, select } from '@storybook/addon-knobs'; + + + +# Generic Navigation Link + +Proxies the built-in `LinkTo` component, applying a class `rose-nav-link`. + +```html +Text +``` + + + {{ + template: hbs` + Text + `, + context: {}, + }} + diff --git a/addons/rose/addon/components/rose/nav/sidebar/index.hbs b/addons/rose/addon/components/rose/nav/sidebar/index.hbs index 28250c8d6..8d5dd5f9b 100644 --- a/addons/rose/addon/components/rose/nav/sidebar/index.hbs +++ b/addons/rose/addon/components/rose/nav/sidebar/index.hbs @@ -12,7 +12,7 @@ {{/if}} {{yield (hash - link=(component "link-to" class="rose-nav-link") + link=(component "rose/nav/link") )}} diff --git a/addons/rose/addon/components/rose/nav/tabs/index.hbs b/addons/rose/addon/components/rose/nav/tabs/index.hbs index 18470f7d5..bef7428e2 100644 --- a/addons/rose/addon/components/rose/nav/tabs/index.hbs +++ b/addons/rose/addon/components/rose/nav/tabs/index.hbs @@ -3,7 +3,7 @@ class="rose-nav-tabs"> {{yield (hash - link=(component "link-to" class="rose-nav-link") + link=(component "rose/nav/link") )}} diff --git a/addons/rose/addon/styles/rose/components/nav/_breadcrumbs.scss b/addons/rose/addon/styles/rose/components/nav/_breadcrumbs.scss index e7ac5572e..f87fb9ae7 100644 --- a/addons/rose/addon/styles/rose/components/nav/_breadcrumbs.scss +++ b/addons/rose/addon/styles/rose/components/nav/_breadcrumbs.scss @@ -6,7 +6,7 @@ display: flex; flex-wrap: wrap; - .rose-nav-breadcrumbs-link { + .rose-nav-link { --color: var(--ui-gray); color: var(--color); text-decoration: none; diff --git a/addons/rose/app/components/rose/nav/link.js b/addons/rose/app/components/rose/nav/link.js new file mode 100644 index 000000000..b4f6d844f --- /dev/null +++ b/addons/rose/app/components/rose/nav/link.js @@ -0,0 +1 @@ +export { default } from 'rose/components/rose/nav/link'; diff --git a/addons/rose/tests/integration/components/rose/nav/breadcrumbs-test.js b/addons/rose/tests/integration/components/rose/nav/breadcrumbs-test.js index 1d8204eb4..bd935bae3 100644 --- a/addons/rose/tests/integration/components/rose/nav/breadcrumbs-test.js +++ b/addons/rose/tests/integration/components/rose/nav/breadcrumbs-test.js @@ -21,6 +21,6 @@ module('Integration | Component | rose/nav/breadcrumbs', function (hooks) { `); - assert.equal(findAll('.rose-nav-breadcrumbs-link').length, 2); + assert.equal(findAll('.rose-nav-link').length, 2); }); }); diff --git a/addons/rose/tests/integration/components/rose/nav/link-test.js b/addons/rose/tests/integration/components/rose/nav/link-test.js new file mode 100644 index 000000000..2887900bc --- /dev/null +++ b/addons/rose/tests/integration/components/rose/nav/link-test.js @@ -0,0 +1,18 @@ +import { module, test } from 'qunit'; +import { setupRenderingTest } from 'ember-qunit'; +import { render, find } from '@ember/test-helpers'; +import hbs from 'htmlbars-inline-precompile'; + +module('Integration | Component | rose/nav/link', function (hooks) { + setupRenderingTest(hooks); + + test('it renders', async function (assert) { + assert.expect(1); + await render(hbs` + + Item Name + + `); + assert.equal(find('.rose-nav-link').textContent.trim(), 'Item Name'); + }); +}); From 932e2e7b505fcd41d05adf820c067916203e9f9c Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Tue, 8 Feb 2022 16:56:21 -0500 Subject: [PATCH 04/26] docs: fix nav link titles --- addons/rose/addon/components/rose/nav/link/index.stories.mdx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/rose/addon/components/rose/nav/link/index.stories.mdx b/addons/rose/addon/components/rose/nav/link/index.stories.mdx index 381997582..198f434f4 100644 --- a/addons/rose/addon/components/rose/nav/link/index.stories.mdx +++ b/addons/rose/addon/components/rose/nav/link/index.stories.mdx @@ -3,7 +3,7 @@ import { hbs } from 'ember-cli-htmlbars'; import { action } from '@storybook/addon-actions'; import { text, boolean, select } from '@storybook/addon-knobs'; - + # Generic Navigation Link @@ -14,7 +14,7 @@ Proxies the built-in `LinkTo` component, applying a class `rose-nav-link`. ``` - {{ + {{ template: hbs` Text `, From f0065ddc13f33d6e0e08bd665ce24d7018d687fb Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 9 Feb 2022 11:06:26 -0500 Subject: [PATCH 05/26] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20pull=20breadcr?= =?UTF-8?q?umbs=20fully=20local=20and=20remove=20dep?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/admin/app/components/bread-crumbs.js | 113 +++++++++++++++++++++++- ui/admin/package.json | 1 - yarn.lock | 7 -- 3 files changed, 111 insertions(+), 10 deletions(-) diff --git a/ui/admin/app/components/bread-crumbs.js b/ui/admin/app/components/bread-crumbs.js index 93f5a78a7..1f2ac7cea 100644 --- a/ui/admin/app/components/bread-crumbs.js +++ b/ui/admin/app/components/bread-crumbs.js @@ -1,9 +1,118 @@ -import BreadCrumbsComponent from 'ember-breadcrumbs/components/bread-crumbs'; +import Component from '@glimmer/component'; +import EmberObject, { computed, get } from '@ember/object'; import { inject as service } from '@ember/service'; +import { isBlank, isPresent } from '@ember/utils'; +import { A } from '@ember/array'; -export default class crumbs extends BreadCrumbsComponent { +// This component copies and modifies source from ember-breadcrumbs 0.2.3, +// updating it for Ember v4 compatibility. + +// The original copyright is below. + +/* +The MIT License (MIT) + +Copyright (c) 2014-2019 Chris Farber + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ + +export default class BreadcrumbsComponent extends Component { // =services @service session; @service scope; + @service router; + + // =properties + + /* eslint-disable-next-line ember/require-computed-property-dependencies */ + @computed('router.currentRouteName') + get routeInfos() { + /* eslint-disable-next-line ember/no-private-routing-service */ + return this.router._router._routerMicrolib.currentRouteInfos; + } + + /* + For the pathNames and controllers properties, we must be careful not to NOT + specify the properties of the route in our dependent keys. + + Observing the controller property of the route causes some serious problems: + https://github.com/chrisfarber/ember-breadcrumbs/issues/21 + */ + + @computed('routeInfos.[]') + get pathNames() { + return this.routeInfos.map(function (routeInfo) { + return routeInfo.name; + }); + } + + @computed('routeInfos.[]') + get controllers() { + return this.routeInfos.map(function (routeInfo) { + var route = routeInfo.route || routeInfo.handler; + return route.controller; + }); + } + + @computed( + 'controllers.@each.{breadCrumbs,breadCrumb,breadCrumbPath,breadCrumbModel}', + 'pathNames.[]' + ) + get breadCrumbs() { + var controllers = this.controllers; + var defaultPaths = this.pathNames; + var breadCrumbs = A([]); + + controllers.forEach(function (controller, index) { + var crumbs = controller.breadCrumbs || A([]); + var singleCrumb = controller.breadCrumb; + + if (!isBlank(singleCrumb)) { + crumbs.push({ + label: singleCrumb, + path: controller.breadCrumbPath, + model: controller.breadCrumbModel, + }); + } + + crumbs.forEach(function (crumb) { + breadCrumbs.addObject( + EmberObject.create({ + label: crumb.label, + path: crumb.path || defaultPaths[index], + model: crumb.model, + linkable: isPresent(crumb.linkable) + ? crumb.linkable + : crumb.path !== false, + isCurrent: false, + }) + ); + }); + }); + + var deepestCrumb = get(breadCrumbs, 'lastObject'); + if (deepestCrumb) { + deepestCrumb.isCurrent = true; + } + + return breadCrumbs; + } } diff --git a/ui/admin/package.json b/ui/admin/package.json index 6d2ac1828..cacece22b 100644 --- a/ui/admin/package.json +++ b/ui/admin/package.json @@ -49,7 +49,6 @@ "doctoc": "^2.0.1", "ember-a11y-testing": "^4.2.0", "ember-auto-import": "^1.12.0", - "ember-breadcrumbs": "^0.2.3", "ember-cli": "~4.1.0", "ember-cli-app-version": "^5.0.0", "ember-cli-babel": "^7.26.8", diff --git a/yarn.lock b/yarn.lock index 7008409e9..227b0b49f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10536,13 +10536,6 @@ ember-autofocus-modifier@^2.0.0: ember-cli-babel "^7.26.4" ember-modifier "^2.1.1" -ember-breadcrumbs@^0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/ember-breadcrumbs/-/ember-breadcrumbs-0.2.3.tgz#a95e02b73fdc2150f3d552e84a479d6dc96a8b31" - integrity sha512-QUiPXwAlTeiXykF5RnyilEgcj9NSFGciAawktImv6V6Lq9sNfmJHZAYZXAg8U/wA1tw7CG0fQl991K+jtuBTKQ== - dependencies: - ember-cli-babel "^7.10.0" - ember-browser-services@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ember-browser-services/-/ember-browser-services-2.0.0.tgz#37481eccd3828e80b0ef3b97edd8ab0325cb6dc5" From ad2e8bdd6c850808da7607e1c6127909efc214a8 Mon Sep 17 00:00:00 2001 From: dharini Date: Wed, 16 Feb 2022 11:10:40 -0800 Subject: [PATCH 06/26] =?UTF-8?q?chore:=20=F0=9F=A4=96=20add=20preferred?= =?UTF-8?q?=20endpoitns?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/core/translations/resources/en-us.yaml | 2 + .../components/form/host-set/aws/index.hbs | 81 +++++++++++++++++++ .../components/form/host-set/azure/index.hbs | 81 +++++++++++++++++++ .../host-catalogs/host-catalog/host-sets.js | 25 ++++++ 4 files changed, 189 insertions(+) diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml index 1341dcc76..6d55b8ae9 100644 --- a/addons/core/translations/resources/en-us.yaml +++ b/addons/core/translations/resources/en-us.yaml @@ -111,6 +111,8 @@ host-set: filter: label: Filter help: Create a filter to select resources using values such as tag name or tag value. Filter format is specific to each provider + preferred_endpoints: + label: Preferred Endpoints messages: welcome: title: Welcome to Host Sets diff --git a/ui/admin/app/components/form/host-set/aws/index.hbs b/ui/admin/app/components/form/host-set/aws/index.hbs index 3af6ce47f..4be390cbb 100644 --- a/ui/admin/app/components/form/host-set/aws/index.hbs +++ b/ui/admin/app/components/form/host-set/aws/index.hbs @@ -74,6 +74,87 @@ + + <:title>{{t 'resources.host-set.form.preferred_endpoints.label'}} + + <:body> + {{#if @model.errors.preferred_endpoints}} + + {{#each @model.errors.preferred_endpoints as |error|}} + {{error.message}} + {{/each}} + + {{/if}} + + + + {{t 'titles.value'}} + + + + + {{#each @model.preferred_endpoints as |endpoint i|}} + + + + + + + + + {{t 'actions.remove'}} + + + + {{/each}} + + + + + + + + {{t 'actions.add'}} + + + + + + + + <:title>{{t 'resources.host-set.form.filter.label'}} <:description>{{t 'resources.host-set.form.filter.help'}} diff --git a/ui/admin/app/components/form/host-set/azure/index.hbs b/ui/admin/app/components/form/host-set/azure/index.hbs index 686cb70d4..e7e437ce0 100644 --- a/ui/admin/app/components/form/host-set/azure/index.hbs +++ b/ui/admin/app/components/form/host-set/azure/index.hbs @@ -74,6 +74,87 @@ + + <:title>{{t 'resources.host-set.form.preferred_endpoints.label'}} + + <:body> + {{#if @model.errors.preferred_endpoints}} + + {{#each @model.errors.preferred_endpoints as |error|}} + {{error.message}} + {{/each}} + + {{/if}} + + + + {{t 'titles.value'}} + + + + + {{#each @model.preferred_endpoints as |endpoint i|}} + + + + + + + + + {{t 'actions.remove'}} + + + + {{/each}} + + + + + + + + {{t 'actions.add'}} + + + + + + + + Date: Wed, 16 Feb 2022 11:33:33 -0800 Subject: [PATCH 07/26] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Fix=20host=20list?= =?UTF-8?q?=20table=20missing=20address=20field?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix address missing field for static hosts in the host list --- .../scopes/scope/projects/targets/target/hosts.hbs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets/target/hosts.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets/target/hosts.hbs index 1f25fe243..5a2f47206 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/targets/target/hosts.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/targets/target/hosts.hbs @@ -26,7 +26,13 @@ {{host.id}} - {{host.attributes.address}} + + {{#if host.isStatic}} + {{host.address}} + {{else}} +   + {{/if}} + Date: Wed, 16 Feb 2022 11:37:16 -0800 Subject: [PATCH 08/26] =?UTF-8?q?fix:=20=F0=9F=90=9B=20lint?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/core/translations/resources/en-us.yaml | 1 + ui/admin/app/components/form/host-set/aws/index.hbs | 4 +++- ui/admin/app/components/form/host-set/azure/index.hbs | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml index 6d55b8ae9..57de894d3 100644 --- a/addons/core/translations/resources/en-us.yaml +++ b/addons/core/translations/resources/en-us.yaml @@ -113,6 +113,7 @@ host-set: help: Create a filter to select resources using values such as tag name or tag value. Filter format is specific to each provider preferred_endpoints: label: Preferred Endpoints + help: Selects addresses of hosts, in cidr: or dns: format messages: welcome: title: Welcome to Host Sets diff --git a/ui/admin/app/components/form/host-set/aws/index.hbs b/ui/admin/app/components/form/host-set/aws/index.hbs index 4be390cbb..9f21b0097 100644 --- a/ui/admin/app/components/form/host-set/aws/index.hbs +++ b/ui/admin/app/components/form/host-set/aws/index.hbs @@ -76,7 +76,9 @@ <:title>{{t 'resources.host-set.form.preferred_endpoints.label'}} - + <:description>{{t + 'resources.host-set.form.preferred_endpoints.help' + }} <:body> {{#if @model.errors.preferred_endpoints}} diff --git a/ui/admin/app/components/form/host-set/azure/index.hbs b/ui/admin/app/components/form/host-set/azure/index.hbs index e7e437ce0..4cc9cfb4c 100644 --- a/ui/admin/app/components/form/host-set/azure/index.hbs +++ b/ui/admin/app/components/form/host-set/azure/index.hbs @@ -76,7 +76,9 @@ <:title>{{t 'resources.host-set.form.preferred_endpoints.label'}} - + <:description>{{t + 'resources.host-set.form.preferred_endpoints.help' + }} <:body> {{#if @model.errors.preferred_endpoints}} From e0b8f7d796e8f78dd897c718a8b49bdfe5582b6c Mon Sep 17 00:00:00 2001 From: dharini Date: Wed, 16 Feb 2022 11:38:16 -0800 Subject: [PATCH 09/26] remove unused --- .../host-catalogs/host-catalog/host-sets.js | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets.js index c12deae0f..dc6fdccea 100644 --- a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets.js +++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets.js @@ -91,29 +91,4 @@ export default class ScopesScopeHostCatalogsHostCatalogHostSetsRoute extends Rou 'scopes.scope.host-catalogs.host-catalog.host-sets' ); } - - // /** - // * Adds a string item to array `property` on the passed `filter`. - - // * @param {hostSetModel} hostSet - // * @param {string} property - // * @param {string} value - // */ - // @action - // async addStringItem(hostSet, property, value) { - // const array = hostSet.get(property); - // array.addObject({ value }); - // } - // /** - // * Removes an item from array `property` at `index` on the - // * passed `hostSet`. - // * @param {hostSetModel} hostSet - // * @param {string} property - // * @param {number} index - // */ - // @action - // async removeItemByIndex(hostSet, property, index) { - // const array = hostSet.get(property); - // array.removeAt(index); - // } } From 22e3a3e6db2186558408866443e304ac68f01ad1 Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Corvo Date: Wed, 16 Feb 2022 13:31:38 -0800 Subject: [PATCH 10/26] Delete unnecessary else clause in host list within targets --- .../templates/scopes/scope/projects/targets/target/hosts.hbs | 2 -- 1 file changed, 2 deletions(-) diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets/target/hosts.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets/target/hosts.hbs index 5a2f47206..425fd6b9e 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/targets/target/hosts.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/targets/target/hosts.hbs @@ -29,8 +29,6 @@ {{#if host.isStatic}} {{host.address}} - {{else}} -   {{/if}} From 595443bccf5369da816025bea071c40ba2e3dbc0 Mon Sep 17 00:00:00 2001 From: dharini Date: Wed, 16 Feb 2022 13:35:20 -0800 Subject: [PATCH 11/26] =?UTF-8?q?fix:=20=F0=9F=90=9B=20add=20placeholder?= =?UTF-8?q?=20to=20input?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/rose/addon/components/rose/form/input/index.hbs | 2 ++ .../addon/components/rose/form/input/index.stories.mdx | 6 +++++- .../rose/addon/components/rose/form/input/input/index.hbs | 1 + addons/rose/addon/styles/rose/components/form/_input.scss | 4 ++++ ui/admin/app/components/form/host-set/aws/index.hbs | 7 ++++++- ui/admin/app/components/form/host-set/azure/index.hbs | 7 ++++++- 6 files changed, 24 insertions(+), 3 deletions(-) diff --git a/addons/rose/addon/components/rose/form/input/index.hbs b/addons/rose/addon/components/rose/form/input/index.hbs index 524523bbb..96bf0330d 100644 --- a/addons/rose/addon/components/rose/form/input/index.hbs +++ b/addons/rose/addon/components/rose/form/input/index.hbs @@ -15,6 +15,7 @@ type=@type disabled=@disabled error=@error + placeholder=@placeholder aria-describedby=(concat (if @helperText (concat 'helper-text-' this.id)) (if @error (concat ' errors-' this.id))) ) errors=(component 'rose/form/errors' @@ -48,6 +49,7 @@ @type={{@type}} @disabled={{@disabled}} @error={{@error}} + @placeholder={{@placeholder}} @aria-describedby="{{if @helperText (concat 'helper-text-' this.id)}} {{if @error (concat 'errors-' this.id)}}" /> {{yield (hash diff --git a/addons/rose/addon/components/rose/form/input/index.stories.mdx b/addons/rose/addon/components/rose/form/input/index.stories.mdx index 2eaeb2f99..e84eab87b 100644 --- a/addons/rose/addon/components/rose/form/input/index.stories.mdx +++ b/addons/rose/addon/components/rose/form/input/index.stories.mdx @@ -13,7 +13,7 @@ Renders a simple form input. ``` @@ -40,6 +41,7 @@ Or a fully contextual component without a wrapper, for maximum flexibility. @error={{false}} @disabled={{false}} readonly={{false}} + placeholder='la la la' > @@ -60,6 +62,7 @@ Or a fully contextual component without a wrapper, for maximum flexibility. @disabled={{disabled}} readonly={{read-only}} @icon={{icon}} + placeholder={{placeholder}} /> `, context: { @@ -75,6 +78,7 @@ Or a fully contextual component without a wrapper, for maximum flexibility. ), value: text('value', 'Value'), label: text('label', 'Label'), + placeholder: text('placeholder', 'this is a placeholder'), helperText: text('helperText', 'Helper text'), link: text('link', 'link goes here'), linkText: text('linkText', 'link text'), diff --git a/addons/rose/addon/components/rose/form/input/input/index.hbs b/addons/rose/addon/components/rose/form/input/input/index.hbs index 95e81a114..802feeea7 100644 --- a/addons/rose/addon/components/rose/form/input/input/index.hbs +++ b/addons/rose/addon/components/rose/form/input/input/index.hbs @@ -6,4 +6,5 @@ name={{@name}} @type={{@type}} @value={{@value}} + placeholder={{@placeholder}} aria-describedby={{@aria-describedby}} /> diff --git a/addons/rose/addon/styles/rose/components/form/_input.scss b/addons/rose/addon/styles/rose/components/form/_input.scss index 214f57734..889c933ef 100644 --- a/addons/rose/addon/styles/rose/components/form/_input.scss +++ b/addons/rose/addon/styles/rose/components/form/_input.scss @@ -30,6 +30,10 @@ border-radius: sizing.rems(xxxs); box-shadow: inset 0px 3px 1px rgba(var(--stark-components), var(--opacity-4)); + &::placeholder { + color: var(--ui-gray-subtler-1); + } + &.error { color: var(--failure); border-color: currentColor; diff --git a/ui/admin/app/components/form/host-set/aws/index.hbs b/ui/admin/app/components/form/host-set/aws/index.hbs index 9f21b0097..79782093e 100644 --- a/ui/admin/app/components/form/host-set/aws/index.hbs +++ b/ui/admin/app/components/form/host-set/aws/index.hbs @@ -103,6 +103,7 @@ @value={{endpoint.value}} @error={{@model.errors.preferred_endpoints}} @contextual={{true}} + @placeholder='cidr:2001:4860:4860::8888/32' as |field| > @@ -128,7 +129,11 @@ - + @@ -128,7 +129,11 @@ - + Date: Wed, 16 Feb 2022 13:36:49 -0800 Subject: [PATCH 12/26] Update index.stories.mdx --- addons/rose/addon/components/rose/form/input/index.stories.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/rose/addon/components/rose/form/input/index.stories.mdx b/addons/rose/addon/components/rose/form/input/index.stories.mdx index e84eab87b..486acaf47 100644 --- a/addons/rose/addon/components/rose/form/input/index.stories.mdx +++ b/addons/rose/addon/components/rose/form/input/index.stories.mdx @@ -41,7 +41,7 @@ Or a fully contextual component without a wrapper, for maximum flexibility. @error={{false}} @disabled={{false}} readonly={{false}} - placeholder='la la la' + placeholder='placeholder text' > From 1dcfc67e0a4cf04ee59387f506cef544489d3558 Mon Sep 17 00:00:00 2001 From: dharini Date: Wed, 16 Feb 2022 13:47:02 -0800 Subject: [PATCH 13/26] remove attr from input --- addons/rose/addon/components/rose/form/input/index.hbs | 2 -- .../rose/addon/components/rose/form/input/index.stories.mdx | 4 ---- addons/rose/addon/components/rose/form/input/input/index.hbs | 1 - ui/admin/app/components/form/host-set/aws/index.hbs | 4 ++-- ui/admin/app/components/form/host-set/azure/index.hbs | 4 ++-- 5 files changed, 4 insertions(+), 11 deletions(-) diff --git a/addons/rose/addon/components/rose/form/input/index.hbs b/addons/rose/addon/components/rose/form/input/index.hbs index 96bf0330d..524523bbb 100644 --- a/addons/rose/addon/components/rose/form/input/index.hbs +++ b/addons/rose/addon/components/rose/form/input/index.hbs @@ -15,7 +15,6 @@ type=@type disabled=@disabled error=@error - placeholder=@placeholder aria-describedby=(concat (if @helperText (concat 'helper-text-' this.id)) (if @error (concat ' errors-' this.id))) ) errors=(component 'rose/form/errors' @@ -49,7 +48,6 @@ @type={{@type}} @disabled={{@disabled}} @error={{@error}} - @placeholder={{@placeholder}} @aria-describedby="{{if @helperText (concat 'helper-text-' this.id)}} {{if @error (concat 'errors-' this.id)}}" /> {{yield (hash diff --git a/addons/rose/addon/components/rose/form/input/index.stories.mdx b/addons/rose/addon/components/rose/form/input/index.stories.mdx index e84eab87b..4dbe35b58 100644 --- a/addons/rose/addon/components/rose/form/input/index.stories.mdx +++ b/addons/rose/addon/components/rose/form/input/index.stories.mdx @@ -22,7 +22,6 @@ Renders a simple form input. @disabled={{false}} @icon='flight-icons/svg/search-16' readonly={{false}} - placeholder='this is a placeholder' /> ``` @@ -41,7 +40,6 @@ Or a fully contextual component without a wrapper, for maximum flexibility. @error={{false}} @disabled={{false}} readonly={{false}} - placeholder='la la la' > @@ -62,7 +60,6 @@ Or a fully contextual component without a wrapper, for maximum flexibility. @disabled={{disabled}} readonly={{read-only}} @icon={{icon}} - placeholder={{placeholder}} /> `, context: { @@ -78,7 +75,6 @@ Or a fully contextual component without a wrapper, for maximum flexibility. ), value: text('value', 'Value'), label: text('label', 'Label'), - placeholder: text('placeholder', 'this is a placeholder'), helperText: text('helperText', 'Helper text'), link: text('link', 'link goes here'), linkText: text('linkText', 'link text'), diff --git a/addons/rose/addon/components/rose/form/input/input/index.hbs b/addons/rose/addon/components/rose/form/input/input/index.hbs index 802feeea7..95e81a114 100644 --- a/addons/rose/addon/components/rose/form/input/input/index.hbs +++ b/addons/rose/addon/components/rose/form/input/input/index.hbs @@ -6,5 +6,4 @@ name={{@name}} @type={{@type}} @value={{@value}} - placeholder={{@placeholder}} aria-describedby={{@aria-describedby}} /> diff --git a/ui/admin/app/components/form/host-set/aws/index.hbs b/ui/admin/app/components/form/host-set/aws/index.hbs index 79782093e..3d7b974ab 100644 --- a/ui/admin/app/components/form/host-set/aws/index.hbs +++ b/ui/admin/app/components/form/host-set/aws/index.hbs @@ -103,7 +103,7 @@ @value={{endpoint.value}} @error={{@model.errors.preferred_endpoints}} @contextual={{true}} - @placeholder='cidr:2001:4860:4860::8888/32' + placeholder='cidr:2001:4860:4860::8888/32' as |field| > @@ -132,7 +132,7 @@ diff --git a/ui/admin/app/components/form/host-set/azure/index.hbs b/ui/admin/app/components/form/host-set/azure/index.hbs index b31f8e7df..866577b7d 100644 --- a/ui/admin/app/components/form/host-set/azure/index.hbs +++ b/ui/admin/app/components/form/host-set/azure/index.hbs @@ -103,7 +103,7 @@ @value={{endpoint.value}} @error={{@model.errors.preferred_endpoints}} @contextual={{true}} - @placeholder='cidr:2001:4860:4860::8888/32' + placeholder='cidr:2001:4860:4860::8888/32' as |field| > @@ -132,7 +132,7 @@ From c5601a5c6359250d4b8e992b7e3848c84b974dd4 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 16 Feb 2022 16:48:01 -0500 Subject: [PATCH 14/26] chore: support `filters` when it is a string by converting to an array --- addons/api/addon/serializers/host-set.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/addons/api/addon/serializers/host-set.js b/addons/api/addon/serializers/host-set.js index 613caf1ab..5749cd993 100644 --- a/addons/api/addon/serializers/host-set.js +++ b/addons/api/addon/serializers/host-set.js @@ -1,4 +1,5 @@ import ApplicationSerializer from './application'; +import { copy } from 'ember-copy'; const fieldByType = { aws: ['preferred_endpoints', 'filters'], @@ -69,4 +70,19 @@ export default class HostSetSerializer extends ApplicationSerializer { } return value; } + + /** + * Temporarily converts `filters` to an array if it is a string. This is a + * quirk of the API. + * + * TODO: remove once API consistently returns arrays. + */ + normalize(typeClass, hash, ...rest) { + const normalizedHash = copy(hash, true); + if (typeof normalizedHash?.filters === 'string') { + normalizedHash.filters = [normalizedHash.filters]; + } + const normalized = super.normalize(typeClass, normalizedHash, ...rest); + return normalized; + } } From 731ce408507ffef5e581453591acac55591145b4 Mon Sep 17 00:00:00 2001 From: dharini Date: Wed, 16 Feb 2022 13:53:58 -0800 Subject: [PATCH 15/26] undo change --- addons/rose/addon/components/rose/form/input/index.stories.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/rose/addon/components/rose/form/input/index.stories.mdx b/addons/rose/addon/components/rose/form/input/index.stories.mdx index 4dbe35b58..2eaeb2f99 100644 --- a/addons/rose/addon/components/rose/form/input/index.stories.mdx +++ b/addons/rose/addon/components/rose/form/input/index.stories.mdx @@ -13,7 +13,7 @@ Renders a simple form input. Date: Thu, 17 Feb 2022 09:20:30 -0500 Subject: [PATCH 16/26] chore: make radio cards a bit narrower --- .../rose/addon/styles/rose/components/form/_radio-card.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/rose/addon/styles/rose/components/form/_radio-card.scss b/addons/rose/addon/styles/rose/components/form/_radio-card.scss index d8b69c896..18081e154 100644 --- a/addons/rose/addon/styles/rose/components/form/_radio-card.scss +++ b/addons/rose/addon/styles/rose/components/form/_radio-card.scss @@ -32,12 +32,12 @@ $radio-svg: ( ); .rose-form-radio-card { - $cardWideWidth: $size-m * 11; + $cardWideWidth: $size-m * 10; $cardTileWidth: $size-m * 7.25; $borderWidth: $size-xxxs * 2; &.wide { - width: ($size-m) * 23; + width: ($size-m) * 20; } &.tile { From f6a29597af4cee0cfe8702bd0ade86fafa624d27 Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Corvo Date: Thu, 17 Feb 2022 09:12:34 -0800 Subject: [PATCH 17/26] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Host=20address=20fi?= =?UTF-8?q?eld=20shows=20value=20for=20type=20plugin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Host address field shows Dynamic value on list when it is not type static --- .../templates/scopes/scope/projects/targets/target/hosts.hbs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets/target/hosts.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets/target/hosts.hbs index 425fd6b9e..8e30c4bbc 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/targets/target/hosts.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/targets/target/hosts.hbs @@ -29,6 +29,8 @@ {{#if host.isStatic}} {{host.address}} + {{else}} + {{t 'resources.host-catalog.types.dynamic'}} {{/if}} From d66b40ad9b1af93fb1a828cc1335e63562a3630f Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Corvo Date: Thu, 17 Feb 2022 11:41:35 -0800 Subject: [PATCH 18/26] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20Bump=20binary=20ve?= =?UTF-8?q?rsion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bump binary version + update changelog --- ui/desktop/CHANGELOG.md | 6 ++++++ ui/desktop/electron-app/config/cli/VERSION | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ui/desktop/CHANGELOG.md b/ui/desktop/CHANGELOG.md index 9e8fc2f53..923135f1c 100644 --- a/ui/desktop/CHANGELOG.md +++ b/ui/desktop/CHANGELOG.md @@ -2,6 +2,12 @@ Canonical reference for changes, improvements, and bugfixes for Boundary Desktop. +## v1.4.2 [CLI 0.7.5] (2022.02.17) + +### New + +- Support dynamic host catalogs. ([PR](https://github.com/hashicorp/boundary-ui/pull/981)) + ## v1.4.1 [CLI 0.7.3] (2021.12.16) ### New diff --git a/ui/desktop/electron-app/config/cli/VERSION b/ui/desktop/electron-app/config/cli/VERSION index f38fc5393..8bd6ba8c5 100644 --- a/ui/desktop/electron-app/config/cli/VERSION +++ b/ui/desktop/electron-app/config/cli/VERSION @@ -1 +1 @@ -0.7.3 +0.7.5 From a5f0674e9d6f394e0b6068f7fe5b564732ddeedd Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Corvo Date: Tue, 22 Feb 2022 08:30:28 -0800 Subject: [PATCH 19/26] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Update=20ember-cl?= =?UTF-8?q?i-storybook=20dev?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/rose/package.json | 2 +- yarn.lock | 117 +++++++++++---------------------------- 2 files changed, 32 insertions(+), 87 deletions(-) diff --git a/addons/rose/package.json b/addons/rose/package.json index 292c1f3ca..8409863f0 100644 --- a/addons/rose/package.json +++ b/addons/rose/package.json @@ -55,7 +55,7 @@ "@storybook/components": "^6.3.12", "@storybook/core-events": "^6.3.0", "@storybook/ember": "^6.3.8", - "@storybook/ember-cli-storybook": "^0.4.0", + "@storybook/ember-cli-storybook": "^0.5.0", "@storybook/theming": "^6.3.0", "babel-eslint": "^10.1.0", "babel-loader": "^8.2.2", diff --git a/yarn.lock b/yarn.lock index 7c0982189..76e206d2c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4888,15 +4888,15 @@ dependencies: lodash "^4.17.15" -"@storybook/ember-cli-storybook@^0.4.0": - version "0.4.0" - resolved "https://registry.yarnpkg.com/@storybook/ember-cli-storybook/-/ember-cli-storybook-0.4.0.tgz#d0d0d326fa99a19602071e91d93b0bbd907493ec" - integrity sha512-sJyetdQRtM8tO3pjxaRt1Y1nuWRCRAp3mPLgqNS7+6Pv/bISsSgkg0bziqXq1DeDLLOZYe1kqYschaVifTy89A== +"@storybook/ember-cli-storybook@^0.5.0": + version "0.5.0" + resolved "https://registry.yarnpkg.com/@storybook/ember-cli-storybook/-/ember-cli-storybook-0.5.0.tgz#b97fc212e6920871f0d6ac4348d663c335ff61b4" + integrity sha512-TleCWq4SgtgeutdSQ2UWEEI5h37au9vX8U+LXN1dbnSBNnNpmdSa0PxXhFhJNZaMZsMq8XzAQowG+H0U7BxIeg== dependencies: - broccoli-funnel "^2.0.2" - broccoli-merge-trees "^3.0.2" + broccoli-funnel "^3.0.8" + broccoli-merge-trees "^4.2.0" cheerio "^1.0.0-rc.2" - ember-cli-addon-docs-yuidoc "^0.2.3" + ember-cli-addon-docs-yuidoc "^1.0.0" ember-cli-babel "^7.23.0" ember-cli-htmlbars "^5.3.1" @@ -6416,11 +6416,6 @@ ansistyles@~0.1.3: resolved "https://registry.yarnpkg.com/ansistyles/-/ansistyles-0.1.3.tgz#5de60415bda071bb37127854c864f41b23254539" integrity sha1-XeYEFb2gcbs3EnhUyGT0GyMlRTk= -any-promise@^1.1.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" - integrity sha1-q8av7tzqUugJzcA3au0845Y10X8= - anymatch@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" @@ -10557,16 +10552,17 @@ ember-can@^3.1.0: ember-cli-htmlbars "^4.2.1" ember-inflector "^3.0.1" -ember-cli-addon-docs-yuidoc@^0.2.3: - version "0.2.4" - resolved "https://registry.yarnpkg.com/ember-cli-addon-docs-yuidoc/-/ember-cli-addon-docs-yuidoc-0.2.4.tgz#dd8f5cf4982e8492b255fb677e9d771925e27dce" - integrity sha512-asyGxagV+VKK+edc5iOW8JI8Css/d8mEE7ndWKqYa8Ub4eFwVfI6SLr9gHZc8f7q9BK+M5a/RSWHSnTTL5/3Zw== +ember-cli-addon-docs-yuidoc@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/ember-cli-addon-docs-yuidoc/-/ember-cli-addon-docs-yuidoc-1.0.0.tgz#0bc750c3950d77fbcce645855063013b295ee6be" + integrity sha512-q7tNVbD4niPgXEQ1Exfeh7Mfiwi3sbT5IG8vXgAumpJgATouTJrk3MGeZjInR7x6CV0AKDiExF/BdMwAshTmrg== dependencies: broccoli-caching-writer "^3.0.3" - ember-cli-babel "^7.7.3" - fs-extra "^5.0.0" - json-api-serializer "^1.11.0" - lodash "^4.17.5" + ember-cli-babel "^7.22.1" + ember-cli-htmlbars "^5.3.1" + fs-extra "^9.0.1" + json-api-serializer "^2.6.0" + lodash "^4.17.20" yuidocjs "^0.10.2" ember-cli-app-version@^5.0.0: @@ -14408,7 +14404,7 @@ hmac-drbg@^1.0.1: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.1" -hoek@2.x.x, hoek@4.x.x, hoek@6.x.x, hoek@~4.2.0: +hoek@2.x.x, hoek@6.x.x, hoek@~4.2.0: version "4.2.1" resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb" integrity sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA== @@ -15568,13 +15564,6 @@ isbinaryfile@^4.0.8: resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz#5d34b94865bd4946633ecc78a026fc76c5b11fcf" integrity sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w== -isemail@3.x.x: - version "3.2.0" - resolved "https://registry.yarnpkg.com/isemail/-/isemail-3.2.0.tgz#59310a021931a9fb06bbb51e155ce0b3f236832c" - integrity sha512-zKqkK+O+dGqevc93KNsbZ/TqTUFd46MwWjYOoMrjIMZ51eU7DtQG3Wmd9SQQT7i7RVnuTPEiYEWHU3MSbxC1Tg== - dependencies: - punycode "2.x.x" - isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -16214,15 +16203,6 @@ jest@^27.4.7: import-local "^3.0.2" jest-cli "^27.4.7" -joi@^12.0.0: - version "12.0.0" - resolved "https://registry.yarnpkg.com/joi/-/joi-12.0.0.tgz#46f55e68f4d9628f01bbb695902c8b307ad8d33a" - integrity sha512-z0FNlV4NGgjQN1fdtHYXf5kmgludM65fG/JlXzU6+rwkt9U5UWuXVYnXa2FpK0u6+qBuCmrm5byPNuiiddAHvQ== - dependencies: - hoek "4.x.x" - isemail "3.x.x" - topo "2.x.x" - jpeg-js@^0.4.2: version "0.4.3" resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.4.3.tgz#6158e09f1983ad773813704be80680550eff977b" @@ -16376,17 +16356,12 @@ jsesc@~0.5.0: resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= -json-api-serializer@^1.11.0: - version "1.15.1" - resolved "https://registry.yarnpkg.com/json-api-serializer/-/json-api-serializer-1.15.1.tgz#241ea66dfc5c629ae46d8315c6ee4232b81bb6b7" - integrity sha512-dp7d/TLWudViXADFnmdiq80krYZ+zA0WeB1771O1Is8HWdeySZofhp/TPWHCzgFPmGkgwI7oTEgjgZ6Dcxr/2w== +json-api-serializer@^2.6.0: + version "2.6.6" + resolved "https://registry.yarnpkg.com/json-api-serializer/-/json-api-serializer-2.6.6.tgz#fa5d283b913e0ea25653f4d04f981dc44d66dd4f" + integrity sha512-l7/e2O5/0+GU38RTMowRUKxRlT8zFc1oryAYBxqK54sFZnvJOJI2bo4XbbxnkTtvSzwkyv5DoBUuFm0hvG3avg== dependencies: - into-stream "^3.1.0" - joi "^12.0.0" - lodash "^4.5.1" - stream-to-array "^2.3.0" - through2 "^2.0.3" - unique-stream "^2.2.1" + setimmediate "^1.0.5" json-buffer@3.0.0: version "3.0.0" @@ -17317,7 +17292,7 @@ lodash.without@~4.4.0: resolved "https://registry.yarnpkg.com/lodash.without/-/lodash.without-4.4.0.tgz#3cd4574a00b67bae373a94b748772640507b7aac" integrity sha1-PNRXSgC2e643OpS3SHcmQFB7eqw= -lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@^4.5.1, lodash@^4.6.1, lodash@^4.7.0, lodash@~4.17.10: +lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.3.0, lodash@^4.6.1, lodash@^4.7.0, lodash@~4.17.10: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -20290,16 +20265,16 @@ punycode@1.3.2: resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= -punycode@2.x.x, punycode@^2.1.0, punycode@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== - punycode@^1.2.4, punycode@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= +punycode@^2.1.0, punycode@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + pupa@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" @@ -21906,7 +21881,7 @@ set-value@^2.0.0, set-value@^2.0.1, set-value@^4.0.1: is-plain-object "^2.0.4" is-primitive "^3.0.1" -setimmediate@^1.0.4: +setimmediate@^1.0.4, setimmediate@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= @@ -22530,13 +22505,6 @@ stream-shift@^1.0.0: resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ== -stream-to-array@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/stream-to-array/-/stream-to-array-2.3.0.tgz#bbf6b39f5f43ec30bc71babcb37557acecf34353" - integrity sha1-u/azn19D7DC8cbq8s3VXrOzzQ1M= - dependencies: - any-promise "^1.1.0" - strict-uri-encode@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546" @@ -23277,15 +23245,7 @@ throttleit@0.0.2: resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-0.0.2.tgz#cfedf88e60c00dd9697b61fdd2a8343a9b680eaf" integrity sha1-z+34jmDADdlpe2H90qg0OptoDq8= -through2-filter@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254" - integrity sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA== - dependencies: - through2 "~2.0.0" - xtend "~4.0.0" - -through2@^2.0.0, through2@^2.0.3, through2@~2.0.0: +through2@^2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== @@ -23466,13 +23426,6 @@ toidentifier@1.0.0: resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== -topo@2.x.x: - version "2.0.2" - resolved "https://registry.yarnpkg.com/topo/-/topo-2.0.2.tgz#cd5615752539057c0dc0491a621c3bc6fbe1d182" - integrity sha1-zVYVdSU5BXwNwEkaYhw7xvvh0YI= - dependencies: - hoek "4.x.x" - tough-cookie@^4.0.0, tough-cookie@~2.2.0, tough-cookie@~2.3.3: version "2.3.4" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655" @@ -23858,14 +23811,6 @@ unique-slug@^2.0.0: dependencies: imurmurhash "^0.1.4" -unique-stream@^2.2.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz#c65d110e9a4adf9a6c5948b28053d9a8d04cbeac" - integrity sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A== - dependencies: - json-stable-stringify-without-jsonify "^1.0.1" - through2-filter "^3.0.0" - unique-string@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a" @@ -24863,7 +24808,7 @@ xmlhttprequest-ssl@^1.6.2: resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz#03b713873b01659dfa2c1c5d056065b27ddc2de6" integrity sha512-3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q== -xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1: +xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== From aa623485034046735da4a4fedf9098054c4eda4c Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Corvo Date: Tue, 22 Feb 2022 08:46:29 -0800 Subject: [PATCH 20/26] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Update=20babel-pl?= =?UTF-8?q?ugin-ember-modules-api-polyfill?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/rose/package.json | 2 +- yarn.lock | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/addons/rose/package.json b/addons/rose/package.json index 292c1f3ca..ae6e3c97e 100644 --- a/addons/rose/package.json +++ b/addons/rose/package.json @@ -59,7 +59,7 @@ "@storybook/theming": "^6.3.0", "babel-eslint": "^10.1.0", "babel-loader": "^8.2.2", - "babel-plugin-ember-modules-api-polyfill": "^2.12.0", + "babel-plugin-ember-modules-api-polyfill": "^3.5.0", "broccoli-asset-rev": "^3.0.0", "doctoc": "^2.0.1", "ember-auto-import": "^1.12.0", diff --git a/yarn.lock b/yarn.lock index 7c0982189..bd5f6d86f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6932,13 +6932,6 @@ babel-plugin-ember-data-packages-polyfill@^0.1.2: dependencies: "@ember-data/rfc395-data" "^0.0.4" -babel-plugin-ember-modules-api-polyfill@^2.12.0: - version "2.13.4" - resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-2.13.4.tgz#cf62bc9bfd808c48d810d5194f4329e9453bd603" - integrity sha512-uxQPkEQAzCYdwhZk16O9m1R4xtCRNy4oEUTBrccOPfzlIahRZJic/JeP/ZEL0BC6Mfq6r55eOg6gMF/zdFoCvA== - dependencies: - ember-rfc176-data "^0.3.13" - babel-plugin-ember-modules-api-polyfill@^3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-3.5.0.tgz#27b6087fac75661f779f32e60f94b14d0e9f6965" @@ -11475,7 +11468,7 @@ ember-resolver@^8.0.3: ember-cli-version-checker "^5.1.2" resolve "^1.20.0" -ember-rfc176-data@^0.3.13, ember-rfc176-data@^0.3.15, ember-rfc176-data@^0.3.17: +ember-rfc176-data@^0.3.15, ember-rfc176-data@^0.3.17: version "0.3.17" resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.17.tgz#d4fc6c33abd6ef7b3440c107a28e04417b49860a" integrity sha512-EVzTTKqxv9FZbEh6Ktw56YyWRAA0MijKvl7H8C06wVF+8f/cRRz3dXxa4nkwjzyVwx4rzKGuIGq77hxJAQhWWw== From ea9e286de4409def987c812f444d9c9927e40a4f Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Corvo Date: Tue, 22 Feb 2022 09:31:20 -0800 Subject: [PATCH 21/26] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20Update=20@ember/te?= =?UTF-8?q?st-helpers?= 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 +- ui/admin/package.json | 2 +- ui/desktop/package.json | 2 +- yarn.lock | 8 ++++---- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/addons/api/package.json b/addons/api/package.json index f92862d48..952aa0dac 100644 --- a/addons/api/package.json +++ b/addons/api/package.json @@ -36,7 +36,7 @@ "js-bexpr": "hashicorp/js-bexpr#9b4a4b54d85eba67fdfc0990133d1518d890b1e1", "@babel/core": "^7.16.5", "@ember/optional-features": "^2.0.0", - "@ember/test-helpers": "^2.4.2", + "@ember/test-helpers": "^2.6.0", "@glimmer/component": "^1.0.4", "@glimmer/tracking": "^1.0.4", "babel-eslint": "^10.1.0", diff --git a/addons/auth/package.json b/addons/auth/package.json index 14e337b01..2562cea2c 100644 --- a/addons/auth/package.json +++ b/addons/auth/package.json @@ -28,7 +28,7 @@ }, "devDependencies": { "@ember/optional-features": "^2.0.0", - "@ember/test-helpers": "^2.4.2", + "@ember/test-helpers": "^2.6.0", "@glimmer/component": "^1.0.4", "@glimmer/tracking": "^1.0.4", "babel-eslint": "^10.1.0", diff --git a/addons/core/package.json b/addons/core/package.json index 34d8a6e2b..48c92d29c 100644 --- a/addons/core/package.json +++ b/addons/core/package.json @@ -42,7 +42,7 @@ }, "devDependencies": { "@ember/optional-features": "^2.0.0", - "@ember/test-helpers": "^2.4.2", + "@ember/test-helpers": "^2.6.0", "@glimmer/component": "^1.0.4", "@glimmer/tracking": "^1.0.4", "babel-eslint": "^10.1.0", diff --git a/addons/rose/package.json b/addons/rose/package.json index 292c1f3ca..a012f94a4 100644 --- a/addons/rose/package.json +++ b/addons/rose/package.json @@ -41,7 +41,7 @@ "devDependencies": { "@babel/core": "^7.16.5", "@ember/optional-features": "^2.0.0", - "@ember/test-helpers": "^2.4.2", + "@ember/test-helpers": "^2.6.0", "@glimmer/component": "^1.0.4", "@glimmer/tracking": "^1.0.4", "@hashicorp/flight-icons": "^2.0.1", diff --git a/ui/admin/package.json b/ui/admin/package.json index 6d2ac1828..4836b581d 100644 --- a/ui/admin/package.json +++ b/ui/admin/package.json @@ -38,7 +38,7 @@ "@babel/core": "^7.16.5", "@ember/optional-features": "^2.0.0", "@ember/render-modifiers": "^2.0.2", - "@ember/test-helpers": "^2.4.2", + "@ember/test-helpers": "^2.6.0", "@glimmer/component": "^1.0.4", "@glimmer/tracking": "^1.0.4", "babel-eslint": "^10.1.0", diff --git a/ui/desktop/package.json b/ui/desktop/package.json index cca7db5a3..22260a301 100755 --- a/ui/desktop/package.json +++ b/ui/desktop/package.json @@ -56,7 +56,7 @@ "@doyensec/electronegativity": "^1.9.1", "@ember/optional-features": "^2.0.0", "@ember/render-modifiers": "^2.0.2", - "@ember/test-helpers": "^2.4.2", + "@ember/test-helpers": "^2.6.0", "@glimmer/component": "^1.0.4", "@glimmer/tracking": "^1.0.4", "@playwright/test": "^1.15.0", diff --git a/yarn.lock b/yarn.lock index 7c0982189..83bf194b6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2943,10 +2943,10 @@ ember-cli-htmlbars "^5.7.1" ember-destroyable-polyfill "^2.0.3" -"@ember/test-helpers@^2.4.2": - version "2.4.2" - resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-2.4.2.tgz#e5be97e316dc502d7da933461135fbcb9254726e" - integrity sha512-++k/dXZ0IeOQLSm0Yu5QuCRe9UoptuckMhaXHY37VLb1varLHRuP8908kigVNt9c5waiocaK4jPjDBkKYRLlfA== +"@ember/test-helpers@^2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-2.6.0.tgz#d687515c6ab49ba72717fc62046970ef4a72ea9c" + integrity sha512-N5sr3layWk60wB3maCy+/5hFHQRcTh8aqxcZTSs3Od9QkuHdWBtRgMGLP/35mXpJlgWuu3xqLpt6u3dGHc8gCg== dependencies: "@ember/test-waiters" "^3.0.0" broccoli-debug "^0.6.5" From 48bb575b8fde2dc36ea395a5b49db37ff8fe0ade Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Corvo Date: Tue, 22 Feb 2022 09:45:14 -0800 Subject: [PATCH 22/26] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Update=20doctoc?= 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 | 8 ++++---- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/addons/api/package.json b/addons/api/package.json index f92862d48..676f79d22 100644 --- a/addons/api/package.json +++ b/addons/api/package.json @@ -41,7 +41,7 @@ "@glimmer/tracking": "^1.0.4", "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", - "doctoc": "^2.0.1", + "doctoc": "^2.1.0", "ember-auto-import": "^1.12.0", "ember-cli": "~4.1.0", "ember-cli-dependency-checker": "^3.2.0", diff --git a/addons/auth/package.json b/addons/auth/package.json index 14e337b01..24801d3f2 100644 --- a/addons/auth/package.json +++ b/addons/auth/package.json @@ -34,7 +34,7 @@ "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", "core": "*", - "doctoc": "^2.0.1", + "doctoc": "^2.1.0", "ember-auto-import": "^1.12.0", "ember-cli": "~4.1.0", "ember-cli-dependency-checker": "^3.2.0", diff --git a/addons/core/package.json b/addons/core/package.json index 34d8a6e2b..4508190d5 100644 --- a/addons/core/package.json +++ b/addons/core/package.json @@ -47,7 +47,7 @@ "@glimmer/tracking": "^1.0.4", "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", - "doctoc": "^2.0.1", + "doctoc": "^2.1.0", "ember-auto-import": "^1.12.0", "ember-cli": "~4.1.0", "ember-cli-dependency-checker": "^3.2.0", diff --git a/addons/rose/package.json b/addons/rose/package.json index 292c1f3ca..a272566f1 100644 --- a/addons/rose/package.json +++ b/addons/rose/package.json @@ -61,7 +61,7 @@ "babel-loader": "^8.2.2", "babel-plugin-ember-modules-api-polyfill": "^2.12.0", "broccoli-asset-rev": "^3.0.0", - "doctoc": "^2.0.1", + "doctoc": "^2.1.0", "ember-auto-import": "^1.12.0", "ember-cli": "~4.1.0", "ember-cli-dependency-checker": "^3.2.0", diff --git a/package.json b/package.json index eb0ba9c44..7b6148ae1 100755 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ }, "devDependencies": { "cz-conventional-changelog": "^3.1.0", - "doctoc": "^2.0.1", + "doctoc": "^2.1.0", "git-cz": "^4.3.1", "license-checker": "^25.0.1" }, diff --git a/ui/admin/package.json b/ui/admin/package.json index 6d2ac1828..582f974ba 100644 --- a/ui/admin/package.json +++ b/ui/admin/package.json @@ -46,7 +46,7 @@ "broccoli-asset-rev": "^3.0.0", "clipboard": "^2.0.8", "core": "*", - "doctoc": "^2.0.1", + "doctoc": "^2.1.0", "ember-a11y-testing": "^4.2.0", "ember-auto-import": "^1.12.0", "ember-breadcrumbs": "^0.2.3", diff --git a/ui/desktop/package.json b/ui/desktop/package.json index cca7db5a3..31493554f 100755 --- a/ui/desktop/package.json +++ b/ui/desktop/package.json @@ -67,7 +67,7 @@ "core": "*", "cross-env": "^7.0.3", "cross-os": "^1.4.0", - "doctoc": "^2.0.1", + "doctoc": "^2.1.0", "ember-a11y-testing": "^4.2.0", "ember-auto-import": "^1.12.0", "ember-autofocus-modifier": "^2.0.0", diff --git a/yarn.lock b/yarn.lock index 7c0982189..08968cdaf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10100,10 +10100,10 @@ dir-glob@^3.0.1: dependencies: path-type "^4.0.0" -doctoc@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/doctoc/-/doctoc-2.0.1.tgz#d5aee2bce65a438ff8717d9e51df3d540caa3b78" - integrity sha512-JsxnSVZtLCThKehjFPBDhP1+ZLmdfXQynZH/0ABAwrnd1Zf3AV6LigC9oWJyaZ+c6RXCDnlGUNJ7I+1v8VaaRg== +doctoc@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/doctoc/-/doctoc-2.1.0.tgz#e7cbcd1f9e65519c295461423b2e7195d9e0d7ab" + integrity sha512-0darEVEuWKLyIlpGOzE5cILf/pgUu25qUs6YwCqLqfxb8+3b9Cl4iakA8vwYrBQOkJ5SwpHKEPVMu2KOMrTA7A== dependencies: "@textlint/markdown-to-ast" "~6.1.7" anchor-markdown-header "~0.5.7" From ab9581ea12f423288cabff7fb14f4b27697b7d82 Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Corvo Date: Tue, 22 Feb 2022 10:25:55 -0800 Subject: [PATCH 23/26] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Update=20ember-cl?= =?UTF-8?q?i-htmlbars?= 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 +- ui/admin/package.json | 2 +- ui/desktop/package.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/api/package.json b/addons/api/package.json index f92862d48..bf4f8e38e 100644 --- a/addons/api/package.json +++ b/addons/api/package.json @@ -26,7 +26,7 @@ "dependencies": { "ember-can": "^3.1.0", "ember-cli-babel": "^7.26.8", - "ember-cli-htmlbars": "^5.7.1", + "ember-cli-htmlbars": "^6.0.1", "ember-cli-mirage": "^2.2.0", "ember-data": "^3.20.0", "ember-data-model-fragments": "5.0.0-beta.2", diff --git a/addons/auth/package.json b/addons/auth/package.json index 14e337b01..108e76a38 100644 --- a/addons/auth/package.json +++ b/addons/auth/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "ember-cli-babel": "^7.26.8", - "ember-cli-htmlbars": "^5.7.1", + "ember-cli-htmlbars": "^6.0.1", "ember-fetch": "^8.1.1", "ember-simple-auth": "^4.0.0" }, diff --git a/addons/core/package.json b/addons/core/package.json index 34d8a6e2b..2544c31d8 100644 --- a/addons/core/package.json +++ b/addons/core/package.json @@ -32,7 +32,7 @@ "auth": "*", "ember-browser-services": "^2.0.0", "ember-cli-babel": "^7.26.8", - "ember-cli-htmlbars": "^5.7.1", + "ember-cli-htmlbars": "^6.0.1", "ember-feature-flags": "^6.0.0", "ember-intl": "^5.7.0", "ember-loading": "^2.0.0", diff --git a/addons/rose/package.json b/addons/rose/package.json index 292c1f3ca..0aff38444 100644 --- a/addons/rose/package.json +++ b/addons/rose/package.json @@ -30,7 +30,7 @@ }, "dependencies": { "ember-cli-babel": "^7.26.8", - "ember-cli-htmlbars": "^5.7.1", + "ember-cli-htmlbars": "^6.0.1", "ember-composable-helpers": "^4.5.0", "ember-focus-trap": "^0.7.0", "ember-named-blocks-polyfill": "^0.2.4", diff --git a/ui/admin/package.json b/ui/admin/package.json index 6d2ac1828..1eb37233f 100644 --- a/ui/admin/package.json +++ b/ui/admin/package.json @@ -56,7 +56,7 @@ "ember-cli-code-coverage": "^1.0.3", "ember-cli-content-security-policy": "^1.1.1", "ember-cli-dependency-checker": "^3.2.0", - "ember-cli-htmlbars": "^5.7.1", + "ember-cli-htmlbars": "^6.0.1", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sass": "^10.0.1", "ember-cli-sri": "^2.1.1", diff --git a/ui/desktop/package.json b/ui/desktop/package.json index cca7db5a3..9c036328c 100755 --- a/ui/desktop/package.json +++ b/ui/desktop/package.json @@ -76,7 +76,7 @@ "ember-cli-babel": "^7.26.8", "ember-cli-code-coverage": "^1.0.3", "ember-cli-dependency-checker": "^3.2.0", - "ember-cli-htmlbars": "^5.7.1", + "ember-cli-htmlbars": "^6.0.1", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sass": "^10.0.1", "ember-cli-sri": "^2.1.1", From 4fdd4d777da86f7bfea95c52ad3465c255931927 Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Corvo Date: Tue, 22 Feb 2022 12:09:15 -0800 Subject: [PATCH 24/26] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Update=20ember-co?= =?UTF-8?q?mposable-helpers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 292c1f3ca..2a5585820 100644 --- a/addons/rose/package.json +++ b/addons/rose/package.json @@ -31,7 +31,7 @@ "dependencies": { "ember-cli-babel": "^7.26.8", "ember-cli-htmlbars": "^5.7.1", - "ember-composable-helpers": "^4.5.0", + "ember-composable-helpers": "^5.0.0", "ember-focus-trap": "^0.7.0", "ember-named-blocks-polyfill": "^0.2.4", "ember-radio-button": "^2.0.1", diff --git a/yarn.lock b/yarn.lock index 7c0982189..75a63c7f7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11076,10 +11076,10 @@ ember-compatibility-helpers@^1.1.1, ember-compatibility-helpers@^1.1.2, ember-co fs-extra "^9.1.0" semver "^5.4.1" -ember-composable-helpers@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/ember-composable-helpers/-/ember-composable-helpers-4.5.0.tgz#94febbdf4348e64f45f7a6f993f326e32540a61e" - integrity sha512-XjpDLyVPsLCy6kd5dIxZonOECCO6AA5sY5Hr6tYUbJg3s5ghFAiFWaNcYraYC+fL2yPJQAswwpfwGlQORUJZkw== +ember-composable-helpers@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ember-composable-helpers/-/ember-composable-helpers-5.0.0.tgz#055bab3a3e234ab2917499b1465e968c253ca885" + integrity sha512-gyUrjiSju4QwNrsCLbBpP0FL6VDFZaELNW7Kbcp60xXhjvNjncYgzm4zzYXhT+i1lLA6WEgRZ3lOGgyBORYD0w== dependencies: "@babel/core" "^7.0.0" broccoli-funnel "2.0.1" From 23a353d68af1971af49eb555c1decc0f27c6d1ba Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Corvo Date: Tue, 22 Feb 2022 13:10:07 -0800 Subject: [PATCH 25/26] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Update=20ember=20?= =?UTF-8?q?named=20blocks=20polyfill?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/rose/package.json | 2 +- ui/admin/package.json | 2 +- ui/desktop/package.json | 2 +- yarn.lock | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/rose/package.json b/addons/rose/package.json index 292c1f3ca..d541ffe5d 100644 --- a/addons/rose/package.json +++ b/addons/rose/package.json @@ -33,7 +33,7 @@ "ember-cli-htmlbars": "^5.7.1", "ember-composable-helpers": "^4.5.0", "ember-focus-trap": "^0.7.0", - "ember-named-blocks-polyfill": "^0.2.4", + "ember-named-blocks-polyfill": "^0.2.5", "ember-radio-button": "^2.0.1", "ember-uuid": "^2.1.0", "emberx-select": "github:adopted-ember-addons/emberx-select#bc5f774" diff --git a/ui/admin/package.json b/ui/admin/package.json index 6d2ac1828..0c456f0fb 100644 --- a/ui/admin/package.json +++ b/ui/admin/package.json @@ -32,7 +32,7 @@ "posttest": "ember coverage-merge && yarn clean:coverage" }, "dependencies": { - "ember-named-blocks-polyfill": "^0.2.4" + "ember-named-blocks-polyfill": "^0.2.5" }, "devDependencies": { "@babel/core": "^7.16.5", diff --git a/ui/desktop/package.json b/ui/desktop/package.json index cca7db5a3..f1a2e3385 100755 --- a/ui/desktop/package.json +++ b/ui/desktop/package.json @@ -50,7 +50,7 @@ } }, "dependencies": { - "ember-named-blocks-polyfill": "^0.2.4" + "ember-named-blocks-polyfill": "^0.2.5" }, "devDependencies": { "@doyensec/electronegativity": "^1.9.1", diff --git a/yarn.lock b/yarn.lock index 7c0982189..7939c176b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11409,10 +11409,10 @@ ember-modifier@^2.1.1, ember-modifier@^2.1.2: ember-destroyable-polyfill "^2.0.2" ember-modifier-manager-polyfill "^1.2.0" -ember-named-blocks-polyfill@^0.2.4: - version "0.2.4" - resolved "https://registry.yarnpkg.com/ember-named-blocks-polyfill/-/ember-named-blocks-polyfill-0.2.4.tgz#f5f30711ee89244927b55aae7fa9630edaadc974" - integrity sha512-PsohC7ejjS7V++6i/JSy0pl1hXLV3IS3Qs+O7SrjIPYcg1UEmUwqgPiDmXqNgy0p2dc5TK5bIJTtX8wofCI63Q== +ember-named-blocks-polyfill@^0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/ember-named-blocks-polyfill/-/ember-named-blocks-polyfill-0.2.5.tgz#d5841406277026a221f479c815cfbac6cdcaeecb" + integrity sha512-OVMxzkfqJrEvmiky7gFzmuTaImCGm7DOudHWTdMBPO7E+dQSunrcRsJMgO9ZZ56suqBIz/yXbEURrmGS+avHxA== dependencies: ember-cli-babel "^7.19.0" ember-cli-version-checker "^5.1.1" From 6bd70237765c400b6b335a7d04cb5c655c21a1a0 Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Corvo Date: Tue, 22 Feb 2022 14:21:28 -0800 Subject: [PATCH 26/26] =?UTF-8?q?Revert=20"chore:=20=F0=9F=A4=96=20Update?= =?UTF-8?q?=20ember-cli-htmlbars"?= 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 +- ui/admin/package.json | 2 +- ui/desktop/package.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/api/package.json b/addons/api/package.json index bf4f8e38e..f92862d48 100644 --- a/addons/api/package.json +++ b/addons/api/package.json @@ -26,7 +26,7 @@ "dependencies": { "ember-can": "^3.1.0", "ember-cli-babel": "^7.26.8", - "ember-cli-htmlbars": "^6.0.1", + "ember-cli-htmlbars": "^5.7.1", "ember-cli-mirage": "^2.2.0", "ember-data": "^3.20.0", "ember-data-model-fragments": "5.0.0-beta.2", diff --git a/addons/auth/package.json b/addons/auth/package.json index 108e76a38..14e337b01 100644 --- a/addons/auth/package.json +++ b/addons/auth/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "ember-cli-babel": "^7.26.8", - "ember-cli-htmlbars": "^6.0.1", + "ember-cli-htmlbars": "^5.7.1", "ember-fetch": "^8.1.1", "ember-simple-auth": "^4.0.0" }, diff --git a/addons/core/package.json b/addons/core/package.json index 2544c31d8..34d8a6e2b 100644 --- a/addons/core/package.json +++ b/addons/core/package.json @@ -32,7 +32,7 @@ "auth": "*", "ember-browser-services": "^2.0.0", "ember-cli-babel": "^7.26.8", - "ember-cli-htmlbars": "^6.0.1", + "ember-cli-htmlbars": "^5.7.1", "ember-feature-flags": "^6.0.0", "ember-intl": "^5.7.0", "ember-loading": "^2.0.0", diff --git a/addons/rose/package.json b/addons/rose/package.json index 4dbfdd404..8409863f0 100644 --- a/addons/rose/package.json +++ b/addons/rose/package.json @@ -30,7 +30,7 @@ }, "dependencies": { "ember-cli-babel": "^7.26.8", - "ember-cli-htmlbars": "^6.0.1", + "ember-cli-htmlbars": "^5.7.1", "ember-composable-helpers": "^4.5.0", "ember-focus-trap": "^0.7.0", "ember-named-blocks-polyfill": "^0.2.4", diff --git a/ui/admin/package.json b/ui/admin/package.json index 1eb37233f..6d2ac1828 100644 --- a/ui/admin/package.json +++ b/ui/admin/package.json @@ -56,7 +56,7 @@ "ember-cli-code-coverage": "^1.0.3", "ember-cli-content-security-policy": "^1.1.1", "ember-cli-dependency-checker": "^3.2.0", - "ember-cli-htmlbars": "^6.0.1", + "ember-cli-htmlbars": "^5.7.1", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sass": "^10.0.1", "ember-cli-sri": "^2.1.1", diff --git a/ui/desktop/package.json b/ui/desktop/package.json index 9c036328c..cca7db5a3 100755 --- a/ui/desktop/package.json +++ b/ui/desktop/package.json @@ -76,7 +76,7 @@ "ember-cli-babel": "^7.26.8", "ember-cli-code-coverage": "^1.0.3", "ember-cli-dependency-checker": "^3.2.0", - "ember-cli-htmlbars": "^6.0.1", + "ember-cli-htmlbars": "^5.7.1", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sass": "^10.0.1", "ember-cli-sri": "^2.1.1",