Move away from using reopen to using Mixins

app/mixins/with-feedback.js

@@ -0,0 +1,12 @@
+import Mixin from '@ember/object/mixin';
+import { inject as service } from '@ember/service';
+
+export default Mixin.create({
+  feedback: service('feedback'),
+  init: function() {
+    this._super(...arguments);
+    this.set('feedback', {
+      execute: this.get('feedback').execute.bind(this),
+    });
+  },
+});

app/mixins/with-key-utils.js

@@ -0,0 +1,17 @@
+import Mixin from '@ember/object/mixin';
+
+export default Mixin.create({
+  rootKey: '-',
+  actions: {
+    // Used to link to keys that are not objects,
+    // like parents and grandParents
+    // TODO: This is a view thing, should possibly be a helper
+    linkToKey: function(key) {
+      if (key.slice(-1) === '/' || key === this.rootKey) {
+        this.transitionTo('dc.kv.show', key);
+      } else {
+        this.transitionTo('dc.kv.edit', key);
+      }
+    },
+  },
+});

app/routes/dc/acls.js

@@ -3,7 +3,8 @@ import { inject as service } from '@ember/service';
 import { hash } from 'rsvp';
 
 import { next } from '@ember/runloop';
-export default Route.extend({
+import WithFeedback from 'consul-ui/mixins/with-feedback';
+export default Route.extend(WithFeedback, {
   repo: service('acls'),
   model: function(params) {
     const repo = this.get('repo');

app/routes/dc/acls/show.js

@@ -1,7 +1,8 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 import { hash } from 'rsvp';
-export default Route.extend({
+import WithFeedback from 'consul-ui/mixins/with-feedback';
+export default Route.extend(WithFeedback, {
   repo: service('acls'),
   model: function(params) {
     const dc = this.modelFor('dc').dc;

app/routes/dc/kv/edit.js

@@ -4,10 +4,12 @@ import { assign } from '@ember/polyfills';
 
 import { hash } from 'rsvp';
 import { get } from '@ember/object';
+import WithFeedback from 'consul-ui/mixins/with-feedback';
+import WithKeyUtils from 'consul-ui/mixins/with-key-utils';
 import transitionToNearestParent from 'consul-ui/utils/transitionToNearestParent';
 import ascend from 'consul-ui/utils/ascend';
 
-export default Route.extend({
+export default Route.extend(WithFeedback, WithKeyUtils, {
   repo: service('kv'),
   sessionRepo: service('session'),
   model: function(params) {

app/routes/dc/kv/index.js

@@ -1,6 +1,7 @@
 import Route from '@ember/routing/route';
 
-export default Route.extend({
+import WithKeyUtils from 'consul-ui/mixins/with-key-utils';
+export default Route.extend(WithKeyUtils, {
   beforeModel: function() {
     this.transitionTo('dc.kv.show', this.rootKey);
   },

app/routes/dc/kv/show.js

@@ -1,6 +1,8 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 import { hash } from 'rsvp';
+import WithFeedback from 'consul-ui/mixins/with-feedback';
+import WithKeyUtils from 'consul-ui/mixins/with-key-utils';
 import rootKey from 'consul-ui/utils/rootKey';
 import transitionToNearestParent from 'consul-ui/utils/transitionToNearestParent';
 import ascend from 'consul-ui/utils/ascend';
@@ -14,7 +16,7 @@ const prefix = function(key, prefix) {
   }
   return key;
 };
-export default Route.extend({
+export default Route.extend(WithFeedback, WithKeyUtils, {
   repo: service('kv'),
   model: function(params) {
     const repo = this.get('repo');

tests/unit/mixins/with-feedback-test.js

@@ -0,0 +1,12 @@
+import EmberObject from '@ember/object';
+import WithFeedbackMixin from 'consul-ui/mixins/with-feedback';
+import { module, test } from 'qunit';
+
+module('Unit | Mixin | with feedback');
+
+// Replace this with your real tests.
+test('it works', function(assert) {
+  let WithFeedbackObject = EmberObject.extend(WithFeedbackMixin);
+  let subject = WithFeedbackObject.create();
+  assert.ok(subject);
+});

tests/unit/mixins/with-key-utils-test.js

@@ -0,0 +1,12 @@
+import EmberObject from '@ember/object';
+import WithKeyUtilsMixin from 'consul-ui/mixins/with-key-utils';
+import { module, test } from 'qunit';
+
+module('Unit | Mixin | with key utils');
+
+// Replace this with your real tests.
+test('it works', function(assert) {
+  let WithKeyUtilsObject = EmberObject.extend(WithKeyUtilsMixin);
+  let subject = WithKeyUtilsObject.create();
+  assert.ok(subject);
+});