feat: move yearsFilterModel to the filteringModel

Author: GuustMetz

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

@@ -92,8 +92,8 @@ export const lhcPeriodsActiveColumns = {
         visible: true,
         sortable: true,
         format: (_, lhcPeriod) => formatLhcPeriodYear(lhcPeriod.name),
-        filter: ({ yearsFilterModel }) => textFilter(
-            yearsFilterModel,
+        filter: ({ filteringModel }) => textFilter(
+            filteringModel.get('years'),
             { class: 'w-75 mt1', placeholder: 'e.g. 2022, 2023, ...' },
         ),
         classes: 'w-7',

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

@@ -30,6 +30,7 @@ export class LhcPeriodsOverviewModel extends OverviewPageModel {
 
         this._filteringModel = new FilteringModel({
             names: new TextTokensFilterModel(),
+            years: new TextTokensFilterModel(),
         });
 
         this._filteringModel.visualChange$.bubbleTo(this);
@@ -38,8 +39,6 @@ export class LhcPeriodsOverviewModel extends OverviewPageModel {
             this.load();
         });
 
-        this._yearsFilterModel = new TextTokensFilterModel();
-        this._registerFilter(this._yearsFilterModel);
         this._pdpBeamTypesFilterModel = new TextTokensFilterModel();
         this._registerFilter(this._pdpBeamTypesFilterModel);
     }
@@ -49,7 +48,6 @@ export class LhcPeriodsOverviewModel extends OverviewPageModel {
      */
     getRootEndpoint() {
         const filter = this._filteringModel.normalized;
-        filter.years = this._yearsFilterModel.normalized;
         filter.pdpBeamTypes = this._pdpBeamTypesFilterModel.normalized;
 
         return buildUrl('/api/lhcPeriodsStatistics', { filter });
@@ -80,14 +78,6 @@ export class LhcPeriodsOverviewModel extends OverviewPageModel {
         });
     }
 
-    /**
-     * Returns lhc periods years filter model
-     * @return {TextTokensFilterModel} lhc periods years filter model
-     */
-    get yearsFilterModel() {
-        return this._yearsFilterModel;
-    }
-
     /**
      * Returns lhc periods beam type filter model
      * @return {TextTokensFilterModel} lhc periods beam type filter model
@@ -104,7 +94,6 @@ export class LhcPeriodsOverviewModel extends OverviewPageModel {
     reset() {
         super.reset();
         this._filteringModel.reset();
-        this._yearsFilterModel.reset();
         this._pdpBeamTypesFilterModel.reset();
     }
 
@@ -127,6 +116,6 @@ export class LhcPeriodsOverviewModel extends OverviewPageModel {
      * @return {boolean} true if any filter is active
      */
     isAnyFilterActive() {
-        return this._filteringModel.isAnyFilterActive() || !this._yearsFilterModel.isEmpty || !this._pdpBeamTypesFilterModel.isEmpty;
+        return this._filteringModel.isAnyFilterActive() || !this._pdpBeamTypesFilterModel.isEmpty;
     }
 }