@evoke-platform/ui-components 1.16.0 → 1.17.0

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

@@ -1,10 +1,10 @@
 /// <reference types="react" />
-import { Action, ApiServices, Column, Columns, EvokeForm, FormEntry, InputField, InputParameter, InputParameterReference, Obj, ObjectInstance, ObjWithRoot, PanelViewEntry, Property, Section, Sections, UserAccount } from '@evoke-platform/context';
+import { Action, ApiServices, Column, Columns, EvokeForm, FormEntry, InputField, InputParameter, InputParameterReference, Obj, ObjectInstance, Property, Section, Sections, UserAccount, ObjWithRoot, PanelViewEntry } from '@evoke-platform/context';
 import { LocalDateTime } from '@js-joda/core';
 import { FieldErrors, FieldValues } from 'react-hook-form';
 import { ObjectProperty } from '../../../../types';
 import { AutocompleteOption } from '../../../core';
-import { DocumentReference, FileUploadBatchResult, InstanceLink } from './types';
+import { InstanceLink, SavedDocumentReference } from './types';
 export declare const scrollIntoViewWithOffset: (el: HTMLElement, offset: number, container?: HTMLElement) => void;
 export declare const normalizeDateTime: (dateTime: LocalDateTime) => string;
 export declare function isAddressProperty(key: string): boolean;
@@ -20,6 +20,10 @@ export declare const entryIsVisible: (entry: FormEntry, instance?: FieldValues,
  */
 export declare const getNestedParameterIds: (entry: Sections | Columns) => string[];
 export declare const getEntryId: (entry: FormEntry) => string | undefined;
+/**
+ * Returns editable field IDs that are currently visible on the form.
+ */
+export declare const getVisibleEditableFieldIds: (entries: FormEntry[], instance?: FieldValues, formValues?: FieldValues) => string[];
 export declare function getPrefixedUrl(url: string): string;
 export declare const isOptionEqualToValue: (option: AutocompleteOption | string, value: unknown) => boolean;
 export declare function addressProperties(addressProperty: Property): Property[];
@@ -50,13 +54,16 @@ export declare const convertPropertiesToParams: (object: Obj) => InputParameter[
 export declare function getUnnestedEntries(entries: FormEntry[]): FormEntry[];
 export declare const isEmptyWithDefault: (fieldValue: unknown, entry: InputParameterReference | InputField, instance: Record<string, unknown> | object) => boolean | "" | 0 | undefined;
 export declare const docProperties: Property[];
-export declare const uploadFiles: (files: (File | DocumentReference)[], apiServices: ApiServices, actionId?: string, fileObjectId?: string, linkTo?: InstanceLink, shortCircuit?: boolean) => Promise<FileUploadBatchResult>;
+/**
+ * Upload files using the POST /files endpoint for sys__file objects
+ */
+export declare const uploadFiles: (files: (File | SavedDocumentReference)[], apiServices: ApiServices, actionId?: string, metadata?: Record<string, string>, linkTo?: InstanceLink) => Promise<SavedDocumentReference[]>;
 /**
  * Creates file links for uploaded files by calling the objects endpoint with sys__fileLink
  * This is used after instance creation when the instance ID becomes available
  */
-export declare const createFileLinks: (fileReferences: DocumentReference[], linkedInstance: InstanceLink, apiServices: ApiServices) => Promise<void>;
-export declare const uploadDocuments: (files: (File | DocumentReference)[], metadata: Record<string, string>, apiServices: ApiServices, instanceId: string, objectId: string) => Promise<DocumentReference[]>;
+export declare const createFileLinks: (files: SavedDocumentReference[], linkedInstance: InstanceLink, apiServices: ApiServices) => Promise<void>;
+export declare const uploadDocuments: (files: (File | SavedDocumentReference)[], metadata: Record<string, string>, apiServices: ApiServices, instanceId: string, objectId: string) => Promise<SavedDocumentReference[]>;
 export declare const deleteDocuments: (submittedFields: FieldValues, requestSuccess: boolean, apiServices: ApiServices, object: Obj, instance: FieldValues, action?: Action, setSnackbarError?: React.Dispatch<React.SetStateAction<{
     showAlert: boolean;
     message?: string;
@@ -82,10 +89,9 @@ export declare function formatSubmission(submission: FieldValues, apiServices?:
 }>>, associatedObject?: {
     instanceId: string;
     propertyId: string;
-    objectId?: string;
 }, parameters?: InputParameter[]): Promise<FieldValues>;
 export declare function filterEmptySections(entry: Sections | Columns, instance?: FieldValues, formData?: FieldValues): Sections | Columns | null;
-export declare function assignIdsToSectionsAndRichText(entries: FormEntry[] | PanelViewEntry[], object: Obj, parameters?: InputParameter[]): FormEntry[] | PanelViewEntry[];
+export declare function assignIdsToSectionsAndRichText(entries: FormEntry[] | PanelViewEntry[], object?: Obj, parameters?: InputParameter[]): FormEntry[] | PanelViewEntry[];
 /**
  * Converts a plain text string to RTF format suitable for a RichTextEditor.
  *
@@ -99,12 +105,8 @@ export declare function assignIdsToSectionsAndRichText(entries: FormEntry[] | Pa
  * This ensures that any plain text input will be safely represented in RTF without losing formatting or characters.
  */
 export declare function plainTextToRtf(plainText: string): string;
-export declare function getFieldDefinition(entry: FormEntry | PanelViewEntry, object: Obj, parameters?: InputParameter[]): InputParameter | Property | undefined;
+export declare function getFieldDefinition(entry: FormEntry | PanelViewEntry, object?: Obj, parameters?: InputParameter[]): InputParameter | Property | undefined;
 export declare function obfuscateValue(value: unknown, property?: Partial<Property> | Partial<ObjectProperty>): unknown;
-export declare function handleFileUpload(apiServices: ApiServices, submission: FieldValues, actionId: string, objectId?: string, instanceId?: string, linkTo?: {
-    instanceId: string;
-    objectId: string;
-}): Promise<ObjectInstance>;
 export declare function useFormById(formId: string, apiServices: ApiServices, errorMessage?: string): import("@tanstack/react-query/build/legacy/types").UseQueryResult<EvokeForm, Error>;
 /**
  * Extract all values from a criteria/filter object.

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

@@ -1,5 +1,4 @@
 import { LocalDateTime } from '@js-joda/core';
-import { useQuery } from '@tanstack/react-query';
 import { jsonLogic } from 'json-logic-js-graphql';
 import { get, isArray, isEmpty, isObject, omit, pick, startCase, transform } from 'lodash';
 import { DateTime } from 'luxon';
@@ -7,6 +6,7 @@ import { nanoid } from 'nanoid';
 import Handlebars from 'no-eval-handlebars';
 import { defaultRuleProcessorMongoDB, formatQuery } from 'react-querybuilder';
 import { parseMongoDB } from '../../util';
+import { useQuery } from '@tanstack/react-query';
 export const scrollIntoViewWithOffset = (el, offset, container) => {
     const elementRect = el.getBoundingClientRect();
     const containerRect = container ? container.getBoundingClientRect() : document.body.getBoundingClientRect();
@@ -117,15 +117,47 @@ export const getEntryId = (entry) => {
                 ? entry.input.id
                 : undefined;
 };
-const getEntryType = (entry, parameters) => {
-    if (entry?.type === 'inputField') {
-        return entry?.input?.type;
-    }
-    else if (entry?.type === 'input') {
-        // For 'input' type entries, look up the parameter by parameterId
-        const parameter = parameters?.find((param) => param.id === entry.parameterId);
-        return parameter?.type;
-    }
+/**
+ * Returns editable field IDs that are currently visible on the form.
+ */
+export const getVisibleEditableFieldIds = (entries, instance, formValues) => {
+    const fieldIds = new Set();
+    const collectVisibleIds = (entriesToCheck) => {
+        entriesToCheck.forEach((entry) => {
+            if (!entryIsVisible(entry, instance, formValues)) {
+                return;
+            }
+            if (entry.type === 'sections') {
+                entry.sections.forEach((section) => {
+                    if (section.entries) {
+                        collectVisibleIds(section.entries);
+                    }
+                });
+                return;
+            }
+            if (entry.type === 'columns') {
+                entry.columns.forEach((column) => {
+                    if (column.entries) {
+                        collectVisibleIds(column.entries);
+                    }
+                });
+                return;
+            }
+            if (entry.type !== 'input' && entry.type !== 'inputField') {
+                return;
+            }
+            // Collection entries are handled by their own flow and are not part of autosave payloads.
+            if (entry.type === 'inputField' && entry.input.type === 'collection') {
+                return;
+            }
+            const fieldId = getEntryId(entry);
+            if (fieldId) {
+                fieldIds.add(fieldId);
+            }
+        });
+    };
+    collectVisibleIds(entries ?? []);
+    return Array.from(fieldIds);
 };
 export function getPrefixedUrl(url) {
     const wcsMatchers = ['/apps', '/pages', '/widgets'];
@@ -135,8 +167,8 @@ export function getPrefixedUrl(url) {
         '/documents',
         '/payments',
         '/forms',
+        '/formlets',
         '/locations',
-        '/files',
     ];
     const signalrMatchers = ['/hubs'];
     const accessManagementMatchers = ['/users'];
@@ -477,85 +509,53 @@ export const docProperties = [
         type: 'string',
     },
 ];
-export const uploadFiles = async (files, apiServices, actionId = '_create', fileObjectId = 'sys__file', linkTo, shortCircuit = true) => {
+/**
+ * Upload files using the POST /files endpoint for sys__file objects
+ */
+export const uploadFiles = async (files, apiServices, actionId = '_create', metadata, linkTo) => {
     // Separate already uploaded files from files that need uploading
     const alreadyUploaded = files.filter((file) => !('size' in file));
     const filesToUpload = files.filter((file) => 'size' in file);
-    let failedUpload = false;
-    // Upload all files in parallel, handling each result individually
-    const uploadPromises = [];
-    for (const file of filesToUpload) {
+    // Upload all files in parallel
+    const uploadPromises = filesToUpload.map(async (file) => {
         const formData = new FormData();
         formData.append('file', file);
         formData.append('actionId', actionId);
-        formData.append('objectId', fileObjectId);
-        formData.append('input', JSON.stringify({ name: file.name, contentType: file.type }));
+        formData.append('objectId', 'sys__file');
+        if (metadata) {
+            for (const [key, value] of Object.entries(metadata)) {
+                formData.append(key, value);
+            }
+        }
         if (linkTo) {
             formData.append('linkTo', JSON.stringify(linkTo));
         }
-        const uploadPromise = (async () => {
-            try {
-                const fileInstance = await apiServices.post(getPrefixedUrl(`/files`), formData);
-                return {
-                    id: fileInstance.id,
-                    name: fileInstance.name,
-                    unsaved: true,
-                };
-            }
-            catch (error) {
-                console.error(`Failed to upload file ${file.name}:`, error);
-                failedUpload = true;
-            }
-        })();
-        uploadPromises.push(uploadPromise);
-    }
-    if (!shortCircuit) {
-        // Wait for all upload attempts to complete (successes and failures)
-        const uploadResults = await Promise.allSettled(uploadPromises);
-        const uploadedFiles = uploadResults
-            .filter((result) => result.status === 'fulfilled' && !!result.value)
-            .map((result) => result.value);
-        const failedCount = filesToUpload.length - uploadedFiles.length;
+        const fileInstance = await apiServices.post(getPrefixedUrl(`/files`), formData);
         return {
-            successfulUploads: [...alreadyUploaded, ...uploadedFiles],
-            errorMessage: failedCount > 0 ? `Failed to upload ${failedCount} file(s)` : undefined,
+            id: fileInstance.id,
+            name: fileInstance.name,
         };
-    }
+    });
     const uploadedFiles = await Promise.all(uploadPromises);
-    if (failedUpload) {
-        return {
-            successfulUploads: [],
-            errorMessage: 'An error occurred when uploading files',
-        };
-    }
-    return {
-        successfulUploads: [...alreadyUploaded, ...uploadedFiles],
-    };
+    return [...alreadyUploaded, ...uploadedFiles];
 };
 /**
  * Creates file links for uploaded files by calling the objects endpoint with sys__fileLink
  * This is used after instance creation when the instance ID becomes available
  */
-export const createFileLinks = async (fileReferences, linkedInstance, apiServices) => {
-    // Link files in parallel, handling each result individually
-    const linkPromises = [];
-    for (const file of fileReferences) {
-        const linkPromise = (async () => {
-            try {
-                await apiServices.post(getPrefixedUrl(`/objects/sys__fileLink/instances/actions`), {
-                    actionId: '_create',
-                    input: { name: 'File Link', file: { id: file.id, name: file.name }, linkedInstance },
-                });
-            }
-            catch (error) {
-                console.error(`Failed to create file link for ${file.name}:`, error);
-                // The file remains unlinked and can be retried later
-            }
-        })();
-        linkPromises.push(linkPromise);
-    }
-    // Wait for all linking attempts to complete (successes and failures)
-    await Promise.allSettled(linkPromises);
+export const createFileLinks = async (files, linkedInstance, apiServices) => {
+    const linkPromises = files.map(async (file) => {
+        await apiServices.post(getPrefixedUrl(`/objects/sys__fileLink/instances`), {
+            name: 'File Link',
+            file: { id: file.id, name: file.name },
+            linkedInstance,
+        }, {
+            params: {
+                actionId: '_create',
+            },
+        });
+    });
+    await Promise.all(linkPromises);
 };
 export const uploadDocuments = async (files, metadata, apiServices, instanceId, objectId) => {
     const allDocuments = [];
@@ -583,29 +583,20 @@ export const uploadDocuments = async (files, metadata, apiServices, instanceId,
 export const deleteDocuments = async (submittedFields, requestSuccess, apiServices, object, instance, action, setSnackbarError) => {
     const documentProperties = action?.parameters
         ? action.parameters.filter((param) => ['document', 'file'].includes(param.type))
-        : object.properties?.filter((prop) => ['document', 'file'].includes(prop.type));
+        : object?.properties?.filter((prop) => ['document', 'file'].includes(prop.type));
     for (const docProperty of documentProperties ?? []) {
         const savedValue = submittedFields[docProperty.id];
-        const originalValue = instance[docProperty.id];
+        const originalValue = instance?.[docProperty.id];
         const documentsToRemove = requestSuccess
             ? (originalValue?.filter((file) => !savedValue?.some((f) => f.id === file.id)) ?? [])
             : (savedValue?.filter((file) => !originalValue?.some((f) => f.id === file.id)) ?? []);
         for (const doc of documentsToRemove) {
             try {
-                // Build context for state model
-                const fieldType = docProperty.type === 'file' ? 'file' : 'document';
-                if (fieldType === 'file') {
-                    // For file properties, unlink the file. Don't delete the actual file
-                    // since other instances may be using it.
-                    await apiServices.post(getPrefixedUrl(`/files/${doc.id}/unlinkInstance`), {
-                        linkedInstanceId: instance.id,
-                        linkedObjectId: object.id,
-                    });
-                }
-                else {
-                    // For document properties, delete the document
-                    await apiServices.delete(getPrefixedUrl(`/objects/${object.id}/instances/${instance.id}/documents/${doc.id}`));
-                }
+                // Use different endpoints based on property type
+                const deleteEndpoint = docProperty.type === 'file'
+                    ? getPrefixedUrl(`/files/${doc.id}`)
+                    : getPrefixedUrl(`/objects/${object.id}/instances/${instance.id}/documents/${doc.id}`);
+                await apiServices?.delete(deleteEndpoint);
             }
             catch (error) {
                 if (error) {
@@ -620,28 +611,16 @@ export const deleteDocuments = async (submittedFields, requestSuccess, apiServic
         }
     }
 };
-async function handleUploads(files, propertyType, entry, apiServices, objectId, instanceId) {
-    if (propertyType === 'file') {
-        const fileObjectId = entry.display?.fileObjectId ?? 'sys__file';
-        const createActionId = entry.display?.createActionId ?? '_create';
-        return await uploadFiles(files, apiServices, createActionId, fileObjectId, instanceId ? { id: instanceId, objectId } : undefined);
+const getEntryType = (entry, parameters) => {
+    if (entry?.type === 'inputField') {
+        return entry.input.type;
     }
-    else if (propertyType === 'document' && instanceId) {
-        try {
-            const docs = await uploadDocuments(files, {
-                type: '',
-                view_permission: '',
-                ...entry?.documentMetadata,
-            }, apiServices, instanceId, objectId);
-            return { successfulUploads: docs };
-        }
-        catch (error) {
-            console.error('Error uploading documents:', error);
-            return { successfulUploads: [], errorMessage: 'Error uploading documents' };
-        }
+    else if (entry?.type === 'input') {
+        // For 'input' type entries, look up the parameter by parameterId
+        const parameter = parameters?.find((param) => param.id === entry.parameterId);
+        return parameter?.type;
     }
-    return { successfulUploads: [] };
-}
+};
 /**
  * Transforms a form submission into a format safe for API submission.
  *
@@ -659,36 +638,44 @@ export async function formatSubmission(submission, apiServices, objectId, instan
     if (associatedObject) {
         delete submission[associatedObject.propertyId];
     }
-    const allEntries = getUnnestedEntries(form?.entries ?? []);
+    const allEntries = getUnnestedEntries(form?.entries ?? []) ?? [];
     for (const [key, value] of Object.entries(submission)) {
         const entry = allEntries?.find((entry) => getEntryId(entry) === key);
         if (isArray(value)) {
-            const propertyType = getEntryType(entry, parameters);
-            // The only array types we need to handle specially are 'file' and 'document'.
-            if (propertyType !== 'file' && propertyType !== 'document') {
-                continue;
-            }
-            // Only upload if array contains File instances (not SavedDocumentReference).
+            // Only upload if array contains File instances (not SavedDocumentReference)
             const fileInArray = value.some((item) => item instanceof File);
             if (fileInArray && apiServices && objectId) {
-                const result = await handleUploads(value, propertyType ?? '', entry, apiServices, objectId, instanceId);
-                if (result.errorMessage) {
-                    setSnackbarError?.({
-                        showAlert: true,
-                        // Provide generic message since we're ignoring a partial upload.
-                        message: `An error occurred while uploading associated ${propertyType === 'file' ? 'files' : 'documents'}`,
-                        isError: true,
-                    });
+                // Determine property type from the entry
+                const parameterType = getEntryType(entry, parameters);
+                try {
+                    let uploadedDocuments = [];
+                    if (parameterType === 'file') {
+                        uploadedDocuments = await uploadFiles(value, apiServices, '_create', {
+                            ...entry?.documentMetadata,
+                        }, 
+                        // Only pass linkTo if instanceId exists (update action)
+                        instanceId ? { id: instanceId, objectId } : undefined);
+                    }
+                    else if (parameterType === 'document' && instanceId) {
+                        uploadedDocuments = await uploadDocuments(value, {
+                            type: '',
+                            view_permission: '',
+                            ...entry?.documentMetadata,
+                        }, apiServices, instanceId, objectId);
+                    }
+                    submission[key] = uploadedDocuments;
+                }
+                catch (err) {
+                    if (err) {
+                        setSnackbarError &&
+                            setSnackbarError({
+                                showAlert: true,
+                                message: `An error occurred while uploading associated ${parameterType === 'file' ? 'files' : 'documents'}`,
+                                isError: true,
+                            });
+                    }
                     return submission;
                 }
-                submission[key] = result.successfulUploads;
-            }
-            else {
-                submission[key] = value
-                    // This should never happen but it's possible that the else branch
-                    // is reached because either 'apiServices' or 'objectId' is undefined.
-                    // If that's the case the submission will fail if we submit File blobs.
-                    .filter((file) => !(file instanceof File));
             }
             // if there are address fields with no value address needs to be set to undefined to be able to submit
         }
@@ -702,8 +689,7 @@ export async function formatSubmission(submission, apiServices, objectId, instan
                 submission[key] =
                     entry &&
                         ['input', 'inputField'].includes(entry.type) &&
-                        (entry.display?.relatedObjectId ||
-                            associatedObject?.objectId)
+                        entry.display?.relatedObjectId
                         ? pick(value, 'id', 'name', 'objectId')
                         : pick(value, 'id', 'name');
             }
@@ -856,8 +842,8 @@ export function getFieldDefinition(entry, object, parameters) {
     }
     else if (entry.type === 'readonlyField') {
         def = isAddressProperty(entry.propertyId)
-            ? object.properties?.find((prop) => prop.id === entry.propertyId.split('.')[0])
-            : object.properties?.find((prop) => prop.id === entry.propertyId);
+            ? object?.properties?.find((prop) => prop.id === entry.propertyId.split('.')[0])
+            : object?.properties?.find((prop) => prop.id === entry.propertyId);
     }
     else if (entry.type === 'inputField') {
         def = entry.input;
@@ -935,34 +921,12 @@ function applyMaskToObfuscatedValue(value, mask) {
     }
     return maskedValue;
 }
-export async function handleFileUpload(apiServices, submission, actionId, objectId, instanceId, linkTo) {
-    const formData = new FormData();
-    if (submission['content'] instanceof File && submission['content'].size !== 0) {
-        formData.append('file', submission['content']);
-    }
-    formData.append('objectId', objectId ?? 'sys__file');
-    formData.append('actionId', actionId);
-    delete submission['content'];
-    formData.append('input', JSON.stringify(submission));
-    if (instanceId) {
-        return await apiServices.patch(getPrefixedUrl(`/files/${instanceId}`), formData);
-    }
-    else {
-        if (linkTo) {
-            formData.append('linkTo', JSON.stringify({
-                id: linkTo?.instanceId,
-                objectId: linkTo?.objectId,
-            }));
-        }
-        return await apiServices.post(getPrefixedUrl(`/files`), formData);
-    }
-}
 export function useFormById(formId, apiServices, errorMessage) {
     return useQuery({
         queryKey: ['form', formId],
         enabled: formId !== '_auto_' && !!formId,
         staleTime: Infinity,
-        queryFn: () => apiServices.get(getPrefixedUrl(`/forms/${formId}`)),
+        queryFn: () => apiServices.get(getPrefixedUrl(`/forms/${formId}/effective`)),
         meta: {
             errorMessage,
         },

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

@@ -34,6 +34,11 @@ describe('FormRenderer', () => {
             if (sanitizedVersion === 'true') {
                 return HttpResponse.json(specialtyObject);
             }
+        }), http.get('/api/data/objects/formletTestObject/effective', (req) => {
+            const sanitizedVersion = new URL(req.request.url).searchParams.get('sanitizedVersion');
+            if (sanitizedVersion === 'true') {
+                return HttpResponse.json({});
+            }
         }), http.get('/api/data/objects/accessibility508Object/effective', (req) => {
             const sanitizedVersion = new URL(req.request.url).searchParams.get('sanitizedVersion');
             if (sanitizedVersion === 'true') {
@@ -416,7 +421,7 @@ describe('FormRenderer', () => {
     });
     describe('when passed a regular related object entry', () => {
         const setupTestMocks = (object, form, instances) => {
-            server.use(http.get(`/api/data/objects/${object.id}/effective`, () => HttpResponse.json(object)), http.get(`/api/data/forms/${form.id}`, () => HttpResponse.json(form)), http.get(`/api/data/forms?filter={"where":{"actionId":"${form.actionId}","objectId":"${object.id}"}}`, () => HttpResponse.json([form])), http.get(`/api/data/objects/${object.id}/instances`, () => HttpResponse.json(instances || [])));
+            server.use(http.get(`/api/data/objects/${object.id}/effective`, () => HttpResponse.json(object)), http.get(`/api/data/forms/${form.id}/effective`, () => HttpResponse.json(form)), http.get(`/api/data/forms?filter={"where":{"actionId":"${form.actionId}","objectId":"${object.id}"}}`, () => HttpResponse.json([form])), http.get(`/api/data/objects/${object.id}/instances`, () => HttpResponse.json(instances || [])));
         };
         describe('when in table view', () => {
             describe('when mode is existing records only', () => {
@@ -880,7 +885,7 @@ describe('FormRenderer', () => {
                 });
                 it('displays a not found error in record creation mode if a form could not be found', async () => {
                     const user = userEvent.setup();
-                    server.use(http.get('/api/data/forms/specialtyTypeForm', () => {
+                    server.use(http.get('/api/data/forms/specialtyTypeForm/effective', () => {
                         return HttpResponse.json({ error: 'Not found' }, { status: 404 });
                     }));
                     render(React.createElement(FormRenderer, { form: form, onChange: () => { } }));
@@ -1180,7 +1185,7 @@ describe('FormRenderer', () => {
     });
     describe('when passed a dynamic related object entry', () => {
         const setupTestMocks = (object, form, instances) => {
-            server.use(http.get(`/api/data/objects/${object.id}/effective`, () => HttpResponse.json(object)), http.get(`/api/data/forms/${form.id}`, () => HttpResponse.json(form)), http.get(`/api/data/forms?filter={"where":{"actionId":"${form.actionId}","objectId":"${object.id}"}}`, () => HttpResponse.json([form])), http.get(`/api/data/objects/${object.id}/instances`, () => HttpResponse.json(instances || [])));
+            server.use(http.get(`/api/data/objects/${object.id}/effective`, () => HttpResponse.json(object)), http.get(`/api/data/forms/${form.id}/effective`, () => HttpResponse.json(form)), http.get(`/api/data/forms?filter={"where":{"actionId":"${form.actionId}","objectId":"${object.id}"}}`, () => HttpResponse.json([form])), http.get(`/api/data/objects/${object.id}/instances`, () => HttpResponse.json(instances || [])));
         };
         const form = {
             id: 'relatedObjectTestForm',
@@ -1294,7 +1299,7 @@ describe('FormRenderer', () => {
         });
         it('displays a not found error in record creation mode if a form could not be found', async () => {
             const user = userEvent.setup();
-            server.use(http.get('/api/data/forms/specialtyTypeForm', () => {
+            server.use(http.get('/api/data/forms/specialtyTypeForm/effective', () => {
                 return HttpResponse.json({ error: 'Not found' }, { status: 404 });
             }));
             render(React.createElement(FormRenderer, { form: form, onChange: () => { } }));
@@ -1306,7 +1311,7 @@ describe('FormRenderer', () => {
     });
     describe('when passed a one-to-many collection entry', () => {
         const setupTestMocks = (object, form, instances) => {
-            server.use(http.get(`/api/data/objects/${object.id}/effective`, () => HttpResponse.json(object)), http.get(`/api/data/forms/${form.id}`, () => HttpResponse.json(form)), http.get(`/api/data/forms?filter={"where":{"actionId":"${form.actionId}","objectId":"${object.id}"}}`, () => HttpResponse.json([form])), http.get(`/api/data/objects/${object.id}/instances`, () => HttpResponse.json(instances || [])), http.get(`/api/data/objects/${object.id}/instances/checkAccess`, () => HttpResponse.json({
+            server.use(http.get(`/api/data/objects/${object.id}/effective`, () => HttpResponse.json(object)), http.get(`/api/data/forms/${form.id}/effective`, () => HttpResponse.json(form)), http.get(`/api/data/forms?filter={"where":{"actionId":"${form.actionId}","objectId":"${object.id}"}}`, () => HttpResponse.json([form])), http.get(`/api/data/objects/${object.id}/instances`, () => HttpResponse.json(instances || [])), http.get(`/api/data/objects/${object.id}/instances/checkAccess`, () => HttpResponse.json({
                 result: true,
             })));
         };
@@ -1648,4 +1653,42 @@ describe('FormRenderer', () => {
             expect(textField).toHaveValue('Test Input');
         });
     });
+    describe('when passed a formlet entry', () => {
+        const formlet = {
+            id: 'formletId',
+            name: 'Test Formlet',
+            entries: [
+                {
+                    type: 'inputField',
+                    input: {
+                        type: 'date',
+                        id: 'dateId2',
+                    },
+                    display: {
+                        label: 'Date 2',
+                        required: false,
+                    },
+                },
+            ],
+        };
+        beforeEach(() => {
+            server.use(http.get('/api/data/formlets/formletId', () => HttpResponse.json(formlet)));
+        });
+        it('should render formlet entry fields', async () => {
+            const form = {
+                id: 'formWithFormlet',
+                name: 'Form With Formlet',
+                entries: [
+                    {
+                        type: 'formlet',
+                        formletId: 'formletId',
+                    },
+                ],
+                actionId: '_update',
+                objectId: 'formletTestObject',
+            };
+            render(React.createElement(FormRenderer, { form: form, onChange: () => { } }));
+            await screen.findByLabelText('Date 2');
+        });
+    });
 });