@evoke-platform/ui-components 1.4.0-testing.1 → 1.4.0-testing.3

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

@@ -12,23 +12,8 @@ import { Box } from '../../layout';
 import { OverflowTextField } from '../OverflowTextField';
 import { difference } from '../util';
 import PropertyTree from './PropertyTree';
-import { parseMongoDB, traversePropertyPath } from './utils';
+import { ALL_OPERATORS, parseMongoDB, traversePropertyPath } from './utils';
 import ValueEditor from './ValueEditor';
-const ALL_OPERATORS = [
-    { name: '=', label: 'Is' },
-    { name: '!=', label: 'Is not' },
-    { name: '<', label: 'Less than' },
-    { name: '>', label: 'Greater than' },
-    { name: '<=', label: 'Less than or equal to' },
-    { name: '>=', label: 'Greater than or equal to' },
-    { name: 'contains', label: 'Contains' },
-    { name: 'beginsWith', label: 'Starts with' },
-    { name: 'endsWith', label: 'Ends with' },
-    { name: 'null', label: 'Is empty' },
-    { name: 'notNull', label: 'Is not empty' },
-    { name: 'in', label: 'In' },
-    { name: 'notIn', label: 'Not in' },
-];
 const styles = {
     buttons: {
         padding: '6px 16px',
@@ -437,7 +422,6 @@ const CriteriaBuilder = (props) => {
                 '.ruleGroup:not(.ruleGroup .ruleGroup)': {
                     borderStyle: 'hidden',
                     background: '#fff',
-                    maxWidth: '70vw',
                 },
                 '.ruleGroup-header': {
                     display: 'block',

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

@@ -1,10 +1,10 @@
 import { Instant, LocalDate, LocalDateTime, LocalTime, ZoneId } from '@js-joda/core';
-import { ClearRounded } from '@mui/icons-material';
+import { ClearRounded, CodeRounded } from '@mui/icons-material';
 import { Box, darken, lighten, styled } from '@mui/material';
 import { TimePicker } from '@mui/x-date-pickers';
 import React, { useEffect, useRef, useState } from 'react';
 import { InvalidDate } from '../../../util';
-import { Autocomplete, Chip, DatePicker, DateTimePicker, LocalizationProvider, Menu, MenuItem, TextField, Typography, } from '../../core';
+import { Autocomplete, Chip, DatePicker, DateTimePicker, IconButton, LocalizationProvider, Menu, MenuItem, TextField, Typography, } from '../../core';
 import { NumericFormat } from '../FormField/InputFieldComponent';
 const GroupHeader = styled('div')(({ theme }) => ({
     position: 'sticky',
@@ -54,6 +54,9 @@ const ValueEditor = (props) => {
             width: '33%',
             background: readOnly ? '#f4f6f8' : '#fff',
             borderRadius: '8px',
+            '& .MuiAutocomplete-tag': {
+                backgroundColor: '#edeff1',
+            },
         },
     };
     useEffect(() => {
@@ -274,14 +277,26 @@ const ValueEditor = (props) => {
         }
     };
     return (React.createElement(React.Fragment, null,
-        isPresetValueSelected ? (React.createElement(Chip, { label: presetDisplayValue, sx: {
-                borderRadius: '8px',
-                fontSize: '14px',
+        isPresetValueSelected ? (React.createElement(Box, { ref: inputRef, sx: {
                 width: '33%',
-                height: '40px',
-                padding: '0 5px',
+                display: 'flex',
                 justifyContent: 'space-between',
-            }, deleteIcon: React.createElement(ClearRounded, { fontSize: "small" }), onDelete: clearValue })) : (getEditor()),
+                alignItems: 'center',
+                height: '40px',
+                border: readOnly ? undefined : '1px solid #d5d5d5',
+                borderRadius: '8px',
+                backgroundColor: readOnly ? '#edeff1' : '#ffffff',
+            } },
+            React.createElement(Chip, { label: presetDisplayValue, sx: {
+                    fontSize: '14px',
+                    margin: '6px',
+                    backgroundColor: '#edeff1',
+                    borderRadius: '6px',
+                    color: '#212B36',
+                    height: '28px',
+                }, icon: React.createElement(CodeRounded, { sx: { height: '18px' } }) }),
+            !readOnly && (React.createElement(IconButton, { onClick: clearValue, sx: { padding: '3px', margin: '3px' } },
+                React.createElement(ClearRounded, { fontSize: "small", sx: { color: 'rgba(0, 0, 0, 0.54)' } }))))) : (getEditor()),
         !!presetValues?.length && (React.createElement(Menu, { open: openPresetValues, anchorEl: inputRef?.current, PaperProps: { sx: { borderRadius: '8px', width: inputRef?.current?.offsetWidth } }, onClose: onClose }, presetValues &&
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             presetValues.map((option) => (React.createElement(MenuItem, { ...props, onClick: () => setPresetValue(option.value.name), sx: { padding: '8px', minHeight: '25px' } },

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

@@ -1,3 +1,4 @@
 import CriteriaBuilder from './CriteriaBuilder';
-export { CriteriaBuilder };
+import { getReadableQuery } from './utils';
+export { CriteriaBuilder, getReadableQuery };
 export default CriteriaBuilder;

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

@@ -1,3 +1,4 @@
 import CriteriaBuilder from './CriteriaBuilder';
-export { CriteriaBuilder };
+import { getReadableQuery } from './utils';
+export { CriteriaBuilder, getReadableQuery };
 export default CriteriaBuilder;

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

@@ -1,3 +1,4 @@
+import { Property } from '@evoke-platform/context';
 import { RuleGroupType } from 'react-querybuilder';
 import { ExpandedProperty, Obj, ObjectProperty } from '../../../types';
 /**
@@ -61,4 +62,16 @@ export declare const truncateNamePath: (namePath: string, limit?: number) => str
  * @returns {RuleGroupType} - Correctly formatted rule or rules for the query builder.
  */
 export declare function parseMongoDB(mongoQuery: Record<string, unknown>): RuleGroupType;
+export declare const ALL_OPERATORS: {
+    name: string;
+    label: string;
+}[];
+/**
+ * Gets a human readable representation of a MongoDB query.
+ *
+ * @param {Record<string, unknown>} [mongoQuery] - The MongoDB query
+ * @param {Property[]} [properties] - The object properties referenced in the query
+ * @returns {string} The resulting query string.
+ */
+export declare const getReadableQuery: (mongoQuery?: Record<string, unknown>, properties?: Property[]) => string;
 export {};

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

@@ -1,4 +1,4 @@
-import { isArray, isEmpty } from 'lodash';
+import { isArray, isEmpty, startCase } from 'lodash';
 /**
  * Recursively updates a node in a tree structure by applying an updater function to the node with the specified ID.
  *
@@ -302,3 +302,60 @@ export function parseMongoDB(mongoQuery) {
         };
     }
 }
+export const ALL_OPERATORS = [
+    { name: '=', label: 'Is' },
+    { name: '!=', label: 'Is not' },
+    { name: '<', label: 'Less than' },
+    { name: '>', label: 'Greater than' },
+    { name: '<=', label: 'Less than or equal to' },
+    { name: '>=', label: 'Greater than or equal to' },
+    { name: 'contains', label: 'Contains' },
+    { name: 'beginsWith', label: 'Starts with' },
+    { name: 'endsWith', label: 'Ends with' },
+    { name: 'null', label: 'Is empty' },
+    { name: 'notNull', label: 'Is not empty' },
+    { name: 'in', label: 'In' },
+    { name: 'notIn', label: 'Not in' },
+];
+/**
+ * Gets a human readable representation of a MongoDB query.
+ *
+ * @param {Record<string, unknown>} [mongoQuery] - The MongoDB query
+ * @param {Property[]} [properties] - The object properties referenced in the query
+ * @returns {string} The resulting query string.
+ */
+export const getReadableQuery = (mongoQuery, properties) => {
+    function isPresetValue(value) {
+        return typeof value === 'string' && value.startsWith('{{{') && value.endsWith('}}}');
+    }
+    function parseValue(val) {
+        if (val && Array.isArray(val)) {
+            return val.map((v) => (isPresetValue(v) ? startCase(v.slice(3, -3)) : v)).join(', ');
+        }
+        else {
+            return isPresetValue(val) ? startCase(val.slice(3, -3)) : `${val}`;
+        }
+    }
+    function getOperatorLabel(operator) {
+        const operatorObj = ALL_OPERATORS.find((o) => o.name === operator);
+        const defaultLabel = operatorObj ? operatorObj.label.toLowerCase() : operator;
+        if (['<', '>', '<=', '>='].includes(operator)) {
+            return `is ${defaultLabel}`;
+        }
+        return defaultLabel;
+    }
+    function buildQueryString(rule) {
+        if ('combinator' in rule) {
+            return rule?.rules?.map(buildQueryString).filter(Boolean).join(` ${rule.combinator.toLowerCase()} `);
+        }
+        else {
+            const property = properties?.find((p) => p.id === rule.field);
+            return `${property?.name ?? rule.field} ${getOperatorLabel(rule.operator)} ${parseValue(rule.value)}`;
+        }
+    }
+    if (!mongoQuery) {
+        return '';
+    }
+    const parsedQuery = parseMongoDB(mongoQuery);
+    return buildQueryString(parsedQuery);
+};

package/dist/published/components/custom/Form/Common/Form.js

@@ -1,14 +1,14 @@
 import { useApp, useAuthenticationContext, } from '@evoke-platform/context';
 import { Components, Form as FormIO, Utils } from '@formio/react';
 import { flatten } from 'flat';
-import { isEmpty, isEqual, toPairs } from 'lodash';
+import { isEmpty, isEqual, isObject, pick, toPairs } from 'lodash';
 import React, { useEffect, useRef, useState } from 'react';
 import '../../../../styles/form-component.css';
 import { Skeleton, Snackbar } from '../../../core';
 import { Box } from '../../../layout';
 import { ButtonComponent, DocumentComponent, FormFieldComponent, ImageComponent, ObjectComponent, RepeatableFieldComponent, UserComponent, ViewOnlyComponent, } from '../FormComponents';
 import { CriteriaComponent } from '../FormComponents/CriteriaComponent/CriteriaComponent';
-import { addObjectPropertiesToComponentProps, buildComponentPropsFromDocumentProperties, buildComponentPropsFromObjectProperties, convertFormToComponents, getFlattenEntries, getPrefixedUrl, } from '../utils';
+import { addObjectPropertiesToComponentProps, buildComponentPropsFromDocumentProperties, buildComponentPropsFromObjectProperties, convertFormToComponents, flattenFormComponents, getAllCriteriaInputs, getFlattenEntries, getPrefixedUrl, } from '../utils';
 const usePrevious = (value) => {
     const ref = useRef();
     useEffect(() => {
@@ -101,24 +101,16 @@ export function Form(props) {
     const buildComponents = async () => {
         const action = object?.actions?.find((action) => action.id === actionId);
         let input;
-        const parameters = associatedObject?.propertyId && action?.parameters
-            ? action.parameters.filter((param) => param.id !== associatedObject.propertyId)
-            : action?.parameters;
-        if (parameters && object) {
+        if (action?.parameters && object) {
             input = action?.form?.entries
-                ? convertFormToComponents(action.form.entries, parameters, object)
-                : parameters.filter((param) => object.properties?.some((prop) => prop.id === param.id));
+                ? convertFormToComponents(action.form.entries, action.parameters, object)
+                : action.parameters.filter((param) => object.properties?.some((prop) => prop.id === param.id));
         }
         else {
             input = action?.inputProperties ?? (action?.type === 'delete' ? [] : undefined);
         }
-        let visibleObjectProperties = object?.properties;
-        if (associatedObject) {
-            // Eliminates the associated object's field from the form
-            visibleObjectProperties = visibleObjectProperties?.filter((property) => property.id !== associatedObject.propertyId);
-        }
         let foundDefaultPages = defaultPages;
-        const relatedObjectProperties = visibleObjectProperties?.filter((property) => property.type === 'object');
+        const relatedObjectProperties = object?.properties?.filter((property) => property.type === 'object');
         if (relatedObjectProperties) {
             foundDefaultPages = await relatedObjectProperties.reduce(async (acc, property) => {
                 const result = await acc;
@@ -132,23 +124,25 @@ export function Form(props) {
             }, Promise.resolve({}));
         }
         const allDefaultPages = { ...defaultPages, ...foundDefaultPages };
-        if (input && visibleObjectProperties) {
+        // visibleObjectProperties
+        if (input && object?.properties) {
+            const allCriteriaInputs = getAllCriteriaInputs(action?.inputProperties ? flattenFormComponents(action.inputProperties) : action?.parameters ?? []);
             if (input.length || action?.type !== 'delete') {
                 // formIO builder-configured input properties exist
-                const newComponentProps = await addObjectPropertiesToComponentProps(visibleObjectProperties, input, instance, {
+                const newComponentProps = await addObjectPropertiesToComponentProps(object.properties, input, allCriteriaInputs, instance, {
                     ...objectInputCommonProps,
                     defaultPages: allDefaultPages,
                     navigateTo,
                     apiServices,
                     user: userAccount,
-                }, undefined, isReadOnly, allDefaultPages, navigateTo, queryAddresses, apiServices, !!closeModal, fieldHeight, richTextEditor);
+                }, associatedObject, undefined, isReadOnly, allDefaultPages, navigateTo, queryAddresses, apiServices, !!closeModal, fieldHeight, richTextEditor);
                 if (!hideButtons && !isReadOnly) {
                     newComponentProps.push(BottomButtons);
                 }
                 setComponentProps(newComponentProps);
             }
             else {
-                const components = await addObjectPropertiesToComponentProps(visibleObjectProperties, [
+                const components = await addObjectPropertiesToComponentProps(object.properties, [
                     {
                         html: `<p>${action?.type === 'delete' ? 'This action cannot be undone.' : 'Are you sure?'}</p>`,
                         label: 'Content',
@@ -216,13 +210,13 @@ export function Form(props) {
                         addons: [],
                         id: 'eahbwo',
                     },
-                ], instance, {
+                ], undefined, instance, {
                     ...objectInputCommonProps,
                     defaultPages: allDefaultPages,
                     navigateTo,
                     apiServices,
                     user: userAccount,
-                }, undefined, undefined, undefined, undefined, undefined, undefined, !!closeModal, fieldHeight, richTextEditor);
+                }, undefined, undefined, undefined, undefined, undefined, undefined, undefined, !!closeModal, fieldHeight, richTextEditor);
                 if (!hideButtons) {
                     components.push(BottomButtons);
                 }
@@ -343,7 +337,12 @@ export function Form(props) {
                 submittedFields[field] = null;
             }
             else {
-                submittedFields[field] = value;
+                if (isObject(value) && 'id' in value && 'name' in value) {
+                    submittedFields[field] = pick(value, 'id', 'name');
+                }
+                else {
+                    submittedFields[field] = value;
+                }
             }
         }
         //OPTIMIZATION TODO: See if type can be inferred from the event target

package/dist/published/components/custom/Form/Common/FormComponentWrapper.js

@@ -81,7 +81,8 @@ export const FormComponentWrapper = (props) => {
                             property && onChange(property.id, '');
                         } },
                         React.createElement(HighlightOffOutlined, { sx: clearBtnStyles }))))),
-            React.createElement(Typography, { variant: "caption", sx: { ...descriptionStyles, ...(displayOption === 'radioButton' && { display: 'flex' }) } }, description),
+            React.createElement(Box, { sx: { ...(displayOption === 'radioButton' && { display: 'flex' }) } },
+                React.createElement(Typography, { variant: "caption", sx: descriptionStyles }, description)),
             React.createElement(Box, { sx: { display: 'flex', flexDirection: 'row' } },
                 React.createElement(PrefixSuffix, { prefix: prefix, height: fieldHeight }),
                 React.createElement(Box, { sx: { width: '100%', paddingTop: '6px' } }, children),

package/dist/published/components/custom/Form/FormComponents/ObjectComponent/ObjectComponent.d.ts

@@ -6,6 +6,7 @@ interface ObjectComponentProps extends BaseFormComponentProps {
     mode: 'default' | 'existingOnly';
     defaultValueCriteria?: Record<string, unknown>;
     initialValue?: string;
+    allCriteriaInputs: string[];
     richTextEditor?: typeof ReactComponent;
 }
 export declare class ObjectComponent extends ReactComponent {
@@ -20,6 +21,7 @@ export declare class ObjectComponent extends ReactComponent {
     updatedDefaultValueCriteria: Record<string, unknown>;
     constructor(component: ObjectComponentProps, options: any, data: any);
     init(): void;
+    expandInstance(): Promise<void>;
     clearErrors(): void;
     handleValidation(): void;
     hasErrors(): boolean;

package/dist/published/components/custom/Form/FormComponents/ObjectComponent/ObjectComponent.js

@@ -1,10 +1,9 @@
 import { ReactComponent } from '@formio/react';
-import dot from 'dot-object';
-import { cloneDeep, isEmpty, pick } from 'lodash';
+import { cloneDeep, isEmpty, isNil, isObject, pick } from 'lodash';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { FormComponentWrapper } from '../../Common';
-import { getAllCriteriaInputs, getPrefixedUrl, transformToWhere, updateCriteriaInputs } from '../../utils';
+import { getCriteriaInputs, getPrefixedUrl, populateInstanceWithNestedData, transformToWhere, updateCriteriaInputs, } from '../../utils';
 import { ObjectPropertyInput } from './ObjectPropertyInput';
 export class ObjectComponent extends ReactComponent {
     constructor(component, options, data) {
@@ -17,9 +16,9 @@ export class ObjectComponent extends ReactComponent {
             delete this.errorDetails['api-error'];
             const updatedValue = pick(value, 'id', 'name');
             // set the value on the form instance at this.root.data
-            this.setValue(updatedValue ?? '');
+            this.setValue(!isNil(updatedValue) ? updatedValue : '');
             // update the value in the component instance
-            this.updateValue(updatedValue ?? {}, { modified: true });
+            this.updateValue(!isNil(updatedValue) ? updatedValue : {}, { modified: true });
             this.handleValidation();
             this.emit('changed-' + this.component.key, value);
             this.attach(this.element);
@@ -33,25 +32,44 @@ export class ObjectComponent extends ReactComponent {
         this.handleChangeObjectProperty = this.handleChangeObjectProperty.bind(this);
     }
     init() {
-        const data = dot.dot(this.root._data);
         if (this.criteria) {
-            const inputProps = getAllCriteriaInputs(this.criteria);
+            const inputProps = getCriteriaInputs(this.criteria);
+            this.updatedCriteria = updateCriteriaInputs(this.criteria, this.root._data, this.component.user);
             for (const inputProp of inputProps) {
-                // Parse data to update criteria when form is loaded.
-                updateCriteriaInputs(this.updatedCriteria, inputProp, data[inputProp], true);
                 // Parse data to update criteria when form field is updated
                 // Need to parse all fields again.
                 const compKeyFragments = inputProp.split('.');
                 let compKey = compKeyFragments[0];
-                if (['line1', 'line2', 'city', 'state', 'zipCode'].includes(compKeyFragments[1])) {
+                const property = this.component.properties.find((c) => c.id === compKey);
+                if (property?.type === 'address' &&
+                    ['line1', 'line2', 'city', 'state', 'zipCode'].includes(compKeyFragments[1])) {
                     compKey = inputProp;
                 }
-                this.on(`changed-${compKey}`, () => {
-                    const data = dot.dot(this.root._data);
-                    this.updatedCriteria = cloneDeep(this.criteria) ?? {};
-                    for (const inputProp of inputProps) {
-                        updateCriteriaInputs(this.updatedCriteria, inputProp, data[inputProp], true);
+                this.on(`changed-${compKey}`, async (value) => {
+                    const data = this.root._data;
+                    if (property?.type === 'object' && isObject(value) && 'id' in value && 'objectId' in value) {
+                        const paths = this.component.allCriteriaInputs
+                            .filter((input) => input.split('.')[0] === compKey)
+                            .map((p) => p.split('.').slice(1).join('.'));
+                        let instance = value;
+                        if (!isEmpty(paths)) {
+                            instance = await populateInstanceWithNestedData(value['id'], value['objectId'], paths, this.component.apiServices);
+                        }
+                        data[compKey] = instance;
                     }
+                    else {
+                        if (compKey.includes('.')) {
+                            const keyFragments = compKey.split('.');
+                            if (!data[keyFragments[0]]) {
+                                data[keyFragments[0]] = {};
+                            }
+                            data[keyFragments[0]][keyFragments[1]] = value;
+                        }
+                        else {
+                            data[compKey] = value;
+                        }
+                    }
+                    this.updatedCriteria = updateCriteriaInputs(this.criteria ?? {}, data, this.component.user);
                     if (this.visible) {
                         this.attachReact(this.element);
                     }
@@ -59,25 +77,43 @@ export class ObjectComponent extends ReactComponent {
             }
         }
         if (this.defaultValueCriteria) {
-            const inputProps = getAllCriteriaInputs(this.defaultValueCriteria);
-            updateCriteriaInputs(this.updatedDefaultValueCriteria, 'user.id', this.component.user?.id ?? '');
+            const inputProps = getCriteriaInputs(this.defaultValueCriteria);
+            this.updatedDefaultValueCriteria = updateCriteriaInputs(this.defaultValueCriteria, this.root._data, this.component.user);
             for (const inputProp of inputProps) {
-                // Parse data to update criteria when form is loaded.
-                updateCriteriaInputs(this.updatedDefaultValueCriteria, inputProp, data[inputProp], true);
                 // Parse data to update criteria when form field is updated
                 // Need to parse all fields again.
                 const compKeyFragments = inputProp.split('.');
                 let compKey = compKeyFragments[0];
-                if (['line1', 'line2', 'city', 'state', 'zipCode'].includes(compKeyFragments[1])) {
+                const property = this.component.properties.find((c) => c.id === compKey);
+                if (property?.type === 'address' &&
+                    ['line1', 'line2', 'city', 'state', 'zipCode'].includes(compKeyFragments[1])) {
                     compKey = inputProp;
                 }
-                this.on(`changed-${compKey}`, () => {
-                    const data = dot.dot(this.root._data);
-                    this.updatedDefaultValueCriteria = cloneDeep(this.defaultValueCriteria) ?? {};
-                    updateCriteriaInputs(this.updatedDefaultValueCriteria, 'user.id', this.component.user?.id ?? '');
-                    for (const inputProp of inputProps) {
-                        updateCriteriaInputs(this.updatedDefaultValueCriteria, inputProp, data[inputProp], true);
+                this.on(`changed-${compKey}`, async (value) => {
+                    const data = this.root._data;
+                    if (property?.type === 'object' && isObject(value) && 'id' in value && 'objectId' in value) {
+                        const paths = this.component.allCriteriaInputs
+                            .filter((input) => input.split('.')[0] === compKey)
+                            .map((p) => p.split('.').slice(1).join('.'));
+                        let instance = value;
+                        if (!isEmpty(paths)) {
+                            instance = await populateInstanceWithNestedData(value['id'], value['objectId'], paths, this.component.apiServices);
+                        }
+                        data[compKey] = instance;
+                    }
+                    else {
+                        if (compKey.includes('.')) {
+                            const keyFragments = compKey.split('.');
+                            if (!data[keyFragments[0]]) {
+                                data[keyFragments[0]] = {};
+                            }
+                            data[keyFragments[0]][keyFragments[1]] = value;
+                        }
+                        else {
+                            data[compKey] = value;
+                        }
                     }
+                    this.updatedDefaultValueCriteria = updateCriteriaInputs(this.defaultValueCriteria ?? {}, data, this.component.user);
                     if (this.visible) {
                         this.attachReact(this.element);
                     }
@@ -124,6 +160,19 @@ export class ObjectComponent extends ReactComponent {
             this.attach(this.element);
             this.attachReact(this.element);
         });
+        if (this.component.defaultValue) {
+            this.expandInstance();
+        }
+    }
+    async expandInstance() {
+        const { property, apiServices, defaultValue } = this.component;
+        const paths = this.component.allCriteriaInputs
+            .filter((input) => input.split('.')[0] === this.component.key)
+            .map((p) => p.split('.').slice(1).join('.'));
+        if (!isEmpty(paths)) {
+            const instance = await populateInstanceWithNestedData(defaultValue.id, property.objectId, paths, apiServices);
+            this.handleChangeObjectProperty(property.id, instance);
+        }
     }
     clearErrors() {
         this.errorDetails = {};

package/dist/published/components/custom/Form/FormComponents/RepeatableFieldComponent/ActionDialog.d.ts

@@ -1,4 +1,4 @@
-import { Action, ApiServices, Obj, Property, UserAccount } from '@evoke-platform/context';
+import { Action, ApiServices, Obj, UserAccount } from '@evoke-platform/context';
 import React from 'react';
 import { Address, ObjectPropertyInputProps } from '../../types';
 export type ActionDialogProps = {
@@ -13,9 +13,12 @@ export type ActionDialogProps = {
     object: Obj;
     objectInputCommonProps: ObjectPropertyInputProps;
     instanceId?: string;
-    relatedProperty?: Property;
     apiServices: ApiServices;
     queryAddresses?: (query: string) => Promise<Address[]>;
     user?: UserAccount;
+    associatedObject?: {
+        instanceId: string;
+        propertyId: string;
+    };
 };
 export declare const ActionDialog: (props: ActionDialogProps) => React.JSX.Element;

package/dist/published/components/custom/Form/FormComponents/RepeatableFieldComponent/ActionDialog.js

@@ -36,7 +36,7 @@ const styles = {
     },
 };
 export const ActionDialog = (props) => {
-    const { open, onClose, action, instanceInput, handleSubmit, apiServices, object, instanceId, relatedProperty, objectInputCommonProps, queryAddresses, user, } = props;
+    const { open, onClose, action, instanceInput, handleSubmit, apiServices, object, instanceId, objectInputCommonProps, queryAddresses, associatedObject, user, } = props;
     const [updatedObject, setUpdatedObject] = useState();
     const [hasAccess, setHasAccess] = useState(false);
     const [loading, setLoading] = useState(false);
@@ -57,18 +57,16 @@ export const ActionDialog = (props) => {
     }, [object, instanceId]);
     useEffect(() => {
         const input = (action.form?.entries && action.parameters) || action?.inputProperties
-            ? (action.form?.entries && action.parameters
+            ? action.form?.entries && action.parameters
                 ? convertFormToComponents(action.form.entries, action.parameters, object)
-                : action?.inputProperties)?.filter((inputProperty) => inputProperty?.key !== relatedProperty?.relatedPropertyId)
+                : action?.inputProperties
             : undefined;
         const updatedAction = {
             ...action,
             form: input ? { entries: convertComponentsToForm(input) } : undefined,
         };
-        const properties = object.properties?.filter((prop) => prop.id !== relatedProperty?.relatedPropertyId);
         setUpdatedObject({
             ...object,
-            properties,
             actions: concat(object.actions?.filter((a) => a.id !== action.id) ?? [], [updatedAction]),
         });
     }, [object]);
@@ -78,7 +76,7 @@ export const ActionDialog = (props) => {
             React.createElement(IconButton, { sx: styles.closeIcon, onClick: onClose },
                 React.createElement(Close, { fontSize: "small" })),
             action && hasAccess && !loading ? action?.name : ''),
-        React.createElement(DialogContent, null, hasAccess ? (React.createElement(Box, { sx: { width: '100%', marginTop: '10px' } }, (updatedObject || isDeleteAction) && (React.createElement(Form, { actionId: action.id, actionType: action.type, apiServices: objectInputCommonProps.apiServices, object: !isDeleteAction ? updatedObject : object, instance: instanceInput, onSave: async (data, setSubmitting) => handleSubmit(action.type, data, instanceId, setSubmitting), objectInputCommonProps: objectInputCommonProps, closeModal: onClose, queryAddresses: queryAddresses, user: user, submitButtonLabel: isDeleteAction ? 'Delete' : undefined })))) : (React.createElement(React.Fragment, null, loading ? (React.createElement(React.Fragment, null,
+        React.createElement(DialogContent, null, hasAccess ? (React.createElement(Box, { sx: { width: '100%', marginTop: '10px' } }, (updatedObject || isDeleteAction) && (React.createElement(Form, { actionId: action.id, actionType: action.type, apiServices: objectInputCommonProps.apiServices, object: !isDeleteAction ? updatedObject : object, instance: instanceInput, onSave: async (data, setSubmitting) => handleSubmit(action.type, data, instanceId, setSubmitting), objectInputCommonProps: objectInputCommonProps, closeModal: onClose, queryAddresses: queryAddresses, user: user, submitButtonLabel: isDeleteAction ? 'Delete' : undefined, associatedObject: associatedObject })))) : (React.createElement(React.Fragment, null, loading ? (React.createElement(React.Fragment, null,
             React.createElement(Skeleton, { height: '30px', animation: 'wave' }),
             React.createElement(Skeleton, { height: '30px', animation: 'wave' }),
             React.createElement(Skeleton, { height: '30px', animation: 'wave' }))) : (React.createElement(ErrorComponent, { code: 'AccessDenied', message: 'You do not have permission to perform this action.', styles: { boxShadow: 'none' } })))))));

package/dist/published/components/custom/Form/FormComponents/RepeatableFieldComponent/RepeatableField.js

@@ -405,7 +405,9 @@ const RepeatableField = (props) => {
         relatedObject && openDialog && (React.createElement(ActionDialog, { object: relatedObject, open: openDialog, apiServices: apiServices, onClose: () => setOpenDialog(false), instanceInput: dialogType === 'update' ? relatedInstances.find((i) => i.id === selectedRow) ?? {} : {}, handleSubmit: save, 
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             objectInputCommonProps: { apiServices }, action: relatedObject?.actions?.find((a) => a.id ===
-                (dialogType === 'create' ? '_create' : dialogType === 'update' ? '_update' : '_delete')), instanceId: selectedRow, relatedProperty: property, queryAddresses: queryAddresses, user: user })),
+                (dialogType === 'create' ? '_create' : dialogType === 'update' ? '_update' : '_delete')), instanceId: selectedRow, queryAddresses: queryAddresses, user: user, associatedObject: instance.id && property.relatedPropertyId
+                ? { instanceId: instance.id, propertyId: property.relatedPropertyId }
+                : undefined })),
         React.createElement(Snackbar, { open: snackbarError.showAlert, handleClose: () => setSnackbarError({ isError: snackbarError.isError, showAlert: false }), message: snackbarError.message, error: snackbarError.isError })));
 };
 export default RepeatableField;

package/dist/published/components/custom/Form/FormComponents/RepeatableFieldComponent/RepeatableFieldComponent.js

@@ -1,11 +1,10 @@
 import { ApiBaseUrlProvider, NotificationProvider, } from '@evoke-platform/context';
 import { ReactComponent } from '@formio/react';
-import dot from 'dot-object';
-import { cloneDeep } from 'lodash';
+import { cloneDeep, isEmpty, isObject } from 'lodash';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { FormComponentWrapper } from '../../Common';
-import { getAllCriteriaInputs, updateCriteriaInputs } from '../../utils';
+import { getCriteriaInputs, populateInstanceWithNestedData, updateCriteriaInputs } from '../../utils';
 import { DropdownRepeatableField } from './ManyToMany/DropdownRepeatableField';
 import RepeatableField from './RepeatableField';
 const apiBaseUrl = process.env.REACT_APP_API_ROOT || `${window.location.origin}/api`;
@@ -23,24 +22,43 @@ export class RepeatableFieldComponent extends ReactComponent {
     }
     init() {
         if (this.criteria) {
-            const inputProps = getAllCriteriaInputs(this.criteria);
-            const data = dot.dot(this.root._data);
+            const inputProps = getCriteriaInputs(this.criteria);
+            this.updatedCriteria = updateCriteriaInputs(this.updatedCriteria, this.root._data, this.component.user);
             for (const inputProp of inputProps) {
-                // Parse data to update criteria when form is loaded.
-                updateCriteriaInputs(this.updatedCriteria, inputProp, data[inputProp], true);
                 // Parse data to update criteria when form field is updated
                 // Need to parse all fields again.
                 const compKeyFragments = inputProp.split('.');
                 let compKey = compKeyFragments[0];
-                if (['line1', 'line2', 'city', 'state', 'zipCode'].includes(compKeyFragments[1])) {
+                const property = this.component.properties.find((c) => c.id === compKey);
+                if (property?.type === 'address' &&
+                    ['line1', 'line2', 'city', 'state', 'zipCode'].includes(compKeyFragments[1])) {
                     compKey = inputProp;
                 }
-                this.on(`changed-${compKey}`, () => {
-                    const data = dot.dot(this.root._data);
-                    this.updatedCriteria = cloneDeep(this.criteria) ?? {};
-                    for (const inputProp of inputProps) {
-                        updateCriteriaInputs(this.updatedCriteria, inputProp, data[inputProp], true);
+                this.on(`changed-${compKey}`, async (value) => {
+                    const data = this.root._data;
+                    if (property?.type === 'object' && isObject(value) && 'id' in value && 'objectId' in value) {
+                        const paths = this.component.allCriteriaInputs
+                            .filter((input) => input.split('.')[0] === compKey)
+                            .map((p) => p.split('.').slice(1).join('.'));
+                        let instance = value;
+                        if (!isEmpty(paths)) {
+                            instance = await populateInstanceWithNestedData(value['id'], value['objectId'], paths, this.component.apiServices);
+                        }
+                        data[compKey] = instance;
                     }
+                    else {
+                        if (compKey.includes('.')) {
+                            const keyFragments = compKey.split('.');
+                            if (!data[keyFragments[0]]) {
+                                data[keyFragments[0]] = {};
+                            }
+                            data[keyFragments[0]][keyFragments[1]] = value;
+                        }
+                        else {
+                            data[compKey] = value;
+                        }
+                    }
+                    this.updatedCriteria = updateCriteriaInputs(this.criteria ?? {}, data, this.component.user);
                     this.attachReact(this.element);
                 });
             }

package/dist/published/components/custom/Form/tests/Form.test.d.ts

@@ -0,0 +1 @@
+export {};