UI - support for kv v2

ui/app/adapters/capabilities.js

@@ -18,6 +18,9 @@ export default ApplicationAdapter.extend({
 
   queryRecord(store, type, query) {
     const { id } = query;
+    if (!id) {
+      return;
+    }
     return this.findRecord(store, type, id).then(resp => {
       resp.path = id;
       return resp;

ui/app/adapters/secret-v2-version.js

@@ -0,0 +1,72 @@
+/* eslint-disable */
+import { isEmpty } from '@ember/utils';
+import { get } from '@ember/object';
+import ApplicationAdapter from './application';
+import DS from 'ember-data';
+
+export default ApplicationAdapter.extend({
+  namespace: 'v1',
+  _url(backend, id, infix = 'data') {
+    let url = `${this.buildURL()}/${backend}/${infix}/`;
+    if (!isEmpty(id)) {
+      url = url + id;
+    }
+    return url;
+  },
+
+  urlForFindRecord(id) {
+    let [backend, path, version] = JSON.parse(id);
+    return this._url(backend, path) + `?version=${version}`;
+  },
+
+  findRecord() {
+    return this._super(...arguments).catch(errorOrModel => {
+      // if it's a real 404, this will be an error, if not
+      // it will be the body of a deleted / destroyed version
+      if (errorOrModel instanceof DS.AdapterError) {
+        throw errorOrModel;
+      }
+      return errorOrModel;
+    });
+  },
+
+  urlForCreateRecord(modelName, snapshot) {
+    let backend = snapshot.belongsTo('secret').belongsTo('engine').id;
+    let path = snapshot.attr('path');
+    return this._url(backend, path);
+  },
+
+  createRecord(store, modelName, snapshot) {
+    let backend = snapshot.belongsTo('secret').belongsTo('engine').id;
+    let path = snapshot.attr('path');
+    return this._super(...arguments).then(resp => {
+      resp.id = JSON.stringify([backend, path, resp.version]);
+      return resp;
+    });
+  },
+
+  urlForUpdateRecord(id) {
+    let [backend, path] = JSON.parse(id);
+    return this._url(backend, path);
+  },
+
+  v2DeleteOperation(store, id, deleteType = 'delete') {
+    let [backend, path, version] = JSON.parse(id);
+
+    // deleteType should be 'delete', 'destroy', 'undelete'
+    return this.ajax(this._url(backend, path, deleteType), 'POST', { data: { versions: [version] } }).then(
+      () => {
+        let model = store.peekRecord('secret-v2-version', id);
+        return model && model.reload();
+      }
+    );
+  },
+
+  handleResponse(status, headers, payload, requestData) {
+    // the body of the 404 will have some relevant information
+    if (status === 404 && get(payload, 'data.metadata')) {
+      return this._super(200, headers, payload, requestData);
+    }
+    return this._super(...arguments);
+  },
+});

ui/app/adapters/secret-v2.js

@@ -1,34 +1,55 @@
+/* eslint-disable */
 import { isEmpty } from '@ember/utils';
-import SecretAdapter from './secret';
+import ApplicationAdapter from './application';
 
-export default SecretAdapter.extend({
-  createOrUpdate(store, type, snapshot) {
-    const serializer = store.serializerFor(type.modelName);
-    const data = serializer.serialize(snapshot);
-    const { id } = snapshot;
-
-    return this.ajax(this.urlForSecret(snapshot.attr('backend'), id), 'POST', {
-      data: { data },
-    });
-  },
-
-  urlForSecret(backend, id, infix = 'data') {
-    let url = `${this.buildURL()}/${backend}/${infix}/`;
+export default ApplicationAdapter.extend({
+  namespace: 'v1',
+  _url(backend, id) {
+    let url = `${this.buildURL()}/${backend}/metadata/`;
     if (!isEmpty(id)) {
       url = url + id;
     }
     return url;
   },
 
-  fetchByQuery(query, methodCall) {
+  // we override query here because the query object has a bunch of client-side
+  // concerns and we only want to send "list" to the server
+  query(store, type, query) {
+    let { backend, id } = query;
+    return this.ajax(this._url(backend, id), 'GET', { data: { list: true } }).then(resp => {
+      resp.id = id;
+      resp.backend = backend;
+      return resp;
+    });
+  },
+
+  urlForQueryRecord(query) {
     let { id, backend } = query;
-    let args = [backend, id];
-    if (methodCall === 'query') {
-      args.push('metadata');
-    }
-    return this.ajax(this.urlForSecret(...args), 'GET', this.optionsForQuery(id, methodCall)).then(resp => {
+    return this._url(backend, id);
+  },
+
+  queryRecord(store, type, query) {
+    let { backend, id } = query;
+    return this.ajax(this._url(backend, id), 'GET').then(resp => {
       resp.id = id;
+      resp.backend = backend;
       return resp;
     });
   },
+
+  detailURL(snapshot) {
+    let backend = snapshot.belongsTo('engine', { id: true }) || snapshot.attr('engineId');
+    let { id } = snapshot;
+    return this._url(backend, id);
+  },
+
+  urlForUpdateRecord(store, type, snapshot) {
+    return this.detailURL(snapshot);
+  },
+  urlForCreateRecord(modelName, snapshot) {
+    return this.detailURL(snapshot);
+  },
+  urlForDeleteRecord(store, type, snapshot) {
+    return this.detailURL(snapshot);
+  },
 });

ui/app/adapters/secret.js

@@ -47,6 +47,7 @@ export default ApplicationAdapter.extend({
     const { id, backend } = query;
     return this.ajax(this.urlForSecret(backend, id), 'GET', this.optionsForQuery(id, action)).then(resp => {
       resp.id = id;
+      resp.backend = backend;
       return resp;
     });
   },

ui/app/components/block-empty.js

@@ -0,0 +1,2 @@
+import OuterHTML from './outer-html';
+export default OuterHTML.extend();

ui/app/components/block-error.js

@@ -0,0 +1,2 @@
+import OuterHTML from './outer-html';
+export default OuterHTML.extend();

ui/app/components/i-con.js

@@ -24,6 +24,7 @@ const GLYPHS_WITH_SVG_TAG = [
   'edition-oss',
   'check-plain',
   'check-circle-fill',
+  'cancel-square-outline',
 ];
 
 export default Component.extend({

ui/app/components/namespace-picker.js

@@ -39,7 +39,8 @@ export default Component.extend({
   fetchListCapability: task(function*() {
     try {
       if (this.listCapability) {
-        this.listCapability.unloadRecord();
+        yield this.listCapability.reload();
+        return;
       }
       let capability = yield this.store.findRecord('capabilities', 'sys/namespaces/');
       this.set('listCapability', capability);

ui/app/components/navigate-input.js

@@ -163,8 +163,7 @@ export default Component.extend(FocusOnInsertMixin, {
   },
 
   actions: {
-    handleInput: function(event) {
-      var filter = event.target.value;
+    handleInput: function(filter) {
       this.get('filterDidChange')(filter);
       debounce(this, 'filterUpdated', filter, 200);
     },
@@ -173,14 +172,15 @@ export default Component.extend(FocusOnInsertMixin, {
       this.get('filterFocusDidChange')(isFocused);
     },
 
-    handleKeyPress: function(val, event) {
+    handleKeyPress: function(event) {
       if (event.keyCode === keys.TAB) {
         this.onTab(event);
       }
     },
 
-    handleKeyUp: function(val, event) {
+    handleKeyUp: function(event) {
       var keyCode = event.keyCode;
+      let val = event.target.value;
       if (keyCode === keys.ENTER) {
         this.onEnter(val);
       }