Эх сурвалжийг харах

HUE-3294 [desktop] Move search document and data calls to desktop

Romain Rigaux 9 жил өмнө
parent
commit
157e47a

+ 13 - 3
desktop/core/src/desktop/api2.py

@@ -32,15 +32,17 @@ from django.utils.translation import ugettext as _
 from django.views.decorators.csrf import ensure_csrf_cookie
 from django.views.decorators.http import require_POST
 
+from metadata.navigator_api import search_entities as metadata_search_entities
+from metadata.navigator_api import search_entities_interactive as metadata_search_entities_interactive
+from notebook.connectors.base import Notebook
+from notebook.views import upgrade_session_properties
+
 from desktop.lib.django_util import JsonResponse
 from desktop.lib.exceptions_renderable import PopupException
 from desktop.lib.export_csvxls import make_response
 from desktop.lib.i18n import smart_str, force_unicode
 from desktop.models import Document2, Document, Directory, FilesystemException, uuid_default
 
-from notebook.connectors.base import Notebook
-from notebook.views import upgrade_session_properties
-
 
 LOG = logging.getLogger(__name__)
 
@@ -500,6 +502,14 @@ def _update_imported_oozie_document(doc, uuids_map):
 
   return doc
 
+def search_entities(request):
+  return metadata_search_entities(request)
+
+
+def search_entities_interactive(request):
+  return metadata_search_entities_interactive(request)
+
+
 def _is_import_valid(documents):
   """
   Validates the JSON file to be imported for schema correctness

+ 1 - 1
desktop/core/src/desktop/static/desktop/js/apiHelper.js

@@ -1388,7 +1388,7 @@ var ApiHelper = (function () {
 
   ApiHelper.prototype.navSearchAutocomplete = function (options) {
     var self = this;
-    $.post('/metadata/api/navigator/search_entities_interactive', {
+    $.post('/desktop/api/search/entities_interactive', {
       query_s: ko.mapping.toJSON(options.query),
       limit: 10,
       sources: '["' + options.source + '"]'

+ 1 - 1
desktop/core/src/desktop/templates/assist.mako

@@ -1882,7 +1882,7 @@ from metadata.conf import has_navigator
             window.clearTimeout(navContextPopoverTimeout);
           };
 
-          $.post('/metadata/api/navigator/search_entities', {
+          $.post('/desktop/api/search/entities', {
             query_s: ko.mapping.toJSON(self.searchInput()),
             limit: 25,
             sources: ko.mapping.toJSON([self.visiblePanel().type])

+ 3 - 0
desktop/core/src/desktop/urls.py

@@ -134,6 +134,9 @@ dynamic_patterns += patterns('desktop.api2',
 
   (r'^desktop/api2/doc/export/?$', 'export_documents'),
   (r'^desktop/api2/doc/import/?$', 'import_documents'),
+
+  (r'^desktop/api/search/entities/?$', 'search_entities'),
+  (r'^desktop/api/search/entities_interactive/?$', 'search_entities_interactive'),
 )
 
 # Default Configurations