@ampath/esm-dha-workflow-app 4.0.0-next.44 → 4.0.0-next.445

package/src/registry/registry.resource.ts

@@ -1,3 +1,4 @@
+import { openmrsFetch } from '@openmrs/esm-framework';
 import { getHieBaseUrl } from '../shared/utils/get-base-url';
 import {
   type ClientRegistrySearchRequest,
@@ -9,8 +10,8 @@ import {
 
 export type ClientRegistrySearchResponse = any[];
 
-async function postJson<T>(url: string, payload: unknown): Promise<T> {
-  const response = await fetch(url, {
+export async function postJson<T>(url: string, payload: unknown): Promise<T> {
+  const response = await openmrsFetch(url, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify(payload),
@@ -18,7 +19,24 @@ async function postJson<T>(url: string, payload: unknown): Promise<T> {
 
   if (!response.ok) {
     const errorText = await response.text();
-    throw new Error(`Request failed with ${response.status}: ${errorText}`);
+    // Surface the server's own message (e.g. { statusCode, message }) as the
+    // Error message so callers can show it directly, instead of a raw dump.
+    let message = `Request failed with ${response.status}`;
+    let responseBody: any;
+    try {
+      responseBody = errorText ? JSON.parse(errorText) : undefined;
+      if (responseBody?.message) {
+        message = responseBody.message;
+      }
+    } catch {
+      if (errorText) {
+        message = errorText;
+      }
+    }
+    const error = new Error(message) as Error & { statusCode?: number; responseBody?: unknown };
+    error.statusCode = response.status;
+    error.responseBody = responseBody;
+    throw error;
   }
 
   return response.json() as Promise<T>;
@@ -31,6 +49,7 @@ export async function requestCustomOtp(payload: RequestCustomOtpDto): Promise<Re
     identificationNumber: payload.identificationNumber,
     identificationType: payload.identificationType,
     locationUuid: payload.locationUuid,
+    phoneNumber: payload.phoneNumber,
   };
   return postJson<RequestCustomOtpResponse>(url, formattedPayload);
 }

package/src/registry/types/index.ts

@@ -1,14 +1,14 @@
 import { type Location, type Patient } from '@openmrs/esm-framework';
 
-export type IdentifierType = 'National ID' | 'Alien ID' | 'Passport' | 'Mandate Number' | 'Refugee ID';
+export type IdentifierType =
+  | 'National ID'
+  | 'Alien ID'
+  | 'Passport'
+  | 'Mandate Number'
+  | 'Refugee ID'
+  | 'Birth Certificate';
 
-export const IDENTIFIER_TYPES: IdentifierType[] = [
-  'National ID',
-  'Alien ID',
-  'Passport',
-  'Mandate Number',
-  'Refugee ID',
-];
+export const IDENTIFIER_TYPES: IdentifierType[] = ['National ID', 'Alien ID', 'Mandate Number', 'Refugee ID'];
 
 export enum OtpStatus {
   Draft = 'DRAFT',
@@ -16,6 +16,12 @@ export enum OtpStatus {
   Verified = 'VERIFIED',
 }
 
+export enum OtpOptions {
+  Skip = 'SKIP',
+  NoOverride = 'NO OVERRIDE',
+  Override = 'OVERRIDE',
+}
+
 export interface ValidateCustomOtpResponse {
   message: string;
   isValid?: boolean;
@@ -48,6 +54,7 @@ export type RequestCustomOtpDto = {
   identificationNumber: string | number;
   identificationType: string;
   locationUuid: string;
+  phoneNumber: string;
 };
 
 export interface RequestCustomOtpResponse {
@@ -69,9 +76,10 @@ export enum HieIdentificationType {
   RefugeeID = 'Refugee ID',
   AlienID = 'Alien ID',
   MandateNumber = 'Mandate Number',
-  Cr = 'id',
+  Cr = 'CR ID',
   TemporaryDependantID = 'Temporary Dependant ID',
   BirthCertificate = 'Birth Certificate',
+  BirthNotification = 'Birth Notification',
 }
 
 export interface HieIdentifications {
@@ -227,6 +235,12 @@ export type CreateVisitDto = {
   startDatetime: null | string;
   stopDatetime: null | string;
   patient: string;
+  attributes?: VisitAttribute[];
+};
+
+export type VisitAttribute = {
+  attributeType: string;
+  value: string;
 };
 
 export type EndVisitDto = {
@@ -306,4 +320,107 @@ export type QueueEntryResult = {
   status: string;
   visit_uuid: string;
   queue_coming_from: string;
+  bill_status: string;
+  bill_item_payment_status: string;
+  price_name: string;
+  cash_unpaid_client: string;
+  hide_in_queue: number;
+  identifiers: string;
+  phone_number: string;
+  age: number;
+};
+
+export enum PaymentDetail {
+  Paying = 'Paying',
+  NonPaying = 'Non-Paying',
+}
+
+export type EligibilityFilterDto = {
+  requestIdType: string;
+  requestIdNumber: string;
+  locationUuid: string;
+};
+
+export type HieClientEligibility = {
+  requestIdType: number;
+  requestIdNumber: string;
+  memberCrNumber: string;
+  fullName: string;
+  schemes: Scheme[];
+  statusDesc: string;
+  dateOfBirth: string;
+  gender: string;
+  age: number;
+  isAlive: boolean;
+  whitelistedForOTP: boolean;
+  facilityBiometricsEnforced: boolean;
+  facilityContracts: any;
+  statusCode: string;
+};
+
+export type Scheme = {
+  schemeName: string;
+  memberType: 'BENEFICIARY' | string;
+  coverageType: 'SHIF' | string;
+  policy: Policy;
+  coverage: Coverage;
+  principalContributor: PrincipalContributor;
+};
+
+export type Policy = {
+  startDate: string;
+  endDate: string;
+  number: string;
+};
+
+export type Coverage = {
+  startDate: string;
+  endDate: string;
+  message: string;
+  reason: string;
+  possibleSolution: string | null;
+  status: string;
+};
+
+export type PrincipalContributor = {
+  idNumber: string;
+  name: string;
+  crNumber: string;
+  relationship: string;
+  employmentType: string;
+  employerDetails: EmployerDetails;
+};
+
+export type EmployerDetails = {
+  name: string;
+  jobGroup: string;
+};
+
+export enum RequestIdTypes {
+  BirthCertificate = 2,
+  CrId = 3,
+  NationalId = 4,
+  Refugee = 5,
+  TemporaryId = 6,
+  TempDependantId = 7,
+  MandateNo = 8,
+  Passport = 9,
+  BirthCertificate2 = 10,
+  HouseholdNumber = 11,
+}
+
+export type UpdateVisitDto = {
+  attributes?: VisitAttribute[];
+};
+
+export type RegistrationQueueList = {
+  patient_id: number;
+  reg_date: string;
+  location: string;
+  patient_uuid: string;
+  patient_name: string;
+  visit_uuid: string;
+  phone_number: string;
+  age: number;
+  identifiers: string;
 };

package/src/registry/utils/error-handler.ts

@@ -1,5 +1,59 @@
 import { type AmrsErrorResponse } from '../types';
 
+const tryParseJson = (value: string): any => {
+  try {
+    return JSON.parse(value);
+  } catch {
+    return undefined;
+  }
+};
+
+const isBoilerplate = (msg: string): boolean =>
+  /^Server responded with/i.test(msg) || /^Request failed with/i.test(msg) || /^Failed to fetch/i.test(msg);
+
+/**
+ * Extract a human-readable message from a failed request.
+ *
+ * openmrsFetch rejects with an error whose `.message` is boilerplate ("Server
+ * responded with 500 …"); the server's real message lives on `.responseBody`
+ * (parsed object or JSON string). This walks the common shapes and only falls
+ * back to `.message` when it isn't that boilerplate.
+ */
+const SERVICE_UNAVAILABLE_MESSAGE =
+  'The registry service is temporarily unavailable (timed out). Please try again in a moment.';
+
+const looksLikeInfraError = (msg: string): boolean =>
+  /proxy|gateway time-?out|ECONNREFUSED|ETIMEDOUT|ENOTFOUND|socket hang up/i.test(msg);
+
+export function getReadableErrorMessage(error: any, fallback = 'Something went wrong. Please try again.'): string {
+  if (!error) {
+    return fallback;
+  }
+
+  // Gateway / proxy / timeout failures carry unhelpful bodies (HTML or proxy text)
+  // — surface a clear, friendly line instead.
+  const status = error.response?.status ?? error.status ?? error.statusCode ?? error.responseBody?.statusCode;
+  if (status === 502 || status === 503 || status === 504) {
+    return SERVICE_UNAVAILABLE_MESSAGE;
+  }
+
+  const rawBody = error.responseBody ?? error.response?.data ?? error.response?.body;
+  const body = typeof rawBody === 'string' ? tryParseJson(rawBody) ?? rawBody : rawBody;
+
+  const candidate =
+    (typeof body === 'object' && (body?.message || body?.error?.message || body?.error)) ||
+    (typeof body === 'string' && body) ||
+    undefined;
+
+  if (typeof candidate === 'string' && candidate.trim()) {
+    return looksLikeInfraError(candidate) ? SERVICE_UNAVAILABLE_MESSAGE : candidate.trim();
+  }
+  if (typeof error.message === 'string' && error.message.trim() && !isBoilerplate(error.message)) {
+    return looksLikeInfraError(error.message) ? SERVICE_UNAVAILABLE_MESSAGE : error.message.trim();
+  }
+  return fallback;
+}
+
 export function generateErrorMessage(error: any): string[] {
   const errors: string[] = [];
   return errors;

package/src/registry/utils/format-dependant-display-data.ts

@@ -2,7 +2,7 @@ import { type HieClient } from '../types';
 import { maskExceptFirstAndLast } from './mask-data';
 
 export function formatDependantDisplayData(dependant: HieClient, relationship: string): string {
-  const stringData = `${dependant.first_name} ${maskExceptFirstAndLast(dependant.middle_name)} (${dependant.gender}) (DOB: ${dependant.date_of_birth}) (${relationship}) (CR: ${dependant.id})`;
+  const stringData = `${maskExceptFirstAndLast(dependant.first_name)} ${maskExceptFirstAndLast(dependant.middle_name)} (${dependant.gender}) (DOB: ${dependant.date_of_birth}) (${relationship}) (CR: ${dependant.id})`;
 
   return stringData;
 }

package/src/registry/utils/hie-client-adapter.ts

@@ -131,9 +131,9 @@ export function generateAmrsPersonPayload(hieClient: HieClient): CreatePersonDto
       addresses['address2'] = hieClient.sub_county;
       addresses['stateProvince'] = hieClient.sub_county;
     }
-    if (d === 'ward' && hieClient.sub_county.length > 0) {
-      addresses['address7'] = hieClient.sub_county;
-      addresses['address4'] = hieClient.sub_county;
+    if (d === 'ward' && hieClient.ward.length > 0) {
+      addresses['address7'] = hieClient.ward;
+      addresses['address4'] = hieClient.ward;
     }
     if (d === 'village_estate' && hieClient.village_estate.length > 0) {
       addresses['cityVillage'] = hieClient.village_estate;
@@ -168,7 +168,7 @@ export function generateAmrsPersonPayload(hieClient: HieClient): CreatePersonDto
         attributeType: PersonAttributeTypeUuids.CIVIL_STATUS_UUID,
       });
     }
-    if (d === 'id' && hieClient.id) {
+    if (d === HieIdentificationType.Cr && hieClient.id) {
       attributes.push({
         value: hieClient.id,
         attributeType: PersonAttributeTypeUuids.CLIENT_REGISTRY_ID_UUID,
@@ -304,6 +304,9 @@ export function getAmrsIdentifierTypeUuid(hieIdentifierName: string) {
     case HieIdentificationType.TemporaryDependantID:
       idTypeUuid = IdentifierTypesUuids.TEMPORARY_DEPENDANT_ID_UUID;
       break;
+    case HieIdentificationType.BirthNotification:
+      idTypeUuid = IdentifierTypesUuids.BIRTH_NOTIFICATION_UUID;
+      break;
   }
   return idTypeUuid;
 }

package/src/registry/utils/mask-data.ts

@@ -9,6 +9,35 @@ export const maskValue = (value: string): string => {
   return maskedValue;
 };
 
+/**
+ * Mask a CR / identifier number, revealing only the last few characters and
+ * replacing the rest with bullets — e.g. "1002938475" -> "••••••8475".
+ */
+export const maskCrNumber = (value: string, visible = 4): string => {
+  if (!value) {
+    return '';
+  }
+  if (value.length <= visible) {
+    return '•'.repeat(value.length);
+  }
+  return `${'•'.repeat(value.length - visible)}${value.slice(-visible)}`;
+};
+
+/**
+ * Mask a phone number, keeping the first 5 and last 3 digits visible — e.g.
+ * "254728830041" -> "25472****041".
+ */
+export const maskPhone = (value: string): string => {
+  if (!value) {
+    return '';
+  }
+  const digits = value.replace(/\s+/g, '');
+  if (digits.length <= 8) {
+    return digits;
+  }
+  return `${digits.slice(0, 5)}${'*'.repeat(digits.length - 8)}${digits.slice(-3)}`;
+};
+
 export const maskExceptFirstAndLast = (value: string): string => {
   let arrValue = value.split('');
   for (let i = 0; i < value.length; i++) {
@@ -19,3 +48,14 @@ export const maskExceptFirstAndLast = (value: string): string => {
   const maskedValue = arrValue.join('');
   return maskedValue;
 };
+
+export const maskAllButFirstAndLastThree = (value: string): string => {
+  let arrValue = value.split('');
+  for (let i = 0; i < value.length; i++) {
+    if (i > 3 && i < value.length - 3) {
+      arrValue[i] = '*';
+    }
+  }
+  const maskedValue = arrValue.join('');
+  return maskedValue;
+};

package/src/registry/utils/phone-number-formatter.ts

@@ -0,0 +1,11 @@
+export function formatPhoneNumberForOTP(phone: string): string {
+  let cleaned = phone.replace(/[^\d+]/g, '');
+
+  if (cleaned.startsWith('+')) {
+    cleaned = cleaned.slice(1);
+  }
+  if (cleaned.startsWith('0')) {
+    cleaned = '254' + cleaned.slice(1);
+  }
+  return cleaned;
+}

package/src/resources/dashboard.resource.ts

@@ -0,0 +1,20 @@
+import { openmrsFetch } from '@openmrs/esm-framework';
+import { getEtlBaseUrl } from '../shared/utils/get-base-url';
+
+export async function getDashBoardSummary(locationUuid: string): Promise<any> {
+  const etlBaseUrl = await getEtlBaseUrl();
+  const dashboardSummaryUrl = `${etlBaseUrl}/dashboard-summary`;
+  const params = {
+    locationUuid: locationUuid,
+  };
+  const queryString = new URLSearchParams(params).toString();
+  const response = await openmrsFetch(`${dashboardSummaryUrl}?${queryString}`);
+
+  if (!response.ok) {
+    const errorText = await response.text();
+    throw new Error(`Failed to fetch dashboard summary: ${response.status} - ${errorText}`);
+  }
+
+  const data = await response.json();
+  return data.data;
+}

package/src/resources/identifier-types.ts

@@ -10,6 +10,7 @@ const TEMPORARY_DEPENDANT_ID_UUID = 'a3d34214-93e8-4faf-bf4d-0272eee079eb';
 const AMRS_UNIVERSAL_ID_UUID = '58a4732e-1359-11df-a1f1-0026b9348838';
 const UPI_NUMBER_UUID = 'cba702b9-4664-4b43-83f1-9ab473cbd64d';
 const BIRTH_CERTIFICATE_NUMBER_UUID = '7924e13b-131a-4da8-8efa-e294184a1b0d';
+const BIRTH_NOTIFICATION_UUID = '10a4349d-dd1b-4b0c-bd35-a00a22394266';
 
 export const IdentifierTypesUuids = {
   HOUSE_HOLD_NUMBER_UUID,
@@ -24,4 +25,5 @@ export const IdentifierTypesUuids = {
   AMRS_UNIVERSAL_ID_UUID,
   UPI_NUMBER_UUID,
   BIRTH_CERTIFICATE_NUMBER_UUID,
+  BIRTH_NOTIFICATION_UUID,
 };

package/src/resources/patient-resource.ts

@@ -23,7 +23,12 @@ export const generatePatientIdentifiers = async (identifierLocation: string, cli
     location: identifierLocation,
     preferred: true,
   });
-  return identifiers;
+  // Drop identifiers whose type couldn't be resolved (an unmapped ID type) or
+  // whose value is empty. Sending an identifier with an undefined type makes the
+  // whole patient create fail — which would also lose the Client Registry
+  // identifier. Filtering keeps the valid CR (and universal) identifiers so the
+  // patient is always created with a CR number.
+  return identifiers.filter((i) => i.identifierType && i.identifier);
 };
 
 export function generateAmrsCreatePatientIdentifiersPayload(hieClient: HieClient, identifierLocation: string) {
@@ -47,7 +52,7 @@ export function generateAmrsCreatePatientIdentifiersPayload(hieClient: HieClient
 export async function generateAmrsUniversalIdentifier() {
   const subDomainUrl = await getSubDomainUrl();
   const abortController = new AbortController();
-  const resp = await openmrsFetch(`${subDomainUrl}/amrs-id-generator/generateidentifier`, {
+  const resp = await openmrsFetch(`/amrs-id-generator/generateidentifier`, {
     headers: {
       'Content-Type': 'application/json',
     },

package/src/resources/queue.resource.ts

@@ -1,5 +1,5 @@
 import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
-import { type QueueEntryDto, type ServiceQueueApiResponse } from '../registry/types';
+import { type ServiceQueue, type QueueEntryDto, type ServiceQueueApiResponse } from '../registry/types';
 import { getLocationByUuid } from '../shared/services/location.resource';
 
 export async function fetchServiceQueuesByLocationUuid<T>(locationUuid: string): Promise<ServiceQueueApiResponse> {
@@ -37,7 +37,7 @@ export async function createQueueEntry(createQueueEntryDto: QueueEntryDto) {
   return response.json();
 }
 
-export async function getFacilityServiceQueues(locationUuid: string) {
+export async function getFacilityServiceQueues(locationUuid: string): Promise<ServiceQueue[] | undefined> {
   const currentLocation = await getLocationByUuid(locationUuid);
   if (!currentLocation) return;
   const parentLocation = currentLocation.parentLocation;
@@ -49,7 +49,7 @@ export async function getFacilityServiceQueues(locationUuid: string) {
     childLocations.map((c) => {
       return c.uuid;
     }) ?? [];
-  let sqs = [];
+  let sqs: ServiceQueue[] = [];
   if (childLocationUuids.length > 0) {
     for (let i = 0; i < childLocationUuids.length; i++) {
       const s = await fetchServiceQueuesByLocationUuid(childLocationUuids[i]);

package/src/resources/superset.resource.ts

@@ -0,0 +1,41 @@
+import { openmrsFetch } from '@openmrs/esm-framework';
+import { getEtlBaseUrl } from '../shared/utils/get-base-url';
+import { showSnackbar } from '@openmrs/esm-styleguide';
+
+export async function fetchGuestToken(locationUuid: string, dashboardId: string): Promise<string | null> {
+  try {
+    const etlBaseUrl = await getEtlBaseUrl();
+    const supersetTokenUrl = `${etlBaseUrl}/superset-token`;
+
+    const params = {
+      locationUuid,
+      dashboardId,
+    };
+
+    const queryString = new URLSearchParams(params).toString();
+    const response = await openmrsFetch(`${supersetTokenUrl}?${queryString}`);
+
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(`Failed to fetch guest token: ${response.status} - ${errorText}`);
+    }
+
+    const data = await response.json();
+
+    if (!data?.access_token) {
+      throw new Error('Guest token response did not contain an access_token');
+    }
+
+    return data.access_token;
+  } catch (error) {
+    console.error('Error fetching Superset guest token:', error);
+
+    showSnackbar({
+      title: 'Error fetching Superset guest token',
+      subtitle: error instanceof Error ? error.message : 'Failed to fetch guest token',
+      kind: 'error',
+    });
+
+    return null;
+  }
+}

package/src/resources/visit.resource.ts

@@ -1,5 +1,5 @@
 import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
-import { EndVisitDto, type CreateVisitDto } from '../registry/types';
+import { type EndVisitDto, type CreateVisitDto, type UpdateVisitDto } from '../registry/types';
 
 export async function createVisit(createVisitDto: CreateVisitDto) {
   const url = `${restBaseUrl}/visit`;
@@ -36,3 +36,21 @@ export async function endVisit(visitUuid: string, endVisitDto: EndVisitDto) {
 
   return response.json();
 }
+
+export async function updateVisit(visitUuid: string, updateVisitDto: UpdateVisitDto) {
+  const url = `${restBaseUrl}/visit/${visitUuid}`;
+  const response = await openmrsFetch(url, {
+    method: 'POST',
+    headers: {
+      'content-type': 'application/json',
+    },
+    body: JSON.stringify(updateVisitDto),
+  });
+
+  if (!response.ok) {
+    const errorText = await response.text();
+    throw new Error(`Request failed with ${response.status}: ${errorText}`);
+  }
+
+  return response.json();
+}

package/src/root.component.tsx

@@ -10,11 +10,12 @@ import AppointmentsComponent from './appointments/appointments.component';
 import PharmacyComponent from './pharmacy/pharmacy.component';
 import Consultation from './service-queues/consultation/consultation.component';
 import Dashboard from './dashboard/dashboard.component';
-import AccountingComponent from './accounting/accounting.component';
 import DailyBookings from './bookings/daily/daily-bookings.component';
-import MchTriage from './mch/queues/triage/mch-triage';
-import MchConsultation from './mch/queues/consultation/mch-consultation';
 import Mortuary from './mortuary/mortuary.component';
+import ServiceQueueAdminDashboard from './service-queues/admin/service-queue-admin-dashboard.component';
+import AdmissionsDashboard from './admissions/admissions-dashboard.component';
+import EmtQueue from './emt/emt-queue.component';
+import ClaimsAdminDashboard from './billing/admin/claims-admin-dashboard.component';
 
 const Root: React.FC = () => {
   const spaBasePath = window.spaBase;
@@ -29,17 +30,18 @@ const Root: React.FC = () => {
       <main className={styles.container}>
         <Routes>
           <Route path="dashboard" element={<Dashboard />} />
-          <Route path="registry" element={<RegistryComponent />} />
+          <Route path="registration" element={<RegistryComponent />} />
           <Route path="consultation" element={<Consultation />} />
           <Route path="triage" element={<Triage />} />
           <Route path="laboratory" element={<LaboratoryComponent />} />
           <Route path="pharmacy" element={<PharmacyComponent />} />
           <Route path="appointments" element={<AppointmentsComponent />} />
-          <Route path="accounting" element={<AccountingComponent />} />
           <Route path="bookings/daily" element={<DailyBookings />} />
-          <Route path="mch/triage" element={<MchTriage />} />
-          <Route path="mch/consultation" element={<MchConsultation />} />
           <Route path="mortuary" element={<Mortuary />} />
+          <Route path="service-queue-admin" element={<ServiceQueueAdminDashboard />} />
+          <Route path="admissions-dashboard" element={<AdmissionsDashboard />} />
+          <Route path="emt" element={<EmtQueue />} />
+           <Route path="claims-admin" element={<ClaimsAdminDashboard />} />
         </Routes>
       </main>
       <WorkspaceContainer contextKey="home" />