@kenyaemr/esm-patient-registration-app 5.2.3 → 6.0.1-pre.1.0.0

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.24.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},{"component":"cancelPatientEditModal","name":"cancel-patient-edit-modal","online":true,"offline":true},{"component":"patientPhoto","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":"deleteIdentifierConfirmationModal","name":"delete-identifier-confirmation-modal","online":true,"offline":true},{"component":"emptyClientRegistryModal","name":"empty-client-registry-modal","online":true,"offline":true},{"component":"confirmClientRegistryModal","name":"confirm-client-registry-modal","online":true,"offline":true}],"version":"5.2.3"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.24.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},{"component":"cancelPatientEditModal","name":"cancel-patient-edit-modal","online":true,"offline":true},{"component":"patientPhoto","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":"deleteIdentifierConfirmationModal","name":"delete-identifier-confirmation-modal","online":true,"offline":true},{"component":"emptyClientRegistryModal","name":"empty-client-registry-modal","online":true,"offline":true},{"component":"confirmClientRegistryModal","name":"confirm-client-registry-modal","online":true,"offline":true}],"version":"6.0.1-pre.1.0.0"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-patient-registration-app",
-  "version": "5.2.3",
+  "version": "6.0.1-pre.1.0.0",
   "description": "Patient registration microfrontend for the OpenMRS SPA",
   "browser": "dist/kenyaemr-esm-patient-registration-app.js",
   "main": "src/index.ts",
@@ -13,7 +13,7 @@
     "debug": "npm run serve",
     "build": "webpack --mode production",
     "analyze": "webpack --mode=production --env.analyze=true",
-    "lint": "cross-env TIMING=1 eslint src --ext ts,tsx",
+    "lint": "cross-env eslint src --ext ts,tsx",
     "test": "cross-env TZ=UTC jest --config jest.config.js --verbose false --passWithNoTests --color",
     "test:watch": "cross-env TZ=UTC jest --watch --config jest.config.js --color",
     "coverage": "yarn test --coverage",
@@ -37,7 +37,7 @@
     "url": "https://github.com/openmrs/openmrs-esm-patient-management/issues"
   },
   "dependencies": {
-    "@carbon/react": "^1.12.0",
+    "@carbon/react": "~1.37.0",
     "core-js-pure": "^3.34.0",
     "formik": "^2.1.5",
     "geopattern": "^1.2.3",
@@ -56,5 +56,6 @@
   },
   "devDependencies": {
     "webpack": "^5.74.0"
-  }
+  },
+  "stableVersion": "6.0.0"
 }

package/src/offline.resources.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import find from 'lodash-es/find';
 import camelCase from 'lodash-es/camelCase';
 import escapeRegExp from 'lodash-es/escapeRegExp';
-import { getConfig, messageOmrsServiceWorker, openmrsFetch, type Session } from '@openmrs/esm-framework';
+import { getConfig, messageOmrsServiceWorker, openmrsFetch, restBaseUrl, type Session } from '@openmrs/esm-framework';
 import type {
   PatientIdentifierType,
   FetchedPatientIdentifierType,
@@ -20,17 +20,17 @@ export interface Resources {
 export const ResourcesContext = React.createContext<Resources>(null);
 
 export async function fetchCurrentSession(): Promise<Session> {
-  const { data } = await cacheAndFetch<Session>('/ws/rest/v1/session');
+  const { data } = await cacheAndFetch<Session>(`${restBaseUrl}/session`);
   return data;
 }
 
 export async function fetchAddressTemplate() {
-  const { data } = await cacheAndFetch<AddressTemplate>('/ws/rest/v1/addresstemplate');
+  const { data } = await cacheAndFetch<AddressTemplate>(`${restBaseUrl}/addresstemplate`);
   return data;
 }
 
 export async function fetchAllRelationshipTypes() {
-  const { data } = await cacheAndFetch('/ws/rest/v1/relationshiptype?v=default');
+  const { data } = await cacheAndFetch(`${restBaseUrl}/relationshiptype?v=default`);
   return data;
 }
 
@@ -59,11 +59,11 @@ async function fetchFieldDefinitionType(fieldDefinition) {
   let apiUrl = '';
 
   if (fieldDefinition.type === 'person attribute') {
-    apiUrl = `/ws/rest/v1/personattributetype/${fieldDefinition.uuid}`;
+    apiUrl = `${restBaseUrl}/personattributetype/${fieldDefinition.uuid}`;
   }
 
   if (fieldDefinition.answerConceptSetUuid) {
-    await cacheAndFetch(`/ws/rest/v1/concept/${fieldDefinition.answerConceptSetUuid}`);
+    await cacheAndFetch(`${restBaseUrl}/concept/${fieldDefinition.answerConceptSetUuid}`);
   }
   const { data } = await cacheAndFetch(apiUrl);
   return data;
@@ -93,8 +93,10 @@ export async function fetchPatientIdentifierTypesWithSources(): Promise<Array<Pa
 
 async function fetchPatientIdentifierTypes(): Promise<Array<FetchedPatientIdentifierType>> {
   const [patientIdentifierTypesResponse, primaryIdentifierTypeResponse] = await Promise.all([
-    cacheAndFetch('/ws/rest/v1/patientidentifiertype?v=custom:(display,uuid,name,format,required,uniquenessBehavior)'),
-    cacheAndFetch('/ws/rest/v1/metadatamapping/termmapping?v=full&code=emr.primaryIdentifierType'),
+    cacheAndFetch(
+      `${restBaseUrl}/patientidentifiertype?v=custom:(display,uuid,name,format,required,uniquenessBehavior)`,
+    ),
+    cacheAndFetch(`${restBaseUrl}/metadatamapping/termmapping?v=full&code=emr.primaryIdentifierType`),
   ]);
 
   if (patientIdentifierTypesResponse.ok) {
@@ -117,11 +119,11 @@ async function fetchPatientIdentifierTypes(): Promise<Array<FetchedPatientIdenti
 }
 
 async function fetchIdentifierSources(identifierType: string) {
-  return await cacheAndFetch(`/ws/rest/v1/idgen/identifiersource?v=default&identifierType=${identifierType}`);
+  return await cacheAndFetch(`${restBaseUrl}/idgen/identifiersource?v=default&identifierType=${identifierType}`);
 }
 
 async function fetchAutoGenerationOptions(abortController?: AbortController) {
-  return await cacheAndFetch(`/ws/rest/v1/idgen/autogenerationoption?v=full`);
+  return await cacheAndFetch(`${restBaseUrl}/idgen/autogenerationoption?v=full`);
 }
 
 async function cacheAndFetch<T = any>(url?: string) {

package/src/offline.ts

@@ -1,7 +1,9 @@
 import {
+  fhirBaseUrl,
   makeUrl,
   messageOmrsServiceWorker,
   navigate,
+  restBaseUrl,
   setupDynamicOfflineDataHandler,
   setupOfflineSync,
   type SyncProcessOptions,
@@ -54,10 +56,10 @@ export function setupOffline() {
 
 function getPatientUrlsToBeCached(patientUuid: string) {
   return [
-    `/ws/fhir2/R4/Patient/${patientUuid}`,
-    `/ws/rest/v1/relationship?v=${personRelationshipRepresentation}&person=${patientUuid}`,
-    `/ws/rest/v1/person/${patientUuid}/attribute`,
-    `/ws/rest/v1/patient/${patientUuid}/identifier?v=custom:(uuid,identifier,identifierType:(uuid,required,name),preferred)`,
+    `${fhirBaseUrl}/Patient/${patientUuid}`,
+    `${restBaseUrl}/relationship?v=${personRelationshipRepresentation}&person=${patientUuid}`,
+    `${restBaseUrl}/person/${patientUuid}/attribute`,
+    `${restBaseUrl}/patient/${patientUuid}/identifier?v=custom:(uuid,identifier,identifierType:(uuid,required,name),preferred)`,
   ].map((url) => window.origin + makeUrl(url));
 }
 

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

@@ -1,11 +1,11 @@
-import { type FetchResponse, openmrsFetch, showSnackbar } from '@openmrs/esm-framework';
+import { type FetchResponse, openmrsFetch, showSnackbar, restBaseUrl } from '@openmrs/esm-framework';
 import useSWRImmutable from 'swr/immutable';
 import { type ConceptAnswers, type ConceptResponse } from '../patient-registration.types';
 
 export function useConcept(conceptUuid: string): { data: ConceptResponse; isLoading: boolean } {
   const shouldFetch = typeof conceptUuid === 'string' && conceptUuid !== '';
   const { data, error, isLoading } = useSWRImmutable<FetchResponse<ConceptResponse>, Error>(
-    shouldFetch ? `/ws/rest/v1/concept/${conceptUuid}` : null,
+    shouldFetch ? `${restBaseUrl}/concept/${conceptUuid}` : null,
     openmrsFetch,
   );
   if (error) {
@@ -21,7 +21,7 @@ export function useConcept(conceptUuid: string): { data: ConceptResponse; isLoad
 export function useConceptAnswers(conceptUuid: string): { data: Array<ConceptAnswers>; isLoading: boolean } {
   const shouldFetch = typeof conceptUuid === 'string' && conceptUuid !== '';
   const { data, error, isLoading } = useSWRImmutable<FetchResponse<ConceptResponse>, Error>(
-    shouldFetch ? `/ws/rest/v1/concept/${conceptUuid}` : null,
+    shouldFetch ? `${restBaseUrl}/concept/${conceptUuid}` : null,
     openmrsFetch,
   );
   if (error) {

package/src/patient-registration/field/person-attributes/coded-person-attribute-field.component.tsx

@@ -26,12 +26,13 @@ export function CodedPersonAttributeField({
   const { data: conceptAnswers, isLoading: isLoadingConceptAnswers } = useConceptAnswers(
     customConceptAnswers.length ? '' : answerConceptSetUuid,
   );
+
   const { t } = useTranslation();
   const fieldName = `attributes.${personAttributeType.uuid}`;
   const [error, setError] = useState(false);
 
   useEffect(() => {
-    if (!answerConceptSetUuid) {
+    if (!answerConceptSetUuid && !customConceptAnswers.length) {
       reportError(
         t(
           'codedPersonAttributeNoAnswerSet',
@@ -41,10 +42,10 @@ export function CodedPersonAttributeField({
       );
       setError(true);
     }
-  }, [answerConceptSetUuid]);
+  }, [answerConceptSetUuid, customConceptAnswers]);
 
   useEffect(() => {
-    if (!isLoadingConceptAnswers) {
+    if (!isLoadingConceptAnswers && !customConceptAnswers.length) {
       if (!conceptAnswers) {
         reportError(
           t(
@@ -69,7 +70,7 @@ export function CodedPersonAttributeField({
         setError(true);
       }
     }
-  }, [isLoadingConceptAnswers, conceptAnswers]);
+  }, [isLoadingConceptAnswers, conceptAnswers, customConceptAnswers]);
 
   const answers = useMemo(() => {
     if (customConceptAnswers.length) {
@@ -77,7 +78,9 @@ export function CodedPersonAttributeField({
     }
     return isLoadingConceptAnswers || !conceptAnswers
       ? []
-      : conceptAnswers.map((answer) => ({ ...answer, label: answer.display }));
+      : conceptAnswers
+          .map((answer) => ({ ...answer, label: answer.display }))
+          .sort((a, b) => a.label.localeCompare(b.label));
   }, [customConceptAnswers, conceptAnswers, isLoadingConceptAnswers]);
 
   if (error) {

package/src/patient-registration/field/person-attributes/person-attributes.resource.ts

@@ -1,4 +1,4 @@
-import { type FetchResponse, openmrsFetch } from '@openmrs/esm-framework';
+import { type FetchResponse, openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
 import useSWRImmutable from 'swr/immutable';
 import { type PersonAttributeTypeResponse } from '../../patient-registration.types';
 
@@ -8,7 +8,7 @@ export function usePersonAttributeType(personAttributeTypeUuid: string): {
   error: any;
 } {
   const { data, error, isLoading } = useSWRImmutable<FetchResponse<PersonAttributeTypeResponse>>(
-    `/ws/rest/v1/personattributetype/${personAttributeTypeUuid}`,
+    `${restBaseUrl}/personattributetype/${personAttributeTypeUuid}`,
     openmrsFetch,
   );
 

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

@@ -1,4 +1,10 @@
-import { type FetchResponse, openmrsFetch, queueSynchronizationItem, type Session } from '@openmrs/esm-framework';
+import {
+  type FetchResponse,
+  openmrsFetch,
+  queueSynchronizationItem,
+  type Session,
+  restBaseUrl,
+} from '@openmrs/esm-framework';
 import { patientRegistration } from '../constants';
 import {
   type FormValues,
@@ -128,7 +134,7 @@ export class FormManager {
         await savePatientPhoto(
           savePatientResponse.data.uuid,
           capturePhotoProps.imageData,
-          '/ws/rest/v1/obs',
+          `${restBaseUrl}/obs`,
           capturePhotoProps.dateTime || new Date().toISOString(),
           config.concepts.patientPhotoUuid,
         );
@@ -354,7 +360,7 @@ export class FormManager {
           .filter(([, value]) => !value)
           .forEach(async ([key]) => {
             const attributeUuid = patientUuidMap[`attribute.${key}`];
-            await openmrsFetch(`/ws/rest/v1/person/${values.patientUuid}/attribute/${attributeUuid}`, {
+            await openmrsFetch(`${restBaseUrl}/person/${values.patientUuid}/attribute/${attributeUuid}`, {
               method: 'DELETE',
             }).catch((err) => {
               console.error(err);

package/src/patient-registration/input/custom-input/identifier/identifier-input.component.tsx

@@ -141,7 +141,7 @@ export const IdentifierInput: React.FC<IdentifierInputProps> = ({ patientIdentif
           <UserHasAccess privilege="Delete Patient Identifiers">
             <Button
               size="md"
-              kind="danger--ghost"
+              kind="ghost"
               onClick={handleDelete}
               iconDescription={t('deleteIdentifierTooltip', 'Delete')}
               disabled={disabled}

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

@@ -5,6 +5,7 @@ import {
   openmrsFetch,
   useConfig,
   usePatient,
+  restBaseUrl,
 } from '@openmrs/esm-framework';
 import last from 'lodash-es/last';
 import camelCase from 'lodash-es/camelCase';
@@ -35,7 +36,7 @@ import { useInitialPatientRelationships } from './section/patient-relationships/
 import dayjs from 'dayjs';
 
 export function useInitialFormValues(patientUuid: string): [FormValues, Dispatch<FormValues>] {
-  const { martialStatus, education, occupation, educationLoad, loadingStatus } = useConcepts();
+  const { martialStatus, education, occupation, educationLoad } = useConcepts();
   const { isLoading: isLoadingPatientToEdit, patient: patientToEdit } = usePatient(patientUuid);
   const { data: attributes, isLoading: isLoadingAttributes } = useInitialPersonAttributes(patientUuid);
   const { data: identifiers, isLoading: isLoadingIdentifiers } = useInitialPatientIdentifiers(patientUuid);
@@ -157,13 +158,13 @@ export function useInitialFormValues(patientUuid: string): [FormValues, Dispatch
   // Set Initial encounter
 
   useEffect(() => {
-    if (!educationLoad || !loadingStatus) {
+    if (!educationLoad) {
       setInitialFormValues((initialFormValues) => ({
         ...initialFormValues,
         concepts: [...occupation, ...martialStatus, ...education],
       }));
     }
-  }, [educationLoad, loadingStatus]);
+  }, [educationLoad]);
 
   return [initialFormValues, setInitialFormValues];
 }
@@ -232,7 +233,7 @@ export function useInitialPatientIdentifiers(patientUuid: string): {
 
   const { data, error, isLoading } = useSWR<FetchResponse<{ results: Array<PatientIdentifierResponse> }>, Error>(
     shouldFetch
-      ? `/ws/rest/v1/patient/${patientUuid}/identifier?v=custom:(uuid,identifier,identifierType:(uuid,required,name),preferred)`
+      ? `${restBaseUrl}/patient/${patientUuid}/identifier?v=custom:(uuid,identifier,identifierType:(uuid,required,name),preferred)`
       : null,
     openmrsFetch,
   );
@@ -269,7 +270,7 @@ function useInitialEncounters(patientUuid: string, patientToEdit: fhir.Patient)
   const { registrationObs } = useConfig() as RegistrationConfig;
   const { data, error, isLoading } = useSWR<FetchResponse<{ results: Array<Encounter> }>>(
     patientToEdit && registrationObs.encounterTypeUuid
-      ? `/ws/rest/v1/encounter?patient=${patientUuid}&v=custom:(encounterDatetime,obs:(concept:ref,value:ref))&encounterType=${registrationObs.encounterTypeUuid}`
+      ? `${restBaseUrl}/encounter?patient=${patientUuid}&v=custom:(encounterDatetime,obs:(concept:ref,value:ref))&encounterType=${registrationObs.encounterTypeUuid}`
       : null,
     openmrsFetch,
   );
@@ -287,7 +288,7 @@ function useInitialPersonAttributes(personUuid: string) {
   const shouldFetch = !!personUuid;
   const { data, error, isLoading } = useSWR<FetchResponse<{ results: Array<PersonAttributeResponse> }>, Error>(
     shouldFetch
-      ? `/ws/rest/v1/person/${personUuid}/attribute?v=custom:(uuid,display,attributeType:(uuid,display,format),value)`
+      ? `${restBaseUrl}/person/${personUuid}/attribute?v=custom:(uuid,display,attributeType:(uuid,display,format),value)`
       : null,
     openmrsFetch,
   );
@@ -322,7 +323,7 @@ export function usePatientObs(patientUuid: string) {
 }
 
 function useConcepts() {
-  const { data: martialStatus, isLoading: loadingStatus } = useConceptAnswers('1054AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA');
+  const config = useConfig<RegistrationConfig>();
   const { data: education, isLoading: educationLoad } = useConceptAnswers('1712AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA');
   const occupation: Array<ConceptAnswers> = [
     {
@@ -355,5 +356,9 @@ function useConcepts() {
     },
   ];
 
-  return { martialStatus, education, occupation, loadingStatus, educationLoad };
+  const martialStatus: Array<ConceptAnswers> = config.fieldDefinitions
+    .find((fieldDefinition) => fieldDefinition.id === 'maritalStatus')
+    .customConceptAnswers.map((concept) => ({ uuid: concept.uuid, display: concept.label }));
+
+  return { martialStatus, education, occupation, educationLoad };
 }

package/src/patient-registration/patient-registration.component.tsx

@@ -231,7 +231,7 @@ export const PatientRegistration: React.FC<PatientRegistrationProps> = ({ savePa
                   initialFormValues: props.initialValues,
                   setInitialFormValues,
                 }}>
-                <PatientVerification props={props} />
+                <PatientVerification props={props} setInitialFormValues={setInitialFormValues} />
                 {sections.map((section, index) => (
                   <SectionWrapper
                     key={`registration-section-${section.id}`}

package/src/patient-registration/patient-registration.resource.test.tsx

@@ -1,4 +1,4 @@
-import { openmrsFetch } from '@openmrs/esm-framework';
+import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
 import { savePatient } from './patient-registration.resource';
 
 const mockOpenmrsFetch = openmrsFetch as jest.Mock;
@@ -15,12 +15,12 @@ describe('savePatient', () => {
   it('appends patient uuid in url if provided', () => {
     mockOpenmrsFetch.mockImplementationOnce((url) => url);
     savePatient(null, '1234');
-    expect(mockOpenmrsFetch.mock.calls[0][0]).toEqual('/ws/rest/v1/patient/1234');
+    expect(mockOpenmrsFetch.mock.calls[0][0]).toEqual(`${restBaseUrl}/patient/1234`);
   });
 
   it('does not append patient uuid in url', () => {
     mockOpenmrsFetch.mockImplementationOnce(() => {});
     savePatient(null);
-    expect(mockOpenmrsFetch.mock.calls[0][0]).toEqual('/ws/rest/v1/patient/');
+    expect(mockOpenmrsFetch.mock.calls[0][0]).toEqual(`${restBaseUrl}/patient/`);
   });
 });

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

@@ -1,5 +1,5 @@
 import useSWR from 'swr';
-import { openmrsFetch, useConfig } from '@openmrs/esm-framework';
+import { openmrsFetch, restBaseUrl, useConfig } from '@openmrs/esm-framework';
 import { type Patient, type Relationship, type PatientIdentifier, type Encounter } from './patient-registration.types';
 
 export const uuidIdentifier = '05a29f94-c0ed-11e2-94be-8c13b969e334';
@@ -22,7 +22,7 @@ function dataURItoFile(dataURI: string) {
 export function savePatient(patient: Patient | null, updatePatientUuid?: string) {
   const abortController = new AbortController();
 
-  return openmrsFetch(`/ws/rest/v1/patient/${updatePatientUuid || ''}`, {
+  return openmrsFetch(`${restBaseUrl}/patient/${updatePatientUuid || ''}`, {
     headers: {
       'Content-Type': 'application/json',
     },
@@ -35,7 +35,7 @@ export function savePatient(patient: Patient | null, updatePatientUuid?: string)
 export function saveEncounter(encounter: Encounter) {
   const abortController = new AbortController();
 
-  return openmrsFetch(`/ws/rest/v1/encounter`, {
+  return openmrsFetch(`${restBaseUrl}/encounter`, {
     headers: {
       'Content-Type': 'application/json',
     },
@@ -48,7 +48,7 @@ export function saveEncounter(encounter: Encounter) {
 export function generateIdentifier(source: string) {
   const abortController = new AbortController();
 
-  return openmrsFetch(`/ws/rest/v1/idgen/identifiersource/${source}/identifier`, {
+  return openmrsFetch(`${restBaseUrl}/idgen/identifiersource/${source}/identifier`, {
     headers: {
       'Content-Type': 'application/json',
     },
@@ -61,7 +61,7 @@ export function generateIdentifier(source: string) {
 export function deletePersonName(nameUuid: string, personUuid: string) {
   const abortController = new AbortController();
 
-  return openmrsFetch(`/ws/rest/v1/person/${personUuid}/name/${nameUuid}`, {
+  return openmrsFetch(`${restBaseUrl}/person/${personUuid}/name/${nameUuid}`, {
     method: 'DELETE',
     signal: abortController.signal,
   });
@@ -70,7 +70,7 @@ export function deletePersonName(nameUuid: string, personUuid: string) {
 export function saveRelationship(relationship: Relationship) {
   const abortController = new AbortController();
 
-  return openmrsFetch('/ws/rest/v1/relationship', {
+  return openmrsFetch(`${restBaseUrl}/relationship`, {
     headers: {
       'Content-Type': 'application/json',
     },
@@ -83,7 +83,7 @@ export function saveRelationship(relationship: Relationship) {
 export function updateRelationship(relationshipUuid, relationship: { relationshipType: string }) {
   const abortController = new AbortController();
 
-  return openmrsFetch(`/ws/rest/v1/relationship/${relationshipUuid}`, {
+  return openmrsFetch(`${restBaseUrl}/relationship/${relationshipUuid}`, {
     headers: {
       'Content-Type': 'application/json',
     },
@@ -96,7 +96,7 @@ export function updateRelationship(relationshipUuid, relationship: { relationshi
 export function deleteRelationship(relationshipUuid) {
   const abortController = new AbortController();
 
-  return openmrsFetch(`/ws/rest/v1/relationship/${relationshipUuid}`, {
+  return openmrsFetch(`${restBaseUrl}/relationship/${relationshipUuid}`, {
     headers: {
       'Content-Type': 'application/json',
     },
@@ -161,7 +161,7 @@ export function usePatientPhoto(patientUuid: string): UsePatientPhotoResult {
   const {
     concepts: { patientPhotoUuid },
   } = useConfig();
-  const url = `/ws/rest/v1/obs?patient=${patientUuid}&concept=${patientPhotoUuid}&v=full`;
+  const url = `${restBaseUrl}/obs?patient=${patientUuid}&concept=${patientPhotoUuid}&v=full`;
 
   const { data, error, isLoading } = useSWR<{ data: ObsFetchResponse }, Error>(patientUuid ? url : null, openmrsFetch);
 
@@ -181,10 +181,10 @@ export function usePatientPhoto(patientUuid: string): UsePatientPhotoResult {
 
 export async function fetchPerson(query: string, abortController: AbortController) {
   const [patientsRes, personsRes] = await Promise.all([
-    openmrsFetch(`/ws/rest/v1/patient?q=${query}`, {
+    openmrsFetch(`${restBaseUrl}/patient?q=${query}`, {
       signal: abortController.signal,
     }),
-    openmrsFetch(`/ws/rest/v1/person?q=${query}`, {
+    openmrsFetch(`${restBaseUrl}/person?q=${query}`, {
       signal: abortController.signal,
     }),
   ]);
@@ -202,7 +202,7 @@ export async function fetchPerson(query: string, abortController: AbortControlle
 
 export async function addPatientIdentifier(patientUuid: string, patientIdentifier: PatientIdentifier) {
   const abortController = new AbortController();
-  return openmrsFetch(`/ws/rest/v1/patient/${patientUuid}/identifier/`, {
+  return openmrsFetch(`${restBaseUrl}/patient/${patientUuid}/identifier/`, {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',
@@ -214,7 +214,7 @@ export async function addPatientIdentifier(patientUuid: string, patientIdentifie
 
 export async function updatePatientIdentifier(patientUuid: string, identifierUuid: string, identifier: string) {
   const abortController = new AbortController();
-  return openmrsFetch(`/ws/rest/v1/patient/${patientUuid}/identifier/${identifierUuid}`, {
+  return openmrsFetch(`${restBaseUrl}/patient/${patientUuid}/identifier/${identifierUuid}`, {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',
@@ -226,7 +226,7 @@ export async function updatePatientIdentifier(patientUuid: string, identifierUui
 
 export async function deletePatientIdentifier(patientUuid: string, patientIdentifierUuid: string) {
   const abortController = new AbortController();
-  return openmrsFetch(`/ws/rest/v1/patient/${patientUuid}/identifier/${patientIdentifierUuid}?purge`, {
+  return openmrsFetch(`${restBaseUrl}/patient/${patientUuid}/identifier/${patientIdentifierUuid}?purge`, {
     method: 'DELETE',
     headers: {
       'Content-Type': 'application/json',

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

@@ -317,7 +317,8 @@ export interface RestAddressTemplate {
   description: string;
   property: string;
   display: string;
-  value: string;}
+  value: string;
+}
 export interface ObsResponse {
   results: Array<{ obs: Array<{ uuid: string; display: string; value: OpenmrsResource; concept: OpenmrsResource }> }>;
 }

package/src/patient-registration/section/patient-relationships/relationships.resource.tsx

@@ -1,6 +1,6 @@
 import { useMemo } from 'react';
 import useSWR from 'swr';
-import { type FetchResponse, openmrsFetch } from '@openmrs/esm-framework';
+import { type FetchResponse, openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
 import { type RelationshipValue } from '../../patient-registration.types';
 import { personRelationshipRepresentation } from '../../../constants';
 
@@ -10,7 +10,7 @@ export function useInitialPatientRelationships(patientUuid: string): {
 } {
   const shouldFetch = !!patientUuid;
   const { data, error, isLoading } = useSWR<FetchResponse<RelationshipsResponse>, Error>(
-    shouldFetch ? `/ws/rest/v1/relationship?v=${personRelationshipRepresentation}&person=${patientUuid}` : null,
+    shouldFetch ? `${restBaseUrl}/relationship?v=${personRelationshipRepresentation}&person=${patientUuid}` : null,
     openmrsFetch,
   );
 

package/src/patient-verification/patient-verification-hook.tsx

@@ -1,11 +1,20 @@
-import { FetchResponse, openmrsFetch, showNotification, showToast } from '@openmrs/esm-framework';
+import { type FetchResponse, openmrsFetch, showNotification, showToast } from '@openmrs/esm-framework';
 import { generateNUPIPayload, handleClientRegistryResponse } from './patient-verification-utils';
 import useSWR from 'swr';
 import useSWRImmutable from 'swr/immutable';
-import { ConceptAnswers, ConceptResponse, FormValues } from '../patient-registration/patient-registration.types';
+import {
+  type ConceptAnswers,
+  type ConceptResponse,
+  type FormValues,
+} from '../patient-registration/patient-registration.types';
 
-export function searchClientRegistry(identifierType: string, searchTerm: string, token: string) {
-  const url = `https://afyakenyaapi.health.go.ke/partners/registry/search/KE/${identifierType}/${searchTerm}`;
+export function searchClientRegistry(
+  identifierType: string,
+  searchTerm: string,
+  token: string,
+  countryCode: string = 'KE',
+) {
+  const url = `https://afyakenyaapi.health.go.ke/partners/registry/search/${countryCode}/${identifierType}/${searchTerm}`;
   return fetch(url, { headers: { Authorization: `Bearer ${token}` } }).then((r) => r.json());
 }
 

package/src/patient-verification/patient-verification-utils.ts

@@ -1,8 +1,9 @@
 import { showModal } from '@openmrs/esm-framework';
-import { FormikProps } from 'formik';
-import { ClientRegistryPatient, RegistryPatient } from './verification-types';
+import { type FormikProps } from 'formik';
+import { type ClientRegistryPatient, type RegistryPatient } from './verification-types';
 import counties from './assets/counties.json';
-import { FormValues } from '../patient-registration/patient-registration.types';
+import { type FormValues } from '../patient-registration/patient-registration.types';
+import { capitalize } from 'lodash-es';
 
 export function handleClientRegistryResponse(
   clientResponse: ClientRegistryPatient,
@@ -83,7 +84,7 @@ export function handleClientRegistryResponse(
           familyName: lastName,
           middleName: middleName,
           givenName: firstName,
-          gender: gender === 'male' ? 'Male' : 'Female',
+          gender: clientResponse.client.gender,
           birthdate: new Date(dateOfBirth),
           isDead: !isAlive,
           attributes: {
@@ -94,9 +95,9 @@ export function handleClientRegistryResponse(
           address: {
             address1: residence?.address,
             address2: '',
-            address4: residence?.ward,
+            address4: capitalize(residence?.ward ?? ''),
             cityVillage: residence?.village,
-            stateProvince: residence?.subCounty,
+            stateProvince: capitalize(residence?.subCounty ?? ''),
             countyDistrict: counties.find((county) => county.code === parseInt(residence?.county))?.name,
             country: 'Kenya',
             postalCode: residence?.address,
@@ -104,14 +105,21 @@ export function handleClientRegistryResponse(
           identifiers: { ...props.values.identifiers, ...nupiIdentifiers },
           obs: {
             '1054AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA':
-              props.values.concepts.find((concept) => concept.display?.toLowerCase() === maritalStatus?.toLowerCase())
-                ?.uuid ?? '',
+              props.values.concepts.find(
+                (concept) =>
+                  concept.display?.toLowerCase()?.includes(clientResponse.client.maritalStatus?.toLowerCase()),
+              )?.uuid ?? '',
             '1712AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA':
-              props.values.concepts.find((concept) => concept.display?.toLowerCase() === educationLevel?.toLowerCase())
-                ?.uuid ?? '',
+              props.values.concepts.find(
+                (concept) =>
+                  concept.display?.toLowerCase()?.includes(clientResponse.client.educationLevel?.toLowerCase()),
+              )?.uuid ?? '',
             '1542AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA':
-              props.values.concepts.find((concept) => concept.display?.toLowerCase() === occupation?.toLowerCase())
-                ?.uuid ?? '',
+              clientResponse.client.occupation === undefined || clientResponse.client.occupation === null
+                ? '1107AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
+                : props.values.concepts.find(
+                    (concept) => concept.display?.toLowerCase() === clientResponse.client.occupation?.toLowerCase(),
+                  )?.uuid ?? '5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
           },
         });
         dispose();