feat: move namesFilterModel to the filteringModel

Author: GuustMetz

lib/public/views/lhcPeriods/ActiveColumns/lhcPeriodsActiveColumns.js

@@ -30,8 +30,8 @@ export const lhcPeriodsActiveColumns = {
         name: 'Name',
         visible: true,
         sortable: true,
-        filter: ({ namesFilterModel }) => textFilter(
-            namesFilterModel,
+        filter: ({ filteringModel }) => textFilter(
+            filteringModel.get('names'),
             { class: 'w-75 mt1', placeholder: 'e.g. LHC22a, lhc23b, ...' },
         ),
         classes: 'w-15',

lib/public/views/lhcPeriods/Overview/LhcPeriodsOverviewModel.js

@@ -11,6 +11,7 @@
  * or submit itself to any jurisdiction.
  */
 
+import { FilteringModel } from '../../../components/Filters/common/FilteringModel.js';
 import { TextTokensFilterModel } from '../../../components/Filters/common/filters/TextTokensFilterModel.js';
 import { OverviewPageModel } from '../../../models/OverviewModel.js';
 import { buildUrl } from '/js/src/index.js';
@@ -27,16 +28,16 @@ export class LhcPeriodsOverviewModel 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._yearsFilterModel = new TextTokensFilterModel();
         this._registerFilter(this._yearsFilterModel);
         this._pdpBeamTypesFilterModel = new TextTokensFilterModel();
@@ -47,15 +48,11 @@ export class LhcPeriodsOverviewModel extends OverviewPageModel {
      * @inheritdoc
      */
     getRootEndpoint() {
-        const params = {
-            filter: {
-                names: this._namesFilterModel.normalized,
-                years: this._yearsFilterModel.normalized,
-                pdpBeamTypes: this._pdpBeamTypesFilterModel.normalized,
-            },
-        };
+        const filter = this._filteringModel.normalized;
+        filter.years = this._yearsFilterModel.normalized;
+        filter.pdpBeamTypes = this._pdpBeamTypesFilterModel.normalized;
 
-        return buildUrl('/api/lhcPeriodsStatistics', params);
+        return buildUrl('/api/lhcPeriodsStatistics', { filter });
     }
 
     /**
@@ -83,14 +80,6 @@ export class LhcPeriodsOverviewModel extends OverviewPageModel {
         });
     }
 
-    /**
-     * Returns lhc periods names filter model
-     * @return {TextTokensFilterModel} lhc periods names filter model
-     */
-    get namesFilterModel() {
-        return this._namesFilterModel;
-    }
-
     /**
      * Returns lhc periods years filter model
      * @return {TextTokensFilterModel} lhc periods years filter model
@@ -114,7 +103,7 @@ export class LhcPeriodsOverviewModel extends OverviewPageModel {
      */
     reset() {
         super.reset();
-        this._namesFilterModel.reset();
+        this._filteringModel.reset();
         this._yearsFilterModel.reset();
         this._pdpBeamTypesFilterModel.reset();
     }
@@ -138,6 +127,6 @@ export class LhcPeriodsOverviewModel extends OverviewPageModel {
      * @return {boolean} true if any filter is active
      */
     isAnyFilterActive() {
-        return !this._namesFilterModel.isEmpty || !this._yearsFilterModel.isEmpty || !this._pdpBeamTypesFilterModel.isEmpty;
+        return this._filteringModel.isAnyFilterActive() || !this._yearsFilterModel.isEmpty || !this._pdpBeamTypesFilterModel.isEmpty;
     }
 }