From 32a0b757d0cbe0445c8a1488cbecd25bfbd07fb3 Mon Sep 17 00:00:00 2001
From: John Cowen <johncowen@users.noreply.github.com>
Date: Fri, 11 Dec 2020 11:43:13 +0000
Subject: [PATCH] ui: Controller dead code removal (#9367)

* ui: Controller dead code removal

This commit removes a little code that became 'dead' as a result of
previous PRs/commits

* Remove a little more from the settings Controller

* Remove CSS related to being able to set the dashboard_url in settings
---
 ui/packages/consul-ui/app/controllers/dc.js   |  3 ---
 .../dc/services/instance/upstreams.js         | 11 --------
 .../app/controllers/dc/services/show.js       |  9 ++-----
 .../consul-ui/app/controllers/settings.js     | 25 -------------------
 ui/packages/consul-ui/app/styles/routes.scss  |  1 -
 .../app/styles/routes/dc/settings/index.scss  | 16 ------------
 .../tests/unit/controllers/dc-test.js         | 12 ---------
 7 files changed, 2 insertions(+), 75 deletions(-)
 delete mode 100644 ui/packages/consul-ui/app/controllers/dc.js
 delete mode 100644 ui/packages/consul-ui/app/controllers/dc/services/instance/upstreams.js
 delete mode 100644 ui/packages/consul-ui/app/styles/routes/dc/settings/index.scss
 delete mode 100644 ui/packages/consul-ui/tests/unit/controllers/dc-test.js

diff --git a/ui/packages/consul-ui/app/controllers/dc.js b/ui/packages/consul-ui/app/controllers/dc.js
deleted file mode 100644
index 7abcab1c7..000000000
--- a/ui/packages/consul-ui/app/controllers/dc.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Controller from '@ember/controller';
-
-export default class DcController extends Controller {}
diff --git a/ui/packages/consul-ui/app/controllers/dc/services/instance/upstreams.js b/ui/packages/consul-ui/app/controllers/dc/services/instance/upstreams.js
deleted file mode 100644
index ecb092564..000000000
--- a/ui/packages/consul-ui/app/controllers/dc/services/instance/upstreams.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import Controller from '@ember/controller';
-
-export default class DcServicesInstanceUpstreamsController extends Controller {
-  queryParams = {
-    sortBy: 'sort',
-    search: {
-      as: 'filter',
-      replace: true,
-    },
-  };
-}
diff --git a/ui/packages/consul-ui/app/controllers/dc/services/show.js b/ui/packages/consul-ui/app/controllers/dc/services/show.js
index e715f0de6..639e7f10a 100644
--- a/ui/packages/consul-ui/app/controllers/dc/services/show.js
+++ b/ui/packages/consul-ui/app/controllers/dc/services/show.js
@@ -3,14 +3,9 @@ import { alias } from '@ember/object/computed';
 import Controller from '@ember/controller';
 import { get, action } from '@ember/object';
 export default class ShowController extends Controller {
-  @service('dom')
-  dom;
+  @service('flashMessages') notify;
 
-  @service('flashMessages')
-  notify;
-
-  @alias('items.firstObject')
-  item;
+  @alias('items.firstObject') item;
 
   @action
   error(e) {
diff --git a/ui/packages/consul-ui/app/controllers/settings.js b/ui/packages/consul-ui/app/controllers/settings.js
index 0533a52c5..affd76222 100644
--- a/ui/packages/consul-ui/app/controllers/settings.js
+++ b/ui/packages/consul-ui/app/controllers/settings.js
@@ -3,26 +3,8 @@ import { get, set } from '@ember/object';
 import { inject as service } from '@ember/service';
 
 export default Controller.extend({
-  repo: service('settings'),
   dom: service('dom'),
-  timeout: service('timeout'),
-  confirming: false,
-  applyTransition: function() {
-    const tick = this.timeout.tick;
-    set(this, 'confirming', true);
-    tick().then(() => {
-      set(this, 'confirming', false);
-    });
-  },
   actions: {
-    key: function(e) {
-      this.applyTransition();
-      switch (true) {
-        case e.keyCode === 13:
-          // disable ENTER
-          e.preventDefault();
-      }
-    },
     change: function(e, value, item) {
       const event = this.dom.normalizeEvent(e, value);
       // TODO: Switch to using forms like the rest of the app
@@ -37,13 +19,6 @@ export default Controller.extend({
           set(this, 'item.client.blocking', !blocking);
           this.send('update', 'client', this.item.client);
           break;
-        case 'urls[service]':
-          if (typeof get(this, 'item.urls') === 'undefined') {
-            set(this, 'item.urls', {});
-          }
-          set(this, 'item.urls.service', target.value);
-          this.send('update', 'urls', this.item.urls);
-          break;
       }
     },
   },
diff --git a/ui/packages/consul-ui/app/styles/routes.scss b/ui/packages/consul-ui/app/styles/routes.scss
index 5af7d3f15..34f12616b 100644
--- a/ui/packages/consul-ui/app/styles/routes.scss
+++ b/ui/packages/consul-ui/app/styles/routes.scss
@@ -1,4 +1,3 @@
-@import 'routes/dc/settings/index';
 @import 'routes/dc/services/index';
 @import 'routes/dc/nodes/index';
 @import 'routes/dc/kv/index';
diff --git a/ui/packages/consul-ui/app/styles/routes/dc/settings/index.scss b/ui/packages/consul-ui/app/styles/routes/dc/settings/index.scss
deleted file mode 100644
index 3f97998b7..000000000
--- a/ui/packages/consul-ui/app/styles/routes/dc/settings/index.scss
+++ /dev/null
@@ -1,16 +0,0 @@
-#urls_service span {
-  position: relative;
-}
-#urls_service span::after {
-  @extend %with-check-circle-fill-color-icon, %as-pseudo;
-  position: absolute;
-  top: 3px;
-  right: 0;
-}
-#urls_service span::after {
-  @extend %blink-in-fade-out;
-  transition-delay: 3s;
-}
-#urls_service.confirming span::after {
-  @extend %blink-in-fade-out-active;
-}
diff --git a/ui/packages/consul-ui/tests/unit/controllers/dc-test.js b/ui/packages/consul-ui/tests/unit/controllers/dc-test.js
deleted file mode 100644
index 9780e13c9..000000000
--- a/ui/packages/consul-ui/tests/unit/controllers/dc-test.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
-
-module('Unit | Controller | dc', function(hooks) {
-  setupTest(hooks);
-
-  // Replace this with your real tests.
-  test('it exists', function(assert) {
-    let controller = this.owner.lookup('controller:dc');
-    assert.ok(controller);
-  });
-});