Merge pull request #100 from jobready/NEP-10395

Do not validate unknown filters
rdytech · Apr 6, 2021 · 402b3ae · 402b3ae
2 parents 7474ec2 + 2c62b7a
commit 402b3ae
Show file tree

Hide file tree

Showing 6 changed files with 1,452 additions and 1,239 deletions.
diff --git a/dist/react-filterbar.js b/dist/react-filterbar.js
@@ -19867,10 +19867,8 @@ var FilterVerificator = /*#__PURE__*/function () {
   }, {
     key: "validateFilter",
     value: function validateFilter(appliedFilter) {
-      return Object.keys(this.configurationFilters).some(function (filterUid) {
-        var confFilter = this.configurationFilters[filterUid];
-        return this.validateFilterProperties(appliedFilter.field, confFilter.field) && this.validateFilterProperties(appliedFilter.type, confFilter.type) && this.validateFilterProperties(appliedFilter.uid, filterUid);
-      }.bind(this));
+      var confFilter = this.configurationFilters[appliedFilter.uid];
+      return !confFilter || this.validateFilterProperties(appliedFilter.field, confFilter.field) && this.validateFilterProperties(appliedFilter.type, confFilter.type);
     }
   }, {
     key: "validateFilterProperties",

diff --git a/dist/react-filterbar.min.js b/dist/react-filterbar.min.js
diff --git a/example/public/js/react-filterbar.js b/example/public/js/react-filterbar.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-filterbar",
-  "version": "1.23",
+  "version": "1.24",
   "description": "",
   "main": "dist/react-filterbar.js",
   "engines": {

diff --git a/src/helpers/FilterVerificator.js b/src/helpers/FilterVerificator.js
@@ -14,15 +14,11 @@ export class FilterVerificator {
   }
 
   validateFilter(appliedFilter) {
-    return Object.keys(this.configurationFilters)
-            .some(function(filterUid) {
-              var confFilter = this.configurationFilters[filterUid];
-              return (
-                this.validateFilterProperties(appliedFilter.field, confFilter.field) &&
-                this.validateFilterProperties(appliedFilter.type, confFilter.type) &&
-                this.validateFilterProperties(appliedFilter.uid, filterUid)
-              );
-            }.bind(this));
+    var confFilter = this.configurationFilters[appliedFilter.uid];
+    return !confFilter || (
+      this.validateFilterProperties(appliedFilter.field, confFilter.field) &&
+      this.validateFilterProperties(appliedFilter.type, confFilter.type)
+    );
   }
 
   validateFilterProperties(appliedFilterProperty, confFilterProperty) {