@openmrs/esm-form-engine-lib 2.1.0-pre.1404 → 2.1.0-pre.1412

package/package.json

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

package/src/adapters/obs-adapter.ts

@@ -8,8 +8,13 @@ import {
   type Attachment,
   type ValueAndDisplay,
 } from '../types';
-import { hasRendering, gracefullySetSubmission, clearSubmission, flattenObsList } from '../utils/common-utils';
-import { parseToLocalDateTime } from '../utils/form-helper';
+import {
+  hasRendering,
+  gracefullySetSubmission,
+  clearSubmission,
+  flattenObsList,
+  parseToLocalDateTime,
+} from '../utils/common-utils';
 import { type FormContextProps } from '../provider/form-provider';
 import { type FormFieldValueAdapter } from '../types';
 import { isEmpty } from '../validators/form-validator';

package/src/components/renderer/field/form-field-renderer.component.tsx

@@ -16,11 +16,10 @@ import { hasRendering } from '../../../utils/common-utils';
 import { useFormProviderContext } from '../../../provider/form-provider';
 import { isEmpty } from '../../../validators/form-validator';
 import PreviousValueReview from '../../previous-value-review/previous-value-review.component';
-import { getRegisteredControl } from '../../../registry/registry';
+import { getFieldControlWithFallback, getRegisteredControl } from '../../../registry/registry';
 import styles from './form-field-renderer.scss';
 import { isTrue } from '../../../utils/boolean-utils';
 import UnspecifiedField from '../../inputs/unspecified/unspecified.component';
-import { getFieldControlWithFallback } from '../../../utils/form-helper';
 import { handleFieldLogic } from './fieldLogic';
 
 export interface FormFieldRendererProps {

package/src/registry/registry.ts

@@ -1,4 +1,5 @@
 import {
+  type FormField,
   type DataSource,
   type FormFieldValidator,
   type FormSchemaTransformer,
@@ -121,7 +122,7 @@ export async function getRegisteredControl(renderType: string) {
   let component = inbuiltControls.find(
     (control) => control.name === renderType || control?.alias === renderType,
   )?.component;
-  // if undefined, try serching through the registered custom controls
+  // if undefined, try searching through the registered custom controls
   if (!component) {
     const importedControl = await getFormsStore()
       .controls.find((control) => control.name === renderType || control?.alias === renderType)
@@ -132,6 +133,26 @@ export async function getRegisteredControl(renderType: string) {
   return component;
 }
 
+/**
+ * Retrieves the appropriate field control for a question, considering missing concepts.
+ * If the question is of type 'obs' and has a missing concept, it falls back to a disabled text input.
+ * Otherwise, it retrieves the registered control based on the rendering specified in the question.
+ * @param question - The FormField representing the question.
+ * @returns The field control to be used for rendering the question.
+ */
+export function getFieldControlWithFallback(question: FormField) {
+  // Check if the question has a missing concept
+  if (hasMissingConcept(question)) {
+    // If so, render a disabled text input
+    question.disabled = true;
+    question.isDisabled = true;
+    return getRegisteredControl('text');
+  }
+
+  // Retrieve the registered control based on the specified rendering
+  return getRegisteredControl(question.questionOptions.rendering);
+}
+
 export async function getRegisteredFieldValueAdapter(type: string): Promise<FormFieldValueAdapter> {
   if (registryCache.fieldValueAdapters[type]) {
     return registryCache.fieldValueAdapters[type];
@@ -259,3 +280,9 @@ function getFormsStore(): FormsRegistryStoreState {
     formSchemaTransformers: [],
   }).getState();
 }
+
+function hasMissingConcept(question: FormField) {
+  return (
+    question.type == 'obs' && !question.questionOptions.concept && question.questionOptions.rendering !== 'fixed-value'
+  );
+}

package/src/types/index.ts

@@ -110,6 +110,19 @@ export interface PostSubmissionAction {
   ): void;
 }
 
+export interface FormFieldInputProps {
+  value: any;
+  field: FormField;
+  errors: ValidationResult[];
+  warnings: ValidationResult[];
+  /**
+   * Callback function to handle changes to the field value in the React Hook Form context.
+   *
+   * @param value - The new value of the field.
+   */
+  setFieldValue: (value: any) => void;
+}
+
 /**
  * Field validator
  */

package/src/types/schema.ts

@@ -1,6 +1,5 @@
 import { type OpenmrsResource } from '@openmrs/esm-framework';
 import { type OpenmrsEncounter } from './domain';
-import { type ValidationResult } from '..';
 
 export interface FormSchema {
   name: string;
@@ -88,19 +87,6 @@ export interface FormField {
   meta?: QuestionMetaProps;
 }
 
-export interface FormFieldInputProps {
-  value: any;
-  field: FormField;
-  errors: ValidationResult[];
-  warnings: ValidationResult[];
-  /**
-   * Callback function to handle changes to the field value in the React Hook Form context.
-   *
-   * @param value - The new value of the field.
-   */
-  setFieldValue: (value: any) => void;
-}
-
 export interface HideProps {
   hideWhenExpression: string;
 }

package/src/utils/common-utils.test.ts

@@ -1,4 +1,11 @@
-import { flattenObsList, hasRendering, clearSubmission, gracefullySetSubmission, hasSubmission } from './common-utils';
+import {
+  flattenObsList,
+  hasRendering,
+  clearSubmission,
+  gracefullySetSubmission,
+  hasSubmission,
+  parseToLocalDateTime,
+} from './common-utils';
 import { isEmpty } from '../validators/form-validator';
 import { type FormField, type OpenmrsObs } from '../types';
 import { obsList } from '__mocks__/forms/rfe-forms/obs-list-data';
@@ -134,3 +141,32 @@ describe('utils functions', () => {
     });
   });
 });
+
+describe('parseToLocalDateTime', () => {
+  it('should parse valid date string with time correctly', () => {
+    const dateString = '2023-06-27T14:30:00';
+    const expectedDate = new Date(2023, 5, 27, 14, 30, 0);
+    const parsedDate = parseToLocalDateTime(dateString);
+
+    expect(parsedDate).toEqual(expectedDate);
+  });
+
+  it('should parse valid date string without time correctly', () => {
+    const dateString = '2023-06-27';
+    const expectedDate = new Date(2023, 5, 27);
+    const parsedDate = parseToLocalDateTime(dateString);
+
+    // Set hours, minutes, and seconds to 0 since the input doesn't contain time
+    expectedDate.setHours(0, 0, 0, 0);
+
+    expect(parsedDate).toEqual(expectedDate);
+  });
+
+  it('should handle invalid date string format gracefully', () => {
+    const dateString = 'invalid-date-string';
+    const parsedDate = parseToLocalDateTime(dateString);
+
+    // Check if the parsedDate is an Invalid Date
+    expect(isNaN(parsedDate.getTime())).toBe(true);
+  });
+});

package/src/utils/common-utils.ts

@@ -1,3 +1,4 @@
+import dayjs from 'dayjs';
 import { type FormField, type OpenmrsObs, type RenderType } from '../types';
 import { isEmpty } from '../validators/form-validator';
 
@@ -53,3 +54,14 @@ export function hasSubmission(field: FormField) {
 export function isViewMode(sessionMode: string) {
   return sessionMode === 'view' || sessionMode === 'embedded-view';
 }
+
+export function parseToLocalDateTime(dateString: string): Date {
+  const dateObj = dayjs(dateString).toDate();
+  try {
+    const localTimeTokens = dateString.split('T')[1].split(':');
+    dateObj.setHours(parseInt(localTimeTokens[0]), parseInt(localTimeTokens[1]), 0);
+  } catch (e) {
+    console.error(e);
+  }
+  return dateObj;
+}

package/src/utils/form-helper.test.ts

@@ -2,7 +2,6 @@ import {
   findConceptByReference,
   evaluateConditionalAnswered,
   evaluateFieldReadonlyProp,
-  parseToLocalDateTime,
   evaluateDisabled,
 } from './form-helper';
 import { DefaultValueValidator } from '../validators/default-value-validator';
@@ -384,35 +383,6 @@ describe('Form Engine Helper', () => {
     });
   });
 
-  describe('parseToLocalDateTime', () => {
-    it('should parse valid date string with time correctly', () => {
-      const dateString = '2023-06-27T14:30:00';
-      const expectedDate = new Date(2023, 5, 27, 14, 30, 0);
-      const parsedDate = parseToLocalDateTime(dateString);
-
-      expect(parsedDate).toEqual(expectedDate);
-    });
-
-    it('should parse valid date string without time correctly', () => {
-      const dateString = '2023-06-27';
-      const expectedDate = new Date(2023, 5, 27);
-      const parsedDate = parseToLocalDateTime(dateString);
-
-      // Set hours, minutes, and seconds to 0 since the input doesn't contain time
-      expectedDate.setHours(0, 0, 0, 0);
-
-      expect(parsedDate).toEqual(expectedDate);
-    });
-
-    it('should handle invalid date string format gracefully', () => {
-      const dateString = 'invalid-date-string';
-      const parsedDate = parseToLocalDateTime(dateString);
-
-      // Check if the parsedDate is an Invalid Date
-      expect(isNaN(parsedDate.getTime())).toBe(true);
-    });
-  });
-
   describe('evaluateDisabled', () => {
     let mockExpressionRunnerFn;
     let node;

package/src/utils/form-helper.ts

@@ -1,4 +1,3 @@
-import dayjs from 'dayjs';
 import { type LayoutType } from '@openmrs/esm-framework';
 import { type FormField, type FormPage, type FormSection, type SessionMode } from '../types';
 import { isEmpty } from '../validators/form-validator';
@@ -58,17 +57,6 @@ export function findPagesWithErrors(pages: Set<FormPage>, errorFields: FormField
   return pagesWithErrors;
 }
 
-export function parseToLocalDateTime(dateString: string): Date {
-  const dateObj = dayjs(dateString).toDate();
-  try {
-    const localTimeTokens = dateString.split('T')[1].split(':');
-    dateObj.setHours(parseInt(localTimeTokens[0]), parseInt(localTimeTokens[1]), 0);
-  } catch (e) {
-    console.error(e);
-  }
-  return dateObj;
-}
-
 export function evalConditionalRequired(field: FormField, allFields: FormField[], formValues: Record<string, any>) {
   if (typeof field.required !== 'object') {
     return false;
@@ -170,32 +158,6 @@ export function findConceptByReference(reference: string, concepts) {
   }
 }
 
-/**
- * Retrieves the appropriate field control for a question, considering missing concepts.
- * If the question is of type 'obs' and has a missing concept, it falls back to a disabled text input.
- * Otherwise, it retrieves the registered control based on the rendering specified in the question.
- * @param question - The FormField representing the question.
- * @returns The field control to be used for rendering the question.
- */
-export function getFieldControlWithFallback(question: FormField) {
-  // Check if the question has a missing concept
-  if (hasMissingConcept(question)) {
-    // If so, render a disabled text input
-    question.disabled = true;
-    question.isDisabled = true;
-    return getRegisteredControl('text');
-  }
-
-  // Retrieve the registered control based on the specified rendering
-  return getRegisteredControl(question.questionOptions.rendering);
-}
-
-export function hasMissingConcept(question: FormField) {
-  return (
-    question.type == 'obs' && !question.questionOptions.concept && question.questionOptions.rendering !== 'fixed-value'
-  );
-}
-
 export function scrollIntoView(viewId: string, shouldFocus: boolean = false) {
   const currentElement = document.getElementById(viewId);
   currentElement?.scrollIntoView({