ui: Remove some javascript files we no longer use (#6853)

hashicorp · Dec 17, 2019 · 7693fc0 · 7693fc0
1 parent 050936f
commit 7693fc0
Show file tree

Hide file tree

Showing 14 changed files with 4 additions and 139 deletions.
diff --git a/ui-v2/app/components/confirmation-dialog.js b/ui-v2/app/components/confirmation-dialog.js
@@ -3,7 +3,6 @@ import Component from '@ember/component';
 
 import SlotsMixin from 'block-slots';
 import { set } from '@ember/object';
-import { inject as service } from '@ember/service';
 
 const cancel = function() {
   set(this, 'confirming', false);
@@ -15,25 +14,10 @@ const confirm = function() {
   const [action, ...args] = arguments;
   set(this, 'actionName', action);
   set(this, 'arguments', args);
-  if (this._isRegistered('dialog')) {
-    set(this, 'confirming', true);
-  } else {
-    this._confirm
-      .execute(this.message)
-      .then(confirmed => {
-        if (confirmed) {
-          this.execute();
-        }
-      })
-      .catch(function() {
-        return this.error.execute(...arguments);
-      });
-  }
+  set(this, 'confirming', true);
 };
 export default Component.extend(SlotsMixin, {
   classNameBindings: ['confirming'],
-  _confirm: service('confirm'),
-  error: service('error'),
   classNames: ['with-confirmation'],
   message: 'Are you sure?',
   confirming: false,

diff --git a/ui-v2/app/models/intention.js b/ui-v2/app/models/intention.js
@@ -24,6 +24,7 @@ const model = Model.extend({
   CreateIndex: attr('number'),
   ModifyIndex: attr('number'),
 });
+// TODO: Remove this in favour of just specifying it in the Adapter
 export const ATTRS = writable(model, [
   'Action',
   'SourceName',

diff --git a/ui-v2/app/models/policy.js b/ui-v2/app/models/policy.js
@@ -29,5 +29,6 @@ const model = Model.extend({
     defaultValue: '',
   }),
 });
+// TODO: Remove this in favour of just specifying it in the Adapter
 export const ATTRS = writable(model, ['Name', 'Description', 'Rules', 'Datacenters']);
 export default model;
diff --git a/ui-v2/app/models/token.js b/ui-v2/app/models/token.js
@@ -43,6 +43,7 @@ const model = Model.extend({
   CreateIndex: attr('number'),
   ModifyIndex: attr('number'),
 });
+// TODO: Remove this in favour of just specifying it in the Adapter
 // Name and Rules is only for legacy tokens
 export const ATTRS = writable(model, [
   'Name',

diff --git a/ui-v2/app/services/confirm.js b/ui-v2/app/services/confirm.js
diff --git a/ui-v2/app/services/error.js b/ui-v2/app/services/error.js
diff --git a/ui-v2/app/utils/confirm.js b/ui-v2/app/utils/confirm.js
diff --git a/ui-v2/app/utils/error.js b/ui-v2/app/utils/error.js
diff --git a/ui-v2/app/utils/injectableRequestToJQueryAjaxHash.js b/ui-v2/app/utils/injectableRequestToJQueryAjaxHash.js
diff --git a/ui-v2/app/utils/makeAttrable.js b/ui-v2/app/utils/makeAttrable.js
diff --git a/ui-v2/tests/unit/services/confirm-test.js b/ui-v2/tests/unit/services/confirm-test.js
diff --git a/ui-v2/tests/unit/services/error-test.js b/ui-v2/tests/unit/services/error-test.js
diff --git a/ui-v2/tests/unit/utils/confirm-test.js b/ui-v2/tests/unit/utils/confirm-test.js
diff --git a/ui-v2/tests/unit/utils/makeAttrable-test.js b/ui-v2/tests/unit/utils/makeAttrable-test.js