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

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

@@ -3,8 +3,9 @@ import { Typography } from '@mui/material';
 import { QueryBuilderMaterial } from '@react-querybuilder/material';
 import { isArray, isEmpty, startCase } from 'lodash';
 import React, { useEffect, useMemo, useState } from 'react';
-import { QueryBuilder, RuleGroupBodyComponents, RuleGroupHeaderComponents, TestID, formatQuery, useRuleGroup, } from 'react-querybuilder';
+import { QueryBuilder, RuleGroupBodyComponents, RuleGroupHeaderComponents, TestID, defaultRuleProcessorMongoDB, formatQuery, useRuleGroup, } from 'react-querybuilder';
 import 'react-querybuilder/dist/query-builder.css';
+import escape from 'string-escape-regex';
 import { TrashCan } from '../../../icons/custom';
 import { Autocomplete, Button, IconButton, TextField } from '../../core';
 import { Box } from '../../layout';
@@ -22,9 +23,6 @@ const ALL_OPERATORS = [
     { name: 'contains', label: 'Contains' },
     { name: 'beginsWith', label: 'Starts with' },
     { name: 'endsWith', label: 'Ends with' },
-    { name: 'doesNotContain', label: 'Does not contain' },
-    { name: 'doesNotBeginWith', label: 'Does not start with' },
-    { name: 'doesNotEndWith', label: 'Does not end with' },
     { name: 'null', label: 'Is empty' },
     { name: 'notNull', label: 'Is not empty' },
     { name: 'in', label: 'In' },
@@ -330,7 +328,16 @@ const CriteriaBuilder = (props) => {
     };
     const handleQueryChange = (q) => {
         setQuery(q);
-        const newCriteria = JSON.parse(formatQuery(q, 'mongodb'));
+        const newCriteria = JSON.parse(formatQuery(q, {
+            format: 'mongodb',
+            ruleProcessor: (rule, options) => {
+                let newRule = rule;
+                if (['contains', 'beginsWith', 'endsWith'].includes(rule.operator)) {
+                    newRule = { ...rule, value: escape(rule.value) };
+                }
+                return defaultRuleProcessorMongoDB(newRule, options);
+            },
+        }));
         //when q has no rules, it formats and parses to { $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,

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

@@ -197,6 +197,10 @@ export function parseMongoDB(mongoQuery) {
                 operator = 'endsWith';
                 regexValue = regexValue.slice(0, -1);
             }
+            if (regexValue) {
+                // remove escape characters for display
+                regexValue = regexValue.replace(/\\/g, '');
+            }
             return {
                 field: key,
                 operator: operator,

package/dist/published/stories/CriteriaBuilder.stories.js

@@ -8,7 +8,7 @@ const CriteriaBuilderTemplate = (args) => {
     const [criteria, setCriteria] = React.useState(args.criteria);
     args.setCriteria = setCriteria;
     args.criteria = criteria;
-    console.log('reset criteria= ', criteria);
+    console.log('criteria= ', JSON.stringify(criteria, null, 4));
     return React.createElement(BuildCriteria, { ...args });
 };
 export const CriteriaBuilderEmpty = CriteriaBuilderTemplate.bind({});
@@ -97,7 +97,6 @@ CriteriaBuilderEmpty.args = {
         },
     ],
     criteria: {},
-    setCriteria: (criteria) => console.log('criteria= ', criteria),
 };
 export const CriteriaBuilder = CriteriaBuilderTemplate.bind({});
 CriteriaBuilder.args = {
@@ -190,7 +189,6 @@ CriteriaBuilder.args = {
             required: false,
         },
     ],
-    setCriteria: (criteria) => console.log('criteria= ', criteria),
     criteria: {
         $or: [
             {
@@ -216,6 +214,11 @@ CriteriaBuilder.args = {
             {
                 issueDate: '2023-03-16',
             },
+            {
+                applicantName: {
+                    $regex: '\\(410\\)',
+                },
+            },
         ],
     },
     enablePresetValues: false,
@@ -311,7 +314,6 @@ CriteriaBuilderPresetUserID.args = {
             required: false,
         },
     ],
-    setCriteria: (criteria) => console.log('criteria= ', criteria),
     criteria: {
         $or: [
             {
@@ -380,7 +382,6 @@ CriteriaBuilderGroupedPresetValues.args = {
             searchable: false,
         },
     ],
-    setCriteria: (criteria) => console.log('criteria= ', criteria),
     criteria: {
         $or: [
             {
@@ -836,7 +837,6 @@ CriteriaBuilderRelatedObject.args = {
             required: false,
         },
     ],
-    setCriteria: (criteria) => console.log('criteria= ', criteria),
     criteria: {
         $and: [
             {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@evoke-platform/ui-components",
-    "version": "1.0.0-dev.254",
+    "version": "1.0.0-dev.256",
     "description": "",
     "main": "dist/published/index.js",
     "module": "dist/published/index.js",
@@ -127,7 +127,8 @@
         "react-querybuilder": "^6.0.2",
         "rtf.js": "^3.0.9",
         "sift": "^17.1.3",
-        "small-date": "^2.0.0"
+        "small-date": "^2.0.0",
+        "string-escape-regex": "^1.0.1"
     },
     "lint-staged": {
         "*.{js,jsx,ts,tsx,json,css,md}": [