feat: move methodsFilterModelFilter to filteringModel

Author: GuustMetz

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

@@ -43,8 +43,8 @@ export const qcFlagTypesActiveColumns = {
         name: 'Method',
         visible: true,
         sortable: true,
-        filter: ({ methodsFilterModel }) => textFilter(
-            methodsFilterModel,
+        filter: ({ filteringModel }) => textFilter(
+            filteringModel.get('methods'),
             { class: 'w-75 mt1', placeholder: 'e.g. Bad PID, ...' },
         ),
         classes: 'f6',

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

@@ -29,10 +29,9 @@ export class QcFlagTypesOverviewModel extends OverviewPageModel {
 
         this._filteringModel = new FilteringModel({
             names: new TextTokensFilterModel(),
+            methods: new TextTokensFilterModel(),
         });
 
-        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);
@@ -53,7 +52,7 @@ export class QcFlagTypesOverviewModel extends OverviewPageModel {
         if (this.isAnyFilterActive()) {
             params.filter = {
                 names: this._filteringModel.get("names").normalized,
-                methods: this._methodsFilterModel.normalized,
+                methods: this._filteringModel.get("methods").normalized,
                 bad: this._isBadFilterModel.selected.length === 2
                     ? undefined
                     : this._isBadFilterModel.selected[0],
@@ -72,15 +71,6 @@ export class QcFlagTypesOverviewModel extends OverviewPageModel {
         return this._filteringModel;
     }
 
-    /**
-     * Get methods filter model
-     *
-     * @return {TextTokensFilterModel} methods filter model
-     */
-    get methodsFilterModel() {
-        return this._methodsFilterModel;
-    }
-
     /**
      * Returns filter model for filtering bad and not bad flags
      *
@@ -111,7 +101,7 @@ export class QcFlagTypesOverviewModel extends OverviewPageModel {
      * @return {boolean} true if any filter is active
      */
     isAnyFilterActive() {
-        return this._filteringModel.isAnyFilterActive() || !this._methodsFilterModel.isEmpty || this._isBadFilterModel.selected.length;
+        return this._filteringModel.isAnyFilterActive() || this._isBadFilterModel.selected.length;
     }
 
     /**
@@ -120,7 +110,6 @@ export class QcFlagTypesOverviewModel extends OverviewPageModel {
      * @returns {void}
      */
     reset() {
-        this._methodsFilterModel.reset();
         this._filteringModel.reset();
         this._isBadFilterModel.reset();
         super.reset();