O3-1144: Remove redundant type definitions, use types from form-engine-lib

- Import and re-export types (FormField, FormPage, FormSection, FormQuestionOptions, etc.) from @openmrs/esm-form-engine-lib instead of defining them locally
- Create type aliases (Page, Section, Question, QuestionOptions) pointing to form-engine types for backward compatibility
- Export additional useful types (QuestionAnswerOption, HideProps, DisableProps, RepeatOptions, etc.) from form-engine-lib
- Update add-form-reference.modal.tsx to use FormPage, FormSection, FormField instead of local Page, Section, Question types
- All tests passing, no breaking changes

Author: RajPrakash681

src/components/interactive-builder/modals/add-form-reference/add-form-reference.modal.tsx

@@ -19,7 +19,7 @@ import {
 import { showSnackbar } from '@openmrs/esm-framework';
 import { useForms } from '@hooks/useForms';
 import { useClobdata } from '@hooks/useClobdata';
-import { type Form as FormType, type Schema, type Page, type Section, type Question } from '@types';
+import { type Form as FormType, type Schema, type FormPage, type FormSection, type FormField } from '@types';
 import styles from './add-form-reference.scss';
 
 interface AddFormReferenceModalProps {
@@ -41,9 +41,9 @@ const AddFormReferenceModal: React.FC<AddFormReferenceModalProps> = ({
 }) => {
   const { t } = useTranslation();
   const [selectedForm, setSelectedForm] = useState<FormType>(null);
-  const [pages, setPages] = useState<Page[]>([]);
-  const [selectedPage, setSelectedPage] = useState<Page>(null);
-  const [selectedSection, setSelectedSection] = useState<Section>(null);
+  const [pages, setPages] = useState<FormPage[]>([]);
+  const [selectedPage, setSelectedPage] = useState<FormPage>(null);
+  const [selectedSection, setSelectedSection] = useState<FormSection>(null);
   const [excludedQuestions, setExcludedQuestions] = useState<string[]>([]);
   const { forms, error, isLoading } = useForms();
   const { clobdata, isLoadingClobdata, clobdataError } = useClobdata(selectedForm);
@@ -61,18 +61,18 @@ const AddFormReferenceModal: React.FC<AddFormReferenceModalProps> = ({
     }
   }, [clobdata]);
 
-  const handleSelectedPage = useCallback(({ selectedItem }: { selectedItem: Page }) => {
+  const handleSelectedPage = useCallback(({ selectedItem }: { selectedItem: FormPage }) => {
     setSelectedPage(selectedItem);
     setSelectedSection(null);
     setExcludedQuestions([]);
   }, []);
 
-  const handleSelectedSections = useCallback((section: Section) => {
+  const handleSelectedSections = useCallback((section: FormSection) => {
     setSelectedSection(section);
     setExcludedQuestions([]);
   }, []);
 
-  const handleExcludedQuestions = useCallback((question: Question, checked: Boolean) => {
+  const handleExcludedQuestions = useCallback((question: FormField, checked: Boolean) => {
     setExcludedQuestions((prev) => {
       if (!checked) {
         return prev.some((q) => q === question.id) ? prev : [...prev, question.id];
@@ -211,7 +211,7 @@ const AddFormReferenceModal: React.FC<AddFormReferenceModalProps> = ({
                       label: page.label,
                       sections: page.sections,
                     }))}
-                    itemToString={(item: Page) => (item ? item.label : '')}
+                    itemToString={(item: FormPage) => (item ? item.label : '')}
                     onChange={handleSelectedPage}
                     selectedItem={selectedPage}
                   />

src/types.ts

@@ -7,10 +7,27 @@ import type {
   RenderType,
   RequiredFieldProps,
   FormReference,
+  OpenmrsEncounter,
+  OpenmrsObs,
+  SessionMode,
+  PostSubmissionAction,
+  FormSchema,
+  FormPage,
+  FormSection,
+  FormQuestionOptions,
+  QuestionAnswerOption,
+  HideProps,
+  DisableProps,
+  RepeatOptions,
 } from '@openmrs/esm-form-engine-lib';
 import type { AuditInfo } from './components/audit-details/audit-details.component';
 import type { questionTypes } from '@constants';
 
+// Extend FormSchema to include description property
+export interface FormBuilderSchema extends FormSchema {
+  description?: string;
+}
+
 export interface Form {
   uuid: string;
   name: string;
@@ -50,116 +67,33 @@ export type QuestionType = (typeof questionTypes)[number];
 
 export type DatePickerType = 'both' | 'calendar' | 'timer';
 
-export interface Schema {
-  name: string;
-  pages: Array<{
-    label: string;
-    sections: Array<{
-      label: string;
-      isExpanded: string;
-      reference?: FormReference;
-      questions: Array<{
-        id: string;
-        label?: string;
-        value?: string;
-        type: string;
-        required?: string | boolean | RequiredFieldProps;
-        questionInfo?: string;
-        questionOptions: {
-          type?: string;
-          concept?: string;
-          answers?: Array<Record<string, string>>;
-          rendering: RenderType;
-          max?: string;
-          min?: string;
-          conceptMappings?: Array<Record<string, string>>;
-        };
-        questions?: Array<Question>;
-        validators?: Array<Record<string, string>>;
-      }>;
-    }>;
-  }>;
-  processor: string;
-  uuid: string;
-  encounterType: string;
-  referencedForms: Array<ReferencedForm>;
-  version?: string;
-  description?: string;
-  encounter?: string | OpenmrsEncounter;
-  allowUnspecifiedAll?: boolean;
-  defaultPage?: string;
-  readonly?: string | boolean;
-  inlineRendering?: 'single-line' | 'multiline' | 'automatic';
-  markdown?: unknown;
-  postSubmissionActions?: Array<{ actionId: string; config?: Record<string, unknown> }>;
-  formOptions?: {
-    usePreviousValueDisabled: boolean;
-  };
-  translations?: Record<string, string>;
-}
+// Using extended FormBuilderSchema instead of FormSchema
+export type Schema = FormBuilderSchema;
 
 export interface SchemaContextType {
   schema: Schema;
   setSchema: (schema: Schema) => void;
 }
 
-export interface Page {
-  label: string;
-  sections: Array<Section>;
-}
+// Using FormPage from form-engine-lib instead of local Page
+export type Page = FormPage;
+// Export FormPage as well for direct imports
+export { FormPage };
 
-export interface Section {
-  label: string;
-  questions: Array<Question>;
-  isExpanded: string | boolean;
-}
+// Using FormSection from form-engine-lib instead of local Section
+export type Section = FormSection;
+// Export FormSection as well for direct imports
+export { FormSection };
 
-export interface Question {
-  id: string;
-  label?: string;
-  value?: any;
-  type: string;
-  questionOptions: QuestionOptions;
-  datePickerFormat?: DatePickerType;
-  questions?: Array<Question>;
-  required?: string | boolean | RequiredFieldProps;
-  validators?: Array<Record<string, string>>;
-  questionInfo?: string;
-}
+// Using FormField from form-engine-lib instead of local Question
+export type Question = FormField;
+// Export FormField as well for direct imports
+export { FormField };
 
-export interface QuestionOptions {
-  rendering: RenderType;
-  answers?: Array<Record<string, string>>;
-  concept?: string;
-  conceptMappings?: Array<ConceptMapping>;
-  max?: string;
-  min?: string;
-  isSearchable?: boolean;
-  attributeType?: string;
-  calculate?: {
-    calculateExpression: string;
-  };
-  rows?: number;
-  orderSettingUuid?: string;
-  orderType?: string;
-  identifierType?: string;
-  selectableOrders?: Array<
-    | {
-        concept: string;
-        label: string;
-      }
-    | Record<string, any>
-  >;
-  weekList?: [];
-  showComment?: boolean;
-  showDate?: string;
-  programUuid?: string;
-  workflowUuid?: string;
-  toggleOptions?: {
-    labelTrue: string;
-    labelFalse: string;
-  };
-}
+// Using FormQuestionOptions from form-engine-lib instead of local QuestionOptions
+export type QuestionOptions = FormQuestionOptions;
+// Export FormQuestionOptions as well for direct imports
+export { FormQuestionOptions };
 
 export interface Answer {
   concept: string;
@@ -208,53 +142,24 @@ export interface PersonAttributeType {
   };
 }
 
-export interface OpenmrsEncounter {
-  uuid?: string;
-  encounterDatetime?: string | Date;
-  patient?: OpenmrsResource | string;
-  location?: OpenmrsResource | string;
-  encounterType?: OpenmrsResource | string;
-  obs?: Array<OpenmrsObs>;
-  orders?: Array<OpenmrsResource>;
-  voided?: boolean;
-  visit?: OpenmrsResource | string;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  encounterProviders?: Array<Record<string, any>>;
-  form?: OpenmrsFormResource;
-}
-
-export type SessionMode = 'edit' | 'enter' | 'view' | 'embedded-view';
-
-export interface PostSubmissionAction {
-  applyAction(
-    formSession: {
-      patient: fhir.Patient;
-      encounters: Array<OpenmrsEncounter>;
-      sessionMode: SessionMode;
-    },
-    config?: Record<string, unknown>,
-    enabled?: string,
-  ): void;
-}
-
-export interface OpenmrsObs extends OpenmrsResource {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  concept?: any;
-  obsDatetime?: string | Date;
-  obsGroup?: OpenmrsObs;
-  groupMembers?: Array<OpenmrsObs>;
-  comment?: string;
-  location?: OpenmrsResource;
-  order?: OpenmrsResource;
-  encounter?: OpenmrsResource;
-  voided?: boolean;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  value?: any;
-  formFieldPath?: string;
-  formFieldNamespace?: string;
-  status?: string;
-  interpretation?: string;
-}
+// Export the imported types directly
+export type {
+  OpenmrsEncounter,
+  OpenmrsObs,
+  SessionMode,
+  PostSubmissionAction,
+  FormSchema,
+  QuestionAnswerOption,
+  HideProps,
+  DisableProps,
+  RepeatOptions,
+  OpenmrsFormResource,
+  RenderType,
+  RequiredFieldProps,
+  FormReference,
+  ReferencedForm,
+  ProgramState,
+};
 
 export interface Program {
   uuid: string;