@openmrs/esm-form-engine-lib 2.1.0-pre.1502 → 2.1.0-pre.1510

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-form-engine-lib",
-  "version": "2.1.0-pre.1502",
+  "version": "2.1.0-pre.1510",
   "description": "React Form Engine for O3",
   "browser": "dist/openmrs-esm-form-engine-lib.js",
   "main": "src/index.ts",

package/src/components/inputs/date/date.test.tsx

@@ -0,0 +1,107 @@
+import React from 'react';
+import { act, render, screen } from '@testing-library/react';
+import { useFormProviderContext } from 'src/provider/form-provider';
+import DateField from './date.component';
+import { type FormField } from 'src/types';
+import { OpenmrsDatePicker } from '@openmrs/esm-framework';
+import dayjs from 'dayjs';
+
+jest.mock('src/provider/form-provider', () => ({
+  useFormProviderContext: jest.fn(),
+}));
+
+const mockUseFormProviderContext = useFormProviderContext as jest.Mock;
+const mockSetFieldValue = jest.fn();
+
+const mockOpenmrsDatePicker = jest.mocked(OpenmrsDatePicker);
+
+mockOpenmrsDatePicker.mockImplementation(({ id, labelText, value, onChange, isInvalid, invalidText }) => {
+  return (
+    <>
+      <label htmlFor={id}>{labelText}</label>
+      <input
+        id={id}
+        value={value ? dayjs(value as unknown as string).format('DD/MM/YYYY') : ''}
+        onChange={(evt) => {
+          onChange(dayjs(evt.target.value).toDate());
+        }}
+      />
+      {isInvalid && <span>{invalidText}</span>}
+    </>
+  );
+});
+
+const dateFieldMock: FormField = {
+  id: 'test-date-field',
+  label: 'Test Date Field',
+  type: 'obs',
+  datePickerFormat: 'both',
+  questionOptions: {
+    rendering: 'date',
+    concept: '6089AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+  },
+  isHidden: false,
+  isDisabled: false,
+  readonly: false,
+};
+
+const renderDateField = async (props) => {
+  await act(() => render(<DateField {...props} />));
+};
+
+describe('DateField Component', () => {
+  beforeEach(() => {
+    mockUseFormProviderContext.mockReturnValue({
+      layoutType: 'default',
+      sessionMode: 'edit',
+      workspaceLayout: 'default',
+      formFieldAdapters: {},
+    });
+  });
+
+  it('should render date picker and time picker when datePickerFormat is "both"', async () => {
+    await renderDateField({
+      field: dateFieldMock,
+      value: new Date(),
+      errors: [],
+      warnings: [],
+      setFieldValue: mockSetFieldValue,
+    });
+
+    expect(screen.getByLabelText('Test Date Field')).toBeInTheDocument();
+    expect(screen.getByText('Time')).toBeInTheDocument();
+  });
+
+  it('should display error message when there are errors', async () => {
+    await renderDateField({
+      field: dateFieldMock,
+      value: new Date(),
+      errors: [{ resultType: 'error', message: 'Error message' }],
+      warnings: [],
+      setFieldValue: mockSetFieldValue,
+    });
+
+    const errorMessages = screen.getAllByText(/Error message/i);
+    expect(errorMessages.length).toBeGreaterThan(0);
+    errorMessages.forEach((message) => {
+      expect(message).toBeInTheDocument();
+    });
+  });
+
+  it('should display warning message when there are warnings', async () => {
+    const warnings = [{ resultType: 'warning', message: 'Warning message' }];
+    await renderDateField({
+      field: dateFieldMock,
+      value: new Date(),
+      errors: [],
+      warnings: warnings,
+      setFieldValue: mockSetFieldValue,
+    });
+
+    const warningMessages = screen.getAllByText(/Warning message/i);
+    expect(warningMessages.length).toBeGreaterThan(0);
+    warningMessages.forEach((message) => {
+      expect(message).toBeInTheDocument();
+    });
+  });
+});

package/src/processors/encounter/encounter-form-processor.ts

@@ -256,17 +256,11 @@ export class EncounterFormProcessor extends FormProcessor {
       const filteredFields = formFields.filter(
         (field) => field.questionOptions.rendering !== 'group' && field.type !== 'obsGroup',
       );
+      const fieldsWithCalculateExpressions = [];
       await Promise.all(
         filteredFields.map(async (field) => {
           const adapter = formFieldAdapters[field.type];
           initialValues[field.id] = emptyValues[field.questionOptions.rendering] ?? null;
-          if (field.questionOptions.calculate?.calculateExpression) {
-            try {
-              await evaluateCalculateExpression(field, initialValues, context);
-            } catch (error) {
-              console.error(error);
-            }
-          }
           if (isEmpty(initialValues[field.id]) && contextInitializableTypes.includes(field.type)) {
             try {
               initialValues[field.id] = await adapter.getInitialValue(field, null, context);
@@ -274,8 +268,18 @@ export class EncounterFormProcessor extends FormProcessor {
               console.error(error);
             }
           }
+          if (field.questionOptions.calculate?.calculateExpression) {
+            fieldsWithCalculateExpressions.push(field);
+          }
         }),
       );
+      fieldsWithCalculateExpressions.forEach(async (field) => {
+        try {
+          await evaluateCalculateExpression(field, initialValues, context);
+        } catch (error) {
+          console.error(error);
+        }
+      });
     }
     return initialValues;
   }

package/src/types/schema.ts

@@ -215,8 +215,6 @@ export type RenderType =
   | 'toggle'
   | 'ui-select-extended'
   | 'workspace-launcher'
-  | 'fixed-value'
-  | 'file'
   | 'markdown'
   | 'extension-widget'
   | 'select-concept-answers';