From 88586543f9b17a992041e1c5b247be5ab23df9bd Mon Sep 17 00:00:00 2001
From: Ian <52504170+ibacher@users.noreply.github.com>
Date: Thu, 29 Aug 2024 15:54:27 -0400
Subject: [PATCH] (fix) Move HtmlFormEntryForm type to patient-common-lib
 (#1983)

---
 .../visits-table/visits-table.component.tsx            |  8 ++++++--
 .../src/form-entry/form-entry.ts                       |  2 +-
 packages/esm-patient-common-lib/src/types/index.ts     | 10 ++++++++--
 packages/esm-patient-forms-app/src/config-schema.ts    |  9 +--------
 .../esm-patient-forms-app/src/form-entry-interop.ts    |  9 ++++++---
 .../src/offline-forms/offline-form-helpers.ts          |  2 +-
 6 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/packages/esm-patient-chart-app/src/visit/visits-widget/past-visits-components/visits-table/visits-table.component.tsx b/packages/esm-patient-chart-app/src/visit/visits-widget/past-visits-components/visits-table/visits-table.component.tsx
index bfb97d1b47..140df9f298 100644
--- a/packages/esm-patient-chart-app/src/visit/visits-widget/past-visits-components/visits-table/visits-table.component.tsx
+++ b/packages/esm-patient-chart-app/src/visit/visits-widget/past-visits-components/visits-table/visits-table.component.tsx
@@ -37,8 +37,12 @@ import {
   useSession,
   userHasAccess,
 } from '@openmrs/esm-framework';
-import { EmptyState, PatientChartPagination, launchFormEntryOrHtmlForms } from '@openmrs/esm-patient-common-lib';
-import type { HtmlFormEntryForm } from '@openmrs/esm-patient-forms-app/src/config-schema';
+import {
+  type HtmlFormEntryForm,
+  EmptyState,
+  PatientChartPagination,
+  launchFormEntryOrHtmlForms,
+} from '@openmrs/esm-patient-common-lib';
 import { deleteEncounter } from './visits-table.resource';
 import { type MappedEncounter } from '../../visit.resource';
 import EncounterObservations from '../../encounter-observations';
diff --git a/packages/esm-patient-common-lib/src/form-entry/form-entry.ts b/packages/esm-patient-common-lib/src/form-entry/form-entry.ts
index 0c918c0c59..4344381ef2 100644
--- a/packages/esm-patient-common-lib/src/form-entry/form-entry.ts
+++ b/packages/esm-patient-common-lib/src/form-entry/form-entry.ts
@@ -1,4 +1,4 @@
-import { type HtmlFormEntryForm } from '@openmrs/esm-patient-forms-app/src/config-schema';
+import { type HtmlFormEntryForm } from '../types';
 
 export interface FormEntryProps {
   encounterUuid?: string;
diff --git a/packages/esm-patient-common-lib/src/types/index.ts b/packages/esm-patient-common-lib/src/types/index.ts
index 38c6a9ff36..7ef7db6a5a 100644
--- a/packages/esm-patient-common-lib/src/types/index.ts
+++ b/packages/esm-patient-common-lib/src/types/index.ts
@@ -1,5 +1,3 @@
-import { type OpenmrsResource } from '@openmrs/esm-framework';
-
 export * from './test-results';
 
 export interface DashboardLinkConfig {
@@ -49,3 +47,11 @@ export interface DisplayMetadata {
   links: Links;
   uuid: string;
 }
+
+export interface HtmlFormEntryForm {
+  formUuid: string;
+  formName: string;
+  formUiResource: string;
+  formUiPage: 'enterHtmlFormWithSimpleUi' | 'enterHtmlFormWithStandardUi';
+  formEditUiPage: 'editHtmlFormWithSimpleUi' | 'editHtmlFormWithStandardUi';
+}
diff --git a/packages/esm-patient-forms-app/src/config-schema.ts b/packages/esm-patient-forms-app/src/config-schema.ts
index 655b82f343..00732e2ac0 100644
--- a/packages/esm-patient-forms-app/src/config-schema.ts
+++ b/packages/esm-patient-forms-app/src/config-schema.ts
@@ -1,4 +1,5 @@
 import { validator, Type } from '@openmrs/esm-framework';
+import { type HtmlFormEntryForm } from '@openmrs/esm-patient-common-lib';
 
 export const configSchema = {
   htmlFormEntryForms: {
@@ -133,14 +134,6 @@ export const configSchema = {
   },
 };
 
-export interface HtmlFormEntryForm {
-  formUuid: string;
-  formName: string;
-  formUiResource: string;
-  formUiPage: 'enterHtmlFormWithSimpleUi' | 'enterHtmlFormWithStandardUi';
-  formEditUiPage: 'editHtmlFormWithSimpleUi' | 'editHtmlFormWithStandardUi';
-}
-
 export interface FormsSection {
   name: string;
   forms: Array<string>;
diff --git a/packages/esm-patient-forms-app/src/form-entry-interop.ts b/packages/esm-patient-forms-app/src/form-entry-interop.ts
index c8a1d2cd2f..db65784042 100644
--- a/packages/esm-patient-forms-app/src/form-entry-interop.ts
+++ b/packages/esm-patient-forms-app/src/form-entry-interop.ts
@@ -1,7 +1,10 @@
 import { navigate, type Visit } from '@openmrs/esm-framework';
-import { type HtmlFormEntryForm } from './config-schema';
-import isEmpty from 'lodash-es/isEmpty';
-import { launchPatientWorkspace, launchStartVisitPrompt } from '@openmrs/esm-patient-common-lib';
+import {
+  type HtmlFormEntryForm,
+  launchPatientWorkspace,
+  launchStartVisitPrompt,
+} from '@openmrs/esm-patient-common-lib';
+import { isEmpty } from 'lodash-es';
 
 export function launchFormEntryOrHtmlForms(
   currentVisit: Visit | undefined,
diff --git a/packages/esm-patient-forms-app/src/offline-forms/offline-form-helpers.ts b/packages/esm-patient-forms-app/src/offline-forms/offline-form-helpers.ts
index 463983bed2..935513869b 100644
--- a/packages/esm-patient-forms-app/src/offline-forms/offline-form-helpers.ts
+++ b/packages/esm-patient-forms-app/src/offline-forms/offline-form-helpers.ts
@@ -1,7 +1,7 @@
 import useSWR from 'swr';
 import { getDynamicOfflineDataEntries } from '@openmrs/esm-framework';
+import { type HtmlFormEntryForm } from '@openmrs/esm-patient-common-lib';
 import { type Form, type FormEncounterResource } from '../types';
-import { type HtmlFormEntryForm } from '../config-schema';
 
 /**
  * Returns whether the given form encounter is valid for offline mode and can be cached.