瀏覽代碼

[doc2] Update the homepage to use the new API to list documents

Romain Rigaux 9 年之前
父節點
當前提交
3438830746

+ 30 - 30
desktop/core/src/desktop/static/desktop/js/assist/assistHelper.js

@@ -181,12 +181,12 @@
           }
         }
       })
-        .fail(self.assistErrorCallback(options))
-        .always(function () {
-          if (options.editor) {
-            options.editor.hideSpinner();
-          }
-        });
+      .fail(self.assistErrorCallback(options))
+      .always(function () {
+        if (options.editor) {
+          options.editor.hideSpinner();
+        }
+      });
     };
 
     fetchCached.bind(self)($.extend({}, options, {
@@ -209,7 +209,7 @@
     $.ajax({
       url: DOCUMENTS_API,
       data: {
-        path: options.path
+        uuid: options.uuid
       },
       success: function (data) {
         if (! self.successResponseIsError(data)) {
@@ -219,7 +219,7 @@
         }
       }
     })
-      .fail(self.assistErrorCallback(options));
+    .fail(self.assistErrorCallback(options));
   };
 
   /**
@@ -234,20 +234,20 @@
   AssistHelper.prototype.searchDocuments = function (options) {
     var self = this;
     $.ajax({
-          url: DOCUMENTS_API,
-          data: {
-            path: options.path,
-            text: options.query
-          },
-          success: function (data) {
-            if (! self.successResponseIsError(data)) {
-              options.successCallback(data);
-            } else {
-              self.assistErrorCallback(options)(data);
-            }
-          }
-        })
-        .fail(self.assistErrorCallback(options));
+      url: DOCUMENTS_API,
+      data: {
+        uuid: options.uuid,
+        text: options.query
+      },
+      success: function (data) {
+        if (! self.successResponseIsError(data)) {
+          options.successCallback(data);
+        } else {
+          self.assistErrorCallback(options)(data);
+        }
+      }
+    })
+    .fail(self.assistErrorCallback(options));
   };
 
   /**
@@ -263,7 +263,7 @@
     $.ajax({
       url: DOCUMENT_API,
       data: {
-        id: options.docId
+        uuid: options.docId
       },
       success: function (data) {
         if (! self.successResponseIsError(data)) {
@@ -288,7 +288,7 @@
   AssistHelper.prototype.createDocumentsFolder = function (options) {
     var self = this;
     $.post("/desktop/api2/doc/mkdir", {
-      parent_path: ko.mapping.toJSON(options.path),
+      parent_uuid: ko.mapping.toJSON(options.uuid),
       name: ko.mapping.toJSON(options.name)
     }, function (data) {
       if (! self.successResponseIsError(data)) {
@@ -297,7 +297,7 @@
         self.assistErrorCallback(options)(data);
       }
     })
-      .fail(self.assistErrorCallback(options));
+    .fail(self.assistErrorCallback(options));
   };
 
   /**
@@ -334,7 +334,7 @@
       contentType: false,
       processData: false
     })
-      .fail(self.assistErrorCallback(options));
+    .fail(self.assistErrorCallback(options));
   };
 
   /**
@@ -349,8 +349,8 @@
   AssistHelper.prototype.moveDocument = function (options) {
     var self = this;
     $.post("/desktop/api2/doc/move", {
-      source_doc_id: ko.mapping.toJSON(options.sourceId),
-      destination_doc_id: ko.mapping.toJSON(options.destinationId)
+      source_doc_uuid: ko.mapping.toJSON(options.sourceId),
+      destination_doc_uuid: ko.mapping.toJSON(options.destinationId)
     }, function (data) {
       if (! self.successResponseIsError(data)) {
         options.successCallback(data);
@@ -358,7 +358,7 @@
         self.assistErrorCallback(options)(data);
       }
     })
-      .fail(self.assistErrorCallback(options));
+    .fail(self.assistErrorCallback(options));
   };
 
   /**
@@ -382,7 +382,7 @@
         self.assistErrorCallback(options)(data);
       }
     })
-      .fail(self.assistErrorCallback(options));
+    .fail(self.assistErrorCallback(options));
   };
 
   /**

+ 11 - 10
desktop/core/src/desktop/static/desktop/js/fileBrowser/hueFileEntry.js

@@ -38,6 +38,7 @@
    */
   function HueFileEntry (options) {
     var self = this;
+    self.uuid = options.uuid;
     self.activeEntry = options.activeEntry;
     self.parent = options.parent;
     self.definition = ko.observable(options.definition);
@@ -135,7 +136,7 @@
     if (self.app === "documents") {
       var moveNext = function () {
         if (entries.length > 0) {
-          var nextId = entries.shift().definition().id;
+          var nextId = entries.shift().definition().uuid;
           self.assistHelper.moveDocument({
             successCallback: function () {
               moveNext();
@@ -144,7 +145,7 @@
               self.activeEntry().load();
             },
             sourceId: nextId,
-            destinationId: self.definition().id
+            destinationId: self.definition().uuid
           });
         } else {
           if (self !== self.activeEntry()) {
@@ -185,11 +186,11 @@
     resultEntry.loading(true);
 
     self.assistHelper.searchDocuments({
-      path: owner.path,
+      uuid: owner.uuid,
       query: query,
       successCallback: function (data) {
         resultEntry.hasErrors(false);
-        resultEntry.entries($.map(data.documents, function (definition) {
+        resultEntry.entries($.map(data.children, function (definition) {
           return new HueFileEntry({
             activeEntry: self.activeEntry,
             assistHelper: self.assistHelper,
@@ -243,12 +244,12 @@
 
     if (self.app === 'documents') {
       self.assistHelper.fetchDocuments({
-        path: self.path,
+        uuid: self.uuid,
         successCallback: function(data) {
           self.definition(data.directory);
           self.hasErrors(false);
 
-          var newEntries = $.map(data.documents, function (definition) {
+          var newEntries = $.map(data.children, function (definition) {
             return new HueFileEntry({
               activeEntry: self.activeEntry,
               assistHelper: self.assistHelper,
@@ -259,10 +260,10 @@
           });
 
           newEntries.sort(function (a, b) {
-            if (a.isDirectory && !b.isDirectory) {
+            if (a.isDirectory && ! b.isDirectory) {
               return -1;
             }
-            if (b.isDirectory && !a.isDirectory) {
+            if (b.isDirectory && ! a.isDirectory) {
               return 1;
             }
             return a.name.localeCompare(b.name);
@@ -294,7 +295,7 @@
 
   HueFileEntry.prototype.showDeleteConfirmation = function () {
     var self = this;
-    if (self.selectedEntries().length > 0 ) {
+    if (self.selectedEntries().length > 0) {
       self.entriesToDelete(self.selectedEntries());
       $('#deleteEntriesModal').modal('show');
     }
@@ -412,7 +413,7 @@
     if (self.app === 'documents') {
       self.assistHelper.createDocumentsFolder({
         successCallback: self.load.bind(self),
-        path: self.path,
+        parent_uuid: self.uuid,
         name: name
       });
     }

+ 0 - 1
desktop/core/src/desktop/templates/home2.mako

@@ -32,7 +32,6 @@ ${ assist.assistPanel() }
 ${ fileBrowser.fileBrowser() }
 
 <style type="text/css">
-
   html {
     height: 100%;
   }