[O2B-536] Clean selection model

lib/domain/dtos/filters/RunFilterDto.js

@@ -90,8 +90,10 @@ exports.RunFilterDto = Joi.object({
     dataPassIds: Joi.array().items(Joi.number()),
     simulationPassIds: Joi.array().items(Joi.number()),
     runTypes: CustomJoi.stringArray().items(Joi.string()).single().optional(),
-    aliceL3Current: Joi.number().integer(),
-    aliceDipoleCurrent: Joi.number().integer(),
+    magnets: Joi.object({
+        l3: Joi.number().integer(),
+        dipole: Joi.number().integer(),
+    }),
     updatedAt: FromToFilterDto,
 
     muInelasticInteractionRate: FloatComparisonDto,

lib/public/components/Filters/RunsFilter/MagnetsFilteringModel.js

@@ -0,0 +1,94 @@
+/**
+ * @license
+ * Copyright CERN and copyright holders of ALICE O2. This software is
+ * distributed under the terms of the GNU General Public License v3 (GPL
+ * Version 3), copied verbatim in the file "COPYING".
+ *
+ * See http://alice-o2.web.cern.ch/license for full licensing information.
+ *
+ * In applying this license CERN does not waive the privileges and immunities
+ * granted to it by virtue of its status as an Intergovernmental Organization
+ * or submit itself to any jurisdiction.
+ */
+
+import { RemoteData } from '/js/src/index.js';
+import { getRemoteData } from '../../../utilities/fetch/getRemoteData.js';
+import { SelectionDropdownModel } from '../../common/selection/dropdown/SelectionDropdownModel.js';
+import { FilterModel } from '../common/FilterModel.js';
+
+/**
+ * AliceL3AndDipoleFilteringModel
+ */
+export class MagnetsFilteringModel extends FilterModel {
+    /**
+     * Constructor
+     */
+    constructor() {
+        super();
+        this._selectionDropdownModel = new SelectionDropdownModel({ multiple: false });
+        this._addSubmodel(this._selectionDropdownModel);
+
+        this._valueToFilteringParamsMap = new Map();
+
+        getRemoteData('/api/runs/aliceMagnetsCurrentLevels')
+            .then(
+                ({ data }) => {
+                    data.sort((
+                        { l3Level: l3LevelA, dipoleLevel: dipoleLevelA },
+                        { l3Level: l3LevelB, dipoleLevel: dipoleLevelB },
+                    ) => l3LevelA - l3LevelB || dipoleLevelA - dipoleLevelB);
+
+                    const options = [];
+                    for (const { l3Level, dipoleLevel } of data) {
+                        const value = `${l3Level}kA/${dipoleLevel}kA`;
+                        options.push({
+                            value,
+
+                        });
+                        this._valueToFilteringParamsMap.set(
+                            value,
+                            {
+                                l3: l3Level,
+                                dipole: dipoleLevel,
+                            },
+                        );
+                    }
+                    this._selectionDropdownModel.setAvailableOptions(RemoteData.success(options));
+                },
+                (errors) => this._selectionDropdownModel.setAvailableOptions(RemoteData.failure(errors)),
+            );
+    }
+
+    // eslint-disable-next-line valid-jsdoc
+    /**
+     * @inheritDoc
+     */
+    reset() {
+        this._selectionDropdownModel.reset();
+    }
+
+    // eslint-disable-next-line valid-jsdoc
+    /**
+     * @inheritDoc
+     */
+    get isEmpty() {
+        return this._selectionDropdownModel.isEmpty;
+    }
+
+    // eslint-disable-next-line valid-jsdoc
+    /**
+     * @inheritDoc
+     */
+    get normalized() {
+        return this._valueToFilteringParamsMap.get(this._selectionDropdownModel.selected[0]) ?? null;
+    }
+
+    /**
+     * Return the underlying selection dropdown model
+     *
+     * @return {SelectionDropdownModel} the dropdown model
+     */
+    get selectionDropdownModel() {
+        return this._selectionDropdownModel;
+    }
+}

lib/public/components/Filters/RunsFilter/RunDefinitionFilterModel.js

@@ -0,0 +1,49 @@
+import { RUN_DEFINITIONS, RunDefinition } from '../../../domain/enums/RunDefinition.js';
+import { SelectionFilterModel } from '../common/filters/SelectionFilterModel.js';
+
+/**
+ * Run definition filter model
+ */
+export class RunDefinitionFilterModel extends SelectionFilterModel {
+    /**
+     * Constructor
+     */
+    constructor() {
+        super({ availableOptions: RUN_DEFINITIONS.map((definition) => ({ value: definition })) });
+    }
+
+    /**
+     * Returns true if the current filter is physics only
+     *
+     * @return {boolean} true if filter is physics only
+     */
+    isPhysicsOnly() {
+        const selectedOptions = this._selectionModel.selected;
+        return selectedOptions.length === 1 && selectedOptions[0] === RunDefinition.Physics;
+    }
+
+    /**
+     * Sets the current filter to physics only
+     *
+     * @return {void}
+     */
+    setPhysicsOnly() {
+        if (!this.isPhysicsOnly()) {
+            this._selectionModel.selectedOptions = [];
+            this._selectionModel.select(RunDefinition.Physics);
+            this.notify();
+        }
+    }
+
+    /**
+     * Empty the current filter
+     *
+     * @return {void}
+     */
+    setEmpty() {
+        if (!this.isEmpty) {
+            this.reset();
+            this.notify();
+        }
+    }
+}

lib/public/components/Filters/RunsFilter/durationFilter.js

@@ -11,26 +11,16 @@
  * or submit itself to any jurisdiction.
  */
 
-import { amountFilter } from '../common/filters/amountFilter.js';
+import { numericalComparisonFilter } from '../common/filters/numericalComparisonFilter.js';
 
 /**
- * Returns the run duration filter component
+ * Component to filter on a duration
  *
- * @param {RunsOverviewModel} runModel the runs model object
+ * @param {NumericalComparisonFilterModel} numericalComparisonFilterModel the filter model
  *
  * @return {vnode} the duration filter
  */
-export const durationFilter = (runModel) => amountFilter(
-    runModel.runDurationFilter,
-    (filter) => {
-        runModel.runDurationFilter = filter;
-    },
-    {
-        operatorAttributes: {
-            id: 'duration-operator',
-        },
-        limitAttributes: {
-            id: 'duration-limit',
-        },
-    },
+export const durationFilter = (numericalComparisonFilterModel) => numericalComparisonFilter(
+    numericalComparisonFilterModel,
+    { selectorPrefix: 'duration' },
 );

lib/public/components/Filters/RunsFilter/environmentIdsFilter.js

@@ -0,0 +1,34 @@
+/**
+ * @license
+ * Copyright CERN and copyright holders of ALICE O2. This software is
+ * distributed under the terms of the GNU General Public License v3 (GPL
+ * Version 3), copied verbatim in the file "COPYING".
+ *
+ * See http://alice-o2.web.cern.ch/license for full licensing information.
+ *
+ * In applying this license CERN does not waive the privileges and immunities
+ * granted to it by virtue of its status as an Intergovernmental Organization
+ * or submit itself to any jurisdiction.
+ */
+
+import { h } from '/js/src/index.js';
+
+/**
+ * Returns a filter component to filter on environment ids (comma separated list)
+ *
+ * @param {RawTextFilterModel} filterModel the filter model
+ * @return {Component} the environment ids filter
+ */
+export const environmentIdsFilter = (filterModel) => h(
+    'input.w-75.mt1',
+    {
+        type: 'text',
+        id: 'environment-ids-filter',
+        value: filterModel.value,
+        placeholder: 'e.g. Dxi029djX, TDI59So3d...',
+        onchange: (e) => {
+            filterModel.value = e.target.value;
+        },
+    },
+    '',
+);

lib/public/components/Filters/RunsFilter/fillNumbers.js → lib/public/components/Filters/RunsFilter/fillNumbersFilter.js

@@ -16,16 +16,19 @@
 /**
  * Returns a filter component to filter on a list of fill numbers
  *
- * @param {RunsOverviewModel} runModel the run model object
- *
- * @return {vnode} A text box that allows the user to enter a list of fill numbers
+ * @param {RawTextFilterModel} fillNumbersFilterModel the filter model
+ * @return {Component} the fill number filter component
  */
-const fillNumbers = (runModel) => h('input.w-75.mt1', {
-    type: 'text',
-    id: 'fillNumbers',
-    value: runModel.getFillNumbersFilter(),
-    placeholder: 'e.g. 7966, 7954, 7948...',
-    oninput: (e) => runModel.setFillNumbersFilter(e.target.value),
-}, '');
-
-export default fillNumbers;
+export const fillNumbersFilter = (fillNumbersFilterModel) => h(
+    'input.w-75.mt1',
+    {
+        type: 'text',
+        id: 'fillNumbers',
+        value: fillNumbersFilterModel.value,
+        placeholder: 'e.g. 7966, 7954, 7948...',
+        oninput: (e) => {
+            fillNumbersFilterModel.value = e.target.value;
+        },
+    },
+    '',
+);