Merge pull request #17 from cloudant-labs/fauxton-pouch-mr

Advanced _view options and editor

Author: chewbranca

src/fauxton/app/modules/documents/resources.js

@@ -193,8 +193,21 @@ function(app, FauxtonAPI, Views) {
       return url.join("/") + query;
     },
 
+    totalRows: function() {
+      return this.viewMeta.total_rows || "unknown";
+    },
+
+    updateSeq: function() {
+      return this.viewMeta.update_seq || false;
+    },
+
     parse: function(resp) {
       that = this;
+      this.viewMeta = {
+        total_rows: resp.total_rows,
+        offest: resp.offest,
+        update_seq: resp.update_seq
+      };
       return _.map(resp.rows, function(row) {
         return {
           value: row.value,

src/fauxton/app/modules/documents/routes.js

@@ -378,6 +378,7 @@ function(app, FauxtonAPI, Documents, Databases) {
 
       var ddocInfo = {
         id: "_design/" + ddoc,
+        currView: view,
         designDocs: data.designDocs
       };
 
@@ -396,7 +397,8 @@ function(app, FauxtonAPI, Documents, Databases) {
           }),
 
           "#sidebar-content": new Documents.Views.Sidebar({
-            collection: data.designDocs
+            collection: data.designDocs,
+            ddocInfo: ddocInfo
           }),
 
           "#tabs": new Documents.Views.Tabs({

src/fauxton/app/modules/documents/views.js

@@ -240,18 +240,28 @@ function(app, FauxtonAPI, Codemirror, JSHint) {
   Views.IndexItem = FauxtonAPI.View.extend({
     template: "templates/documents/index_menu_item",
     tagName: "li",
+
     initialize: function(options){
       this.index = options.index;
       this.ddoc = options.ddoc;
       this.database = options.database;
+      this.selected = !! options.selected;
     },
 
     serialize: function() {
       return {
         index: this.index,
         ddoc: this.ddoc,
-        database: this.database
+        database: this.database,
+        selected: this.selected
       };
+    },
+
+    afterRender: function() {
+      if (this.selected) {
+        $("#sidenav ul.nav-list li").removeClass("active");
+        this.$el.addClass("active");
+      }
     }
   });
 
@@ -320,7 +330,8 @@ function(app, FauxtonAPI, Codemirror, JSHint) {
         database: this.collection,
         viewList: this.viewList,
         hasReduce: false,
-        params: this.params
+        params: this.params,
+        ddocs: this.designDocs
       };
       if (this.ddoc) {
         data.ddoc = this.ddoc;
@@ -363,14 +374,14 @@ function(app, FauxtonAPI, Codemirror, JSHint) {
           return FauxtonAPI.addNotification({
             msg: "JSON Parse Error on field: "+param.name,
             type: "error",
-            selector: ".view.show .errors-container"
+            selector: ".view.show .all-docs-list.errors-container"
           });
         });
 
         FauxtonAPI.addNotification({
           msg: "Make sure that strings are properly quoted and any other values are valid JSON structures",
           type: "warning",
-          selector: ".view.show .errors-container"
+          selector: ".view.show .all-docs-list.errors-container"
         });
 
         return false;
@@ -401,7 +412,7 @@ function(app, FauxtonAPI, Codemirror, JSHint) {
               var notification = FauxtonAPI.addNotification({
                 msg: "include_docs has been disabled as you cannot include docs on a reduced view",
                 type: "warn",
-                selector: ".view.show .errors-container"
+                selector: ".view.show .all-docs-list.errors-container"
               });
             }
             $form.find("input[name=include_docs]").prop("disabled", true);
@@ -451,6 +462,14 @@ function(app, FauxtonAPI, Codemirror, JSHint) {
     },
 
     beforeRender: function() {
+      this.setDdocInfo();
+      if (this.viewList) {
+        this.viewEditorView = this.insertView("#edit-index-container", new Views.ViewEditor({
+          model: this.ddoc,
+          ddocs: this.designDocs,
+          viewCollection: this.collection
+        }));
+      }
       this.collection.each(function(doc) {
         this.rows[doc.id] = this.insertView("table.all-docs tbody", new this.nestedView({
           model: doc
@@ -470,6 +489,9 @@ function(app, FauxtonAPI, Codemirror, JSHint) {
               $form.find("select[name='"+key+"']").val(val);
               break;
             case "include_docs":
+            case "stale":
+            case "descending":
+            case "inclusive_end":
               $form.find("input[name='"+key+"']").prop('checked', true);
               break;
             case "reduce":
@@ -619,9 +641,11 @@ function(app, FauxtonAPI, Codemirror, JSHint) {
 
   Views.ViewEditor = FauxtonAPI.View.extend({
     template: "templates/documents/view_editor",
+    builtinReduces: ['_sum', '_count', '_stats'],
 
     events: {
       "click button.save": "saveView",
+      "click button.preview": "previewView",
       "change select#reduce-function-selector": "updateReduce"
     },
 
@@ -636,6 +660,9 @@ function(app, FauxtonAPI, Codemirror, JSHint) {
 
     initialize: function(options) {
       this.ddocs = options.ddocs;
+      this.viewCollection = options.viewCollection;
+      this.reduceFunStr = this.model.viewHasReduce(this.viewCollection.view);
+      this.newView = false;
     },
 
     updateValues: function() {
@@ -661,18 +688,40 @@ function(app, FauxtonAPI, Codemirror, JSHint) {
     },
 
     establish: function() {
-      return [this.ddocs.fetch(), this.model.fetch()];
+      //return [this.ddocs.fetch(), this.model.fetch()];
+      return [];
+    },
+
+    previewView: function(event) {
+      FauxtonAPI.addNotification({
+        msg: "<strong>Warning!</strong> Preview executes the Map/Reduce functions in your browser, and may behave differently from CouchDB.",
+        type: "warning",
+        selector: "#define-view .errors-container",
+        fade: false
+      });
+      FauxtonAPI.addNotification({
+        msg: "Preview Functionality Coming Soon",
+        type: "warning",
+        selector: "#define-view .errors-container"
+      });
     },
 
     saveView: function(event) {
       var json, notification;
       if (this.hasValidCode()) {
         var mapVal = this.mapEditor.getValue();
         var reduceVal = this.reduceEditor.getValue();
+        /*
         notification = FauxtonAPI.addNotification({
           msg: "Saving document.",
           selector: "#define-view .errors-container"
         });
+        */
+        FauxtonAPI.addNotification({
+          msg: "Save Functionality Coming Soon",
+          type: "warning",
+          selector: "#define-view .errors-container"
+        });
         /*
         this.model.save().error(function(xhr) {
           var responseText = JSON.parse(xhr.responseText).reason;
@@ -745,18 +794,28 @@ function(app, FauxtonAPI, Codemirror, JSHint) {
 
     serialize: function() {
       return {
-        database: this.model,
-        ddocs: this.ddocs
+        //database: this.model,
+        ddocs: this.ddocs,
+        ddoc: this.model,
+        viewCollection: this.viewCollection,
+        reduceFunStr: this.reduceFunStr,
+        isCustomReduce: this.hasCustomReduce(),
+        newView: this.newView
       };
     },
 
+    hasCustomReduce: function() {
+      return this.reduceFunStr && ! _.contains(this.builtinReduces, this.reduceFunStr);
+    },
+
     afterRender: function() {
-      this.model.on("sync", this.updateValues, this);
       var that = this;
       var mapFun = $("#map-function");
-      mapFun.val(this.langTemplates[this.defaultLang].map);
       var reduceFun = $("#reduce-function");
-      reduceFun.val(this.langTemplates[this.defaultLang].reduce);
+      if (this.newView) {
+        mapFun.val(this.langTemplates[this.defaultLang].map);
+        reduceFun.val(this.langTemplates[this.defaultLang].reduce);
+      }
       this.mapEditor = Codemirror.fromTextArea(mapFun.get()[0], {
         mode: "javascript",
         lineNumbers: true,
@@ -766,7 +825,7 @@ function(app, FauxtonAPI, Codemirror, JSHint) {
           that.runJSHint("mapEditor");
         },
         extraKeys: {
-          "Ctrl-S": function(instance) { that.saveDoc(); },
+          "Ctrl-S": function(instance) { that.saveView(); },
           "Ctrl-/": "undo"
         }
       });
@@ -779,14 +838,16 @@ function(app, FauxtonAPI, Codemirror, JSHint) {
           that.runJSHint("reduceEditor");
         },
         extraKeys: {
-          "Ctrl-S": function(instance) { that.saveDoc(); },
+          "Ctrl-S": function(instance) { that.saveView(); },
           "Ctrl-/": "undo"
         }
       });
       // HACK: this should be in the html
       // but CodeMirror's head explodes and it won't set the hight properly.
       // So render it first, set the editor, then hide.
-      $(".control-group.reduce-function").hide();
+      if ( ! this.hasCustomReduce()) {
+        $(".control-group.reduce-function").hide();
+      }
     }
   });
 
@@ -799,6 +860,13 @@ function(app, FauxtonAPI, Codemirror, JSHint) {
       "click .nav-list a.toggle-view#design-docs": "toggleView"
     },
 
+    initialize: function(options) {
+      if (options.ddocInfo) {
+        this.ddocID = options.ddocInfo.id;
+        this.currView = options.ddocInfo.currView;
+      }
+    },
+
     establish: function() {
       if (this.collection) {
         return [this.collection.fetch()];
@@ -836,10 +904,12 @@ function(app, FauxtonAPI, Codemirror, JSHint) {
     buildIndexList: function(collection, selector, design){
 
       _.each(_.keys(collection), function(key){
+        var selected = this.ddocID == "_design/"+design;
         this.insertView("ul.nav." + selector, new Views.IndexItem({
           ddoc: design,
           index: key,
-          database: this.collection.database.id
+          database: this.collection.database.id,
+          selected: selected && key == this.currView
         }));
       }, this);
     },

src/fauxton/app/modules/pouchdb/base.js

@@ -0,0 +1,57 @@
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not
+// use this file except in compliance with the License. You may obtain a copy of
+// the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations under
+// the License.
+
+
+/*
+ * NOTE:
+ * This temporarily uses the PouchDB map reduce implementation
+ * These files are modified locally until we make a more general version and
+ * push it back upstream.
+ */
+
+define([
+  "app",
+
+  "api",
+
+  // Modules
+  "modules/pouchdb/pouchdb.mapreduce.js"
+],
+
+function(app, FauxtonAPI, MapReduce) {
+  var Pouch = {};
+  Pouch.MapReduce = MapReduce;
+
+  Pouch.runViewQuery = function(fun, docs) {
+    docs = [
+      {_id: 'test_doc_1', foo: 'bar-1'},
+      {_id: 'test_doc_2', foo: 'bar-2'},
+      {_id: 'test_doc_3', foo: 'bar-3'},
+      {_id: 'test_doc_4', foo: 'bar-4'},
+      {_id: 'test_doc_5', foo: 'bar-5'},
+      {_id: 'test_doc_6', foo: 'bar-6'},
+      {_id: 'test_doc_7', foo: 'bar-7'},
+      {_id: 'test_doc_8', foo: 'bar-8'},
+      {_id: 'test_doc_9', foo: 'bar-9'},
+      {_id: 'test_doc_10', foo: 'bar-10'}
+    ];
+
+    var deferred = FauxtonAPI.Deferred();
+    var complete = function(resp) {
+      console.log("COMPLETE TRIGGERED", arguments);
+    };
+
+    return Pouch.MapReduce.query(fun, {docs: docs, complete:complete});
+  };
+
+  return Pouch;
+});