فهرست منبع

HUE-1389 [oozie] Pull list of hive queries

Romain Rigaux 9 سال پیش
والد
کامیت
7aeac6d
2فایلهای تغییر یافته به همراه10 افزوده شده و 10 حذف شده
  1. 1 6
      apps/oozie/src/oozie/models2.py
  2. 9 4
      apps/oozie/src/oozie/static/oozie/js/workflow-editor.ko.js

+ 1 - 6
apps/oozie/src/oozie/models2.py

@@ -1840,7 +1840,7 @@ class HiveDocumentAction(Action):
   FIELDS = {
      'uuid': {
           'name': 'uuid',
-          'label': _('UUID of a Hive query'),
+          'label': _('Hive query'),
           'value': '',
           'help_text': _('Select a saved Hive query you want to schedule.'),
           'type': 'hive'
@@ -1924,11 +1924,6 @@ class HiveDocumentAction(Action):
     return [cls.FIELDS['uuid']]
 
 
-
-def _generate_hive_script():
-  self._create_file(deployment_dir, self.job.XML_FILE_NAME, oozie_xml)
-
-
 class DecisionNode(Action):
   TYPE = 'decision'
   FIELDS = {}

+ 9 - 4
apps/oozie/src/oozie/static/oozie/js/workflow-editor.ko.js

@@ -491,6 +491,12 @@ var WorkflowEditorViewModel = function (layout_json, workflow_json, credentials_
     self.workflow_properties = ko.mapping.fromJS(workflow_properties_json);
     loadLayout(self, layout_json);
     self.workflow.loadNodes(workflow_json);
+
+    $.get('/desktop/api2/docs/?type=query-hive&page=1&limit=25', function(data) {
+      $.each(data.documents, function(index, query) {
+        self.hiveQueries.push(ko.mapping.fromJS(query));
+      });
+    });
   };
 
   self.addActionProperties = ko.observableArray([]);
@@ -516,10 +522,10 @@ var WorkflowEditorViewModel = function (layout_json, workflow_json, credentials_
 
 
   self.subworkflows = ko.observableArray(getOtherSubworkflows(self, subworkflows_json));
-  self.hiveQueries = ko.observableArray([{"uuid": "c73171ec-acff-4c30-b350-3df0c31689a9", "name": "show tables"}]);
+  self.hiveQueries = ko.observableArray();
   self.history = ko.mapping.fromJS(history_json);
-  //AssistHelper.getInstance(vm);
-  
+
+
   self.getSubWorkflow = function (uuid) {
     var wf = $.grep(self.subworkflows(), function (wf, i) {
       return wf.value == uuid;
@@ -1230,7 +1236,6 @@ var WorkflowEditorViewModel = function (layout_json, workflow_json, credentials_
   self.draggableSparkAction = ko.observable(bareWidgetBuilder("Spark", "spark-widget"));
   self.draggableGenericAction = ko.observable(bareWidgetBuilder("Generic", "generic-widget"));
   self.draggableHiveDocumentAction = ko.observable(bareWidgetBuilder("Hive", "hive-document-widget"));
-
   self.draggableKillNode = ko.observable(bareWidgetBuilder("Kill", "kill-widget"));
 };