Make filterInputModel extend filterModel

Author: Guust

lib/public/components/Filters/common/filters/FilterInputModel.js

@@ -10,48 +10,43 @@
  * granted to it by virtue of its status as an Intergovernmental Organization
  * or submit itself to any jurisdiction.
  */
-import { Observable } from '/js/src/index.js';
+import { FilterModel } from '../FilterModel';
 
 /**
  * Model for a generic filter input
  */
-export class FilterInputModel extends Observable {
+export class FilterInputModel extends FilterModel {
     /**
      * Constructor
+     *
+     * @param {callback} parse function called to parse a value from a raw value
      */
-    constructor() {
+    constructor(parse) {
         super();
 
+        this.parse = parse;
         this._value = null;
         this._raw = '';
-
-        this._visualChange$ = new Observable();
     }
 
     /**
      * Define the current value of the filter
      *
      * @param {string} raw the raw value of the filter
+     * @override
      * @return {void}
      */
     update(raw) {
-        const previousValues = this.value;
-
-        this._value = this.valueFromRaw(raw);
-        this._raw = raw;
+        const value = this._parse(raw);
 
-        if (this.areValuesEquals(this.value, previousValues)) {
-            // Only raw value changed
-            this._visualChange$.notify();
-        } else {
+        if (!this.areValuesEquals(this._value, value)) {
+            this._value = value;
             this.notify();
         }
     }
 
     /**
-     * Reset the filter to its default value
-     *
-     * @return {void}
+     * @inheritdoc
      */
     reset() {
         this._value = null;
@@ -86,23 +81,10 @@ export class FilterInputModel extends Observable {
     }
 
     /**
-     * Returns the observable notified any time there is a visual change which has no impact on the actual filter value
-     *
-     * @return {Observable} the observable
-     */
-    get visualChange$() {
-        return this._visualChange$;
-    }
-
-    /**
-     * Returns the processed value from raw input
-     *
-     * @param {string} raw the raw input value
-     * @return {*} the processed value
-     * @protected
+     * @inheritdoc
      */
-    valueFromRaw(raw) {
-        return raw.trim();
+    get normalized() {
+        return this.value;
     }
 
     /**