瀏覽代碼

HUE-6254 [jb] Fixed workflow graph display

Enrico Berti 8 年之前
父節點
當前提交
b39712e

+ 9 - 3
apps/jobbrowser/src/jobbrowser/templates/job_browser.mako

@@ -237,7 +237,7 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
 </div>
 
 <!-- ko if: $root.job() -->
-  <div id="rerun-modal" class="modal" data-bind="html: $root.job().rerunModalContent"></div>
+  <div id="rerun-modal" class="modal hide" data-bind="html: $root.job().rerunModalContent"></div>
 <!-- /ko -->
 
 </div>
@@ -1154,7 +1154,12 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
             crumbs.push({'id': vm.job().id(), 'name': vm.job().name(), 'type': vm.job().type()});
             vm.resetBreadcrumbs(crumbs);
 
+            if (vm.job().type() === 'workflow' && !vm.job().workflowGraphLoaded) {
+              vm.job().updateWorkflowGraph();
+            }
+
             vm.job().fetchLogs();
+
           } else {
             $(document).trigger("error", data.message);
           }
@@ -1175,7 +1180,6 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
               vm.job().fetchLogs();
             }
             // vm.job().fetchProfile(); // Get name of active tab?
-            // updateWorkflowGraph() // If workflow
           });
         }
       };
@@ -1240,6 +1244,7 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
         }
       }
 
+      self.workflowGraphLoaded = false;
       self.updateWorkflowGraph = function() {
         var lastPosition = {
           top: 0,
@@ -1278,6 +1283,7 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
             },
             dataType: "html",
             success: function (response) {
+              self.workflowGraphLoaded = true;
               $('#workflow-page-graph').html(response);
               updateArrowPosition();
               arrowsPolling();
@@ -1736,7 +1742,7 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
         viewModel.job().updateJob();
       }, 'jobbrowser');
       % else:
-        viewModel.selectInterface('jobs');
+      viewModel.selectInterface('jobs');
       huePubSub.subscribe('mini.jb.navigate', function(interface){
         viewModel.selectInterface(interface);
       });

文件差異過大導致無法顯示
+ 0 - 0
apps/oozie/src/oozie/static/oozie/css/workflow-editor.css


+ 2 - 2
apps/oozie/src/oozie/static/oozie/js/workflow-editor.utils.js

@@ -20,8 +20,8 @@ function linkWidgets(fromId, toId) {
   if (_from.length > 0 && _to.length > 0) {
     var $painter = $(document.body);
 
-    if ($('#oozie_workflowComponents').length > 0){
-      $painter = $('#oozie_workflowComponents');
+    if ($('.oozie_workflowComponents').length > 0){
+      $painter = $('.oozie_workflowComponents');
     }
 
     var _fromCenter = {

+ 1 - 1
apps/oozie/src/oozie/static/oozie/less/workflow-editor.less

@@ -18,7 +18,7 @@
 
 @import (reference) "hue-mixins.less";
 
-#oozie_workflowComponents {
+.oozie_workflowComponents {
 
   .draggable-widget, .draggable-icon {
     cursor: move;

+ 1 - 1
apps/oozie/src/oozie/templates/dashboard/list_oozie_workflow.mako

@@ -29,7 +29,7 @@
 ${ commonheader(_("Workflow Dashboard"), "oozie", user, request) | n,unicode }
 ${ layout.menubar(section='workflows', dashboard=True) }
 
-<div id="oozie_workflowComponents" class="container-fluid">
+<div id="oozie_workflowComponents" class="container-fluid oozie_workflowComponents">
 <div class="card card-small">
   <div class="card-body">
   <p>

+ 7 - 3
apps/oozie/src/oozie/templates/dashboard/list_oozie_workflow_graph.mako

@@ -35,10 +35,14 @@ ${ dashboard.import_layout() }
 <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>
 
-${ workflow.render() }
+<div class="oozie_workflowComponents">
+
+  ${ workflow.render() }
+
+  <div id="loaded${doc_uuid}graph">
+    ${ workflow_graph | n,unicode }
+  </div>
 
-<div id="loaded${doc_uuid}graph">
-  ${ workflow_graph | n,unicode }
 </div>
 
 <script type="text/javascript">

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

@@ -31,7 +31,7 @@ from oozie.conf import ENABLE_DOCUMENT_ACTION, ENABLE_IMPALA_ACTION
 ${ commonheader(_("Workflow Editor"), "Oozie", user, request, "40px") | n,unicode }
 %endif
 
-<div id="oozie_workflowComponents" class="dashboard-container">
+<div id="oozie_workflowComponents" class="dashboard-container oozie_workflowComponents">
 
 <%def name="buttons()">
   <div class="pull-right" style="padding-right: 10px">

文件差異過大導致無法顯示
+ 0 - 0
desktop/core/src/desktop/static/desktop/css/hue.css


+ 1 - 1
desktop/core/src/desktop/static/desktop/less/hue.less

@@ -809,7 +809,7 @@ a:visited {
 }
 
 /* oozie workflow */
-#oozie_workflowComponents .card-toolbar {
+.oozie_workflowComponents .card-toolbar {
   position: static;
   width: auto;
 }

部分文件因文件數量過多而無法顯示