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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-form-engine-lib",
-  "version": "2.1.0-pre.1409",
+  "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/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/utils/form-helper.ts

@@ -158,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({