@evoke-platform/ui-components 1.12.0 → 1.13.0-dev.1

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

@@ -7,7 +7,7 @@ import { Box } from '../../layout';
 import ErrorComponent from '../ErrorComponent';
 import { evalDefaultVals, processValueUpdate } from './components/DefaultValues';
 import Header from './components/Header';
-import { convertPropertiesToParams, deleteDocuments, encodePageSlug, formatSubmission, getEntryId, getPrefixedUrl, getUnnestedEntries, isAddressProperty, isEmptyWithDefault, plainTextToRtf, } from './components/utils';
+import { convertPropertiesToParams, createFileLinks, deleteDocuments, encodePageSlug, formatSubmission, getEntryId, getPrefixedUrl, getUnnestedEntries, isAddressProperty, isEmptyWithDefault, plainTextToRtf, } from './components/utils';
 import FormRenderer from './FormRenderer';
 function FormRendererContainer(props) {
     const { instanceId, pageNavigation, dataType, display, formId, objectId, actionId, richTextEditor, onSubmit, onDiscardChanges: onDiscardChangesOverride, associatedObject, renderContainer, onSubmitError, sx, renderHeader, renderBody, renderFooter, } = props;
@@ -167,9 +167,25 @@ function FormRendererContainer(props) {
         }
         setInstance(updatedInstance);
     };
+    const linkFiles = async (submission, linkTo) => {
+        // Create file links for any uploaded files after instance creation
+        for (const property of sanitizedObject?.properties?.filter((property) => property.type === 'file') ?? []) {
+            const files = submission[property.id];
+            if (files?.length) {
+                try {
+                    await createFileLinks(files, linkTo, apiServices);
+                }
+                catch (error) {
+                    console.error('Failed to create file links:', error);
+                    // Don't fail the entire submission if file linking fails
+                }
+            }
+        }
+    };
     const saveHandler = async (submission) => {
-        if (!form)
+        if (!form) {
             return;
+        }
         submission = await formatSubmission(submission, apiServices, objectId, instanceId, form, setSnackbarError);
         try {
             if (action?.type === 'create') {
@@ -180,6 +196,8 @@ function FormRendererContainer(props) {
                         .map((property) => property.id) ?? []),
                 });
                 if (response) {
+                    // Manually link files to created instance.
+                    await linkFiles(submission, { id: response.id, objectId: form.objectId });
                     onSubmissionSuccess(response);
                 }
             }

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

@@ -85,8 +85,8 @@ export function RecursiveEntryRenderer(props) {
         }
         else if (fieldDefinition.type === 'object') {
             return (React.createElement(FieldWrapper, { ...getFieldWrapperProps(fieldDefinition, entry, entryId, fieldValue, display, errors) },
-                React.createElement(ObjectPropertyInput, { relatedObjectId: !fieldDefinition.objectId ? display?.relatedObjectId : fieldDefinition.objectId, fieldDefinition: fieldDefinition, id: entryId, mode: display?.mode || 'default', error: !!errors?.[entryId], displayOption: display?.relatedObjectDisplay || 'dialogBox', initialValue: fieldValue, readOnly: entry.type === 'readonlyField', filter: validation?.criteria
-                        ? updateCriteriaInputs(validation.criteria, getValues(), userAccount)
+                React.createElement(ObjectPropertyInput, { relatedObjectId: !fieldDefinition.objectId ? display?.relatedObjectId : fieldDefinition.objectId, fieldDefinition: fieldDefinition, id: entryId, mode: display?.mode || 'default', error: !!errors?.[entryId], displayOption: display?.relatedObjectDisplay || 'dialogBox', initialValue: fieldValue, readOnly: entry.type === 'readonlyField', filter: 'criteria' in validation && validation.criteria
+                        ? updateCriteriaInputs(validation.criteria, getValues(), userAccount, instance)
                         : undefined, sortBy: typeof display?.defaultValue === 'object' && 'sortBy' in display.defaultValue
                         ? display?.defaultValue.sortBy
                         : undefined, orderBy: typeof display?.defaultValue === 'object' && 'orderBy' in display.defaultValue
@@ -104,7 +104,9 @@ export function RecursiveEntryRenderer(props) {
                 if (middleObject && !isEmpty(middleObject)) {
                     return (initialMiddleObjectInstances && (React.createElement(FieldWrapper, { ...getFieldWrapperProps(fieldDefinition, entry, entryId, fieldValue, display, errors) },
                         React.createElement(DropdownRepeatableField, { initialMiddleObjectInstances: fetchedOptions[`${entryId}MiddleObjectInstances`] ||
-                                initialMiddleObjectInstances, fieldDefinition: fieldDefinition, id: entryId, middleObject: middleObject, readOnly: entry.type === 'readonlyField', criteria: validation?.criteria, hasDescription: !!display?.description }))));
+                                initialMiddleObjectInstances, fieldDefinition: fieldDefinition, id: entryId, middleObject: middleObject, readOnly: entry.type === 'readonlyField', criteria: 'criteria' in validation && validation.criteria
+                                ? updateCriteriaInputs(validation.criteria, getValues(), userAccount, instance)
+                                : undefined, hasDescription: !!display?.description }))));
                 }
                 else {
                     // when in the builder preview, the middle object won't be fetched so instead show an empty field
@@ -116,7 +118,9 @@ export function RecursiveEntryRenderer(props) {
             }
             else {
                 return (React.createElement(FieldWrapper, { ...getFieldWrapperProps(fieldDefinition, entry, entryId, fieldValue, display, errors) },
-                    React.createElement(RepeatableField, { fieldDefinition: fieldDefinition, canUpdateProperty: entry.type !== 'readonlyField', criteria: validation?.criteria, viewLayout: display?.viewLayout, entry: entry })));
+                    React.createElement(RepeatableField, { fieldDefinition: fieldDefinition, canUpdateProperty: entry.type !== 'readonlyField', criteria: 'criteria' in validation && validation.criteria
+                            ? updateCriteriaInputs(validation.criteria, getValues(), userAccount, instance)
+                            : undefined, viewLayout: display?.viewLayout, entry: entry })));
             }
         }
         else if (fieldDefinition.type === 'richText') {

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

@@ -108,3 +108,7 @@ export type SectionsProps = {
 export type RichTextFormEntry = FormEntry & {
     uniqueId: string;
 };
+export type InstanceLink = {
+    id: string;
+    objectId: string;
+};

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

@@ -4,7 +4,7 @@ import { LocalDateTime } from '@js-joda/core';
 import { FieldErrors, FieldValues } from 'react-hook-form';
 import { ObjectProperty } from '../../../../types';
 import { AutocompleteOption } from '../../../core';
-import { SavedDocumentReference } 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;
@@ -40,7 +40,7 @@ export declare const encodePageSlug: (slug: string) => string;
 export declare function getDefaultPages(parameters: InputParameter[], defaultPages: Record<string, string> | undefined, findDefaultPageSlugFor: (objectId: string) => Promise<string | undefined>): Promise<{
     [x: string]: string;
 }>;
-export declare function updateCriteriaInputs(criteria: Record<string, unknown>, data: Record<string, unknown>, user?: UserAccount): Record<string, unknown>;
+export declare function updateCriteriaInputs(criteria: Record<string, unknown>, data: Record<string, unknown>, user?: UserAccount, instance?: Record<string, unknown>): Record<string, unknown>;
 export declare function fetchCollectionData(apiServices: ApiServices, fieldDefinition: InputParameter | Property, setFetchedOptions: (newData: FieldValues) => void, instanceId?: string, fetchedOptions?: Record<string, unknown>, initialMiddleObjectInstances?: ObjectInstance[]): Promise<void>;
 export declare const getErrorCountForSection: (section: Section | Column, errors?: FieldErrors) => number;
 export declare const propertyToParameter: (property: Property) => InputParameter;
@@ -52,7 +52,12 @@ export declare const docProperties: Property[];
 /**
  * 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>) => Promise<SavedDocumentReference[]>;
+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: (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;

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

@@ -307,12 +307,13 @@ function compileQueryValues(query, data) {
         return query;
     }
 }
-export function updateCriteriaInputs(criteria, data, user) {
+export function updateCriteriaInputs(criteria, data, user, instance) {
     const dataSet = {
         input: {
             ...data,
         },
         user: user,
+        instance,
     };
     const compiledQuery = compileQueryValues(parseMongoDB(criteria), dataSet);
     // The "compiledQueryValues" function filters out rules that have a value of "undefined".
@@ -471,7 +472,7 @@ export const docProperties = [
 /**
  * Upload files using the POST /files endpoint for sys__file objects
  */
-export const uploadFiles = async (files, apiServices, actionId = '_create', metadata) => {
+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);
@@ -486,6 +487,9 @@ export const uploadFiles = async (files, apiServices, actionId = '_create', meta
                 formData.append(key, value);
             }
         }
+        if (linkTo) {
+            formData.append('linkTo', JSON.stringify(linkTo));
+        }
         const fileInstance = await apiServices.post(getPrefixedUrl(`/files`), formData);
         return {
             id: fileInstance.id,
@@ -495,6 +499,24 @@ export const uploadFiles = async (files, apiServices, actionId = '_create', meta
     const uploadedFiles = await Promise.all(uploadPromises);
     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 (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 = [];
     const formData = new FormData();
@@ -572,20 +594,25 @@ export async function formatSubmission(submission, apiServices, objectId, instan
         if (isArray(value)) {
             // Only upload if array contains File instances (not SavedDocumentReference)
             const fileInArray = value.some((item) => item instanceof File);
-            if (fileInArray && instanceId && apiServices && objectId) {
+            if (fileInArray && apiServices && objectId) {
                 // Determine property type from the entry
                 const propertyType = entry?.input?.type;
                 try {
-                    // Use uploadFiles for 'file' type, uploadDocuments for 'document' type
-                    const uploadedDocuments = propertyType === 'file'
-                        ? await uploadFiles(value, apiServices, '_create', {
+                    let uploadedDocuments = [];
+                    if (propertyType === 'file') {
+                        uploadedDocuments = await uploadFiles(value, apiServices, '_create', {
                             ...entry?.documentMetadata,
-                        })
-                        : await uploadDocuments(value, {
+                        }, 
+                        // Only pass linkTo if instanceId exists (update action)
+                        instanceId ? { id: instanceId, objectId } : undefined);
+                    }
+                    else if (propertyType === 'document' && instanceId) {
+                        uploadedDocuments = await uploadDocuments(value, {
                             type: '',
                             view_permission: '',
                             ...entry?.documentMetadata,
                         }, apiServices, instanceId, objectId);
+                    }
                     submission[key] = uploadedDocuments;
                 }
                 catch (err) {

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

@@ -1465,7 +1465,7 @@ describe('FormRenderer', () => {
             const addButton = await screen.findByRole('button', { name: /add/i });
             await user.click(addButton);
             await screen.findByRole('dialog');
-            const nameField = screen.getByRole('textbox', { name: 'Name *' });
+            const nameField = await screen.findByRole('textbox', { name: 'Name *' });
             await user.type(nameField, 'New Collection Item');
             const submitButton = screen.getByRole('button', { name: 'Create Collection Item' });
             await user.click(submitButton);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@evoke-platform/ui-components",
-    "version": "1.12.0",
+    "version": "1.13.0-dev.1",
     "description": "",
     "main": "dist/published/index.js",
     "module": "dist/published/index.js",