@evoke-platform/ui-components 1.0.0-dev.172 → 1.0.0-dev.174

package/dist/published/components/custom/CriteriaBuilder/CriteriaBuilder.d.ts

@@ -6,6 +6,7 @@ export declare type CriteriaInputProps = {
     properties: ObjectProperty[];
     setCriteria: Function;
     criteria?: Record<string, any>;
+    originalCriteria?: Record<string, any>;
     enablePresetValues?: boolean;
     presetValues?: PresetValue[];
     dynamicContentInput?: {

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

@@ -25,8 +25,6 @@ const ALL_OPERATORS = [
     { name: 'notNull', label: 'is not null' },
     { name: 'in', label: 'in' },
     { name: 'notIn', label: 'not in' },
-    { name: 'between', label: 'between' },
-    { name: 'notBetween', label: 'not between' },
 ];
 const CustomRuleGroup = (props) => {
     const rg = Object.assign(Object.assign({}, props), useRuleGroup(props));
@@ -136,11 +134,12 @@ export const valueEditor = (props) => {
     return ValueEditor(props);
 };
 const CriteriaBuilder = (props) => {
-    const { properties, criteria, setCriteria, enablePresetValues, presetValues, operators, dynamicContentInput, disabled, hideBorder, presetGroupLabel, } = props;
+    const { properties, criteria, setCriteria, originalCriteria, enablePresetValues, presetValues, operators, dynamicContentInput, disabled, hideBorder, presetGroupLabel, } = props;
     const [query, setQuery] = useState(undefined);
     useEffect(() => {
-        if (criteria) {
-            const updatedQuery = parseMongoDB(criteria);
+        if (criteria || originalCriteria) {
+            const criteriaToParse = criteria || originalCriteria || {};
+            const updatedQuery = parseMongoDB(criteriaToParse);
             setQuery(Object.assign(Object.assign({}, updatedQuery), { rules: updatedQuery.rules.map((rule) => {
                     var _a, _b;
                     const propertyType = (_a = properties.find((property) => property.id === rule.field)) === null || _a === void 0 ? void 0 : _a.type;
@@ -154,7 +153,7 @@ const CriteriaBuilder = (props) => {
         else {
             setQuery({ combinator: 'and', rules: [] });
         }
-    }, []);
+    }, [originalCriteria]);
     const handleQueryChange = (q) => {
         setQuery(q);
         const newCriteria = JSON.parse(formatQuery(q, 'mongodb'));
@@ -202,7 +201,7 @@ const CriteriaBuilder = (props) => {
                 },
             } },
             React.createElement(QueryBuilderMaterial, null,
-                React.createElement(QueryBuilder, { query: !criteria ? { combinator: 'and', rules: [] } : query, fields: fields, onQueryChange: (q) => {
+                React.createElement(QueryBuilder, { query: !criteria && !originalCriteria ? { combinator: 'and', rules: [] } : query, fields: fields, onQueryChange: (q) => {
                         handleQueryChange(q);
                     }, showCombinatorsBetweenRules: true, listsAsArrays: true, disabled: disabled, addRuleToNewGroups: true, controlElements: {
                         combinatorSelector: customCombinator,

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

@@ -80,7 +80,9 @@ export default function MultiSelect(props) {
     };
     const updateOptions = (value) => {
         const newOptions = optionsArray.map((option) => {
-            option.value = value;
+            if (!option.disabled) {
+                option.value = value;
+            }
             return option;
         });
         onChange(newOptions);

package/package.json

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