Ver código fonte

HUE-3797 [scheduler] Get schedule document via generic interface

Romain 6 anos atrás
pai
commit
7aa0df52cc

+ 2 - 2
desktop/core/src/desktop/js/apps/notebook/notebook.js

@@ -767,7 +767,7 @@ class Notebook {
 
         const getCoordinator = function() {
           $.get(
-            '/oozie/editor/coordinator/' + _action + '/',
+            '/scheduler/api/schedule/' + _action + '/',
             {
               format: 'json',
               document: self.uuid(),
@@ -848,7 +848,7 @@ class Notebook {
 
     self.showSubmitPopup = function() {
       $.get(
-        '/oozie/editor/coordinator/submit/' + self.coordinatorUuid(),
+        '/scheduler/api/schedule/submit/' + self.coordinatorUuid(),
         {
           format: 'json'
         },

+ 2 - 2
desktop/core/src/desktop/js/apps/notebook2/notebook.js

@@ -547,7 +547,7 @@ class Notebook {
 
       const getCoordinator = function() {
         $.get(
-          '/oozie/editor/coordinator/' + action + '/',
+          '/scheduler/api/schedule/' + action + '/',
           {
             format: 'json',
             document: self.uuid(),
@@ -825,7 +825,7 @@ class Notebook {
   showSubmitPopup() {
     const self = this;
     $.get(
-      '/oozie/editor/coordinator/submit/' + self.coordinatorUuid(),
+      '/scheduler/api/submit/' + self.coordinatorUuid(),
       {
         format: 'json'
       },

+ 12 - 4
desktop/core/src/desktop/lib/scheduler/api.py

@@ -18,17 +18,25 @@
 import logging
 
 from desktop.auth.backend import is_admin
+from desktop.conf import TASK_SERVER
 from desktop.lib.django_util import JsonResponse
 
+from oozie.views.editor2 import edit_coordinator, new_coordinator, submit_coordinator
+
 
 LOG = logging.getLogger(__name__)
 
 
+def new_schedule(request):
+  return new_coordinator(request)
+
+
 def get_schedule(request):
-  return JsonResponse({
-  })
+  return edit_coordinator(request)
 
 
 def submit_schedule(request):
-  return JsonResponse({
-  })
+  if TASK_SERVER.ENABLED.get():
+    pass
+  else:
+    return submit_coordinator(request)

+ 3 - 5
desktop/core/src/desktop/lib/scheduler/urls.py

@@ -21,9 +21,7 @@ from desktop.lib.scheduler import api
 
 
 urlpatterns = [
-  url(r'^api/schedule/submit?$', api.submit_schedule(), name='analytics.api.admin_stats'),
-  url(r'^api/schedule/?$', api.get_schedule, name='analytics.api.admin_stats'),
+  url(r'^api/schedule/new/?$', api.get_schedule, name='scheduler.api.new_schedule'),
+  url(r'^api/schedule/edit/?$', api.get_schedule, name='scheduler.api.edit_schedule'),
+  url(r'^api/schedule/submit/(?P<doc_id>[-\w]+)?$', api.submit_schedule, name='scheduler.api.submit_schedule'),
 ]
-
-# /oozie/editor/coordinator
-# /oozie/editor/coordinator/submit/

+ 5 - 1
desktop/core/src/desktop/urls.py

@@ -45,8 +45,8 @@ from desktop import api as desktop_api
 from desktop import api2 as desktop_api2
 from notebook import views as notebook_views
 from desktop.configuration import api as desktop_configuration_api
-from useradmin import views as useradmin_views
 from desktop.lib.vcs import api as desktop_lib_vcs_api
+from useradmin import views as useradmin_views
 
 # Django expects handler404 and handler500 to be defined.
 # django.conf.urls provides them. But we want to override them.
@@ -203,6 +203,10 @@ if ANALYTICS.IS_ENABLED.get():
     url(r'^desktop/analytics/?', include('desktop.lib.analytics.urls'))
   ]
 
+dynamic_patterns += [
+  url(r'^desktop/scheduler/', include('desktop.lib.scheduler.urls'))
+]
+
 dynamic_patterns += [
   url(r'^admin/?', include(admin.site.urls)),
 ]