@evoke-platform/ui-components 1.0.0-dev.249 → 1.0.0-dev.251

package/dist/published/components/custom/CriteriaBuilder/CriteriaBuilder.js

@@ -328,8 +328,26 @@ const CriteriaBuilder = (props) => {
     const handleQueryChange = (q) => {
         setQuery(q);
         const newCriteria = JSON.parse(formatQuery(q, 'mongodb'));
+        //Filters out the empty rules
+        const filterEmptyRules = (newCriteria) => {
+            let updatedCriteria;
+            Object.keys(newCriteria).forEach((key) => {
+                updatedCriteria = newCriteria[key];
+                if (key === '$and' || key === '$or') {
+                    if (Array.isArray(updatedCriteria)) {
+                        newCriteria[key] = updatedCriteria.filter((query) => !isEmpty(difference(query, { $and: [{ $expr: true }] })));
+                    }
+                }
+                //If it is an object filter there may be a nested rule
+                if (typeof updatedCriteria === 'object') {
+                    filterEmptyRules(updatedCriteria);
+                }
+            });
+            return newCriteria;
+        };
+        const filteredCriteria = filterEmptyRules(newCriteria);
         //when q has no rules, it formats and parses to { $and: [{ $expr: true }] }
-        const allRulesDeleted = isEmpty(difference(newCriteria, { $and: [{ $expr: true }] }));
+        const allRulesDeleted = isEmpty(difference(filteredCriteria, { $and: [{ $expr: true }] }));
         // since the Add Condition / Add Group buttons add rules with all the fields empty,
         // we need to check if the first rule was added because q will still parse to { $and: [{ $expr: true }] }
         const firstRuleAdded = isEmpty(criteria) && q.rules.length > 0;

package/dist/published/components/custom/CriteriaBuilder/utils.js

@@ -182,14 +182,14 @@ export function parseMongoDB(mongoQuery) {
         }
         else if (typeof value.$regex === 'string') {
             let operator = 'contains';
-            const regexValue = value.$regex;
+            let regexValue = value.$regex;
             if (regexValue.startsWith('^')) {
                 operator = 'beginsWith';
-                regexValue.slice(1);
+                regexValue = regexValue.slice(1);
             }
             else if (regexValue.endsWith('$')) {
                 operator = 'endsWith';
-                regexValue.slice(0, -1);
+                regexValue = regexValue.slice(0, -1);
             }
             return {
                 field: key,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@evoke-platform/ui-components",
-    "version": "1.0.0-dev.249",
+    "version": "1.0.0-dev.251",
     "description": "",
     "main": "dist/published/index.js",
     "module": "dist/published/index.js",