Schema CRUD

basho-labs · Dec 18, 2015 · e977147 · e977147
1 parent 465d6f0
commit e977147
Show file tree

Hide file tree

Showing 22 changed files with 207 additions and 42 deletions.
diff --git a/app/components/code-highlighter.js b/app/components/code-highlighter.js
@@ -0,0 +1,14 @@
+import Ember from 'ember';
+/* global hljs */
+
+export default Ember.Component.extend({
+    tagName: 'pre',
+
+    classNames: ['code-highlighter'],
+
+    didRender() {
+        let codeBlock = this.$().find('code')[0];
+
+        hljs.highlightBlock(codeBlock);
+    }
+});
diff --git a/app/index.html b/app/index.html
@@ -8,6 +8,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     {{content-for 'head'}}
     <link rel="stylesheet" href="assets/ember-riak-explorer.css">
+    <link rel="stylesheet" href="assets/vendor.css">
     {{content-for 'head-footer'}}
   </head>
   <body>

diff --git a/app/pods/cluster/template.hbs b/app/pods/cluster/template.hbs
@@ -57,7 +57,12 @@
         {{/if}}
     {{/dashboard-module}}
 
-    {{#dashboard-module label='Search Indexes'}}
+    {{#dashboard-module label='Search Overview'}}
+        {{#link-to 'search-schema.create' model.id class='btn btn-small btn-primary'}}
+            <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
+            Create new search schema
+        {{/link-to}}
+
         {{#if model.searchIndexes}}
             {{search-indexes indexes=model.searchIndexes}}
         {{else}}

diff --git a/app/pods/search-index/template.hbs b/app/pods/search-index/template.hbs
@@ -22,7 +22,7 @@
         <tr>
             <td class="key">Schema</td>
             <td class="value">
-                {{#link-to 'search-schema' model.cluster.id model.schema.name}}
+                {{#link-to 'search-schema' model.cluster.id model.schema.name class='btn btn-small btn-primary'}}
                     {{model.schema.name}}
                 {{/link-to}}
             </td>

diff --git a/app/pods/search-schema/create/controller.js b/app/pods/search-schema/create/controller.js
@@ -0,0 +1,6 @@
+import Ember from 'ember';
+
+export default Ember.Controller.extend({
+    schemaName: '',
+    schemaContent: ''
+});
diff --git a/app/pods/search-schema/create/route.js b/app/pods/search-schema/create/route.js
@@ -0,0 +1,49 @@
+import Ember from 'ember';
+
+export default Ember.Route.extend({
+    model(params) {
+        return this.explorer.getCluster(params.clusterId, this.store);
+    },
+
+    actions: {
+        createSchema: function(clusterId, schemaName, schemaContent) {
+            let self = this;
+            let xmlDoc = null;
+            let url = `/riak/clusters/${clusterId}/search/schema/${schemaName}`;
+
+            try {
+                xmlDoc = Ember.$.parseXML(schemaContent);
+            } catch(error) {
+                // TODO: Put in proper error messaging
+                alert('Invalid XML. Please check and make sure schema is valid xml.');
+                return;
+            }
+
+            if (!Ember.$(xmlDoc).find('schema').attr('name')) {
+                // TODO: Put in proper error messaging
+                alert('Solr requires that the schema tag has a name attribute. Please update your xml.');
+                return;
+            }
+
+            if (!Ember.$(xmlDoc).find('schema').attr('version')) {
+                // TODO: Put in proper error messaging
+                alert('Solr requires that the schema tag has a version attribute. Please update your xml.');
+                return;
+            }
+
+            return Ember.$.ajax({
+                type: 'PUT',
+                url: url,
+                contentType: 'application/xml',
+                processData: false,
+                data: xmlDoc
+            }).then(function(data) {
+                self.transitionTo('search-schema', clusterId, schemaName);
+            }, function(error) {
+                // TODO: Put in proper error messaging
+                alert('Something went wrong, schema was not saved.');
+            });
+        }
+    }
+
+});
diff --git a/app/pods/search-schema/create/template.hbs b/app/pods/search-schema/create/template.hbs
@@ -0,0 +1,34 @@
+<div class='view-header'>
+    {{breadcrumb-component
+    clusterId=model.clusterId
+    pageTitle='create schema'
+    }}
+    {{view-label
+    pre-label='Create Schema'}}
+</div>
+
+{{#dashboard-module}}
+    <div class="schema-actions">
+        <span class="create schema-action" {{action 'createSchema' model.clusterId schemaName schemaContent}}>
+            <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span>
+            Create Schema
+        </span>
+
+        {{#link-to 'cluster' model.clusterId class='cancel schema-action' }}
+            <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
+            Cancel
+        {{/link-to}}
+    </div>
+
+    <form>
+        <div class="form-group">
+            <label>Schema Name</label>
+            {{input value=schemaName class='form-control'}}
+        </div>
+
+        <div class="form-group">
+            <label>Schema XML</label>
+            {{textarea value=schemaContent rows=10 class='form-control'}}
+        </div>
+    </form>
+{{/dashboard-module}}
diff --git a/app/pods/search-schema/edit/model.js b/app/pods/search-schema/edit/model.js
diff --git a/app/pods/search-schema/edit/template.hbs b/app/pods/search-schema/edit/template.hbs
@@ -21,8 +21,11 @@
         {{/link-to}}
     </div>
 
-    {{content-editable
-    value=model.content
-    type="html"
-    tagName="pre"}}
+    <pre class="editable">
+        <code>
+            {{content-editable
+            value=model.content
+            type="html"}}
+        </code>
+    </pre>
 {{/dashboard-module}}
diff --git a/app/pods/search-schema/route.js b/app/pods/search-schema/route.js
@@ -3,13 +3,20 @@ import $ from 'jquery';
 
 export default Ember.Route.extend({
     model(params) {
+        let self = this;
+
         return this.explorer.getCluster(params.clusterId, this.store)
             .then(function(cluster){
-                return cluster.get('searchSchemas').findBy('name', params.searchSchemaId);
+                let schema = cluster.get('searchSchemas').findBy('name', params.searchSchemaId);
+
+                if (!schema) {
+                    schema = self.explorer.createSchema(params.searchSchemaId, cluster, self.store);
+                }
+
+                return schema;
             });
     },
 
-    // TODO: Move to init???
     afterModel(model, transition) {
         return Ember.$.ajax({
             type: 'GET',

diff --git a/app/pods/search-schema/template.hbs b/app/pods/search-schema/template.hbs
@@ -14,8 +14,12 @@
             <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span>
             Edit Schema
         {{/link-to}}
+        <a href={{model.url}} target="_blank" class='raw schema-action'>
+            <span class="glyphicon glyphicon-eye-open" aria-hidden="true"></span>
+            View Raw
+        </a>
     </div>
-    <pre>
+    {{#code-highlighter language-type='XML'}}
         {{model.content}}
-    </pre>
+    {{/code-highlighter}}
 {{/dashboard-module}}
diff --git a/app/router.js b/app/router.js
@@ -30,6 +30,8 @@ export default Router.map(function() {
     this.route('service-not-found');
   });
   this.route('search-index', { path: '/cluster/:clusterId/index/:searchIndexId' });
-  this.route('search-schema', { path: '/cluster/:clusterId/schema/:searchSchemaId' });
-  this.route('search-schema.edit', { path: '/cluster/:clusterId/schema/:searchSchemaId/edit' });
+
+  this.route('search-schema',        { path: '/cluster/:clusterId/schema/:searchSchemaId' });
+  this.route('search-schema.edit',   { path: '/cluster/:clusterId/schema/:searchSchemaId/edit' });
+  this.route('search-schema.create', { path: '/cluster/:clusterId/schema/create' });
 });
diff --git a/app/styles/app.scss b/app/styles/app.scss
@@ -25,6 +25,8 @@
 @import "components/cluster-resource-link";
 @import "components/pagination-component";
 @import "components/schema-actions";
+@import "components/code-highlter";
+@import "components/content-editable";
 
 // View specific styling
 @import "views/object-counter-container";

diff --git a/app/styles/components/_code-highlter.scss b/app/styles/components/_code-highlter.scss
@@ -0,0 +1,10 @@
+.code-highlighter {
+  padding: 0;
+  margin: 0;
+  border: none;
+  background: none;
+
+  code {
+    border-radius: 4px;
+  }
+}
diff --git a/app/styles/components/_content-editable.scss b/app/styles/components/_content-editable.scss
@@ -0,0 +1,18 @@
+// Don't focus when inside of a code block
+code {
+  .ember-content-editable {
+    margin-top: -50px; // Not sure why this space is being added to the component
+    min-height: 100px;
+
+    &:focus {
+      outline: none;
+    }
+  }
+}
+
+pre.editable {
+  background: #FFF;
+  border-color: #000;
+  border-radius: 0px;
+}
+
diff --git a/app/styles/components/_schema-actions.scss b/app/styles/components/_schema-actions.scss
@@ -19,4 +19,12 @@
   .update {
     @extend .btn-primary;
   }
+
+  .create {
+    @extend .btn-primary;
+  }
+
+  .raw {
+    @extend .btn-primary;
+  }
 }
diff --git a/app/templates/components/code-highlighter.hbs b/app/templates/components/code-highlighter.hbs
@@ -0,0 +1,4 @@
+<code class={{language-type}}>
+    {{yield}}
+</code>
+
diff --git a/app/templates/components/search-indexes.hbs b/app/templates/components/search-indexes.hbs
@@ -11,7 +11,7 @@
     <tr>
         <td>{{link.link-index searchIndex=index}}</td>
         <td>
-            {{#link-to 'search-schema' index.cluster.id index.schema.name}}
+            {{#link-to 'search-schema' index.cluster.id index.schema.name class='btn btn-small btn-primary'}}
                 {{index.schema.name}}
             {{/link-to}}
         </td>

diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -19,7 +19,7 @@ module.exports = function(defaults) {
   // please specify an object with the list of modules as keys
   // along with the exports of each module as its value.
   app.import('bower_components/highlightjs/highlight.pack.js');
-  app.import('bower_components/highlightjs/styles/darkula.css');
+  app.import('bower_components/highlightjs/styles/default.css');
 
   return app.toTree();
 };
diff --git a/tests/integration/components/code-highlighter-test.js b/tests/integration/components/code-highlighter-test.js
@@ -0,0 +1,26 @@
+import { moduleForComponent, test } from 'ember-qunit';
+import hbs from 'htmlbars-inline-precompile';
+
+moduleForComponent('code-highlighter', 'Integration | Component | code highlighter', {
+  integration: true
+});
+
+test('it renders', function(assert) {
+  assert.expect(2);
+
+  // Set any properties with this.set('myProperty', 'value');
+  // Handle any actions with this.on('myAction', function(val) { ... });
+
+  this.render(hbs`{{code-highlighter}}`);
+
+  assert.equal(this.$().text().trim(), '');
+
+  // Template block usage:
+  this.render(hbs`
+    {{#code-highlighter}}
+      template block text
+    {{/code-highlighter}}
+  `);
+
+  assert.equal(this.$().text().trim(), 'template block text');
+});
diff --git a/tests/unit/pods/search-schema/edit/model-test.js b/tests/unit/pods/search-schema/edit/model-test.js
diff --git a/tests/unit/pods/search-schema/edit/route-test.js b/tests/unit/pods/search-schema/edit/route-test.js