From 0f85357a6e48ffb0d56b9d7649471aa130628b77 Mon Sep 17 00:00:00 2001
From: John Cowen <johncowen@users.noreply.github.com>
Date: Mon, 30 Nov 2020 17:19:44 +0000
Subject: [PATCH] ui: Remove unused helpers or swap for helpers in
 ember-string-fns (#9294)

* ui: Remove unused helpers or swap for helpers in ember-string-fns

* starts-with > string-starts-with
---
 .../consul/discovery-chain/index.hbs          |  4 ++--
 .../consul/intention/form/index.hbs           |  2 +-
 ui/packages/consul-ui/app/helpers/default.js  | 10 --------
 .../consul-ui/app/helpers/difference.js       |  9 -------
 .../consul-ui/app/helpers/object-entries.js   | 10 --------
 .../consul-ui/app/helpers/starts-with.js      |  7 ------
 .../app/templates/dc/nodes/show/metadata.hbs  |  2 +-
 .../dc/services/instance/addresses.hbs        |  2 +-
 .../dc/services/instance/metadata.hbs         |  2 +-
 .../tests/integration/helpers/default-test.js | 24 -------------------
 .../helpers/object-entries-test.js            | 17 -------------
 .../integration/helpers/starts-with-test.js   | 17 -------------
 12 files changed, 6 insertions(+), 100 deletions(-)
 delete mode 100644 ui/packages/consul-ui/app/helpers/default.js
 delete mode 100644 ui/packages/consul-ui/app/helpers/difference.js
 delete mode 100644 ui/packages/consul-ui/app/helpers/object-entries.js
 delete mode 100644 ui/packages/consul-ui/app/helpers/starts-with.js
 delete mode 100644 ui/packages/consul-ui/tests/integration/helpers/default-test.js
 delete mode 100644 ui/packages/consul-ui/tests/integration/helpers/object-entries-test.js
 delete mode 100644 ui/packages/consul-ui/tests/integration/helpers/starts-with-test.js

diff --git a/ui/packages/consul-ui/app/components/consul/discovery-chain/index.hbs b/ui/packages/consul-ui/app/components/consul/discovery-chain/index.hbs
index 4af01d0a47..7b6dda497f 100644
--- a/ui/packages/consul-ui/app/components/consul/discovery-chain/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/discovery-chain/index.hbs
@@ -126,7 +126,7 @@
 </svg>
 <svg class="resolver-inlets" viewBox={{concat '0 0 10 ' height}}>
   {{#each routes as |item|}}
-    {{#if (starts-with 'resolver:' item.NextNode) }}
+    {{#if (string-starts-with item.NextNode 'resolver:') }}
       {{#let (dom-position (concat '#' item.NextNode) '.edges') as |dest|}}
         <circle r="2.5" cx="5" cy={{add dest.y (div dest.height 2)}} />
       {{/let}}
@@ -142,7 +142,7 @@
 </svg>
 <svg class="splitter-inlets" viewBox={{concat '0 0 10 ' height}}>
   {{#each routes as |item|}}
-    {{#if (starts-with 'splitter:' item.NextNode) }}
+    {{#if (string-starts-with item.NextNode 'splitter:') }}
       {{#let (dom-position (concat '#' item.NextNode) '.edges') as |dest|}}
         <circle r="2.5" cx="5" cy={{add dest.y (div dest.height 2)}} />
       {{/let}}
diff --git a/ui/packages/consul-ui/app/components/consul/intention/form/index.hbs b/ui/packages/consul-ui/app/components/consul/intention/form/index.hbs
index bfc0aee5a7..17d92c8772 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/form/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/intention/form/index.hbs
@@ -16,7 +16,7 @@ as |api|>
     <BlockSlot @name="error" as |Notification|>
       <Notification>
         <p data-notification role="alert" class="error notification-update">
-  {{#if (starts-with 'duplicate intention found:' api.error.detail)}}
+  {{#if (string-starts-with api.error.detail 'duplicate intention found:')}}
           <strong>Intention exists</strong>
           An intention already exists for this Source-Destination pair. Please enter a different combination of Services, or search the intentions to edit an existing intention.
   {{else}}
diff --git a/ui/packages/consul-ui/app/helpers/default.js b/ui/packages/consul-ui/app/helpers/default.js
deleted file mode 100644
index b0cbcc1952..0000000000
--- a/ui/packages/consul-ui/app/helpers/default.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { helper } from '@ember/component/helper';
-
-export function _default(params, hash) {
-  if (params[0] === '' || typeof params[0] === 'undefined') {
-    return params[1];
-  }
-  return params[0];
-}
-
-export default helper(_default);
diff --git a/ui/packages/consul-ui/app/helpers/difference.js b/ui/packages/consul-ui/app/helpers/difference.js
deleted file mode 100644
index 983b4a4006..0000000000
--- a/ui/packages/consul-ui/app/helpers/difference.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { helper } from '@ember/component/helper';
-import { get } from '@ember/object';
-export function difference(params, hash) {
-  return params[0].filter(function(item) {
-    return !params[1].findBy('ID', get(item, 'ID'));
-  });
-}
-
-export default helper(difference);
diff --git a/ui/packages/consul-ui/app/helpers/object-entries.js b/ui/packages/consul-ui/app/helpers/object-entries.js
deleted file mode 100644
index 802675e3b4..0000000000
--- a/ui/packages/consul-ui/app/helpers/object-entries.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { helper } from '@ember/component/helper';
-
-export function objectEntries([obj = {}] /*, hash*/) {
-  if (obj == null) {
-    return [];
-  }
-  return Object.entries(obj);
-}
-
-export default helper(objectEntries);
diff --git a/ui/packages/consul-ui/app/helpers/starts-with.js b/ui/packages/consul-ui/app/helpers/starts-with.js
deleted file mode 100644
index b4e25bc69e..0000000000
--- a/ui/packages/consul-ui/app/helpers/starts-with.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { helper } from '@ember/component/helper';
-
-export function startsWith([needle, haystack = ''] /*, hash*/) {
-  return haystack.startsWith(needle);
-}
-
-export default helper(startsWith);
diff --git a/ui/packages/consul-ui/app/templates/dc/nodes/show/metadata.hbs b/ui/packages/consul-ui/app/templates/dc/nodes/show/metadata.hbs
index 2ada7ced88..c8bc020fba 100644
--- a/ui/packages/consul-ui/app/templates/dc/nodes/show/metadata.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/nodes/show/metadata.hbs
@@ -1,7 +1,7 @@
 <div id="metadata" class="tab-section">
   <div role="tabpanel">
 {{#if item.Meta}}
-  <Consul::Metadata::List @items={{object-entries item.Meta}} />
+  <Consul::Metadata::List @items={{entries item.Meta}} />
 {{else}}
   <EmptyState>
     <BlockSlot @name="body">
diff --git a/ui/packages/consul-ui/app/templates/dc/services/instance/addresses.hbs b/ui/packages/consul-ui/app/templates/dc/services/instance/addresses.hbs
index c147bd74a1..5c9e8417f1 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/instance/addresses.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/instance/addresses.hbs
@@ -3,7 +3,7 @@
     {{#if item.Service.TaggedAddresses }}
       <TabularCollection
         data-test-addresses
-        @items={{object-entries item.Service.TaggedAddresses}} as |taggedAddress index|
+        @items={{entries item.Service.TaggedAddresses}} as |taggedAddress index|
       >
           <BlockSlot @name="header">
             <th>Tag</th>
diff --git a/ui/packages/consul-ui/app/templates/dc/services/instance/metadata.hbs b/ui/packages/consul-ui/app/templates/dc/services/instance/metadata.hbs
index 98f5ba995b..76645926ea 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/instance/metadata.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/instance/metadata.hbs
@@ -17,7 +17,7 @@
     <section class="metadata">
       <h3>Meta</h3>
     {{#if item.Meta}}
-      <Consul::Metadata::List @items={{object-entries item.Meta}} />
+      <Consul::Metadata::List @items={{entries item.Meta}} />
     {{else}}
       <EmptyState>
         <BlockSlot @name="body">
diff --git a/ui/packages/consul-ui/tests/integration/helpers/default-test.js b/ui/packages/consul-ui/tests/integration/helpers/default-test.js
deleted file mode 100644
index ff6d039aec..0000000000
--- a/ui/packages/consul-ui/tests/integration/helpers/default-test.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
-
-module('Integration | Helper | default', function(hooks) {
-  setupRenderingTest(hooks);
-
-  // Replace this with your real tests.
-  test('it renders', async function(assert) {
-    this.set('inputValue', '1234');
-
-    await render(hbs`{{default inputValue}}`);
-
-    assert.equal(this.element.textContent.trim(), '1234');
-  });
-  test('it renders the default value', async function(assert) {
-    this.set('inputValue', '');
-
-    await render(hbs`{{default inputValue '1234'}}`);
-
-    assert.equal(this.element.textContent.trim(), '1234');
-  });
-});
diff --git a/ui/packages/consul-ui/tests/integration/helpers/object-entries-test.js b/ui/packages/consul-ui/tests/integration/helpers/object-entries-test.js
deleted file mode 100644
index e64d6123be..0000000000
--- a/ui/packages/consul-ui/tests/integration/helpers/object-entries-test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
-
-module('Integration | Helper | object-entries', function(hooks) {
-  setupRenderingTest(hooks);
-
-  // Replace this with your real tests.
-  test('it renders', async function(assert) {
-    this.set('inputValue', '1234');
-
-    await render(hbs`{{object-entries inputValue}}`);
-
-    assert.equal(this.element.textContent.trim(), Object.entries('1234').toString());
-  });
-});
diff --git a/ui/packages/consul-ui/tests/integration/helpers/starts-with-test.js b/ui/packages/consul-ui/tests/integration/helpers/starts-with-test.js
deleted file mode 100644
index 8a89a7b166..0000000000
--- a/ui/packages/consul-ui/tests/integration/helpers/starts-with-test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
-
-module('Integration | Helper | starts-with', function(hooks) {
-  setupRenderingTest(hooks);
-
-  // Replace this with your real tests.
-  test('it renders', async function(assert) {
-    this.set('inputValue', '1234');
-
-    await render(hbs`{{starts-with inputValue}}`);
-
-    assert.equal(this.element.textContent.trim(), 'false');
-  });
-});