@ampath/esm-patient-registration-app 9.2.0-next.18 → 9.2.0-next.19

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

@@ -298,6 +298,31 @@
       "hash": "a8b5c0ea2ff5d96f",
       "childrenByOrder": {}
     },
+    {
+      "rendered": true,
+      "initial": false,
+      "entry": false,
+      "recorded": false,
+      "reason": "split chunk (cache group: default)",
+      "size": 149526,
+      "sizes": {
+        "javascript": 149526
+      },
+      "names": [],
+      "idHints": [],
+      "runtime": [
+        "@ampath/esm-patient-registration-app",
+        "main"
+      ],
+      "files": [
+        "2523.js"
+      ],
+      "auxiliaryFiles": [
+        "2523.js.map"
+      ],
+      "hash": "bb0f4d90b804432e",
+      "childrenByOrder": {}
+    },
     {
       "rendered": true,
       "initial": false,
@@ -578,30 +603,6 @@
       "hash": "93419d8f25067437",
       "childrenByOrder": {}
     },
-    {
-      "rendered": true,
-      "initial": false,
-      "entry": false,
-      "recorded": false,
-      "size": 53431,
-      "sizes": {
-        "javascript": 53431
-      },
-      "names": [],
-      "idHints": [],
-      "runtime": [
-        "@ampath/esm-patient-registration-app",
-        "main"
-      ],
-      "files": [
-        "4395.js"
-      ],
-      "auxiliaryFiles": [
-        "4395.js.map"
-      ],
-      "hash": "3c7d9adcd5a22b91",
-      "childrenByOrder": {}
-    },
     {
       "rendered": true,
       "initial": false,
@@ -955,9 +956,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 6547,
+      "size": 3883,
       "sizes": {
-        "javascript": 6547
+        "javascript": 3883
       },
       "names": [],
       "idHints": [],
@@ -966,10 +967,12 @@
         "main"
       ],
       "files": [
-        "6679.js"
+        "6583.js"
       ],
-      "auxiliaryFiles": [],
-      "hash": "6a2dc2d473cfe02a",
+      "auxiliaryFiles": [
+        "6583.js.map"
+      ],
+      "hash": "bf48d4479083b76f",
       "childrenByOrder": {}
     },
     {
@@ -977,26 +980,21 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "reason": "split chunk (cache group: defaultVendors)",
-      "size": 80564,
+      "size": 6547,
       "sizes": {
-        "javascript": 80564
+        "javascript": 6547
       },
       "names": [],
-      "idHints": [
-        "vendors"
-      ],
+      "idHints": [],
       "runtime": [
         "@ampath/esm-patient-registration-app",
         "main"
       ],
       "files": [
-        "6687.js"
-      ],
-      "auxiliaryFiles": [
-        "6687.js.map"
+        "6679.js"
       ],
-      "hash": "09088578b9bade84",
+      "auxiliaryFiles": [],
+      "hash": "6a2dc2d473cfe02a",
       "childrenByOrder": {}
     },
     {
@@ -1004,23 +1002,26 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 614105,
+      "reason": "split chunk (cache group: defaultVendors)",
+      "size": 80564,
       "sizes": {
-        "javascript": 614105
+        "javascript": 80564
       },
       "names": [],
-      "idHints": [],
+      "idHints": [
+        "vendors"
+      ],
       "runtime": [
         "@ampath/esm-patient-registration-app",
         "main"
       ],
       "files": [
-        "6741.js"
+        "6687.js"
       ],
       "auxiliaryFiles": [
-        "6741.js.map"
+        "6687.js.map"
       ],
-      "hash": "2c75af39c28a4d59",
+      "hash": "09088578b9bade84",
       "childrenByOrder": {}
     },
     {
@@ -1210,9 +1211,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 145342,
+      "size": 145351,
       "sizes": {
-        "javascript": 145342
+        "javascript": 145351
       },
       "names": [],
       "idHints": [],
@@ -1225,7 +1226,7 @@
       "auxiliaryFiles": [
         "7821.js.map"
       ],
-      "hash": "08bda2df07bbd3a4",
+      "hash": "1e98f0254f77d833",
       "childrenByOrder": {}
     },
     {
@@ -1298,9 +1299,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 680,
+      "size": 1240,
       "sizes": {
-        "javascript": 680
+        "javascript": 1240
       },
       "names": [],
       "idHints": [],
@@ -1314,7 +1315,7 @@
       "auxiliaryFiles": [
         "8414.js.map"
       ],
-      "hash": "ef5001bdf57ce99e",
+      "hash": "ab4e9ca64444c78d",
       "childrenByOrder": {}
     },
     {
@@ -1368,10 +1369,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 2686896,
+      "size": 2686905,
       "sizes": {
         "consume-shared": 168,
-        "javascript": 2664360,
+        "javascript": 2664369,
         "share-init": 336,
         "runtime": 22032
       },
@@ -1388,7 +1389,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "53586bd43e22a588",
+      "hash": "4fdab53d48aa6f52",
       "childrenByOrder": {}
     },
     {
@@ -1396,10 +1397,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "reason": "split chunk (cache group: default)",
-      "size": 116185,
+      "size": 6145,
       "sizes": {
-        "javascript": 116185
+        "javascript": 6145
       },
       "names": [],
       "idHints": [],
@@ -1408,12 +1408,10 @@
         "main"
       ],
       "files": [
-        "8882.js"
-      ],
-      "auxiliaryFiles": [
-        "8882.js.map"
+        "9214.js"
       ],
-      "hash": "04d2462c0d9d01e6",
+      "auxiliaryFiles": [],
+      "hash": "557d45dd8b80aac2",
       "childrenByOrder": {}
     },
     {
@@ -1421,9 +1419,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 6145,
+      "size": 6573,
       "sizes": {
-        "javascript": 6145
+        "javascript": 6573
       },
       "names": [],
       "idHints": [],
@@ -1432,10 +1430,10 @@
         "main"
       ],
       "files": [
-        "9214.js"
+        "9538.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "557d45dd8b80aac2",
+      "hash": "834a8b67aa62ebba",
       "childrenByOrder": {}
     },
     {
@@ -1443,9 +1441,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 6573,
+      "size": 6021,
       "sizes": {
-        "javascript": 6573
+        "javascript": 6021
       },
       "names": [],
       "idHints": [],
@@ -1454,10 +1452,10 @@
         "main"
       ],
       "files": [
-        "9538.js"
+        "9569.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "834a8b67aa62ebba",
+      "hash": "4d989f532c63737b",
       "childrenByOrder": {}
     },
     {
@@ -1465,9 +1463,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 6021,
+      "size": 680853,
       "sizes": {
-        "javascript": 6021
+        "javascript": 680853
       },
       "names": [],
       "idHints": [],
@@ -1476,10 +1474,12 @@
         "main"
       ],
       "files": [
-        "9569.js"
+        "9853.js"
       ],
-      "auxiliaryFiles": [],
-      "hash": "4d989f532c63737b",
+      "auxiliaryFiles": [
+        "9853.js.map"
+      ],
+      "hash": "57b9558dff0bf2e9",
       "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.18"}
+{"$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.19"}

package/package.json

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

package/src/index.ts

@@ -63,6 +63,6 @@ export const deleteIdentifierConfirmationModal = getAsyncLifecycle(
 );
 
 export const clientRegistryVerificationTag = getAsyncLifecycle(
-  () => import('./patient-registration/client-registry-search/client-registry-verification-tag.component'),
+  () => import('./patient-registration/client-registry/existing-client/client-registry-verification-tag.component'),
   options,
 );

package/src/patient-registration/client-registry/client-registry-search.component.tsx

@@ -18,14 +18,17 @@ import { useFormikContext } from 'formik';
 import styles from './client-registry-search.scss';
 import { requestCustomOtp, validateCustomOtp, fetchClientRegistryData } from './client-registry.resource';
 import { applyClientRegistryMapping } from './map-client-registry-to-form-utils';
-import ClientDetails from './client-details/client-details';
+import ClientDetails from './new-client/client-details/client-details';
 import { type HieClient } from './types';
-import ClientDependantList from './client-dependants/list/client-depandants.component';
+import ClientDependantList from './new-client/client-dependants/list/client-depandants.component';
+import NewClientTab from './new-client/new-client-tab.component';
+import ExistingClientTab from './existing-client/existing-client-tab.component';
 
 export interface ClientRegistryLookupSectionProps {
   onClientVerified?: () => void;
   onModalClose: () => void;
   open: boolean;
+  isNewClient: boolean;
 }
 
 export type IdentifierType = 'National ID' | 'Alien ID' | 'Passport' | 'Mandate Number' | 'Refugee ID';
@@ -42,6 +45,7 @@ const ClientRegistryLookupSection: React.FC<ClientRegistryLookupSectionProps> =
   onClientVerified,
   open,
   onModalClose,
+  isNewClient = true,
 }) => {
   const { setFieldValue } = useFormikContext<any>();
   const [identifierType, setIdentifierType] = useState<IdentifierType>('National ID');
@@ -294,7 +298,12 @@ const ClientRegistryLookupSection: React.FC<ClientRegistryLookupSectionProps> =
 
           {otpVerified && client ? (
             <div className="clientDataSection">
-              <Tabs>
+              {isNewClient ? (
+                <NewClientTab client={client} useHieData={useHieData} />
+              ) : (
+                <ExistingClientTab hieClient={client} />
+              )}
+              {/* <Tabs>
                 <TabList contained>
                   <Tab>Patient</Tab>
                   <Tab>Dependants</Tab>
@@ -306,7 +315,7 @@ const ClientRegistryLookupSection: React.FC<ClientRegistryLookupSectionProps> =
                   </TabPanel>
                 </TabPanels>
               </Tabs>
-              <Button onClick={useHieData}>Use Data</Button>
+              <Button onClick={useHieData}>Use Data</Button> */}
             </div>
           ) : (
             <></>

package/src/patient-registration/client-registry/existing-client/client-dependants-comparison/client-dependants-comparison.component.tsx

@@ -0,0 +1,26 @@
+import { Accordion } from '@carbon/react';
+import React from 'react';
+import { type ClientDependantsComparisonProps } from '../types';
+import ClientDependantComparisonRows from './dependant-comparison-rows.component';
+
+const ClientDependantsComparison: React.FC<ClientDependantsComparisonProps> = ({
+  hieDependants,
+  amrsClient,
+  patientRelationships,
+}) => {
+  return (
+    <div>
+      <Accordion size="lg">
+        {hieDependants.map((dependant) => (
+          <ClientDependantComparisonRows
+            hieDependant={dependant}
+            amrsClient={amrsClient}
+            patientRelationships={patientRelationships}
+          />
+        ))}
+      </Accordion>
+    </div>
+  );
+};
+
+export default ClientDependantsComparison;

package/src/patient-registration/client-registry/existing-client/client-dependants-comparison/dependant-comparison-rows.component.tsx

@@ -0,0 +1,153 @@
+import { AccordionItem, Row, Column, Select, SelectItem, Button } from '@carbon/react';
+import { showSnackbar } from '@openmrs/esm-framework';
+import React, { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { createPerson, createRelationship, fetchAmrsPersonData } from '../existing-client.resource';
+import {
+  patientObjFields,
+  mapFieldValue,
+  getPatientAttributes,
+  personSyncFields,
+  nameFields,
+  addressFields,
+  getPatientRelationshipPayload,
+} from '../mapper-utils';
+import { type AmrsClient, type ClientDependantComparisonRowsProps } from '../types';
+import { type HieDependant } from '../../types';
+import ClientDetailsComparison from '../client-details-comparison/client-details-comparison.component';
+
+const ClientDependantComparisonRows: React.FC<ClientDependantComparisonRowsProps> = ({
+  hieDependant,
+  patientRelationships,
+  amrsClient,
+}) => {
+  const { t } = useTranslation();
+  const [amrsRelationExists, setAmrsRelationExists] = useState(false);
+  const [amrsDependantData, setAmrsDependantData] = useState<AmrsClient>();
+  const [selectedRelationship, setSelectedRelationship] = useState('');
+
+  const handleCreateDependant = async (dependantBody: HieDependant) => {
+    try {
+      const syncFields = {};
+      patientObjFields.forEach((field) => {
+        let fieldArr = mapFieldValue(field, dependantBody.result[0], amrsClient);
+        const hieFieldValue = fieldArr[1];
+        syncFields[field] = hieFieldValue;
+      });
+
+      // Person
+      const patientPayload = {};
+      const names = {};
+      const addresses = {};
+      const otherFields = {};
+      const attributes = getPatientAttributes(dependantBody.result[0]);
+      Object.entries(syncFields).forEach(([k, v]) => {
+        if (personSyncFields.includes(k)) {
+          // names
+          if (nameFields.includes(k)) {
+            names[k] = v;
+          }
+          // addresses
+          else if (addressFields.includes(k)) {
+            if (v) {
+              addresses[k] = v;
+            }
+          } else {
+            otherFields[k] = v;
+          }
+        }
+      });
+      Object.assign(
+        patientPayload,
+        otherFields,
+        { addresses: [addresses] },
+        { names: [names] },
+        { attributes: attributes },
+      );
+      const response = await createPerson(patientPayload);
+      if (response && response.data) {
+        showSnackbar({
+          kind: 'success',
+          title: 'Dependant created successfully.',
+        });
+        const relationshipPayload = getPatientRelationshipPayload(
+          amrsClient,
+          dependantBody.relationship,
+          response.data.uuid,
+        );
+        await createRelationship(relationshipPayload);
+        showSnackbar({
+          kind: 'success',
+          title: 'Dependant relationship created successfully.',
+        });
+      }
+    } catch (err) {
+      showSnackbar({
+        kind: 'error',
+        title: 'Error syncing patient data.',
+        subtitle: JSON.stringify(err),
+      });
+    }
+  };
+
+  const handleSelectAmrsDependant = async (e: any) => {
+    const uuid = e.target.value;
+    if (!uuid) {
+      setAmrsRelationExists(false);
+      setAmrsDependantData(null);
+    }
+    const response = await fetchAmrsPersonData(uuid);
+    if (response && response.data) {
+      setAmrsRelationExists(true);
+      setAmrsDependantData((prev) => ({ ...prev, person: response.data }));
+    } else {
+      setAmrsRelationExists(false);
+      setAmrsDependantData(null);
+      const relationshipUuid = patientRelationships.find((v) => v.relatedPersonUuid === uuid);
+      if (relationshipUuid && relationshipUuid.relationshipType) {
+        setSelectedRelationship(relationshipUuid.relationshipType);
+      }
+    }
+  };
+
+  const getDependantName = () => {
+    const name = hieDependant.result[0];
+    return `${name.first_name} ${name.middle_name} ${name.last_name} (${hieDependant.relationship})`;
+  };
+
+  return (
+    <>
+      <AccordionItem title={getDependantName()}>
+        <Row>
+          <Column>
+            <Select labelText={t('amrsDependants', 'AMRS dependants')} onChange={handleSelectAmrsDependant}>
+              <SelectItem text={t('selectAmrsRelation', 'Select AMRS relation')} value="" />
+              {patientRelationships.map((relationship) => (
+                <SelectItem
+                  text={`${relationship.display} (${relationship.relationshipType})`}
+                  value={relationship.relatedPerson.uuid}
+                />
+              ))}
+            </Select>
+          </Column>
+          {!amrsRelationExists ? (
+            <Column>
+              <Button onClick={() => handleCreateDependant(hieDependant)}>
+                {t('createDependant', 'Create dependant in AMRS')}
+              </Button>
+            </Column>
+          ) : null}
+        </Row>
+        <Row>
+          <ClientDetailsComparison
+            hieClient={hieDependant.result[0]}
+            amrsClient={amrsDependantData}
+            fromDependant={true}
+          />
+        </Row>
+      </AccordionItem>
+    </>
+  );
+};
+
+export default ClientDependantComparisonRows;