more clean ups

openmrs · Sep 4, 2024 · e5f4e59 · e5f4e59
1 parent 5ff352a
commit e5f4e59
Show file tree

Hide file tree

Showing 8 changed files with 96 additions and 324 deletions.
diff --git a/...ges/esm-patient-chart-app/src/clinical-views/components/encounter-list-tabs.component.tsx b/...ges/esm-patient-chart-app/src/clinical-views/components/encounter-list-tabs.component.tsx
@@ -15,7 +15,7 @@ const EncounterListTabsComponent: React.FC<EncounterListTabsComponentProps> = ({
   const { tabDefinitions = [] } = config;
 
   const tabsConfig = getMenuItemTabsConfiguration(tabDefinitions);
-  const filter = (encounter, name) => false;
+  const filter = (encounter, formUuid) => encounter?.form?.uuid === formUuid;
 
   return (
     <div className={styles.tabContainer}>
@@ -29,7 +29,7 @@ const EncounterListTabsComponent: React.FC<EncounterListTabsComponentProps> = ({
           {tabsConfig.map((tab) => (
             <TabPanel key={tab.name}>
               <EncounterList
-                filter={tab.hasFilter ? (encounter) => filter(encounter, tab.launchOptions[0].label) : null}
+                filter={tab.hasFilter ? (encounter) => filter(encounter, tab.formList[0].uuid) : null}
                 patientUuid={patientUuid}
                 formList={tab.formList}
                 columns={tab.columns}

diff --git a/packages/esm-patient-chart-app/src/encounter-list/components/empty-illustration.tsx b/packages/esm-patient-chart-app/src/encounter-list/components/empty-illustration.tsx
diff --git a/packages/esm-patient-chart-app/src/encounter-list/components/empty-state.component.tsx b/packages/esm-patient-chart-app/src/encounter-list/components/empty-state.component.tsx
diff --git a/packages/esm-patient-chart-app/src/encounter-list/components/empty-state.scss b/packages/esm-patient-chart-app/src/encounter-list/components/empty-state.scss