feat: move pdpBeamTypes to the filteringModel

Author: GuustMetz

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

@@ -104,8 +104,8 @@ export const lhcPeriodsActiveColumns = {
         visible: true,
         sortable: true,
         format: (pdpBeamTypes) => pdpBeamTypes.length > 0 ? pdpBeamTypes.join(',') : '-',
-        filter: ({ pdpBeamTypesFilterModel }) => textFilter(
-            pdpBeamTypesFilterModel,
+        filter: ({ filteringModel }) => textFilter(
+            filteringModel.get('pdpBeamTypes'),
             { class: 'w-75 mt1', placeholder: 'e.g. pp, PbPb' },
         ),
         classes: 'w-7',

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

@@ -31,26 +31,21 @@ export class LhcPeriodsOverviewModel extends OverviewPageModel {
         this._filteringModel = new FilteringModel({
             names: new TextTokensFilterModel(),
             years: new TextTokensFilterModel(),
+            pdpBeamTypes: new TextTokensFilterModel(),
         });
 
         this._filteringModel.visualChange$.bubbleTo(this);
         this._filteringModel.observe(() => {
             this._pagination.silentlySetCurrentPage(1);
             this.load();
         });
-
-        this._pdpBeamTypesFilterModel = new TextTokensFilterModel();
-        this._registerFilter(this._pdpBeamTypesFilterModel);
     }
 
     /**
      * @inheritdoc
      */
     getRootEndpoint() {
-        const filter = this._filteringModel.normalized;
-        filter.pdpBeamTypes = this._pdpBeamTypesFilterModel.normalized;
-
-        return buildUrl('/api/lhcPeriodsStatistics', { filter });
+        return buildUrl('/api/lhcPeriodsStatistics', { filter: this._filteringModel.normalized });
     }
 
     /**
@@ -78,14 +73,6 @@ export class LhcPeriodsOverviewModel extends OverviewPageModel {
         });
     }
 
-    /**
-     * Returns lhc periods beam type filter model
-     * @return {TextTokensFilterModel} lhc periods beam type filter model
-     */
-    get pdpBeamTypesFilterModel() {
-        return this._pdpBeamTypesFilterModel;
-    }
-
     /**
      * Reset this model to its default
      *
@@ -94,28 +81,13 @@ export class LhcPeriodsOverviewModel extends OverviewPageModel {
     reset() {
         super.reset();
         this._filteringModel.reset();
-        this._pdpBeamTypesFilterModel.reset();
-    }
-
-    /**
-     * 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._filteringModel.isAnyFilterActive() || !this._pdpBeamTypesFilterModel.isEmpty;
+        return this._filteringModel.isAnyFilterActive();
     }
 }