@evoke-platform/ui-components 1.8.0-testing.4 → 1.8.0-testing.6

package/dist/published/components/custom/Form/FormComponents/ObjectComponent/ObjectPropertyInput.js

@@ -230,6 +230,10 @@ export const ObjectPropertyInput = (props) => {
                         ? (options.find((o) => o.id === option)?.name ?? '')
                         : option.label;
                 }, onKeyDownCapture: (e) => {
+                    // prevents keyboard trap
+                    if (e.key === 'Tab') {
+                        return;
+                    }
                     if (instance?.[property.id]?.id || selectedInstance?.id) {
                         e.preventDefault();
                     }

package/dist/published/components/custom/Form/FormComponents/UserComponent/UserProperty.js

@@ -89,6 +89,10 @@ export const UserProperty = (props) => {
                     }
                 }
             }, onKeyDownCapture: (e) => {
+                // prevents keyboard trap
+                if (e.key === 'Tab') {
+                    return;
+                }
                 if (value) {
                     e.preventDefault();
                 }

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

@@ -14,6 +14,10 @@ export type FormProps = BaseProps & {
     instance?: ObjectInstance | Document;
     onChange: (id: string, value: unknown) => void;
     onValidationChange?: (errors: FieldErrors) => void;
+    associatedObject?: {
+        instanceId?: string;
+        propertyId?: string;
+    };
 };
 declare function FormRenderer(props: FormProps): React.JSX.Element;
 export default FormRenderer;

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

@@ -1,5 +1,5 @@
 import { useObject } from '@evoke-platform/context';
-import { isEqual } from 'lodash';
+import { isEmpty, isEqual } from 'lodash';
 import React, { useEffect, useMemo, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { useResponsive } from '../../../theme';
@@ -12,7 +12,7 @@ import { convertDocToParameters, convertPropertiesToParams } from './components/
 import { handleValidation } from './components/ValidationFiles/Validation';
 import ValidationErrorDisplay from './components/ValidationFiles/ValidationErrorDisplay';
 function FormRenderer(props) {
-    const { onSubmit, value, fieldHeight, richTextEditor, hideButtons, stickyFooter, onCancel, form, instance, onChange, onValidationChange, } = props;
+    const { onSubmit, value, fieldHeight, richTextEditor, hideButtons, stickyFooter, onCancel, form, instance, onChange, onValidationChange, associatedObject, } = props;
     const { entries, name: title, objectId, actionId, display } = form;
     const { register, unregister, setValue, reset, handleSubmit, formState: { errors, isSubmitted }, getValues, } = useForm({
         defaultValues: value,
@@ -99,10 +99,9 @@ function FormRenderer(props) {
     }, []);
     if (entries && parameters && (!actionId || action)) {
         return (React.createElement(React.Fragment, null,
-            React.createElement(Box, { sx: {
+            ((isSubmitted && !isEmpty(errors)) || (isSmallerThanMd && hasSections) || title) && (React.createElement(Box, { sx: {
                     paddingX: isSmallerThanMd ? 2 : 3,
                     paddingTop: '0px',
-                    borderBottom: '2px solid #F4F6F8',
                 } },
                 React.createElement(Box, { sx: {
                         display: 'flex',
@@ -111,13 +110,14 @@ function FormRenderer(props) {
                         flexWrap: 'wrap',
                         paddingY: isSm || isXs ? 2 : 3,
                     } },
-                    React.createElement(Typography, { sx: {
+                    title && (React.createElement(Typography, { sx: {
                             fontSize: '20px',
                             lineHeight: '30px',
                             fontWeight: 700,
                             flexGrow: '1',
-                        } }, title),
+                        } }, title)),
                     isSmallerThanMd && hasSections && (React.createElement(Box, { sx: {
+                            color: '#212B36',
                             display: 'flex',
                             alignItems: 'center',
                             maxHeight: '22px',
@@ -140,7 +140,7 @@ function FormRenderer(props) {
                                 fontWeight: 400,
                                 fontSize: '14px',
                             }, onClick: handleCollapseAll }, "Collapse all")))),
-                React.createElement(ValidationErrorDisplay, { formId: form.id, title: title })),
+                React.createElement(ValidationErrorDisplay, { formId: form.id, title: title, errors: errors, showSubmitError: isSubmitted }))),
             React.createElement(FormContext.Provider, { value: {
                     fetchedOptions,
                     setFetchedOptions: updateFetchedOptions,
@@ -159,26 +159,25 @@ function FormRenderer(props) {
                     handleChange: onChange,
                     triggerFieldReset,
                     showSubmitError: isSubmitted,
+                    associatedObject,
                 } },
                 React.createElement(Box, { sx: {
-                        padding: isModal ? '0px' : isSm || isXs ? 2 : 3,
-                        paddingBottom: '0px',
-                        paddingTop: !hasSections ? undefined : '0px',
+                        paddingX: isSm || isXs ? 2 : 3,
+                        // when rendering the default delete action, we don't want a border
+                        borderTop: !form.id || isModal ? undefined : '1px solid #e9ecef',
                     } },
                     entries.map((entry, index) => (React.createElement(RecursiveEntryRenderer, { key: index, entry: entry, isDocument: !!(form.id === 'documentForm') }))),
                     !hideButtons && (actionId || form.id === 'documentForm') && onSubmit && (React.createElement(Box, { sx: {
                             ...(stickyFooter === false ? { position: 'static' } : { position: 'sticky' }),
-                            bottom: isModal ? -5 : isSmallerThanMd ? 0 : 24,
+                            bottom: isModal || isSmallerThanMd ? 0 : 24,
                             zIndex: 1000,
                             borderTop: action?.type !== 'delete' ? '1px solid #f4f6f8' : 'none',
                             backgroundColor: '#fff',
-                            paddingY: isSmallerThanMd ? '16px' : '20px',
-                            paddingX: isSmallerThanMd ? '16px' : '20px',
+                            padding: isSmallerThanMd ? '16px' : '20px',
                             display: 'flex',
                             justifyContent: isXs ? 'center' : 'flex-end',
                             alignItems: 'center',
                             marginX: isSmallerThanMd ? -2 : -3,
-                            marginBottom: '1px',
                             borderRadius: '0px 0px 6px 6px',
                         } },
                         React.createElement(ActionButtons, { onSubmit: onSubmit, handleSubmit: handleSubmit, isModal: isModal, actionType: action?.type, submitButtonLabel: display?.submitLabel, onReset: handleReset, unregister: unregister, entries: entries, setValue: setValue, formId: form.id })))))));

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

@@ -16,6 +16,10 @@ export type FormProps = BaseProps & {
     richTextEditor?: ComponentType<SimpleEditorProps>;
     onClose?: () => void;
     onSubmit?: (submission: Record<string, unknown>) => Promise<void>;
+    associatedObject?: {
+        instanceId?: string;
+        propertyId?: string;
+    };
 };
 declare function FormRendererContainer(props: FormProps): React.JSX.Element;
 export default FormRendererContainer;

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

@@ -1,5 +1,4 @@
 import { useApiServices, useApp, useAuthenticationContext, useNavigate, useObject, } from '@evoke-platform/context';
-import { LocalDateTime } from '@js-joda/core';
 import axios from 'axios';
 import { get, isArray, isEmpty, isEqual, merge, omit, pick, set, uniq } from 'lodash';
 import React, { useEffect, useState } from 'react';
@@ -7,10 +6,10 @@ import { Skeleton, Snackbar } from '../../core';
 import { Box } from '../../layout';
 import ErrorComponent from '../ErrorComponent';
 import { evalDefaultVals, processValueUpdate } from './components/DefaultValues';
-import { convertDocToEntries, encodePageSlug, formatDataToDoc, getEntryId, getPrefixedUrl, getUnnestedEntries, isAddressProperty, isEmptyWithDefault, normalizeDateTime, } from './components/utils';
+import { convertDocToEntries, deleteDocuments, encodePageSlug, formatDataToDoc, formatSubmission, getEntryId, getPrefixedUrl, getUnnestedEntries, isAddressProperty, isEmptyWithDefault, } from './components/utils';
 import FormRenderer from './FormRenderer';
 function FormRendererContainer(props) {
-    const { instanceId, pageNavigation, documentId, dataType, display, formId, stickyFooter, objectId, actionId, richTextEditor, } = props;
+    const { instanceId, pageNavigation, documentId, dataType, display, formId, stickyFooter, objectId, actionId, richTextEditor, onClose, onSubmit, associatedObject, } = props;
     const apiServices = useApiServices();
     const navigateTo = useNavigate();
     const { id: appId, defaultPages } = useApp();
@@ -101,7 +100,8 @@ function FormRendererContainer(props) {
                 .get(getPrefixedUrl(`data/forms/${formId || action?.defaultFormId}`))
                 .then((evokeForm) => {
                 if (evokeForm?.actionId === actionId) {
-                    setForm(evokeForm);
+                    const form = onClose ? { ...evokeForm, name: '' } : evokeForm;
+                    setForm(form);
                 }
                 else {
                     setError(true);
@@ -111,24 +111,50 @@ function FormRendererContainer(props) {
                 onError(error);
             });
         }
-        else if (action && !action?.defaultFormId) {
+        else if (action) {
             apiServices
-                .get(getPrefixedUrl(`data/forms?filter[where][actionId]=${action.id}`))
+                .get(getPrefixedUrl('data/forms'), {
+                params: {
+                    filter: {
+                        where: {
+                            actionId: action.id,
+                            objectId: objectId,
+                        },
+                    },
+                },
+            })
                 .then((matchingForms) => {
                 if (matchingForms.length === 1) {
-                    if (matchingForms[0]?.actionId === actionId) {
-                        setForm(matchingForms[0]);
-                    }
-                    else {
-                        setError(true);
-                    }
+                    const form = onClose ? { ...matchingForms[0], name: '' } : matchingForms[0];
+                    setForm(form);
+                    // use this default form if no delete form is found
+                }
+                else if (action.type === 'delete' && instance) {
+                    setForm({
+                        id: '',
+                        name: '',
+                        entries: [
+                            {
+                                type: 'content',
+                                html: `<p>You are about to delete <strong>${instance.name}</strong>. Deleted records can't be restored. Are you sure you want to continue?</p>`,
+                            },
+                        ],
+                        objectId: objectId,
+                        actionId: '_delete',
+                        display: {
+                            submitLabel: 'Delete',
+                        },
+                    });
+                }
+                else if (instance) {
+                    setError(true);
                 }
             })
                 .catch((error) => {
                 onError(error);
             });
         }
-    }, [action]);
+    }, [action, objectId, instance]);
     useEffect(() => {
         if (form?.id === 'documentForm') {
             setParameters([
@@ -174,54 +200,6 @@ function FormRendererContainer(props) {
         };
         getInitialValues();
     }, [form, instance, sanitizedObject]);
-    const uploadDocuments = async (files, metadata) => {
-        const allDocuments = [];
-        const formData = new FormData();
-        for (const [index, file] of files.entries()) {
-            if ('size' in file) {
-                formData.append(`files[${index}]`, file);
-            }
-            else {
-                allDocuments.push(file);
-            }
-        }
-        if (metadata) {
-            for (const [key, value] of Object.entries(metadata)) {
-                formData.append(key, value);
-            }
-        }
-        const docs = await apiServices?.post(getPrefixedUrl(`/objects/${form?.objectId}/instances/${instanceId}/documents`), formData);
-        return allDocuments.concat(docs?.map((doc) => ({
-            id: doc.id,
-            name: doc.name,
-        })) ?? []);
-    };
-    const deleteDocuments = async (submittedFields, requestSuccess, action) => {
-        const documentProperties = action?.parameters
-            ? action.parameters.filter((param) => param.type === 'document')
-            : sanitizedObject?.properties?.filter((prop) => prop.type === 'document');
-        for (const docProperty of documentProperties ?? []) {
-            const savedValue = submittedFields[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 {
-                    await apiServices?.delete(getPrefixedUrl(`/objects/${form?.objectId}/instances/${instanceId}/documents/${doc.id}`));
-                }
-                catch (error) {
-                    if (error) {
-                        setSnackbarError({
-                            showAlert: true,
-                            message: `An error occurred while removing document '${doc.name}'`,
-                            isError: true,
-                        });
-                    }
-                }
-            }
-        }
-    };
     const onSubmissionSuccess = (updatedInstance) => {
         setSnackbarError({
             showAlert: true,
@@ -247,47 +225,7 @@ function FormRendererContainer(props) {
     const saveHandler = async (submission) => {
         if (!form)
             return;
-        // checks for a file upload and handles getting the new format to upload
-        for (const [key, value] of Object.entries(submission)) {
-            if (isArray(value)) {
-                const fileInArray = value.some((item) => item instanceof File);
-                if (fileInArray) {
-                    try {
-                        const uploadedDocuments = await uploadDocuments(value, {
-                            type: '',
-                            view_permission: '',
-                        });
-                        submission[key] = uploadedDocuments;
-                    }
-                    catch (err) {
-                        if (err) {
-                            setSnackbarError({
-                                showAlert: true,
-                                message: `An error occurred while uploading associated documents`,
-                                isError: true,
-                            });
-                        }
-                        return;
-                    }
-                }
-                // if there are address fields with no value address needs to be set to undefined to be able to submit
-            }
-            else if (typeof value === 'object' && value !== null) {
-                if (Object.values(value).every((v) => v === undefined)) {
-                    submission[key] = undefined;
-                    // only submit the name and id of a related object
-                }
-                else if ('id' in value && 'name' in value) {
-                    submission[key] = pick(value, 'id', 'name');
-                }
-            }
-            else if ((value === '' && !document) || value === undefined) {
-                submission[key] = null;
-            }
-            else if (value instanceof LocalDateTime) {
-                submission[key] = normalizeDateTime(value);
-            }
-        }
+        submission = await formatSubmission(submission, apiServices, objectId, instanceId, setSnackbarError);
         if (document) {
             submission = formatDataToDoc(submission);
         }
@@ -331,9 +269,9 @@ function FormRendererContainer(props) {
                         ?.filter((property) => !property.formula && property.type !== 'collection')
                         .map((property) => property.id) ?? []),
                 });
-                if (response) {
+                if (response && sanitizedObject && instance) {
                     onSubmissionSuccess(response);
-                    deleteDocuments(submission, !!response, action ?? undefined);
+                    deleteDocuments(submission, !!response, apiServices, sanitizedObject, instance, action ?? undefined, setSnackbarError);
                 }
             }
         }
@@ -393,7 +331,17 @@ function FormRendererContainer(props) {
                         const fieldValue = instanceData?.[fieldId] ??
                             instanceData?.metadata?.[fieldId];
                         const parameter = parameters?.find((param) => param.id === fieldId);
-                        if (entry.type !== 'readonlyField' && isEmptyWithDefault(fieldValue, entry, instanceData)) {
+                        if (associatedObject?.propertyId === fieldId && associatedObject?.instanceId && parameter) {
+                            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, entry, fieldValue, fieldId, apiServices, userAccount, instanceData);
                                 for (const { fieldId, fieldValue } of defaultValuesArray) {
@@ -463,9 +411,13 @@ function FormRendererContainer(props) {
         })();
     }
     const isLoading = (instanceId && !formData && !document) || !form || !sanitizedObject;
-    return !error ? (React.createElement(React.Fragment, null,
-        !isLoading ? (React.createElement(React.Fragment, null,
-            React.createElement(FormRenderer, { onSubmit: saveHandler, hideButtons: document && !hasDocumentUpdateAccess, richTextEditor: richTextEditor, fieldHeight: display?.fieldHeight ?? 'medium', value: formData, stickyFooter: stickyFooter, form: form, instance: dataType !== 'documents' ? instance : document, onChange: onChange, onCancel: onCancel }))) : (React.createElement(Box, { sx: { padding: '20px' } },
+    return !error ? (React.createElement(Box, { sx: {
+            backgroundColor: '#ffffff',
+            borderRadius: '6px',
+            padding: '0px',
+            border: !isLoading && !onClose ? '1px solid #dbe0e4' : undefined,
+        } },
+        !isLoading ? (React.createElement(FormRenderer, { onSubmit: onSubmit ?? saveHandler, hideButtons: document && !hasDocumentUpdateAccess, richTextEditor: richTextEditor, fieldHeight: display?.fieldHeight ?? 'medium', value: formData, stickyFooter: stickyFooter, form: form, instance: dataType !== 'documents' ? instance : document, onChange: onChange, onCancel: onClose ?? onCancel, associatedObject: associatedObject })) : (React.createElement(Box, { sx: { padding: '20px' } },
             React.createElement(Box, { display: 'flex', width: '100%', justifyContent: 'space-between' },
                 React.createElement(Skeleton, { width: '78%', sx: { borderRadius: '8px', height: '40px' } }),
                 React.createElement(Skeleton, { width: '20%', sx: { borderRadius: '8px', height: '40px' } })),

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

@@ -20,6 +20,10 @@ type FormContextType = {
     fieldHeight?: 'small' | 'medium';
     triggerFieldReset?: boolean;
     showSubmitError?: boolean;
+    associatedObject?: {
+        instanceId?: string;
+        propertyId?: string;
+    };
 };
 export declare const FormContext: import("react").Context<FormContextType>;
 export {};

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

@@ -1,14 +1,18 @@
-import { Action, ActionType, EvokeForm, InputParameter, Obj } from '@evoke-platform/context';
+import { Action, InputParameter, Obj } from '@evoke-platform/context';
 import React from 'react';
+import { FieldValues } from 'react-hook-form';
 export type ActionDialogProps = {
     open: boolean;
     onClose: () => void;
     action: Action;
-    instanceInput: Record<string, unknown>;
-    handleSubmit: (actionType: ActionType, input: Record<string, unknown> | undefined, instanceId?: string, setSubmitting?: (value: boolean) => void) => void;
+    handleSubmit: (action: Action, input: FieldValues, instanceId?: string, setSubmitting?: (value: boolean) => void) => void;
     object: Obj;
     instanceId?: string;
-    relatedParameter?: InputParameter;
-    relatedForm?: EvokeForm;
+    relatedParameter: InputParameter;
+    relatedFormId?: string;
+    associatedObject?: {
+        instanceId?: string;
+        propertyId?: string;
+    };
 };
 export declare const ActionDialog: (props: ActionDialogProps) => React.JSX.Element;

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

@@ -1,9 +1,11 @@
 import { useApiServices } from '@evoke-platform/context';
 import { Close } from '@mui/icons-material';
 import React, { useEffect, useState } from 'react';
+import { useFormContext } from '../../../../../../theme/hooks';
 import { Dialog, DialogContent, DialogTitle, IconButton, Skeleton } from '../../../../../core';
 import { Box } from '../../../../../layout';
 import ErrorComponent from '../../../../ErrorComponent';
+import FormRendererContainer from '../../../FormRendererContainer';
 import { getPrefixedUrl } from '../../utils';
 const styles = {
     button: {
@@ -36,12 +38,11 @@ const styles = {
     },
 };
 export const ActionDialog = (props) => {
-    const { open, onClose, action, object, instanceId, relatedForm, instanceInput } = props;
+    const { open, onClose, action, object, instanceId, relatedFormId, relatedParameter, handleSubmit, associatedObject, } = props;
     const [loading, setLoading] = useState(false);
     const [hasAccess, setHasAccess] = useState();
-    const [form, setForm] = useState();
+    const { stickyFooter, fieldHeight, richTextEditor } = useFormContext();
     const apiServices = useApiServices();
-    const isDeleteAction = action.type === 'delete';
     useEffect(() => {
         if (instanceId) {
             setLoading(true);
@@ -57,31 +58,18 @@ export const ActionDialog = (props) => {
             setLoading(false);
         }
     }, [object, instanceId]);
-    useEffect(() => {
-        setForm(isDeleteAction && !form
-            ? {
-                id: '',
-                name: '',
-                entries: [
-                    {
-                        type: 'content',
-                        html: `<p>You are about to delete ${instanceInput?.name}. Deleted records can't be restored. Are you sure you want to continue?</p>`,
-                    },
-                ],
-                objectId: object.id,
-                actionId: '_delete',
-                display: {
-                    submitLabel: 'Delete',
-                },
-            }
-            : relatedForm);
-    }, [relatedForm, action, form]);
+    const handleFormSave = async (data) => {
+        return handleSubmit(action, data, instanceId);
+    };
     return (React.createElement(Dialog, { maxWidth: 'md', fullWidth: true, open: open, onClose: (e, reason) => reason !== 'backdropClick' && onClose() },
-        React.createElement(DialogTitle, { sx: styles.dialogTitle },
+        React.createElement(DialogTitle, { sx: { ...styles.dialogTitle, borderBottom: action.type === 'delete' ? undefined : '1px solid #e9ecef' } },
             React.createElement(IconButton, { sx: styles.closeIcon, onClick: onClose },
                 React.createElement(Close, { fontSize: "small" })),
             action && hasAccess && !loading ? action?.name : ''),
-        React.createElement(DialogContent, { sx: { paddingBottom: loading ? undefined : '0px' } }, hasAccess ? (React.createElement(Box, { sx: { width: '100%', marginTop: '10px' } })) : (React.createElement(React.Fragment, null, loading ? (React.createElement(React.Fragment, null,
+        React.createElement(DialogContent, { sx: { paddingBottom: loading ? undefined : '0px' } }, hasAccess ? (React.createElement(Box, { sx: { width: '100%', marginTop: '10px' } },
+            React.createElement(FormRendererContainer, { instanceId: instanceId, formId: relatedFormId, display: { fieldHeight: fieldHeight ?? 'medium' }, actionId: action.id, stickyFooter: stickyFooter, 
+                // relatedParameter will have an objectId here
+                objectId: relatedParameter.objectId, onClose: onClose, onSubmit: handleFormSave, richTextEditor: richTextEditor, associatedObject: associatedObject }))) : (React.createElement(React.Fragment, null, loading ? (React.createElement(React.Fragment, null,
             React.createElement(Skeleton, { height: '30px', animation: 'wave' }),
             React.createElement(Skeleton, { height: '30px', animation: 'wave' }),
             React.createElement(Skeleton, { height: '30px', animation: 'wave' }))) : (React.createElement(ErrorComponent, { code: 'AccessDenied', message: 'You do not have permission to perform this action.', styles: { boxShadow: 'none' } })))))));

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

@@ -1,10 +1,14 @@
-import { InputParameter, Property, ViewLayoutEntityReference } from '@evoke-platform/context';
+import { InputField, InputParameter, InputParameterReference, Property, ReadonlyField, ViewLayoutEntityReference } from '@evoke-platform/context';
 import React from 'react';
 export type ObjectPropertyInputProps = {
     fieldDefinition: InputParameter | Property;
     canUpdateProperty: boolean;
     criteria?: object;
     viewLayout?: ViewLayoutEntityReference;
+    entry: InputField | InputParameterReference | ReadonlyField;
+    createActionId?: string;
+    updateActionId?: string;
+    deleteActionId?: string;
 };
 declare const RepeatableField: (props: ObjectPropertyInputProps) => React.JSX.Element;
 export default RepeatableField;