Browse Source

HUE-6496 [oozie] The bundle submit page should render normally in Hue 4

Enrico Berti 8 năm trước cách đây
mục cha
commit
8225f56

+ 1 - 1
apps/oozie/src/oozie/static/oozie/js/bundle-editor.ko.js

@@ -108,7 +108,7 @@ var BundleEditorViewModel = function (bundle_json, coordinators_json, can_edit_j
           self.bundle.id(data.id);
           self.bundle.tracker().markCurrentStateAsClean();
           $(document).trigger("info", data.message);
-          if (window.location.search.indexOf("bundle") == -1) {
+          if (window.location.search.indexOf("bundle") == -1 && !IS_HUE_4) {
             window.location.hash = '#bundle=' + data.id;
           }
         }

+ 1 - 1
apps/oozie/src/oozie/static/oozie/js/coordinator-editor.ko.js

@@ -243,7 +243,7 @@ var CoordinatorEditorViewModel = (function () {
             else {
               $(document).trigger("info", data.message);
             }
-            if (window.location.search.indexOf("coordinator") == -1) {
+            if (window.location.search.indexOf("coordinator") == -1 && !IS_HUE_4) {
               window.location.hash = '#coordinator=' + data.id;
             }
           }

+ 0 - 26
apps/oozie/src/oozie/static/oozie/js/editor2-utils.js

@@ -1,26 +0,0 @@
-// Licensed to Cloudera, Inc. under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  Cloudera, Inc. licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-$(document).ready(function () {
-  $(document).on("showSubmitPopup", function (event, data) {
-    $('.submit-modal').html(data);
-    $('.submit-modal').modal('show');
-    var _sel = $('.submit-form .control-group[rel!="popover"]:visible');
-    if (_sel.length > 0) {
-      $('.submit-modal .modal-body').height($('.submit-modal .modal-body').height() + 60);
-    }
-  });
-});

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

@@ -1191,7 +1191,7 @@ var WorkflowEditorViewModel = function (layout_json, workflow_json, credentials_
           }
           self.workflow.id(data.id);
           $(document).trigger("info", data.message);
-          if (window.location.search.indexOf("workflow") == -1) {
+          if (window.location.search.indexOf("workflow") == -1 && !IS_HUE_4) {
             window.location.hash = '#workflow=' + data.id;
           }
           self.workflow.tracker().markCurrentStateAsClean();

+ 3 - 1
apps/oozie/src/oozie/templates/editor2/bundle_editor.mako

@@ -20,6 +20,7 @@ from django.utils.translation import ugettext as _
 
 <%namespace name="dashboard" file="/common_dashboard.mako" />
 <%namespace name="layout" file="../navigation-bar.mako" />
+<%namespace name="utils" file="../utils.inc.mako" />
 
 % if not is_embeddable:
 ${ commonheader(_("Bundle Editor"), "Oozie", user, request) | n,unicode }
@@ -272,7 +273,8 @@ ${ commonshare() | n,unicode }
 ${ dashboard.import_bindings() }
 
 <script src="${ static('oozie/js/bundle-editor.ko.js') }" type="text/javascript" charset="utf-8"></script>
-<script src="${ static('oozie/js/editor2-utils.js') }" type="text/javascript" charset="utf-8"></script>
+
+${ utils.submit_popup_event() }
 
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery.hotkeys.js') }"></script>
 

+ 2 - 1
apps/oozie/src/oozie/templates/editor2/coordinator_editor.mako

@@ -134,7 +134,8 @@ ${ commonshare() | n,unicode }
 ${ dashboard.import_bindings() }
 
 <script src="${ static('oozie/js/coordinator-editor.ko.js') }" type="text/javascript" charset="utf-8"></script>
-<script src="${ static('oozie/js/editor2-utils.js') }" type="text/javascript" charset="utf-8"></script>
+
+${ utils.submit_popup_event() }
 
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery.hotkeys.js') }"></script>
 

+ 1 - 1
apps/oozie/src/oozie/templates/editor2/list_editor_bundles.mako

@@ -137,8 +137,8 @@ ${ commonimportexport(request) | n,unicode }
 
 <script src="${ static('desktop/ext/js/datatables-paging-0.1.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/js/share2.vm.js') }"></script>
-<script src="${ static('oozie/js/editor2-utils.js') }" type="text/javascript" charset="utf-8"></script>
 
+${ utils.submit_popup_event() }
 
 <script type="text/javascript">
   var Editor = function () {

+ 2 - 1
apps/oozie/src/oozie/templates/editor2/list_editor_coordinators.mako

@@ -136,7 +136,8 @@ ${ commonimportexport(request) | n,unicode }
 
 <script src="${ static('desktop/ext/js/datatables-paging-0.1.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/js/share2.vm.js') }"></script>
-<script src="${ static('oozie/js/editor2-utils.js') }" type="text/javascript" charset="utf-8"></script>
+
+${ utils.submit_popup_event() }
 
 
 <script type="text/javascript">

+ 1 - 1
apps/oozie/src/oozie/templates/editor2/list_editor_workflows.mako

@@ -136,8 +136,8 @@ ${ commonimportexport(request) | n,unicode }
 
 <script src="${ static('desktop/ext/js/datatables-paging-0.1.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/js/share2.vm.js') }"></script>
-<script src="${ static('oozie/js/editor2-utils.js') }" type="text/javascript" charset="utf-8"></script>
 
+${ utils.submit_popup_event() }
 
 <script type="text/javascript">
   var Editor = function () {

+ 2 - 1
apps/oozie/src/oozie/templates/editor2/workflow_editor.mako

@@ -643,7 +643,8 @@ ${ dashboard.import_bindings() }
 <script src="${ static('oozie/js/workflow-editor.ko.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('oozie/js/workflow-editor.utils.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery.curvedarrow.js') }" type="text/javascript" charset="utf-8"></script>
-<script src="${ static('oozie/js/editor2-utils.js') }" type="text/javascript" charset="utf-8"></script>
+
+${ utils.submit_popup_event() }
 
 <style type="text/css">
 % if conf.CUSTOM.BANNER_TOP_HTML.get():

+ 16 - 0
apps/oozie/src/oozie/templates/utils.inc.mako

@@ -580,6 +580,22 @@ function renderCrons() {
 }
 </%def>
 
+<%def name="submit_popup_event()">
+  <script type="text/javascript">
+    $(document).ready(function () {
+      $(document).off('showSubmitPopup');
+      $(document).on('showSubmitPopup', function (event, data) {
+        $('.submit-modal').html(data);
+        $('.submit-modal').modal('show');
+        var _sel = $('.submit-form .control-group[rel!="popover"]:visible');
+        if (_sel.length > 0) {
+          $('.submit-modal .modal-body').height($('.submit-modal .modal-body').height() + 60);
+        }
+      });
+    });
+  </script>
+</%def>
+
 <%def name="bulk_dashboard_functions()">
 
 <div id="bulkConfirmation" class="modal hide">

+ 4 - 1
desktop/core/src/desktop/templates/hue.mako

@@ -739,9 +739,12 @@ ${ smart_unicode(login_modal(request).content) | n,unicode }
           });
           huePubSub.publish('hue.datatable.search.hide');
           huePubSub.publish('nicescroll.resize');
-          if (app === 'filebrowser'){
+          if (app === 'filebrowser') {
             $(window).unbind('hashchange.fblist');
           }
+          if (app.startsWith('oozie')) {
+            huePubSub.clearAppSubscribers('oozie');
+          }
           if (typeof self.embeddable_cache[app] === 'undefined') {
             if (loadedApps.indexOf(app) == -1){
               loadedApps.push(app);

+ 9 - 0
desktop/libs/notebook/src/notebook/static/notebook/js/notebook.ko.js

@@ -2307,6 +2307,15 @@ var EditorViewModel = (function() {
 
                   ko.cleanNode($("#schedulerEditor")[0]);
                   ko.applyBindings(self.schedulerViewModel, $("#schedulerEditor")[0]);
+                  $(document).off("showSubmitPopup");
+                  $(document).on("showSubmitPopup", function (event, data) {
+                    $('.submit-modal').html(data);
+                    $('.submit-modal').modal('show');
+                    var _sel = $('.submit-form .control-group[rel!="popover"]:visible');
+                    if (_sel.length > 0) {
+                      $('.submit-modal .modal-body').height($('.submit-modal .modal-body').height() + 60);
+                    }
+                  });
 
                   huePubSub.publish('render.jqcron');
 

+ 0 - 3
desktop/libs/notebook/src/notebook/templates/editor_components.mako

@@ -165,9 +165,6 @@ from notebook.conf import ENABLE_QUERY_BUILDER, ENABLE_QUERY_SCHEDULING, ENABLE_
 <script src="${ static('desktop/ext/js/tzdetect.js') }" type="text/javascript" charset="utf-8"></script>
 
 <script src="${ static('desktop/js/ko.common-dashboard.js') }" type="text/javascript" charset="utf-8"></script>
-% if ENABLE_QUERY_SCHEDULING.get():
-<script src="${ static('oozie/js/editor2-utils.js') }" type="text/javascript" charset="utf-8"></script>
-% endif
 
 </%def>