From 0da255add8fdc040563f92481282cd915f7d47ee Mon Sep 17 00:00:00 2001
From: George Raduta <george.raduta@cern.ch>
Date: Fri, 6 Oct 2023 12:40:34 +0200
Subject: [PATCH] [OGUI-1421] Sort display of detectors alphabetically & patch
 release (#2156)

* Display list of detectors alphabetically
* Bump patch version
---
 Control/lib/adapters/EnvironmentInfoAdapter.js | 2 +-
 Control/package-lock.json                      | 4 ++--
 Control/package.json                           | 2 +-
 Control/public/environment/environmentsPage.js | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Control/lib/adapters/EnvironmentInfoAdapter.js b/Control/lib/adapters/EnvironmentInfoAdapter.js
index 8fb167c55..d88d49dae 100644
--- 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
index 9835b30f6..c80808766 100644
--- a/Control/package-lock.json
+++ b/Control/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@aliceo2/control",
-  "version": "1.64.0",
+  "version": "1.64.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@aliceo2/control",
-      "version": "1.64.0",
+      "version": "1.64.1",
       "bundleDependencies": [
         "@aliceo2/web-ui",
         "@grpc/grpc-js",
diff --git a/Control/package.json b/Control/package.json
index d08c64258..9b62bebc8 100644
--- 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
index 13ae2afe0..e796b7f1a 100644
--- 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 : '-'),