Browse Source

[editor] Use the new API to list saved queries

Romain Rigaux 9 years ago
parent
commit
130d63a

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

@@ -27,7 +27,7 @@
   var HDFS_API_PREFIX = "/filebrowser/view=";
   var HDFS_PARAMETERS = "?pagesize=100&format=json";
   var DOCUMENTS_API = "/desktop/api2/doc/";
-
+  var DOCUMENTS_SEARCH_API = "/desktop/api2/docs/";
 
   /**
    * @param {Object} i18n
@@ -278,7 +278,7 @@
   AssistHelper.prototype.searchDocuments = function (options) {
     var self = this;
     $.ajax({
-      url: DOCUMENTS_API,
+      url: DOCUMENTS_SEARCH_API,
       data: {
         uuid: options.uuid,
         text: options.query,

+ 2 - 3
desktop/libs/notebook/src/notebook/static/notebook/js/notebook.ko.js

@@ -204,7 +204,6 @@
     self.loadingQueries = ko.observable(false);
 
     self.queriesHasErrors = ko.observable(false);
-    self.loadingQueries = ko.observable(false);
     self.queriesCurrentPage = ko.observable(1);
     self.queriesTotalPages = ko.observable(1);
     self.queries = ko.observableArray();
@@ -219,7 +218,7 @@
       self.getAssistHelper().searchDocuments({
         successCallback: function (result) {
           self.queriesTotalPages(Math.ceil(result.count / 25));
-          self.queries(result.children);
+          self.queries(result.documents);
           self.loadingQueries(false);
           self.queriesHasErrors(false);
         },
@@ -235,7 +234,7 @@
 
     var lastQueriesPage = 1;
     self.currentQueryTab.subscribe(function (newValue) {
-      if (newValue === 'myQueries' && (self.queries().length === 0 || lastQueriesPage !== self.queriesCurrentPage())) {
+      if (newValue === 'savedQueries' && (self.queries().length === 0 || lastQueriesPage !== self.queriesCurrentPage())) {
         fetchQueries();
       }
     });