Merge branch 'master' of https://gitlab.irap.omp.eu/CDPP/AMDA_IHM

Benjamin Renard
2 parents 134b0d67 721edeef
Showing 10 changed files with 59 additions and 48 deletions Show diff stats
desktop.php
generic_data/resources.json
js/app/controllers/AstroImagesModule.js
js/app/models/ExecutableNode.js
js/app/models/LocalParamNode.js
js/app/models/RemoteParamNode.js
js/app/models/RemoteSimuParamNode.js
js/app/views/ExplorerUI.js
php/classes/AmdaAction.php
php/my_config.template.php
@@ -7,7 +7,6 @@
  
  
   require_once('php/config.php');
-
   // error_reporting(E_ALL);
   if (!isset($_POST['username'])) {
     header('Location: index.html');
@@ -107,6 +106,8 @@
         var max_uploaded_file_size = '<?php echo MAX_UPLOADED_FILESIZE; ?>';
         var guestSessionDuration = '<?php echo GuestSessionDuration*60; ?>'; // in secs
         var maxGuestTimeInterval = '<?php echo MaxGuestTimeInterval; ?>';    // in days
+        
+        var gatewayTimeout = '<?php if (defined('GATEWAY_TIMEOUT')) echo GATEWAY_TIMEOUT; else echo 300000; ?>'; // in msec
  
         var logExecTime = <?php echo (LOG_EXEC_TIME === TRUE ? 'true' : 'false'); ?>;
  
@@ -166,15 +167,23 @@
         Ext.onReady(function () { 
             //TODO update jobsStatus onLogin             
             Ext.Ajax.extraParams = {sessionID : sessionID};
-            Ext.Ajax.timeout = 600000;
-            Ext.Ajax.on('requestexception', function(conn, response, options, e) {                   
+            Ext.Ajax.timeout = gatewayTimeout; // msec ; should be the same value (or less) as gateway timeout
+
+            Ext.Ajax.on('requestexception', function(conn, response, options, e) { 
+
                 if (loadMask && loadMask.isMasked())
                     loadMask.hide();
-               if (response && response.statusText)
-                    myDesktopApp.errorMsg(response.statusText);
+                    
+                if (response && response.statusText) {
+                    if (response.timedout) 
+                        myDesktopApp.errorMsg('Request processing time exceeds gateway timeout.<br/>In case of parameter from Remote Bases : please re-launch the same request in 10 min,<br/>otherwise contact AMDA team');
+                    else 
+                        myDesktopApp.errorMsg(response.statusText);
+                }
                 else
                     myDesktopApp.errorMsg('Communication failure');
                 });
+           
             // backspace key disable           
             Ext.EventManager.on(window, 'keydown', function(e, t) {
                 if (e.getKey() == e.BACKSPACE && ((!/^input$/i.test(t.tagName) && !/^textarea$/i.test(t.tagName)) || t.disabled || t.readOnly)) {
@@ -7,7 +7,6 @@
 		]
   },
   {"nodeType" : "derivedParam","text" : "Derived Parameters","id" : "derivedParam-treeRootNode"},
-  {"nodeType" : "alias","text" : "Aliases","id" : "alias-treeRootNode"},   
   {"nodeType" : "", "text" : "Time Tables", "id" :  "TT-treeBase" , 
   "children" : [
 		 { "nodeType" : "timeTable", "text" : "My Time Tables", "id" : "timeTable-treeRootNode"},
@@ -17,7 +17,7 @@ Ext.define(&#39;amdaDesktop.AstroImagesModule&#39;, {
     extend: 'amdaDesktop.AmdaModule',
  
     requires : [
-      'amdaUI.HstUI',
+//      'amdaUI.HstUI',
       'amdaUI.APISImagesUI'
     ],
  
@@ -52,11 +52,11 @@ Ext.define(&#39;amdaDesktop.AstroImagesModule&#39;, {
 	            	        	   title: 'APIS Archive',
 	            	        	   xtype: 'panelAPIS',
 	            	        	   id   : 'apisPanel'
-	            	           },
-	            	           {
-	            	        	   title: 'MAST Archive',
-	            	        	   xtype: 'panelHst',
-	            	        	   id   : 'hstPanel'
+//	            	           },
+//	            	           {
+//	            	        	   title: 'MAST Archive',
+//	            	        	   xtype: 'panelHst',
+//	            	        	   id   : 'hstPanel'
 	            	           }
 	            	          ]
 	              }
@@ -64,11 +64,11 @@ Ext.define(&#39;amdaDesktop.AstroImagesModule&#39;, {
 	        });
 	    } 
  
-	    var hstPanel = win.queryById('hstPanel');
+//	    var hstPanel = win.queryById('hstPanel');
 		var apisPanel = win.queryById('apisPanel');
  
  
-		hstPanel.setInterval(startDate,stopDate);
+//		hstPanel.setInterval(startDate,stopDate);
 		apisPanel.setInterval(startDate,stopDate);
  
 	    win.on({
@@ -78,8 +78,8 @@ Ext.define(&#39;amdaDesktop.AstroImagesModule&#39;, {
         		{
 			win.doLayout();
 	    			var astrotabsUI = win.queryById('astrotabs');
-	    	        astrotabsUI.setActiveTab(apisPanel);
-	    	        hstPanel.forceRefresh();
+//	    	        astrotabsUI.setActiveTab(apisPanel);
+//	    	        hstPanel.forceRefresh();
 	    			apisPanel.forceRefresh();
         		},
         		scope : this
@@ -57,10 +57,10 @@ Ext.define(&#39;amdaModel.ExecutableNode&#39;, {
  
 				//AKKA - Rework of the result treatment for the integration with the new kernel
 				if (!e.status){
-					myDesktopApp.errorMsg('Internal error during request');
+				//	myDesktopApp.errorMsg('Internal error during request');
 					return;
 				}
-     	   
+
 				if (!res.success){
 					myDesktopApp.errorMsg(res.message);
 					return;
@@ -98,11 +98,11 @@ Ext.define(&#39;amdaModel.LocalParamNode&#39;,
 			fnId : 'para-createDerivedParam',
 			text : 'Create Derived Parameter',
 			hidden : true
-		}, {
+		}, /*{
 			fnId : 'leaf-createAlias',
 			text : 'Create/Edit Alias',
 			hidden : true
-		},{
+		},*/{
 			fnId : 'leaf-createDerivedParam',
 			text : 'Create Derived Parameter',
 			hidden : true
@@ -55,10 +55,10 @@ Ext.define(&#39;amdaModel.RemoteParamNode&#39;, {
 		fnId : 'para-downParam',
 			text : 'Download Parameter',
 			hidden : true
-		},{
+		},/*{
 			fnId : 'leaf-createAlias',
 			text : 'Create/Edit Alias'
-		}, {
+		}, */{
 			fnId : 'leaf-createDerivedParam',
 			text : 'Create Derived Parameter'
 		},{
@@ -61,10 +61,10 @@ Ext.define(&#39;amdaModel.RemoteSimuParamNode&#39;, {
 				fnId : 'dire-collapseAll',
 				text : 'Close All'
 			},
-			{
-				fnId : 'leaf-createAlias',
-				text : 'Create/Edit Alias'
-			}, 
+// 			{
+// 				fnId : 'leaf-createAlias',
+// 				text : 'Create/Edit Alias'
+// 			}, 
 			{    
 				fnId : 'leaf-createDerivedParam',
 				text : 'Create Derived Parameter'
@@ -945,10 +945,10 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
 								tree.applyDisableToNode(localNode);
  
 								//apply filter to aliases
-								var aliasNode = tree.getRootNode().findChild('id','alias-treeRootNode',true);
-								tree.applyFilterToNodes(aliasNode);
-								tree.setNodesVisibility(aliasNode,false);
-								tree.applyDisableToNode(aliasNode);
+// 								var aliasNode = tree.getRootNode().findChild('id','alias-treeRootNode',true);
+// 								tree.applyFilterToNodes(aliasNode);
+// 								tree.setNodesVisibility(aliasNode,false);
+// 								tree.applyDisableToNode(aliasNode);
 								break;
  
 						case 'simu' :
@@ -200,24 +200,24 @@ class AmdaAction
 							$plotTabs = FALSE;
 						break;
  
-						case 'alias':
-							$info = $id;
-							$id = 'alias_'.$id;
-							$component_info = array();
-							if ($child->hasAttribute("index1"))
-								$component_info["index1"] = $child->getAttribute('index1');
-							if ($child->hasAttribute("index2"))
-								$component_info["index2"] = $child->getAttribute('index2');
-
-							if ($child->hasAttribute("parentId"))
-								$component_info["parentId"] = $child->getAttribute("parentId");
-
-							if ($child->hasAttribute("iconCls"))
-								$iconCls = $child->getAttribute("iconCls");
-
-							if ($isLeaf) $isParameter = true;
-
-						break;
+// 						case 'alias':
+// 							$info = $id;
+// 							$id = 'alias_'.$id;
+// 							$component_info = array();
+// 							if ($child->hasAttribute("index1"))
+// 								$component_info["index1"] = $child->getAttribute('index1');
+// 							if ($child->hasAttribute("index2"))
+// 								$component_info["index2"] = $child->getAttribute('index2');
+// 
+// 							if ($child->hasAttribute("parentId"))
+// 								$component_info["parentId"] = $child->getAttribute("parentId");
+// 
+// 							if ($child->hasAttribute("iconCls"))
+// 								$iconCls = $child->getAttribute("iconCls");
+// 
+// 							if ($isLeaf) $isParameter = true;
+// 
+// 						break;
  
 						case 'timeTable':
 						case 'catalog':
@@ -24,6 +24,9 @@ define(&#39;TITLE&#39;, &#39;{:TITLE:}&#39;);
 // here for additional flexibility
 define('MAX_UPLOADED_FILESIZE',{:MAX_UPLOADED_FILESIZE:}); // in bytes !!!
  
+// To define only if current AMDA installation is behind proxy
+define('GATEWAY_TIMEOUT','{:GATEWAY_TIMEOUT:}');
+
 // To define only if you are behind a proxy
 define('PROXY_HOST','{:PROXY_HOST:}');
 define('PROXY_USERPWD','{:PROXY_USERPWD:}');