feat: change all filters that have only ObservableBasedSelectionDropdownModel as submodels to extend it instead

Author: NarrowsProjects

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

@@ -12,50 +12,17 @@
  */
 
 import { ObservableBasedSelectionDropdownModel } from '../../detector/ObservableBasedSelectionDropdownModel.js';
-import { FilterModel } from '../common/FilterModel.js';
 
 /**
  * Beam mode filter model
  */
-export class BeamModeFilterModel extends FilterModel {
+export class BeamModeFilterModel extends ObservableBasedSelectionDropdownModel {
     /**
      * Constructor
      *
      * @param {ObservableData<RemoteData<{name: string}, ApiError>>} beamModes$ observable remote data of objects representing beam modes
      */
     constructor(beamModes$) {
-        super();
-        this._selectionDropdownModel = new ObservableBasedSelectionDropdownModel(beamModes$, ({ name }) => ({ value: name }));
-        this._addSubmodel(this._selectionDropdownModel);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    reset() {
-        this._selectionDropdownModel.reset();
-    }
-
-    /**
-     * @inheritDoc
-     */
-    get isEmpty() {
-        return this._selectionDropdownModel.isEmpty;
-    }
-
-    /**
-     * Return the underlying dropdown model
-     *
-     * @return {ObservableDropDownModel} the underlying dropdown model
-     */
-    get selectionDropdownModel() {
-        return this._selectionDropdownModel;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    get normalized() {
-        return this._selectionDropdownModel.selected;
+        super(beamModes$, ({ name }) => ({ value: name }));
     }
 }

lib/public/components/runTypes/RunTypesFilterModel.js

@@ -12,51 +12,18 @@
  */
 
 import { runTypeToOption } from './runTypeToOption.js';
-import { FilterModel } from '../Filters/common/FilterModel.js';
 import { ObservableBasedSelectionDropdownModel } from '../detector/ObservableBasedSelectionDropdownModel.js';
 
 /**
  * Model storing state of a selection of run types picked from the list of all the existing run types
  */
-export class RunTypesFilterModel extends FilterModel {
+export class RunTypesFilterModel extends ObservableBasedSelectionDropdownModel {
     /**
      * Constructor
      *
      * @param {ObservableData<RemoteData<RunType[], ApiError>>} runTypes$ observable remote data of run types list
      */
     constructor(runTypes$) {
-        super();
-        this._selectionDropdownModel = new ObservableBasedSelectionDropdownModel(runTypes$, runTypeToOption);
-        this._addSubmodel(this._selectionDropdownModel);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    reset() {
-        this._selectionDropdownModel.reset();
-    }
-
-    /**
-     * @inheritDoc
-     */
-    get isEmpty() {
-        return this._selectionDropdownModel.isEmpty;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    get normalized() {
-        return this._selectionDropdownModel.selected;
-    }
-
-    /**
-     * Return the underlying selection dropdown model
-     *
-     * @return {SelectionDropdownModel} the selection dropdown model
-     */
-    get selectionDropdownModel() {
-        return this._selectionDropdownModel;
+        super(runTypes$, runTypeToOption);
     }
 }

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

@@ -158,8 +158,7 @@ export const runsActiveColumns = {
          * @param {RunsOverviewModel} runsOverviewModel the runs overview model
          * @return {Component} the beam modes filter component
          */
-        filter: (runsOverviewModel) =>
-            selectionDropdown(runsOverviewModel.filteringModel.get('beamModes').selectionDropdownModel, { selectorPrefix: 'beam-mode' }),
+        filter: (runsOverviewModel) => selectionDropdown(runsOverviewModel.filteringModel.get('beamModes'), { selectorPrefix: 'beam-mode' }),
     },
     fillNumber: {
         name: 'Fill No.',
@@ -407,10 +406,7 @@ export const runsActiveColumns = {
          * @param {RunsOverviewModel} runsOverviewModel the runs overview model
          * @return {Component} the run types filter component
          */
-        filter: (runsOverviewModel) => selectionDropdown(
-            runsOverviewModel.filteringModel.get('runTypes').selectionDropdownModel,
-            { selectorPrefix: 'run-types' },
-        ),
+        filter: (runsOverviewModel) => selectionDropdown(runsOverviewModel.filteringModel.get('runTypes'), { selectorPrefix: 'run-types' }),
     },
     runQuality: {
         name: 'Quality',

test/public/Filters/filtersToUrl.test.js

@@ -228,8 +228,8 @@ module.exports = () => {
             "filter[runDuration][operator]": "=",
             "filter[runDuration][limit]": "90000000",
             "filter[environmentIds]": "Dxi029djX, TDI59So3d",
-            "filter[runTypes][]": "2",
-            "filter[beamModes][]": "NO BEAM",
+            "filter[runTypes]": "2",
+            "filter[beamModes]": "NO BEAM",
             "filter[runQualities]": "bad",
             "filter[nDetectors][operator]": "=",
             "filter[nDetectors][limit]": "1",