Merge branch 'wip' into save-plot-request

Benjamin Renard
2 parents 37f1898e d648a5c0
Showing 15 changed files with 368 additions and 114 deletions Show diff stats
js/app/controllers/AmdaModule.js
js/app/controllers/InteractiveModule.js
js/app/controllers/PlotModule.js
js/app/models/AmdaNode.js
js/app/models/PlotNode.js
js/app/models/PlotObjects/PlotRequestObject.js
js/app/models/PlotObjects/PlotTabObject.js
js/app/models/PlotTabNode.js
js/app/views/ExplorerUI.js
js/app/views/PlotComponents/PlotTabPanel.js
js/app/views/PlotUI.js
js/resources/css/amda.css
js/resources/images/16x16/plot_pages.png
php/classes/AmdaAction.php
php/classes/RequestMgr.php
@@ -99,7 +99,12 @@ Ext.define(&#39;amdaDesktop.AmdaModule&#39;, {
 				show : onshowfn,
 				scope : this
 			});
-		}		
-		win.show();
+		}
+		if (!win.isVisible()) {
+			win.show();
+		}
+		else if (onshowfn) {
+			onshowfn();
+		}
 	}
 });
@@ -144,7 +144,13 @@ Ext.define(&#39;amdaDesktop.InteractiveModule&#39;, {
 			// second arg 'true' is used in CatalogUI to mark if Grid Reconfiguration is needed
 			this.getUiContent().setObject(this.linkedNode.get('object'), true);
 		}
-		win.show();
+
+		if (!win.isVisible()) {
+			win.show();
+		}
+		else if (onShowEvent) {
+			onShowEvent();
+		}
 	},
 	/**
 	 * Mechanism to attach a Module to the Workspace Explorer to enable interactions
@@ -256,4 +262,4 @@ Ext.define(&#39;amdaDesktop.InteractiveModule&#39;, {
               return null;
           }
-});
 \ No newline at end of file
+});
@@ -208,5 +208,12 @@ Ext.define(&#39;amdaDesktop.PlotModule&#39;, {
     getWindowResult: function(winResultId){
 	    if (!this.plotResultWindowsManager.get(winResultId)) return null;
 	    return this.plotResultWindowsManager.get(winResultId);	    
+	},
+
+    forceTabSelection: function(tabId) {
+	var uiContent = this.getUiContent();
+        if (uiContent != null) {
+		uiContent.forceActiveTab(tabId);
 	}
+    }
 });
@@ -128,6 +128,14 @@ Ext.define(&#39;amdaModel.AmdaNode&#39;, {
 		}
 		// if this node is a leaf and have no child
 		else if (this.isLeaf() || this.get('nodeType' ) ==  'derivedParam' ) {
+			if (this.get('nodeType')  == 'plottab') {
+				itemKind = amdaUI.ExplorerUI.ITEM_KIND_PTAB;
+			}
+			else {
+				itemKind = amdaUI.ExplorerUI.ITEM_KIND_LEAF;
+			}
+		}
+		else if (this.get('nodeType')  ==  'request') {
 			itemKind = amdaUI.ExplorerUI.ITEM_KIND_LEAF;
 		}
 		else if (this.get('isParameter') &&  this.get('nodeType' ) !=  'derivedParam' ) {
@@ -10,15 +10,45 @@
 Ext.define('amdaModel.PlotNode', {
 	extend: 'amdaModel.ExecutableNode',
+    fields : [
+        {name : 'tabs', type:'auto', defaultValue:[],  persist:  false}
+    ],
+
     statics: {
         nodeType: 'request' 
     },
+    requires:[
+        'amdaModel.PlotTabNode'
+    ],
+
     constructor : function(config){
         this.callParent(arguments);
         this.set('moduleId',myDesktopApp.dynamicModules.plot.id);
         this.set('objectDataModel','amdaPlotObj.PlotRequestObject');
         this.set('nodeType',this.self.nodeType);
+	this.updateTabs(this.get('tabs'));
+    },
+
+    updateTabs : function(tabs) {
+	if (tabs) {
+		var oneTab = (tabs.length == 1);
+        	this.set('leaf', oneTab); 
+		this.set('iconCls', oneTab ? 'icon-plot-page' : 'icon-plot-pages');
+		this.removeAll();
+		if (tabs.length > 1) {
+			var me = this;
+			Ext.Array.each(tabs, function(tab) {
+				var tabNode = new amdaModel.PlotTabNode({text: tab.name, tabid: tab.id});
+              			me.appendChild(tabNode);
+			});
+		}
+		this.set('tabs', tabs);
+	}
+    },
+
+    specialUpdate : function(res) {
+	this.updateTabs(res.tabs);
     },
     allMenuItems : function() {
@@ -30,8 +30,7 @@ Ext.define(&#39;amdaPlotObj.PlotRequestObject&#39;, {
               {name: 'one-file-per-interval', type: 'boolean'},
               {name: 'last-plotted-tab', type: 'int', defaultValue: 0},
               {name: 'last-tab-id', type: 'int', defaultValue: 0},
-				  {name: 'active-tab-id', type: 'int', defaultValue: 1},
-				  {name: 'all-in-one', type: 'boolean', defaultValue: false}
+	      {name: 'active-tab-id', type: 'int', defaultValue: 1}
     ],
     hasMany: {
@@ -74,10 +73,19 @@ Ext.define(&#39;amdaPlotObj.PlotRequestObject&#39;, {
     createNewTab: function() {
     	this.set('last-tab-id', this.get('last-tab-id') + 1);
-    	var recs = this.tabs().add({id : this.get('last-tab-id')});
-    	recs[0].setDefaultValues();
+	var data = {id: this.get('last-tab-id')};
+	var applyDefault = true;
+	if ((arguments.length > 0) && arguments[0]) {
+		data = arguments[0];
+		data['id'] = this.get('last-tab-id');
+		applyDefault = false;
+	}
+    	var recs = this.tabs().add(data);
+	if (applyDefault) {
+    		recs[0].setDefaultValues();
+	}
     	this.dirty = true;
-		return recs[0];
+	return recs[0];
     },
     removeTabById: function(tabId) {
@@ -124,7 +132,6 @@ Ext.define(&#39;amdaPlotObj.PlotRequestObject&#39;, {
     	requestValues['one-file-per-interval'] = this.get('one-file-per-interval');
     	requestValues['last-plotted-tab'] = this.get('last-plotted-tab');
     	requestValues['name'] = this.get('name');
-		requestValues['all-in-one'] =  this.get('all-in-one');
     	requestValues['timesrc'] =  this.get('timesrc'); 
@@ -153,26 +160,15 @@ Ext.define(&#39;amdaPlotObj.PlotRequestObject&#39;, {
 				requestValues['durationSec'] = this.get('durationSec');
 			}
-		requestValues['tabs'] = [];
+	requestValues['tabs'] = [];
-		if (this.get('all-in-one')) {
-			this.tabs().each(function (tab, index) {
-				requestValues['tabs'][index] = tab.getJsonValues();
-			});
+	this.tabs().each(function (tab, index) {
+		requestValues['tabs'][index] = tab.getJsonValues();
+	});
-			requestValues['active-tab-id'] = this.get('active-tab-id');
-			requestValues['last-tab-id'] = this.get('last-tab-id');
-		}
-		else {
-			var tab = this.tabs().getAt(this.get('active-tab-id')-1);
-			requestValues['tabs'][0] = tab.getJsonValues();
-			
-			requestValues['tabs'][0]['id'] = "1";
-			requestValues['active-tab-id'] =  "1";
-			requestValues['last-tab-id'] = "1";
-			requestValues['last-plotted-tab'] = "0";
-		}
+	requestValues['active-tab-id'] = this.get('active-tab-id');
+	requestValues['last-tab-id'] = this.get('last-tab-id');
-      return requestValues;
+	return requestValues;
     }
-});
 \ No newline at end of file
+});
@@ -27,6 +27,7 @@ Ext.define(&#39;amdaPlotObj.PlotTabObject&#39;, {
 	fields : [
 	          {name: 'id', type: 'int'},
+                  {name: 'tab-name', type: 'string', defaultValue: ''},
 	          {name: 'tree-full-view', type: 'boolean'},
 	          {name: 'multi-plot-linked', type: 'boolean'},
 	          {name: 'page-node-state', type: 'int', defaultValue: 2}, //0 : collapsed, 1 : expanded, 2 : not set 
@@ -223,6 +224,7 @@ Ext.define(&#39;amdaPlotObj.PlotTabObject&#39;, {
     	var tabValues  = new Object();
     	tabValues['id'] = this.get('id');
+	tabValues['tab-name'] = this.get('tab-name');
     	tabValues['tree-full-view'] = this.get('tree-full-view');
     	tabValues['multi-plot-linked'] = this.get('multi-plot-linked');
     	tabValues['page-node-state'] = this.get('page-node-state');
@@ -289,4 +291,4 @@ Ext.define(&#39;amdaPlotObj.PlotTabObject&#39;, {
     	return tabValues;
     }
-});
 \ No newline at end of file
+});
@@ -0,0 +1,142 @@
+/** 
+ * Project  : AMDA-NG4
+ * Name     : PlotTabNode.js
+ * @class   amdaModel.PlotTabNode
+ * @extends amdaModel.ExecutableNode
+ * @brief   Basic Model of Node corresponding to a tab of a plot request
+ * @author  Benjamin Renard
+ */
+
+Ext.define('amdaModel.PlotTabNode', {
+	extend: 'amdaModel.ExecutableNode',
+
+    fields : [
+        {name : 'tabid', type:'string', defaultValue:'',  persist:  false}
+    ],
+
+    statics: {
+        nodeType: 'plottab' 
+    },
+
+    constructor : function(config){
+        this.callParent(arguments);
+        this.set('moduleId',myDesktopApp.dynamicModules.plot.id);
+        //this.set('objectDataModel','amdaPlotObj.PlotRequestObject');
+        this.set('nodeType',this.self.nodeType);
+	this.set('leaf',true);
+	this.set('iconCls','icon-plot-page');
+    },
+
+    allMenuItems : function() {
+        var menuItems =
+         [
+         {
+            fnId : 'ptab-openTab',
+            text : 'Open in new Plot Request'
+         }, {
+	    fnId : 'ptab-insertTab',
+            text : 'Insert in current Plot Request'
+	 }, {
+             fnId : 'ptab-renameTab',
+             text : 'Rename Plot Tab'
+         }];
+
+        return menuItems;
+    }, 
+    
+    allMenuMultiItems : function() {
+        var menuMulti = [
+        ];
+        return menuMulti;
+    },
+    
+    getAllContextMenuItems: function(){
+        return this.allMenuItems();
+    },
+    
+    getMultiContextMenuItems: function(){
+        return this.allMenuMultiItems();
+    },
+    
+    onMenuItemClick : function(menu,item,event) {
+		 
+        var fnId = Ext.util.Format.substr(item.fnId, 5, item.fnId.length);
+
+        switch (fnId) {
+
+        case 'openTab':
+            this.insertPlotTabRequest(true);
+            break;
+
+        case 'insertTab':
+	    this.insertPlotTabRequest(false);
+            break;
+
+        case 'renameTab':
+            console.log('renameTab');
+            break;
+        default:
+            break;
+        }
+    },
+
+    insertPlotTabRequest : function(inNewRequest) {
+	var me = this;
+	amdaModel.InteractiveNode.preloadNodes(this.parentNode.getRootNode(), function() {
+		AmdaAction.getObject(me.parentNode.get('id'), me.parentNode.get('nodeType'), function (result,remoteEvent) {
+			var paramObj = Ext.create(me.parentNode.get('objectDataModel'), result);
+			var tabData = null;
+			paramObj.tabs().each(function(tab) {
+				if (tab.get('id') == me.get('tabid')) {
+					tabData = tab.getJsonValues();
+				}
+			});
+			if (tabData != null) {
+				if (inNewRequest) {
+					tabData['id'] = 1;
+					paramObj.set('id','');
+					paramObj.set('name', '');
+					paramObj.set('folderId', '');
+					paramObj.set('active-tab-id', 1);
+					paramObj.set('last-tab-id', 1);
+					paramObj.set('last-plotted-tab', 1);
+					paramObj.loadTabs([tabData]);
+					myDesktopApp.getLoadedModule(me.get('moduleId'), true, function (module) {
+						module.setContextNode(me.parentNode.getRootNode());
+						module.createWindow(function () {
+							var uiContent = module.getUiContent();
+							if (uiContent != null) {
+								uiContent.resetProcess(paramObj.getJsonValues());
+							}
+						});
+					});
+				}
+				else {
+					myDesktopApp.getLoadedModule(me.get('moduleId'), true, function (module) {
+						module.createWindow(function () {
+							var uiContent = module.getUiContent();
+							if (uiContent != null) {
+								var tabObj = new amdaPlotObj.PlotTabObject(tabData);
+								uiContent.insertPlotTab(tabData);
+							}
+						});
+					});
+				}
+			}
+		}, me);
+	});
+    },
+
+    editPlotTab : function() {
+	var me = this;
+	this.parentNode.editLeaf(function () {
+		myDesktopApp.getLoadedModule(me.get('moduleId'), true, function (module) {
+			var uiContent = module.getUiContent();
+			if (uiContent != null) {
+				uiContent.forceActiveTab(me.get('tabid'));
+			}
+		});
+	});
+    }
+   
+});
@@ -102,6 +102,7 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
 		ITEM_KIND_LEAF : 'leaf',
 		ITEM_KIND_DIRE : 'dire',
 		ITEM_KIND_PARA : 'para',
+		ITEM_KIND_PTAB : 'ptab', //plot tab
 		ITEM_KIND_MISS : 'miss'
 	},
@@ -575,13 +576,13 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
 						});
 					}
-					if (record.isLeaf() || record.data.isParameter)                                                                                                                                     
+					if (record.isLeaf() || record.data.isParameter || (record.data.tabs && (record.data.tabs.length > 0)))                                                                                                                                     
 						switch (record.get('nodeType'))
 						{
 							case 'myData' :
 							case 'myDataParam' :
 							case 'derivedParam' :
-                                                                                                                                          							case 'timeTable' :
+							case 'timeTable' :
 							case 'sharedtimeTable' :
 							case 'sharedcatalog' :
 							case 'catalog' :
@@ -589,6 +590,9 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
 							case 'condition' :
 								record.editLeaf();
 								break;
+							case 'plottab' :
+								record.editPlotTab();
+								break;
 							case 'localParam' :
 							case 'remoteParam':
 							case 'remoteSimuParam':
@@ -31,16 +31,20 @@ Ext.define(&#39;amdaPlotComp.PlotTabPanel&#39;, {
 	setRequestObject: function(object)
 	{
+		var me = this;
 		this.removeAll();
 		this.object = object;
-		var selectedTab = this.object.get('active-tab-id');
+		var haveSelectedTab = false;
 		this.object.tabs().each(function (rec, index) {
-			var isSelected = false;
-			if (index+1 == selectedTab) 
-				isSelected = true;
+			if (rec.get('id') == me.object.get('active-tab-id')) {
+				haveSelectedTab = true;
+			}
+		});
-			this.addPlotTab(rec, isSelected); 	
+		this.object.tabs().each(function (rec, index) {
+			var isSelectedTab = haveSelectedTab ? (rec.get('id') == me.object.get('active-tab-id')) : (index == 0);
+			this.addPlotTab(rec, isSelectedTab); 	
 		}, this);
 	},
@@ -141,7 +145,13 @@ Ext.define(&#39;amdaPlotComp.PlotTabPanel&#39;, {
 					    handler:function(btn,e){
 					    	var tabContent = me.addPlotTab(me.object.createNewTab(), true);
 					    }
-					}]
+					}],
+					listeners: {
+						click: function(tabBar, e, eOpts) {
+							console.log('click');
+						},
+						scope: me
+					}
 				},
 				listeners: {
@@ -32,8 +32,6 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
 	plotElement : null,
-	allPlots : false,
-	
 	constructor: function(config) {
 		this.init(config);	    
 		this.callParent(arguments);
@@ -47,12 +45,6 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
 		this.plotTabs.setRequestObject(this.object);
 		this.timeSelector.intervalSel.setInterval(this.object.get('startDate'), this.object.get('stopDate'));
 		this.addTTs(this.object.get('timeTables'));
-		this.updateRequestOption(this.object.get('all-in-one'));
-	},
-	
-	updateRequestOption : function(allInOne) {
-		var requestOptionCB = this.formPanel.getForm().findField('all-in-one');
-		requestOptionCB.setValue(allInOne);
 	},
 	/**
@@ -92,7 +84,11 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
 	resetProcess : function(){
 		var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);			
 		plotModule.createLinkedNode();
-		plotModule.createObject();					  
+		var obj = null;
+		if ((arguments.length > 0) && (arguments[0] != null)) {
+			obj = arguments[0];
+		}
+		plotModule.createObject(obj);					  
 		this.setObject(plotModule.linkedNode.get('object'));
 	},
@@ -119,7 +115,6 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
 	doPlot : function(){
 		this.updateObject();
-		this.object.set('all-in-one', true);
 		this.object.set('last-plotted-tab', this.plotTabs.getSelectedTabId());
 		var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
 		if (plotModule)
@@ -180,10 +175,70 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
 		this.timeSelector.intervalSel.setInterval(dateStart, dateStop);        
 	},
+
+	forceActiveTab : function(tabId) {
+		for (var i = 0; i < this.plotTabs.items.getCount(); ++i) {
+			var plotTab = this.plotTabs.items.getAt(i).items.getAt(0);
+			if (plotTab.tabId == tabId) {
+				this.plotTabs.setActiveTab(i);
+				return;
+			}
+		}
+	},
+
+	insertPlotTab : function(tabData) {
+		var newTab = this.object.createNewTab(tabData);
+		this.plotTabs.addPlotTab(newTab,true);
+	},
 	updateLinkedToMultiPlotMode : function(isLinkedToMultiPlotMode) {
 		this.timeSelector.setVisible(isLinkedToMultiPlotMode); 
 	},
+
+	savePlotRequest : function(allTabs = false) {
+		var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
+		if (!plotModule)
+			return;
+		this.updateObject();
+		this.object.set('active-tab-id', this.plotTabs.getSelectedTabId());
+
+		if ((this.object.get('id') != '') && (plotModule.linkedNode.get('text') == this.object.get('name'))) {
+			//update existing request
+			plotModule.linkedNode.update();
+			return;
+		}
+
+		//save new request
+		var me = this;
+		plotModule.linkedNode.isValidName(this.object.get('name'), function (res) {
+			if (!res) {
+				myDesktopApp.errorMsg('Error during object validation');
+				return;
+			}
+			if (!res.valid) {
+				if (res.error) {
+					if (res.error.search('subtree') != -1) {
+						Ext.Msg.show( { title : 'Warning',
+							msg: res.error + '<br/>Do you want to overwrite it?',
+							width: 300,
+							buttons: Ext.Msg.OKCANCEL,
+							icon: Ext.Msg.WARNING,
+							fn :  me.overwriteProcess,
+							scope : me
+						});
+					}
+					else {
+						myDesktopApp.errorMsg(res.error);
+					}
+				}
+				else {
+					myDesktopApp.errorMsg('Invalid object name');
+				}
+				return;
+			}
+			me.saveProcess(false);
+		});
+	},
 	init : function(config) {
 		this.timeSelector = new amdaUI.TimeSelectorUI( { id: 'multiPlotTimeSelector' + config.id, title : 'MultiPlot Time Selection', border : false, collapsible : true, collapseDirection : 'bottom', visible : false, flex: 2 } );
@@ -252,7 +307,8 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
 			            ]
 			        }
 			],
-			fbar: [{
+			fbar: [
+					{
 						xtype: 'button',
 						text: 'Plot',
 						scope: this,
@@ -275,68 +331,24 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
 						}
 					},
 					'->', '-', {
-						xtype: 'button',
-						text: 'Save Request',
+						xtype: 'splitbutton',
+						text: 'Save All Tabs',
+						menu: {
+							items: [
+								{
+									text: 'Save Current Tab',
+									scope: this,
+									handler: function() {
+										this.savePlotRequest(false);
+									}
+								},
+							]
+						},
 						scope: this,
 						handler: function(button) {
-							var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
-							if (!plotModule)
-											return;
-							
-							this.updateObject();
-							this.object.set('active-tab-id', this.plotTabs.getSelectedTabId());
-							this.object.set('all-in-one', this.allPlots);
-							
-							//update existing request
-							if ((this.object.get('id') != '') && 
-								(plotModule.linkedNode.get('text') == this.object.get('name'))) 
-										plotModule.linkedNode.update();
-							else {
-								var me = this; 
-								plotModule.linkedNode.isValidName(this.object.get('name'), function (res) {
-									if (!res) {
-										myDesktopApp.errorMsg('Error during object validation');
-										return;
-									}
-									if (!res.valid) {
-										if (res.error) {
-											if (res.error.search('subtree') != -1) { 
-												Ext.Msg.show( { title : 'Warning', 
-													msg: res.error + '<br/>Do you want to overwrite it?',
-													width: 300,
-													buttons: Ext.Msg.OKCANCEL,
-													icon: Ext.Msg.WARNING, 
-													fn :  me.overwriteProcess, 
-													scope : me
-												});	 
-											}
-											else {
-												myDesktopApp.errorMsg(res.error);
-											}
-										}
-										else {
-											myDesktopApp.errorMsg('Invalid object name');
-										}
-										
-										return;
-									}
-									me.saveProcess(false);
-								})
-							}
-						}
-					 }, ' ', 
-						myDesktopApp.addAmdaInfo('plotSaveRequest'),
-						' ', {
-						xtype: 'checkbox',
-						boxLabel: 'All Plot Tabs',
-						name : 'all-in-one',
-						listeners : {
-							scope: this,
-							change: function (cb, nv, ov) { 
-									 this.allPlots = nv;
-							}
+							this.savePlotRequest(true);
 						}
-					} 
+					 } 
 			]
 		});
@@ -456,6 +456,10 @@ p + p {
 	background-image:url( ../images/16x16/plot_page.png ) !important;
 }
+.icon-plot-pages {
+	background-image:url( ../images/16x16/plot_pages.png ) !important;
+}
+
 .icon-plot-layout {
 	background-image:url( ../images/16x16/plot_layout.png ) !important;
 }
@@ -151,6 +151,7 @@ class AmdaAction
 					$isParameter = false;
 					$isAddable =  false;
 					$isSimulation = false;
+					$plotTabs = FALSE;
 					$rank = null;
 					$skip = FALSE;
@@ -178,12 +179,25 @@ class AmdaAction
 						case 'request':
 						$objectMgr = new RequestMgr();
 						$objplot = $objectMgr->getObject($id);
-						for ($i=0; $i < count($objplot->children); $i++)
-						{
-							for ($j=0; $j < count($objplot->children[$i]->children); $j++) {
-								$info = $info.' . '.$objplot->children[$i]->children[$j]->name;
+						if (isset($objplot->name)) {
+							$info = $objplot->name;
+						}
+						else {
+							$info = $id;
+						}
+
+						$isLeaf = isset($objplot->tabs);
+						if ($isLeaf) {
+							$plotTabs = array();
+							foreach ($objplot->tabs as $index => $tab) {
+								$plotTabs[$index] = array(
+									"name" => "Plot ".($index+1),
+									"id" => $tab->id,
+								);
 							}
 						}
+						else
+							$plotTabs = FALSE;
 						break;
 						case 'alias':
@@ -313,6 +327,7 @@ class AmdaAction
 								}
 							}
+
 							if ($isParameter) {
 								$objectMgr = new AliasMgr();
 								$alias = $objectMgr->getAlias($id);
@@ -561,7 +576,7 @@ class AmdaAction
 						}
 						$childrenToReturn[] = array('text' => $name, 'id' => $id, 'nodeType' => $nodeType, 'info' => $info,
-													'help' => $help, 'leaf' => $isLeaf, 'isParameter' => $isParameter, 'dim_1' => $dim_1, 'dim_2' => $dim_2);
+													'help' => $help, 'leaf' => $isLeaf, 'isParameter' => $isParameter, 'dim_1' => $dim_1, 'dim_2' => $dim_2, 'tabs' => $plotTabs);
 					}
 				}
 				// if $childrenToReturn we have to return []
@@ -177,6 +177,19 @@ class RequestMgr extends AmdaObjectMgr
 				}
 			}
 		}
+
+		$additional = array();
+		if ($this->type == 'request') {
+			$additional['tabs'] = array();
+			if (isset($p->tabs)) {
+				foreach ($p->tabs as $index => $tab) {
+					$additional['tabs'][$index] = array(
+						"name" => "Plot ".($index+1),
+						"id" => $tab->id,
+					);
+				}
+			}
+		}
 		$this->descFileName = USERREQDIR.$this->id;
 		$p->id = $this->id;
@@ -187,7 +200,7 @@ class RequestMgr extends AmdaObjectMgr
 		$this -> addToContent($p, $folder);
-		return array('id' => $this->id, 'info' => $info);
+		return array('id' => $this->id, 'info' => $info) + $additional;
 	}
 	public static function checkRequest($obj)