feat: move badFilterModel to filteringModel

Author: GuustMetz

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

@@ -54,8 +54,8 @@ export const qcFlagTypesActiveColumns = {
         name: 'Bad',
         visible: true,
         sortable: true,
-        filter: ({ isBadFilterModel }) => checkboxes(
-            isBadFilterModel,
+        filter: ({ filteringModel }) => checkboxes(
+            filteringModel.get('bad'),
             { class: 'w-75 mt1', selector: 'qc-flag-type-bad-filter' },
         ),
         classes: 'f6 w-5',

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

@@ -30,12 +30,9 @@ export class QcFlagTypesOverviewModel extends OverviewPageModel {
         this._filteringModel = new FilteringModel({
             names: new TextTokensFilterModel(),
             methods: new TextTokensFilterModel(),
+            bad: new SelectionModel({ availableOptions: [{ label: 'Bad', value: true }, { label: 'Not Bad', value: false }] })
         });
 
-        this._isBadFilterModel =
-            new SelectionModel({ availableOptions: [{ label: 'Bad', value: true }, { label: 'Not Bad', value: false }] });
-        this._registerFilter(this._isBadFilterModel);
-
         this._filteringModel.observe(() => {
             this._pagination.silentlySetCurrentPage(1);
             this.load();
@@ -53,9 +50,7 @@ export class QcFlagTypesOverviewModel extends OverviewPageModel {
             params.filter = {
                 names: this._filteringModel.get("names").normalized,
                 methods: this._filteringModel.get("methods").normalized,
-                bad: this._isBadFilterModel.selected.length === 2
-                    ? undefined
-                    : this._isBadFilterModel.selected[0],
+                bad: this._filteringModel.get('bad').selected.length === 2 ? undefined : this._filteringModel.get('bad').selected[0],
             };
         }
 
@@ -71,37 +66,14 @@ export class QcFlagTypesOverviewModel extends OverviewPageModel {
         return this._filteringModel;
     }
 
-    /**
-     * Returns filter model for filtering bad and not bad flags
-     *
-     * @return {TextTokensFilterModel} filter model for filtering bad and not bad flags
-     */
-    get isBadFilterModel() {
-        return this._isBadFilterModel;
-    }
-
-    /**
-     * 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._isBadFilterModel.selected.length;
+        return this._filteringModel.isAnyFilterActive();
     }
 
     /**
@@ -111,7 +83,6 @@ export class QcFlagTypesOverviewModel extends OverviewPageModel {
      */
     reset() {
         this._filteringModel.reset();
-        this._isBadFilterModel.reset();
         super.reset();
     }
 }