[O2B-1533] Move detector ordering into DetectorOrders

Centralise detector ordering maps by moving DEFAULT and RCT switchCase inputs into the ENUM.

This consolidates ordering configuration and avoids duplicate definitions in the provider.

Author: isaachilly

lib/public/domain/enums/DetectorOrders.js

@@ -11,7 +11,25 @@
  *  or submit itself to any jurisdiction.
  */
 
+import { DetectorType } from './DetectorTypes.js';
+
 export const DetectorOrders = Object.freeze({
-    DEFAULT: 'DEFAULT',
-    RCT: 'RCT',
+    DEFAULT: {
+        [DetectorType.OTHER]: 0,
+        [DetectorType.VIRTUAL]: 1,
+        [DetectorType.PHYSICAL]: 2,
+        [DetectorType.AOT_GLO]: 3,
+        [DetectorType.AOT_EVENT]: 4,
+        [DetectorType.MUON_GLO]: 5,
+        [DetectorType.QC_ONLY]: 6,
+    },
+    RCT: {
+        [DetectorType.OTHER]: 0,
+        [DetectorType.AOT_GLO]: 1,
+        [DetectorType.AOT_EVENT]: 2,
+        [DetectorType.MUON_GLO]: 3,
+        [DetectorType.VIRTUAL]: 4,
+        [DetectorType.PHYSICAL]: 5,
+        [DetectorType.QC_ONLY]: 6,
+    },
 });

lib/public/services/detectors/detectorsProvider.js

@@ -39,27 +39,6 @@ const getPhysicalDetectorsFromAllDetectors = (allDetectors) => allDetectors.filt
 const getQcDetectorsFromAllDetectors = (allDetectors) => allDetectors
     .filter(({ type, name }) => QC_DETECTORS.includes(type) && !DETECTORS_EXCLUDED_FROM_QC.includes(name));
 
-const ORDERING_KEYS = {
-    [DetectorOrders.DEFAULT]: {
-        [DetectorType.OTHER]: 0,
-        [DetectorType.VIRTUAL]: 1,
-        [DetectorType.PHYSICAL]: 2,
-        [DetectorType.AOT_GLO]: 3,
-        [DetectorType.AOT_EVENT]: 4,
-        [DetectorType.MUON_GLO]: 5,
-        [DetectorType.QC_ONLY]: 6,
-    },
-    [DetectorOrders.RCT]: {
-        [DetectorType.OTHER]: 0,
-        [DetectorType.AOT_GLO]: 1,
-        [DetectorType.AOT_EVENT]: 2,
-        [DetectorType.MUON_GLO]: 3,
-        [DetectorType.VIRTUAL]: 4,
-        [DetectorType.PHYSICAL]: 5,
-        [DetectorType.QC_ONLY]: 6,
-    },
-};
-
 /**
  * Service class to fetch detectors from the backend
  */
@@ -99,7 +78,7 @@ export class DetectorsProvider extends RemoteDataProvider {
      */
     async getRemoteData() {
         const { data: detectors } = await getRemoteData('/api/detectors');
-        const typeToOrderingKey = (type) => switchCase(type, ORDERING_KEYS[this._detectorOrder]);
+        const typeToOrderingKey = (type) => switchCase(type, this._detectorOrder);
 
         const orderingKey = (detector1, detector2) => {
             const specialPair = ['ZDC', 'TST'];