chore: remove all mentions of selectionFilterModel and replace it with SelectionModel

Author: NarrowsProjects

lib/public/components/Filters/LhcFillsFilter/BeamTypeFilterModel.js

@@ -12,12 +12,12 @@
  */
 
 import { beamTypesProvider } from '../../../services/beamTypes/beamTypesProvider.js';
-import { SelectionFilterModel } from '../common/filters/SelectionFilterModel.js';
+import { SelectionModel } from '../../common/selection/SelectionModel.js';
 
 /**
  * Beam type filter model
  */
-export class BeamTypeFilterModel extends SelectionFilterModel {
+export class BeamTypeFilterModel extends SelectionModel {
     /**
      * Constructor
      */
@@ -28,7 +28,7 @@ export class BeamTypeFilterModel extends SelectionFilterModel {
             beamTypesProvider.items$.getCurrent().apply({
                 Success: (types) => {
                     const beamTypes = types.map((type) => ({ value: type.beam_type }));
-                    this._selectionModel.setAvailableOptions(beamTypes);
+                    this.setAvailableOptions(beamTypes);
                 },
             });
         });

lib/public/components/Filters/LhcFillsFilter/beamTypeFilter.js

@@ -19,8 +19,4 @@ import { checkboxes } from '../common/filters/checkboxFilter.js';
  * @param {BeamTypeFilterModel} beamTypeFilterModel beamTypeFilterModel
  * @return {Component} the filter
  */
-export const beamTypeFilter = (beamTypeFilterModel) =>
-    checkboxes(
-        beamTypeFilterModel.selectionModel,
-        { selector: 'beam-types' },
-    );
+export const beamTypeFilter = (beamTypeFilterModel) => checkboxes(beamTypeFilterModel, { selector: 'beam-types' });

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

@@ -1,10 +1,10 @@
 import { RUN_DEFINITIONS, RunDefinition } from '../../../domain/enums/RunDefinition.js';
-import { SelectionFilterModel } from '../common/filters/SelectionFilterModel.js';
+import { SelectionModel } from '../../common/selection/SelectionModel.js';
 
 /**
  * Run definition filter model
  */
-export class RunDefinitionFilterModel extends SelectionFilterModel {
+export class RunDefinitionFilterModel extends SelectionModel {
     /**
      * Constructor
      */
@@ -18,7 +18,7 @@ export class RunDefinitionFilterModel extends SelectionFilterModel {
      * @return {boolean} true if filter is physics only
      */
     isPhysicsOnly() {
-        const selectedOptions = this._selectionModel.selected;
+        const selectedOptions = this.selected;
         return selectedOptions.length === 1 && selectedOptions[0] === RunDefinition.Physics;
     }
 
@@ -29,8 +29,8 @@ export class RunDefinitionFilterModel extends SelectionFilterModel {
      */
     setPhysicsOnly() {
         if (!this.isPhysicsOnly()) {
-            this._selectionModel.selectedOptions = [];
-            this._selectionModel.select(RunDefinition.Physics);
+            this.selectedOptions = [];
+            this.select(RunDefinition.Physics);
             this.notify();
         }
     }

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

@@ -19,7 +19,4 @@ import { checkboxes } from '../common/filters/checkboxFilter.js';
  * @param {RunDefinitionFilterModel} runDefinitionFilterModel run definition filter model
  * @return {Component} the filter
  */
-export const runDefinitionFilter = (runDefinitionFilterModel) => checkboxes(
-    runDefinitionFilterModel.selectionModel,
-    { selector: 'run-definition' },
-);
+export const runDefinitionFilter = (runDefinitionFilterModel) => checkboxes(runDefinitionFilterModel, { selector: 'run-definition' });

lib/public/components/Filters/common/filters/SelectionFilterModel.js

@@ -102,7 +102,7 @@ export const dataPassesActiveColumns = {
 
     nonPhysicsProductions: {
         name: 'Include nonphysics productions',
-        filter: (filteringModel) => checkboxes(filteringModel.get('include[byName]').selectionModel),
+        filter: (filteringModel) => checkboxes(filteringModel.get('include[byName]')),
         visible: false,
     },
 };

lib/public/views/DataPasses/ActiveColumns/dataPassesActiveColumns.js

@@ -10,8 +10,8 @@
  * granted to it by virtue of its status as an Intergovernmental Organization
  * or submit itself to any jurisdiction.
  */
+import { SelectionModel } from '../../components/common/selection/SelectionModel.js';
 import { FilteringModel } from '../../components/Filters/common/FilteringModel.js';
-import { SelectionFilterModel } from '../../components/Filters/common/filters/SelectionFilterModel.js';
 import { TextTokensFilterModel } from '../../components/Filters/common/filters/TextTokensFilterModel.js';
 import { NON_PHYSICS_PRODUCTIONS_NAMES_WORDS } from '../../domain/enums/NonPhysicsProductionsNamesWords.js';
 import { OverviewPageModel } from '../../models/OverviewModel.js';
@@ -31,7 +31,7 @@ export class DataPassesOverviewModel extends OverviewPageModel {
             router,
             {
                 names: new TextTokensFilterModel(),
-                'include[byName]': new SelectionFilterModel({
+                'include[byName]': new SelectionModel({
                     availableOptions: NON_PHYSICS_PRODUCTIONS_NAMES_WORDS.map((word) => ({ label: word.toUpperCase(), value: word })),
                 }),
             },

lib/public/views/DataPasses/DataPassesOverviewModel.js

@@ -117,7 +117,7 @@ export const environmentsActiveColumns = {
          * @param {EnvironmentOverviewModel} environmentOverviewModel the environment overview model
          * @return {Component} the filter component
          */
-        filter: (environmentOverviewModel) => checkboxes(environmentOverviewModel.filteringModel.get('currentStatus').selectionModel),
+        filter: (environmentOverviewModel) => checkboxes(environmentOverviewModel.filteringModel.get('currentStatus')),
     },
     historyItems: {
         name: h('.flex-row.g2.items-center', ['Status History', infoTooltip(environmentStatusHistoryLegendComponent())]),

lib/public/views/Environments/ActiveColumns/environmentsActiveColumns.js

@@ -15,11 +15,11 @@ import { buildUrl } from '/js/src/index.js';
 import { FilteringModel } from '../../../components/Filters/common/FilteringModel.js';
 import { OverviewPageModel } from '../../../models/OverviewModel.js';
 import { TimeRangeInputModel } from '../../../components/Filters/common/filters/TimeRangeInputModel.js';
-import { SelectionFilterModel } from '../../../components/Filters/common/filters/SelectionFilterModel.js';
 import { RawTextFilterModel } from '../../../components/Filters/common/filters/RawTextFilterModel.js';
 import { debounce } from '../../../utilities/debounce.js';
 import { coloredEnvironmentStatusComponent } from '../ColoredEnvironmentStatusComponent.js';
 import { StatusAcronym } from '../../../domain/enums/statusAcronym.mjs';
+import { SelectionModel } from '../../../components/common/selection/SelectionModel.js';
 
 /**
  * Environment overview page model
@@ -39,7 +39,7 @@ export class EnvironmentOverviewModel extends OverviewPageModel {
                 created: new TimeRangeInputModel(),
                 runNumbers: new RawTextFilterModel(),
                 statusHistory: new RawTextFilterModel(),
-                currentStatus: new SelectionFilterModel({
+                currentStatus: new SelectionModel({
                     availableOptions: Object.keys(StatusAcronym).map((status) => ({
                         value: status,
                         label: coloredEnvironmentStatusComponent(status),

lib/public/views/Environments/Overview/EnvironmentOverviewModel.js

@@ -441,7 +441,7 @@ export const runsActiveColumns = {
          * @param {RunsOverviewModel} runsOverviewModel the runs overview model
          * @return {Component} the run quality filter component
          */
-        filter: (runsOverviewModel) => checkboxes(runsOverviewModel.filteringModel.get('runQualities').selectionModel),
+        filter: (runsOverviewModel) => checkboxes(runsOverviewModel.filteringModel.get('runQualities')),
     },
     nDetectors: {
         name: 'DETs #',