[OGUI-1421] Sort display of detectors alphabetically & patch release (#…

…2156) * Display list of detectors alphabetically * Bump patch version
AliceO2Group · Oct 6, 2023 · 0da255a · 0da255a
1 parent 111cd8a
commit 0da255a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Control/lib/adapters/EnvironmentInfoAdapter.js b/Control/lib/adapters/EnvironmentInfoAdapter.js
@@ -81,7 +81,7 @@ class EnvironmentInfoAdapter {
         epn: EnvironmentInfoAdapter._getOdcCounters(integratedServicesData.odc ?? {}),
       },
       tasks: [],
-      includedDetectors,
+      includedDetectors: includedDetectors.sort(),
       defaults: EnvironmentInfoAdapter._filterOutDetectorsVariables(defaults, includedDetectors, detectorsAll),
       vars: EnvironmentInfoAdapter._filterOutDetectorsVariables(vars, includedDetectors, detectorsAll),
       userVars: EnvironmentInfoAdapter._filterOutDetectorsVariables(userVars, includedDetectors, detectorsAll),

diff --git a/Control/package-lock.json b/Control/package-lock.json
diff --git a/Control/package.json b/Control/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aliceo2/control",
-  "version": "1.64.0",
+  "version": "1.64.1",
   "description": "ALICE O2 Control GUI",
   "author": "George Raduta",
   "contributors": [

diff --git a/Control/public/environment/environmentsPage.js b/Control/public/environment/environmentsPage.js
@@ -99,7 +99,7 @@ const requestsTable = (model, requests) =>
       requests.map(item => h('tr', {style: {background: item.failed ? 'rgba(214, 38, 49, 0.2)' : ''}}, [
         h('td', {style: 'text-align: center;'}, item.envId || '-'),
         h('td', {style: 'text-align: center;'},
-          item.detectors && item.detectors.length > 0 ? item.detectors.join(' ') : '-'
+          item.detectors && item.detectors.length > 0 ? item.detectors.sort().join(' ') : '-'
         ),
         h('td', {style: 'text-align: center;'}, item.workflow.substring(
           item.workflow.lastIndexOf('/') + 1, item.workflow.indexOf('@')
@@ -160,7 +160,7 @@ const environmentsTable = (model, list) => {
           ),
           h('td', {style: 'text-align: center;'}, [
             item.includedDetectors && item.includedDetectors.length > 0 ?
-              item.includedDetectors.map((detector) => `${detector} `)
+              item.includedDetectors.sort().map((detector) => `${detector} `)
               : '-'
           ]),
           h('td', {style: 'text-align: center;'}, item.userVars.run_type ? item.userVars.run_type : '-'),