diff --git a/packages/esm-patient-labs-app/src/test-results/filter/filter-set.component.tsx b/packages/esm-patient-labs-app/src/test-results/filter/filter-set.component.tsx index c8d992ea46..62e9c693ca 100644 --- a/packages/esm-patient-labs-app/src/test-results/filter/filter-set.component.tsx +++ b/packages/esm-patient-labs-app/src/test-results/filter/filter-set.component.tsx @@ -1,6 +1,6 @@ import React, { useContext, useState, useEffect } from 'react'; import { useTranslation } from 'react-i18next'; -import { Accordion, AccordionItem, Button, Checkbox, Search } from '@carbon/react'; +import { Accordion, AccordionItem, Button, Checkbox } from '@carbon/react'; import { useConfig, useLayoutType } from '@openmrs/esm-framework'; import type { FilterNodeProps, FilterLeafProps } from './filter-types'; import { FilterEmptyState } from '../ui-elements/resetFiltersEmptyState/filter-empty-state.component'; diff --git a/packages/esm-patient-labs-app/src/test-results/filter/filter-set.styles.scss b/packages/esm-patient-labs-app/src/test-results/filter/filter-set.styles.scss index 6a282d32ba..05a74f2314 100644 --- a/packages/esm-patient-labs-app/src/test-results/filter/filter-set.styles.scss +++ b/packages/esm-patient-labs-app/src/test-results/filter/filter-set.styles.scss @@ -64,6 +64,7 @@ .cds--accordion__item--active>.cds--accordion__content { display: block; + padding-right: spacing.$spacing-05 } .cds--accordion__title { diff --git a/packages/esm-patient-labs-app/src/test-results/results-viewer/results-viewer.extension.tsx b/packages/esm-patient-labs-app/src/test-results/results-viewer/results-viewer.extension.tsx index 30bbf14d8d..fde4e3dc5d 100644 --- a/packages/esm-patient-labs-app/src/test-results/results-viewer/results-viewer.extension.tsx +++ b/packages/esm-patient-labs-app/src/test-results/results-viewer/results-viewer.extension.tsx @@ -61,7 +61,7 @@ const ResultsViewer: React.FC = ({ patientUuid, basePath, lo const isTablet = useLayoutType() === 'tablet'; const [view, setView] = useState('split'); const [selectedSection, setSelectedSection] = useState('tree'); - const { totalResultsCount } = useContext(FilterContext); + const { totalResultsCount, resetTree } = useContext(FilterContext); const { type, testUuid } = useParams(); const isExpanded = view === 'full'; const trendlineView = testUuid && type === 'trendline'; @@ -130,7 +130,7 @@ const ResultsViewer: React.FC = ({ patientUuid, basePath, lo className={styles.button} kind="ghost" size={isTablet ? 'md' : 'sm'} - onClick={''} //TO-DO (undo selections fix) + onClick={resetTree} //TO-DO (undo selections fix) > {t('reset', 'Reset')} diff --git a/packages/esm-patient-labs-app/src/test-results/results-viewer/results-viewer.styles.scss b/packages/esm-patient-labs-app/src/test-results/results-viewer/results-viewer.styles.scss index f32adac85f..857fe23272 100644 --- a/packages/esm-patient-labs-app/src/test-results/results-viewer/results-viewer.styles.scss +++ b/packages/esm-patient-labs-app/src/test-results/results-viewer/results-viewer.styles.scss @@ -45,7 +45,6 @@ } .leftSection { - //determine appropriate way to tackle div sizing for the two containers on the homepage and handle the spacing on the side width: 300px; margin-right: layout.$spacing-05; } @@ -68,7 +67,6 @@ } .leftHeaderActions { - // leftHeaderActions class apply also on tablet mode, cleanup after display: flex; min-width: 2.5rem; } @@ -97,7 +95,6 @@ } .filterSetHeader { - //deprecated display: flex; justify-content: space-between; align-items: center;