[OGUI-1509] Update Task Counters following cache update (#2396)

* adds a check for environments tasks and updates the counters 
* if counters are different than at last check, sends them via websocket

Control/lib/api.js

@@ -97,7 +97,7 @@ module.exports.setup = (http, ws) => {
   aliecsReqHandler.setWs(ws);
   aliecsReqHandler.workflowService = workflowService;
 
-  const envCache = new EnvCache(ctrlService);
+  const envCache = new EnvCache(ctrlService, envService);
   envCache.setWs(ws);
 
   const bkpService = new BookkeepingService(config.bookkeeping ?? {});

Control/lib/control-core/EnvCache.js

@@ -23,14 +23,17 @@ class EnvCache {
 
   /**
    * @param {object} ctrlService - Handle to Control service
+   * @param {EnvironmentService} environmentService - service to be used to retrieve information on environments
    */
-  constructor(ctrlService) {
+  constructor(ctrlService, environmentService) {
     this.ctrlService = ctrlService;
     this.cache = {};
     this.timeout = 9000;
     this.cacheEvictionTimeout = 5 * 60 * 1000;
     this.cacheEvictionLast = new Date();
-    this.refreshInterval = setInterval(() => this.refresh(), this.timeout);
+    this._cacheRefreshRate = 6000;
+    this.refreshInterval = setInterval(() => this.refresh(), this._cacheRefreshRate);
+    this._environmentService = environmentService;
   }
 
   /**
@@ -81,16 +84,35 @@ class EnvCache {
     try {
       const deadline = Date.now() + this.timeout;
       const envs = await this.ctrlService.executeCommandNoResponse('GetEnvironments', {}, {deadline});
-      if (!this._cacheInSync(envs)) {
-        this.cache = envs;
-        this.webSocket?.broadcast(new WebSocketMessage().setCommand('environments').setPayload(this.cache));
-        log.debug('Updated cache');
+
+      for (let [index, currentEnv] of envs.environments.entries()) {
+        try {
+          const environment = await this._environmentService.getEnvironment(currentEnv.id);
+          envs.environments[index] = environment;
+          this._updateCache(envs);
+        } catch (error) {
+          console.error(error);
+        }
       }
-      this.cacheEvictionLast = new Date();
+      this._updateCache(envs);
     } catch (error) {
       log.debug(error);
     }
     this.evictCache();
   }
+
+  /**
+   * Method to update cache if there are any changes
+   * @param {Object{Environments}} - environments' data that is to be stored in cache
+   * @return {void}
+   */
+  _updateCache(envs) {
+    if (!this._cacheInSync(envs)) {
+      this.cache = envs;
+      this.webSocket?.broadcast(new WebSocketMessage().setCommand('environments').setPayload(this.cache));
+      log.debug('Updated cache');
+    }
+    this.cacheEvictionLast = new Date();
+  }
 }
 module.exports = EnvCache;

Control/lib/services/Environment.service.js

@@ -53,7 +53,7 @@ class EnvironmentService {
    * Parses the environment and prepares the information for GUI purposes
    * @param {string} id - environment id as defined by AliECS Core
    * @param {string} taskSource - Source of where to request tasks from: FLP, EPN, QC, TRG
-   * @return {EnvironmentDetails}
+   * @return {EnvironmentInfo}
    * @throws {Error}
    */
   async getEnvironment(id, taskSource) {

Control/public/common/enums/TaskState.js

@@ -23,7 +23,7 @@ export const TaskState = Object.freeze({
 });
 
 /**
- * List of possible states for a task sorted alphabetically with ERROR first and RUNNING second
+ * List of possible states for a task sorted alphabetically with ERROR first and RUNNING second and CONFIGURED third
  * @return {Array<String>} list of task states
  */
 export const TASK_STATES = Object.values(TaskState)
@@ -36,6 +36,10 @@ export const TASK_STATES = Object.values(TaskState)
       return -1;
     } else if (b === 'RUNNING') {
       return 1;
+    } else if (a === 'CONFIGURED') {
+      return -1;
+    } else if (b === 'CONFIGURED') {
+      return 1;
     } else {
       return a.localeCompare(b);
     }
@@ -44,7 +48,7 @@ export const TASK_STATES = Object.values(TaskState)
 export const TaskStateClassAssociation = Object.freeze({
   ERROR: '.danger',
   RUNNING: '.success',
-  CONFIGURED: '.warning',
+  CONFIGURED: '.primary',
   STANDBY: '',
   DONE: '',
   MIXED: '',