wip

Author: xsalonx

lib/public/components/Filters/common/FilteringModel.js

@@ -68,7 +68,7 @@ export class FilteringModel extends Observable {
      */
     isAnyFilterActive() {
         for (const model of this._filterModels) {
-            if (!model.isEmpty) {
+            if (model.isEmpty instanceof Boolean && !model.isEmpty || model.isEmpty instanceof Function && !model.isEmpty()) {
                 return true;
             }
         }

lib/public/views/DataPasses/ActiveColumns/dataPassesActiveColumns.js

@@ -35,8 +35,8 @@ export const dataPassesActiveColumns = {
         visible: true,
         sortable: true,
         format: (_, dataPass) => formatDataPassName(dataPass),
-        filter: ({ nameFilterModel }) => textFilter(
-            nameFilterModel,
+        filter: ({ filteringModel }) => textFilter(
+            filteringModel.get('names'),
             { class: 'w-75 mt1', placeholder: 'e.g. LHC22a_apass1, ...' },
         ),
         balloon: true,
@@ -105,7 +105,7 @@ export const dataPassesActiveColumns = {
 
     nonPhysicsProductions: {
         name: 'include nonphysical productions',
-        filter: (runsOverviewModel) => checkboxes(runsOverviewModel.filteringModel.get('runQualities').selectionModel),
+        // filter: (runsOverviewModel) => checkboxes(runsOverviewModel.filteringModel.get('runQualities').selectionModel),
         visible: false,
     }
 };

lib/public/views/DataPasses/PerLhcPeriodOverview/DataPassesPerLhcPeriodOverviewModel.js

@@ -10,6 +10,7 @@
  * granted to it by virtue of its status as an Intergovernmental Organization
  * 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';
@@ -23,8 +24,15 @@ export class DataPassesPerLhcPeriodOverviewModel extends OverviewPageModel {
      */
     constructor() {
         super();
-        this._nameFilterModel = new TextTokensFilterModel();
-        this._registerFilter(this._nameFilterModel);
+        this._filteringModel = new FilteringModel({
+            names: new TextTokensFilterModel(),
+        });
+
+        this._filteringModel.visualChange$.bubbleTo(this);
+        this._filteringModel.observe(() => {
+            this._pagination.silentlySetCurrentPage(1);
+            this.load();
+        });
     }
 
     /**
@@ -42,7 +50,7 @@ export class DataPassesPerLhcPeriodOverviewModel extends OverviewPageModel {
         const params = {
             filter: {
                 lhcPeriodIds: [this._lhcPeriodId],
-                names: this._nameFilterModel.normalized,
+                names: this._filteringModel.get('names').normalized,
             },
         };
 
@@ -55,7 +63,7 @@ export class DataPassesPerLhcPeriodOverviewModel extends OverviewPageModel {
      * @returns {void}
      */
     reset() {
-        this._nameFilterModel.reset();
+        this._filteringModel.reset();
         super.reset();
     }
 
@@ -67,32 +75,19 @@ export class DataPassesPerLhcPeriodOverviewModel extends OverviewPageModel {
     }
 
     /**
-     * Returns data pass name filter model
-     * @return {TextTokensFilterModel} data pass name filter model
-     */
-    get nameFilterModel() {
-        return this._nameFilterModel;
-    }
-
-    /**
-     * Register a new filter model
-     * @param {FilterModel} filterModel the filter model to register
-     * @return {void}
-     * @private
+     * Return the filtering model
+     *
+     * @return {FilteringModel} the filtering model
      */
-    _registerFilter(filterModel) {
-        filterModel.visualChange$.bubbleTo(this);
-        filterModel.observe(() => {
-            this._pagination.silentlySetCurrentPage(1);
-            this.load();
-        });
+    get filteringModel() {
+        return this._filteringModel;
     }
 
     /**
-     * States whether any filter is active
-     * @return {boolean} true if any filter is active
+     * Checks if any filter value has been modified from their default (empty)
+     * @return {Boolean} If any filter is active
      */
     isAnyFilterActive() {
-        return !this._nameFilterModel.isEmpty();
+        return this._filteringModel.isAnyFilterActive();
     }
 }