@kenyaemr/esm-patient-clinical-view-app 5.4.2-pre.2351 → 5.4.2-pre.2354

package/src/routes.json

@@ -6,185 +6,107 @@
   "pages": [],
   "extensions": [
     {
-      "name": "clinical-view-section",
-      "component": "clinicalViewPatientDashboard",
-      "slot": "patient-chart-dashboard-slot"
-    },
-    {
-      "name": "family-history",
-      "slot": "patient-chart-family-history-slot",
-      "component": "familyHistory",
-      "order": 0,
-      "online": true,
-      "offline": false
-    },
-    {
-      "name": "relationships-link",
-      "component": "relationshipsLink",
+      "name": "hiv-care-and-treatment-dashboard-link",
       "slot": "patient-chart-dashboard-slot",
-      "order": 14,
+      "component": "hivCareAndTreatmentLink",
       "meta": {
         "columns": 1,
         "columnSpan": 1,
-        "slot": "patient-chart-relationships-slot",
-        "path": "relationships",
+        "slot": "patient-chart-hiv-care-and-treatment-dashboard-slot",
+        "path": "hiv-care-and-treatment-dashboard",
         "layoutMode": "anchored"
       }
     },
     {
-      "name": "relationships",
-      "slot": "patient-chart-relationships-slot",
-      "component": "relationships",
+      "name": "hiv-care-and-treatment-dashboard",
+      "slot": "patient-chart-hiv-care-and-treatment-dashboard-slot",
+      "component": "hivCareAndTreatment",
       "order": 0,
       "online": true,
       "offline": false
     },
     {
-      "name": "contact-list-form",
-      "component": "contactListForm"
-    },
-    {
-      "name": "maternal-and-child-health-dashboard-group-link",
-      "slot": "clinical-view-section",
-      "component": "maternalAndChildHealthSideNavGroup"
-    },
-    {
-      "name": "antenatal-care-dashboard-link",
-      "component": "antenatalCareLink",
-      "slot": "maternal-and-child-health-slot",
-      "meta": {
-        "columns": 1,
-        "columnSpan": 1,
-        "slot": "patient-chart-antenatal-care-dashboard-slot",
-        "path": "antenatal-care-dashboard",
-        "layoutMode": "anchored"
-      }
-    },
-    {
-      "name": "antenatal-care-dashboard",
-      "slot": "patient-chart-antenatal-care-dashboard-slot",
-      "component": "antenatalCare"
-    },
-    {
-      "name": "postnatal-care-dashboard-link",
-      "component": "postnatalCareLink",
-      "slot": "maternal-and-child-health-slot",
-      "meta": {
-        "columns": 1,
-        "columnSpan": 1,
-        "slot": "patient-chart-postnatal-care-dashboard-slot",
-        "path": "postnatal-care-dashboard",
-        "layoutMode": "anchored"
-      }
-    },
-    {
-      "name": "postnatal-care-dashboard",
-      "slot": "patient-chart-postnatal-care-dashboard-slot",
-      "component": "postnatalCare"
-    },
-    {
-      "name": "labour-and-delivery-dashboard-link",
-      "component": "labourAndDeliveryLink",
-      "slot": "maternal-and-child-health-slot",
-      "meta": {
-        "fullWidth": true,
-        "slot": "patient-chart-labour-and-delivery-dashboard-slot",
-        "path": "labour-and-delivery-dashboard",
-        "layoutMode": "anchored"
-      }
-    },
-    {
-      "name": "labour-and-delivery-dashboard",
-      "slot": "patient-chart-labour-and-delivery-dashboard-slot",
-      "component": "labourAndDelivery",
-      "meta": {
-        "fullWidth": true
-      }
-    },
-    {
-      "name": "hiv-care-and-treatment-dashboard-group-link",
-      "slot": "special-clinics-slot",
-      "component": "hivCareAndTreatMentSideNavGroup"
-    },
-    {
-      "name": "genericNavLinks",
-      "slot": "special-clinics-slot",
-      "component": "genericNavLinks",
+      "name": "relationship-dashboard-link",
+      "slot": "patient-chart-dashboard-slot",
+      "component": "relationshipsLink",
+      "order": 24,
+      "online": true,
+      "offline": false,
       "meta": {
         "columns": 1,
         "columnSpan": 1,
-        "slot": "patient-chart-special-clinic-dashboard-slot",
-        "path": "special-clinics-dashboard",
+        "slot": "patient-chart-relationship-slot",
+        "path": "relationships",
         "layoutMode": "anchored"
       }
     },
     {
-      "name": "patient-chart-special-clinic-dashboard-slot",
-      "slot": "patient-chart-special-clinic-dashboard-slot",
-      "component": "genericDashboard"
+      "name": "relationship-dashboard",
+      "slot": "patient-chart-relationship-slot",
+      "component": "relationships",
+      "order": 0,
+      "online": true,
+      "offline": false
     },
     {
-      "name": "hts-dashboard-link",
-      "component": "htsDashboardLink",
-      "slot": "hiv-care-and-treatment-slot",
+      "name": "clinical-encounter-dashboard-link",
+      "component": "clinicalEncounterLink",
+      "slot": "patient-chart-dashboard-slot",
+      "order": 25,
       "meta": {
         "columns": 1,
         "columnSpan": 1,
-        "slot": "patient-chart-hts-dashboard-slot",
-        "path": "hts-dashboard",
+        "slot": "patient-chart-clinical-encounter-slot",
+        "path": "clinical-encounter",
         "layoutMode": "anchored"
       }
     },
     {
-      "name": "hts-clinical-view",
-      "slot": "patient-chart-hts-dashboard-slot",
-      "component": "htsClinicalView",
-      "order": 2,
+      "name": "clinical-encounter-dashboard",
+      "slot": "patient-chart-clinical-encounter-slot",
+      "component": "clinicalEncounter",
+      "order": 0,
       "online": true,
       "offline": false
     },
     {
-      "name": "defaulter-tracing-dashboard-link",
-      "component": "defaulterTracingLink",
-      "slot": "hiv-care-and-treatment-slot",
+      "name": "maternal-and-child-health-dashboard-link",
+      "component": "maternalAndChildHealthDashboardLink",
+      "slot": "patient-chart-dashboard-slot",
+      "order": 26,
       "meta": {
         "columns": 1,
         "columnSpan": 1,
-        "slot": "patient-chart-defaulter-tracing-dashboard-slot",
-        "path": "defaulter-tracing-dashboard",
+        "slot": "patient-chart-maternal-and-child-health-slot",
+        "path": "maternal-and-child-health",
         "layoutMode": "anchored"
       }
     },
     {
-      "name": "defaulter-tracing-dashboard",
-      "slot": "patient-chart-defaulter-tracing-dashboard-slot",
-      "component": "defaulterTracing",
-      "order": 3,
+      "name": "maternal-and-child-health-dashboard",
+      "slot": "patient-chart-maternal-and-child-health-slot",
+      "component": "maternalAndChildHealthDashboard",
+      "order": 0,
       "online": true,
       "offline": false
     },
     {
-      "name": "special-clinics-dashboard-group-link",
-      "slot": "clinical-view-section",
-      "component": "specialClinicsSideNavGroup"
-    },
-    {
-      "name": "clinical-encounter-link",
-      "component": "inPatientClinicalEncounterLink",
-      "slot": "clinical-view-section",
-      "order": 40,
+      "name": "contact-list-dashboard-link",
+      "component": "contactListLink",
+      "slot": "patient-chart-dashboard-slot",
+      "order": 27,
       "meta": {
         "columns": 1,
         "columnSpan": 1,
-        "slot": "patient-chart-clinical-encounter-slot",
-        "path": "clinical-encounter",
+        "slot": "patient-chart-contact-list-slot",
+        "path": "contact-list",
         "layoutMode": "anchored"
       }
     },
     {
-      "name": "clinical-encounter",
-      "slot": "patient-chart-clinical-encounter-slot",
-      "component": "inPatientClinicalEncounter",
+      "name": "contact-list-dashboard",
+      "slot": "patient-chart-contact-list-slot",
+      "component": "contactList",
       "order": 0,
       "online": true,
       "offline": false
@@ -252,6 +174,7 @@
     {
       "component": "peerCalendarDashboardLink",
       "name": "peer-calendar-dashboard-link",
+      "slot": "homepage-dashboard-slot",
       "meta": {
         "name": "peer-calendar",
         "title": "Peer Calendar",
@@ -268,33 +191,25 @@
       "offline": false
     },
     {
-      "name": "deceased-panel-dashboard-link",
-      "component": "deceasedPanelDashboardLink",
+      "name": "special-clinics-dashboard-link",
+      "component": "specialClinicsDashboardLink",
       "slot": "patient-chart-dashboard-slot",
       "order": 15,
       "meta": {
         "columns": 1,
         "columnSpan": 1,
-        "slot": "patient-chart-deceased-panel-slot",
-        "path": "deceased-panel",
+        "slot": "patient-chart-special-clinics-slot",
+        "path": "special-clinics",
         "layoutMode": "anchored"
       }
     },
     {
-      "name": "deceased-details-tabs",
-      "slot": "patient-chart-deceased-panel-slot",
-      "component": "deceasedDetailsTabs",
+      "name": "special-clinics-dashboard",
+      "slot": "patient-chart-special-clinics-slot",
+      "component": "specialClinicsDashboard",
       "order": 0,
       "online": true,
       "offline": false
-    },
-    {
-      "name": "parto-graph-chart",
-      "slot": "patient-chart-labour-and-delivery-dashboard-slot",
-      "component": "partograph",
-      "meta": {
-        "fullWidth": true
-      }
     }
   ],
   "modals": [
@@ -312,6 +227,12 @@
     }
   ],
   "workspaces": [
+    {
+      "name": "contact-list-form",
+      "component": "contactListForm",
+      "title": "Contact List Form",
+      "type": "form"
+    },
     {
       "name": "case-management-form",
       "component": "caseManagementForm",

package/src/special-clinics/special-clinic.component.tsx

@@ -0,0 +1,53 @@
+import React, { useMemo, useState } from 'react';
+import { useConfig } from '@openmrs/esm-framework';
+import { ConfigObject } from '../config-schema';
+import GenericDashboard from '../specialized-clinics/generic-nav-links/generic-dashboard.component';
+import { Dropdown, Layer } from '@carbon/react';
+import { useTranslation } from 'react-i18next';
+import styles from './special-clinics.scss';
+
+type SpecialClinicDashboardProps = {
+  patientUuid: string;
+};
+
+type ClinicConfig = {
+  title: string;
+  encounterTypeUuid: string;
+  formUuid: string;
+};
+
+const SpecialClinicDashboard: React.FC<SpecialClinicDashboardProps> = ({ patientUuid }) => {
+  const { t } = useTranslation();
+  const { specialClinics } = useConfig<ConfigObject>();
+  const [selectedClinic, setSelectedClinic] = useState<ClinicConfig | null>(specialClinics[0]);
+
+  const sortedClinics = useMemo(() => specialClinics.sort((a, b) => a.title.localeCompare(b.title)), [specialClinics]);
+
+  return (
+    <Layer>
+      <div className={styles.dashboardContainer}>
+        <h4 className={styles.dashboardTitle}>{t('specialClinics', 'Special Clinics')}</h4>
+        <Dropdown
+          id="default"
+          itemToString={(item) => item?.title}
+          items={sortedClinics}
+          label={t('selectClinic', 'Select Clinic')}
+          hideLabel={true}
+          type="default"
+          className={styles.dropdown}
+          titleText={t('selectClinic', 'Select Clinic')}
+          warnText={t('selectClinic', 'Select Clinic')}
+          size="md"
+          initialSelectedItem={selectedClinic}
+          direction="bottom"
+          onChange={(data) => setSelectedClinic(data.selectedItem)}
+        />
+      </div>
+      <Layer level={0}>
+        <GenericDashboard patientUuid={patientUuid} clinicConfig={selectedClinic} />
+      </Layer>
+    </Layer>
+  );
+};
+
+export default SpecialClinicDashboard;

package/src/special-clinics/special-clinics.scss

@@ -0,0 +1,23 @@
+@use '@carbon/type';
+@use '@carbon/layout';
+@use '@carbon/colors';
+
+.dashboardContainer {
+  height: layout.$layout-04;
+  align-content: center;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  background-color: colors.$white;
+  margin-bottom: layout.$layout-01;
+  padding: layout.$layout-01;
+}
+
+.dashboardTitle {
+  @include type.type-style('heading-01');
+}
+
+.dropdown {
+  width: 23rem;
+}

package/src/specialized-clinics/generic-nav-links/generic-dashboard.component.tsx

@@ -9,37 +9,24 @@ import { DataTableSkeleton, Button } from '@carbon/react';
 import GenericTable from './generic-table.component';
 import { deleteEncounter } from '../../case-management/encounters/case-encounter-table.resource';
 
-type GenericDashboardProps = { patientUuid: string };
+type GenericDashboardProps = {
+  patientUuid: string;
+  clinicConfig: {
+    formUuid: string;
+    encounterTypeUuid: string;
+    title: string;
+  };
+};
 
-const GenericDashboard: React.FC<GenericDashboardProps> = ({ patientUuid }) => {
+const GenericDashboard: React.FC<GenericDashboardProps> = ({ patientUuid, clinicConfig }) => {
   const { t } = useTranslation();
-  const { specialClinics } = useConfig<ConfigObject>();
-  const [clinic, setClinic] = useState('');
-  const clinicInfo = specialClinics.find(({ id }) => id === clinic);
   const { encounters, isLoading, error, mutate } = useEncounters(
-    clinicInfo?.encounterTypeUuid,
-    clinicInfo?.formUuid,
+    clinicConfig.encounterTypeUuid,
+    clinicConfig.formUuid,
     patientUuid,
   );
 
-  useEffect(() => {
-    const handleURLChange = () => {
-      const urlParams = new URLSearchParams(window.location.search);
-      const clinicParam = urlParams.get('clinic');
-      if (clinicParam) {
-        setClinic(clinicParam);
-      }
-    };
-
-    // Call once on initial load
-    handleURLChange();
-    window.onpopstate = handleURLChange;
-    return () => {
-      window.onpopstate = null;
-    };
-  }, []);
-
-  const clinicalFormTitle = capitalize(clinic.replace('-', ' '));
+  const clinicalFormTitle = capitalize(clinicConfig.title.replace('-', ' '));
 
   const handleWorkspaceForm = () => {
     launchWorkspace('patient-form-entry-workspace', {
@@ -47,7 +34,7 @@ const GenericDashboard: React.FC<GenericDashboardProps> = ({ patientUuid }) => {
       mutateForm: mutate,
       formInfo: {
         encounterUuid: '',
-        formUuid: clinicInfo?.formUuid,
+        formUuid: clinicConfig.formUuid,
         additionalProps: {},
       },
     });
@@ -58,7 +45,7 @@ const GenericDashboard: React.FC<GenericDashboardProps> = ({ patientUuid }) => {
       mutateForm: mutate,
       formInfo: {
         encounterUuid: encounterUuid,
-        formUuid: clinicInfo?.formUuid,
+        formUuid: clinicConfig.formUuid,
         additionalProps: {},
       },
     });

package/src/specialized-clinics/generic-nav-links/useEncounters.tsx

@@ -9,10 +9,10 @@ export const useEncounters = (encounterUuid: string, formUuid: string, patientUu
     openmrsFetch,
   );
   const filteredByEncounterTypeUuid =
-    data?.data?.results.filter(
-      (encounter) => encounter.encounterType.uuid === encounterUuid && encounter.form.uuid === formUuid,
+    data?.data?.results?.filter(
+      (encounter) => encounter?.encounterType?.uuid === encounterUuid && encounter.form?.uuid === formUuid,
     ) ?? [];
-  return { encounters: filteredByEncounterTypeUuid, isLoading, isValidating, error, mutate };
+  return { encounters: filteredByEncounterTypeUuid ?? [], isLoading, isValidating, error, mutate };
 };
 
 export const genericTableHeader = [

package/src/specialized-clinics/hiv-care-and-treatment-services/hiv-care-and-treatment-dashboard.meta.tsx

@@ -1,24 +1,9 @@
-export const htsDashboardMeta = {
-  slot: 'patient-chart-hts-dashboard-slot',
+export const hivCareAndTreatmentDashboardMeta = {
+  slot: 'patient-chart-hiv-care-and-treatment-dashboard-slot',
   columns: 1,
-  title: 'HIV Testing Services',
-  path: 'hts-dashboard',
-  moduleName: '@kenyaemr/esm-patient-clinical-view-app',
-  icon: '',
-};
-export const defaulterTracingDashboardMeta = {
-  slot: 'patient-chart-defaulter-tracing-dashboard-slot',
-  columns: 1,
-  title: 'Defaulter Tracing',
-  path: 'defaulter-tracing-dashboard',
-  moduleName: '@kenyaemr/esm-patient-clinical-view-app',
-  icon: '',
-};
-
-export const hivCareAndTreatmentNavGroup = {
   title: 'HIV Care & Treatment',
-  slotName: 'hiv-care-and-treatment-slot',
-  isExpanded: false,
-  isChild: true,
-  showWhenExpression: "enrollment.includes('HIV')",
+  path: 'hiv-care-and-treatment-dashboard',
+  moduleName: '@kenyaemr/esm-patient-clinical-view-app',
+  icon: 'omrs-icon-programs',
+  showWhenExpression: 'patientEnrollments.filter(enrollment => enrollment.program.name === "HIV").length > 0',
 };

package/src/specialized-clinics/hiv-care-and-treatment-services/hiv-care-and-treatment.component.tsx

@@ -0,0 +1,38 @@
+import { Tabs, TabList, Tab, TabPanels, TabPanel, Layer, Checkbox, Button, TextInput } from '@carbon/react';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import DefaulterTracing from './defaulter-tracing/defaulter-tracing.component';
+import HivTestingEncountersList from './hiv-testing-services/views/hiv-testing/hiv-testing-services.component';
+import { ExtensionSlot } from '@openmrs/esm-framework';
+
+type HivCareAndTreatmentProps = {
+  patientUuid: string;
+};
+
+const HivCareAndTreatment = ({ patientUuid }: HivCareAndTreatmentProps) => {
+  const { t } = useTranslation();
+  return (
+    <Layer>
+      <Tabs>
+        <TabList contained>
+          <Tab>{t('defaulterTracing', 'Defaulter Tracing')}</Tab>
+          <Tab>{t('hts', 'HIV Testing Services')}</Tab>
+          <Tab>{t('hivPatientSummary', 'HIV Patient Summary')}</Tab>
+        </TabList>
+        <TabPanels>
+          <TabPanel>
+            <DefaulterTracing patientUuid={patientUuid} />
+          </TabPanel>
+          <TabPanel>
+            <HivTestingEncountersList patientUuid={patientUuid} />
+          </TabPanel>
+          <TabPanel>
+            <ExtensionSlot name="hiv-patient-summary-slot" state={{ patientUuid }} />
+          </TabPanel>
+        </TabPanels>
+      </Tabs>
+    </Layer>
+  );
+};
+
+export default HivCareAndTreatment;

package/src/ui/encounter-list/encounter-list.component.tsx

@@ -1,20 +1,11 @@
 import { ErrorState, isDesktop, navigate, useLayoutType, usePagination } from '@openmrs/esm-framework';
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import styles from './encounter-list.scss';
 import { OTable } from '../data-table/o-table.component';
-import {
-  Button,
-  Link,
-  OverflowMenu,
-  OverflowMenuItem,
-  Pagination,
-  DataTableSkeleton,
-  Layer,
-  Tile,
-} from '@carbon/react';
+import { Link, OverflowMenu, OverflowMenuItem, Pagination, DataTableSkeleton, Layer } from '@carbon/react';
 import { useEncounterRows } from '../../hooks/useEncounterRows';
-import { EmptyDataIllustration, EmptyState } from '@openmrs/esm-patient-common-lib';
+import { EmptyState } from '@openmrs/esm-patient-common-lib';
 import { OpenmrsEncounter } from '../../types';
 
 export interface O3FormSchema {

package/src/ui/encounter-list/encounter-list.scss

@@ -1,5 +1,4 @@
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/styles/scss/type';
+@use '@carbon/layout';
 @use '@carbon/colors';
 @use '@openmrs/esm-styleguide/src/vars' as *;
 @use '../../root.scss';
@@ -14,7 +13,7 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding: spacing.$spacing-04 0 spacing.$spacing-04 spacing.$spacing-05;
+  padding: layout.$spacing-04 0 layout.$spacing-04 layout.$spacing-05;
 }
 
 .widgetHeaderContainer > h4:after {
@@ -49,10 +48,10 @@
 .content {
   @extend .productiveHeading01;
   color: $text-02;
-  margin-top: spacing.$spacing-05;
-  margin-bottom: spacing.$spacing-03;
+  margin-top: layout.$spacing-05;
+  margin-bottom: layout.$spacing-03;
 }
 
 .errorContainer {
-  margin: spacing.$spacing-05;
+  margin: layout.$spacing-05;
 }

package/translations/am.json

@@ -34,15 +34,14 @@
   "chronicDisease": "ሥር የሰደደ በሽታ",
   "clientEligibility": "ብቁ",
   "clinicalEncounter": "ክሊኒካዊ ግኝት",
-  "clinicalViews": "በዚህ ክፍል ውስጥ ለታካሚዎች ሁኔታ እና ለተመዘገቡ የእንክብካቤ ፕሮግራሞች የተበጁ ክሊኒካዊ እይታዎችን ያገኛሉ።",
   "completed": "ተጠናቋል",
   "completedDocumentations": "የተጠናቀቀ ሰነድ",
   "contact": "እውቂያ",
   "contactCreated": "እውቂያ ተፈጥሯል",
   "contacted": "ተገናኝቷል",
+  "contactList": "የእውቂያ ዝርዝር",
   "contactTracingForm": "የእውቂያ ፍለጋ ቅጽ",
   "contactType": "የእውቂያ አይነት",
-  "customViews": "በዚህ ክፍል ውስጥ ለታካሚዎች ሁኔታ እና ለተመዘገቡ የእንክብካቤ ፕሮግራሞች የተበጁ ክሊኒካዊ እይታዎችን ያገኛሉ።",
   "date": "ቀን",
   "dateDate": "ቀን እና ሰዓት",
   "dateOfDelivery": "የወሊድ ቀን",
@@ -93,8 +92,10 @@
   "followUpDate": "ቀጣይ የክትትል ቀን",
   "formName": "የቅጽ ስም",
   "gestationalSize": "የእርግዝና መጠን",
+  "hivPatientSummary": "የኤችአይቪ ታካሚ ማጠቃለያ",
   "hivStatus": "የኤችአይቪ ሁኔታ",
   "hivTestResults": "የኤችአይቪ ሁኔታ",
+  "hts": "የኤችአይቪ ምርመራ አገልግሎቶች",
   "htsClinicalView": "HTS ክሊኒካዊ እይታ",
   "htsInitial": "HTS የመጀመሪያ ምርመራ",
   "htsResult": "የመጨረሻ ውጤት",
@@ -111,6 +112,7 @@
   "labourAndDelivery": "ምጥ እና ወሊድ",
   "listingDate": "የመዘገብ ቀን",
   "livingWithClient": "ከታካሚው ጋር የሚኖሩ",
+  "loading": "በመጫን ላይ...",
   "managePeers": "እኩያዎችን አስተዳድር",
   "maternalCondition": "የእናት ሁኔታ",
   "maternalSummary": "የእናት ማጠቃለያ",
@@ -162,11 +164,13 @@
   "reportingYear": "ዓመት",
   "save": "አስቀምጥ",
   "savedRelationship": "ግንኙነት በተሳካ ሁኔታ ተቋርጧል",
+  "selectClinic": "ክሊኒክ ምረጥ",
   "sex": "ፆታ",
   "sexualAssault": "3.እሱ/እሷ sexually ምቾት ያልተሰማሽን/ያልተሰማህን ነገር እንድታደርጊ/እንድታደርግ አስገድዶሽ/አስገድዶሃል?",
   "smoking": "ማጨስ",
   "smokingDuration": "የማጨስ ጊዜ",
   "socialHistory": "ማህበራዊ ታሪክ",
+  "specialClinics": "ልዩ ክሊኒኮች",
   "status": "ሁኔታ",
   "statusAtDischarge": "በመልቀቂያ ጊዜ ሁኔታ",
   "successfullyDeleted": "በተሳካ ሁኔታ ተሰርዟል",