@openmrs/esm-fast-data-entry-app 1.0.1-pre.180 → 1.0.1-pre.183

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.2.0"},"pages":[{"component":"root","routeRegex":"forms","online":true,"offline":true}],"extensions":[{"name":"forms-app-link","slot":"app-menu-slot","component":"formsAppMenuLink","online":true,"offline":true}],"version":"1.0.1-pre.180"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.2.0"},"pages":[{"component":"root","routeRegex":"forms","online":true,"offline":true}],"extensions":[{"name":"forms-app-link","slot":"app-menu-slot","component":"formsAppMenuLink","online":true,"offline":true}],"version":"1.0.1-pre.183"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-fast-data-entry-app",
-  "version": "1.0.1-pre.180",
+  "version": "1.0.1-pre.183",
   "license": "MPL-2.0",
   "description": "An OpenMRS 3.x microfrontend",
   "browser": "dist/openmrs-esm-fast-data-entry-app.js",

package/src/group-form-entry-workflow/SessionDetailsForm.tsx

@@ -9,7 +9,7 @@ import { AttendanceTable } from './attendance-table';
 import GroupFormWorkflowContext from '../context/GroupFormWorkflowContext';
 import useGetPatients from '../hooks/useGetPatients';
 import ConfigurableQuestionsSection from './configurable-questions/ConfigurableQuestionsSection';
-import useSpecificQuestions from '../hooks/useForm';
+import useSpecificQuestions from '../hooks/useSpecificQuestions';
 
 interface ParamTypes {
   formUuid?: string;

package/src/group-form-entry-workflow/configurable-questions/ConfigurableQuestionsSection.tsx

@@ -18,6 +18,8 @@ const ConfigurableQuestionsSection: React.FC<ConfigurableQuestionsSectionProps>
               {...register(specificQuestion.question.id, { required: false })}
               id={specificQuestion.question.id}
               labelText={specificQuestion.question.display}
+              readOnly={!!specificQuestion.question.disabled}
+              defaultValue={specificQuestion.question.defaultAnswer}
             >
               <SelectItem value="" text="" />
               {specificQuestion.answers.map((answer) => (
@@ -30,6 +32,8 @@ const ConfigurableQuestionsSection: React.FC<ConfigurableQuestionsSectionProps>
               {...register(specificQuestion.question.id, { required: false })}
               type="text"
               labelText={specificQuestion.question.display}
+              readOnly={!!specificQuestion.question.disabled}
+              defaultValue={specificQuestion.question.defaultAnswer}
             />
           )}
         </div>

package/src/hooks/index.ts

@@ -2,7 +2,7 @@ import useGetAllForms from './useGetAllForms';
 import useGetPatient from './useGetPatient';
 import useFormState from './useFormState';
 import useGetEncounter from './useGetEncounter';
-import useForm from './useForm';
+import useSpecificQuestions from './useSpecificQuestions';
 
-export { useGetAllForms, useGetPatient, useFormState, useGetEncounter, useForm };
+export { useGetAllForms, useGetPatient, useFormState, useGetEncounter, useSpecificQuestions };
 export * from './usePostEndpoint';

package/src/hooks/useSpecificQuestions.ts

@@ -0,0 +1,68 @@
+import { type FetchResponse, openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
+import useSWR from 'swr';
+import { type SpecificQuestion, type SpecificQuestionConfig } from '../types';
+import { useMemo } from 'react';
+
+const formUrl = `${restBaseUrl}/o3/forms`;
+
+export const useSpecificQuestions = (formUuid: string, specificQuestionConfig: Array<SpecificQuestionConfig>) => {
+  const specificQuestionsToLoad = useMemo(
+    () => getQuestionByFormId(formUuid, specificQuestionConfig),
+    [formUuid, specificQuestionConfig],
+  );
+
+  const { data, error } = useSWR<FetchResponse, Error>(
+    specificQuestionsToLoad ? `${formUrl}/${formUuid}` : null,
+    openmrsFetch,
+  );
+
+  const specificQuestions = getQuestions(specificQuestionsToLoad, data?.data);
+
+  return {
+    questions: specificQuestions || null,
+    isError: error,
+    isLoading: !data && !error,
+  };
+};
+
+function getQuestionByFormId(formUuid: string, specificQuestionConfig: Array<SpecificQuestionConfig>) {
+  return specificQuestionConfig.filter((question) => question.forms.includes(formUuid));
+}
+
+function getQuestions(specificQuestions: Array<SpecificQuestionConfig>, formSchema): Array<SpecificQuestion> {
+  if (!formSchema || specificQuestions.length <= 0) {
+    return [];
+  }
+
+  const specificQuestionsMap = new Map<string, SpecificQuestionConfig>(
+    specificQuestions.map((sq) => [sq.questionId, sq]),
+  );
+
+  const questionIds = new Set(specificQuestionsMap.keys());
+  const conceptLabels = formSchema.conceptReferences;
+
+  return formSchema.pages.flatMap((page) =>
+    page.sections.flatMap((section) =>
+      section.questions
+        .filter((question) => questionIds.has(question.id))
+        .map((question) => {
+          const specificQuestion = specificQuestionsMap.get(question.id) || {};
+
+          return {
+            question: {
+              display: question.label ?? conceptLabels[question.questionOptions.concept]?.display,
+              id: question.id,
+              disabled: (specificQuestion as SpecificQuestionConfig).disabled,
+              defaultAnswer: (specificQuestion as SpecificQuestionConfig).defaultAnswer,
+            },
+            answers: (question.questionOptions.answers ?? []).map((answer) => ({
+              value: answer.concept,
+              display: answer.label ?? conceptLabels[answer.concept]?.display,
+            })),
+          };
+        }),
+    ),
+  );
+}
+
+export default useSpecificQuestions;

package/src/types.ts

@@ -7,6 +7,8 @@ export interface SpecificQuestion {
   question: {
     id: string;
     display: string;
+    defaultAnswer?: string;
+    disabled?: boolean;
   };
   answers: Array<{
     value: string;
@@ -17,4 +19,6 @@ export interface SpecificQuestion {
 export interface SpecificQuestionConfig {
   forms: Array<string>;
   questionId: string;
+  defaultAnswer?: string;
+  disabled?: boolean;
 }

package/src/hooks/useForm.ts

@@ -1,56 +0,0 @@
-import { type FetchResponse, openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
-import useSWR from 'swr';
-import { type SpecificQuestion, type SpecificQuestionConfig } from '../types';
-import { useMemo } from 'react';
-
-const formUrl = `${restBaseUrl}/o3/forms`;
-
-export const useSpecificQuestions = (formUuid: string, specificQuestionConfig: Array<SpecificQuestionConfig>) => {
-  const specificQuestionsToLoad = useMemo(
-    () => getQuestionIdsByFormId(formUuid, specificQuestionConfig),
-    [formUuid, specificQuestionConfig],
-  );
-
-  const { data, error } = useSWR<FetchResponse, Error>(
-    specificQuestionsToLoad ? `${formUrl}/${formUuid}` : null,
-    openmrsFetch,
-  );
-
-  const specificQuestions = getQuestionsByIds(specificQuestionsToLoad, data?.data);
-
-  return {
-    questions: specificQuestions || null,
-    isError: error,
-    isLoading: !data && !error,
-  };
-};
-
-function getQuestionIdsByFormId(formUuid: string, specificQuestionConfig: Array<SpecificQuestionConfig>) {
-  const matchingQuestions = specificQuestionConfig.filter((question) => question.forms.includes(formUuid));
-  return matchingQuestions.map((question) => question.questionId);
-}
-
-function getQuestionsByIds(questionIds, formSchema): Array<SpecificQuestion> {
-  if (!formSchema || questionIds.lenght <= 0) {
-    return [];
-  }
-  const conceptLabels = formSchema.conceptReferences;
-  return formSchema.pages.flatMap((page) =>
-    page.sections.flatMap((section) =>
-      section.questions
-        .filter((question) => questionIds.includes(question.id))
-        .map((question) => ({
-          question: {
-            display: question.label ?? conceptLabels[question.questionOptions.concept]?.display,
-            id: question.id,
-          },
-          answers: (question.questionOptions.answers ?? []).map((answer) => ({
-            value: answer.concept,
-            display: answer.label ?? conceptLabels[answer.concept]?.display,
-          })),
-        })),
-    ),
-  );
-}
-
-export default useSpecificQuestions;