chore: add namesFilterModel to the filteringModel instance

Author: GuustMetz

lib/public/views/SimulationPasses/ActiveColumns/simulationPassesActiveColumns.js

@@ -31,8 +31,8 @@ export const simulationPassesActiveColumns = {
         name: 'Name',
         visible: true,
         sortable: true,
-        filter: ({ namesFilterModel }) => textFilter(
-            namesFilterModel,
+        filter: ({ filteringModel }) => textFilter(
+            filteringModel.get('names'),
             { class: 'w-75 mt1', placeholder: 'e.g. LHC23k5, ...' },
         ),
         classes: 'w-10 f6',

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

@@ -27,9 +27,14 @@ export class AnchoredSimulationPassesOverviewModel extends OverviewPageModel {
     constructor() {
         super();
 
-        this._filteringModel = new FilteringModel();
-        this._namesFilterModel = new TextTokensFilterModel();
-        this._registerFilter(this._namesFilterModel);
+        this._filteringModel = new FilteringModel({ names: new TextTokensFilterModel() });
+
+        this._filteringModel.observe(() => {
+            this._pagination.silentlySetCurrentPage(1);
+            this.load();
+        });
+
+        this._filteringModel.visualChange$.bubbleTo(this);
 
         this._dataPass = new ObservableData(RemoteData.notAsked());
     }
@@ -60,14 +65,10 @@ export class AnchoredSimulationPassesOverviewModel extends OverviewPageModel {
      * @inheritdoc
      */
     getRootEndpoint() {
-        const params = {
-            filter: {
-                names: this._namesFilterModel.normalized,
-                dataPassIds: [this._dataPassId],
-            },
-        };
+        const filter = this._filteringModel.normalized;
+        filter.dataPassIds = [this._dataPassId];
 
-        return buildUrl('/api/simulationPasses', params);
+        return buildUrl('/api/simulationPasses', { filter });
     }
 
     /**
@@ -76,7 +77,7 @@ export class AnchoredSimulationPassesOverviewModel extends OverviewPageModel {
      * @returns {void}
      */
     reset() {
-        this._namesFilterModel.reset();
+        this._filteringModel.reset();
         super.reset();
     }
 
@@ -104,33 +105,11 @@ export class AnchoredSimulationPassesOverviewModel extends OverviewPageModel {
         return this._dataPass.getCurrent();
     }
 
-    /**
-     * Returns data passes names filter model
-     * @return {TextTokensFilterModel} data 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();
     }
 }