feat: move namesFilterModelFilter to fileringmodel

Author: GuustMetz

lib/public/views/QcFlagTypes/ActiveColumns/qcFlagTypesActiveColumns.js

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

lib/public/views/QcFlagTypes/Overview/QcFlagTypesOverviewModel.js

@@ -15,7 +15,7 @@ import { TextTokensFilterModel } from '../../../components/Filters/common/filter
 import { OverviewPageModel } from '../../../models/OverviewModel.js';
 import { SelectionModel } from '../../../components/common/selection/SelectionModel.js';
 import { buildUrl } from '/js/src/index.js';
-import { FilterModel } from '../../../components/Filters/common/FilterModel.js';
+import { FilteringModel } from '../../../components/Filters/common/FilteringModel.js';
 
 /**
  * QcFlagTypesOverviewModel
@@ -27,17 +27,21 @@ export class QcFlagTypesOverviewModel extends OverviewPageModel {
     constructor() {
         super();
 
-        this._filteringModel = new FilterModel({});
+        this._filteringModel = new FilteringModel({
+            names: new TextTokensFilterModel(),
+        });
 
-        this._namesFilterModel = new TextTokensFilterModel();
-        this._registerFilter(this._namesFilterModel);
         this._methodsFilterModel = new TextTokensFilterModel();
         this._registerFilter(this._methodsFilterModel);
         this._isBadFilterModel =
             new SelectionModel({ availableOptions: [{ label: 'Bad', value: true }, { label: 'Not Bad', value: false }] });
         this._registerFilter(this._isBadFilterModel);
 
-        this._filteringModel.observe(() => this._applyFilters());
+        this._filteringModel.observe(() => {
+            this._pagination.silentlySetCurrentPage(1);
+            this.load();
+        });
+
         this._filteringModel.visualChange$.bubbleTo(this);
     }
 
@@ -48,7 +52,7 @@ export class QcFlagTypesOverviewModel extends OverviewPageModel {
         const params = {};
         if (this.isAnyFilterActive()) {
             params.filter = {
-                names: this._namesFilterModel.normalized,
+                names: this._filteringModel.get("names").normalized,
                 methods: this._methodsFilterModel.normalized,
                 bad: this._isBadFilterModel.selected.length === 2
                     ? undefined
@@ -68,15 +72,6 @@ export class QcFlagTypesOverviewModel extends OverviewPageModel {
         return this._filteringModel;
     }
 
-    /**
-     * Get names filter model
-     *
-     * @return {TextTokensFilterModel} names filter model
-     */
-    get namesFilterModel() {
-        return this._namesFilterModel;
-    }
-
     /**
      * Get methods filter model
      *
@@ -116,7 +111,7 @@ export class QcFlagTypesOverviewModel extends OverviewPageModel {
      * @return {boolean} true if any filter is active
      */
     isAnyFilterActive() {
-        return !this._namesFilterModel.isEmpty || !this._methodsFilterModel.isEmpty || this._isBadFilterModel.selected.length;
+        return this._filteringModel.isAnyFilterActive() || !this._methodsFilterModel.isEmpty || this._isBadFilterModel.selected.length;
     }
 
     /**
@@ -126,7 +121,7 @@ export class QcFlagTypesOverviewModel extends OverviewPageModel {
      */
     reset() {
         this._methodsFilterModel.reset();
-        this._namesFilterModel.reset();
+        this._filteringModel.reset();
         this._isBadFilterModel.reset();
         super.reset();
     }