roll bakc

Author: xsalonx

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

@@ -29,7 +29,8 @@ export class FilteringModel extends Observable {
         this._visualChange$ = new Observable();
 
         this._filters = filters;
-        for (const model of this.filterModels) {
+        this._filterModels = Object.values(filters);
+        for (const model of this._filterModels) {
             model.bubbleTo(this);
             model.visualChange$?.bubbleTo(this._visualChange$);
         }
@@ -42,7 +43,7 @@ export class FilteringModel extends Observable {
      * @return {void}
      */
     reset(notify = false) {
-        for (const model of this.filterModels) {
+        for (const model of this._filterModels) {
             model.reset();
         }
 
@@ -81,22 +82,6 @@ export class FilteringModel extends Observable {
         return false;
     }
 
-    /**
-     * Get all filter models
-     * @return {FilterModel[]} filter models list
-     */
-    get filterModels() {
-        return Object.values(this._filters);
-    }
-
-    /**
-     * Get all filter keys
-     * @return {string[]} filter keys list
-     */
-    get filterKeys() {
-        return Object.keys(this._filters);
-    }
-
     /**
      * Returns the observable notified any time there is a visual change which has no impact on the actual filtering
      *
@@ -134,6 +119,7 @@ export class FilteringModel extends Observable {
         }
 
         this._filters[key] = filter;
+        this._filterModels.push(filter);
         filter.bubbleTo(this);
         filter.visualChange$?.bubbleTo(this._visualChange$);
     }