@evoke-platform/ui-components 1.0.1-testing.2 → 1.0.2-testing.0

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

@@ -108,7 +108,7 @@ const customSelector = (props) => {
     let opts = options;
     let inputType = props.fieldData?.inputType;
     // for tree view / related object properties, the properties are stored in the propertyTreeMap upon selection
-    if (!!context.treeViewOpts && !!context.propertyTreeMap[rule.field]) {
+    if (!!context.treeViewOpts && !!context.propertyTreeMap?.[rule.field]) {
         inputType = context.propertyTreeMap[rule.field].type;
     }
     let readOnly = false;
@@ -274,7 +274,7 @@ export const valueEditor = (props) => {
 const CriteriaBuilder = (props) => {
     const { properties, criteria, setCriteria, originalCriteria, enablePresetValues, presetValues, operators, dynamicContentInput, disabled, disabledCriteria, hideBorder, presetGroupLabel, treeViewOpts, disableRegexEscapeChars, } = props;
     const [query, setQuery] = useState(undefined);
-    const [propertyTreeMap, setPropertyTreeMap] = useState({});
+    const [propertyTreeMap, setPropertyTreeMap] = useState();
     useEffect(() => {
         if (criteria || originalCriteria) {
             const criteriaToParse = criteria || originalCriteria || {};
@@ -326,7 +326,7 @@ const CriteriaBuilder = (props) => {
         traverseRulesForIds(q.rules);
         const tempPropertyMap = { ...propertyTreeMap };
         ids.forEach(async (id) => {
-            if (!propertyTreeMap[id] && treeViewOpts?.object && treeViewOpts?.fetchObject) {
+            if (!propertyTreeMap?.[id] && treeViewOpts?.object && treeViewOpts?.fetchObject) {
                 const prop = await traversePropertyPath(id, treeViewOpts?.object, treeViewOpts?.fetchObject);
                 if (prop)
                     tempPropertyMap[id] = prop;
@@ -365,7 +365,9 @@ const CriteriaBuilder = (props) => {
         }
     };
     const fields = useMemo(() => {
-        return properties.map((property) => {
+        return properties
+            .filter(({ type }) => type !== 'collection')
+            .map((property) => {
             return {
                 name: property.type === 'object' ? `${property.id}.id` : property.id,
                 label: property.name,
@@ -466,7 +468,15 @@ const CriteriaBuilder = (props) => {
                         enablePresetValues,
                         presetGroupLabel,
                         disabledCriteria,
-                        treeViewOpts,
+                        treeViewOpts: treeViewOpts
+                            ? {
+                                ...treeViewOpts,
+                                object: {
+                                    ...treeViewOpts?.object,
+                                    properties: treeViewOpts?.object.properties.filter(({ type }) => type !== 'collection'),
+                                },
+                            }
+                            : undefined,
                         propertyTreeMap,
                         setPropertyTreeMap,
                     }, controlClassnames: {

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

@@ -49,8 +49,6 @@ const PropertyTree = ({ fetchObject, handleTreePropertySelect, rootObject, value
                     if (originalValue.includes('.')) {
                         const parts = originalValue.split('.');
                         if (parts.length >= 2) {
-                            const parentId = parts.slice(0, -1).join('.');
-                            await fetchObject(parentId);
                             if (!newObjectPropertyNamePathMap[originalValue]) {
                                 const fieldNamePath = await fetchDisplayNamePath(originalValue, rootObject, fetchObject);
                                 newObjectPropertyNamePathMap = {

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

@@ -20,7 +20,7 @@ const ValueEditor = (props) => {
     const { handleOnChange, value, operator, context, level, rule } = props;
     let inputType = props.inputType;
     let values = props.values;
-    const property = context.propertyTreeMap[rule.field];
+    const property = context.propertyTreeMap?.[rule.field];
     // for tree view / related object properties, the properties are stored in the propertyTreeMap upon selection
     if (!!context.treeViewOpts && !!property) {
         inputType = property.type;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@evoke-platform/ui-components",
-    "version": "1.0.1-testing.2",
+    "version": "1.0.2-testing.0",
     "description": "",
     "main": "dist/published/index.js",
     "module": "dist/published/index.js",