@evoke-platform/ui-components 1.10.0-testing.21 → 1.10.0-testing.23

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

@@ -104,11 +104,14 @@ function FormRendererContainer(props) {
         }
     }, []);
     useEffect(() => {
+        const needsInstance = action?.type !== 'create' && !!instanceId;
+        // Instance and Action are loaded in the side effect above; wait for them to complete.
+        const loading = (actionId && !action) || (needsInstance && !instance);
         if (dataType === 'documents' || form)
             return;
-        if (actionId && !action)
-            return; // Action is loaded in the side effect above; wait for it to complete
-        if (formId || action?.defaultFormId) {
+        if (loading)
+            return;
+        if ((formId || action?.defaultFormId) && formId !== '_auto_') {
             apiServices
                 .get(getPrefixedUrl(`/forms/${formId || action?.defaultFormId}`))
                 .then((evokeForm) => {
@@ -125,14 +128,14 @@ function FormRendererContainer(props) {
                 onError(error);
             });
         }
-        else if (action?.type === 'delete' && instance) {
+        else if (action?.type === 'delete' && formId === '_auto_') {
             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>`,
+                        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,

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

@@ -66,6 +66,8 @@ const RepeatableField = (props) => {
     const updateAction = relatedObject?.actions?.find((item) => item.id === entry.display?.updateActionId);
     const deleteAction = relatedObject?.actions?.find((item) => item.id === entry.display?.deleteActionId);
     function getForm(setForm, action, formId) {
+        if (formId === '_auto_')
+            return;
         if (formId || action?.defaultFormId) {
             apiServices
                 .get(getPrefixedUrl(`/forms/${formId || action?.defaultFormId}`))
@@ -554,7 +556,9 @@ const RepeatableField = (props) => {
                 : dialogType === 'update'
                     ? updateForm?.id
                     : dialogType === 'delete'
-                        ? deleteForm?.id
+                        ? entry.display?.deleteFormId === '_auto_'
+                            ? '_auto_'
+                            : deleteForm?.id
                         : undefined, instanceId: selectedInstanceId, relatedParameter: fieldDefinition, associatedObject: instance?.id && fieldDefinition.relatedPropertyId
                 ? { instanceId: instance.id, propertyId: fieldDefinition.relatedPropertyId }
                 : undefined })),

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

@@ -729,4 +729,24 @@ describe('FormRendererContainer', () => {
             expect(scrollIntoViewMock).not.toHaveBeenCalled();
         });
     });
+    it('renders the auto-generated delete confirmation form when formId is "_auto_"', async () => {
+        server.use(http.get('/api/data/objects/specialty/instances/test-instance', () => {
+            return HttpResponse.json({
+                id: 'test-instance',
+                name: 'Persons Name',
+                specialtyType: null,
+                license: null,
+            });
+        }), http.get('/api/data/objects/specialty/instances/test-instance/object', () => {
+            return HttpResponse.json(specialtyObject);
+        }));
+        render(React.createElement(FormRendererContainer, { objectId: 'specialty', formId: '_auto_', dataType: 'objectInstances', actionId: '_delete', instanceId: 'test-instance' }));
+        // Wait for the delete confirmation message to appear
+        const confirmation = await screen.findByText(/you are about to delete/i);
+        expect(confirmation).toBeInTheDocument();
+        // Validate that the message includes the instance name
+        expect(confirmation).toHaveTextContent(/Persons Name/);
+        // Ensure the "Delete" button is rendered
+        await screen.findByRole('button', { name: /delete/i });
+    });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@evoke-platform/ui-components",
-    "version": "1.10.0-testing.21",
+    "version": "1.10.0-testing.23",
     "description": "",
     "main": "dist/published/index.js",
     "module": "dist/published/index.js",