@evoke-platform/ui-components 1.14.0 → 1.15.1

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

@@ -1,23 +1,30 @@
 import { useApiServices, useApp, useAuthenticationContext, useNavigate, useObject, } from '@evoke-platform/context';
+import { useQuery, useQueryClient } from '@tanstack/react-query';
 import axios from 'axios';
-import { cloneDeep, get, isArray, isEmpty, isEqual, omit, pick, set } from 'lodash';
-import React, { useEffect, useRef, useState } from 'react';
+import { cloneDeep, get, isArray, isEmpty, isEqual, isObject, pick, set } from 'lodash';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { Skeleton, Snackbar } from '../../core';
 import { Box } from '../../layout';
 import ErrorComponent from '../ErrorComponent';
+import ConditionalQueryClientProvider from './components/ConditionalQueryClientProvider';
 import { evalDefaultVals, processValueUpdate } from './components/DefaultValues';
 import Header from './components/Header';
-import { convertPropertiesToParams, createFileLinks, deleteDocuments, encodePageSlug, formatSubmission, getEntryId, getPrefixedUrl, getUnnestedEntries, isAddressProperty, isEmptyWithDefault, plainTextToRtf, } from './components/utils';
+import { convertPropertiesToParams, createFileLinks, deleteDocuments, encodePageSlug, extractAllCriteria, extractPresetValuesFromCriteria, extractPresetValuesFromDynamicDefaultValues, formatSubmission, getEntryId, getPrefixedUrl, getUnnestedEntries, isAddressProperty, isEmptyWithDefault, plainTextToRtf, useFormById, } from './components/utils';
 import FormRenderer from './FormRenderer';
+import { DepGraph } from 'dependency-graph';
+// Wrapper to provide QueryClient context for FormRendererContainer if this is not a nested form
 function FormRendererContainer(props) {
-    const { instanceId, pageNavigation, dataType, title, display, formId, objectId, actionId, richTextEditor, onSubmit, onDiscardChanges: onDiscardChangesOverride, associatedObject, renderContainer, onSubmitError, sx, renderHeader, renderBody, renderFooter, } = props;
+    return (React.createElement(ConditionalQueryClientProvider, null,
+        React.createElement(FormRendererContainerInner, { ...props })));
+}
+// Inner component that assumes QueryClient context is available
+function FormRendererContainerInner(props) {
+    const { instanceId, pageNavigation, title, display, formId, objectId, actionId, richTextEditor, onSubmit, onDiscardChanges: onDiscardChangesOverride, associatedObject, renderContainer, onSubmitError, sx, renderHeader, renderBody, renderFooter, } = props;
     const apiServices = useApiServices();
     const navigateTo = useNavigate();
+    const queryClient = useQueryClient();
     const { id: appId } = useApp();
-    const [sanitizedObject, setSanitizedObject] = useState();
-    const [navigationSlug, setNavigationSlug] = useState();
-    const [parameters, setParameters] = useState();
-    const [instance, setInstance] = useState();
+    const [parameters, setParameters] = useState([]);
     const formDataRef = useRef();
     // We only need the setter to force a re-render when form data updates; the value itself
     // is intentionally not referenced elsewhere to avoid stale reads (we use formDataRef).
@@ -46,6 +53,55 @@ function FormRendererContainer(props) {
     });
     const [isSaving, setIsSaving] = useState(false);
     const [lastSavedData, setLastSavedData] = useState({});
+    const [uniquePresetValues, setUniquePresetValues] = useState([]);
+    const flattenFormEntries = useMemo(() => {
+        const graph = new DepGraph({ circular: true });
+        const unnestedEntries = getUnnestedEntries(form?.entries || []);
+        const nonInputEntries = [];
+        for (const entry of unnestedEntries) {
+            const entryId = getEntryId(entry);
+            if (entryId && entry.type !== 'readonlyField') {
+                graph.addNode(entryId, entry);
+            }
+            else {
+                nonInputEntries.push(entry);
+            }
+        }
+        for (const entry of unnestedEntries) {
+            const entryId = getEntryId(entry);
+            if (entryId && (entry.type === 'input' || entry.type === 'inputField')) {
+                const { defaultValue } = entry.display || {};
+                let presetValues = [];
+                if (typeof defaultValue === 'string') {
+                    presetValues = extractPresetValuesFromDynamicDefaultValues([entry]);
+                }
+                else if (isObject(defaultValue) && 'criteria' in defaultValue && !isEmpty(defaultValue.criteria)) {
+                    presetValues = extractPresetValuesFromCriteria(defaultValue.criteria);
+                }
+                presetValues.forEach((presetValue) => {
+                    const fragments = presetValue.replace(/{{{input.|}}}|{{input.|}}/g, '').split('.');
+                    // preset value references top level fields i.e name or dateOfBirth
+                    if (fragments.length === 1 && graph.hasNode(fragments[0])) {
+                        graph.addDependency(entryId, fragments[0]);
+                    }
+                    else if (fragments.length > 1) {
+                        // preset value references nested fields i.e address.line1 or person.address.line1
+                        const addressKeys = ['line1', 'line2', 'city', 'county', 'state', 'zipCode', 'country'];
+                        if (addressKeys.includes(fragments[1]) && graph.hasNode(`${fragments[0]}.${fragments[1]}`)) {
+                            graph.addDependency(entryId, `${fragments[0]}.${fragments[1]}`);
+                        }
+                        else if (graph.hasNode(fragments[0])) {
+                            graph.addDependency(entryId, fragments[0]);
+                        }
+                    }
+                });
+            }
+        }
+        return graph
+            .overallOrder()
+            .map((id) => graph.getNodeData(id))
+            .concat(nonInputEntries);
+    }, [form?.entries]);
     const userAccount = useAuthenticationContext()?.account;
     const objectStore = useObject(form?.objectId ?? objectId);
     const onError = (err) => {
@@ -53,68 +109,165 @@ function FormRendererContainer(props) {
         setSnackbarError({ ...snackbarError, isError: true });
         setError(code ?? err);
     };
-    useEffect(() => {
-        (async () => {
-            try {
-                if (instanceId) {
-                    const instance = await objectStore.getInstance(instanceId);
-                    setInstance(instance);
-                }
-                const object = await apiServices.get(getPrefixedUrl(`/objects/${form?.objectId || objectId}${instanceId ? `/instances/${instanceId}/object` : '/effective'}`), { params: { sanitizedVersion: true } });
-                setSanitizedObject(object);
-                const action = object?.actions?.find((a) => a.id === (form?.actionId || actionId));
-                if (action && (instanceId || action.type === 'create')) {
-                    setAction(action);
-                    // Clear error if action is found after being missing
-                    // TODO: This entire effect should take place after form is fetched to avoid an error flickering
-                    // That is, this effect should be merged with the one below that fetches the form
-                    setError((prevError) => prevError === 'Action could not be found' ? undefined : prevError);
+    const { data: sanitizedObject, error: sanitizedObjectError } = useQuery({
+        queryKey: [form?.objectId ?? objectId, ...(instanceId ? [instanceId] : []), 'sanitized'],
+        queryFn: () => 
+        // form?.objectId is needed for subtype forms to get the correct object
+        apiServices.get(getPrefixedUrl(`/objects/${form?.objectId ?? objectId}${instanceId ? `/instances/${instanceId}/object` : '/effective'}`), { params: { sanitizedVersion: true } }),
+        staleTime: Infinity,
+        enabled: !!(form?.objectId || objectId),
+    });
+    // trigger refetch on success
+    const { data: instance, error: instanceError } = useQuery({
+        queryKey: [objectId, instanceId, 'instance', uniquePresetValues],
+        queryFn: async () => {
+            const instance = await apiServices.get(getPrefixedUrl(`/objects/${objectId}/instances/${instanceId}`), {
+                params: {
+                    expand: uniquePresetValues
+                        .filter((value) => value.startsWith('{{{input.') ||
+                        value.startsWith('{{input.') ||
+                        value.startsWith('{{{instance.'))
+                        .map((value) => {
+                        return value
+                            .replace(/{{{|}}}|{{|}}/g, '')
+                            .split('.')
+                            .slice(1)
+                            .join('.');
+                    }),
+                },
+            });
+            return instance;
+        },
+        staleTime: Infinity,
+        enabled: !!instanceId && !!sanitizedObject,
+    });
+    const getDefaultValues = useCallback(async (unnestedEntries, instanceData) => {
+        const result = cloneDeep(instanceData);
+        for (const entry of unnestedEntries) {
+            const fieldId = getEntryId(entry);
+            if (!fieldId)
+                continue;
+            const fieldValue = get(result, fieldId);
+            if ((entry.type === 'input' || entry.type === 'inputField') &&
+                isAddressProperty(entry.parameterId || entry.input?.id)) {
+                if ((isEmpty(result) || fieldValue === undefined || fieldValue === null || fieldValue === '') &&
+                    entry?.display?.defaultValue &&
+                    parameters) {
+                    const defaultValuesArray = await evalDefaultVals(parameters, entry, fieldValue, fieldId, apiServices, userAccount, result);
+                    if (isArray(defaultValuesArray)) {
+                        defaultValuesArray.forEach(({ fieldId, fieldValue }) => {
+                            set(result, fieldId, fieldValue);
+                        });
+                    }
                 }
-                else {
-                    setError('Action could not be found');
+                else if (fieldValue !== undefined && fieldValue !== null) {
+                    set(result, fieldId, fieldValue);
                 }
             }
-            catch (error) {
-                onError(error);
+            else if (entry.type !== 'sections' && entry.type !== 'columns' && entry.type !== 'content') {
+                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}`), {
+                            params: {
+                                expand: uniquePresetValues.filter((value) => value.startsWith(`{{{input.${fieldId}.`) ||
+                                    value.startsWith(`{{input.${fieldId}.`)),
+                            },
+                        });
+                        result[associatedObject.propertyId] = instance;
+                    }
+                    catch (error) {
+                        console.error(error);
+                    }
+                }
+                else if (entry.type === 'formlet') {
+                    // TODO: this should eventually fetch the formletId then get the fields and default values of those fields
+                }
+                else if (entry.type !== 'readonlyField') {
+                    if (isEmptyWithDefault(fieldValue, entry, result)) {
+                        if (fieldId && parameters && parameters.length > 0) {
+                            const defaultValuesArray = await evalDefaultVals(parameters, entry, fieldValue, fieldId, apiServices, userAccount, result);
+                            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);
+                            }
+                        }
+                    }
+                    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;
+                        }
+                    }
+                }
             }
-        })();
-    }, [dataType, form, instanceId]);
-    useEffect(() => {
-        if (pageNavigation) {
-            apiServices
-                .get(getPrefixedUrl(`/apps/${appId}/pages/${encodePageSlug(pageNavigation)}`))
-                .then((page) => {
-                setNavigationSlug(page?.slug);
-            });
         }
-    }, []);
+        return result;
+    }, [action, parameters, associatedObject, uniquePresetValues, formDataRef, apiServices, userAccount]);
     useEffect(() => {
-        const needsInstance = action?.type !== 'create' && !!instanceId;
-        // Instance and Action are loaded in the side effect above; wait for them to complete.
-        const loading = (actionId && !action) || (needsInstance && !instance);
-        if (form || loading)
+        if (!sanitizedObject)
             return;
-        if ((formId || action?.defaultFormId) && formId !== '_auto_') {
-            apiServices
-                .get(getPrefixedUrl(`/forms/${formId || action?.defaultFormId}`))
-                .then((evokeForm) => {
-                // If an actionId is provided, ensure it matches the form's actionId
-                if (!actionId || evokeForm?.actionId === actionId) {
-                    const form = evokeForm;
-                    setForm(form);
-                }
-                else {
-                    setError('Configured action ID does not match form action ID');
-                }
-            })
-                .catch((error) => {
-                onError(error);
-            });
+        const allCriterias = extractAllCriteria(flattenFormEntries, parameters || []);
+        const uniquePresetValues = new Set();
+        for (const criteria of allCriterias) {
+            const presetValues = extractPresetValuesFromCriteria(criteria);
+            presetValues.forEach((value) => uniquePresetValues.add(value));
+        }
+        extractPresetValuesFromDynamicDefaultValues(flattenFormEntries).map((value) => uniquePresetValues.add(value));
+        setUniquePresetValues(Array.from(uniquePresetValues));
+        const action = sanitizedObject.actions?.find((a) => a.id === (form?.actionId || actionId));
+        if (action && (instanceId || action.type === 'create')) {
+            setAction(action);
+            // Clear error if action is found after being missing
+            setError((prevError) => (prevError === 'Action could not be found' ? undefined : prevError));
         }
-        else if (action?.type === 'delete' && formId === '_auto_') {
+        else {
+            setError('Action could not be found');
+        }
+    }, [sanitizedObject, actionId, form?.actionId, instanceId, flattenFormEntries, parameters]);
+    const { data: navigationSlug } = useQuery({
+        queryKey: [appId, 'navigationSlug'],
+        queryFn: () => apiServices.get(getPrefixedUrl(`/apps/${appId}/pages/${encodePageSlug(pageNavigation)}`)),
+        select: (page) => page.slug,
+        staleTime: Infinity,
+        enabled: !!pageNavigation,
+    });
+    const formIdToFetch = formId || action?.defaultFormId;
+    const { data: fetchedForm, error: fetchedFormError } = useFormById(formIdToFetch ?? '', apiServices);
+    useEffect(() => {
+        if (!formIdToFetch && action) {
+            setError('Action form could not be found');
+        }
+    }, [formIdToFetch, action]);
+    useEffect(() => {
+        if (fetchedForm) {
+            if (actionId && fetchedForm.actionId !== actionId) {
+                setError('Configured action ID does not match form action ID');
+            }
+            setForm(fetchedForm);
+        }
+        else if (action?.type === 'delete' && formId === '_auto_' && instance) {
             setForm({
                 id: '',
-                name: '',
+                name: 'Delete',
                 entries: [
                     {
                         type: 'content',
@@ -128,28 +281,31 @@ function FormRendererContainer(props) {
                 },
             });
         }
-        else {
-            setError('Action form could not be found');
-        }
-    }, [action, actionId, objectId, instance]);
+    }, [fetchedForm, instance, action, formId]);
     useEffect(() => {
-        if (!form)
+        const error = sanitizedObjectError || fetchedFormError || instanceError;
+        if (error)
+            onError(error);
+    }, [sanitizedObjectError, fetchedFormError, instanceError]);
+    useEffect(() => {
+        if (!form || !action)
             return;
         // If no parameters are defined, then the action is synced with object properties
-        const getParamsFromObject = sanitizedObject && !action?.parameters;
-        setParameters(getParamsFromObject ? convertPropertiesToParams(sanitizedObject) : action?.parameters);
+        const getParamsFromObject = sanitizedObject && !action.parameters;
+        const parameters = (getParamsFromObject ? convertPropertiesToParams(sanitizedObject) : action.parameters) ?? [];
+        setParameters(parameters.filter((param) => param.type !== 'collection' && !param.formula));
     }, [form, action?.parameters, sanitizedObject]);
     useEffect(() => {
         const getInitialValues = async () => {
-            if (form && (instance || !instanceId)) {
-                const defaultValues = await getDefaultValues(form.entries, instance || {});
+            if (flattenFormEntries.length && (instance || !instanceId)) {
+                const defaultValues = await getDefaultValues(flattenFormEntries, instance || {});
                 setFormData(defaultValues);
                 // Deep clone to avoid reference issues
                 setLastSavedData(cloneDeep(defaultValues));
             }
         };
         getInitialValues();
-    }, [form, instance, sanitizedObject]);
+    }, [instanceId, instance, flattenFormEntries, getDefaultValues]);
     const onSubmissionSuccess = (updatedInstance) => {
         setSnackbarError({
             showAlert: true,
@@ -158,14 +314,19 @@ function FormRendererContainer(props) {
         });
         if (navigationSlug) {
             if (navigationSlug.includes(':instanceId')) {
-                const navigateInstanceId = action?.type === 'create' ? updatedInstance?.id : instanceId;
+                const navigateInstanceId = action?.type === 'create' ? updatedInstance.id : instanceId;
                 navigateTo(`/${appId}/${navigationSlug.replace(':instanceId', navigateInstanceId ?? ':instanceId')}`);
             }
             else {
                 navigateTo(`/${appId}/${navigationSlug}`);
             }
         }
-        setInstance(updatedInstance);
+        if (instanceId) {
+            // Invalidate the instance to fetch the latest version
+            queryClient.invalidateQueries({
+                queryKey: [objectId, instanceId, 'instance'],
+            });
+        }
     };
     const linkFiles = async (submission, linkTo) => {
         // Create file links for any uploaded files after instance creation
@@ -191,9 +352,7 @@ function FormRendererContainer(props) {
             if (action?.type === 'create') {
                 const response = await apiServices.post(getPrefixedUrl(`/objects/${form.objectId}/instances/actions`), {
                     actionId: form.actionId,
-                    input: omit(submission, sanitizedObject?.properties
-                        ?.filter((property) => property.formula || property.type === 'collection')
-                        .map((property) => property.id) ?? []),
+                    input: pick(submission, parameters.map((parameter) => parameter.id)),
                 });
                 if (response) {
                     // Manually link files to created instance.
@@ -204,9 +363,7 @@ function FormRendererContainer(props) {
             else if (instanceId && action) {
                 const response = await objectStore.instanceAction(instanceId, {
                     actionId: action.id,
-                    input: omit(submission, sanitizedObject?.properties
-                        ?.filter((property) => property.formula || property.type === 'collection')
-                        .map((property) => property.id) ?? []),
+                    input: pick(submission, parameters.map((parameter) => parameter.id)),
                 });
                 if (sanitizedObject && instance) {
                     onSubmissionSuccess(response);
@@ -227,78 +384,6 @@ function FormRendererContainer(props) {
             throw error; // Throw error so caller knows submission failed
         }
     };
-    const getDefaultValues = async (entries, instanceData) => {
-        const result = {};
-        const unnestedEntries = getUnnestedEntries(entries);
-        for (const entry of unnestedEntries) {
-            const fieldId = getEntryId(entry);
-            if (!fieldId)
-                continue;
-            const fieldValue = get(instanceData, fieldId);
-            if ((entry.type === 'input' || entry.type === 'inputField') &&
-                isAddressProperty(entry.parameterId || entry.input?.id)) {
-                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);
-                        });
-                    }
-                }
-                else if (fieldValue !== undefined && fieldValue !== null) {
-                    set(result, fieldId, fieldValue);
-                }
-            }
-            else if (entry.type !== 'sections' && entry.type !== 'columns' && entry.type !== 'content') {
-                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 !== '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);
-                        }
-                    }
-                }
-                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;
-                    }
-                }
-            }
-        }
-        return result;
-    };
     const removeUneditedProtectedValues = (data) => {
         const protectedProperties = sanitizedObject?.properties?.filter((prop) => prop.protection?.maskChar);
         if (!protectedProperties || protectedProperties.length === 0) {
@@ -349,26 +434,23 @@ function FormRendererContainer(props) {
     const onAutosave = form?.autosaveActionId ? handleAutosave : undefined;
     async function onChange(id, value) {
         const parameter = parameters?.find((param) => param.id === id);
-        const entries = getUnnestedEntries(form.entries);
-        const isReadOnlyField = entries.some((e) => e.type === 'readonlyField' && e.propertyId === id) &&
-            !entries.some((e) => (e.type === 'input' && e.parameterId === id) || (e.type === 'inputField' && e.input.id === id));
+        const isReadOnlyField = flattenFormEntries.some((e) => e.type === 'readonlyField' && e.propertyId === id) &&
+            !flattenFormEntries.some((e) => (e.type === 'input' && e.parameterId === id) || (e.type === 'inputField' && e.input.id === id));
         if (isReadOnlyField)
             return;
-        if (parameter) {
-            if (parameter.type === 'object' && parameters && parameters.length > 0) {
+        if (parameter?.type === 'string' && parameter.enum && value) {
+            // If a single select property has a sortBy option that isn't NONE the value gets spread and doesn't save properly,
+            // this will make it correctly save the value
+            value = value.value ? value.value : value;
+        }
+        if (!isEqual(value, get(formDataRef.current, id))) {
+            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(entries, parameters, value, apiServices, id, formDataRef.current, userAccount);
+                const dependentFields = await processValueUpdate(flattenFormEntries, parameters, value, apiServices, id, formDataRef.current, userAccount);
                 for (const field of dependentFields) {
                     onChange(field.fieldId, field.fieldValue);
                 }
             }
-            else if (parameter.type === 'string' && parameter.enum && value) {
-                // If a single select property has a sortBy option that isn't NONE the value gets spread and doesn't save properly,
-                // this will make it correctly save the value
-                value = value.value ? value.value : value;
-            }
-        }
-        if (!isEqual(value, get(formDataRef.current, id))) {
             const newData = { ...formDataRef.current };
             set(newData, id, value);
             setFormData(newData);
@@ -387,7 +469,7 @@ function FormRendererContainer(props) {
         ? onDiscardChangesOverride
         : async () => {
             if (form) {
-                const defaultValues = await getDefaultValues(form.entries, instance || {});
+                const defaultValues = await getDefaultValues(flattenFormEntries, instance || {});
                 setFormData(defaultValues);
             }
         };

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

@@ -0,0 +1,5 @@
+import React from 'react';
+declare function ConditionalQueryClientProvider({ children }: {
+    children: React.ReactNode;
+}): React.JSX.Element;
+export default ConditionalQueryClientProvider;

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

@@ -0,0 +1,21 @@
+import { QueryCache, QueryClient, QueryClientContext, QueryClientProvider } from '@tanstack/react-query';
+import React, { useContext, useState } from 'react';
+// If FormRenderer is rendered outside a QueryClientProvider (e.g. standalone usage),
+// we create a local QueryClient so React Query hooks still work.
+// If a provider already exists, we reuse it to avoid fragmenting the cache.
+function ConditionalQueryClientProvider({ children }) {
+    const existingQueryClient = useContext(QueryClientContext);
+    const [localQueryClient] = useState(() => new QueryClient({
+        queryCache: new QueryCache({
+            onError: (error, query) => {
+                const message = query.meta?.errorMessage ?? 'Something went wrong:';
+                console.error(message, error);
+            },
+        }),
+    }));
+    if (existingQueryClient) {
+        return React.createElement(React.Fragment, null, children);
+    }
+    return React.createElement(QueryClientProvider, { client: localQueryClient }, children);
+}
+export default ConditionalQueryClientProvider;

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

@@ -1,6 +1,6 @@
 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[], unnestedEntries: FormEntry[], entry: InputParameterReference | InputField, fieldValue: unknown, fieldId: string, apiServices: ApiServices, userAccount?: UserAccount, formValues?: FieldValues, updatedRelatedObjectValue?: ObjectInstance | null | Reference): Promise<{
+export declare function evalDefaultVals(parameters: InputParameter[], entry: InputParameterReference | InputField, fieldValue: unknown, fieldId: string, apiServices: ApiServices, userAccount?: UserAccount, formValues?: FieldValues, updatedRelatedObjectValue?: ObjectInstance | null | Reference, updatedRelatedObjectParamId?: string): Promise<{
     fieldId: string;
     fieldValue: unknown;
 }[]>;