refractor: move object type to types dir

openmrs · Mar 25, 2024 · f5dca54 · f5dca54
1 parent 2aab89e
commit f5dca54
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 19 deletions.
diff --git a/packages/esm-patient-common-lib/src/orders/postOrders.ts b/packages/esm-patient-common-lib/src/orders/postOrders.ts
@@ -1,7 +1,8 @@
 import { openmrsFetch } from '@openmrs/esm-framework';
 import { getPatientUuidFromUrl } from '../get-patient-uuid-from-url';
 import { type OrderBasketStore, orderBasketStore } from './store';
-import { type OrderBasketItem, type OrderPost } from './types';
+import { type ExtractedOrderErrorObject, type OrderBasketItem, type OrderPost } from './types';
+import { type OderErrorObject } from './types';
 
 export async function postOrders(encounterUuid: string, abortController: AbortController) {
   const patientUuid = getPatientUuidFromUrl();
@@ -35,22 +36,7 @@ function postOrder(body: OrderPost, abortController?: AbortController) {
   });
 }
 
-interface IErrorObject {
-  responseBody?: {
-    error?: {
-      message?: string;
-      fieldErrors?: {
-        [fieldName: string]: {
-          message: string;
-          [key: string]: string;
-        }[];
-      };
-      globalErrors?: string[];
-    };
-  };
-}
-
-function extractErrorDetails(errorObject: IErrorObject) {
+function extractErrorDetails(errorObject: OderErrorObject): ExtractedOrderErrorObject {
   const errorDetails = {
     message: errorObject.responseBody?.error?.message,
     fieldErrors: [],

diff --git a/packages/esm-patient-common-lib/src/orders/types.ts b/packages/esm-patient-common-lib/src/orders/types.ts
@@ -1,5 +1,25 @@
 import { type OpenmrsResource } from '@openmrs/esm-framework';
 
+export interface ExtractedOrderErrorObject {
+  message: string;
+  fieldErrors: string[];
+  globalErrors: string[];
+}
+export interface OderErrorObject {
+  responseBody?: {
+    error?: {
+      message?: string;
+      fieldErrors?: {
+        [fieldName: string]: {
+          message: string;
+          [key: string]: string;
+        }[];
+      };
+      globalErrors?: string[];
+    };
+  };
+}
+
 export interface OrderBasketItem {
   action: 'NEW' | 'REVISE' | 'DISCONTINUE' | 'RENEW' | undefined;
   display: string;
@@ -15,7 +35,7 @@ export interface OrderBasketItem {
       };
     };
   };
-  extractedOrderError?: { message: string; fieldErrors: string[]; globalErrors: string[] };
+  extractedOrderError?: ExtractedOrderErrorObject;
   isOrderIncomplete?: boolean;
 }
 

diff --git a/packages/esm-patient-medications-app/src/add-drug-order/drug-order-form.component.tsx b/packages/esm-patient-medications-app/src/add-drug-order/drug-order-form.component.tsx
@@ -91,9 +91,11 @@ const schemaFields = {
   asNeededCondition: z.string().nullable(),
   duration: z.number().nullable(),
   durationUnit: z.object({ ...comboSchema }).nullable(),
+  // t( 'pillDispensedErrorMessage', 'The quantity to dispense is required' )
   pillsDispensed: z.number({
     invalid_type_error: translateFrom(moduleName, 'pillDispensedErrorMessage', 'The quantity to dispense is required'),
   }),
+  // t( 'selectQuantityUnitsErrorMessage', 'Dispensing requires a quantity unit' )
   quantityUnits: z.object(
     { ...comboSchema },
     {
@@ -105,6 +107,7 @@ const schemaFields = {
     },
   ),
   numRefills: z.number().nullable(),
+  // t( 'indicationErrorMessage', 'Please add an indication' )
   indication: z.string().refine((value) => value !== '', {
     message: translateFrom(moduleName, 'indicationErrorMessage', 'Please add an indication'),
   }),

diff --git a/packages/esm-patient-medications-app/translations/en.json b/packages/esm-patient-medications-app/translations/en.json
@@ -37,6 +37,7 @@
   "goToDrugOrderForm": "Order form",
   "increment": "Increment",
   "indication": "Indication",
+  "indicationErrorMessage": "Please add an indication",
   "indicationPlaceholder": "e.g. \"Hypertension\"",
   "male": "Male",
   "medicationDurationAndUnit": "for {{duration}} {{durationUnit}}",
@@ -58,6 +59,7 @@
   "pastMedicationsTableTitle": "Past Medications",
   "patientInstructions": "Patient instructions",
   "patientInstructionsPlaceholder": "Additional dosing instructions (e.g. \"Take after eating\")",
+  "pillDispensedErrorMessage": "The quantity to dispense is required",
   "prescriptionDuration": "2. Prescription duration",
   "prescriptionRefills": "Prescription refills",
   "print": "Print",
@@ -76,9 +78,9 @@
   "searchResultsMatchesForTerm_one": "{{count}} result for \"{{searchTerm}}\"",
   "searchResultsMatchesForTerm_other": "{{count}} results for \"{{searchTerm}}\"",
   "selectFrequencyErrorMessage": "Please select a frequency",
+  "selectQuantityUnitsErrorMessage": "Dispensing requires a quantity unit",
   "selectRouteErrorMessage": "Please select a route",
   "selectUnitErrorMessage": "Please select a unit",
-  "selectQuantityUnitsErrorMessage": "Dispensing requires a quantity unit",
   "startDate": "Start date",
   "takeAsNeeded": "Take as needed",
   "tryReopeningTheForm": "Please try launching the form again",