Refactor ohri dashboard welcome component to support custom title

UCSF-IGHS · Sep 25, 2023 · 49f45da · 49f45da
1 parent 8223d59
commit 49f45da
Show file tree

Hide file tree

Showing 4 changed files with 3,614 additions and 3,815 deletions.
diff --git a/...s/esm-hiv-app/src/views/hts/care-and-treatment/lab-results/Tabs/cd4-results.component.tsx b/...s/esm-hiv-app/src/views/hts/care-and-treatment/lab-results/Tabs/cd4-results.component.tsx
@@ -15,15 +15,11 @@ import { capitalize } from 'lodash-es';
 import { Link, BrowserRouter as Router } from 'react-router-dom';
 import { LabresultsFormViewer } from '../lab-results-form-viewer';
 
-interface CD4ResultsListProps {
-  patientUuid: string;
-}
-
 export const filterPatientsByName = (searchTerm: string, patients: Array<any>) => {
   return patients.filter((patient) => patient.patientSearchName.toLowerCase().includes(searchTerm.toLowerCase()));
 };
 
-const CD4ResultsList: React.FC<CD4ResultsListProps> = ({ patientUuid }) => {
+const CD4ResultsList = () => {
   const { t } = useTranslation();
   const [patients, setPatients] = useState([]);
   const [patientToCd4Map, setPatientToCd4Map] = useState([]);

diff --git a/...iv-app/src/views/hts/care-and-treatment/lab-results/Tabs/viral-load-results.component.tsx b/...iv-app/src/views/hts/care-and-treatment/lab-results/Tabs/viral-load-results.component.tsx
@@ -1,5 +1,4 @@
 import React, { useEffect, useState, useMemo, useCallback } from 'react';
-
 import styles from './patient-list.scss';
 import { useTranslation } from 'react-i18next';
 import { age, navigate, openmrsFetch } from '@openmrs/esm-framework';
@@ -11,7 +10,6 @@ import {
   fetchPatientList,
   encounterRepresentation,
   getObsFromEncounter,
-  fetchLastVisit,
 } from '@ohri/openmrs-esm-ohri-commons-lib';
 import {
   ViralLoadResultDate_UUID,
@@ -22,11 +20,7 @@ import { Link, BrowserRouter as Router } from 'react-router-dom';
 import { filterPatientsByName } from './cd4-results.component';
 import { LabresultsFormViewer } from '../lab-results-form-viewer';
 
-interface ViralLoadResultsListProps {
-  patientUuid: string;
-}
-
-const ViralLoadResultsList: React.FC<ViralLoadResultsListProps> = () => {
+const ViralLoadResultsList = () => {
   const { t } = useTranslation();
   const [patients, setPatients] = useState([]);
   const [patientToViralLoadMap, setPatientToViralLoadMap] = useState([]);

diff --git a/...sm-hiv-app/src/views/hts/care-and-treatment/lab-results/lab-results-summary.component.tsx b/...sm-hiv-app/src/views/hts/care-and-treatment/lab-results/lab-results-summary.component.tsx
@@ -5,11 +5,7 @@ import CD4ResultsList from './Tabs/cd4-results.component';
 import ViralLoadResultsList from './Tabs/viral-load-results.component';
 import { useTranslation } from 'react-i18next';
 
-interface OverviewListProps {
-  patientUuid: string;
-}
-
-const LabResultsSummary: React.FC<OverviewListProps> = ({ patientUuid }) => {
+const LabResultsSummary = () => {
   const { t } = useTranslation();
   return (
     <Tabs type="container" className={styles.tabContainer}>
@@ -19,10 +15,10 @@ const LabResultsSummary: React.FC<OverviewListProps> = ({ patientUuid }) => {
       </TabList>
       <TabPanels>
         <TabPanel>
-          <CD4ResultsList patientUuid={patientUuid} />
+          <CD4ResultsList />
         </TabPanel>
         <TabPanel>
-          <ViralLoadResultsList patientUuid={patientUuid} />
+          <ViralLoadResultsList />
         </TabPanel>
       </TabPanels>
     </Tabs>