From 44b5d7427a8a1285844c6276a4d1a3986bb9bf0b Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Tue, 8 Feb 2022 15:50:29 -0500 Subject: [PATCH 01/16] =?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 02/16] =?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 03/16] 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 04/16] =?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 4994b8256bc91ece8d8123b64bafcadb8781b29f Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 16 Feb 2022 15:05:35 -0500 Subject: [PATCH 05/16] =?UTF-8?q?chore:=20=F0=9F=A4=96=20add=20read-only?= =?UTF-8?q?=20host=20route=20for=20dynamic=20hosts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../host-sets/host-set/hosts/host.js | 3 + ui/admin/app/router.js | 4 +- .../host-sets/host-set/hosts/host.js | 3 + .../host-sets/host-set/hosts/host/index.js | 3 + .../host-sets/host-set/hosts/index.js | 3 + .../host-catalog/host-sets/host-set/hosts.hbs | 82 +---------------- .../host-sets/host-set/hosts/host.hbs | 3 + .../host-sets/host-set/hosts/host/index.hbs | 9 ++ .../host-sets/host-set/hosts/index.hbs | 91 +++++++++++++++++++ .../host-sets/host-set/hosts/host-test.js | 17 ++++ .../host-sets/host-set/hosts/host-test.js | 16 ++++ .../host-set/hosts/host/index-test.js | 16 ++++ .../host-sets/host-set/hosts/index-test.js | 16 ++++ 13 files changed, 184 insertions(+), 82 deletions(-) create mode 100644 ui/admin/app/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host.js create mode 100644 ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host.js create mode 100644 ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host/index.js create mode 100644 ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/index.js create mode 100644 ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host.hbs create mode 100644 ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host/index.hbs create mode 100644 ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/index.hbs create mode 100644 ui/admin/tests/unit/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host-test.js create mode 100644 ui/admin/tests/unit/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host-test.js create mode 100644 ui/admin/tests/unit/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host/index-test.js create mode 100644 ui/admin/tests/unit/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/index-test.js diff --git a/ui/admin/app/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host.js b/ui/admin/app/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host.js new file mode 100644 index 000000000..6ef77b91f --- /dev/null +++ b/ui/admin/app/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host.js @@ -0,0 +1,3 @@ +import Controller from '@ember/controller'; + +export default class ScopesScopeHostCatalogsHostCatalogHostSetsHostSetHostsHostController extends Controller {} diff --git a/ui/admin/app/router.js b/ui/admin/app/router.js index ef557fbc8..75ce77c2c 100644 --- a/ui/admin/app/router.js +++ b/ui/admin/app/router.js @@ -91,7 +91,9 @@ Router.map(function () { this.route('host-sets', function () { this.route('new'); this.route('host-set', { path: ':host_set_id' }, function () { - this.route('hosts'); + this.route('hosts', function () { + this.route('host', { path: ':host_id' }, function () {}); + }); this.route('add-hosts'); this.route('create-and-add-host'); }); diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host.js new file mode 100644 index 000000000..3773e93c5 --- /dev/null +++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host.js @@ -0,0 +1,3 @@ +import Route from '@ember/routing/route'; + +export default class ScopesScopeHostCatalogsHostCatalogHostSetsHostSetHostsHostRoute extends Route {} diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host/index.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host/index.js new file mode 100644 index 000000000..873e01b71 --- /dev/null +++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host/index.js @@ -0,0 +1,3 @@ +import Route from '@ember/routing/route'; + +export default class ScopesScopeHostCatalogsHostCatalogHostSetsHostSetHostsHostIndexRoute extends Route {} diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/index.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/index.js new file mode 100644 index 000000000..30f72878b --- /dev/null +++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/index.js @@ -0,0 +1,3 @@ +import Route from '@ember/routing/route'; + +export default class ScopesScopeHostCatalogsHostCatalogHostSetsHostSetHostsIndexRoute extends Route {} diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs index 21d06fcb9..c78470ec0 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs @@ -1,83 +1,3 @@ {{page-title (t 'resources.host.title_plural')}} -{{#if @model.hosts}} - - - - - {{t 'form.name.label'}} - {{t 'form.type.label'}} - {{t 'form.id.label'}} - {{#if @model.isStatic}} - {{t 'titles.actions'}} - {{/if}} - - - - {{#each @model.hosts as |host|}} - - - - {{host.displayName}} - -

{{host.description}}

- - - - - - - {{host.id}} - - - - {{#if (can 'removeHosts hostSet' @model.hostSet)}} - - - {{t 'actions.remove'}} - - - {{/if}} - - - {{/each}} - - - -{{/if}} - -{{#unless @model.hosts}} - - - - {{t 'resources.host-set.host.messages.none.description'}} - - {{!-- - - - {{t "resources.host-set.actions.create-and-add-host"}} - - --}} - - -{{/unless}} \ No newline at end of file +{{outlet}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host.hbs new file mode 100644 index 000000000..7d32ecb0d --- /dev/null +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host.hbs @@ -0,0 +1,3 @@ +{{page-title @model.displayName}} + +{{outlet}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host/index.hbs new file mode 100644 index 000000000..2a0249dfa --- /dev/null +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host/index.hbs @@ -0,0 +1,9 @@ + + +{{!-- + +--}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/index.hbs new file mode 100644 index 000000000..3d1189b2e --- /dev/null +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/index.hbs @@ -0,0 +1,91 @@ +{{#if @model.hosts}} + + + + + {{t 'form.name.label'}} + {{t 'form.type.label'}} + {{t 'form.id.label'}} + {{#if @model.isStatic}} + {{t 'titles.actions'}} + {{/if}} + + + + {{#each @model.hosts as |host|}} + + + {{#if host.isStatic}} + + {{host.displayName}} + + {{else}} + {{! Link to a different subroute for dynamic/plugin hosts }} + + {{host.displayName}} + + {{/if}} +

{{host.description}}

+ + + + + + + {{host.id}} + + + + {{#if (can 'removeHosts hostSet' @model.hostSet)}} + + + {{t 'actions.remove'}} + + + {{/if}} + + + {{/each}} + + + +{{/if}} + +{{#unless @model.hosts}} + + + + {{t 'resources.host-set.host.messages.none.description'}} + + {{!-- + + + {{t "resources.host-set.actions.create-and-add-host"}} + + --}} + + +{{/unless}} \ No newline at end of file diff --git a/ui/admin/tests/unit/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host-test.js b/ui/admin/tests/unit/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host-test.js new file mode 100644 index 000000000..7779bde77 --- /dev/null +++ b/ui/admin/tests/unit/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host-test.js @@ -0,0 +1,17 @@ +import { module, test } from 'qunit'; +import { setupTest } from 'ember-qunit'; + +module( + 'Unit | Controller | scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host', + function (hooks) { + setupTest(hooks); + + // TODO: Replace this with your real tests. + test('it exists', function (assert) { + let controller = this.owner.lookup( + 'controller:scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host' + ); + assert.ok(controller); + }); + } +); diff --git a/ui/admin/tests/unit/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host-test.js b/ui/admin/tests/unit/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host-test.js new file mode 100644 index 000000000..6fc01e757 --- /dev/null +++ b/ui/admin/tests/unit/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host-test.js @@ -0,0 +1,16 @@ +import { module, test } from 'qunit'; +import { setupTest } from 'ember-qunit'; + +module( + 'Unit | Route | scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host', + function (hooks) { + setupTest(hooks); + + test('it exists', function (assert) { + let route = this.owner.lookup( + 'route:scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host' + ); + assert.ok(route); + }); + } +); diff --git a/ui/admin/tests/unit/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host/index-test.js b/ui/admin/tests/unit/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host/index-test.js new file mode 100644 index 000000000..94e8acb8f --- /dev/null +++ b/ui/admin/tests/unit/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host/index-test.js @@ -0,0 +1,16 @@ +import { module, test } from 'qunit'; +import { setupTest } from 'ember-qunit'; + +module( + 'Unit | Route | scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host/index', + function (hooks) { + setupTest(hooks); + + test('it exists', function (assert) { + let route = this.owner.lookup( + 'route:scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host/index' + ); + assert.ok(route); + }); + } +); diff --git a/ui/admin/tests/unit/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/index-test.js b/ui/admin/tests/unit/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/index-test.js new file mode 100644 index 000000000..53eabbeab --- /dev/null +++ b/ui/admin/tests/unit/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/index-test.js @@ -0,0 +1,16 @@ +import { module, test } from 'qunit'; +import { setupTest } from 'ember-qunit'; + +module( + 'Unit | Route | scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/index', + function (hooks) { + setupTest(hooks); + + test('it exists', function (assert) { + let route = this.owner.lookup( + 'route:scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/index' + ); + assert.ok(route); + }); + } +); From e15198d944f5a7c313b1e79926394c3c81184c99 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 16 Feb 2022 15:20:27 -0500 Subject: [PATCH 06/16] chore: add missing breadcrumb --- .../host-catalog/host-sets/host-set/hosts/host.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/ui/admin/app/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host.js b/ui/admin/app/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host.js index 6ef77b91f..97ce819cc 100644 --- a/ui/admin/app/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host.js +++ b/ui/admin/app/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host.js @@ -1,3 +1,13 @@ import Controller from '@ember/controller'; -export default class ScopesScopeHostCatalogsHostCatalogHostSetsHostSetHostsHostController extends Controller {} +export default class ScopesScopeHostCatalogsHostCatalogHostSetsHostSetHostsHostController extends Controller { + // =attributes + + /** + * A role breadcrumb + * @type {string} + */ + get breadCrumb() { + return this.model.displayName; + } +} From 85744200f7dfb85a708df1e9712b85568e283948 Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Corvo Date: Wed, 23 Feb 2022 08:03:32 -0800 Subject: [PATCH 07/16] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Add=20resolutions?= =?UTF-8?q?=20engine.io?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 ++- yarn.lock | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 7b6148ae1..304855ddd 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", + "engine.io": "^5.2.1" }, "config": { "commitizen": { diff --git a/yarn.lock b/yarn.lock index 80a9f952f..3e4932745 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11749,10 +11749,10 @@ engine.io-parser@~4.0.0: dependencies: base64-arraybuffer "0.1.4" -engine.io@~5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-5.1.1.tgz#a1f97e51ddf10cbd4db8b5ff4b165aad3760cdd3" - integrity sha512-aMWot7H5aC8L4/T8qMYbLdvKlZOdJTH54FxfdFunTGvhMx1BHkJOntWArsVfgAZVwAO9LC2sryPWRcEeUzCe5w== +engine.io@^5.2.1, engine.io@~5.1.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-5.2.1.tgz#3f84baf13471d35a6f3284a4effcd04c2f73c8a1" + integrity sha512-hyNxjVgWp619QMfqi/+/6/LQF+ueOIWeVOza3TeyvxUGjeT9U/xPkkHW/NJNuhbStrxMujEoMadoc2EY7DDEnw== dependencies: accepts "~1.3.4" base64id "2.0.0" From 34c1adeba24b6c3c0611a8f655023552a7a1ce15 Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Corvo Date: Wed, 23 Feb 2022 08:17:12 -0800 Subject: [PATCH 08/16] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Add=20resolutions?= =?UTF-8?q?=20markdown=20it?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 ++- yarn.lock | 52 ++++++++-------------------------------------------- 2 files changed, 10 insertions(+), 45 deletions(-) diff --git a/package.json b/package.json index 7b6148ae1..6b7ac60e2 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", + "markdown-it": "^12.3.2" }, "config": { "commitizen": { diff --git a/yarn.lock b/yarn.lock index 80a9f952f..15bcad3be 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6467,7 +6467,7 @@ are-we-there-yet@~1.1.2: delegates "^1.0.0" readable-stream "^2.0.6" -argparse@^1.0.7, argparse@~1.0.2: +argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== @@ -11791,7 +11791,7 @@ ensure-posix-path@^1.0.0, ensure-posix-path@^1.0.1, ensure-posix-path@^1.0.2, en resolved "https://registry.yarnpkg.com/ensure-posix-path/-/ensure-posix-path-1.1.1.tgz#3c62bdb19fa4681544289edb2b382adc029179ce" integrity sha512-VWU0/zXzVbeJNXvME/5EmLuEj2TauvoaTz6aFYK1Z92JCBlDlZ3Gu0tuGR42kpW1754ywTs+QB0g5TP0oj9Zaw== -entities@^1.1.1, entities@~1.1.1: +entities@^1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w== @@ -16813,13 +16813,6 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= -linkify-it@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.2.0.tgz#e3b54697e78bf915c70a38acd78fd09e0058b1cf" - integrity sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw== - dependencies: - uc.micro "^1.0.1" - linkify-it@^3.0.1: version "3.0.2" resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.2.tgz#f55eeb8bc1d3ae754049e124ab3bb56d97797fb8" @@ -16827,13 +16820,6 @@ linkify-it@^3.0.1: dependencies: uc.micro "^1.0.1" -linkify-it@~1.2.0: - version "1.2.4" - resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-1.2.4.tgz#0773526c317c8fd13bd534ee1d180ff88abf881a" - integrity sha1-B3NSbDF8j9E71TTuHRgP+Iq/iBo= - dependencies: - uc.micro "^1.0.1" - livereload-js@^3.3.1: version "3.3.2" resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-3.3.2.tgz#c88b009c6e466b15b91faa26fd7c99d620e12651" @@ -17530,10 +17516,10 @@ markdown-it-terminal@0.2.1: lodash.merge "^4.6.2" markdown-it "^8.3.1" -markdown-it@^12.0.4: - version "12.2.0" - resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.2.0.tgz#091f720fd5db206f80de7a8d1f1a7035fd0d38db" - integrity sha512-Wjws+uCrVQRqOoJvze4HCqkKl1AsSh95iFAeQDwnyfxM09divCBSXlDR1uTvyUP3Grzpn4Ru8GeCxYPM8vkCQg== +markdown-it@^12.0.4, markdown-it@^12.3.2, markdown-it@^4.3.0, markdown-it@^8.3.1: + version "12.3.2" + resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90" + integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg== dependencies: argparse "^2.0.1" entities "~2.1.0" @@ -17541,28 +17527,6 @@ markdown-it@^12.0.4: mdurl "^1.0.1" uc.micro "^1.0.5" -markdown-it@^4.3.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-4.4.0.tgz#3df373dbea587a9a7fef3e56311b68908f75c414" - integrity sha1-PfNz2+pYepp/7z5WMRtokI91xBQ= - dependencies: - argparse "~1.0.2" - entities "~1.1.1" - linkify-it "~1.2.0" - mdurl "~1.0.0" - uc.micro "^1.0.0" - -markdown-it@^8.3.1: - version "8.4.2" - resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.2.tgz#386f98998dc15a37722aa7722084f4020bdd9b54" - integrity sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ== - dependencies: - argparse "^1.0.7" - entities "~1.1.1" - linkify-it "^2.0.0" - mdurl "^1.0.1" - uc.micro "^1.0.5" - markdown-to-jsx@^6.11.4: version "6.11.4" resolved "https://registry.yarnpkg.com/markdown-to-jsx/-/markdown-to-jsx-6.11.4.tgz#b4528b1ab668aef7fe61c1535c27e837819392c5" @@ -17695,7 +17659,7 @@ mdn-links@^0.1.0: resolved "https://registry.yarnpkg.com/mdn-links/-/mdn-links-0.1.0.tgz#e24c83b97cb4c5886cc39f2f780705fbfe273aa5" integrity sha1-4kyDuXy0xYhsw58veAcF+/4nOqU= -mdurl@^1.0.0, mdurl@^1.0.1, mdurl@~1.0.0: +mdurl@^1.0.0, mdurl@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4= @@ -23665,7 +23629,7 @@ typescript@~4.2.4: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961" integrity sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg== -uc.micro@^1.0.0, uc.micro@^1.0.1, uc.micro@^1.0.5: +uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.6" resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac" integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA== From 7e28dee0ab11b7985538d0421e31338dfc4cd00b Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Corvo Date: Wed, 23 Feb 2022 09:08:43 -0800 Subject: [PATCH 09/16] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Add=20resolutions?= =?UTF-8?q?=20mout?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 ++- yarn.lock | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 12b0237f7..6e571ea9c 100755 --- a/package.json +++ b/package.json @@ -88,7 +88,8 @@ "follow-redirects": "^1.14.7", "node-fetch": "^2.6.7", "shelljs": "^0.8.5", - "ember-template-recast": "^6.0.0" + "ember-template-recast": "^6.0.0", + "mout": "^1.2.3" }, "config": { "commitizen": { diff --git a/yarn.lock b/yarn.lock index 1b2fc3558..cd3854bae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -18180,10 +18180,10 @@ morgan@^1.10.0: on-finished "~2.3.0" on-headers "~1.0.2" -mout@^1.0.0: - version "1.2.2" - resolved "https://registry.yarnpkg.com/mout/-/mout-1.2.2.tgz#c9b718a499806a0632cede178e80f436259e777d" - integrity sha512-w0OUxFEla6z3d7sVpMZGBCpQvYh8PHS1wZ6Wu9GNKHMpAHWJ0if0LsQZh3DlOqw55HlhJEOMLpFnwtxp99Y5GA== +mout@^1.0.0, mout@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/mout/-/mout-1.2.3.tgz#bd1477d8c7f2db5fcf43c91de30b6cc746b78e10" + integrity sha512-vtE+eZcSj/sBkIp6gxB87MznryWP+gHIp0XX9SKrzA5TAkvz6y7VTuNruBjYdJozd8NY5i9XVIsn8cn3SwNjzg== move-concurrently@^1.0.1: version "1.0.1" From 3d782582e58dd77e758c0249dc99a872e4695d5f Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Corvo Date: Wed, 23 Feb 2022 10:35:03 -0800 Subject: [PATCH 10/16] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Update=20flight?= =?UTF-8?q?=20icons?= 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 3254f48b0..8cbfaf017 100644 --- a/addons/rose/package.json +++ b/addons/rose/package.json @@ -44,7 +44,7 @@ "@ember/test-helpers": "^2.6.0", "@glimmer/component": "^1.0.4", "@glimmer/tracking": "^1.0.4", - "@hashicorp/flight-icons": "^2.0.1", + "@hashicorp/flight-icons": "^2.1.0", "@storybook/addon-a11y": "^6.3.12", "@storybook/addon-actions": "^6.3.10", "@storybook/addon-docs": "^6.3.8", diff --git a/yarn.lock b/yarn.lock index 1edc8a96b..d44bf4caf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3513,10 +3513,10 @@ 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" - resolved "https://registry.yarnpkg.com/@hashicorp/flight-icons/-/flight-icons-2.0.1.tgz#7e7370f1d45207409dd20ebdce7285370e7d9532" - integrity sha512-445WEmL0ysOeVQDe2khCqGbmNm+/Rv5B35Q8FXvc+RuE+r9mNWL0ufe2cVa8Sqqt/VRg0lyTEhArNX9gYCX1Yg== +"@hashicorp/flight-icons@^2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@hashicorp/flight-icons/-/flight-icons-2.1.0.tgz#bda6c6942af0432d3342b1b1a2ff7f8da4c10f8a" + integrity sha512-4HWwty+LNhMD7O30sBinn7OQo2KTSUEk1qm65hqFitfp2m8sEl8F+7gY4NcTJV9Y1eEe3C7bED5OOnsPVc60ww== "@humanwhocodes/config-array@^0.5.0": version "0.5.0" From c716e8e5b4485711b4d356ee95b2286dc6d2c69a Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Corvo Date: Thu, 24 Feb 2022 08:08:54 -0800 Subject: [PATCH 11/16] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Add=20nanoid=20to?= =?UTF-8?q?=20resolutions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 ++- yarn.lock | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a960c5cd6..c603a1d49 100755 --- a/package.json +++ b/package.json @@ -91,7 +91,8 @@ "ember-template-recast": "^6.0.0", "engine.io": "^5.2.1", "markdown-it": "^12.3.2", - "mout": "^1.2.3" + "mout": "^1.2.3", + "nanoid": "^3.1.31" }, "config": { "commitizen": { diff --git a/yarn.lock b/yarn.lock index d7df0a57d..e16bf91e8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -18180,10 +18180,10 @@ nan@^2.12.1: resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ== -nanoid@3.1.20: - version "3.1.20" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788" - integrity sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw== +nanoid@3.1.20, nanoid@^3.1.31: + version "3.3.1" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.1.tgz#6347a18cac88af88f58af0b3594b723d5e99bb35" + integrity sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw== nanomatch@^1.2.9: version "1.2.13" From b0dd8e4635785a143201faf6f2c1a6bd32ba60f5 Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Corvo Date: Thu, 24 Feb 2022 08:23:24 -0800 Subject: [PATCH 12/16] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Update=20resoluti?= =?UTF-8?q?ons=20follow-redirects?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a960c5cd6..533768ff5 100755 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "ember-cli-babel": "^7.26.8", "jsonpointer": "5.0.0", "json-schema": "^0.4.0", - "follow-redirects": "^1.14.7", + "follow-redirects": "^1.14.8", "node-fetch": "^2.6.7", "shelljs": "^0.8.5", "ember-template-recast": "^6.0.0", diff --git a/yarn.lock b/yarn.lock index d7df0a57d..99acc8a02 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13110,10 +13110,10 @@ focus-trap@^6.4.0: dependencies: tabbable "^5.2.1" -follow-redirects@^1.0.0, follow-redirects@^1.14.7: - version "1.14.7" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685" - integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ== +follow-redirects@^1.0.0, follow-redirects@^1.14.8: + version "1.14.9" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7" + integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w== for-in@^1.0.2: version "1.0.2" From 140b0084470f741421b996f0f9cdd8e339752391 Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Corvo Date: Thu, 24 Feb 2022 10:23:31 -0800 Subject: [PATCH 13/16] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Update=20ember-pa?= =?UTF-8?q?ge-title?= 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 | 10 +++++----- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/addons/api/package.json b/addons/api/package.json index 55b9ab7bb..ecaae1c2e 100644 --- a/addons/api/package.json +++ b/addons/api/package.json @@ -53,7 +53,7 @@ "ember-export-application-global": "^2.0.1", "ember-load-initializers": "^2.1.2", "ember-maybe-import-regenerator": "^1.0.0", - "ember-page-title": "^6.2.2", + "ember-page-title": "^7.0.0", "ember-qunit": "^5.1.4", "ember-resolver": "^8.0.3", "ember-source": "~3.28.4", diff --git a/addons/auth/package.json b/addons/auth/package.json index b48822efc..5e54df41f 100644 --- a/addons/auth/package.json +++ b/addons/auth/package.json @@ -46,7 +46,7 @@ "ember-export-application-global": "^2.0.1", "ember-load-initializers": "^2.1.2", "ember-maybe-import-regenerator": "^1.0.0", - "ember-page-title": "^6.2.2", + "ember-page-title": "^7.0.0", "ember-qunit": "^5.1.4", "ember-resolver": "^8.0.3", "ember-source": "~3.28.4", diff --git a/addons/core/package.json b/addons/core/package.json index 795e304b5..5e9b1daca 100644 --- a/addons/core/package.json +++ b/addons/core/package.json @@ -59,7 +59,7 @@ "ember-inline-svg": "^1.0.0", "ember-load-initializers": "^2.1.2", "ember-maybe-import-regenerator": "^1.0.0", - "ember-page-title": "^6.2.2", + "ember-page-title": "^7.0.0", "ember-qunit": "^5.1.4", "ember-resolver": "^8.0.3", "ember-source": "~3.28.4", diff --git a/addons/rose/package.json b/addons/rose/package.json index 8cbfaf017..a3699ad02 100644 --- a/addons/rose/package.json +++ b/addons/rose/package.json @@ -75,7 +75,7 @@ "ember-load-initializers": "^2.1.2", "ember-maybe-import-regenerator": "^1.0.0", "ember-modifier": "^1.0.3", - "ember-page-title": "^6.2.2", + "ember-page-title": "^7.0.0", "ember-qunit": "^5.1.4", "ember-resolver": "^8.0.3", "ember-source": "~3.28.4", diff --git a/ui/admin/package.json b/ui/admin/package.json index 8455faaf3..dccae71f0 100644 --- a/ui/admin/package.json +++ b/ui/admin/package.json @@ -68,7 +68,7 @@ "ember-maybe-import-regenerator": "^1.0.0", "ember-modifier": "^2.1.2", "ember-notify": "^6.0.1", - "ember-page-title": "^6.2.2", + "ember-page-title": "^7.0.0", "ember-pollster": "^0.0.1-beta.2", "ember-qunit": "^5.1.4", "ember-resolver": "^8.0.3", diff --git a/ui/desktop/package.json b/ui/desktop/package.json index 0566f510d..382f6c441 100755 --- a/ui/desktop/package.json +++ b/ui/desktop/package.json @@ -90,7 +90,7 @@ "ember-maybe-import-regenerator": "^1.0.0", "ember-modifier": "^2.1.2", "ember-notify": "^6.0.1", - "ember-page-title": "^6.2.2", + "ember-page-title": "^7.0.0", "ember-pollster": "^0.0.1-beta.2", "ember-qunit": "^5.1.4", "ember-resolver": "^8.0.3", diff --git a/yarn.lock b/yarn.lock index d7df0a57d..df5dd0800 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11394,12 +11394,12 @@ ember-notify@^6.0.1: ember-cli-babel "^7.23.1" ember-cli-htmlbars "^5.3.2" -ember-page-title@^6.2.2: - version "6.2.2" - resolved "https://registry.yarnpkg.com/ember-page-title/-/ember-page-title-6.2.2.tgz#980838c44e96cba1d00f42435d707936af627324" - integrity sha512-YTXA+cylZrh9zO0zwjlaAGReT2MVOxAMnVO1OOygFrs1JBs4D6CKV3tImoilg3AvIXFBeJfFNNUbJOdRd9IGGg== +ember-page-title@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/ember-page-title/-/ember-page-title-7.0.0.tgz#11bebd4901d80757646c9006954a13e4fc187421" + integrity sha512-oq6+HYbeVD/BnxIO5AkP4gWlsatdgW2HFO10F8+XQiJZrwa7cC7Wm54JNGqQkavkDQTgNSiy1Fe2NILJ14MmAg== dependencies: - ember-cli-babel "^7.23.1" + ember-cli-babel "^7.26.6" ember-pollster@^0.0.1-beta.2: version "0.0.1-beta.2" From d19f79858b784c82ad06142bf36c88f73c966722 Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Corvo Date: Fri, 25 Feb 2022 09:54:56 -0800 Subject: [PATCH 14/16] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20Deprecate=20em?= =?UTF-8?q?ber-try?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 5 - addons/api/.eslintignore | 4 - addons/api/.npmignore | 6 - addons/api/.prettierignore | 5 - addons/api/config/ember-try.js | 86 ----------- addons/api/package.json | 1 - addons/auth/.eslintignore | 5 - addons/auth/.npmignore | 6 - addons/auth/.prettierignore | 5 - addons/auth/config/ember-try.js | 79 ---------- addons/auth/package.json | 1 - addons/core/.eslintignore | 5 - addons/core/.npmignore | 6 - addons/core/.prettierignore | 5 - addons/core/config/ember-try.js | 79 ---------- addons/core/package.json | 1 - addons/rose/.eslintignore | 5 - addons/rose/.npmignore | 6 - addons/rose/.prettierignore | 5 - addons/rose/config/ember-try.js | 79 ---------- addons/rose/package.json | 1 - ui/admin/.eslintignore | 5 - ui/admin/.prettierignore | 5 - ui/desktop/.eslintignore | 7 +- ui/desktop/.gitignore | 5 - ui/desktop/.prettierignore | 5 - yarn.lock | 247 ++------------------------------ 27 files changed, 11 insertions(+), 658 deletions(-) delete mode 100644 addons/api/config/ember-try.js delete mode 100644 addons/auth/config/ember-try.js delete mode 100644 addons/core/config/ember-try.js delete mode 100644 addons/rose/config/ember-try.js diff --git a/.gitignore b/.gitignore index 95852e8ad..6e903d841 100644 --- a/.gitignore +++ b/.gitignore @@ -23,8 +23,3 @@ yarn-error.log storybook-static **/.storybook/*.html .watchman-cookie* - -# ember-try -.node_modules.ember-try -bower.json.ember-try -package.json.ember-try diff --git a/addons/api/.eslintignore b/addons/api/.eslintignore index 922165552..068e264ae 100644 --- a/addons/api/.eslintignore +++ b/addons/api/.eslintignore @@ -15,7 +15,3 @@ !.* .eslintcache -# ember-try -/.node_modules.ember-try/ -/bower.json.ember-try -/package.json.ember-try diff --git a/addons/api/.npmignore b/addons/api/.npmignore index 88818f2c8..b19149d3d 100644 --- a/addons/api/.npmignore +++ b/addons/api/.npmignore @@ -19,15 +19,9 @@ /.travis.yml /.watchmanconfig /bower.json -/config/ember-try.js /CONTRIBUTING.md /ember-cli-build.js /testem.js /tests/ /yarn.lock .gitkeep - -# ember-try -/.node_modules.ember-try/ -/bower.json.ember-try -/package.json.ember-try diff --git a/addons/api/.prettierignore b/addons/api/.prettierignore index 922165552..ed25eeefb 100644 --- a/addons/api/.prettierignore +++ b/addons/api/.prettierignore @@ -14,8 +14,3 @@ /coverage/ !.* .eslintcache - -# ember-try -/.node_modules.ember-try/ -/bower.json.ember-try -/package.json.ember-try diff --git a/addons/api/config/ember-try.js b/addons/api/config/ember-try.js deleted file mode 100644 index aa7ca9f14..000000000 --- a/addons/api/config/ember-try.js +++ /dev/null @@ -1,86 +0,0 @@ -'use strict'; - -const getChannelURL = require('ember-source-channel-url'); - -module.exports = async function () { - return { - scenarios: [ - { - name: 'ember-lts-3.12', - npm: { - devDependencies: { - 'ember-source': '~3.12.0', - }, - }, - }, - { - name: 'ember-lts-3.16', - npm: { - devDependencies: { - 'ember-source': '~3.16.0', - }, - }, - }, - { - name: 'ember-lts-3.20', - npm: { - devDependencies: { - 'ember-source': '~3.20.5', - }, - }, - }, - { - name: 'ember-release', - npm: { - devDependencies: { - 'ember-source': await getChannelURL('release'), - }, - }, - }, - { - name: 'ember-beta', - npm: { - devDependencies: { - 'ember-source': await getChannelURL('beta'), - }, - }, - }, - { - name: 'ember-canary', - npm: { - devDependencies: { - 'ember-source': await getChannelURL('canary'), - }, - }, - }, - { - name: 'ember-default-with-jquery', - env: { - EMBER_OPTIONAL_FEATURES: JSON.stringify({ - 'jquery-integration': true, - }), - }, - npm: { - devDependencies: { - '@ember/jquery': '^1.1.0', - }, - }, - }, - { - name: 'ember-classic', - env: { - EMBER_OPTIONAL_FEATURES: JSON.stringify({ - 'application-template-wrapper': true, - 'default-async-observers': false, - 'template-only-glimmer-components': false, - }), - }, - npm: { - ember: { - edition: 'classic', - }, - }, - }, - ], - }; -}; diff --git a/addons/api/package.json b/addons/api/package.json index 55b9ab7bb..251365543 100644 --- a/addons/api/package.json +++ b/addons/api/package.json @@ -59,7 +59,6 @@ "ember-source": "~3.28.4", "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^3.7.0", - "ember-try": "^1.4.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-ember": "^10.5.4", diff --git a/addons/auth/.eslintignore b/addons/auth/.eslintignore index 922165552..ed25eeefb 100644 --- a/addons/auth/.eslintignore +++ b/addons/auth/.eslintignore @@ -14,8 +14,3 @@ /coverage/ !.* .eslintcache - -# ember-try -/.node_modules.ember-try/ -/bower.json.ember-try -/package.json.ember-try diff --git a/addons/auth/.npmignore b/addons/auth/.npmignore index 88818f2c8..b19149d3d 100644 --- a/addons/auth/.npmignore +++ b/addons/auth/.npmignore @@ -19,15 +19,9 @@ /.travis.yml /.watchmanconfig /bower.json -/config/ember-try.js /CONTRIBUTING.md /ember-cli-build.js /testem.js /tests/ /yarn.lock .gitkeep - -# ember-try -/.node_modules.ember-try/ -/bower.json.ember-try -/package.json.ember-try diff --git a/addons/auth/.prettierignore b/addons/auth/.prettierignore index 922165552..ed25eeefb 100644 --- a/addons/auth/.prettierignore +++ b/addons/auth/.prettierignore @@ -14,8 +14,3 @@ /coverage/ !.* .eslintcache - -# ember-try -/.node_modules.ember-try/ -/bower.json.ember-try -/package.json.ember-try diff --git a/addons/auth/config/ember-try.js b/addons/auth/config/ember-try.js deleted file mode 100644 index f14ac7f50..000000000 --- a/addons/auth/config/ember-try.js +++ /dev/null @@ -1,79 +0,0 @@ -'use strict'; - -const getChannelURL = require('ember-source-channel-url'); - -module.exports = async function () { - return { - useYarn: true, - scenarios: [ - { - name: 'ember-lts-3.16', - npm: { - devDependencies: { - 'ember-source': '~3.16.0', - }, - }, - }, - { - name: 'ember-lts-3.20', - npm: { - devDependencies: { - 'ember-source': '~3.20.5', - }, - }, - }, - { - name: 'ember-release', - npm: { - devDependencies: { - 'ember-source': await getChannelURL('release'), - }, - }, - }, - { - name: 'ember-beta', - npm: { - devDependencies: { - 'ember-source': await getChannelURL('beta'), - }, - }, - }, - { - name: 'ember-canary', - npm: { - devDependencies: { - 'ember-source': await getChannelURL('canary'), - }, - }, - }, - { - name: 'ember-default-with-jquery', - env: { - EMBER_OPTIONAL_FEATURES: JSON.stringify({ - 'jquery-integration': true, - }), - }, - npm: { - devDependencies: { - '@ember/jquery': '^1.1.0', - }, - }, - }, - { - name: 'ember-classic', - env: { - EMBER_OPTIONAL_FEATURES: JSON.stringify({ - 'application-template-wrapper': true, - 'default-async-observers': false, - 'template-only-glimmer-components': false, - }), - }, - npm: { - ember: { - edition: 'classic', - }, - }, - }, - ], - }; -}; diff --git a/addons/auth/package.json b/addons/auth/package.json index b48822efc..1f75bf464 100644 --- a/addons/auth/package.json +++ b/addons/auth/package.json @@ -52,7 +52,6 @@ "ember-source": "~3.28.4", "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^3.7.0", - "ember-try": "^1.4.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-ember": "^10.5.4", diff --git a/addons/core/.eslintignore b/addons/core/.eslintignore index 922165552..ed25eeefb 100644 --- a/addons/core/.eslintignore +++ b/addons/core/.eslintignore @@ -14,8 +14,3 @@ /coverage/ !.* .eslintcache - -# ember-try -/.node_modules.ember-try/ -/bower.json.ember-try -/package.json.ember-try diff --git a/addons/core/.npmignore b/addons/core/.npmignore index 88818f2c8..b19149d3d 100644 --- a/addons/core/.npmignore +++ b/addons/core/.npmignore @@ -19,15 +19,9 @@ /.travis.yml /.watchmanconfig /bower.json -/config/ember-try.js /CONTRIBUTING.md /ember-cli-build.js /testem.js /tests/ /yarn.lock .gitkeep - -# ember-try -/.node_modules.ember-try/ -/bower.json.ember-try -/package.json.ember-try diff --git a/addons/core/.prettierignore b/addons/core/.prettierignore index 922165552..ed25eeefb 100644 --- a/addons/core/.prettierignore +++ b/addons/core/.prettierignore @@ -14,8 +14,3 @@ /coverage/ !.* .eslintcache - -# ember-try -/.node_modules.ember-try/ -/bower.json.ember-try -/package.json.ember-try diff --git a/addons/core/config/ember-try.js b/addons/core/config/ember-try.js deleted file mode 100644 index f14ac7f50..000000000 --- a/addons/core/config/ember-try.js +++ /dev/null @@ -1,79 +0,0 @@ -'use strict'; - -const getChannelURL = require('ember-source-channel-url'); - -module.exports = async function () { - return { - useYarn: true, - scenarios: [ - { - name: 'ember-lts-3.16', - npm: { - devDependencies: { - 'ember-source': '~3.16.0', - }, - }, - }, - { - name: 'ember-lts-3.20', - npm: { - devDependencies: { - 'ember-source': '~3.20.5', - }, - }, - }, - { - name: 'ember-release', - npm: { - devDependencies: { - 'ember-source': await getChannelURL('release'), - }, - }, - }, - { - name: 'ember-beta', - npm: { - devDependencies: { - 'ember-source': await getChannelURL('beta'), - }, - }, - }, - { - name: 'ember-canary', - npm: { - devDependencies: { - 'ember-source': await getChannelURL('canary'), - }, - }, - }, - { - name: 'ember-default-with-jquery', - env: { - EMBER_OPTIONAL_FEATURES: JSON.stringify({ - 'jquery-integration': true, - }), - }, - npm: { - devDependencies: { - '@ember/jquery': '^1.1.0', - }, - }, - }, - { - name: 'ember-classic', - env: { - EMBER_OPTIONAL_FEATURES: JSON.stringify({ - 'application-template-wrapper': true, - 'default-async-observers': false, - 'template-only-glimmer-components': false, - }), - }, - npm: { - ember: { - edition: 'classic', - }, - }, - }, - ], - }; -}; diff --git a/addons/core/package.json b/addons/core/package.json index 795e304b5..8bf6a4859 100644 --- a/addons/core/package.json +++ b/addons/core/package.json @@ -65,7 +65,6 @@ "ember-source": "~3.28.4", "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^3.7.0", - "ember-try": "^1.4.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-ember": "^10.5.4", diff --git a/addons/rose/.eslintignore b/addons/rose/.eslintignore index 0e64ff566..cb434021d 100644 --- a/addons/rose/.eslintignore +++ b/addons/rose/.eslintignore @@ -17,9 +17,4 @@ main.js !.* .eslintcache -# ember-try -/.node_modules.ember-try/ -/bower.json.ember-try -/package.json.ember-try - index.js diff --git a/addons/rose/.npmignore b/addons/rose/.npmignore index 88818f2c8..b19149d3d 100644 --- a/addons/rose/.npmignore +++ b/addons/rose/.npmignore @@ -19,15 +19,9 @@ /.travis.yml /.watchmanconfig /bower.json -/config/ember-try.js /CONTRIBUTING.md /ember-cli-build.js /testem.js /tests/ /yarn.lock .gitkeep - -# ember-try -/.node_modules.ember-try/ -/bower.json.ember-try -/package.json.ember-try diff --git a/addons/rose/.prettierignore b/addons/rose/.prettierignore index 922165552..ed25eeefb 100644 --- a/addons/rose/.prettierignore +++ b/addons/rose/.prettierignore @@ -14,8 +14,3 @@ /coverage/ !.* .eslintcache - -# ember-try -/.node_modules.ember-try/ -/bower.json.ember-try -/package.json.ember-try diff --git a/addons/rose/config/ember-try.js b/addons/rose/config/ember-try.js deleted file mode 100644 index f14ac7f50..000000000 --- a/addons/rose/config/ember-try.js +++ /dev/null @@ -1,79 +0,0 @@ -'use strict'; - -const getChannelURL = require('ember-source-channel-url'); - -module.exports = async function () { - return { - useYarn: true, - scenarios: [ - { - name: 'ember-lts-3.16', - npm: { - devDependencies: { - 'ember-source': '~3.16.0', - }, - }, - }, - { - name: 'ember-lts-3.20', - npm: { - devDependencies: { - 'ember-source': '~3.20.5', - }, - }, - }, - { - name: 'ember-release', - npm: { - devDependencies: { - 'ember-source': await getChannelURL('release'), - }, - }, - }, - { - name: 'ember-beta', - npm: { - devDependencies: { - 'ember-source': await getChannelURL('beta'), - }, - }, - }, - { - name: 'ember-canary', - npm: { - devDependencies: { - 'ember-source': await getChannelURL('canary'), - }, - }, - }, - { - name: 'ember-default-with-jquery', - env: { - EMBER_OPTIONAL_FEATURES: JSON.stringify({ - 'jquery-integration': true, - }), - }, - npm: { - devDependencies: { - '@ember/jquery': '^1.1.0', - }, - }, - }, - { - name: 'ember-classic', - env: { - EMBER_OPTIONAL_FEATURES: JSON.stringify({ - 'application-template-wrapper': true, - 'default-async-observers': false, - 'template-only-glimmer-components': false, - }), - }, - npm: { - ember: { - edition: 'classic', - }, - }, - }, - ], - }; -}; diff --git a/addons/rose/package.json b/addons/rose/package.json index 8cbfaf017..c06eb14ca 100644 --- a/addons/rose/package.json +++ b/addons/rose/package.json @@ -81,7 +81,6 @@ "ember-source": "~3.28.4", "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^3.7.0", - "ember-try": "^1.4.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-ember": "^10.5.4", diff --git a/ui/admin/.eslintignore b/ui/admin/.eslintignore index 922165552..ed25eeefb 100644 --- a/ui/admin/.eslintignore +++ b/ui/admin/.eslintignore @@ -14,8 +14,3 @@ /coverage/ !.* .eslintcache - -# ember-try -/.node_modules.ember-try/ -/bower.json.ember-try -/package.json.ember-try diff --git a/ui/admin/.prettierignore b/ui/admin/.prettierignore index 922165552..ed25eeefb 100644 --- a/ui/admin/.prettierignore +++ b/ui/admin/.prettierignore @@ -14,8 +14,3 @@ /coverage/ !.* .eslintcache - -# ember-try -/.node_modules.ember-try/ -/bower.json.ember-try -/package.json.ember-try diff --git a/ui/desktop/.eslintignore b/ui/desktop/.eslintignore index c1a086935..178c7df8d 100644 --- a/ui/desktop/.eslintignore +++ b/ui/desktop/.eslintignore @@ -15,10 +15,5 @@ !.* .eslintcache -# ember-try -/.node_modules.ember-try/ -/bower.json.ember-try -/package.json.ember-try - # ember-electron -/electron-app/ \ No newline at end of file +/electron-app/ diff --git a/ui/desktop/.gitignore b/ui/desktop/.gitignore index 42faa5e1e..20d312a89 100644 --- a/ui/desktop/.gitignore +++ b/ui/desktop/.gitignore @@ -20,11 +20,6 @@ /testem.log /yarn-error.log -# ember-try -/.node_modules.ember-try/ -/bower.json.ember-try -/package.json.ember-try - # Vagrant .vagrant/ diff --git a/ui/desktop/.prettierignore b/ui/desktop/.prettierignore index 922165552..ed25eeefb 100644 --- a/ui/desktop/.prettierignore +++ b/ui/desktop/.prettierignore @@ -14,8 +14,3 @@ /coverage/ !.* .eslintcache - -# ember-try -/.node_modules.ember-try/ -/bower.json.ember-try -/package.json.ember-try diff --git a/yarn.lock b/yarn.lock index d7df0a57d..02baec842 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3956,11 +3956,6 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== -"@sindresorhus/is@^0.7.0": - version "0.7.0" - resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd" - integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow== - "@sindresorhus/is@^4.0.0": version "4.0.1" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.0.1.tgz#d26729db850fa327b7cacc5522252194404226f5" @@ -7273,11 +7268,6 @@ base64-arraybuffer@0.1.4: resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812" integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI= -base64-js@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-0.0.2.tgz#024f0f72afa25b75f9c0ee73cd4f55ec1bed9784" - integrity sha1-Ak8Pcq+iW3X5wO5zzU9V7Bvtl4Q= - base64-js@^1.0.2, base64-js@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" @@ -7449,14 +7439,6 @@ boom@7.x.x: dependencies: hoek "6.x.x" -bops@0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/bops/-/bops-0.0.3.tgz#c5cbf6fea8be7401ca5ea6d1679e6c4e8b407c79" - integrity sha1-xcv2/qi+dAHKXqbRZ55sTotAfHk= - dependencies: - base64-js "0.0.2" - to-utf8 "0.0.1" - boundary@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/boundary/-/boundary-1.0.1.tgz#4d67dc2602c0cc16dd9bce7ebf87e948290f5812" @@ -8364,19 +8346,6 @@ cacheable-lookup@^5.0.3: resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005" integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA== -cacheable-request@^2.1.1: - version "2.1.4" - resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz#0d808801b6342ad33c91df9d0b44dc09b91e5c3d" - integrity sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0= - dependencies: - clone-response "1.0.2" - get-stream "3.0.0" - http-cache-semantics "3.8.1" - keyv "3.0.0" - lowercase-keys "1.0.0" - normalize-url "2.0.1" - responselike "1.0.2" - cacheable-request@^6.0.0: version "6.1.0" resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" @@ -8957,7 +8926,7 @@ clone-regexp@^2.1.0: dependencies: is-regexp "^2.0.0" -clone-response@1.0.2, clone-response@^1.0.2: +clone-response@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= @@ -10284,11 +10253,6 @@ downshift@^6.0.15: react-is "^17.0.2" tslib "^2.3.0" -duplex@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/duplex/-/duplex-1.0.0.tgz#6abc5c16ec17e4c578578727126700590d3a2dda" - integrity sha1-arxcFuwX5MV4V4cnEmcAWQ06Ldo= - duplexer3@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" @@ -11479,13 +11443,6 @@ ember-simple-auth@^4.0.0: ember-cookies "^0.5.0" silent-error "^1.0.0" -ember-source-channel-url@^1.0.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/ember-source-channel-url/-/ember-source-channel-url-1.2.0.tgz#77eb9d0889e5f5370e6c70fcb2696c63ff4a34a1" - integrity sha512-CLClcHzVf+8GoFk4176R16nwXoel70bd7DKVAY6D8M0m5fJJhbTrAPYpDA0lY8A60HZo9j/s8A8LWiGh1YmdZg== - dependencies: - got "^8.0.1" - ember-source-channel-url@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/ember-source-channel-url/-/ember-source-channel-url-3.0.0.tgz#bcd5be72c63fa0b8c390b3121783b462063e2a1b" @@ -11593,37 +11550,6 @@ ember-truth-helpers@^3.0.0: dependencies: ember-cli-babel "^7.22.1" -ember-try-config@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ember-try-config/-/ember-try-config-3.0.0.tgz#012d8c90cae9eb624e2b62040bf7e76a1aa58edc" - integrity sha512-pNwHS29O1ACczkrxBKRtDY0TzTb7uPnA5eHEe+4NF6qpLK5FVnL3EtgZ8+yVYtnm1If5mZ07rIubw45vaSek7w== - dependencies: - ember-source-channel-url "^1.0.1" - lodash "^4.6.1" - package-json "^4.0.1" - remote-git-tags "^2.0.0" - rsvp "^4.8.1" - semver "^5.5.0" - -ember-try@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/ember-try/-/ember-try-1.4.0.tgz#be15965bd1727c27a65a78c4c8392f03763cc565" - integrity sha512-o0SoCH4K8umCf8etphla8FDygKfQGkwY+w47wEuYFVKaESrOZaK63ObnAK7DTKkjJU74Fss2abf+r+pAWpX43g== - dependencies: - chalk "^2.4.2" - cli-table3 "^0.5.1" - core-object "^3.1.5" - debug "^4.1.1" - ember-try-config "^3.0.0" - execa "^1.0.0" - extend "^3.0.0" - fs-extra "^5.0.0" - promise-map-series "^0.2.1" - resolve "^1.10.1" - rimraf "^2.6.3" - rsvp "^4.7.0" - walk-sync "^1.1.3" - ember-uuid@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/ember-uuid/-/ember-uuid-2.1.0.tgz#a65d030534d47ced1ea22be9b7d3821eff71f99c" @@ -11658,11 +11584,6 @@ ember-wormhole@^0.6.0: ember-cli-babel "^6.16.0" ember-cli-htmlbars "^3.0.0" -emit-function@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/emit-function/-/emit-function-0.0.2.tgz#e3a50b3d61be1bf8ca88b924bf713157a5bec124" - integrity sha1-46ULPWG+G/jKiLkkv3ExV6W+wSQ= - emittery@^0.8.1: version "0.8.1" resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.8.1.tgz#bb23cc86d03b30aa75a7f734819dee2e1ba70860" @@ -13210,7 +13131,7 @@ from2@^1.3.0: inherits "~2.0.1" readable-stream "~1.1.10" -from2@^2.1.0, from2@^2.1.1: +from2@^2.1.0: version "2.3.0" resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af" integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8= @@ -13566,7 +13487,7 @@ get-stdin@^8.0.0: resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53" integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg== -get-stream@3.0.0, get-stream@^3.0.0: +get-stream@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ= @@ -13615,61 +13536,16 @@ git-cz@^4.3.1: resolved "https://registry.yarnpkg.com/git-cz/-/git-cz-4.7.6.tgz#1250c486f01724e801a630b848fd8786f7e67e90" integrity sha512-WtQEXqetJSi9LKPI77bMdSQWvLGjE93egVbR0zjXd1KFKrFvo/YE/UuGNcMeBDiwzxfQBhjyV7Hn0YUZ8Q0BcQ== -git-fetch-pack@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/git-fetch-pack/-/git-fetch-pack-0.1.1.tgz#7703a32cf0db80f060d2766a34ac00d02cebcdf5" - integrity sha1-dwOjLPDbgPBg0nZqNKwA0CzrzfU= - dependencies: - bops "0.0.3" - emit-function "0.0.2" - git-packed-ref-parse "0.0.0" - through "~2.2.7" - git-hooks-list@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/git-hooks-list/-/git-hooks-list-1.0.3.tgz#be5baaf78203ce342f2f844a9d2b03dba1b45156" integrity sha512-Y7wLWcrLUXwk2noSka166byGCvhMtDRpgHdzCno1UQv/n/Hegp++a2xBWJL1lJarnKD3SWaljD+0z1ztqxuKyQ== -git-packed-ref-parse@0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/git-packed-ref-parse/-/git-packed-ref-parse-0.0.0.tgz#b85046931f3e4a65679b5de54af3a5d3df372646" - integrity sha1-uFBGkx8+SmVnm13lSvOl0983JkY= - dependencies: - line-stream "0.0.0" - through "~2.2.7" - -git-read-pkt-line@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/git-read-pkt-line/-/git-read-pkt-line-0.0.8.tgz#494037854ed57bd90cd55676540d86ab0cb36caa" - integrity sha1-SUA3hU7Ve9kM1VZ2VA2GqwyzbKo= - dependencies: - bops "0.0.3" - through "~2.2.7" - git-repo-info@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-2.1.1.tgz#220ffed8cbae74ef8a80e3052f2ccb5179aed058" integrity sha512-8aCohiDo4jwjOwma4FmYFd3i97urZulL8XL24nIPxuE+GZnfsAyy/g2Shqx6OjUiFKUXZM+Yy+KHnOmmA3FVcg== -git-transport-protocol@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/git-transport-protocol/-/git-transport-protocol-0.1.0.tgz#99f4dd6389b9161eded74a9e617d6ba5ed0a6c2c" - integrity sha1-mfTdY4m5Fh7e10qeYX1rpe0KbCw= - dependencies: - duplex "~1.0.0" - emit-function "0.0.2" - git-read-pkt-line "0.0.8" - git-write-pkt-line "0.1.0" - through "~2.2.7" - -git-write-pkt-line@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/git-write-pkt-line/-/git-write-pkt-line-0.1.0.tgz#a84c1856c09011908389b2f06f911d91f6394694" - integrity sha1-qEwYVsCQEZCDibLwb5EdkfY5RpQ= - dependencies: - bops "0.0.3" - through "~2.2.7" - github-slugger@^1.0.0: version "1.3.0" resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.3.0.tgz#9bd0a95c5efdfc46005e82a906ef8e2a059124c9" @@ -14004,29 +13880,6 @@ got@^6.7.1: unzip-response "^2.0.1" url-parse-lax "^1.0.0" -got@^8.0.1: - version "8.3.2" - resolved "https://registry.yarnpkg.com/got/-/got-8.3.2.tgz#1d23f64390e97f776cac52e5b936e5f514d2e937" - integrity sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw== - dependencies: - "@sindresorhus/is" "^0.7.0" - cacheable-request "^2.1.1" - decompress-response "^3.3.0" - duplexer3 "^0.1.4" - get-stream "^3.0.0" - into-stream "^3.1.0" - is-retry-allowed "^1.1.0" - isurl "^1.0.0-alpha5" - lowercase-keys "^1.0.0" - mimic-response "^1.0.0" - p-cancelable "^0.4.0" - p-timeout "^2.0.1" - pify "^3.0.0" - safe-buffer "^5.1.1" - timed-out "^4.0.1" - url-parse-lax "^3.0.0" - url-to-options "^1.0.1" - got@^9.6.0: version "9.6.0" resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" @@ -14140,23 +13993,11 @@ has-glob@^1.0.0: dependencies: is-glob "^3.0.0" -has-symbol-support-x@^1.4.1: - version "1.4.2" - resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455" - integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw== - has-symbols@^1.0.1, has-symbols@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== -has-to-string-tag-x@^1.2.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d" - integrity sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw== - dependencies: - has-symbol-support-x "^1.4.1" - has-tostringtag@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" @@ -14497,7 +14338,7 @@ htmlparser2@~4.1.0: domutils "^2.0.0" entities "^2.0.0" -http-cache-semantics@3.8.1, http-cache-semantics@^3.8.1: +http-cache-semantics@^3.8.1: version "3.8.1" resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2" integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w== @@ -14925,14 +14766,6 @@ intl-messageformat@^9.3.6: "@formatjs/icu-messageformat-parser" "2.0.9" tslib "^2.1.0" -into-stream@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6" - integrity sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY= - dependencies: - from2 "^2.1.1" - p-is-promise "^1.1.0" - invariant@^2.2.2, invariant@^2.2.3, invariant@^2.2.4: version "2.2.4" resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" @@ -15399,7 +15232,7 @@ is-resolvable@^1.0.0: resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg== -is-retry-allowed@^1.0.0, is-retry-allowed@^1.1.0: +is-retry-allowed@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4" integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg== @@ -15646,14 +15479,6 @@ istextorbinary@^2.5.1: editions "^2.2.0" textextensions "^2.5.0" -isurl@^1.0.0-alpha5: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67" - integrity sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w== - dependencies: - has-to-string-tag-x "^1.2.0" - is-object "^1.0.1" - iterate-iterator@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/iterate-iterator/-/iterate-iterator-1.0.1.tgz#1693a768c1ddd79c969051459453f082fe82e9f6" @@ -16478,13 +16303,6 @@ just-extend@^4.0.2: resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.2.1.tgz#ef5e589afb61e5d66b24eca749409a8939a8c744" integrity sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg== -keyv@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373" - integrity sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA== - dependencies: - json-buffer "3.0.0" - keyv@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" @@ -16775,13 +16593,6 @@ line-column@^1.0.2: isarray "^1.0.0" isobject "^2.0.0" -line-stream@0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/line-stream/-/line-stream-0.0.0.tgz#888b7cc7951c6a05ce4d696dd1e6b8262371bb45" - integrity sha1-iIt8x5UcagXOTWlt0ea4JiNxu0U= - dependencies: - through "~2.2.0" - linenumber@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/linenumber/-/linenumber-1.0.1.tgz#e45aba6ee50ec01626773c89224a8b46d0b2d77d" @@ -17250,7 +17061,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.3.0, 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.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== @@ -17309,11 +17120,6 @@ lower-case@^2.0.2: dependencies: tslib "^2.0.3" -lowercase-keys@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306" - integrity sha1-TjNms55/VFfjXxMkvfb4jQv8cwY= - lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" @@ -18484,7 +18290,7 @@ normalize-selector@^0.2.0: resolved "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03" integrity sha1-0LFF62kRicY6eNIB3E/bEpPvDAM= -normalize-url@2.0.1, normalize-url@^4.1.0, normalize-url@^4.5.1, normalize-url@^6.0.1: +normalize-url@^4.1.0, normalize-url@^4.5.1, normalize-url@^6.0.1: version "4.5.1" resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA== @@ -19080,11 +18886,6 @@ p-all@^2.1.0: dependencies: p-map "^2.0.0" -p-cancelable@^0.4.0: - version "0.4.1" - resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz#35f363d67d52081c8d9585e37bcceb7e0bbcb2a0" - integrity sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ== - p-cancelable@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" @@ -19136,11 +18937,6 @@ p-finally@^2.0.0: resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561" integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw== -p-is-promise@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e" - integrity sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4= - p-is-promise@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e" @@ -19238,7 +19034,7 @@ p-try@^2.0.0: resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== -package-json@^4.0.0, package-json@^4.0.1: +package-json@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed" integrity sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0= @@ -21109,14 +20905,6 @@ remark@^13.0.0: remark-stringify "^9.0.0" unified "^9.1.0" -remote-git-tags@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/remote-git-tags/-/remote-git-tags-2.0.0.tgz#1152f39cf8b5268ae0e4307636ef741ec341664c" - integrity sha1-EVLznPi1Jorg5DB2Nu90HsNBZkw= - dependencies: - git-fetch-pack "^0.1.1" - git-transport-protocol "^0.1.0" - remove-trailing-separator@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" @@ -21347,7 +21135,7 @@ resolve@^1.1.6, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.12 is-core-module "^2.2.0" path-parse "^1.0.6" -responselike@1.0.2, responselike@^1.0.2: +responselike@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= @@ -23210,17 +22998,12 @@ through2@~0.2.3: resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= -through@~2.2.0, through@~2.2.7: - version "2.2.7" - resolved "https://registry.yarnpkg.com/through/-/through-2.2.7.tgz#6e8e21200191d4eb6a99f6f010df46aa1c6eb2bd" - integrity sha1-bo4hIAGR1OtqmfbwEN9Gqhxusr0= - time-zone@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/time-zone/-/time-zone-1.0.0.tgz#99c5bf55958966af6d06d83bdf3800dc82faec5d" integrity sha1-mcW/VZWJZq9tBtg73zgA3IL67F0= -timed-out@^4.0.0, timed-out@^4.0.1: +timed-out@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8= @@ -23347,11 +23130,6 @@ to-regex@^3.0.1, to-regex@^3.0.2: regex-not "^1.0.2" safe-regex "^1.1.0" -to-utf8@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/to-utf8/-/to-utf8-0.0.1.tgz#d17aea72ff2fba39b9e43601be7b3ff72e089852" - integrity sha1-0Xrqcv8vujm55DYBvns/9y4ImFI= - toggle-selection@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32" @@ -23978,11 +23756,6 @@ url-parse-lax@^3.0.0: dependencies: prepend-http "^2.0.0" -url-to-options@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9" - integrity sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k= - url@^0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" From cab70b59550e9f2f869efde52bcbb911e6d94899 Mon Sep 17 00:00:00 2001 From: cameronperera Date: Fri, 25 Feb 2022 12:58:23 -0600 Subject: [PATCH 15/16] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20Display=20DNS=20na?= =?UTF-8?q?mes=20for=20AWS=20hosts=20in=20Admin=20UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ✅ Closes: ICU-3488 --- addons/core/translations/form/en-us.yaml | 4 +++- ui/admin/app/components/form/host/aws/index.hbs | 10 +++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/addons/core/translations/form/en-us.yaml b/addons/core/translations/form/en-us.yaml index 9807dbcaf..519115db9 100644 --- a/addons/core/translations/form/en-us.yaml +++ b/addons/core/translations/form/en-us.yaml @@ -136,4 +136,6 @@ secret: label: Client secret value help: The client secret value for the client you want Boundary to use disable_credential_rotation: - label: Disable credential rotation \ No newline at end of file + label: Disable credential rotation +dns_names: + label: DNS Names \ No newline at end of file diff --git a/ui/admin/app/components/form/host/aws/index.hbs b/ui/admin/app/components/form/host/aws/index.hbs index 9aab28192..b5dd9484c 100644 --- a/ui/admin/app/components/form/host/aws/index.hbs +++ b/ui/admin/app/components/form/host/aws/index.hbs @@ -76,7 +76,6 @@ <:title>{{t 'titles.ip-addresses'}} <:body> {{#each @model.ip_addresses as |ip_address|}} - + + <:title>{{t 'form.dns_names.label'}} + <:body> + {{#each @model.dns_names as |dns_name|}} + + {{/each}} + + + {{#if (can 'save model' @model)}} Date: Fri, 25 Feb 2022 14:10:29 -0600 Subject: [PATCH 16/16] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20Update=20form.?= =?UTF-8?q?dns=5Fnames.label=20to=20"Latest=20DNS=20Names"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/core/translations/form/en-us.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/core/translations/form/en-us.yaml b/addons/core/translations/form/en-us.yaml index 519115db9..88d593d05 100644 --- a/addons/core/translations/form/en-us.yaml +++ b/addons/core/translations/form/en-us.yaml @@ -138,4 +138,4 @@ secret: disable_credential_rotation: label: Disable credential rotation dns_names: - label: DNS Names \ No newline at end of file + label: Latest DNS Names \ No newline at end of file