@ampath/esm-patient-registration-app 9.2.0-next.22 → 9.2.0-next.25

package/dist/openmrs-esm-patient-registration-app.js.buildmanifest.json

@@ -183,9 +183,9 @@
       "entry": false,
       "recorded": false,
       "reason": "split chunk (cache group: default)",
-      "size": 257118,
+      "size": 259242,
       "sizes": {
-        "javascript": 257118
+        "javascript": 259242
       },
       "names": [],
       "idHints": [],
@@ -199,7 +199,7 @@
       "auxiliaryFiles": [
         "1453.js.map"
       ],
-      "hash": "f43343547e89aa18",
+      "hash": "0eb2769a1830d106",
       "childrenByOrder": {}
     },
     {
@@ -1235,9 +1235,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 145351,
+      "size": 153684,
       "sizes": {
-        "javascript": 145351
+        "javascript": 153684
       },
       "names": [],
       "idHints": [],
@@ -1250,7 +1250,7 @@
       "auxiliaryFiles": [
         "7821.js.map"
       ],
-      "hash": "1a4a403e9b256933",
+      "hash": "b8fb692f41156a1d",
       "childrenByOrder": {}
     },
     {
@@ -1420,10 +1420,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 2686905,
+      "size": 2695238,
       "sizes": {
         "consume-shared": 168,
-        "javascript": 2664369,
+        "javascript": 2672702,
         "share-init": 336,
         "runtime": 22032
       },
@@ -1440,7 +1440,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "a045cfc08fd05906",
+      "hash": "f2d7ffbaa324c733",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":">=2.2.0"},"pages":[{"component":"root","route":"patient-registration","online":true,"offline":true},{"component":"editPatient","routeRegex":"patient\\/([a-zA-Z0-9\\-]+)\\/edit","online":true,"offline":true}],"extensions":[{"component":"addPatientLink","name":"add-patient-action","slot":"top-nav-actions-slot","online":true,"offline":true,"order":30},{"component":"patientPhotoExtension","name":"patient-photo-widget","slot":"patient-photo-slot","online":true,"offline":true},{"component":"editPatientDetailsButton","name":"edit-patient-details-button","slot":"patient-actions-slot","online":true,"offline":true},{"component":"editPatientDetailsButton","name":"edit-patient-details-button","slot":"patient-search-actions-slot","online":true,"offline":true},{"component":"clientRegistryVerificationTag","name":"client-registry-verification-tag","slot":"patient-banner-tags-slot","online":true,"offline":true}],"modals":[{"name":"cancel-patient-edit-modal","component":"cancelPatientEditModal"},{"name":"delete-identifier-confirmation-modal","component":"deleteIdentifierConfirmationModal"},{"name":"client-registry-verification-modal","component":"clientRegistryVerificationModal"}],"version":"9.2.0-next.22"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":">=2.2.0"},"pages":[{"component":"root","route":"patient-registration","online":true,"offline":true},{"component":"editPatient","routeRegex":"patient\\/([a-zA-Z0-9\\-]+)\\/edit","online":true,"offline":true}],"extensions":[{"component":"addPatientLink","name":"add-patient-action","slot":"top-nav-actions-slot","online":true,"offline":true,"order":30},{"component":"patientPhotoExtension","name":"patient-photo-widget","slot":"patient-photo-slot","online":true,"offline":true},{"component":"editPatientDetailsButton","name":"edit-patient-details-button","slot":"patient-actions-slot","online":true,"offline":true},{"component":"editPatientDetailsButton","name":"edit-patient-details-button","slot":"patient-search-actions-slot","online":true,"offline":true},{"component":"clientRegistryVerificationTag","name":"client-registry-verification-tag","slot":"patient-banner-tags-slot","online":true,"offline":true}],"modals":[{"name":"cancel-patient-edit-modal","component":"cancelPatientEditModal"},{"name":"delete-identifier-confirmation-modal","component":"deleteIdentifierConfirmationModal"},{"name":"client-registry-verification-modal","component":"clientRegistryVerificationModal"}],"version":"9.2.0-next.25"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ampath/esm-patient-registration-app",
-  "version": "9.2.0-next.22",
+  "version": "9.2.0-next.25",
   "description": "Patient registration microfrontend for O3",
   "browser": "dist/openmrs-esm-patient-registration-app.js",
   "main": "src/index.ts",

package/src/config-schema.ts

@@ -86,6 +86,8 @@ export interface RegistrationConfig {
     registrationFormUuid: string | null;
   };
   freeTextFieldConceptUuid: string;
+  hieBaseUrl: string;
+  subDomainUrl: string;
 }
 
 export const builtInSections: Array<SectionDefinition> = [
@@ -416,6 +418,16 @@ export const esmPatientRegistrationSchema = {
     _type: Type.ConceptUuid,
     _default: '5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
   },
+  subDomainUrl: {
+    _type: Type.String,
+    _description: 'Subdomain e.g training,staging',
+    _default: '',
+  },
+  hieBaseUrl: {
+    _type: Type.String,
+    _description: 'HIE Endpoint',
+    _default: '',
+  },
   _validators: [
     validator(
       (config: RegistrationConfig) =>

package/src/offline.resources.ts

@@ -102,17 +102,16 @@ async function fetchPatientIdentifierTypes(): Promise<Array<FetchedPatientIdenti
     // Primary identifier type is to be kept at the top of the list.
     const patientIdentifierTypes = patientIdentifierTypesResponse?.data?.results;
 
-    // const primaryIdentifierTypeUuid = primaryIdentifierTypeResponse?.data?.results?.[0]?.metadataUuid;
-    const primaryIdentifierTypeUuid = '58a4732e-1359-11df-a1f1-0026b9348838';
-
-    let identifierTypes = primaryIdentifierTypeResponse?.ok
-      ? [
-          mapPatientIdentifierType(
-            patientIdentifierTypes?.find((type) => type.uuid === primaryIdentifierTypeUuid),
-            true,
-          ),
-        ]
-      : [];
+    const primaryIdentifierTypeUuid = primaryIdentifierTypeResponse?.data?.results?.[0]?.metadataUuid;
+    let identifierTypes =
+      primaryIdentifierTypeResponse?.ok && primaryIdentifierTypeUuid
+        ? [
+            mapPatientIdentifierType(
+              patientIdentifierTypes?.find((type) => type.uuid === primaryIdentifierTypeUuid),
+              true,
+            ),
+          ]
+        : [];
 
     patientIdentifierTypes.forEach((type) => {
       if (type.uuid !== primaryIdentifierTypeUuid) {

package/src/patient-registration/client-registry/client-registry.resource.ts

@@ -1,3 +1,4 @@
+import { getHieBaseUrl } from '../../utils/get-base-url';
 import {
   type ClientRegistrySearchRequest,
   type RequestCustomOtpDto,
@@ -6,8 +7,6 @@ import {
   type ValidateHieCustomOtpDto,
 } from './types';
 
-const HIE_BASE_URL = 'https://staging.ampath.or.ke/hie';
-
 export type ClientRegistrySearchResponse = any[];
 
 async function postJson<T>(url: string, payload: unknown): Promise<T> {
@@ -26,7 +25,8 @@ async function postJson<T>(url: string, payload: unknown): Promise<T> {
 }
 
 export async function requestCustomOtp(payload: RequestCustomOtpDto): Promise<RequestCustomOtpResponse> {
-  const url = `${HIE_BASE_URL}/client/send-custom-otp`;
+  const hieBaseUrl = await getHieBaseUrl();
+  const url = `${hieBaseUrl}/client/send-custom-otp`;
   const formattedPayload = {
     identificationNumber: payload.identificationNumber,
     identificationType: payload.identificationType,
@@ -36,7 +36,8 @@ export async function requestCustomOtp(payload: RequestCustomOtpDto): Promise<Re
 }
 
 export async function validateCustomOtp(payload: ValidateHieCustomOtpDto): Promise<ValidateCustomOtpResponse> {
-  const url = `${HIE_BASE_URL}/client/validate-custom-otp`;
+  const hieBaseUrl = await getHieBaseUrl();
+  const url = `${hieBaseUrl}/client/validate-custom-otp`;
   const formattedPayload = {
     sessionId: payload.sessionId,
     otp: payload.otp,
@@ -48,7 +49,8 @@ export async function validateCustomOtp(payload: ValidateHieCustomOtpDto): Promi
 export async function fetchClientRegistryData(
   payload: ClientRegistrySearchRequest,
 ): Promise<ClientRegistrySearchResponse> {
-  const url = `${HIE_BASE_URL}/client/search`;
+  const hieBaseUrl = await getHieBaseUrl();
+  const url = `${hieBaseUrl}/client/search`;
   const formattedPayload = {
     identificationNumber: payload.identificationNumber,
     identificationType: payload.identificationType,

package/src/patient-registration/client-registry-search/client-registry.resource.ts

@@ -12,8 +12,7 @@ import {
   type CreatePersonDto,
 } from '../client-registry/types';
 import { mapAmrsPatientRelationship } from './map-client-registry-to-form-utils';
-
-const HIE_BASE_URL = 'https://staging.ampath.or.ke/hie';
+import { getHieBaseUrl } from '../../utils/get-base-url';
 
 async function postJson<T>(url: string, payload: unknown): Promise<T> {
   const response = await fetch(url, {
@@ -31,7 +30,8 @@ async function postJson<T>(url: string, payload: unknown): Promise<T> {
 }
 
 export async function requestCustomOtp(payload: RequestCustomOtpDto): Promise<RequestCustomOtpResponse> {
-  const url = `${HIE_BASE_URL}/client/send-custom-otp`;
+  const hieBaseUrl = await getHieBaseUrl();
+  const url = `${hieBaseUrl}/client/send-custom-otp`;
   const formattedPayload = {
     identificationNumber: payload.identificationNumber,
     identificationType: payload.identificationType,
@@ -41,7 +41,8 @@ export async function requestCustomOtp(payload: RequestCustomOtpDto): Promise<Re
 }
 
 export async function validateCustomOtp(payload: ValidateHieCustomOtpDto): Promise<ValidateCustomOtpResponse> {
-  const url = `${HIE_BASE_URL}/client/validate-custom-otp`;
+  const hieBaseUrl = await getHieBaseUrl();
+  const url = `${hieBaseUrl}/client/validate-custom-otp`;
   const formattedPayload = {
     sessionId: payload.sessionId,
     otp: payload.otp,
@@ -53,7 +54,8 @@ export async function validateCustomOtp(payload: ValidateHieCustomOtpDto): Promi
 export async function fetchClientRegistryData(
   payload: ClientRegistrySearchRequest,
 ): Promise<ClientRegistrySearchResponse> {
-  const url = `${HIE_BASE_URL}/client/search`;
+  const hieBaseUrl = await getHieBaseUrl();
+  const url = `${hieBaseUrl}/client/search`;
   const formattedPayload = {
     identificationNumber: payload.identificationNumber,
     identificationType: payload.identificationType,

package/src/patient-registration/form-manager.test.ts

@@ -1,13 +1,15 @@
 import { FormManager } from './form-manager';
 import { type FormValues } from './patient-registration.types';
-import { generateIdentifier } from './patient-registration.resource';
+import { generateAmrsUniversalIdentifier, generateIdentifier } from './patient-registration.resource';
 
 jest.mock('./patient-registration.resource', () => ({
   ...jest.requireActual('./patient-registration.resource'),
   generateIdentifier: jest.fn(),
+  generateAmrsUniversalIdentifier: jest.fn(),
 }));
 
 const mockGenerateIdentifier = generateIdentifier as jest.Mock;
+const mockGenerateAmrsUniversalId = generateAmrsUniversalIdentifier as jest.Mock;
 
 const formValues: FormValues = {
   patientUuid: '',
@@ -55,12 +57,24 @@ const formValues: FormValues = {
         autoGenerationOption: { manualEntryEnabled: true, automaticGenerationEnabled: false },
       },
     },
+    amrsUniversalId: {
+      identifierUuid: 'aUuid2',
+      identifierName: 'AmrsUniversalId',
+      required: false,
+      initialValue: '',
+      identifierValue: '',
+      identifierTypeUuid: '58a4732e-1359-11df-a1f1-0026b9348838',
+      preferred: true,
+      autoGeneration: null,
+      selectedSource: null,
+    },
   },
 };
 
 describe('FormManager', () => {
   describe('createIdentifiers', () => {
     it('uses the uuid of a field name if it exists', async () => {
+      mockGenerateAmrsUniversalId.mockReturnValue('123450-6');
       const result = await FormManager.savePatientIdentifiers(true, undefined, formValues.identifiers, {}, 'Nyc');
       expect(result).toEqual([
         {
@@ -70,6 +84,13 @@ describe('FormManager', () => {
           location: 'Nyc',
           preferred: true,
         },
+        {
+          uuid: null,
+          identifier: '123450-6',
+          identifierType: '58a4732e-1359-11df-a1f1-0026b9348838',
+          location: 'Nyc',
+          preferred: true,
+        },
       ]);
     });
 

package/src/patient-registration/form-manager.ts

@@ -222,7 +222,22 @@ export class FormManager {
     initialIdentifierValues: FormValues['identifiers'], // Initial identifiers assigned to the patient
     location: string,
   ): Promise<Array<PatientIdentifier>> {
-    let identifierTypeRequests = Object.values(patientIdentifiers)
+    // if its a new patient then generate the amrsUniversalId on the fly
+    let amrsIdRequest = [];
+    if (isNewPatient) {
+      const identifier = await generateAmrsUniversalIdentifier();
+      amrsIdRequest.push({
+        identifierTypeUuid: '58a4732e-1359-11df-a1f1-0026b9348838',
+        identifierValue: identifier,
+        identifierUuid: null,
+        selectedSource: null,
+        preferred: true,
+        autoGeneration: null,
+        initialValue: null,
+      });
+    }
+    const res = [...Object.values(patientIdentifiers), ...amrsIdRequest];
+    let identifierTypeRequests = [...Object.values(patientIdentifiers), ...amrsIdRequest]
       /* Since default identifier-types will be present on the form and are also in the not-required state,
         therefore we might be running into situations when there's no value and no source associated,
         hence filtering these fields out.
@@ -243,17 +258,13 @@ export class FormManager {
 
         const autoGenerationManualEntry =
           autoGeneration && selectedSource?.autoGenerationOption?.manualEntryEnabled && !!identifierValue;
-        let identifier;
-        if (identifierTypeUuid === '58a4732e-1359-11df-a1f1-0026b9348838') {
-          identifier = await generateAmrsUniversalIdentifier();
-        } else {
-          identifier =
-            !autoGeneration || autoGenerationManualEntry
-              ? identifierValue
-              : await (
-                  await generateIdentifier(selectedSource.uuid)
-                ).data.identifier;
-        }
+        const identifier =
+          !autoGeneration || autoGenerationManualEntry
+            ? identifierValue
+            : await (
+                await generateIdentifier(selectedSource.uuid)
+              ).data.identifier;
+
         const identifierToCreate = {
           uuid: identifierUuid,
           identifier,

package/src/patient-registration/patient-registration.resource.ts

@@ -1,6 +1,7 @@
 import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
 import { type Patient, type Relationship, type PatientIdentifier, type Encounter } from './patient-registration.types';
 import dayjs from 'dayjs';
+import { getSubDomainUrl } from '../utils/get-base-url';
 
 export const uuidIdentifier = '05a29f94-c0ed-11e2-94be-8c13b969e334';
 export const uuidTelephoneNumber = '14d4f066-15f5-102d-96e4-000c29c2a5d7';
@@ -58,9 +59,10 @@ export function generateIdentifier(source: string) {
   });
 }
 
-export async function generateAmrsUniversalIdentifier() {
+export async function generateAmrsUniversalIdentifier(): Promise<string> {
+  const subDomainUrl = await getSubDomainUrl();
   const abortController = new AbortController();
-  const resp = await openmrsFetch(`https://staging.ampath.or.ke/amrs-id-generator/generateidentifier`, {
+  const resp = await openmrsFetch(`${subDomainUrl}/amrs-id-generator/generateidentifier`, {
     headers: {
       'Content-Type': 'application/json',
     },

package/src/utils/get-base-url.ts

@@ -0,0 +1,12 @@
+import { getConfig } from '@openmrs/esm-framework';
+import { moduleName } from '../constants';
+
+export async function getHieBaseUrl() {
+  const { hieBaseUrl } = await getConfig(moduleName);
+  return hieBaseUrl ?? null;
+}
+
+export async function getSubDomainUrl() {
+  const { subDomainUrl } = await getConfig(moduleName);
+  return subDomainUrl ?? null;
+}