chore: add namesFilterModel to the filteringModel instance of SimulationPassesPerLhcPeriodOverviewModel

Author: GuustMetz

lib/public/views/SimulationPasses/AnchoredOverview/AnchoredSimulationPassesOverviewModel.js

@@ -65,9 +65,7 @@ export class AnchoredSimulationPassesOverviewModel extends OverviewPageModel {
      * @inheritdoc
      */
     getRootEndpoint() {
-        const filter = this._filteringModel.normalized;
-        filter.dataPassIds = [this._dataPassId];
-
+        const filter = { ...this._filteringModel.normalized, dataPassIds: [this._dataPassId] };
         return buildUrl('/api/simulationPasses', { filter });
     }
 

lib/public/views/SimulationPasses/PerLhcPeriodOverview/SimulationPassesPerLhcPeriodOverviewModel.js

@@ -27,17 +27,16 @@ export class SimulationPassesPerLhcPeriodOverviewModel extends OverviewPageModel
     constructor() {
         super();
 
-        this._filteringModel = new FilteringModel();
+        this._filteringModel = new FilteringModel({
+            names: new TextTokensFilterModel(),
+        });
 
         this._filteringModel.visualChange$.bubbleTo(this);
         this._filteringModel.observe(() => {
             this._pagination.silentlySetCurrentPage(1);
             this.load();
         });
 
-        this._namesFilterModel = new TextTokensFilterModel();
-        this._registerFilter(this._namesFilterModel);
-
         this._lhcPeriod = new ObservableData(RemoteData.notAsked());
         this._lhcPeriod.bubbleTo(this);
 
@@ -79,14 +78,8 @@ export class SimulationPassesPerLhcPeriodOverviewModel extends OverviewPageModel
      * @inheritdoc
      */
     getRootEndpoint() {
-        const params = {
-            filter: {
-                names: this._namesFilterModel.normalized,
-                lhcPeriodIds: [this._lhcPeriodId],
-            },
-        };
-
-        return buildUrl('/api/simulationPasses', params);
+        const filter = { ...this._filteringModel.normalized, lhcPeriodIds: [this._lhcPeriodId] };
+        return buildUrl('/api/simulationPasses', { filter });
     }
 
     /**
@@ -95,7 +88,7 @@ export class SimulationPassesPerLhcPeriodOverviewModel extends OverviewPageModel
      * @returns {void}
      */
     reset() {
-        this._namesFilterModel.reset();
+        this._filteringModel.reset();
         super.reset();
     }
 
@@ -114,33 +107,11 @@ export class SimulationPassesPerLhcPeriodOverviewModel extends OverviewPageModel
         return this._lhcPeriod.getCurrent();
     }
 
-    /**
-     * Returns simulation passes names filter model
-     * @return {TextTokensFilterModel} simulation passes names filter model
-     */
-    get namesFilterModel() {
-        return this._namesFilterModel;
-    }
-
-    /**
-     * Register a new filter model
-     * @param {FilterModel} filterModel the filter model to register
-     * @return {void}
-     * @private
-     */
-    _registerFilter(filterModel) {
-        filterModel.visualChange$.bubbleTo(this);
-        filterModel.observe(() => {
-            this._pagination.silentlySetCurrentPage(1);
-            this.load();
-        });
-    }
-
     /**
      * States whether any filter is active
      * @return {boolean} true if any filter is active
      */
     isAnyFilterActive() {
-        return !this._namesFilterModel.isEmpty;
+        return this._filteringModel.isAnyFilterActive();
     }
 }