rename inputfilter to ParsedInputFilter

Author: Guust

…lters/common/filters/FilterInputModel.js …common/filters/ParsedInputFilterModel.jslib/public/components/Filters/common/filters/FilterInputModel.js renamed to lib/public/components/Filters/common/filters/ParsedInputFilterModel.js lib/public/components/Filters/common/filters/FilterInputModel.js renamed to lib/public/components/Filters/common/filters/ParsedInputFilterModel.js

@@ -10,12 +10,13 @@
  * granted to it by virtue of its status as an Intergovernmental Organization
  * or submit itself to any jurisdiction.
  */
-import { FilterModel } from '../FilterModel';
+
+import { FilterModel } from '../FilterModel.js';
 
 /**
- * Model for a generic filter input
+ * Model that parses raw intput into a value
  */
-export class FilterInputModel extends FilterModel {
+export class ParsedInputFilterModel extends FilterModel {
     /**
      * Constructor
      *
@@ -24,9 +25,8 @@ export class FilterInputModel extends FilterModel {
     constructor(parse) {
         super();
 
-        this.parse = parse;
+        this._parse = parse;
         this._value = null;
-        this._raw = '';
     }
 
     /**
@@ -37,6 +37,7 @@ export class FilterInputModel extends FilterModel {
      * @return {void}
      */
     update(raw) {
+        this._raw = raw;
         const value = this._parse(raw);
 
         if (!this.areValuesEquals(this._value, value)) {

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

@@ -16,7 +16,7 @@ import { h } from '/js/src/index.js';
 /**
  * Returns a text filter component
  *
- * @param {FilterInputModel|TextTokensFilterModel} filterInputModel the model of the text filter
+ * @param {ParsedInputFilterModel|TextTokensFilterModel} filterInputModel the model of the text filter
  * @param {Object} attributes the additional attributes to pass to the component, such as id and classes
  * @return {Component} the filter component
  */

lib/public/views/Logs/Overview/LogsOverviewModel.js

@@ -15,7 +15,7 @@ import { buildUrl, Observable, RemoteData } from '/js/src/index.js';
 import { TagFilterModel } from '../../../components/Filters/common/TagFilterModel.js';
 import { SortModel } from '../../../components/common/table/SortModel.js';
 import { debounce } from '../../../utilities/debounce.js';
-import { FilterInputModel } from '../../../components/Filters/common/filters/FilterInputModel.js';
+import { ParsedInputFilterModel } from '../../../components/Filters/common/filters/ParsedInputFilterModel.js';
 import { AuthorFilterModel } from '../../../components/Filters/LogsFilter/author/AuthorFilterModel.js';
 import { PaginationModel } from '../../../components/Pagination/PaginationModel.js';
 import { getRemoteDataSlice } from '../../../utilities/fetch/getRemoteDataSlice.js';
@@ -39,8 +39,8 @@ export class LogsOverviewModel extends Observable {
 
         this._filteringModel = new FilteringModel({
             authorFilter: new AuthorFilterModel(),
-            titleFilter: new FilterInputModel(),
-            contentFilter: new FilterInputModel(),
+            titleFilter: new ParsedInputFilterModel((raw) => raw.trim()),
+            contentFilter: new ParsedInputFilterModel((raw) => raw.trim()),
         });
 
         // Sub-models