Update Shared Health Record Implementation (#7)

METS-Programme · Jul 12, 2024 · 3df265b · 3df265b
1 parent 5e2d02d
commit 3df265b
Show file tree

Hide file tree

Showing 16 changed files with 2,390 additions and 284 deletions.
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
     "packages/*"
   ],
   "scripts": {
-    "start": "openmrs develop --sources 'packages/esm-*-app' --backend http://194.163.171.253:8282",
+    "start": "openmrs develop --sources 'packages/esm-*-app'",
     "ci:publish": "lerna publish from-package --yes",
     "ci:prepublish": "lerna publish from-package --no-git-reset --yes --dist-tag next",
     "release": "lerna version --no-git-tag-version",

diff --git a/packages/esm-patient-registration-app/package.json b/packages/esm-patient-registration-app/package.json
@@ -8,13 +8,12 @@
   "license": "MPL-2.0",
   "homepage": "https://github.com/METS-Programme/esm-patient-registration-app#readme",
   "scripts": {
-    "start": "openmrs develop --backend http://194.163.171.253:8282",
+    "start": "openmrs develop",
     "serve": "webpack serve --mode=development",
     "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",
-    "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",
     "typescript": "tsc",

diff --git a/...ent-registration-app/src/patient-registration/input/basic-input/input/input.component.tsx b/...ent-registration-app/src/patient-registration/input/basic-input/input/input.component.tsx
@@ -1,9 +1,9 @@
 import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
-import { Layer, TextInput, TextInputProps } from '@carbon/react';
+import { Layer, TextInput } from '@carbon/react';
 import { useField } from 'formik';
 
-interface InputProps extends TextInputProps {
+interface InputProps {
   checkWarning?(value: string): string;
 }
 

diff --git a/...ion-app/src/patient-registration/input/custom-input/autosuggest/autosuggest.component.tsx b/...ion-app/src/patient-registration/input/custom-input/autosuggest/autosuggest.component.tsx
@@ -1,9 +1,9 @@
 import React, { useEffect, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { Layer, Search, SearchProps } from '@carbon/react';
+import { Layer, Search } from '@carbon/react';
 import styles from './autosuggest.scss';
 
-interface AutosuggestProps extends SearchProps {
+interface AutosuggestProps {
   getDisplayValue: Function;
   getFieldValue: Function;
   getSearchResults: (query: string) => Promise<any>;

diff --git a/packages/esm-patient-registration-app/src/patient-verification/data-table/data-tables.scss b/packages/esm-patient-registration-app/src/patient-verification/data-table/data-tables.scss
@@ -132,18 +132,6 @@
   justify-content: flex-end;
 }
 
-:global(.omrs-breakpoint-lt-desktop) {
-  .toolbarWrapper {
-    height: spacing.$spacing-09;
-  }
-}
-
-:global(.omrs-breakpoint-gt-tablet) {
-  .toolbarWrapper {
-    height: spacing.$spacing-07;
-  }
-}
-
 .tableContainer {
   padding: 0;
 

diff --git a/packages/esm-patient-registration-app/src/patient-verification/patient-verification-hook.tsx b/packages/esm-patient-registration-app/src/patient-verification/patient-verification-hook.tsx
@@ -119,7 +119,6 @@ export async function handleSavePatientToRegistry(
     showToast({
       title: `${selectedRegistry} error`,
       description: `${error}`,
-      millis: 10000,
       kind: 'error',
       critical: true,
     });

diff --git a/.../esm-patient-registration-app/src/patient-verification/patient-verification.component.tsx b/.../esm-patient-registration-app/src/patient-verification/patient-verification.component.tsx
@@ -58,7 +58,6 @@ const PatientVerification: React.FC<PatientVerificationProps> = ({
       showToast({
         title: 'Client registry error',
         description: `Please reload the registration page and try again, if the issue persists contact system administrator`,
-        millis: 10000,
         kind: 'error',
         critical: true,
       });

diff --git a/packages/esm-patient-registration-app/src/patient-verification/verification-constants.ts b/packages/esm-patient-registration-app/src/patient-verification/verification-constants.ts
@@ -9,7 +9,7 @@ export const patientRegistries = [
     uuid: '',
     id: 2,
     name: 'Shared Health Record (SHR)',
-    url: 'http://165.232.114.52:8080',
+    url: 'http://165.227.170.84:9091',
   },
   {
     uuid: '',

diff --git a/...gistration-app/src/patient-verification/verification-modal/multiple-patient.component.tsx b/...gistration-app/src/patient-verification/verification-modal/multiple-patient.component.tsx
@@ -22,6 +22,11 @@ const MultiplePatientPrompt: React.FC<MultiplePatientPromptProps> = ({ close, on
       <div className="cds--modal-content">
         {patient.length > 0 ? <DataList data={patient} columns={registryPatientHeaders} /> : <EmptyStateComponent />}
       </div>
+      <div className="cds--modal-footer">
+        <Button kind="secondary" onClick={close}>
+          {t('close', 'Close')}
+        </Button>
+      </div>
     </>
   );
 };

diff --git a/packages/esm-patient-registration-app/translations/am.json b/packages/esm-patient-registration-app/translations/am.json
@@ -10,6 +10,7 @@
   "birthFieldLabelText": "Birth",
   "cancel": "Cancel",
   "causeOfDeathInputLabel": "Cause of Death",
+  "close": "Close",
   "configure": "Configure",
   "contactSection": "Contact Details",
   "continue": "Continue to registration",

diff --git a/packages/esm-patient-registration-app/translations/en.json b/packages/esm-patient-registration-app/translations/en.json
@@ -10,6 +10,7 @@
   "birthFieldLabelText": "Birth",
   "cancel": "Cancel",
   "causeOfDeathInputLabel": "Cause of Death",
+  "close": "Close",
   "configure": "Configure",
   "contactSection": "Contact Details",
   "continue": "Continue",

diff --git a/packages/esm-patient-registration-app/translations/es.json b/packages/esm-patient-registration-app/translations/es.json
@@ -10,6 +10,7 @@
   "birthFieldLabelText": "Birth",
   "cancel": "Cancel",
   "causeOfDeathInputLabel": "Cause of Death",
+  "close": "Close",
   "configure": "Configure",
   "contactSection": "Contact Details",
   "continue": "Continue to registration",

diff --git a/packages/esm-patient-registration-app/translations/fr.json b/packages/esm-patient-registration-app/translations/fr.json
@@ -10,6 +10,7 @@
   "birthFieldLabelText": "Naissance",
   "cancel": "Annuller",
   "causeOfDeathInputLabel": "Cause de décès",
+  "close": "Close",
   "configure": "Configurer",
   "contactSection": "Contact Details",
   "continue": "Continue to registration",

diff --git a/packages/esm-patient-registration-app/translations/he.json b/packages/esm-patient-registration-app/translations/he.json
@@ -10,6 +10,7 @@
   "birthFieldLabelText": "לידה",
   "cancel": "ביטול",
   "causeOfDeathInputLabel": "סיבת המוות",
+  "close": "Close",
   "configure": "הגדר",
   "contactSection": "Contact Details",
   "continue": "Continue to registration",

diff --git a/packages/esm-patient-registration-app/translations/km.json b/packages/esm-patient-registration-app/translations/km.json
@@ -10,6 +10,7 @@
   "birthFieldLabelText": "ថ្ងៃខែឆ្នាំកំណើត",
   "cancel": "បោះបង់ចោល",
   "causeOfDeathInputLabel": "មូលហេតុនៃការស្លាប់",
+  "close": "Close",
   "configure": "កំណត់រចនាសម្ព័ន្ធ",
   "contactSection": "Contact Details",
   "continue": "Continue to registration",