make MagnetsfilteringModel extend RemoteDataSelectionDropdown

Author: NarrowsProjects

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

@@ -11,86 +11,57 @@
  * or submit itself to any jurisdiction.
  */
 
-import { FilterModel } from '../common/FilterModel.js';
 import { ObservableBasedSelectionDropdownModel } from '../../detector/ObservableBasedSelectionDropdownModel.js';
 
 /**
  * Return the option value corresponding to a given magnets current level
  *
  * @param {MagnetsCurrentLevels} currentLevels the current levels
- * @return {string} the option's value
+ * @return {object<value: string>} the option's value
  */
-const magnetsCurrentLevelsToOptionValue = ({ l3, dipole }) => `${l3}kA/${dipole}kA`;
+const magnetsCurrentLevelsToKey = ({ l3, dipole }) => ({ value: `${l3}kA/${dipole}kA` });
+
+/**
+ * Return the magnets current lever based on a key string
+ *
+ * @param {object} option string containing the current levels
+ * @param {string} option.value string containing the current levels
+ * @return {MagnetsCurrentLevels}
+ */
+const keyToMagnetsCurrentLevels = (value) => {
+    const [l3, dipole] = value.split('/').map((str) => parseFloat(str.slice(0, -2)));
+    return { l3, dipole };
+};
 
 /**
  * AliceL3AndDipoleFilteringModel
  */
-export class MagnetsFilteringModel extends FilterModel {
+export class MagnetsFilteringModel extends ObservableBasedSelectionDropdownModel {
     /**
      * Constructor
      *
      * @param {ObservableData<RemoteData<MagnetsCurrentLevels[], ApiError>>} magnetsCurrentLevels$ observable remote data of magnets current
      * levels
      */
     constructor(magnetsCurrentLevels$) {
-        super();
-        this._selectionDropdownModel = new ObservableBasedSelectionDropdownModel(
-            magnetsCurrentLevels$,
-            (magnetsCurrentLevels) => ({ value: magnetsCurrentLevelsToOptionValue(magnetsCurrentLevels) }),
-            { multiple: false },
-        );
-        this._addSubmodel(this._selectionDropdownModel);
-
-        this._valueToFilteringParamsMap = new Map();
-        magnetsCurrentLevels$.observe(() => {
-            magnetsCurrentLevels$.getCurrent().match({
-
-                /**
-                 * Fill map indexing current level by their corresponding value
-                 *
-                 * @param {MagnetsCurrentLevels[]} currentLevels the current levels to map
-                 * @return {void}
-                 */
-                Success: (currentLevels) => {
-                    this._valueToFilteringParamsMap = new Map(currentLevels.map(({ l3, dipole }) => [
-                        magnetsCurrentLevelsToOptionValue({ l3, dipole }),
-                        { l3, dipole },
-                    ]));
-                },
-                Other: () => {
-                    this._valueToFilteringParamsMap = new Map();
-                },
-            });
-        });
-    }
-
-    /**
-     * @inheritDoc
-     */
-    reset() {
-        this._selectionDropdownModel.reset();
-    }
-
-    /**
-     * @inheritDoc
-     */
-    get isEmpty() {
-        return this._selectionDropdownModel.isEmpty;
+        super(magnetsCurrentLevels$, magnetsCurrentLevelsToKey, { multiple: false });
     }
 
     /**
      * @inheritDoc
      */
     get normalized() {
-        return this._valueToFilteringParamsMap.get(this._selectionDropdownModel.selected[0]) ?? null;
+        const [selectedOption] = this.selected;
+        return keyToMagnetsCurrentLevels(selectedOption);
     }
 
     /**
-     * Return the underlying selection dropdown model
+     * Sets selected options based on a comma-seperated string.
+     * Accounts for the options being either RemoteData or an array.
      *
-     * @return {SelectionDropdownModel} the dropdown model
+     * @return {string}
      */
-    get selectionDropdownModel() {
-        return this._selectionDropdownModel;
+    set normalized(value) {
+        super.normalized = magnetsCurrentLevelsToKey(value).value;
     }
 }

lib/public/views/Runs/ActiveColumns/runsActiveColumns.js

@@ -667,10 +667,8 @@ export const runsActiveColumns = {
          * @param {RunsOverviewModel} runsOverviewModel the runs overview model
          * @return {Component} the run types filter component
          */
-        filter: (runsOverviewModel) => selectionDropdown(
-            runsOverviewModel.filteringModel.get('magnets').selectionDropdownModel,
-            { selectorPrefix: 'l3-dipole-current' },
-        ),
+        filter: (runsOverviewModel) =>
+            selectionDropdown(runsOverviewModel.filteringModel.get('magnets'), { selectorPrefix: 'l3-dipole-current' }),
         profiles: ['runsPerLhcPeriod', 'runsPerDataPass', 'runsPerSimulationPass', profiles.none],
     },