@evoke-platform/ui-components 1.10.0-dev.33 → 1.10.0-dev.35

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

@@ -400,9 +400,31 @@ const CriteriaBuilder = (props) => {
     const fields = useMemo(() => {
         return properties
             .filter(({ type }) => type !== 'collection')
-            .map((property) => {
+            .flatMap((property) => {
+            if (property.type === 'object') {
+                const result = [
+                    {
+                        name: `${property.id}.id`,
+                        label: `${property.name} ID`,
+                        inputType: property.type,
+                    },
+                    {
+                        name: `${property.id}.name`,
+                        label: `${property.name} Name`,
+                        inputType: property.type,
+                    },
+                ];
+                if (!property.objectId) {
+                    result.push({
+                        name: `${property.id}.objectId`,
+                        label: `${property.name} Object ID`,
+                        inputType: property.type,
+                    });
+                }
+                return result;
+            }
             return {
-                name: property.type === 'object' ? `${property.id}.id` : property.id,
+                name: property.id,
                 label: property.name,
                 inputType: property.type,
                 ...(property.enum && {

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

@@ -56,6 +56,17 @@ const mockProperties = [
         name: 'Boolean',
         type: 'boolean',
     },
+    {
+        id: 'regularRelatedObject',
+        name: 'Regular Related Object',
+        type: 'object',
+        objectId: 'relatedObjectId',
+    },
+    {
+        id: 'dynamicRelatedObject',
+        name: 'Dynamic Related Object',
+        type: 'object',
+    },
 ];
 describe('CriteriaBuilder', () => {
     // Mock function for setCriteria
@@ -64,6 +75,40 @@ describe('CriteriaBuilder', () => {
         // Reset the mock before each test
         setCriteriaMock.mockReset();
     });
+    describe('when passed regular related object fields', () => {
+        it('should render the field ID', () => {
+            render(React.createElement(CriteriaBuilder, { properties: mockProperties, criteria: {
+                    'regularRelatedObject.id': 'relatedInstanceId',
+                }, setCriteria: setCriteriaMock }));
+            expect(screen.getByRole('combobox', { name: /select property/i })).toHaveValue('Regular Related Object ID');
+        });
+        it('should render the field Name', () => {
+            render(React.createElement(CriteriaBuilder, { properties: mockProperties, criteria: {
+                    'regularRelatedObject.name': 'relatedInstanceName',
+                }, setCriteria: setCriteriaMock }));
+            expect(screen.getByRole('combobox', { name: /select property/i })).toHaveValue('Regular Related Object Name');
+        });
+    });
+    describe('when passed dynamic related object fields', () => {
+        it('should render the field ID', () => {
+            render(React.createElement(CriteriaBuilder, { properties: mockProperties, criteria: {
+                    'dynamicRelatedObject.id': 'relatedInstanceId',
+                }, setCriteria: setCriteriaMock }));
+            expect(screen.getByRole('combobox', { name: /select property/i })).toHaveValue('Dynamic Related Object ID');
+        });
+        it('should render the field Name', () => {
+            render(React.createElement(CriteriaBuilder, { properties: mockProperties, criteria: {
+                    'dynamicRelatedObject.name': 'relatedInstanceName',
+                }, setCriteria: setCriteriaMock }));
+            expect(screen.getByRole('combobox', { name: /select property/i })).toHaveValue('Dynamic Related Object Name');
+        });
+        it('should render the field Object ID', () => {
+            render(React.createElement(CriteriaBuilder, { properties: mockProperties, criteria: {
+                    'dynamicRelatedObject.objectId': 'relatedInstanceObjectId',
+                }, setCriteria: setCriteriaMock }));
+            expect(screen.getByRole('combobox', { name: /select property/i })).toHaveValue('Dynamic Related Object Object ID');
+        });
+    });
     describe('when passed single-select fields', () => {
         it('should render the field name', () => {
             render(React.createElement(CriteriaBuilder, { properties: mockProperties, criteria: {

package/dist/published/components/custom/FormField/DatePickerSelect/DatePickerSelect.js

@@ -1,9 +1,10 @@
 import { DateTimeFormatter } from '@js-joda/core';
 import { omit } from 'lodash';
-import React, { useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import { useFormContext } from '../../../../theme/hooks';
 import { InvalidDate, LocalDate, nativeJs } from '../../../../util';
 import { DatePicker, LocalizationProvider, TextField } from '../../../core';
+import { obfuscateValue } from '../../FormV2/components/utils';
 import InputFieldComponent from '../InputFieldComponent/InputFieldComponent';
 function asCalendarDate(value) {
     if (!value) {
@@ -28,12 +29,16 @@ const asMonthDayYearFormat = (date) => {
     }
 };
 const DatePickerSelect = (props) => {
-    const { id, property, defaultValue, error, errorMessage, readOnly, required, size, onBlur, onChange, additionalProps, } = props;
-    const [value, setValue] = useState(asCalendarDate(defaultValue));
+    const { id, property, defaultValue, error, errorMessage, readOnly, required, size, onBlur, onChange, additionalProps, endAdornment, protection, } = props;
     const { onAutosave } = useFormContext();
+    const processValue = useCallback((val) => {
+        const isProtected = protection?.maskChar && val === obfuscateValue(val, { protection });
+        return isProtected && typeof val === 'string' ? val : asCalendarDate(val);
+    }, [protection]);
+    const [value, setValue] = useState(() => processValue(defaultValue));
     useEffect(() => {
-        setValue(asCalendarDate(defaultValue));
-    }, [defaultValue]);
+        setValue(processValue(defaultValue));
+    }, [defaultValue, processValue]);
     const handleChange = (date) => {
         setValue(date);
         onChange && onChange(property.id, date, property);
@@ -49,12 +54,23 @@ const DatePickerSelect = (props) => {
             }
         }
     };
-    return readOnly ? (React.createElement(InputFieldComponent, { ...{ ...props, defaultValue: asMonthDayYearFormat(value) } })) : (React.createElement(LocalizationProvider, null,
+    return readOnly ? (React.createElement(InputFieldComponent, { ...{
+            ...props,
+            defaultValue: protection?.maskChar && value === obfuscateValue(value, { protection })
+                ? value
+                : asMonthDayYearFormat(value),
+            endAdornment,
+        } })) : (React.createElement(LocalizationProvider, null,
         React.createElement(DatePicker, { value: value, onChange: handleChange, onAccept: handleAccept, inputFormat: "MM/dd/yyyy", renderInput: (params) => (React.createElement(TextField, { ...params, id: id, error: error, errorMessage: errorMessage, onBlur: onBlur, fullWidth: true, required: required, sx: { background: 'white', borderRadius: '8px' }, size: size ?? 'medium', 
                 // merges MUI inputProps with additionalProps.inputProps in a way that still shows the value
                 inputProps: {
                     ...params.inputProps,
                     ...(additionalProps?.inputProps ?? {}),
+                }, InputProps: {
+                    ...params.InputProps,
+                    endAdornment: (React.createElement(React.Fragment, null,
+                        params.InputProps?.endAdornment,
+                        endAdornment)),
                 }, ...omit(additionalProps, ['inputProps']) })) })));
 };
 export default DatePickerSelect;

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

@@ -1,4 +1,4 @@
-import { SelectOption } from '@evoke-platform/context';
+import { PropertyProtection as PropertyProtectionType, SelectOption } from '@evoke-platform/context';
 import React, { FocusEventHandler, ReactNode } from 'react';
 import { ObjectProperty } from '../../../types';
 import { AutocompleteOption } from '../../core';
@@ -36,6 +36,8 @@ export type FormFieldProps = {
     description?: string;
     tooltip?: string;
     isCombobox?: boolean;
+    endAdornment?: ReactNode;
+    protection?: PropertyProtectionType;
 };
 declare const FormField: (props: FormFieldProps) => React.JSX.Element;
 export default FormField;

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

@@ -1,4 +1,5 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
+import PropertyProtection from '../FormV2/components/PropertyProtection';
 import AddressFieldComponent from './AddressFieldComponent/addressFieldComponent';
 import BooleanSelect from './BooleanSelect/BooleanSelect';
 import DatePickerSelect from './DatePickerSelect/DatePickerSelect';
@@ -8,8 +9,16 @@ import InputFieldComponent from './InputFieldComponent/InputFieldComponent';
 import Select from './Select/Select';
 import TimePickerSelect from './TimePickerSelect/TimePickerSelect';
 const FormField = (props) => {
-    const { id, defaultValue, error, onChange, property, readOnly, selectOptions, required, strictlyTrue, size, placeholder, errorMessage, onBlur, mask, max, min, isMultiLineText, rows, inputMaskPlaceholderChar, queryAddresses, isOptionEqualToValue, renderOption, disableCloseOnSelect, getOptionLabel, additionalProps, displayOption, sortBy, label, description, tooltip, isCombobox, } = props;
-    let control;
+    const { id, defaultValue, error, onChange, property, readOnly, selectOptions, required, strictlyTrue, size, placeholder, errorMessage, onBlur, mask, max, min, isMultiLineText, rows, inputMaskPlaceholderChar, queryAddresses, isOptionEqualToValue, renderOption, disableCloseOnSelect, getOptionLabel, additionalProps, displayOption, sortBy, label, description, tooltip, isCombobox, protection, } = props;
+    const [currentDisplayValue, setCurrentDisplayValue] = useState(defaultValue);
+    const isProtectedProperty = !!protection?.maskChar;
+    const [protectionMode, setProtectionMode] = useState(isProtectedProperty ? (!currentDisplayValue ? 'edit' : 'mask') : 'full');
+    useEffect(() => {
+        if (isProtectedProperty && protectionMode === 'edit') {
+            setCurrentDisplayValue(defaultValue);
+        }
+    }, [defaultValue]);
+    const protectionComponent = isProtectedProperty && !!defaultValue ? (React.createElement(PropertyProtection, { parameter: property, protection: protection, mask: mask, canEdit: !readOnly, value: defaultValue, handleChange: (value) => onChange?.(property.id, value, property), setCurrentDisplayValue: setCurrentDisplayValue, mode: protectionMode, setMode: setProtectionMode })) : null;
     const commonProps = {
         id: id ?? property.id,
         property,
@@ -17,8 +26,8 @@ const FormField = (props) => {
         onBlur,
         error,
         errorMessage,
-        readOnly,
-        defaultValue,
+        readOnly: readOnly || (!!isProtectedProperty && protectionMode !== 'edit'),
+        defaultValue: isProtectedProperty ? currentDisplayValue : defaultValue,
         selectOptions,
         required,
         strictlyTrue,
@@ -37,7 +46,10 @@ const FormField = (props) => {
         description,
         tooltip,
         isCombobox,
+        endAdornment: protectionComponent,
+        protection,
     };
+    let control;
     if (queryAddresses) {
         control = (React.createElement(AddressFieldComponent, { ...commonProps, mask: mask, inputMaskPlaceholderChar: inputMaskPlaceholderChar, isMultiLineText: isMultiLineText, rows: rows, queryAddresses: queryAddresses }));
         return control;

package/dist/published/components/custom/FormField/InputFieldComponent/InputFieldComponent.js

@@ -3,6 +3,7 @@ import React, { useEffect, useState } from 'react';
 import InputMask from 'react-input-mask';
 import NumberFormat from 'react-number-format';
 import { Autocomplete, TextField } from '../../../core';
+import { obfuscateValue } from '../../FormV2/components/utils';
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const NumericFormat = (props) => {
     const { inputRef, onChange, defaultValue, ...other } = props;
@@ -15,7 +16,7 @@ export const NumericFormat = (props) => {
         }, isNumericString: true, fixedDecimalScale: true, allowNegative: true }));
 };
 const InputFieldComponent = (props) => {
-    const { id, property, defaultValue, error, errorMessage, onBlur, readOnly, required, size, placeholder, mask, min, max, isMultiLineText, rows, inputMaskPlaceholderChar, additionalProps, } = props;
+    const { id, property, defaultValue, error, errorMessage, onBlur, readOnly, required, size, placeholder, mask, min, max, isMultiLineText, rows, inputMaskPlaceholderChar, additionalProps, endAdornment, protection, } = props;
     const [value, setValue] = useState(defaultValue ?? '');
     const [inputValue, setInputValue] = useState('');
     useEffect(() => {
@@ -43,6 +44,7 @@ const InputFieldComponent = (props) => {
         : property.type === 'integer'
             ? { inputProps: { min, max, ...(additionalProps?.inputProps ?? {}) } }
             : null;
+    const isValueProtected = protection?.maskChar && defaultValue === obfuscateValue(defaultValue, { protection, mask });
     return property.enum && !readOnly ? (React.createElement(Autocomplete, { id: id, 
         // note: this is different between widgets and builder
         // builder had select options being {label, value}
@@ -53,7 +55,7 @@ const InputFieldComponent = (props) => {
             ? [...property.enum, defaultValue]
             : property.enum, onChange: handleSelectChange, renderInput: (params) => (React.createElement(TextField, { ...params, value: value, error: error, errorMessage: errorMessage, fullWidth: true, onBlur: onBlur, size: size ?? 'medium', placeholder: placeholder })), disableClearable: true, value: value, isOptionEqualToValue: (option, value) => {
             return option.value === value;
-        }, error: error, required: required, inputValue: inputValue ?? '', onInputChange: handleInputValueChange, ...(additionalProps ?? {}) })) : !mask ? (React.createElement(TextField, { id: id, sx: {
+        }, error: error, required: required, inputValue: inputValue ?? '', onInputChange: handleInputValueChange, ...(additionalProps ?? {}) })) : !mask || isValueProtected ? (React.createElement(TextField, { id: id, sx: {
             background: 'white',
             borderRadius: '8px',
             ...(readOnly && {
@@ -65,7 +67,7 @@ const InputFieldComponent = (props) => {
                     backgroundColor: '#f4f6f8',
                 },
             }),
-        }, error: error, errorMessage: errorMessage, value: value, onChange: !readOnly ? handleChange : undefined, InputProps: { ...InputProps, readOnly: readOnly }, required: required, fullWidth: true, onBlur: onBlur, placeholder: readOnly ? undefined : placeholder, size: size ?? 'medium', type: property.type === 'integer' ? 'number' : 'text', multiline: property.type === 'string' && !readOnly && isMultiLineText, rows: isMultiLineText ? (rows ? rows : 3) : undefined, ...(additionalProps ?? {}) })) : (React.createElement(InputMask, { mask: mask, maskChar: inputMaskPlaceholderChar ?? '_', value: value, onChange: !readOnly ? handleChange : undefined, onBlur: onBlur, alwaysShowMask: true }, (() => (React.createElement(TextField, { id: id, sx: readOnly
+        }, error: error, errorMessage: errorMessage, value: value, onChange: !readOnly ? handleChange : undefined, InputProps: { ...InputProps, endAdornment, readOnly: readOnly }, required: required, fullWidth: true, onBlur: onBlur, placeholder: readOnly ? undefined : placeholder, size: size ?? 'medium', type: property.type === 'integer' ? 'number' : 'text', multiline: property.type === 'string' && !readOnly && isMultiLineText, rows: isMultiLineText ? (rows ? rows : 3) : undefined, ...(additionalProps ?? {}) })) : (React.createElement(InputMask, { mask: mask, maskChar: inputMaskPlaceholderChar ?? '_', value: value, onChange: !readOnly ? handleChange : undefined, onBlur: onBlur, alwaysShowMask: true }, (() => (React.createElement(TextField, { id: id, sx: readOnly
             ? {
                 '& .MuiOutlinedInput-notchedOutline': {
                     border: 'none',
@@ -75,7 +77,7 @@ const InputFieldComponent = (props) => {
                     backgroundColor: '#f4f6f8',
                 },
             }
-            : undefined, required: required, error: error, errorMessage: errorMessage, InputProps: { ...InputProps, readOnly: readOnly }, fullWidth: true, size: size ?? 'medium', type: property.type === 'integer' ? 'number' : 'text', multiline: property.type === 'string' && !readOnly && isMultiLineText, rows: isMultiLineText ? (rows ? rows : 3) : undefined, ...(additionalProps ?? {}) })
+            : undefined, required: required, error: error, errorMessage: errorMessage, InputProps: { ...InputProps, endAdornment, readOnly: readOnly }, fullWidth: true, size: size ?? 'medium', type: property.type === 'integer' ? 'number' : 'text', multiline: property.type === 'string' && !readOnly && isMultiLineText, rows: isMultiLineText ? (rows ? rows : 3) : undefined, ...(additionalProps ?? {}) })
     // Casting to `React.ReactNode` is necessary to resolve TypeScript errors
     // due to compatibility issues with the outdated `react-input-mask` version
     // and the newer `@types/react` package.

package/dist/published/components/custom/FormV2/FormRenderer.js

@@ -122,6 +122,22 @@ const FormRendererInternal = (props) => {
             }
         });
     };
+    const removeUneditedProtectedValues = () => {
+        const protectedProperties = object?.properties?.filter((prop) => prop.protection?.maskChar);
+        if (!protectedProperties || protectedProperties.length === 0) {
+            return;
+        }
+        protectedProperties.forEach((property) => {
+            const fieldId = property.id;
+            const originalValue = instance?.[fieldId];
+            const value = getValues(fieldId);
+            // When protected value hasn't been edited or viewed, unregister to
+            // avoid saving the obfuscated value.
+            if (value === originalValue) {
+                processFieldUnregister(fieldId);
+            }
+        });
+    };
     const processFieldUnregister = (fieldId) => {
         if (isAddressProperty(fieldId)) {
             // Unregister entire addressObject to clear hidden field errors, then restore existing values since unregistering address.line1 etc is not working
@@ -145,6 +161,7 @@ const FormRendererInternal = (props) => {
     };
     async function unregisterHiddenFieldsAndSubmit() {
         unregisterHiddenFields(entries ?? []);
+        removeUneditedProtectedValues();
         await handleSubmit((data) => onSubmit && onSubmit(action?.type === 'delete' ? {} : data), (errors) => onSubmitError(errors))();
     }
     const headerProps = {

package/dist/published/components/custom/FormV2/FormRendererContainer.js

@@ -1,6 +1,6 @@
 import { useApiServices, useApp, useAuthenticationContext, useNavigate, useObject, } from '@evoke-platform/context';
 import axios from 'axios';
-import { cloneDeep, get, isArray, isEmpty, isEqual, merge, omit, pick, set, uniq } from 'lodash';
+import { cloneDeep, get, isArray, isEmpty, isEqual, omit, pick, set, uniq } from 'lodash';
 import React, { useEffect, useRef, useState } from 'react';
 import { Skeleton, Snackbar } from '../../core';
 import { Box } from '../../layout';
@@ -278,100 +278,83 @@ function FormRendererContainer(props) {
     };
     const getDefaultValues = async (entries, instanceData) => {
         const result = {};
-        const processEntries = async (entries) => {
-            if (!entries)
-                return;
-            for (const entry of entries) {
-                if (entry.type === 'sections' || entry.type === 'columns') {
-                    const subEntries = entry.type === 'sections' ? entry.sections : entry.columns;
-                    for (const subEntry of subEntries) {
-                        if (subEntry.entries) {
-                            const nested = await getDefaultValues(subEntry.entries, instanceData);
-                            merge(result, nested);
-                        }
+        const unnestedEntries = getUnnestedEntries(entries);
+        for (const entry of unnestedEntries) {
+            if ((entry.type === 'input' || entry.type === 'inputField') &&
+                isAddressProperty(entry.parameterId || entry.input?.id)) {
+                const fieldId = getEntryId(entry);
+                if (!fieldId)
+                    continue;
+                const fieldValue = get(instanceData, fieldId);
+                if ((isEmpty(instanceData) || fieldValue === undefined || fieldValue === null || fieldValue === '') &&
+                    entry?.display?.defaultValue &&
+                    parameters) {
+                    const defaultValuesArray = await evalDefaultVals(parameters, unnestedEntries, entry, fieldValue, fieldId, apiServices, userAccount, instanceData);
+                    if (isArray(defaultValuesArray)) {
+                        defaultValuesArray.forEach(({ fieldId, fieldValue }) => {
+                            set(result, fieldId, fieldValue);
+                        });
                     }
                 }
-                if ((entry.type === 'input' || entry.type === 'inputField') &&
-                    isAddressProperty(entry.parameterId || entry.input?.id)) {
-                    const fieldId = getEntryId(entry);
-                    if (!fieldId)
-                        return;
-                    const fieldValue = get(instanceData, fieldId);
-                    if ((isEmpty(instanceData) ||
-                        fieldValue === undefined ||
-                        fieldValue === null ||
-                        fieldValue === '') &&
-                        entry?.display?.defaultValue &&
-                        parameters) {
-                        const defaultValuesArray = await evalDefaultVals(parameters, entry, fieldValue, fieldId, apiServices, userAccount, instanceData);
-                        if (isArray(defaultValuesArray)) {
-                            defaultValuesArray.forEach(({ fieldId, fieldValue }) => {
-                                set(result, fieldId, fieldValue);
-                            });
-                        }
-                    }
-                    else if (fieldValue !== undefined && fieldValue !== null) {
-                        set(result, fieldId, fieldValue);
-                    }
+                else if (fieldValue !== undefined && fieldValue !== null) {
+                    set(result, fieldId, fieldValue);
                 }
-                else if (entry.type !== 'sections' && entry.type !== 'columns' && entry.type !== 'content') {
-                    const fieldId = entry.type === 'input'
-                        ? entry.parameterId
-                        : entry.type === 'inputField'
-                            ? entry.input?.id
-                            : undefined;
-                    if (fieldId) {
-                        const fieldValue = instanceData?.[fieldId] ??
-                            instanceData?.metadata?.[fieldId];
-                        const parameter = parameters?.find((param) => param.id === fieldId);
-                        if (associatedObject?.propertyId === fieldId &&
-                            associatedObject?.instanceId &&
-                            parameter &&
-                            action?.type === 'create') {
-                            try {
-                                const instance = await apiServices.get(getPrefixedUrl(`/objects/${parameter.objectId}/instances/${associatedObject.instanceId}`));
-                                result[associatedObject.propertyId] = instance;
-                            }
-                            catch (error) {
-                                console.error(error);
-                            }
+            }
+            else if (entry.type !== 'sections' && entry.type !== 'columns' && entry.type !== 'content') {
+                const fieldId = entry.type === 'input'
+                    ? entry.parameterId
+                    : entry.type === 'inputField'
+                        ? entry.input?.id
+                        : undefined;
+                if (fieldId) {
+                    const fieldValue = instanceData?.[fieldId] ??
+                        instanceData?.metadata?.[fieldId];
+                    const parameter = parameters?.find((param) => param.id === fieldId);
+                    if (associatedObject?.propertyId === fieldId &&
+                        associatedObject?.instanceId &&
+                        parameter &&
+                        action?.type === 'create') {
+                        try {
+                            const instance = await apiServices.get(getPrefixedUrl(`/objects/${parameter.objectId}/instances/${associatedObject.instanceId}`));
+                            result[associatedObject.propertyId] = instance;
                         }
-                        else if (entry.type !== 'readonlyField' &&
-                            isEmptyWithDefault(fieldValue, entry, instanceData)) {
-                            if (fieldId && parameters && parameters.length > 0) {
-                                const defaultValuesArray = await evalDefaultVals(parameters, entry, fieldValue, fieldId, apiServices, userAccount, instanceData);
-                                for (const { fieldId, fieldValue } of defaultValuesArray) {
-                                    const parameter = parameters?.find((param) => param.id === fieldId);
-                                    if (parameter?.type === 'object') {
-                                        const dependentFields = await processValueUpdate(form?.entries, parameters, fieldValue, apiServices, fieldId, formDataRef.current, userAccount);
-                                        for (const field of dependentFields) {
-                                            set(result, field.fieldId, field.fieldValue);
-                                        }
+                        catch (error) {
+                            console.error(error);
+                        }
+                    }
+                    else if (entry.type !== 'readonlyField' && isEmptyWithDefault(fieldValue, entry, instanceData)) {
+                        if (fieldId && parameters && parameters.length > 0) {
+                            const defaultValuesArray = await evalDefaultVals(parameters, unnestedEntries, entry, fieldValue, fieldId, apiServices, userAccount, instanceData);
+                            for (const { fieldId, fieldValue } of defaultValuesArray) {
+                                const parameter = parameters?.find((param) => param.id === fieldId);
+                                if (parameter?.type === 'object') {
+                                    const dependentFields = await processValueUpdate(unnestedEntries, parameters, fieldValue, apiServices, fieldId, formDataRef.current, userAccount);
+                                    for (const field of dependentFields) {
+                                        set(result, field.fieldId, field.fieldValue);
                                     }
-                                    set(result, fieldId, fieldValue);
                                 }
+                                set(result, fieldId, fieldValue);
                             }
                         }
-                        else if (parameter?.type === 'boolean' && (fieldValue === undefined || fieldValue === null)) {
-                            result[fieldId] = false;
-                        }
-                        else if (fieldValue !== undefined && fieldValue !== null) {
-                            if (parameter?.type === 'richText' && typeof fieldValue === 'string') {
-                                let RTFFieldValue = fieldValue;
-                                if (!fieldValue.trim().startsWith('{\\rtf')) {
-                                    RTFFieldValue = plainTextToRtf(fieldValue);
-                                }
-                                result[fieldId] = RTFFieldValue;
-                            }
-                            else {
-                                result[fieldId] = fieldValue;
+                    }
+                    else if (parameter?.type === 'boolean' && (fieldValue === undefined || fieldValue === null)) {
+                        result[fieldId] = false;
+                    }
+                    else if (fieldValue !== undefined && fieldValue !== null) {
+                        if (parameter?.type === 'richText' && typeof fieldValue === 'string') {
+                            let RTFFieldValue = fieldValue;
+                            if (!fieldValue.trim().startsWith('{\\rtf')) {
+                                RTFFieldValue = plainTextToRtf(fieldValue);
                             }
+                            result[fieldId] = RTFFieldValue;
+                        }
+                        else {
+                            result[fieldId] = fieldValue;
                         }
                     }
                 }
             }
-        };
-        await processEntries(entries);
+        }
         return result;
     };
     const handleAutosave = async (fieldId) => {
@@ -423,7 +406,7 @@ function FormRendererContainer(props) {
         if (parameter) {
             if (parameter.type === 'object' && parameters && parameters.length > 0) {
                 // On change of a related object, update default values dependent on that object
-                const dependentFields = await processValueUpdate(form?.entries, parameters, value, apiServices, id, formDataRef.current, userAccount);
+                const dependentFields = await processValueUpdate(entries, parameters, value, apiServices, id, formDataRef.current, userAccount);
                 for (const field of dependentFields) {
                     onChange(field.fieldId, field.fieldValue);
                 }

package/dist/published/components/custom/FormV2/components/DefaultValues.d.ts

@@ -1,10 +1,10 @@
 import { ApiServices, FormEntry, InputField, InputParameter, InputParameterReference, ObjectInstance, Reference, UserAccount } from '@evoke-platform/context';
 import { FieldValues } from 'react-hook-form';
-export declare function evalDefaultVals(parameters: InputParameter[], entry: InputParameterReference | InputField, fieldValue: unknown, fieldId: string, apiServices: ApiServices, userAccount?: UserAccount, formValues?: FieldValues, updatedRelatedObjectValue?: ObjectInstance | null | Reference): Promise<{
+export declare function evalDefaultVals(parameters: InputParameter[], unnestedEntries: FormEntry[], entry: InputParameterReference | InputField, fieldValue: unknown, fieldId: string, apiServices: ApiServices, userAccount?: UserAccount, formValues?: FieldValues, updatedRelatedObjectValue?: ObjectInstance | null | Reference): Promise<{
     fieldId: string;
     fieldValue: unknown;
 }[]>;
-export declare function processValueUpdate(entries: FormEntry[] | undefined, parameters: InputParameter[], updatedRelatedObjectValue: ObjectInstance | null | Reference, apiServices: ApiServices, changedEntryId?: string, formValues?: FieldValues, userAccount?: UserAccount): Promise<{
+export declare function processValueUpdate(unnestedEntries: FormEntry[], parameters: InputParameter[], updatedRelatedObjectValue: ObjectInstance | null | Reference, apiServices: ApiServices, changedEntryId?: string, formValues?: FieldValues, userAccount?: UserAccount): Promise<{
     fieldId: string;
     fieldValue: unknown;
 }[]>;