New visits widget

.eslintrc

@@ -2,9 +2,14 @@
   "env": {
     "node": true
   },
-  "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:jest-dom/recommended",
+    "plugin:testing-library/react"
+  ],
   "parser": "@typescript-eslint/parser",
-  "plugins": ["@typescript-eslint", "react-hooks"],
+  "plugins": ["@typescript-eslint", "jest-dom", "react-hooks", "testing-library"],
   "rules": {
     "react-hooks/exhaustive-deps": "warn",
     "react-hooks/rules-of-hooks": "error",

.github/workflows/bundle-size.yml

@@ -23,7 +23,7 @@ jobs:
         uses: felixmosh/turborepo-gh-artifacts@v3
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-          server-token: ${{ env.TURBO_TOKEN }}
+          server-token: ''
 
       - name: Compute bundle size report
         uses: preactjs/compressed-size-action@v2

.github/workflows/ci.yml

@@ -43,7 +43,7 @@ jobs:
         uses: felixmosh/turborepo-gh-artifacts@v3
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-          server-token: ${{ env.TURBO_TOKEN }}
+          server-token: ''
 
       - name: Run lint, type checks and tests
         run: yarn verify
@@ -81,7 +81,7 @@ jobs:
         uses: felixmosh/turborepo-gh-artifacts@v3
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-          server-token: ${{ env.TURBO_TOKEN }}
+          server-token: ''
 
       - name: Version
         run: yarn workspaces foreach --all --topological --exclude @openmrs/esm-patient-chart version "$(node -e "console.log(require('semver').inc(require('./package.json').version, 'patch'))")-pre.${{ github.run_number }}"
@@ -151,7 +151,7 @@ jobs:
         uses: felixmosh/turborepo-gh-artifacts@v3
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-          server-token: ${{ env.TURBO_TOKEN }}
+          server-token: ''
 
       - name: Build
         run: yarn turbo run build --color --concurrency=5

.github/workflows/e2e.yml

@@ -47,7 +47,7 @@ jobs:
         uses: felixmosh/turborepo-gh-artifacts@v3
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-          server-token: ${{ env.TURBO_TOKEN }}
+          server-token: ''
 
       - name: Build apps
         run: yarn turbo run build --color --concurrency=5
@@ -75,14 +75,14 @@ jobs:
           overwrite: true
 
       - name: Capture Server Logs
-        if: '!cancelled()'
+        if: always()
         uses: jwalton/gh-docker-logs@v2
         with:
           dest: './logs'
 
       - name: Upload Logs as Artifact
         uses: actions/upload-artifact@v4
-        if: '!cancelled()'
+        if: always()
         with:
           name: server-logs
           path: './logs'

.prettierignore

@@ -1,7 +1,5 @@
 dist/
 node_modules/
-**/*.css
-**/*.scss
 **/*.md
 **/*.json
 packages/esm-form-entry-app/src/app/loader/loader.component.html

README.md

@@ -107,7 +107,7 @@ To run end-to-end tests, run:
 yarn test-e2e
 ```
 
-Read the [e2e testing guide](https://o3-docs.openmrs.org/docs/frontend-modules/testing#end-to-end-testing-with-playwright) to learn more about End-to-End tests in this project.
+Read the [e2e testing guide](https://o3-docs.openmrs.org/docs/frontend-modules/end-to-end-testing) to learn more about End-to-End tests in this project.
 
 ### Updating Playwright
 

__mocks__/mockDeceasedPatient.ts

@@ -19,7 +19,7 @@ export const mockDeceasedPatient = {
       value: '100732HE',
     },
     {
-      id: '1f0ad7a1-430f-4397-b571-59ea654a52db',
+      id: 'ceda35a8-a445-455d-9928-ac088692190a',
       use: 'usual',
       system: 'OpenMRS ID',
       value: '100GEJ',

__mocks__/patient-flags.mock.ts

@@ -1,20 +1,47 @@
 export const mockPatientFlags = [
   {
-    uuid: '8ca6c08f-66d9-4a18-a233-4f658b1755bf',
-    flag: { display: 'Needs Follow Up' },
+    auditInfo: { dateCreated: '2024-03-01T00:00:00.000Z' },
+    flag: { display: 'Needs Follow Up', uuid: '98ca6c08f-66d9-4a18-a233-4f658b1755bf' },
     message: 'Patient needs to be followed up',
-    tags: [{ display: 'flag tag - risk' }, { display: 'flag type - Social' }],
+    patient: {
+      uuid: '8ca6c08f-66d9-4a18-a233-4f658b1755bf',
+      display: 'John Doe',
+    },
+    tags: [
+      { display: 'flag tag - risk', uuid: 'some-uuid' },
+      { display: 'flag type - Social', uuid: 'some-other-uuid' },
+    ],
+    uuid: '8ca6c08f-66d9-4a18-a233-4f658b1755bf',
+    voided: false,
   },
   {
-    uuid: '5fs6c08f-66d9-4a18-a233-5f658b1755bf',
-    flag: { display: 'Unknown Diagnosis' },
+    auditInfo: { dateCreated: '2024-03-01T00:00:00.000Z' },
+    flag: { display: 'Unknown Diagnosis', uuid: 'a4a4c08f-66d9-4a18-a233-5f658b1755bf' },
     message: 'Diagnosis for the patient is unknown',
-    tags: [{ display: 'flag tag - info' }, { display: 'flag type - Clinical' }],
+    patient: {
+      uuid: '8ca6c08f-66d9-4a18-a233-4f658b1755bf',
+      display: 'John Doe',
+    },
+    tags: [
+      { display: 'flag tag - info', uuid: 'another-uuid' },
+      { display: 'flag type - Clinical', uuid: 'yet-another-uuid' },
+    ],
+    uuid: '5fs6c08f-66d9-4a18-a233-5f658b1755bf',
+    voided: false,
   },
   {
-    uuid: '4da4c08f-66d9-4a18-a233-5f658b1755bf',
-    flag: { display: 'Future Appointment' },
+    auditInfo: { dateCreated: '2024-03-01T00:00:00.000Z' },
+    flag: { display: 'Future Appointment', uuid: 'cc6c08f-66d9-4a18-a233-5f658b1755bf' },
     message: 'Patient has a future appointment scheduled',
-    tags: [{ display: 'flag tag - info' }, { display: 'flag type - Clinical' }],
+    patient: {
+      uuid: '8ca6c08f-66d9-4a18-a233-4f658b1755bf',
+      display: 'John Doe',
+    },
+    tags: [
+      { display: 'flag tag - info', uuid: 'one-more-uuid' },
+      { display: 'flag type - Clinical', uuid: 'yet-one-more-uuid' },
+    ],
+    uuid: '4da4c08f-66d9-4a18-a233-5f658b1755bf',
+    voided: false,
   },
 ];

__mocks__/programs.mock.ts

@@ -50,6 +50,10 @@ export const mockEnrolledProgramsResponse = [
       uuid: '64f950e6-1b07-4ac0-8e7e-f3e148f3463f',
       name: 'HIV Care and Treatment',
       allWorkflows: [],
+      concept: {
+        uuid: '70724784-438a-490e-a581-68b7d1f8f47f',
+        display: 'Human immunodeficiency virus (HIV) disease',
+      },
     },
     display: 'HIV Care and Treatment',
     location: {
@@ -61,6 +65,58 @@ export const mockEnrolledProgramsResponse = [
   },
 ];
 
+export const mockEnrolledInAllProgramsResponse = [
+  {
+    uuid: '8ba6c08f-66d9-4a18-a233-5f658b1755bf',
+    program: {
+      uuid: '64f950e6-1b07-4ac0-8e7e-f3e148f3463f',
+      name: 'HIV Care and Treatment',
+      allWorkflows: [],
+      concept: {
+        uuid: '70724784-438a-490e-a581-68b7d1f8f47f',
+        display: 'Human immunodeficiency virus (HIV) disease',
+      },
+    },
+    display: 'HIV Care and Treatment',
+    location: {
+      uuid: 'aff27d58-a15c-49a6-9beb-d30dcfc0c66e',
+      display: 'Amani Hospital',
+    },
+    dateEnrolled: '2020-01-16T00:00:00.000+0000',
+    dateCompleted: null,
+  },
+  {
+    uuid: '700b7914-9dc9-4569-8fe3-6db6c80af4c5',
+    program: {
+      uuid: '11b129ca-a5e7-4025-84bf-b92a173e20de',
+      name: 'Oncology Screening and Diagnosis',
+      allWorkflows: [],
+    },
+    display: 'Oncology Screening and Diagnosis',
+    location: {
+      uuid: 'aff27d58-a15c-49a6-9beb-d30dcfc0c66e',
+      display: 'Amani Hospital',
+    },
+    dateEnrolled: '2021-03-16T00:00:00.000+0000',
+    dateCompleted: null,
+  },
+  {
+    uuid: '874e5326-faa0-4d4b-a891-9a0e3a16f30f',
+    program: {
+      uuid: 'b2f65a51-2f87-4faa-a8c6-327a0c1d2e17',
+      name: 'HIV Differentiated Care',
+      allWorkflows: [],
+    },
+    display: 'HIV Differentiated Care',
+    location: {
+      uuid: 'aff27d58-a15c-49a6-9beb-d30dcfc0c66e',
+      display: 'Amani Hospital',
+    },
+    dateEnrolled: '2021-02-16T00:00:00.000+0000',
+    dateCompleted: null,
+  },
+];
+
 export const mockCareProgramsResponse = [
   {
     uuid: '64f950e6-1b07-4ac0-8e7e-f3e148f3463f',

__mocks__/session.mock.ts

@@ -60,6 +60,7 @@ export const mockSessionDataResponse = {
       address13: null,
       address14: null,
       address15: null,
+      links: [],
     },
     user: {
       uuid: '45ce6c2e-dd5a-11e6-9d9c-0242ac150002',
@@ -77,31 +78,40 @@ export const mockSessionDataResponse = {
         {
           uuid: '62431c71-5244-11ea-a771-0242ac160002',
           display: 'Manage Appointment Services',
+          links: [],
         },
         {
           uuid: '6206682c-5244-11ea-a771-0242ac160002',
           display: 'Manage Appointments',
+          links: [],
         },
         {
           uuid: '6280ff58-5244-11ea-a771-0242ac160002',
           display: 'Manage Appointment Specialities',
+          links: [],
         },
       ],
       roles: [
         {
           uuid: '8d94f852-c2cc-11de-8d13-0010c6dffd0f',
           display: 'System Developer',
+          links: [],
         },
         {
           uuid: '62c195c5-5244-11ea-a771-0242ac160002',
           display: 'Bahmni Role',
+          links: [],
         },
         {
           uuid: '8d94f280-c2cc-11de-8d13-0010c6dffd0f',
           display: 'Provider',
+          links: [],
         },
       ],
       retired: false,
+      locale: 'en_GB',
+      allowedLocales: ['en_GB'],
     },
+    sessionId: 'D4F7D4D4-6A6D-4D4D-8D4D-4D4D4D4D4D4D',
   },
 };

__mocks__/visits.mock.ts

@@ -51,7 +51,7 @@ export const mockCurrentVisit = {
     display: 'Facility Visit',
   },
   attributes: [],
-  startDatetime: new Date('2021-03-16T08:16:00.000+0000'),
+  startDatetime: new Date('2021-03-16T08:16:00.000+0000').toISOString(),
   stopDatetime: null,
   location: {
     uuid: '6351fcf4-e311-4a19-90f9-35667d99a8af',

__mocks__/vitals-and-biometrics.mock.ts

@@ -1,5 +1,3 @@
-import { type PatientVitalsAndBiometrics } from '../packages/esm-patient-vitals-app/src/common';
-
 export const mockBiometricsResponse = {
   resourceType: 'Bundle',
   id: '0b0f8529-3e6e-41d9-8007-0ef639fb893b',
@@ -5987,12 +5985,12 @@ export const mockFhirVitalsResponse = {
 };
 
 export const mockBiometricsConfig = {
-  biometrics: { bmiUnit: 'kg / m²' },
   concepts: { heightUuid: '5090AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', weightUuid: '5089AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' },
+  biometrics: { bmiUnit: 'kg / m²' },
 };
 
 export const mockVitalsConfig = {
-  biometrics: { bmiUnit: 'kg / m²' },
+  biometrics: { bmiUnit: 'kg / m²', heightUnit: 'm', weightUnit: 'kg' },
   concepts: {
     diastolicBloodPressureUuid: '5086AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
     generalPatientNoteUuid: '165095AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
@@ -6007,8 +6005,12 @@ export const mockVitalsConfig = {
   },
   vitals: {
     encounterTypeUuid: '67a71486-1a54-468f-ac3e-7091a9a79584',
-    formUuid: 'a000cb34-9ec1-4344-a1c8-f692232f6edd',
+    formUuid: '9f26aad4-244a-46ca-be49-1196df1a8c9a',
     useFormEngine: false,
+    logo: null,
+    showPrintButton: false,
+    formName: 'Vitals',
+    useMuacColors: false,
   },
 };
 
@@ -6059,26 +6061,6 @@ export const formattedVitals = [
   },
 ];
 
-export const formattedVitalsAndBiometrics: Array<PatientVitalsAndBiometrics> = [
-  {
-    id: '0',
-    uuid: 'fd481c9f-f81f-4aaf-b00b-747900af9935',
-    date: '2024-04-21T09:31:27.000Z',
-    height: 12,
-    weight: 12,
-    bmi: 833.3,
-    bloodPressureRenderInterpretation: 'normal',
-    systolic: 1,
-    diastolic: 2,
-    pulse: 12,
-    respiratoryRate: 12,
-    spo2: 12,
-    temperature: 31,
-    muac: 12,
-    generalPatientNote: 'notes',
-  },
-];
-
 export const mockVitalsConceptMetadata = mockVitalsSignsConcepts.data.results[0].setMembers;
 
 export const mockConceptUnits = new Map<string, string>(