Templated parameter with pre-filled arguments (#8503)

Benjamin Renard
1 parent 2fa56f95
Showing 4 changed files with 21 additions and 6 deletions Show diff stats
js/app/models/InteractiveNode.js
js/app/views/DownloadUI.js
js/app/views/PlotComponents/PlotTree.js
js/app/views/SearchUI.js
@@ -540,6 +540,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 							paramName = node.get('id');
 				}
  				var component_info = node.get('component_info');
+				var predefinedArgs = node.get('predefinedArgs');
  				if (component_info && component_info.parentId) {
  					//It's a component
  					paramName = component_info.parentId;
@@ -548,8 +549,16 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
  						components['index1'] = component_info.index1;
  					if (component_info.index2)
  						components['index2'] = component_info.index2;
+					predefinedArgs = node.parentNode.get('predefinedArgs');
  				}
-				module.addParam(paramName,true,node.get('needsArgs'),components);
+				if (predefinedArgs) {
+					module.parseTemplatedParam(paramName, function(param_info) {
+						module.addParam(param_info.paramid, true, node.get('needsArgs'), components, param_info.template_args);
+					});
+				}
+				else {
+					module.addParam(paramName,true,node.get('needsArgs'),components);
+				}
 		});
 	},
@@ -432,6 +432,7 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, {
                                         return false;
                                     var idToSent;
                                     var components = null;
+				    var predefinedArgs = data.records[0].get('predefinedArgs');
                                     switch (data.records[0].data.nodeType)
                                     {
                                         case 'localParam' :
@@ -451,6 +452,7 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, {
                                                         components['index1'] = component_info.index1;
                                                     if (component_info.index2)
                                                         components['index2'] = component_info.index2;
+						    predefinedArgs = data.records[0].parentNode.get('predefinedArgs');
                                                 }
                                                 if (data.records[0].get('needsArgs'))
                                                 {
@@ -509,9 +511,10 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, {
                                     }
                                     var downModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.download.id);
                                     if (downModule) {
-					if (data.records[0].get('predefinedArgs')) {
+					
+					if (predefinedArgs) {
 						downModule.parseTemplatedParam(idToSent, function(param_info) {
-							downModule.addParam(param_info.paramid, true, true, components, param_info.template_args);
+							downModule.addParam(param_info.paramid, data.records[0].get('leaf'), data.records[0].get('needsArgs'), components, param_info.template_args);
 						});
 					}
 					else {
@@ -697,6 +697,7 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
                                             var param_id = record.get('id');
                                             var plot_only = record.get('notyet');
                                             var components = null;
+					    var predefinedArgs = record.get('predefinedArgs');
                                             if (component_info && component_info.parentId) {
                                                 //It's a component
                                                 param_id = component_info.parentId;
@@ -705,8 +706,9 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
                                                     components['index1'] = component_info.index1;
                                                 if (component_info.index2)
                                                     components['index2'] = component_info.index2;
+						predefinedArgs = record.parentNode.get('predefinedArgs');
                                             }
-                                            this.dropParamToCreate(targetNode, position, param_id, {'components': components, 'isVector': isVector, 'plotOnly': plot_only, 'predefinedArgs': record.get('predefinedArgs')});
+                                            this.dropParamToCreate(targetNode, position, param_id, {'components': components, 'isVector': isVector, 'plotOnly': plot_only, 'predefinedArgs': predefinedArgs});
                                         }
                                         return true;
                                     case 'amdaModel.AliasNode'        :
@@ -17,7 +17,8 @@ Ext.define(&#39;amdaUI.SearchUI&#39;,
 	 	'amdaUI.CalculatorUI',
 	 	'amdaUI.TimeSelectorUI',
 	 	'extensions.SelectableTextArea',
-	 	'amdaUI.ParamArgumentsPlug'
+	 	'amdaUI.ParamArgumentsPlug',
+		'amdaModel.RequestParamObject'
 	],    
 	constructor: function(config) 
@@ -45,7 +46,7 @@ Ext.define(&#39;amdaUI.SearchUI&#39;,
 	addParam : function(newParamName, isLeaf, needArgs, components) 
 	{
-		if (!isLeaf || needArgs || components)
+		if (needArgs || components)
 				this.editParameterArgs(newParamName, components);
 		else
 			this.addParamInEditor(newParamName);