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

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

@@ -173,6 +173,9 @@ const customSelector = (props) => {
             else if (inputType === 'string' && isArray(props.fieldData?.values)) {
                 opts = options.filter((option) => ['in', 'notIn', '=', '!=', 'notNull', 'null'].includes(option.name));
             }
+            else if (inputType === 'string') {
+                opts = options.filter((option) => !['>', '<', '<=', '>='].includes(option.name));
+            }
             break;
         case 'Fields':
             placeholder = 'Select Property';
@@ -328,26 +331,8 @@ 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(filteredCriteria, { $and: [{ $expr: true }] }));
+        const allRulesDeleted = isEmpty(difference(newCriteria, { $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/stories/CriteriaBuilder.stories.js

@@ -196,6 +196,17 @@ CriteriaBuilder.args = {
             {
                 name: { $in: ['Jane', 'John', 'Jack'] },
             },
+            {
+                //TODO: the fix in CDR-2082 should allow for a preexisting configuration like below to show greater than on the UI
+                licenseeName: {
+                    $gt: 'k',
+                },
+            },
+            {
+                amountOfInspections: {
+                    $lt: 3,
+                },
+            },
             {
                 licensedFor: { $in: ['hot dogs', 'amusements', 'entertainment'] },
             },
@@ -843,6 +854,11 @@ CriteriaBuilderRelatedObject.args = {
                     $regex: '410',
                 },
             },
+            {
+                'applicant.license.person.email': {
+                    $regex: '^k',
+                },
+            },
             {
                 $or: [
                     {

package/package.json

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