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

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

@@ -186,7 +186,7 @@ function FormRendererContainer(props) {
         if (!form) {
             return;
         }
-        submission = await formatSubmission(submission, apiServices, objectId, instanceId, form, setSnackbarError);
+        submission = await formatSubmission(submission, apiServices, objectId, instanceId, form, setSnackbarError, undefined, parameters);
         try {
             if (action?.type === 'create') {
                 const response = await apiServices.post(getPrefixedUrl(`/objects/${form.objectId}/instances/actions`), {

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

@@ -9,7 +9,7 @@ import { Accordion, AccordionDetails, AccordionSummary, Button, IconButton, Skel
 import { Box } from '../../../../../layout';
 import { getReadableQuery } from '../../../../CriteriaBuilder';
 import { retrieveCustomErrorMessage } from '../../../../Form/utils';
-import { deleteDocuments, formatSubmission, getPrefixedUrl, transformToWhere } from '../../utils';
+import { convertPropertiesToParams, deleteDocuments, formatSubmission, getPrefixedUrl, transformToWhere, } from '../../utils';
 import { ActionDialog } from './ActionDialog';
 import { DocumentViewerCell } from './DocumentViewerCell';
 const styles = {
@@ -344,7 +344,7 @@ const RepeatableField = (props) => {
         // 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 }
-            : undefined);
+            : undefined, action?.parameters ?? (relatedObject && convertPropertiesToParams(relatedObject)));
         if (action?.type === 'create' && entry.display?.createActionId) {
             const updatedInput = {
                 ...input,

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

@@ -57,6 +57,7 @@ export const Document = (props) => {
     const handleUpload = async (files) => {
         // Store File objects in form state - they will be uploaded during autosave via formatSubmission()
         const newDocuments = [...(documents ?? []), ...(files ?? [])];
+        console.debug('Uploading documents:', newDocuments);
         setDocuments(newDocuments);
         try {
             handleChange && (await handleChange(id, newDocuments));

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

@@ -84,7 +84,7 @@ export declare function formatSubmission(submission: FieldValues, apiServices?:
 }>>, associatedObject?: {
     instanceId: string;
     propertyId: string;
-}): Promise<FieldValues>;
+}, parameters?: InputParameter[]): Promise<FieldValues>;
 export declare function filterEmptySections(entry: Sections | Columns, instance?: FieldValues, formData?: FieldValues): Sections | Columns | null;
 export declare function assignIdsToSectionsAndRichText(entries: FormEntry[], object: Obj, parameters?: InputParameter[]): FormEntry[];
 /**

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

@@ -1,5 +1,5 @@
 import { LocalDateTime } from '@js-joda/core';
-import jsonLogic from 'json-logic-js';
+import { jsonLogic } from 'json-logic-js-graphql';
 import { get, isArray, isEmpty, isObject, omit, pick, startCase, transform } from 'lodash';
 import { DateTime } from 'luxon';
 import { nanoid } from 'nanoid';
@@ -115,6 +115,16 @@ 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;
+    }
+};
 export function getPrefixedUrl(url) {
     const wcsMatchers = ['/apps', '/pages', '/widgets'];
     const dataMatchers = ['/objects', '/correspondenceTemplates', '/documents', '/payments', '/forms', '/locations'];
@@ -584,7 +594,7 @@ export const deleteDocuments = async (submittedFields, requestSuccess, apiServic
  *
  * Returns the cleaned submission ready for submitting.
  */
-export async function formatSubmission(submission, apiServices, objectId, instanceId, form, setSnackbarError, associatedObject) {
+export async function formatSubmission(submission, apiServices, objectId, instanceId, form, setSnackbarError, associatedObject, parameters) {
     if (associatedObject) {
         delete submission[associatedObject.propertyId];
     }
@@ -596,7 +606,7 @@ export async function formatSubmission(submission, apiServices, objectId, instan
             const fileInArray = value.some((item) => item instanceof File);
             if (fileInArray && apiServices && objectId) {
                 // Determine property type from the entry
-                const propertyType = entry?.input?.type;
+                const propertyType = getEntryType(entry, parameters);
                 try {
                     let uploadedDocuments = [];
                     if (propertyType === 'file') {

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

@@ -135,6 +135,44 @@ describe('FormRenderer', () => {
             // Validate that specialty type dropdown renders
             await screen.findByRole('combobox', { name: 'Specialty Type' });
         });
+        it('shows fields based on form data using JsonLogic with a Lodash function', async () => {
+            server.use(http.get('/data/objects/license/instances/rnLicense', () => HttpResponse.json(rnLicense)));
+            const user = userEvent.setup();
+            const FormWithState = () => {
+                const [formData, setFormData] = React.useState({
+                    specialtyType: { id: 'rnSpecialtyType1', name: 'RN Specialty Type #1' },
+                });
+                const handleChange = (id, value) => {
+                    setFormData((prev) => {
+                        const newData = { ...prev };
+                        set(newData, id, value);
+                        return newData;
+                    });
+                };
+                try {
+                    return (React.createElement(FormRenderer, { form: jsonLogicDisplayTestSpecialtyForm, value: formData, onChange: handleChange, instance: {
+                            id: '123',
+                            objectId: 'specialty',
+                            name: 'Test Specialty Object Instance',
+                        } }));
+                }
+                catch (err) {
+                    console.error('Render error:', err);
+                    return React.createElement("div", null, "Render error");
+                }
+            };
+            render(React.createElement(FormWithState, null));
+            // Validate that Additional Training renders because specialtyType.name isn't empty
+            await screen.findByRole('textbox', { name: 'Additional Training' });
+            await screen.findByRole('combobox', { name: 'Specialty Type' });
+            // Clear the specialtyType field
+            const clearButton = screen.getByRole('button', { name: 'Clear selection' });
+            await user.click(clearButton);
+            // Validate that Additional Training is no longer visible because specialtyType.name is now empty
+            await waitFor(() => {
+                expect(screen.queryByRole('textbox', { name: 'Additional Training' })).not.toBeInTheDocument();
+            });
+        });
         it('hides fields based on instance data using JsonLogic', async () => {
             server.use(http.get('/data/objects/license/instances/rnLicense', () => HttpResponse.json(rnLicense)));
             render(React.createElement(FormRenderer, { form: jsonLogicDisplayTestSpecialtyForm, onChange: () => { }, instance: {
@@ -170,7 +208,6 @@ describe('FormRenderer', () => {
             expect(screen.queryByRole('combobox', { name: 'Specialty Type' })).not.toBeInTheDocument();
         });
     });
-    // accessibility508Form2
     describe('508 accessibility compliance', () => {
         it('supports keyboard navigation back and forth through Related Object dropdowns', async () => {
             const user = userEvent.setup();

package/dist/published/components/custom/FormV2/tests/test-data.js

@@ -87,6 +87,25 @@ export const jsonLogicDisplayTestSpecialtyForm = {
                 },
             },
         },
+        {
+            parameterId: 'additionalTraining',
+            type: 'input',
+            display: {
+                label: 'Additional Training',
+                visibility: {
+                    and: [
+                        {
+                            '!': {
+                                _isEmpty: { var: 'data.specialtyType.name' },
+                            },
+                        },
+                        {
+                            in: [{ var: 'data.specialtyType.name' }, ['RN Specialty Type #1', 'RN Specialty Type #2']],
+                        },
+                    ],
+                },
+            },
+        },
         {
             parameterId: 'license',
             type: 'input',
@@ -360,6 +379,11 @@ export const specialtyObject = {
             type: 'object',
             objectId: 'license',
         },
+        {
+            id: 'additionalTraining',
+            name: 'Additional Training',
+            type: 'string',
+        },
     ],
     actions: [
         {
@@ -422,6 +446,11 @@ export const specialtyObject = {
                     type: 'object',
                     objectId: 'license',
                 },
+                {
+                    id: 'additionalTraining',
+                    name: 'Additional Training',
+                    type: 'string',
+                },
             ],
         },
         {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@evoke-platform/ui-components",
-    "version": "1.13.0-dev.1",
+    "version": "1.13.0-dev.3",
     "description": "",
     "main": "dist/published/index.js",
     "module": "dist/published/index.js",
@@ -128,6 +128,7 @@
         "flat": "^6.0.1",
         "formiojs": "^4.21.7",
         "html-react-parser": "^5.1.18",
+        "json-logic-js-graphql": "^1.2.4",
         "luxon": "^2.5.2",
         "nanoid": "^5.0.8",
         "nanoid-dictionary": "^4.3.0",