From 458bca1923c9ae4ec4b3760ec2318c5a666442eb Mon Sep 17 00:00:00 2001 From: Jordan Reimer Date: Wed, 28 Sep 2022 15:37:59 -0600 Subject: [PATCH 01/16] updates ember-responsive to latest --- ui/package.json | 2 +- ui/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ui/package.json b/ui/package.json index 8eeb7b2cb651..8450cc310566 100644 --- a/ui/package.json +++ b/ui/package.json @@ -123,7 +123,7 @@ "ember-qrcode-shim": "^0.4.0", "ember-qunit": "^5.1.5", "ember-resolver": "^8.0.3", - "ember-responsive": "^3.0.0-beta.3", + "ember-responsive": "5.0.0", "ember-router-helpers": "^0.4.0", "ember-service-worker": "meirish/ember-service-worker#configurable-scope", "ember-sinon": "^4.0.0", diff --git a/ui/yarn.lock b/ui/yarn.lock index 508d479d2234..9bb4b6aeadb3 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -9589,12 +9589,12 @@ ember-resolver@^8.0.3: ember-cli-version-checker "^5.1.2" resolve "^1.20.0" -ember-responsive@^3.0.0-beta.3: - version "3.0.6" - resolved "https://registry.yarnpkg.com/ember-responsive/-/ember-responsive-3.0.6.tgz#4413c1475d08229791d0133f8bfd44f744a81ca7" - integrity sha512-TSFOB5FnlsMoAQrIe8EhM+cV0kJSLefTyXdb/rAi5zAqVoPC5qreQeHUQG7JKHR8K73azNZM64mXADX1IrIVUw== +ember-responsive@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ember-responsive/-/ember-responsive-5.0.0.tgz#729e4fb3d2651a573600333aaa3b3d7cbd9c4642" + integrity sha512-JDwNIKHNcHrILGkpLqLqZ1idO7hxxt6f4M2wmiktOuzhBm2/JxUjkK+yec+tzIzXaD7rrl2/S7STa/Uj5s6TEw== dependencies: - ember-cli-babel "^7.19.0" + ember-cli-babel "^7.26.11" ember-rfc176-data@^0.3.13, ember-rfc176-data@^0.3.15, ember-rfc176-data@^0.3.17: version "0.3.17" From 9fc5c16d5276cdfed032045a04ddefb24d0c51ae Mon Sep 17 00:00:00 2001 From: Jordan Reimer Date: Thu, 29 Sep 2022 16:45:04 -0600 Subject: [PATCH 02/16] updates ember-composable-helpers to latest and uses includes helper since contains was removed --- ui/app/templates/components/database-connection.hbs | 4 ++-- ui/app/templates/components/form-field-from-model.hbs | 2 +- ui/app/templates/components/namespace-picker.hbs | 2 +- ui/app/templates/vault/cluster/access/method/section.hbs | 2 +- .../templates/vault/cluster/access/namespaces/index.hbs | 2 +- ui/lib/core/addon/components/form-field.hbs | 2 +- ui/lib/core/addon/components/secret-list-header.hbs | 2 +- ui/package.json | 2 +- ui/yarn.lock | 8 ++++---- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ui/app/templates/components/database-connection.hbs b/ui/app/templates/components/database-connection.hbs index ac1036e8af33..20da3ad76ebd 100644 --- a/ui/app/templates/components/database-connection.hbs +++ b/ui/app/templates/components/database-connection.hbs @@ -107,7 +107,7 @@
{{#each fields as |attr|}} {{#if - (contains attr.name (array "max_open_connections" "max_idle_connections" "max_connection_lifetime")) + (includes attr.name (array "max_open_connections" "max_idle_connections" "max_connection_lifetime")) }}
@@ -196,7 +196,7 @@
{{#each fields as |attr|}} {{#if - (contains attr.name (array "max_open_connections" "max_idle_connections" "max_connection_lifetime")) + (includes attr.name (array "max_open_connections" "max_idle_connections" "max_connection_lifetime")) }}
diff --git a/ui/app/templates/components/form-field-from-model.hbs b/ui/app/templates/components/form-field-from-model.hbs index 18542aa8f94d..f63fbcf26775 100644 --- a/ui/app/templates/components/form-field-from-model.hbs +++ b/ui/app/templates/components/form-field-from-model.hbs @@ -2,7 +2,7 @@
{{#unless (or - (contains + (includes @attr.options.editType (array "boolean" "searchSelect" "mountAccessor" "kv" "file" "ttl" "stringArray" "json") ) (eq @attr.type "boolean") diff --git a/ui/app/templates/components/namespace-picker.hbs b/ui/app/templates/components/namespace-picker.hbs index 8766ce4f1176..7e3a96c05d21 100644 --- a/ui/app/templates/components/namespace-picker.hbs +++ b/ui/app/templates/components/namespace-picker.hbs @@ -63,7 +63,7 @@ {{/unless}}
Namespaces
- {{#if (contains "" this.lastMenuLeaves)}} + {{#if (includes "" this.lastMenuLeaves)}} {{! leaf is '' which is the root namespace, and then we need to iterate the root leaves }}
{{~#each this.rootLeaves as |rootLeaf|}} diff --git a/ui/app/templates/vault/cluster/access/method/section.hbs b/ui/app/templates/vault/cluster/access/method/section.hbs index df24feda4373..c069b661d273 100644 --- a/ui/app/templates/vault/cluster/access/method/section.hbs +++ b/ui/app/templates/vault/cluster/access/method/section.hbs @@ -18,7 +18,7 @@ -{{#if (not (contains this.model.type (supported-managed-auth-backends)))}} +{{#if (not (includes this.model.type (supported-managed-auth-backends)))}}
The Vault UI only supports configuration for this authentication method. For management, the API or CLI diff --git a/ui/app/templates/vault/cluster/access/namespaces/index.hbs b/ui/app/templates/vault/cluster/access/namespaces/index.hbs index 89961226e71d..5448e19a2317 100644 --- a/ui/app/templates/vault/cluster/access/namespaces/index.hbs +++ b/ui/app/templates/vault/cluster/access/namespaces/index.hbs @@ -33,7 +33,7 @@ {{#let (concat this.currentNamespace (if this.currentNamespace "/") list.item.id) as |targetNamespace|}} - {{#if (contains targetNamespace this.accessibleNamespaces)}} + {{#if (includes targetNamespace this.accessibleNamespaces)}}
  • Switch to Namespace diff --git a/ui/lib/core/addon/components/form-field.hbs b/ui/lib/core/addon/components/form-field.hbs index 2a42b76b1a90..73e87093ff7b 100644 --- a/ui/lib/core/addon/components/form-field.hbs +++ b/ui/lib/core/addon/components/form-field.hbs @@ -3,7 +3,7 @@ {{#unless (or (eq @attr.type "boolean") - (contains + (includes @attr.options.editType (array "boolean" "optionalText" "searchSelect" "mountAccessor" "kv" "file" "ttl" "stringArray" "json" "regex") ) diff --git a/ui/lib/core/addon/components/secret-list-header.hbs b/ui/lib/core/addon/components/secret-list-header.hbs index 7399bd0b723d..e79637805139 100644 --- a/ui/lib/core/addon/components/secret-list-header.hbs +++ b/ui/lib/core/addon/components/secret-list-header.hbs @@ -77,7 +77,7 @@