[OGUI-1420] Reload configuration on global deployment (#2135)

* adds a second reload of configuration if deployment is done via the Global Deployments page
AliceO2Group · Sep 29, 2023 · 906ca8c · 906ca8c
1 parent c944dfe
commit 906ca8c
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 1 deletion.
diff --git a/Control/lib/api.js b/Control/lib/api.js
@@ -81,6 +81,7 @@ module.exports.setup = (http, ws) => {
 
   const aliecsReqHandler = new AliecsRequestHandler(ctrlService);
   aliecsReqHandler.setWs(ws);
+  aliecsReqHandler.workflowService = workflowService;
 
   const envCache = new EnvCache(ctrlService);
   envCache.setWs(ws);

diff --git a/Control/lib/control-core/RequestHandler.js b/Control/lib/control-core/RequestHandler.js
@@ -27,6 +27,11 @@ class RequestHandler {
   constructor(ctrlService) {
     this.ctrlService = ctrlService;
     this.requestList = {};
+
+    /**
+     * @type {WorkflowService}
+     */
+    this._workflowService = undefined;
   }
 
   /**
@@ -57,12 +62,31 @@ class RequestHandler {
     this.broadcast();
     log.debug('Added request to cache, ID: ' + index);
 
+    const {selectedConfiguration} = req.body;
+    if (selectedConfiguration) {
+      // workaround for reloading configuration before deployment from global page
+      try {
+        const {variables} = await this._workflowService.retrieveWorkflowSavedConfiguration(selectedConfiguration);
+        variables.hosts = req.body.vars.hosts;
+
+        const {epn_enabled, odc_n_epns} = req.body.vars;
+        if (epn_enabled === 'true') {
+          variables.odc_n_epns = odc_n_epns;
+        }
+        req.body.vars = variables;
+        console.log('-------------------------');
+        console.log(req.body.vars);
+      } catch (error) {
+        console.error(error);
+      }
+    }
+
     try {
       const payload = CoreUtils.parseEnvironmentCreationPayload(req.body);
       await this.ctrlService.executeCommandNoResponse('NewEnvironment', payload);
       log.debug('Auto-removed request, ID: ' + index);
       delete this.requestList[index];
-    } catch(error) {
+    } catch (error) {
       errorLogger('Request failed, ID: ' + index);
       errorLogger(error);
       this.requestList[index].failed = true;
@@ -115,5 +139,18 @@ class RequestHandler {
   getAll(req, res) {
     return res.json(this._getAll());
   }
+
+  /**
+   * Getters & Setters
+   */
+
+  /**
+   * Setter for updating workflowService to use
+   * @param {WorkflowService} - service to be used for retrieving workflow configuration
+   * @return {void}
+   */
+  set workflowService(service) {
+    this._workflowService = service;
+  }
 }
 module.exports = RequestHandler;
diff --git a/Control/public/pages/EnvironmentCreation/EnvironmentCreation.model.js b/Control/public/pages/EnvironmentCreation/EnvironmentCreation.model.js
@@ -89,6 +89,7 @@ export class EnvironmentCreationModel extends Observable {
 
     this._model.environment.newEnvironment({
       workflowTemplate: path,
+      selectedConfiguration: this._selectedConfigurationLabel,
       vars: this._creationModel.variables,
       detectors: this._model.workflow.flpSelection.selectedDetectors
     });