@evoke-platform/ui-components 1.15.0 → 1.16.0

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

@@ -1,7 +1,7 @@
-import { isArray, isEmpty, uniq } from 'lodash';
+import { isArray, isEmpty, isObject, uniq } from 'lodash';
 import { DateTime } from 'luxon';
-import { getEntryId, getPrefixedUrl, isAddressProperty } from './utils';
-export async function evalDefaultVals(parameters, unnestedEntries, entry, fieldValue, fieldId, apiServices, userAccount, formValues, updatedRelatedObjectValue) {
+import { getEntryId, getPrefixedUrl, isAddressProperty, transformToWhere, updateCriteriaInputs } from './utils';
+export async function evalDefaultVals(parameters, entry, fieldValue, fieldId, apiServices, userAccount, formValues, updatedRelatedObjectValue, updatedRelatedObjectParamId) {
     const updates = [];
     const parameter = parameters.find((param) => param.id === fieldId);
     const defaultValue = entry.display?.defaultValue;
@@ -14,7 +14,6 @@ export async function evalDefaultVals(parameters, unnestedEntries, entry, fieldV
             const regex = /^{{input\.(?<relatedObjectProperty>[a-zA-Z][a-zA-Z0-9_]*)\.(?<nestedProperty>[a-zA-Z][a-zA-Z0-9_]*)}}$/;
             const groups = regex.exec(item)?.groups;
             if (groups?.relatedObjectProperty && groups?.nestedProperty) {
-                const relatedObjectParameter = parameters.find((param) => param.id === groups?.relatedObjectProperty);
                 let relatedObjectInstance = updatedRelatedObjectValue;
                 if (!relatedObjectInstance && !isEmpty(formValues)) {
                     relatedObjectInstance = formValues[groups.relatedObjectProperty];
@@ -28,30 +27,14 @@ export async function evalDefaultVals(parameters, unnestedEntries, entry, fieldV
                     ]);
                     updates.push({ fieldId, fieldValue });
                 }
-                else if (relatedObjectInstance?.id && relatedObjectParameter) {
-                    let relatedObjectId = relatedObjectParameter.objectId;
-                    if (!relatedObjectId) {
-                        const relatedObjectParamEntry = unnestedEntries.find((e) => getEntryId(e) === relatedObjectParameter.id);
-                        relatedObjectId = relatedObjectParamEntry?.display?.relatedObjectId;
-                    }
-                    const instance = await new Promise((resolve) => {
-                        apiServices.get(getPrefixedUrl(`/objects/${relatedObjectId}/instances/${relatedObjectInstance?.id}`), (error, instance) => {
-                            if (error) {
-                                console.error(error);
-                                return resolve(undefined);
-                            }
-                            resolve(instance);
-                        });
-                    });
-                    if (instance) {
-                        fieldValue = uniq([
-                            ...staticValues,
-                            ...(isArray(instance[groups.nestedProperty])
-                                ? instance[groups.nestedProperty]
-                                : []),
-                        ]);
-                        updates.push({ fieldId, fieldValue });
-                    }
+                else if (relatedObjectInstance) {
+                    fieldValue = uniq([
+                        ...staticValues,
+                        ...(isArray(relatedObjectInstance[groups.nestedProperty])
+                            ? relatedObjectInstance[groups.nestedProperty]
+                            : []),
+                    ]);
+                    updates.push({ fieldId, fieldValue });
                 }
                 else {
                     updates.push({ fieldId, fieldValue: staticValues });
@@ -65,42 +48,23 @@ export async function evalDefaultVals(parameters, unnestedEntries, entry, fieldV
     }
     else if (typeof defaultValue === 'string' && /^{{.*}}$/.test(defaultValue)) {
         if (isAddressProperty(fieldId)) {
-            const regex = /^{{input\.(?<relatedObjectProperty>[a-zA-Z][a-zA-Z0-9_]*)\.(?<addressProperty>[a-zA-Z][a-zA-Z0-9_]*)\.(?<nestedAddressProperty>line1|line2|city|county|state|zipCode)}}$/;
+            const regex = /^{{input\.(?<relatedObjectProperty>[a-zA-Z][a-zA-Z0-9_]*)\.(?<addressProperty>[a-zA-Z][a-zA-Z0-9_]*)\.(?<nestedAddressProperty>line1|line2|city|county|state|zipCode|country)}}$/;
             const groups = regex.exec(defaultValue)?.groups;
             if (groups?.relatedObjectProperty && groups?.addressProperty && groups?.nestedAddressProperty) {
-                const relatedObjectParameter = parameters.find((param) => param.id === groups?.relatedObjectProperty);
                 let relatedObjectInstance = updatedRelatedObjectValue;
                 if (!relatedObjectInstance && !isEmpty(formValues)) {
                     relatedObjectInstance = formValues[groups.relatedObjectProperty];
                 }
-                if (updatedRelatedObjectValue?.[groups.addressProperty]?.[groups.nestedAddressProperty]) {
+                if (updatedRelatedObjectValue === null) {
+                    updates.push({ fieldId, fieldValue: '' });
+                }
+                else if (updatedRelatedObjectValue?.[groups.addressProperty]?.[groups.nestedAddressProperty]) {
                     fieldValue = updatedRelatedObjectValue?.[groups.addressProperty]?.[groups.nestedAddressProperty];
                     updates.push({ fieldId, fieldValue });
                 }
-                else if (relatedObjectInstance?.id && relatedObjectParameter) {
-                    let relatedObjectId = relatedObjectParameter.objectId;
-                    if (!relatedObjectId) {
-                        const relatedObjectParamEntry = unnestedEntries.find((e) => getEntryId(e) === relatedObjectParameter.id);
-                        relatedObjectId = relatedObjectParamEntry?.display?.relatedObjectId;
-                    }
-                    const instance = await new Promise((resolve) => {
-                        apiServices.get(getPrefixedUrl(`/objects/${relatedObjectId}/instances/${relatedObjectInstance?.id}`), (error, instance) => {
-                            if (error) {
-                                console.error(error);
-                                return resolve(undefined);
-                            }
-                            resolve(instance);
-                        });
-                    });
-                    // Clear dependent fields only if value is explicitly null (user cleared it).
-                    // If updatedRelatedObjectValue is undefined (not triggered by onChange), use the value from the instance.
-                    if (updatedRelatedObjectValue === null) {
-                        updates.push({ fieldId, fieldValue: '' });
-                    }
-                    else if (instance) {
-                        fieldValue = instance?.[groups.addressProperty]?.[groups.nestedAddressProperty];
-                        updates.push({ fieldId, fieldValue });
-                    }
+                else if (relatedObjectInstance) {
+                    fieldValue = relatedObjectInstance?.[groups.addressProperty]?.[groups.nestedAddressProperty];
+                    updates.push({ fieldId, fieldValue });
                 }
             }
         }
@@ -108,44 +72,44 @@ export async function evalDefaultVals(parameters, unnestedEntries, entry, fieldV
             const regex = /^{{input\.(?<relatedObjectProperty>[a-zA-Z][a-zA-Z0-9_]*)\.(?<nestedProperty>[a-zA-Z][a-zA-Z0-9_]*)}}$/;
             const groups = regex.exec(defaultValue)?.groups;
             if (groups?.relatedObjectProperty && groups?.nestedProperty) {
-                const relatedObjectParameter = parameters.find((param) => param.id === groups?.relatedObjectProperty);
                 let relatedObjectInstance = updatedRelatedObjectValue;
                 if (!relatedObjectInstance && !isEmpty(formValues)) {
                     relatedObjectInstance = formValues[groups.relatedObjectProperty];
                 }
-                if (updatedRelatedObjectValue?.[groups.nestedProperty]) {
+                if (updatedRelatedObjectValue === null) {
+                    updates.push({ fieldId, fieldValue: null });
+                }
+                else if (updatedRelatedObjectValue?.[groups.nestedProperty]) {
                     fieldValue = updatedRelatedObjectValue[groups.nestedProperty];
                     updates.push({ fieldId, fieldValue });
                 }
-                else if (relatedObjectInstance?.id && relatedObjectParameter) {
-                    let relatedObjectId = relatedObjectParameter.objectId;
-                    if (!relatedObjectId) {
-                        const relatedObjectParamEntry = unnestedEntries.find((e) => getEntryId(e) === relatedObjectParameter.id);
-                        relatedObjectId = relatedObjectParamEntry?.display?.relatedObjectId;
-                    }
-                    const instance = await new Promise((resolve) => {
-                        apiServices.get(getPrefixedUrl(`/objects/${relatedObjectId}/instances/${relatedObjectInstance?.id}`), (error, instance) => {
-                            if (error) {
-                                console.error(error);
-                                return resolve(undefined);
-                            }
-                            resolve(instance);
-                        });
-                    });
-                    // Clear dependent fields only if value is explicitly null (user cleared it).
-                    // If updatedRelatedObjectValue is undefined (not triggered by onChange), use the value from the instance.
-                    if (updatedRelatedObjectValue === null) {
-                        updates.push({ fieldId, fieldValue: null });
-                    }
-                    else if (instance) {
-                        fieldValue = instance?.[groups.nestedProperty] || null;
-                        updates.push({ fieldId, fieldValue });
-                    }
+                else if (relatedObjectInstance) {
+                    fieldValue = relatedObjectInstance[groups.nestedProperty] || null;
+                    updates.push({ fieldId, fieldValue });
                 }
             }
         }
         // all other default values set here
     }
+    else if (isObject(defaultValue) && 'criteria' in defaultValue && !isEmpty(defaultValue.criteria)) {
+        const criteria = defaultValue.criteria;
+        const evaluatedCriteria = updateCriteriaInputs(criteria, { ...formValues, [updatedRelatedObjectParamId || '']: updatedRelatedObjectValue }, userAccount);
+        try {
+            const instances = await apiServices.get(getPrefixedUrl(`/objects/${parameter?.objectId || entry.display?.relatedObjectId}/instances`), {
+                params: {
+                    filter: {
+                        where: transformToWhere(evaluatedCriteria),
+                        limit: 1,
+                    },
+                },
+            });
+            updates.push({ fieldId, fieldValue: instances[0] ?? null });
+        }
+        catch (error) {
+            updates.push({ fieldId, fieldValue: null });
+            console.error(error);
+        }
+    }
     else if (parameter?.type !== 'object') {
         let updatedValue = defaultValue;
         // handles current default values ie: "Current logged in user", "Today" etc.
@@ -175,38 +139,45 @@ export async function processValueUpdate(unnestedEntries, parameters, updatedRel
             const parameterId = getEntryId(entry);
             if (!parameterId)
                 return [];
+            if (parameterId === changedEntryId) {
+                continue;
+            }
+            const defaultValue = entry.display.defaultValue;
             if (isAddressProperty(parameterId)) {
-                const regex = /^{{input\.(?<relatedObjectProperty>[a-zA-Z][a-zA-Z0-9_]*)\.(?<addressProperty>[a-zA-Z][a-zA-Z0-9_]*)\.(?<nestedAddressProperty>line1|line2|city|county|state|zipCode)}}$/;
+                const regex = /^{{input\.(?<relatedObjectProperty>[a-zA-Z][a-zA-Z0-9_]*)\.(?<addressProperty>[a-zA-Z][a-zA-Z0-9_]*)\.(?<nestedAddressProperty>line1|line2|city|county|state|zipCode|country)}}$/;
                 const groups = regex.exec(entry.display.defaultValue)?.groups;
                 const [addressObject, addressField] = parameterId.split('.');
                 if (groups?.relatedObjectProperty &&
                     groups?.addressProperty &&
                     groups?.nestedAddressProperty &&
                     changedEntryId === groups.relatedObjectProperty) {
-                    const result = await evalDefaultVals(parameters, unnestedEntries, entry, formValues?.[addressObject]?.[addressField], parameterId, apiServices, userAccount, formValues, updatedRelatedObjectValue);
+                    const result = await evalDefaultVals(parameters, entry, formValues?.[addressObject]?.[addressField], parameterId, apiServices, userAccount, formValues, updatedRelatedObjectValue, changedEntryId);
                     updates.push(...result);
                 }
             }
-            else if (isArray(entry.display.defaultValue) &&
-                entry.display.defaultValue.some((item) => /^{{.*}}$/.test(item))) {
-                for (const item of entry.display.defaultValue.filter((item) => /^{{.*}}$/.test(item))) {
+            else if (isArray(defaultValue) && defaultValue.some((item) => /^{{.*}}$/.test(item))) {
+                for (const item of defaultValue.filter((item) => /^{{.*}}$/.test(item))) {
                     const regex = /^{{input\.(?<relatedObjectProperty>[a-zA-Z][a-zA-Z0-9_]*)\.(?<nestedProperty>[a-zA-Z][a-zA-Z0-9_]*)}}$/;
                     const groups = regex.exec(item)?.groups;
                     if (groups?.relatedObjectProperty &&
                         groups?.nestedProperty &&
                         changedEntryId === groups.relatedObjectProperty) {
-                        const result = await evalDefaultVals(parameters, unnestedEntries, entry, entry.display.defaultValue, parameterId, apiServices, userAccount, formValues, updatedRelatedObjectValue);
+                        const result = await evalDefaultVals(parameters, entry, defaultValue, parameterId, apiServices, userAccount, formValues, updatedRelatedObjectValue, changedEntryId);
                         updates.push(...result);
                     }
                 }
             }
+            else if (isObject(defaultValue) && 'criteria' in defaultValue && !isEmpty(defaultValue.criteria)) {
+                const result = await evalDefaultVals(parameters, entry, formValues?.[parameterId], parameterId, apiServices, userAccount, formValues, updatedRelatedObjectValue, changedEntryId);
+                updates.push(...result);
+            }
             else {
                 const regex = /^{{input\.(?<relatedObjectProperty>[a-zA-Z][a-zA-Z0-9_]*)\.(?<nestedProperty>[a-zA-Z][a-zA-Z0-9_]*)}}$/;
-                const groups = regex.exec(entry.display.defaultValue)?.groups;
+                const groups = regex.exec(defaultValue)?.groups;
                 if (groups?.relatedObjectProperty &&
                     groups?.nestedProperty &&
                     changedEntryId === groups.relatedObjectProperty) {
-                    const result = await evalDefaultVals(parameters, unnestedEntries, entry, formValues?.[parameterId], parameterId, apiServices, userAccount, formValues, updatedRelatedObjectValue);
+                    const result = await evalDefaultVals(parameters, entry, formValues?.[parameterId], parameterId, apiServices, userAccount, formValues, updatedRelatedObjectValue, changedEntryId);
                     updates.push(...result);
                 }
             }

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

@@ -18,11 +18,11 @@ type FormContextType = {
     handleChange?: (name: string, value: unknown) => void | Promise<void>;
     onAutosave?: (fieldId: string) => void | Promise<void>;
     fieldHeight?: 'small' | 'medium';
-    triggerFieldReset?: boolean;
     showSubmitError?: boolean;
     associatedObject?: {
         instanceId: string;
         propertyId: string;
+        objectId?: string;
     };
     form?: EvokeForm;
     width: number;

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

@@ -10,7 +10,6 @@ export const FormContext = createContext({
     expandedSections: [],
     parameters: [],
     showSubmitError: false,
-    triggerFieldReset: false,
     handleChange: () => { },
     fieldHeight: 'medium',
     form: {},

package/dist/published/components/custom/FormV2/components/FormFieldTypes/CollectionFiles/ActionDialog.d.ts

@@ -13,6 +13,7 @@ export type ActionDialogProps = {
     associatedObject?: {
         instanceId: string;
         propertyId: string;
+        objectId?: string;
     };
 };
 export declare const ActionDialog: (props: ActionDialogProps) => React.JSX.Element;

package/dist/published/components/custom/FormV2/components/FormFieldTypes/CollectionFiles/RepeatableField.js

@@ -10,7 +10,7 @@ import { Accordion, AccordionDetails, AccordionSummary, Button, IconButton, Skel
 import { Box } from '../../../../../layout';
 import { getReadableQuery } from '../../../../CriteriaBuilder';
 import { retrieveCustomErrorMessage } from '../../../../Form/utils';
-import { convertPropertiesToParams, deleteDocuments, formatSubmission, getPrefixedUrl, transformToWhere, useFormById, } from '../../utils';
+import { convertPropertiesToParams, deleteDocuments, formatSubmission, getPrefixedUrl, handleFileUpload, transformToWhere, useFormById, } from '../../utils';
 import { ActionDialog } from './ActionDialog';
 import { DocumentViewerCell } from './DocumentViewerCell';
 const styles = {
@@ -258,20 +258,34 @@ const RepeatableField = (props) => {
                 : dialogType === 'update'
                     ? entry.display?.updateActionId
                     : entry.display?.deleteActionId));
+        const relatedProperty = relatedObject?.properties?.find((p) => p.id === fieldDefinition.relatedPropertyId);
         // when save is called we know that fieldDefinition is a parameter and fieldDefinition.objectId is defined
-        input = await formatSubmission(input, apiServices, fieldDefinition.objectId, selectedInstanceId, action?.type === 'update' ? updateForm : undefined, undefined, instance?.id && fieldDefinition.relatedPropertyId
-            ? { instanceId: instance.id, propertyId: fieldDefinition.relatedPropertyId }
+        input = await formatSubmission(input, apiServices, fieldDefinition.objectId, selectedInstanceId, action?.type === 'update' ? updateForm : action?.type === 'delete' ? deleteForm : createForm, undefined, instance?.id && fieldDefinition.relatedPropertyId
+            ? {
+                instanceId: instance.id,
+                propertyId: fieldDefinition.relatedPropertyId,
+                objectId: !relatedProperty?.objectId ? instance.objectId : undefined,
+            }
             : undefined, action?.parameters ?? (relatedObject && convertPropertiesToParams(relatedObject)));
-        if (action?.type === 'create' && entry.display?.createActionId) {
+        if (action?.type === 'create' && action.id) {
             const updatedInput = {
                 ...input,
-                [fieldDefinition?.relatedPropertyId]: { id: instance?.id },
+                [fieldDefinition?.relatedPropertyId]: {
+                    id: instance?.id,
+                    objectId: !relatedProperty?.objectId ? instance?.objectId : undefined,
+                },
             };
             try {
-                const instance = await apiServices.post(getPrefixedUrl(`/objects/${fieldDefinition.objectId}/instances/actions`), {
-                    actionId: entry.display?.createActionId,
-                    input: updatedInput,
-                });
+                let instance = undefined;
+                if (relatedObject?.rootObjectId === 'sys__file') {
+                    instance = await handleFileUpload(apiServices, updatedInput, action.id, fieldDefinition.objectId);
+                }
+                else {
+                    instance = await apiServices.post(getPrefixedUrl(`/objects/${fieldDefinition.objectId}/instances/actions`), {
+                        actionId: action.id,
+                        input: updatedInput,
+                    });
+                }
                 queryClient.setQueryData(relatedInstancesQueryKey, (oldData) => {
                     if (!oldData)
                         return [instance];
@@ -293,12 +307,19 @@ const RepeatableField = (props) => {
         else {
             const relatedObjectId = relatedObject?.id;
             try {
-                const response = await apiServices.post(getPrefixedUrl(`/objects/${relatedObjectId}/instances/${selectedInstanceId}/actions`), {
-                    actionId: `_${action?.type}`,
-                    input: omit(input, relatedObject?.properties
-                        ?.filter((property) => property.formula || property.type === 'collection')
-                        .map((property) => property.id) ?? []),
-                });
+                let response = undefined;
+                const submission = omit(input, relatedObject?.properties
+                    ?.filter((property) => property.formula || property.type === 'collection')
+                    .map((property) => property.id) ?? []);
+                if (relatedObject?.rootObjectId === 'sys__file' && action?.id) {
+                    response = await handleFileUpload(apiServices, submission, action.id, relatedObjectId, selectedInstanceId);
+                }
+                else {
+                    response = await apiServices.post(getPrefixedUrl(`/objects/${relatedObjectId}/instances/${selectedInstanceId}/actions`), {
+                        actionId: action?.id ?? `_${action?.type}`,
+                        input: submission,
+                    });
+                }
                 if (response && relatedObject && instance) {
                     deleteDocuments(input, !!response, apiServices, relatedObject, instance, action);
                 }
@@ -491,7 +512,13 @@ const RepeatableField = (props) => {
                             ? '_auto_'
                             : deleteForm?.id
                         : undefined, instanceId: selectedInstanceId, relatedParameter: fieldDefinition, associatedObject: instance?.id && fieldDefinition.relatedPropertyId
-                ? { instanceId: instance.id, propertyId: fieldDefinition.relatedPropertyId }
+                ? {
+                    instanceId: instance.id,
+                    propertyId: fieldDefinition.relatedPropertyId,
+                    objectId: !relatedObject?.properties?.find((p) => p.id === fieldDefinition.relatedPropertyId)?.objectId
+                        ? instance.objectId
+                        : undefined,
+                }
                 : undefined })),
         React.createElement(Snackbar, { open: snackbarError.showAlert, handleClose: () => setSnackbarError({ isError: snackbarError.isError, showAlert: false }), message: snackbarError.message, error: snackbarError.isError })));
 };

package/dist/published/components/custom/FormV2/components/FormFieldTypes/Criteria.d.ts

@@ -7,5 +7,5 @@ type CriteriaProps = {
     error?: boolean;
 };
 type CriteriaValue = Record<string, unknown>;
-export default function Criteria(props: CriteriaProps): React.JSX.Element;
-export {};
+declare const Criteria: (props: CriteriaProps) => React.JSX.Element;
+export default Criteria;

package/dist/published/components/custom/FormV2/components/FormFieldTypes/Criteria.js

@@ -6,7 +6,7 @@ import { Button, CircularProgress, Skeleton, Typography } from '../../../../core
 import { Box } from '../../../../layout';
 import CriteriaBuilder from '../../../CriteriaBuilder';
 import { addressProperties, getPrefixedUrl } from '../utils';
-export default function Criteria(props) {
+const Criteria = (props) => {
     const { value, canUpdateProperty, fieldDefinition, error } = props;
     const apiServices = useApiServices();
     const { handleChange, onAutosave } = useFormContext();
@@ -90,4 +90,5 @@ export default function Criteria(props) {
                     type: 'date-time',
                 },
             ], enablePresetValues: true }))) : (React.createElement(Typography, { variant: "body2", sx: { color: '#637381' } }, "No criteria"));
-}
+};
+export default Criteria;

package/dist/published/components/custom/FormV2/components/FormFieldTypes/DocumentFiles/Document.d.ts

@@ -1,12 +1,13 @@
 import { DocumentParameterValidation } from '@evoke-platform/context';
 import React from 'react';
-import { SavedDocumentReference } from '../../types';
+import { DocumentReference } from '../../types';
 type DocumentProps = {
     id: string;
+    fieldType?: 'file' | 'document';
     canUpdateProperty: boolean;
     error: boolean;
     validate?: DocumentParameterValidation;
-    value: (File | SavedDocumentReference)[] | undefined;
+    value: (File | DocumentReference)[] | undefined;
     hasDescription?: boolean;
 };
 export declare const Document: (props: DocumentProps) => React.JSX.Element;

package/dist/published/components/custom/FormV2/components/FormFieldTypes/DocumentFiles/Document.js

@@ -1,4 +1,4 @@
-import { useApiServices } from '@evoke-platform/context';
+import { useApiServices, } from '@evoke-platform/context';
 import { useQuery } from '@tanstack/react-query';
 import prettyBytes from 'pretty-bytes';
 import React, { useEffect, useState } from 'react';
@@ -7,12 +7,12 @@ import { InfoRounded, UploadCloud } from '../../../../../../icons';
 import { useFormContext } from '../../../../../../theme/hooks';
 import { Skeleton, Snackbar, Typography } from '../../../../../core';
 import { Box, Grid } from '../../../../../layout';
-import { getPrefixedUrl } from '../../utils';
+import { getEntryId, getPrefixedUrl, getUnnestedEntries, uploadFiles } from '../../utils';
 import { DocumentList } from './DocumentList';
 export const Document = (props) => {
-    const { id, canUpdateProperty, error, value, validate, hasDescription } = props;
+    const { id, fieldType = 'document', canUpdateProperty, error, value, validate, hasDescription } = props;
     const apiServices = useApiServices();
-    const { object, handleChange, onAutosave: onAutosave, instance } = useFormContext();
+    const { object, handleChange, onAutosave: onAutosave, instance, form } = useFormContext();
     const [snackbarError, setSnackbarError] = useState();
     const [documents, setDocuments] = useState();
     let allowedTypesMessage = '';
@@ -32,11 +32,22 @@ export const Document = (props) => {
     useEffect(() => {
         setDocuments(value);
     }, [value]);
+    // Find the entry to get the configured createActionId and fileObjectId
+    const allEntries = getUnnestedEntries(form?.entries ?? []) ?? [];
+    const entry = allEntries?.find((entry) => getEntryId(entry) === id);
+    const createActionId = entry?.display?.createActionId ?? '_create';
+    // Get the configured objectId from display.fileObjectId, defaulting to sys__file
+    const fileObjectId = entry?.display?.fileObjectId ?? 'sys__file';
+    // For 'file' type properties, check regular object instance permissions
+    // For 'document' type properties, check document attachment permissions
+    const endpoint = fieldType === 'file'
+        ? getPrefixedUrl(`/objects/${fileObjectId}/instances/checkAccess?action=execute&field=${createActionId}`)
+        : getPrefixedUrl(`/objects/${object?.id}/instances/${instance?.id}/documents/checkAccess?action=update`);
     const { data: hasUpdatePermission = false, isLoading } = useQuery({
-        queryKey: ['hasDocUpdatePermission', object?.id, instance?.id],
+        queryKey: ['hasUpdatePermission', object?.id, instance?.id, fieldType, id],
         queryFn: async () => {
             try {
-                const accessCheck = await apiServices.get(getPrefixedUrl(`/objects/${object?.id}/instances/${instance?.id}/documents/checkAccess?action=update`));
+                const accessCheck = await apiServices.get(endpoint);
                 return accessCheck.result;
             }
             catch {
@@ -44,14 +55,36 @@ export const Document = (props) => {
             }
         },
         staleTime: Infinity,
-        enabled: canUpdateProperty && !!instance?.id && !!object?.id,
+        // For 'file' type fields the permission endpoint only requires the object ID, so the
+        // query can run on create actions where no instance exists yet. For 'document' type
+        // fields the endpoint is instance-scoped, so instance ID is still required.
+        enabled: canUpdateProperty && !!object?.id && (fieldType === 'file' || !!instance?.id),
     });
     const handleUpload = async (files) => {
-        // Store File objects in form state - they will be uploaded during autosave via formatSubmission()
-        const newDocuments = [...(documents ?? []), ...(files ?? [])];
+        if (!files?.length) {
+            return;
+        }
+        let uploadedFiles = files;
+        // Get the createActionId and fileObjectId from form entry, default to '_create' and 'sys__file'
+        const allEntries = getUnnestedEntries(form?.entries ?? []);
+        const entry = allEntries?.find((entry) => getEntryId(entry) === id);
+        const createActionId = entry?.display?.createActionId ?? '_create';
+        const fileObjectId = entry?.display?.fileObjectId ?? 'sys__file';
+        // Immediately upload files for 'file' type properties when autosave is not enabled.
+        // Linking will happen upon final submission.
+        // If autosave is enabled, upload and linking will happen in the autosave handler.
+        if (fieldType === 'file' && !onAutosave) {
+            const { successfulUploads, errorMessage } = await uploadFiles(files, apiServices, createActionId, fileObjectId, undefined, false);
+            uploadedFiles = successfulUploads;
+            if (errorMessage) {
+                setSnackbarError({ message: errorMessage, type: 'error' });
+            }
+        }
+        // Store uploaded file references (or File objects) in form state
+        const newDocuments = [...(documents ?? []), ...uploadedFiles];
         setDocuments(newDocuments);
         try {
-            handleChange && (await handleChange(id, newDocuments));
+            await handleChange?.(id, newDocuments);
         }
         catch (error) {
             console.error('Failed to update field:', error);
@@ -119,7 +152,7 @@ export const Document = (props) => {
                         } }, validate?.maxDocuments === 1
                         ? `Maximum size is ${formattedMaxSize}.`
                         : `The maximum size of each document is ${formattedMaxSize}.`)))))),
-        canUpdateProperty && isLoading ? (React.createElement(Skeleton, { variant: "rectangular", height: formattedMaxSize || allowedTypesMessage ? '136px' : '115px', sx: { margin: '5px 0', borderRadius: '8px' } })) : (React.createElement(DocumentList, { id: id, handleChange: handleChange, onAutosave: onAutosave, value: documents, setSnackbarError: (type, message) => setSnackbarError({ message, type }), canUpdateProperty: canUpdateProperty && !!hasUpdatePermission })),
+        canUpdateProperty && isLoading ? (React.createElement(Skeleton, { variant: "rectangular", height: formattedMaxSize || allowedTypesMessage ? '136px' : '115px', sx: { margin: '5px 0', borderRadius: '8px' } })) : (React.createElement(DocumentList, { id: id, fieldType: fieldType, handleChange: handleChange, onAutosave: onAutosave, value: documents, setSnackbarError: (type, message) => setSnackbarError({ message, type }), canUpdateProperty: canUpdateProperty && !!hasUpdatePermission })),
         React.createElement(Snackbar, { open: !!snackbarError?.message, handleClose: () => setSnackbarError(null), message: snackbarError?.message, error: snackbarError?.type === 'error' }),
         errors.length > 0 && (React.createElement(Box, { display: 'flex', alignItems: 'center' },
             React.createElement(InfoRounded, { sx: { fontSize: '.75rem', marginRight: '3px', color: '#D3271B' } }),

package/dist/published/components/custom/FormV2/components/FormFieldTypes/DocumentFiles/DocumentList.d.ts

@@ -1,11 +1,12 @@
 import React from 'react';
-import { SavedDocumentReference } from '../../types';
+import { DocumentReference } from '../../types';
 type DocumentListProps = {
-    handleChange?: (propertyId: string, value: (File | SavedDocumentReference)[] | undefined) => void;
+    handleChange?: (propertyId: string, value: (File | DocumentReference)[] | undefined) => void;
     onAutosave?: (fieldId: string) => void | Promise<void>;
     id: string;
+    fieldType?: 'document' | 'file';
     canUpdateProperty: boolean;
-    value: (File | SavedDocumentReference)[] | undefined;
+    value: (File | DocumentReference)[] | undefined;
     setSnackbarError: (type: 'error' | 'success', message: string) => void;
 };
 export declare const DocumentList: (props: DocumentListProps) => React.JSX.Element;