@evoke-platform/ui-components 1.0.0-dev.250 → 1.0.0-dev.252

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/types.d.ts

@@ -35,11 +35,12 @@ export type TreeViewObject = {
     name: string;
     properties: TreeViewProperty[];
 };
-export type MongoDBQueryValue = null | string | {
+export type MongoDBQueryValue = null | string | boolean | {
     $not?: {
         $regex?: string;
     };
     $regex?: string;
+    $expr?: boolean;
     $eq?: unknown;
     $ne?: unknown;
     $lt?: unknown;

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

@@ -159,14 +159,20 @@ export function parseMongoDB(mongoQuery) {
      * @returns {RuleType | undefined} - A RuleType if the value is valid, otherwise undefined.
      */
     const parseRule = (key, value) => {
-        if (value === null) {
+        if (key === '$expr') {
+            return undefined;
+        }
+        else if (value === null) {
             return {
                 field: key,
                 operator: 'null',
                 value: null,
             };
         }
-        else if (typeof value === 'string' || typeof value === 'number' || '$eq' in value) {
+        else if (typeof value === 'string' ||
+            typeof value === 'number' ||
+            typeof value === 'boolean' ||
+            '$eq' in value) {
             return {
                 field: key,
                 operator: '=',
@@ -260,13 +266,13 @@ export function parseMongoDB(mongoQuery) {
         if ('$and' in query && isArray(query.$and)) {
             return {
                 combinator: 'and',
-                rules: query.$and.map(parseGroup),
+                rules: query.$and.map(parseGroup).filter((rule) => rule !== undefined),
             };
         }
         else if ('$or' in query && isArray(query.$or)) {
             return {
                 combinator: 'or',
-                rules: query.$or.map(parseGroup),
+                rules: query.$or.map(parseGroup).filter((rule) => rule !== undefined),
             };
         }
         else if (isEmpty(query)) {

package/package.json

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