ui: upgrade ember composable helper (#13394)

Upgrade ember-composable-helpers to version 5.x. This version contains the pick-helper which makes composition in the template layer easier with Octane. {{!-- this is usually hard to do with Octane --}} <input {{on "input" (pick "target.value" this.updateText)}} .../> Version 5.x also fixes a regression with sort-by that according to @johncowen was the reason why the version was pinned to 4.0.0 at the moment. Version 5 of ember-composable-helpers removes the contains-helper in favor of includes which I changed all occurences for.
hashicorp · Jun 8, 2022 · 4d36e2b · 4d36e2b
1 parent ec0d267
commit 4d36e2b
Show file tree

Hide file tree

Showing 26 changed files with 57 additions and 54 deletions.
diff --git a/.changelog/13394.txt b/.changelog/13394.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+ui: upgrade ember-composable-helpers to v5.x
+```
diff --git a/...onsul-lock-sessions/app/components/consul/lock-session/notifications/README.mdx b/...onsul-lock-sessions/app/components/consul/lock-session/notifications/README.mdx
@@ -30,7 +30,7 @@ A Notification component specifically for LockSessions.
   </figcaption>
 
   <Consul::LockSession::Notifications
-    @type={{if (contains this.type (array 'success' 'error')) 'remove' 'kv'}}
+    @type={{if (includes this.type (array 'success' 'error')) 'remove' 'kv'}}
     @error={{if (eq this.type 'error') (hash
       status="403"
       detail=""

diff --git a/ui/packages/consul-nspaces/app/components/consul/nspace/search-bar/index.hbs b/ui/packages/consul-nspaces/app/components/consul/nspace/search-bar/index.hbs
@@ -55,7 +55,7 @@ as |key value|}}
           <BlockSlot @name="options">
     {{#let components.Optgroup components.Option as |Optgroup Option|}}
             {{#each @filter.searchproperty.default as |prop|}}
-              <Option @value={{prop}} @selected={{contains prop @filter.searchproperty.value}}>
+              <Option @value={{prop}} @selected={{includes prop @filter.searchproperty.value}}>
                 {{t (concat "common.consul." (lowercase prop))}}
               </Option>
             {{/each}}

diff --git a/ui/packages/consul-partitions/app/components/consul/partition/search-bar/index.hbs b/ui/packages/consul-partitions/app/components/consul/partition/search-bar/index.hbs
@@ -55,7 +55,7 @@ as |key value|}}
           <BlockSlot @name="options">
     {{#let components.Optgroup components.Option as |Optgroup Option|}}
             {{#each @filter.searchproperty.default as |prop|}}
-              <Option @value={{prop}} @selected={{contains prop @filter.searchproperty.value}}>
+              <Option @value={{prop}} @selected={{includes prop @filter.searchproperty.value}}>
                 {{t (concat "common.consul." (lowercase prop))}}
               </Option>
             {{/each}}

diff --git a/ui/packages/consul-ui/app/components/consul/auth-method/search-bar/index.hbs b/ui/packages/consul-ui/app/components/consul/auth-method/search-bar/index.hbs
@@ -55,7 +55,7 @@ as |key value|}}
           <BlockSlot @name="options">
     {{#let components.Optgroup components.Option as |Optgroup Option|}}
             {{#each @filter.searchproperty.default as |prop|}}
-              <Option @value={{prop}} @selected={{contains prop @filter.searchproperty.value}}>
+              <Option @value={{prop}} @selected={{includes prop @filter.searchproperty.value}}>
                 {{t (concat "common.consul." (lowercase prop))}}
               </Option>
             {{/each}}
@@ -78,10 +78,10 @@ as |key value|}}
         </BlockSlot>
         <BlockSlot @name="options">
         {{#let components.Optgroup components.Option as |Optgroup Option|}}
-          <Option class="kubernetes" @value="kubernetes" @selected={{contains 'kubernetes' @filter.kind.value}}>Kubernetes</Option>
-          <Option class="jwt" @value="jwt" @selected={{contains 'jwt' @filter.kind.value}}>JWT</Option>
+          <Option class="kubernetes" @value="kubernetes" @selected={{includes 'kubernetes' @filter.kind.value}}>Kubernetes</Option>
+          <Option class="jwt" @value="jwt" @selected={{includes 'jwt' @filter.kind.value}}>JWT</Option>
         {{#if (env 'CONSUL_SSO_ENABLED')}}
-          <Option class="oidc" @value="oidc" @selected={{contains 'oidc' @filter.kind.value}}>OIDC</Option>
+          <Option class="oidc" @value="oidc" @selected={{includes 'oidc' @filter.kind.value}}>OIDC</Option>
         {{/if}}
         {{/let}}
         </BlockSlot>
@@ -100,7 +100,7 @@ as |key value|}}
         <BlockSlot @name="options">
       {{#let components.Optgroup components.Option as |Optgroup Option|}}
         {{#each (array "local" "global") as |option|}}
-          <Option class="{{option}}" @value={{option}} @selected={{contains option @filter.types}}>
+          <Option class="{{option}}" @value={{option}} @selected={{includes option @filter.types}}>
             {{t (concat "components.consul.auth-method.search-bar.locality.options." option)}}
           </Option>
         {{/each}}

diff --git a/ui/packages/consul-ui/app/components/consul/health-check/search-bar/index.hbs b/ui/packages/consul-ui/app/components/consul/health-check/search-bar/index.hbs
@@ -55,7 +55,7 @@ as |key value|}}
           <BlockSlot @name="options">
     {{#let components.Optgroup components.Option as |Optgroup Option|}}
             {{#each @filter.searchproperty.default as |prop|}}
-              <Option @value={{prop}} @selected={{contains prop @filter.searchproperty.value}}>
+              <Option @value={{prop}} @selected={{includes prop @filter.searchproperty.value}}>
                 {{t (concat "common.consul." (lowercase prop))}}
               </Option>
             {{/each}}
@@ -80,7 +80,7 @@ as |key value|}}
         <BlockSlot @name="options">
   {{#let components.Optgroup components.Option as |Optgroup Option|}}
     {{#each (array "passing" "warning" "critical" "empty") as |state|}}
-          <Option class="value-{{state}}" @value={{state}} @selected={{contains state @filter.status.value}}>
+          <Option class="value-{{state}}" @value={{state}} @selected={{includes state @filter.status.value}}>
             {{t (concat "common.consul." state)
                 default=(array
                   (concat "common.search." state)
@@ -106,7 +106,7 @@ as |key value|}}
         <BlockSlot @name="options">
   {{#let components.Optgroup components.Option as |Optgroup Option|}}
     {{#each (array "service" "node") as |item|}}
-          <Option @value={{item}} @selected={{contains item @filter.kind.value}}>
+          <Option @value={{item}} @selected={{includes item @filter.kind.value}}>
             {{t (concat "components.consul.health-check.search-bar.kind.options." item)
                 default=(array
                   (concat "common.search." item)
@@ -132,7 +132,7 @@ as |key value|}}
         <BlockSlot @name="options">
   {{#let components.Optgroup components.Option as |Optgroup Option|}}
     {{#each (array "alias" "docker" "grpc" "http" "script" "serf" "tcp" "ttl") as |item|}}
-          <Option @value={{item}} @selected={{contains item @filter.check.value}}>
+          <Option @value={{item}} @selected={{includes item @filter.check.value}}>
             {{t (concat "components.consul.health-check.search-bar.check.options." item)
                 default=(array
                   (concat "common.search." item)

diff --git a/ui/packages/consul-ui/app/components/consul/intention/permission/form/index.hbs b/ui/packages/consul-ui/app/components/consul/intention/permission/form/index.hbs
@@ -108,7 +108,7 @@ as |group|>
             type="checkbox"
             name="method"
             value={{method}}
-            checked={{if (contains method changeset.HTTP.Methods) 'checked'}}
+            checked={{if (includes method changeset.HTTP.Methods) 'checked'}}
             onchange={{action 'change' 'method' changeset}}
           />
           <span>{{method}}</span>

diff --git a/ui/packages/consul-ui/app/components/consul/intention/search-bar/index.hbs b/ui/packages/consul-ui/app/components/consul/intention/search-bar/index.hbs
@@ -55,7 +55,7 @@ as |key value|}}
           <BlockSlot @name="options">
     {{#let components.Optgroup components.Option as |Optgroup Option|}}
             {{#each @filter.searchproperty.default as |prop|}}
-              <Option @value={{prop}} @selected={{contains prop @filter.searchproperty.value}}>
+              <Option @value={{prop}} @selected={{includes prop @filter.searchproperty.value}}>
                 {{t (concat "common.consul." (lowercase prop))}}
               </Option>
             {{/each}}
@@ -80,7 +80,7 @@ as |key value|}}
         <BlockSlot @name="options">
   {{#let components.Optgroup components.Option as |Optgroup Option|}}
     {{#each (array "allow" "deny" "") as |item|}}
-          <Option class={{concat 'value-' item}} @value={{or item 'app-aware'}} @selected={{contains (or item 'app-aware') @filter.access.value}}>
+          <Option class={{concat 'value-' item}} @value={{or item 'app-aware'}} @selected={{includes (or item 'app-aware') @filter.access.value}}>
             <span>{{t (concat "components.consul.intention.search-bar.access.options." (or item 'app-aware'))}}</span>
           </Option>
     {{/each}}

diff --git a/ui/packages/consul-ui/app/components/consul/kv/search-bar/index.hbs b/ui/packages/consul-ui/app/components/consul/kv/search-bar/index.hbs
@@ -55,7 +55,7 @@ as |key value|}}
           <BlockSlot @name="options">
     {{#let components.Optgroup components.Option as |Optgroup Option|}}
             {{#each @filter.searchproperty.default as |prop|}}
-              <Option @value={{prop}} @selected={{contains prop @filter.searchproperty.value}}>
+              <Option @value={{prop}} @selected={{includes prop @filter.searchproperty.value}}>
                 {{t (concat "common.consul." (lowercase prop))}}
               </Option>
             {{/each}}
@@ -80,7 +80,7 @@ as |key value|}}
         <BlockSlot @name="options">
   {{#let components.Optgroup components.Option as |Optgroup Option|}}
     {{#each (array "folder" "key") as |item|}}
-          <Option class="value-{item}}" @value={{item}} @selected={{contains item @filter.kind.value}}>
+          <Option class="value-{item}}" @value={{item}} @selected={{includes item @filter.kind.value}}>
             {{t (concat "components.consul.kv.search-bar.kind.options." item)}}
           </Option>
     {{/each}}

diff --git a/ui/packages/consul-ui/app/components/consul/node/search-bar/index.hbs b/ui/packages/consul-ui/app/components/consul/node/search-bar/index.hbs
@@ -55,7 +55,7 @@ as |key value|}}
           <BlockSlot @name="options">
     {{#let components.Optgroup components.Option as |Optgroup Option|}}
             {{#each @filter.searchproperty.default as |prop|}}
-              <Option @value={{prop}} @selected={{contains prop @filter.searchproperty.value}}>
+              <Option @value={{prop}} @selected={{includes prop @filter.searchproperty.value}}>
                 {{t (concat "common.consul." (lowercase prop))}}
               </Option>
             {{/each}}
@@ -79,7 +79,7 @@ as |key value|}}
         <BlockSlot @name="options">
   {{#let components.Optgroup components.Option as |Optgroup Option|}}
     {{#each (array "passing" "warning" "critical") as |state|}}
-          <Option class="value-{{state}}" @value={{state}} @selected={{contains state @filter.status.value}}>
+          <Option class="value-{{state}}" @value={{state}} @selected={{includes state @filter.status.value}}>
             {{t (concat "common.consul." state)
                 default=(array
                   (concat "common.search." state)

diff --git a/ui/packages/consul-ui/app/components/consul/policy/search-bar/index.hbs b/ui/packages/consul-ui/app/components/consul/policy/search-bar/index.hbs
@@ -55,7 +55,7 @@ as |key value|}}
           <BlockSlot @name="options">
     {{#let components.Optgroup components.Option as |Optgroup Option|}}
             {{#each @filter.searchproperty.default as |prop|}}
-              <Option @value={{prop}} @selected={{contains prop @filter.searchproperty.value}}>
+              <Option @value={{prop}} @selected={{includes prop @filter.searchproperty.value}}>
                 {{t (concat "common.consul." (lowercase prop))}}
               </Option>
             {{/each}}
@@ -79,7 +79,7 @@ as |key value|}}
         <BlockSlot @name="options">
       {{#let components.Optgroup components.Option as |Optgroup Option|}}
           {{#each dcs as |dc|}}
-            <Option @value={{dc.Name}} @selected={{contains dc.Name @filter.datacenter.value}}>{{dc.Name}}</Option>
+            <Option @value={{dc.Name}} @selected={{includes dc.Name @filter.datacenter.value}}>{{dc.Name}}</Option>
           {{/each}}
             <DataSource
               @src={{uri "/${partition}/*/*/datacenters"
@@ -107,7 +107,7 @@ as |key value|}}
         <BlockSlot @name="options">
   {{#let components.Optgroup components.Option as |Optgroup Option|}}
     {{#each (array "global-management" "standard") as |state|}}
-          <Option class="value-{{state}}" @value={{state}} @selected={{contains state @filter.kind.value}}>
+          <Option class="value-{{state}}" @value={{state}} @selected={{includes state @filter.kind.value}}>
             {{t (concat "components.consul.policy.search-bar.kind.options." state)
                 default=(array
                   (concat "common.search." state)

diff --git a/ui/packages/consul-ui/app/components/consul/role/search-bar/index.hbs b/ui/packages/consul-ui/app/components/consul/role/search-bar/index.hbs
@@ -55,7 +55,7 @@ as |key value|}}
           <BlockSlot @name="options">
     {{#let components.Optgroup components.Option as |Optgroup Option|}}
             {{#each @filter.searchproperty.default as |prop|}}
-              <Option @value={{prop}} @selected={{contains prop @filter.searchproperty.value}}>
+              <Option @value={{prop}} @selected={{includes prop @filter.searchproperty.value}}>
                 {{t (concat "common.consul." (lowercase prop))}}
               </Option>
             {{/each}}

diff --git a/ui/packages/consul-ui/app/components/consul/server/card/index.hbs b/ui/packages/consul-ui/app/components/consul/server/card/index.hbs
@@ -8,7 +8,7 @@
     ))
     (array 'voting-status-non-voter' (or
       @item.ReadReplica
-      (contains @item.Status (array 'non-voter' 'staging'))
+      (includes @item.Status (array 'non-voter' 'staging'))
     ))
   }}
   ...attributes
@@ -31,7 +31,7 @@
       Status
     </dt>
     <dd>
-      {{if (contains @item.Status (array 'leader' 'voter')) 'Active voter' 'Backup voter'}}
+      {{if (includes @item.Status (array 'leader' 'voter')) 'Active voter' 'Backup voter'}}
     </dd>
 
   </dl>

diff --git a/ui/packages/consul-ui/app/components/consul/service-instance/search-bar/index.hbs b/ui/packages/consul-ui/app/components/consul/service-instance/search-bar/index.hbs
@@ -56,7 +56,7 @@ as |key value|}}
           <BlockSlot @name="options">
     {{#let components.Optgroup components.Option as |Optgroup Option|}}
             {{#each @filter.searchproperty.default as |prop|}}
-              <Option @value={{prop}} @selected={{contains prop @filter.searchproperty.value}}>
+              <Option @value={{prop}} @selected={{includes prop @filter.searchproperty.value}}>
                 {{t (concat "common.consul." (lowercase prop))}}
               </Option>
             {{/each}}
@@ -81,7 +81,7 @@ as |key value|}}
         <BlockSlot @name="options">
   {{#let components.Optgroup components.Option as |Optgroup Option|}}
     {{#each (array "passing" "warning" "critical" "empty") as |state|}}
-          <Option class="value-{{state}}" @value={{state}} @selected={{contains state @filter.status.value}}>
+          <Option class="value-{{state}}" @value={{state}} @selected={{includes state @filter.status.value}}>
             {{t (concat "common.consul." state)
                 default=(array
                   (concat "common.search." state)
@@ -107,7 +107,7 @@ as |key value|}}
         <BlockSlot @name="options">
   {{#let components.Optgroup components.Option as |Optgroup Option|}}
     {{#each @sources as |source|}}
-          <Option class={{source}} @value={{source}} @selected={{contains source @filter.source.value}}>
+          <Option class={{source}} @value={{source}} @selected={{includes source @filter.source.value}}>
             {{t (concat "common.brand." source)}}
           </Option>
     {{/each}}

diff --git a/ui/packages/consul-ui/app/components/consul/service/search-bar/index.hbs b/ui/packages/consul-ui/app/components/consul/service/search-bar/index.hbs
@@ -55,7 +55,7 @@ as |key value|}}
           <BlockSlot @name="options">
     {{#let components.Optgroup components.Option as |Optgroup Option|}}
             {{#each @filter.searchproperty.default as |prop|}}
-              <Option @value={{prop}} @selected={{contains prop @filter.searchproperty.value}}>
+              <Option @value={{prop}} @selected={{includes prop @filter.searchproperty.value}}>
                 {{t (concat "common.consul." (lowercase prop))}}
               </Option>
             {{/each}}
@@ -79,7 +79,7 @@ as |key value|}}
         <BlockSlot @name="options">
   {{#let components.Optgroup components.Option as |Optgroup Option|}}
     {{#each (array "passing" "warning" "critical" "empty") as |state|}}
-          <Option class="value-{{state}}" @value={{state}} @selected={{contains state @filter.status.value}}>
+          <Option class="value-{{state}}" @value={{state}} @selected={{includes state @filter.status.value}}>
             {{t (concat "common.consul." state)
                 default=(array
                   (concat "common.search." state)
@@ -102,14 +102,14 @@ as |key value|}}
         </BlockSlot>
         <BlockSlot @name="options">
   {{#let components.Optgroup components.Option as |Optgroup Option|}}
-          <Option @value="service" @selected={{contains 'service' @filter.kind.value}}>
+          <Option @value="service" @selected={{includes 'service' @filter.kind.value}}>
             {{t "common.consul.service"}}
           </Option>
           <Optgroup
             @label={{t "common.consul.gateway"}}
           >
       {{#each (array "ingress-gateway" "terminating-gateway" "mesh-gateway") as |kind|}}
-            <Option @value={{kind}} @selected={{contains kind @filter.kind.value}}>
+            <Option @value={{kind}} @selected={{includes kind @filter.kind.value}}>
               {{t (concat "common.consul." kind)}}
             </Option>
       {{/each}}
@@ -118,7 +118,7 @@ as |key value|}}
             @label={{t "common.consul.mesh"}}
           >
     {{#each (array "in-mesh" "not-in-mesh") as |state|}}
-            <Option @value={{state}} @selected={{contains state @filter.kind.value}}>
+            <Option @value={{state}} @selected={{includes state @filter.kind.value}}>
               {{t (concat "common.search." state)}}
             </Option>
     {{/each}}
@@ -148,7 +148,7 @@ as |nonDefaultPartitions|}}
       @label={{t 'common.brand.consul'}}
     >
     {{#each @partitions as |partition|}}
-      <Option class="partition" @value={{partition}} @selected={{contains partition @filter.source.value}}>
+      <Option class="partition" @value={{partition}} @selected={{includes partition @filter.source.value}}>
         {{partition}}
       </Option>
     {{/each}}
@@ -161,7 +161,7 @@ as |nonDefaultPartitions|}}
       @label={{t 'common.search.integrations'}}
     >
     {{#each @sources as |source|}}
-          <Option class={{source}} @value={{source}} @selected={{contains source @filter.source.value}}>
+          <Option class={{source}} @value={{source}} @selected={{includes source @filter.source.value}}>
             {{t (concat "common.brand." source)}}
           </Option>
     {{/each}}

diff --git a/ui/packages/consul-ui/app/components/consul/token/search-bar/index.hbs b/ui/packages/consul-ui/app/components/consul/token/search-bar/index.hbs
@@ -55,7 +55,7 @@ as |key value|}}
           <BlockSlot @name="options">
     {{#let components.Optgroup components.Option as |Optgroup Option|}}
             {{#each @filter.searchproperty.default as |prop|}}
-              <Option @value={{prop}} @selected={{contains prop @filter.searchproperty.value}}>
+              <Option @value={{prop}} @selected={{includes prop @filter.searchproperty.value}}>
                 {{t (concat "common.consul." (lowercase prop))}}
               </Option>
             {{/each}}
@@ -79,7 +79,7 @@ as |key value|}}
         <BlockSlot @name="options">
   {{#let components.Optgroup components.Option as |Optgroup Option|}}
     {{#each (array "global-management" "global" "local") as |state|}}
-          <Option class="value-{{state}}" @value={{state}} @selected={{contains state @filter.kind.value}}>
+          <Option class="value-{{state}}" @value={{state}} @selected={{includes state @filter.kind.value}}>
             {{t (concat "components.consul.token.search-bar.kind.options." state)
                 default=(array
                   (concat "common.search." state)

diff --git a/ui/packages/consul-ui/app/components/consul/upstream-instance/search-bar/index.hbs b/ui/packages/consul-ui/app/components/consul/upstream-instance/search-bar/index.hbs
@@ -55,7 +55,7 @@ as |key value|}}
           <BlockSlot @name="options">
     {{#let components.Optgroup components.Option as |Optgroup Option|}}
             {{#each @filter.searchproperty.default as |prop|}}
-              <Option @value={{prop}} @selected={{contains prop @filter.searchproperty.value}}>
+              <Option @value={{prop}} @selected={{includes prop @filter.searchproperty.value}}>
                 {{t (concat "common.consul." (lowercase prop))}}
               </Option>
             {{/each}}

diff --git a/ui/packages/consul-ui/app/components/consul/upstream/search-bar/index.hbs b/ui/packages/consul-ui/app/components/consul/upstream/search-bar/index.hbs
@@ -55,7 +55,7 @@ as |key value|}}
           <BlockSlot @name="options">
     {{#let components.Optgroup components.Option as |Optgroup Option|}}
             {{#each @filter.searchproperty.default as |prop|}}
-              <Option @value={{prop}} @selected={{contains prop @filter.searchproperty.value}}>
+              <Option @value={{prop}} @selected={{includes prop @filter.searchproperty.value}}>
                 {{t (concat "common.consul." (lowercase prop))}}
               </Option>
             {{/each}}
@@ -78,7 +78,7 @@ as |key value|}}
         <BlockSlot @name="options">
   {{#let components.Optgroup components.Option as |Optgroup Option|}}
       {{#each (array "registered" "not-registered") as |item|}}
-            <Option @value={{item}} @selected={{contains item @filter.instance.value}}>
+            <Option @value={{item}} @selected={{includes item @filter.instance.value}}>
               {{t (concat "common.consul." item)}}
             </Option>
       {{/each}}

diff --git a/ui/packages/consul-ui/app/components/disclosure-menu/menu/index.hbs b/ui/packages/consul-ui/app/components/disclosure-menu/menu/index.hbs
@@ -9,7 +9,7 @@
       {{css-prop '--paged-row-height' returns=pager.rowHeight}}
       {{css-prop 'max-height' returns=pager.maxHeight}}
       class={{class-map
-        (array 'paged-collection-scroll' (contains pager.type (array 'virtual-scroll' 'native-scroll')))
+        (array 'paged-collection-scroll' (includes pager.type (array 'virtual-scroll' 'native-scroll')))
       }}
       ...attributes
     >

diff --git a/ui/packages/consul-ui/app/components/form-group/element/index.hbs b/ui/packages/consul-ui/app/components/form-group/element/index.hbs
@@ -13,7 +13,7 @@
   state=state
 )
 as |el|}}
-  {{#if (contains this.type (array 'radiogroup' 'checkbox-group' 'checkboxgroup'))}}
+  {{#if (includes this.type (array 'radiogroup' 'checkbox-group' 'checkboxgroup'))}}
     <div
       data-property={{this.prop}}
       class="type-{{this.type}}{{if (state-matches state 'error') ' has-error'}}"