Fix bug when a plot rquest is overwriten

Benjamin Renard
1 parent b9c5d84e
Showing 3 changed files with 73 additions and 13 deletions Show diff stats
js/app/models/PlotObjects/MultiplotRequestObject.js
js/app/views/PlotComponents/PlotTabContent.js
js/app/views/PlotComponents/PlotTabPanel.js
@@ -67,6 +67,25 @@ Ext.define(&#39;amdaPlotObj.MultiplotRequestObject&#39;, {
         return newPlotNode;
     },
  
+    overwritePlot: function(plotNode, targetPlotNode) {
+        var targetIndex = -1;
+        this.plots().each(function(node, index) {
+            if (node == targetPlotNode) {
+                targetIndex = index;
+            }
+        });
+        if (targetIndex < 0) {
+            //Target not exists in multiplot node => add it
+            this.plots().add(targetPlotNode);
+            targetIndex = this.plots().count() - 1;
+        }
+        var data = plotNode.get('object').getJsonValues();
+        data.id = targetPlotNode.get('id');
+        targetPlotNode.set('object', Ext.create('amdaPlotObj.PlotRequestObject', data));
+        plotNode.get('object').reject();
+        return targetPlotNode;
+    },
+
     createNewPlotFromObject: function(plotObject) {
         var plotNode = Ext.create('amdaModel.PlotNode', {
             leaf : true
@@ -112,27 +112,40 @@ Ext.define(&#39;amdaPlotComp.PlotTabContent&#39;, {
         });
     },
  
-    saveProcess : function(toRename) {
+    saveProcess : function(overwriteExistingNode) {
+        var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
+        if (!plotModule)
+            return;
+
         var me = this;
-        if (toRename) {
+        if (overwriteExistingNode) {
             this.updateTimeObject();
-            this.plotNode.update({plot: true, callback: function() {
-                me.setPlotNode(me.plotNode); //to update initial request data
-                me.plotTabPanel.updatePlotTabs();
-            }});
+            amdaModel.InteractiveNode.preloadNodes(this.plotNode.getRootNode(), function () {
+                var targetPlotNode = me.plotNode.getRootNode().findChild('text', me.plotNode.get('object').get('name'), true);
+                if (!targetPlotNode) {
+                    myDesktopApp.errorMsg('Cannot retrieve request node');
+                    return;
+                }
+                targetPlotNode = plotModule.linkedNode.get('object').overwritePlot(me.plotNode, targetPlotNode);
+                if (targetPlotNode) {
+                    //Reject modifications in old plot node
+                    me.resetModif();
+                    targetPlotNode.update({plot: true, callback: function() {
+                        me.setPlotNode(targetPlotNode);
+                        me.plotTabPanel.updatePlotTabs();
+                        me.updateUI();
+                    }});
+                }
+            });
         }
         else {
             if (this.plotNode.get('object').get('id') != '') {
                 //Duplicate request
-                var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
-                if (!plotModule)
-                    return;
-                var newPlotNode = plotModule.linkedNode.get('object').duplicatePlot(this.plotNode);
+                var newPlotNode = this.plotTabPanel.duplicatePlotNode(this.plotNode);
                 if (newPlotNode) {
                     //Reject modifications in old plot node
-                    this.plotNode.reject();
-                    this.plotNode.set('object', Ext.create('amdaPlotObj.PlotRequestObject', this.initialObjectData));
-                    //Set new plot node
+                    this.resetModif();
+                    //Set new plot node to the current tab
                     this.setPlotNode(newPlotNode);
                 }
             }
@@ -146,6 +159,10 @@ Ext.define(&#39;amdaPlotComp.PlotTabContent&#39;, {
         }
     },
  
+    resetModif : function() {
+        this.plotNode.set('object', Ext.create('amdaPlotObj.PlotRequestObject', this.initialObjectData));
+    },
+
     getDataProcess : function() {
         var downObject = amdaModel.DownloadNode.decodeObject(this.plotNode.get('object'));
         amdaModel.DownloadNode.set('object',Ext.create('amdaModel.Download',downObject));
@@ -88,10 +88,14 @@ Ext.define(&#39;amdaPlotComp.PlotTabPanel&#39;, {
                 },
                 close: function( tab, eOpts ) {
                     if (tab.items.getAt(0).plotNode) {
+                        tab.items.getAt(0).resetModif();
                         this.multiplot_object.removePlotByInternalId(tab.items.getAt(0).plotNode.internalId);
                     }
                 },
                 destroy: function(tab, eOpts) {
+                    if (tab.items.getAt(0) && tab.items.getAt(0).plotNode) {
+                        tab.items.getAt(0).resetModif();
+                    }
                     if (!this.tabbar_destroy)
                         this.updatePlotTabs();
                 }
@@ -103,6 +107,14 @@ Ext.define(&#39;amdaPlotComp.PlotTabPanel&#39;, {
  
         return tabContent;
     },
+
+    duplicatePlotNode: function(plotNode)
+    {
+        var newPlotNode = this.multiplot_object.duplicatePlot(plotNode);
+        if (!newPlotNode)
+            return null;
+        return newPlotNode;
+    },
  
     updatePlotTabs: function()
     {
@@ -119,6 +131,18 @@ Ext.define(&#39;amdaPlotComp.PlotTabPanel&#39;, {
         }
     },
  
+    closePlotTabIfOpened: function(plotNodeToClose) {
+        for (i = 0; i < this.items.getCount(); ++i)
+        {
+            var tabItem = this.items.getAt(i);
+            var tabContent = tabItem.items.getAt(0);
+            var plotNode = tabContent.plotNode;
+            if (plotNode == renamedNode) {
+                this.remove(tabItem.getId());
+            }
+        }
+    },
+
     updateRequestName: function(renamedNode)
     {
         for (i = 0; i < this.items.getCount(); ++i)