Browse Source

HUE-5853 [oozie] Avoid dashboards to break after the workflow editor

Enrico Berti 8 years ago
parent
commit
1181f6f

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

@@ -30,12 +30,12 @@ ko.bindingHandlers.droppable = {
 };
 
 
-function magicLayout(vm) {
-  loadLayout(vm, vm.initial.layout);
-  $(document).trigger("magicLayout");
+function magicWorkflowLayout(vm) {
+  loadWorkflowLayout(vm, vm.initial.layout);
+  $(document).trigger("magicWorkflowLayout");
 }
 
-function loadColumns(viewModel, json_layout) {
+function loadWorkflowColumns(viewModel, json_layout) {
   var _columns = [];
 
   $(json_layout).each(function (cnt, json_col) {
@@ -55,7 +55,7 @@ function loadColumns(viewModel, json_layout) {
         });
         row.addWidget(_w);
       });
-      row.columns(loadColumns(viewModel, json_row.columns));
+      row.columns(loadWorkflowColumns(viewModel, json_row.columns));
       _rows.push(row);
     });
     var column = new ExtendedColumn(json_col.size, _rows);
@@ -64,8 +64,8 @@ function loadColumns(viewModel, json_layout) {
   return _columns;
 }
 
-function loadLayout(viewModel, json_layout) {
-  var _cols = loadColumns(viewModel, json_layout);
+function loadWorkflowLayout(viewModel, json_layout) {
+  var _cols = loadWorkflowColumns(viewModel, json_layout);
   viewModel.oozieColumns(_cols);
 }
 
@@ -526,7 +526,7 @@ var WorkflowEditorViewModel = function (layout_json, workflow_json, credentials_
   self.inited = ko.observable(self.oozieColumns().length > 0);
   self.init = function (callback) {
     self.workflow_properties = ko.mapping.fromJS(workflow_properties_json);
-    loadLayout(self, layout_json);
+    loadWorkflowLayout(self, layout_json);
     self.workflow.loadNodes(workflow_json);
   };
 

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

@@ -54,7 +54,7 @@
         <div class="layout-box" style="width: 100px;"></div>
       </div>
     </a>
-    <a data-bind="visible: columns().length == 0" href="javascript: magicLayout(viewModel)" onmouseover="viewModel.previewColumns('magic')" onmouseout="viewModel.previewColumns('')">
+    <a data-bind="visible: columns().length == 0" href="javascript: magicSearchLayout(viewModel)" onmouseover="viewModel.previewColumns('magic')" onmouseout="viewModel.previewColumns('')">
       <div class="layout-container">
         <div class="layout-box" style="width: 100px;"><i class="fa fa-table"></i></div>
       </div>

+ 7 - 7
desktop/libs/dashboard/src/dashboard/static/dashboard/js/search.ko.js

@@ -14,12 +14,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-function magicLayout(vm) {
-  loadLayout(vm, vm.initial.layout);
-  $(document).trigger("magicLayout");
+function magicSearchLayout(vm) {
+  loadSearchLayout(vm, vm.initial.layout);
+  $(document).trigger("magicSearchLayout");
 }
 
-function loadLayout(viewModel, json_layout) {
+function loadSearchLayout(viewModel, json_layout) {
   var _columns = [];
 
   $(json_layout).each(function (cnt, json_col) {
@@ -1402,7 +1402,7 @@ var NewTemplate = function (vm, initial) {
     }
 
     if (initial.autoLoad) {
-      magicLayout(vm);
+      magicSearchLayout(vm);
     }
   };
 
@@ -1554,7 +1554,7 @@ var SearchViewModel = function (collection_json, query_json, initial_json) {
 
     self.previewColumns = ko.observable("");
     self.columns = ko.observable([]);
-    loadLayout(self, self.collectionJson.layout);
+    loadSearchLayout(self, self.collectionJson.layout);
 
     self.additionalMustache = null;
 
@@ -2393,7 +2393,7 @@ var SearchViewModel = function (collection_json, query_json, initial_json) {
     self.fieldAnalysesName("");
     self.previewColumns("");
     self.columns([]);
-    loadLayout(self, self.collectionJson.layout);
+    loadSearchLayout(self, self.collectionJson.layout);
     self.isEditing(true);
     self.isRetrievingResults(false);
     self.hasRetrievedResults(true);

+ 1 - 1
desktop/libs/dashboard/src/dashboard/templates/common_search.mako

@@ -3558,7 +3558,7 @@ $(document).ready(function () {
     $(this).parent().addClass("active");
   });
 
-  $(document).on("magicLayout", function(){
+  $(document).on("magicSearchLayout", function(){
     resizeFieldsList();
   });