From 737e8cf07cb934eba9f7bbb3607e428c2d28930c Mon Sep 17 00:00:00 2001
From: henry-tp <henry.liang@tidepool.org>
Date: Mon, 17 Aug 2026 17:01:37 -0700
Subject: [PATCH 01/23] WEB-4460 initialize base branch


From a8836e24d982564cc9c7a00a254498eff041a3f4 Mon Sep 17 00:00:00 2001
From: henry-tp <henry.liang@tidepool.org>
Date: Mon, 17 Aug 2026 15:32:42 -0700
Subject: [PATCH 02/23] WEB-4460 add new adapter components to dashboard

---
 .../TideDashboardV2/AppliedFiltersList.js     | 81 +++++++++++++++++++
 .../TideDashboardV2/FilterByDataRecency.js    | 33 ++++++++
 .../TideDashboardV2/FilterBySites.js          | 19 +++++
 .../TideDashboardV2/FilterBySummaryPeriod.js  | 25 ++++++
 .../TideDashboardV2/FilterByTags.js           | 19 +++++
 .../TideDashboardV2/TideDashboardV2.js        | 19 ++++-
 .../components/ActiveFiltersTray.js           | 37 +++++----
 7 files changed, 216 insertions(+), 17 deletions(-)
 create mode 100644 app/pages/clinicworkspace/TideDashboardV2/AppliedFiltersList.js
 create mode 100644 app/pages/clinicworkspace/TideDashboardV2/FilterByDataRecency.js
 create mode 100644 app/pages/clinicworkspace/TideDashboardV2/FilterBySites.js
 create mode 100644 app/pages/clinicworkspace/TideDashboardV2/FilterBySummaryPeriod.js
 create mode 100644 app/pages/clinicworkspace/TideDashboardV2/FilterByTags.js

diff --git a/app/pages/clinicworkspace/TideDashboardV2/AppliedFiltersList.js b/app/pages/clinicworkspace/TideDashboardV2/AppliedFiltersList.js
new file mode 100644
index 0000000000..3709028afc
--- /dev/null
+++ b/app/pages/clinicworkspace/TideDashboardV2/AppliedFiltersList.js
@@ -0,0 +1,81 @@
+import React from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import PropTypes from 'prop-types';
+import without from 'lodash/without';
+import noop from 'lodash/noop';
+
+import ActiveFiltersTray from '../components/ActiveFiltersTray';
+import ClearFilterButtons, { PATIENT_QUERY_STATE } from '../components/ClearFilterButtons';
+import { Box } from 'theme-ui';
+import { setClinicSitesFilter, setPatientTagsFilter } from './tideDashboardFiltersSlice';
+import { setOffset } from './tideDashboardSlice';
+
+export const getPatientQueryState = (patientTags, clinicSites) => {
+  const hasFiltersActive = clinicSites?.length > 0 || patientTags?.length > 0;
+
+  if (hasFiltersActive) return PATIENT_QUERY_STATE.FILTER_ONLY;
+
+  return PATIENT_QUERY_STATE.NONE;
+};
+
+const AppliedFiltersList = ({ patientCount = 0 }) => {
+  const dispatch = useDispatch();
+
+  const { lastData, clinicSites, patientTags } = useSelector(state => state.blip.tideDashboardFilters);
+
+  const activeFilters = {
+    lastDataType: 'cgm',
+    lastData,
+    clinicSites,
+    patientTags,
+  };
+
+  const handleResetFilters = () => {
+    dispatch(setPatientTagsFilter([]));
+    dispatch(setClinicSitesFilter([]));
+    dispatch(setOffset(0));
+  };
+
+  const handleRemoveFilter = (filterKey, value) => {
+    switch (filterKey) {
+      case 'patientTags':
+        const updatedTags = without(patientTags, value);
+        dispatch(setPatientTagsFilter(updatedTags));
+        dispatch(setOffset(0));
+        break;
+
+      case 'clinicSites':
+        const updatedSites = without(clinicSites, value);
+        dispatch(setClinicSitesFilter(updatedSites));
+        dispatch(setOffset(0));
+        break;
+    }
+  };
+
+  const patientQueryState = getPatientQueryState(patientTags, clinicSites);
+
+  return (
+    <ActiveFiltersTray
+      patientCount={patientCount}
+      hasSearchActive={false} // No patient search in TIDE Dashboard
+      filters={activeFilters}
+      requiredFilters={['lastData']}
+      onRemoveFilter={handleRemoveFilter}
+      rightContent={
+        <Box sx={{ fontSize: 0 }}>
+          <ClearFilterButtons
+            patientQueryState={patientQueryState}
+            onClearSearch={noop}
+            onResetFilters={handleResetFilters}
+          />
+        </Box>
+      }
+    />
+  );
+};
+
+AppliedFiltersList.propTypes = {
+  patientCount: PropTypes.number,
+};
+
+export default AppliedFiltersList;
diff --git a/app/pages/clinicworkspace/TideDashboardV2/FilterByDataRecency.js b/app/pages/clinicworkspace/TideDashboardV2/FilterByDataRecency.js
new file mode 100644
index 0000000000..843092e8e7
--- /dev/null
+++ b/app/pages/clinicworkspace/TideDashboardV2/FilterByDataRecency.js
@@ -0,0 +1,33 @@
+import React from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { setOffset } from './tideDashboardSlice';
+import { setLastDataFilter } from './tideDashboardFiltersSlice';
+
+import { lastDataFilterOptions } from '../../../core/clinicUtils';
+
+import DataRecencyFilterDropdown from '../components/DataRecencyFilterDropdown';
+
+const FilterByDataRecency = () => {
+  const dispatch = useDispatch();
+  const { lastData } = useSelector(state => state.blip.tideDashboardFilters);
+
+  const handleChange = ({ lastData }) => {
+    dispatch(setLastDataFilter(lastData));
+    dispatch(setOffset(0));
+  };
+
+  const customLastDataFilterOptions = lastDataFilterOptions.filter(opt => [1, 2, 7].includes(opt.value));
+
+  return (
+    <DataRecencyFilterDropdown
+      onChange={handleChange}
+      lastData={lastData}
+      lastDataType="cgm" // Fixed to 'cgm' for TIDE Dashboard
+      filterOptions={customLastDataFilterOptions}
+      canSelectLastDataType={false}
+      canClearSelection={false}
+    />
+  );
+};
+
+export default FilterByDataRecency;
diff --git a/app/pages/clinicworkspace/TideDashboardV2/FilterBySites.js b/app/pages/clinicworkspace/TideDashboardV2/FilterBySites.js
new file mode 100644
index 0000000000..8849379403
--- /dev/null
+++ b/app/pages/clinicworkspace/TideDashboardV2/FilterBySites.js
@@ -0,0 +1,19 @@
+import React from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { setOffset } from './tideDashboardSlice';
+import { setClinicSitesFilter } from './tideDashboardFiltersSlice';
+import SiteFilterDropdown from '../components/SiteFilterDropdown';
+
+const FilterBySites = () => {
+  const dispatch = useDispatch();
+  const { clinicSites } = useSelector(state => state.blip.tideDashboardFilters);
+
+  const handleChange = (clinicSites) => {
+    dispatch(setClinicSitesFilter(clinicSites));
+    dispatch(setOffset(0));
+  };
+
+  return <SiteFilterDropdown onChange={handleChange} clinicSites={clinicSites} />;
+};
+
+export default FilterBySites;
diff --git a/app/pages/clinicworkspace/TideDashboardV2/FilterBySummaryPeriod.js b/app/pages/clinicworkspace/TideDashboardV2/FilterBySummaryPeriod.js
new file mode 100644
index 0000000000..569a1449c1
--- /dev/null
+++ b/app/pages/clinicworkspace/TideDashboardV2/FilterBySummaryPeriod.js
@@ -0,0 +1,25 @@
+import React from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+
+import SummaryPeriodFilterDropdown from '../components/SummaryPeriodFilterDropdown';
+import { setSummaryPeriodFilter } from './tideDashboardFiltersSlice';
+import { setOffset } from './tideDashboardSlice';
+
+const FilterBySummaryPeriod = () => {
+  const dispatch = useDispatch();
+  const { summaryPeriod } = useSelector(state => state.blip.tideDashboardFilters);
+
+  const handleChange = (summaryPeriod) => {
+    dispatch(setSummaryPeriodFilter(summaryPeriod));
+    dispatch(setOffset(0));
+  };
+
+  return (
+    <SummaryPeriodFilterDropdown
+      onChange={handleChange}
+      activeSummaryPeriod={summaryPeriod}
+    />
+  );
+};
+
+export default FilterBySummaryPeriod;
diff --git a/app/pages/clinicworkspace/TideDashboardV2/FilterByTags.js b/app/pages/clinicworkspace/TideDashboardV2/FilterByTags.js
new file mode 100644
index 0000000000..eeb5f84f79
--- /dev/null
+++ b/app/pages/clinicworkspace/TideDashboardV2/FilterByTags.js
@@ -0,0 +1,19 @@
+import React from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { setOffset } from './tideDashboardSlice';
+import { setPatientTagsFilter } from './tideDashboardFiltersSlice';
+import TagFilterDropdown from '../components/TagFilterDropdown';
+
+const FilterByTags = () => {
+  const dispatch = useDispatch();
+  const { patientTags } = useSelector(state => state.blip.tideDashboardFilters);
+
+  const handleChange = (tags) => {
+    dispatch(setPatientTagsFilter(tags));
+    dispatch(setOffset(0));
+  };
+
+  return <TagFilterDropdown onChange={handleChange} patientTags={patientTags} />;
+};
+
+export default FilterByTags;
diff --git a/app/pages/clinicworkspace/TideDashboardV2/TideDashboardV2.js b/app/pages/clinicworkspace/TideDashboardV2/TideDashboardV2.js
index 445203ca88..ca6cd56075 100644
--- a/app/pages/clinicworkspace/TideDashboardV2/TideDashboardV2.js
+++ b/app/pages/clinicworkspace/TideDashboardV2/TideDashboardV2.js
@@ -1,9 +1,12 @@
 import React, { useMemo } from 'react';
 import { useSelector } from 'react-redux';
 import Table from '../../../components/elements/Table';
-import { Flex } from 'theme-ui';
+import { Flex, Text, Box } from 'theme-ui';
 
 import FilterByCategory from './FilterByCategory';
+import FilterByTags from './FilterByTags';
+import FilterByDataRecency from './FilterByDataRecency';
+import FilterBySummaryPeriod from './FilterBySummaryPeriod';
 
 import TableCategoryHeader from './TableCategoryHeader';
 import PaginationController from './PaginationController';
@@ -13,6 +16,10 @@ import useTableColumns from './useTableColumns';
 import EmptyContentNode from './EmptyContentNode';
 import { Redirect, useLocation } from 'react-router-dom';
 import useAuthorizationGate from './useAuthorizationGate';
+import FilterBySites from './FilterBySites';
+import AppliedFiltersList from './AppliedFiltersList';
+
+const Gap = () => <Box sx={{ marginLeft: 'auto' }}></Box>;
 
 const tableContainerProps = { sx: { containerType: 'inline-size' } };
 
@@ -41,11 +48,21 @@ const TideDashboardV2 = () => {
 
   return (
     <>
+      <Flex id="tide-dashboard-filters" mb={3} sx={{ gap: 2, alignItems: 'center', flexWrap: 'wrap' }}>
+        <Text sx={{ fontSize: 0, color: 'grays.4' }}>{t('Filter By')}</Text>
+        <FilterByTags />
+        <FilterBySites />
+        <FilterByDataRecency />
+        <Gap />
+        <FilterBySummaryPeriod />
+      </Flex>
+
       <Flex mb={3} sx={{ justifyContent: 'center' }}>
         <FilterByCategory />
       </Flex>
 
       <TableCategoryHeader category={resolvedCategory} />
+      <AppliedFiltersList patientCount={total} />
       <Table
         id="tideDashboardPatientsTable"
         variant="condensed"
diff --git a/app/pages/clinicworkspace/components/ActiveFiltersTray.js b/app/pages/clinicworkspace/components/ActiveFiltersTray.js
index d8e6596fa3..69c8f580f5 100644
--- a/app/pages/clinicworkspace/components/ActiveFiltersTray.js
+++ b/app/pages/clinicworkspace/components/ActiveFiltersTray.js
@@ -18,7 +18,7 @@ import utils from '../../../core/utils';
 import { transitions } from '../../../themes/baseTheme';
 import { SPECIAL_FILTER_STATES } from '../useClinicPatientsFilters';
 
-const usePrimaryChips = (activeFilters) => {
+const usePrimaryChips = (activeFilters, requiredFilters) => {
   const { t } = useTranslation();
   const { lastData, lastDataType, timeCGMUsePercent, timeInRange = [] } = activeFilters;
 
@@ -47,6 +47,7 @@ const usePrimaryChips = (activeFilters) => {
       type: 'lastData',
       value: `${lastDataType}-${lastData}`,
       label: getLastDataChipLabel(lastDataType, lastData),
+      required: requiredFilters?.includes('lastData') || false,
     }),
 
     // CGM Wear Time Filter
@@ -111,8 +112,9 @@ const useSiteChips = (clinicSites = []) => {
     .toSorted((a, b) => utils.compareLabels(a.label, b.label));
 };
 
-const Chip = ({ label, onRemove }) => {
+const Chip = ({ label, onRemove, required = false }) => {
   const { t } = useTranslation();
+  const hasRemoveIcon = !required;
 
   return (
     <Flex
@@ -125,10 +127,10 @@ const Chip = ({ label, onRemove }) => {
         fontWeight: 'normal',
         cursor: 'default',
         ml: 1,
-        '&:hover': {
+        '&:hover': hasRemoveIcon ? {
           color: vizColors.blue80,
           fontWeight: 'medium',
-        },
+        } : {},
         '.remove-filter-icon': {
           fontSize: '14px',
           padding: '2px',
@@ -154,12 +156,14 @@ const Chip = ({ label, onRemove }) => {
         {label}
       </Text>
 
-      <Icon
-        className="remove-filter-icon"
-        icon={CloseRoundedIcon}
-        label={t('Remove {{ label }} filter', { label })}
-        onClick={onRemove}
-      />
+      { hasRemoveIcon &&
+        <Icon
+          className="remove-filter-icon"
+          icon={CloseRoundedIcon}
+          label={t('Remove {{ label }} filter', { label })}
+          onClick={onRemove}
+        />
+      }
     </Flex>
   );
 };
@@ -175,6 +179,7 @@ const ChipGroup = ({ prefix, chips, onRemove }) => {
         <Chip
           key={`${chip.type}-${chip.value || 'filter'}`}
           label={chip.label}
+          required={chip.required}
           onRemove={() => onRemove(chip)}
         />
       ))}
@@ -183,23 +188,22 @@ const ChipGroup = ({ prefix, chips, onRemove }) => {
 };
 
 const ActiveFiltersTray = ({
+  patientCount = 0,
   filters = {},
+  requiredFilters = [],
   hasSearchActive = false,
   onRemoveFilter = noop,
   rightContent = null,
 }) => {
   const { t } = useTranslation();
-  const selectedClinicId = useSelector(state => state.blip.selectedClinicId);
-  const clinic = useSelector(state => state.blip.clinics?.[selectedClinicId]);
-
-  const primaryChips = usePrimaryChips(filters);
+  const primaryChips = usePrimaryChips(filters, requiredFilters);
   const tagChips = useTagChips(filters.patientTags);
   const siteChips = useSiteChips(filters.clinicSites);
 
-  const count = clinic?.fetchedPatientCount || 0;
-
   const handleRemoveChip = chip => onRemoveFilter(chip.type, chip.value);
 
+  const count = patientCount;
+
   return (
     <Flex
       id="clinic-patients-active-filters"
@@ -267,6 +271,7 @@ const ActiveFiltersTray = ({
 };
 
 ActiveFiltersTray.propTypes = {
+  patientCount: PropTypes.number,
   filters: PropTypes.shape({
     lastData: PropTypes.number,
     lastDataType: PropTypes.oneOf(['bgm', 'cgm']),

From 6fd806b66761042cdf425fedfdeff400305053be Mon Sep 17 00:00:00 2001
From: henry-tp <henry.liang@tidepool.org>
Date: Mon, 17 Aug 2026 15:33:30 -0700
Subject: [PATCH 03/23] WEB-4460 remove DataRecencyType from Data Recency
 dropdown via prop

---
 .../components/DataRecencyFilterDropdown.js   | 61 +++++++++++--------
 1 file changed, 37 insertions(+), 24 deletions(-)

diff --git a/app/pages/clinicworkspace/components/DataRecencyFilterDropdown.js b/app/pages/clinicworkspace/components/DataRecencyFilterDropdown.js
index a1c306ee61..36a7297aff 100644
--- a/app/pages/clinicworkspace/components/DataRecencyFilterDropdown.js
+++ b/app/pages/clinicworkspace/components/DataRecencyFilterDropdown.js
@@ -18,6 +18,8 @@ import { lastDataFilterOptions } from '../../../core/clinicUtils';
 import useClinicMetricsPageName from '../useClinicMetricsPageName';
 
 const DropdownContent = ({
+  canSelectLastDataType,
+  canClearSelection,
   onClose,
   onChange,
   lastData,
@@ -40,25 +42,29 @@ const DropdownContent = ({
   return (
     <Box data-testid="data-recency-filter-dropdown" mt={5} mx={2} sx={{ width: 300 }}>
       <Box>
-        <Box mb={2}>
-          <Box sx={{ padding: 1, color: vizColors.gray50, lineHeight: 1, fontSize: 1, fontWeight: 'medium' }}>
-            {t('Device Type')}
-          </Box>
-        </Box>
-
-        <Box sx={{ border: `1px solid ${vizColors.gray10}`, borderRadius: 6, padding: 2 }}>
-          <RadioGroup
-            id="last-upload-type"
-            name="last-upload-type"
-            options={lastDataTypeFilterOptions}
-            variant="vertical"
-            sx={{ fontSize: 0 }}
-            value={pending.lastDataType}
-            onChange={event => {
-              setPending({ ...pending, lastDataType: event.target.value || null });
-            }}
-          />
-        </Box>
+        {canSelectLastDataType &&
+          <>
+            <Box mb={2} sx={{ padding: 1, color: vizColors.gray50, lineHeight: 1 }}>
+              <Box sx={{ fontSize: 1, fontWeight: 'medium' }}>
+                {t('Device Type')}
+              </Box>
+            </Box>
+
+            <Box sx={{ border: `1px solid ${vizColors.gray10}`, borderRadius: 6, padding: 2 }}>
+              <RadioGroup
+                id="last-upload-type"
+                name="last-upload-type"
+                options={lastDataTypeFilterOptions}
+                variant="vertical"
+                sx={{ fontSize: 0 }}
+                value={pending.lastDataType}
+                onChange={event => {
+                  setPending({ ...pending, lastDataType: event.target.value || null });
+                }}
+              />
+            </Box>
+          </>
+        }
 
         <Box mt={3} mb={2} sx={{ padding: 1, color: vizColors.gray50, lineHeight: 1 }}>
           <Box sx={{ fontSize: 1, fontWeight: 'medium' }}>{t('Data Recency')}</Box>
@@ -82,17 +88,20 @@ const DropdownContent = ({
 
       <Grid sx={{ gridTemplateColumns: '1fr 1fr' }} mt={3} mb={2}>
         <Button
-          id="clear-last-upload-filter"
+          id={canClearSelection ? 'clear-last-upload-filter' : 'cancel-last-upload-filter'}
           sx={{ fontSize: 1 }}
           variant="secondary"
           onClick={() => {
-            trackMetric('Clinic - Last upload clear filter', { clinicId: selectedClinicId, pageName });
-            setPending({ lastData: null, lastDataType: null });
-            handleChange({ lastData: null, lastDataType: null });
+            if (canClearSelection) {
+              trackMetric('Clinic - Last upload clear filter', { clinicId: selectedClinicId, pageName });
+              setPending({ lastData: null, lastDataType: null });
+              handleChange({ lastData: null, lastDataType: null });
+            }
+
             onClose();
           }}
         >
-          {t('Clear')}
+          {canClearSelection ? t('Clear') : t('Cancel')}
         </Button>
 
         <Button
@@ -124,6 +133,8 @@ const DropdownContent = ({
 };
 
 const DataRecencyFilterDropdown = ({
+  canSelectLastDataType = true,
+  canClearSelection = true,
   onChange = noop,
   lastData = null,
   lastDataType = null,
@@ -175,6 +186,8 @@ const DataRecencyFilterDropdown = ({
       >
         { lastDataPopupFilterState.isOpen &&
           <DropdownContent
+            canSelectLastDataType={canSelectLastDataType}
+            canClearSelection={canClearSelection}
             lastData={lastData}
             lastDataType={lastDataType}
             filterOptions={filterOptions || lastDataFilterOptions}

From d3b9476deb86d23145af55075db5f82873eded35 Mon Sep 17 00:00:00 2001
From: henry-tp <henry.liang@tidepool.org>
Date: Thu, 20 Aug 2026 10:05:07 -0700
Subject: [PATCH 04/23] WEB-4460 add 14 day Data Recency option in TIDE

---
 .../clinicworkspace/TideDashboardV2/FilterByDataRecency.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/pages/clinicworkspace/TideDashboardV2/FilterByDataRecency.js b/app/pages/clinicworkspace/TideDashboardV2/FilterByDataRecency.js
index 843092e8e7..48ced003ae 100644
--- a/app/pages/clinicworkspace/TideDashboardV2/FilterByDataRecency.js
+++ b/app/pages/clinicworkspace/TideDashboardV2/FilterByDataRecency.js
@@ -16,7 +16,7 @@ const FilterByDataRecency = () => {
     dispatch(setOffset(0));
   };
 
-  const customLastDataFilterOptions = lastDataFilterOptions.filter(opt => [1, 2, 7].includes(opt.value));
+  const customLastDataFilterOptions = lastDataFilterOptions.filter(opt => [1, 2, 7, 14].includes(opt.value));
 
   return (
     <DataRecencyFilterDropdown

From 7d19686d8a50b1fd447dccb8c35501beb965b908 Mon Sep 17 00:00:00 2001
From: henry-tp <henry.liang@tidepool.org>
Date: Thu, 20 Aug 2026 10:21:52 -0700
Subject: [PATCH 05/23] WEB-4460 alter styling for non-removable filters

---
 .../TideDashboardV2/AppliedFiltersList.js       |  2 +-
 .../components/ActiveFiltersTray.js             | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/pages/clinicworkspace/TideDashboardV2/AppliedFiltersList.js b/app/pages/clinicworkspace/TideDashboardV2/AppliedFiltersList.js
index 3709028afc..29bd1a7ea0 100644
--- a/app/pages/clinicworkspace/TideDashboardV2/AppliedFiltersList.js
+++ b/app/pages/clinicworkspace/TideDashboardV2/AppliedFiltersList.js
@@ -59,7 +59,7 @@ const AppliedFiltersList = ({ patientCount = 0 }) => {
       patientCount={patientCount}
       hasSearchActive={false} // No patient search in TIDE Dashboard
       filters={activeFilters}
-      requiredFilters={['lastData']}
+      requiredFilters={{ lastData: true }}
       onRemoveFilter={handleRemoveFilter}
       rightContent={
         <Box sx={{ fontSize: 0 }}>
diff --git a/app/pages/clinicworkspace/components/ActiveFiltersTray.js b/app/pages/clinicworkspace/components/ActiveFiltersTray.js
index 69c8f580f5..2c0175f962 100644
--- a/app/pages/clinicworkspace/components/ActiveFiltersTray.js
+++ b/app/pages/clinicworkspace/components/ActiveFiltersTray.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { useSelector } from 'react-redux';
-import { useTranslation, withTranslation } from 'react-i18next';
-import { Flex, Text, Box } from 'theme-ui';
+import { useTranslation } from 'react-i18next';
+import { Flex, Text } from 'theme-ui';
 import { colors as vizColors } from '@tidepool/viz';
 
 import CloseRoundedIcon from '@material-ui/icons/CloseRounded';
@@ -47,7 +47,7 @@ const usePrimaryChips = (activeFilters, requiredFilters) => {
       type: 'lastData',
       value: `${lastDataType}-${lastData}`,
       label: getLastDataChipLabel(lastDataType, lastData),
-      required: requiredFilters?.includes('lastData') || false,
+      required: requiredFilters?.['lastData'] || false,
     }),
 
     // CGM Wear Time Filter
@@ -114,7 +114,7 @@ const useSiteChips = (clinicSites = []) => {
 
 const Chip = ({ label, onRemove, required = false }) => {
   const { t } = useTranslation();
-  const hasRemoveIcon = !required;
+  const canRemove = !required;
 
   return (
     <Flex
@@ -127,7 +127,7 @@ const Chip = ({ label, onRemove, required = false }) => {
         fontWeight: 'normal',
         cursor: 'default',
         ml: 1,
-        '&:hover': hasRemoveIcon ? {
+        '&:hover': canRemove ? {
           color: vizColors.blue80,
           fontWeight: 'medium',
         } : {},
@@ -152,11 +152,11 @@ const Chip = ({ label, onRemove, required = false }) => {
         },
       }}
     >
-      <Text sx={{ textDecoration: 'underline', whiteSpace: 'nowrap' }}>
+      <Text sx={{ textDecoration: canRemove ? 'underline' : 'none', whiteSpace: 'nowrap' }}>
         {label}
       </Text>
 
-      { hasRemoveIcon &&
+      { canRemove &&
         <Icon
           className="remove-filter-icon"
           icon={CloseRoundedIcon}
@@ -190,7 +190,7 @@ const ChipGroup = ({ prefix, chips, onRemove }) => {
 const ActiveFiltersTray = ({
   patientCount = 0,
   filters = {},
-  requiredFilters = [],
+  requiredFilters = {},
   hasSearchActive = false,
   onRemoveFilter = noop,
   rightContent = null,
@@ -272,6 +272,7 @@ const ActiveFiltersTray = ({
 
 ActiveFiltersTray.propTypes = {
   patientCount: PropTypes.number,
+  requiredFilters: PropTypes.object,
   filters: PropTypes.shape({
     lastData: PropTypes.number,
     lastDataType: PropTypes.oneOf(['bgm', 'cgm']),

From f6ddee5459ad87bcabbb8c435072cf1b80c25526 Mon Sep 17 00:00:00 2001
From: henry-tp <henry.liang@tidepool.org>
Date: Thu, 20 Aug 2026 14:20:53 -0700
Subject: [PATCH 06/23] WEB-4460 add TIDE to metric source

---
 app/pages/clinicworkspace/useClinicMetricsPageName.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/pages/clinicworkspace/useClinicMetricsPageName.js b/app/pages/clinicworkspace/useClinicMetricsPageName.js
index 43202e1340..377c799ac4 100644
--- a/app/pages/clinicworkspace/useClinicMetricsPageName.js
+++ b/app/pages/clinicworkspace/useClinicMetricsPageName.js
@@ -4,7 +4,13 @@ import { useLocation } from 'react-router-dom';
 const useClinicMetricsPageName = () => {
   const { pathname } = useLocation();
 
-  if (pathname.startsWith('/clinic-workspace')) return 'Population Health';
+  if (pathname.startsWith('/clinic-workspace/tide-dashboard')) {
+    return 'TIDE Dashboard';
+  }
+
+  if (pathname.startsWith('/clinic-workspace')) {
+    return 'Population Health';
+  }
 
   return 'Unknown';
 };

From 7fab8461d2ea52ba1441a48d1bfab607767fae58 Mon Sep 17 00:00:00 2001
From: henry-tp <henry.liang@tidepool.org>
Date: Thu, 20 Aug 2026 16:00:05 -0700
Subject: [PATCH 07/23] Revert "WEB-4460 delete work related to filter
 persistence to move it upstream"

This reverts commit 9c68578b4f53518182b106b0d7742691375dafe3.
---
 .../TideDashboardV2/EmptyContentNode.js       | 35 ++++++++++++++++++-
 .../TideDashboardV2/TideDashboardV2.js        |  6 ++++
 .../tideDashboardFiltersSlice.js              | 25 +++++++++++++
 .../useDerivedDataRecencyEndpoints.js         | 14 ++------
 .../TideDashboardV2/usePruneInvalidFilters.js | 35 +++++++++++++++++++
 .../useTideDashboardPatients.js               | 14 ++------
 app/redux/actions/async.js                    |  8 ++++-
 app/redux/reducers/index.js                   |  2 ++
 app/redux/store/configureStore.dev.js         | 15 +++++---
 app/redux/store/configureStore.prod.js        | 15 +++++---
 app/redux/store/localStorage.js               | 12 ++++---
 .../clinic/WorkspaceSwitcher.test.js          |  4 +++
 test/unit/pages/clinicdetails.test.js         |  1 +
 test/unit/pages/workspaces/workspaces.test.js |  2 ++
 test/unit/redux/actions/async.test.js         | 19 +++++++---
 test/unit/routes.test.js                      |  3 ++
 test/unit/utils/navutils.test.js              |  4 +++
 17 files changed, 173 insertions(+), 41 deletions(-)
 create mode 100644 app/pages/clinicworkspace/TideDashboardV2/tideDashboardFiltersSlice.js
 create mode 100644 app/pages/clinicworkspace/TideDashboardV2/usePruneInvalidFilters.js

diff --git a/app/pages/clinicworkspace/TideDashboardV2/EmptyContentNode.js b/app/pages/clinicworkspace/TideDashboardV2/EmptyContentNode.js
index 33c346efad..0c444d6b94 100644
--- a/app/pages/clinicworkspace/TideDashboardV2/EmptyContentNode.js
+++ b/app/pages/clinicworkspace/TideDashboardV2/EmptyContentNode.js
@@ -1,12 +1,37 @@
 import React from 'react';
+import { useSelector, useDispatch } from 'react-redux';
 import { useTranslation } from 'react-i18next';
 import colorPalette from '../../../themes/colorPalette';
 import { Flex, Text } from 'theme-ui';
+import { resetTideDashboardFilters } from './tideDashboardFiltersSlice';
+import { setOffset } from './tideDashboardSlice';
+import ClearFilterButtons, { PATIENT_QUERY_STATE } from '../components/ClearFilterButtons';
+import noop from 'lodash/noop';
+import without from 'lodash/without';
 
 const EmptyContentNode = () => {
   const { t } = useTranslation();
+  const dispatch = useDispatch();
 
-  const emptyContentCopy = t('There are no results to show');
+  const { patientTags, clinicSites } = useSelector(state => state.blip.tideDashboardFilters);
+
+  const activeFiltersCount = without([
+    patientTags?.length,
+    clinicSites?.length,
+  ], null, 0, undefined).length;
+
+  const hasActiveFilters = activeFiltersCount > 0;
+
+  const handleResetFilters = () => {
+    dispatch(resetTideDashboardFilters());
+    dispatch(setOffset(0));
+  };
+
+  const emptyContentCopy = hasActiveFilters
+    ? t('There are no patients with the current filter(s)')
+    : t('There are no results to show');
+
+  const patientQueryState = hasActiveFilters ? PATIENT_QUERY_STATE.FILTER_ONLY : PATIENT_QUERY_STATE.NONE;
 
   return (
     <Flex sx={{
@@ -22,6 +47,14 @@ const EmptyContentNode = () => {
       <Text className="table-empty-text" sx={{ fontWeight: 'medium' }}>
         {emptyContentCopy}
       </Text>
+
+      { hasActiveFilters &&
+        <ClearFilterButtons
+          patientQueryState={patientQueryState}
+          onResetFilters={handleResetFilters}
+          onClearSearch={noop}
+        />
+      }
     </Flex>
   );
 };
diff --git a/app/pages/clinicworkspace/TideDashboardV2/TideDashboardV2.js b/app/pages/clinicworkspace/TideDashboardV2/TideDashboardV2.js
index ca6cd56075..d61e99e93c 100644
--- a/app/pages/clinicworkspace/TideDashboardV2/TideDashboardV2.js
+++ b/app/pages/clinicworkspace/TideDashboardV2/TideDashboardV2.js
@@ -1,4 +1,5 @@
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 import { useSelector } from 'react-redux';
 import Table from '../../../components/elements/Table';
 import { Flex, Text, Box } from 'theme-ui';
@@ -12,6 +13,7 @@ import TableCategoryHeader from './TableCategoryHeader';
 import PaginationController from './PaginationController';
 
 import useTideDashboardPatients from './useTideDashboardPatients';
+import usePruneInvalidFilters from './usePruneInvalidFilters';
 import useTableColumns from './useTableColumns';
 import EmptyContentNode from './EmptyContentNode';
 import { Redirect, useLocation } from 'react-router-dom';
@@ -25,6 +27,10 @@ const tableContainerProps = { sx: { containerType: 'inline-size' } };
 
 const TideDashboardV2 = () => {
   const { search } = useLocation();
+  const { t } = useTranslation();
+
+  usePruneInvalidFilters();
+
   const category = useSelector(state => state.blip.tideDashboard.category);
 
   const { isAuthorized, isUnauthorized } = useAuthorizationGate();
diff --git a/app/pages/clinicworkspace/TideDashboardV2/tideDashboardFiltersSlice.js b/app/pages/clinicworkspace/TideDashboardV2/tideDashboardFiltersSlice.js
new file mode 100644
index 0000000000..e2ef7a0e62
--- /dev/null
+++ b/app/pages/clinicworkspace/TideDashboardV2/tideDashboardFiltersSlice.js
@@ -0,0 +1,25 @@
+import { createSlice } from '@reduxjs/toolkit';
+
+// IMPORTANT: This slice is automatically persisted between user sessions via localStorage.
+// If you don't want your state variable value persisted, use a different redux slice for it.
+
+const getInitialState = () => ({
+  lastData: 7,
+  patientTags: [],
+  clinicSites: [],
+  summaryPeriod: '14d',
+});
+
+const tideDashboardFiltersSlice = createSlice({
+  name: 'tideDashboardFilters',
+  initialState: getInitialState(),
+  reducers: {
+    setTideDashboardFilters: (_state, action) => action.payload || getInitialState(),
+  },
+});
+
+export const {
+  setTideDashboardFilters,
+} = tideDashboardFiltersSlice.actions;
+
+export default tideDashboardFiltersSlice.reducer;
diff --git a/app/pages/clinicworkspace/TideDashboardV2/useDerivedDataRecencyEndpoints.js b/app/pages/clinicworkspace/TideDashboardV2/useDerivedDataRecencyEndpoints.js
index 10693ffede..edb7c24656 100644
--- a/app/pages/clinicworkspace/TideDashboardV2/useDerivedDataRecencyEndpoints.js
+++ b/app/pages/clinicworkspace/TideDashboardV2/useDerivedDataRecencyEndpoints.js
@@ -4,18 +4,8 @@ import { useSelector } from 'react-redux';
 import { utils as vizUtils } from '@tidepool/viz';
 const { getLocalizedCeiling } = vizUtils.datetime;
 
-// TEMPORARY, will be set in redux
-const tideDashboardFilters = {
-  lastData: 7,
-  patientTags: [],
-  clinicSites: [],
-  summaryPeriod: '14d',
-};
-
-const useDerivedDataRecencyEndpoints = (
-  filters = tideDashboardFilters // TEMPORARY, will be set in redux
-) => {
-  const lastData = filters.lastData;
+const useDerivedDataRecencyEndpoints = () => {
+  const lastData = useSelector(state => state.blip.tideDashboardFilters.lastData);
   const timePrefs = useSelector((state) => state.blip.timePrefs);
 
   const lastDataTo = getLocalizedCeiling(new Date().toISOString(), timePrefs).toISOString();
diff --git a/app/pages/clinicworkspace/TideDashboardV2/usePruneInvalidFilters.js b/app/pages/clinicworkspace/TideDashboardV2/usePruneInvalidFilters.js
new file mode 100644
index 0000000000..33e20634a6
--- /dev/null
+++ b/app/pages/clinicworkspace/TideDashboardV2/usePruneInvalidFilters.js
@@ -0,0 +1,35 @@
+import { useEffect } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { setPatientTagsFilter, setClinicSitesFilter } from './tideDashboardFiltersSlice';
+import keyBy from 'lodash/keyBy';
+
+const usePruneInvalidFilters = () => {
+  const dispatch = useDispatch();
+  const selectedClinicId = useSelector(state => state.blip.selectedClinicId);
+  const clinic = useSelector(state => state.blip.clinics?.[selectedClinicId]);
+  const { patientTags, clinicSites } = useSelector(state => state.blip.tideDashboardFilters);
+
+  useEffect(() => {
+    if (!patientTags?.length || !clinic) return;
+
+    const availableTags = keyBy(clinic.patientTags || [], 'id');
+    const prunedTags = patientTags.filter(tagId => !!availableTags[tagId]);
+
+    if (prunedTags.length < patientTags.length) {
+      dispatch(setPatientTagsFilter(prunedTags));
+    }
+  }, []);
+
+  useEffect(() => {
+    if (!clinicSites?.length || !clinic) return;
+
+    const availableSites = keyBy(clinic.sites || [], 'id');
+    const prunedSites = clinicSites.filter(siteId => !!availableSites[siteId]);
+
+    if (prunedSites.length < clinicSites.length) {
+      dispatch(setClinicSitesFilter(prunedSites));
+    }
+  }, []);
+};
+
+export default usePruneInvalidFilters;
diff --git a/app/pages/clinicworkspace/TideDashboardV2/useTideDashboardPatients.js b/app/pages/clinicworkspace/TideDashboardV2/useTideDashboardPatients.js
index 63a10a9adb..c6454a6526 100644
--- a/app/pages/clinicworkspace/TideDashboardV2/useTideDashboardPatients.js
+++ b/app/pages/clinicworkspace/TideDashboardV2/useTideDashboardPatients.js
@@ -4,21 +4,13 @@ import useDerivedDataRecencyEndpoints from './useDerivedDataRecencyEndpoints';
 
 const LIMIT = 12;
 
-// TEMPORARY, will be set in redux
-const tideDashboardFilters = {
-  lastData: 7,
-  patientTags: [],
-  clinicSites: [],
-  summaryPeriod: '14d',
-};
-
 const useTideDashboardPatients = () => {
   const selectedClinicId = useSelector(state => state.blip.selectedClinicId);
   const category = useSelector(state => state.blip.tideDashboard.category);
   const offset = useSelector(state => state.blip.tideDashboard.offset);
-  const patientTags = tideDashboardFilters.patientTags;
-  const clinicSites = tideDashboardFilters.clinicSites;
-  const summaryPeriod = tideDashboardFilters.summaryPeriod;
+  const patientTags = useSelector(state => state.blip.tideDashboardFilters.patientTags);
+  const clinicSites = useSelector(state => state.blip.tideDashboardFilters.clinicSites);
+  const summaryPeriod = useSelector(state => state.blip.tideDashboardFilters.summaryPeriod);
   const [lastDataFrom, lastDataTo] = useDerivedDataRecencyEndpoints();
 
   return useGetTideDashboardPatientsQuery(
diff --git a/app/redux/actions/async.js b/app/redux/actions/async.js
index 70f0a2449f..5037e8ae5c 100644
--- a/app/redux/actions/async.js
+++ b/app/redux/actions/async.js
@@ -18,6 +18,8 @@ import utils from '../../core/utils';
 import { clinicUIDetails } from '../../core/clinicUtils.js';
 import { getDismissedAltRangeBannerKey, isRangeWithNonStandardTarget } from '../../providers/AppBanner/appBannerHelpers.js';
 import { getGlycemicRangesPreset } from '../../core/glycemicRangesUtils.js';
+import { getTideDashboardFiltersKey, loadLocalState } from '../store/localStorage';
+import { setTideDashboardFilters } from '../../pages/clinicworkspace/TideDashboardV2/tideDashboardFiltersSlice';
 
 // Exported as a mutable reference to allow location to be swapped in tests
 export const _win = { location: window.location };
@@ -3155,7 +3157,11 @@ export function selectClinic(api, clinicId) {
   return (dispatch, getState) => {
     dispatch(sync.selectClinicSuccess(clinicId));
 
-    const { blip: { clinics = {} } } = getState();
+    const { blip: { clinics = {}, loggedInUserId } } = getState();
+
+    const tideDashboardFiltersKey = getTideDashboardFiltersKey(loggedInUserId, clinicId);
+    const tideDashboardFilters = loggedInUserId && clinicId ? loadLocalState(tideDashboardFiltersKey) : undefined;
+    dispatch(setTideDashboardFilters(tideDashboardFilters));
 
     const clinic = clinics[clinicId];
 
diff --git a/app/redux/reducers/index.js b/app/redux/reducers/index.js
index 98d3e9475a..64f5b739e5 100644
--- a/app/redux/reducers/index.js
+++ b/app/redux/reducers/index.js
@@ -21,6 +21,7 @@ import pdf from './pdf';
 import data from './data';
 import patientListFilters from './patientListFilters';
 import tideDashboard from '../../pages/clinicworkspace/TideDashboardV2/tideDashboardSlice';
+import tideDashboardFilters from '../../pages/clinicworkspace/TideDashboardV2/tideDashboardFiltersSlice';
 
 import {
   bgPrefs,
@@ -111,4 +112,5 @@ export default combineReducers({
   clinicMRNsForPatientFormValidation,
   patientListFilters,
   tideDashboard,
+  tideDashboardFilters,
 });
diff --git a/app/redux/store/configureStore.dev.js b/app/redux/store/configureStore.dev.js
index 6a2eb0c18d..d537c9fd72 100644
--- a/app/redux/store/configureStore.dev.js
+++ b/app/redux/store/configureStore.dev.js
@@ -31,7 +31,7 @@ import { stringify, parse } from 'qs';
 
 import blipState from '../reducers/initialState';
 import reducers from '../reducers';
-import { loadLocalState, saveLocalState } from './localStorage';
+import { getTideDashboardFiltersKey, loadLocalState, saveLocalState } from './localStorage';
 
 import createErrorLogger from '../utils/logErrorMiddleware';
 import trackingMiddleware from '../utils/trackingMiddleware';
@@ -110,9 +110,16 @@ function _createStore(api) {
   const store = createStore(reducer, initialState, enhancer(api));
 
   store.subscribe(throttle(() => {
-    saveLocalState({
-      selectedClinicId: store.getState().blip?.selectedClinicId,
-    });
+    const selectedClinicId = store.getState().blip?.selectedClinicId;
+    const loggedInUserId = store.getState().blip?.loggedInUserId;
+
+    saveLocalState({ selectedClinicId });
+
+    if (loggedInUserId && selectedClinicId) {
+      const tideDashboardFiltersKey = getTideDashboardFiltersKey(loggedInUserId, selectedClinicId);
+
+      saveLocalState(store.getState().blip?.tideDashboardFilters, tideDashboardFiltersKey);
+    }
   }, 1000));
 
   if (module.hot) {
diff --git a/app/redux/store/configureStore.prod.js b/app/redux/store/configureStore.prod.js
index f9d144a795..57b5eb44f5 100644
--- a/app/redux/store/configureStore.prod.js
+++ b/app/redux/store/configureStore.prod.js
@@ -26,7 +26,7 @@ import throttle from 'lodash/throttle';
 
 import blipState from '../reducers/initialState';
 import reducers from '../reducers';
-import { loadLocalState, saveLocalState } from './localStorage';
+import { getTideDashboardFiltersKey, loadLocalState, saveLocalState } from './localStorage';
 
 import createErrorLogger from '../utils/logErrorMiddleware';
 import trackingMiddleware from '../utils/trackingMiddleware';
@@ -66,9 +66,16 @@ function _createStore(api) {
   const store = createStoreWithMiddleware(reducer, initialState);
 
   store.subscribe(throttle(() => {
-    saveLocalState({
-      selectedClinicId: store.getState().blip?.selectedClinicId,
-    });
+    const selectedClinicId = store.getState().blip?.selectedClinicId;
+    const loggedInUserId = store.getState().blip?.loggedInUserId;
+
+    saveLocalState({ selectedClinicId });
+
+    if (loggedInUserId && selectedClinicId) {
+      const tideDashboardFiltersKey = getTideDashboardFiltersKey(loggedInUserId, selectedClinicId);
+
+      saveLocalState(store.getState().blip?.tideDashboardFilters, tideDashboardFiltersKey);
+    }
   }, 1000));
 
   return store;
diff --git a/app/redux/store/localStorage.js b/app/redux/store/localStorage.js
index 7ad70e2375..ecc790139c 100644
--- a/app/redux/store/localStorage.js
+++ b/app/redux/store/localStorage.js
@@ -1,7 +1,7 @@
 // c.f. https://github.com/gaearon/todos/tree/03-persisting-state-to-local-storage
-export const loadLocalState = () => {
+export const loadLocalState = (key = 'blipState') => {
   try {
-    const serializedState = localStorage.getItem('blipState');
+    const serializedState = localStorage.getItem(key);
     if (serializedState === null) {
       return undefined;
     }
@@ -11,11 +11,15 @@ export const loadLocalState = () => {
   }
 };
 
-export const saveLocalState = (state) => {
+export const saveLocalState = (state, key = 'blipState') => {
   try {
     const serializedState = JSON.stringify(state);
-    localStorage.setItem('blipState', serializedState);
+    localStorage.setItem(key, serializedState);
   } catch (err) {
     console.error(err);
   }
 };
+
+export const getTideDashboardFiltersKey = (userId, clinicId) => {
+  return `tideDashboardFilters/${userId}/${clinicId}`;
+};
diff --git a/test/unit/components/clinic/WorkspaceSwitcher.test.js b/test/unit/components/clinic/WorkspaceSwitcher.test.js
index c217b25fe6..f5f8f32d29 100644
--- a/test/unit/components/clinic/WorkspaceSwitcher.test.js
+++ b/test/unit/components/clinic/WorkspaceSwitcher.test.js
@@ -211,6 +211,10 @@ describe('WorkspaceSwitcher', () => {
             clinicId: null,
           },
         },
+        {
+          type: 'tideDashboardFilters/setTideDashboardFilters',
+          payload: undefined,
+        },
         {
           type: '@@router/CALL_HISTORY_METHOD',
           payload: {
diff --git a/test/unit/pages/clinicdetails.test.js b/test/unit/pages/clinicdetails.test.js
index 3c14384381..877c451170 100644
--- a/test/unit/pages/clinicdetails.test.js
+++ b/test/unit/pages/clinicdetails.test.js
@@ -475,6 +475,7 @@ describe('ClinicDetails', () => {
           { type: 'CREATE_CLINIC_REQUEST' },
           { type: 'CREATE_CLINIC_SUCCESS', payload: { clinic: { id: 'newClinic123' } } },
           { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'newClinic123' } },
+          { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
           { type: 'GET_CLINICS_FOR_CLINICIAN_REQUEST' },
           { type: 'GET_CLINICS_FOR_CLINICIAN_SUCCESS', payload: { clinics: [{ clinic: { id: 'newClinic123' } }], clinicianId: 'clinicianUserId123' } },
           { type: 'FETCH_CLINIC_EHR_SETTINGS_REQUEST' },
diff --git a/test/unit/pages/workspaces/workspaces.test.js b/test/unit/pages/workspaces/workspaces.test.js
index e042707d63..a352c8b1c2 100644
--- a/test/unit/pages/workspaces/workspaces.test.js
+++ b/test/unit/pages/workspaces/workspaces.test.js
@@ -311,6 +311,7 @@ describe('Workspaces', () => {
       fireEvent.click(button);
       expect(store.getActions()).to.eql([
         { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: null } },
+        { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
         {
           type: '@@router/CALL_HISTORY_METHOD',
           payload: {
@@ -361,6 +362,7 @@ describe('Workspaces', () => {
         { type: 'SET_PATIENT_LIST_SEARCH_TEXT_INPUT', payload: { textInput: '' } },
         { type: 'SET_IS_PATIENT_LIST_VISIBLE', payload: { isVisible: false } },
         { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'clinicID456' } },
+        { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
         { type: 'FETCH_CLINIC_PATIENT_COUNTS_REQUEST' },
         { type: 'FETCH_CLINIC_PATIENT_COUNT_SETTINGS_REQUEST' },
         {
diff --git a/test/unit/redux/actions/async.test.js b/test/unit/redux/actions/async.test.js
index 3518316da2..bd3b645435 100644
--- a/test/unit/redux/actions/async.test.js
+++ b/test/unit/redux/actions/async.test.js
@@ -1203,6 +1203,7 @@ describe('Actions', () => {
               { type: 'FETCH_ASSOCIATED_ACCOUNTS_REQUEST' },
               { type: 'FETCH_ASSOCIATED_ACCOUNTS_SUCCESS', payload: { patients: [] }},
               { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'clinic123' }},
+              { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
               { type: 'LOGIN_SUCCESS', payload: { user } },
               { type: '@@router/CALL_HISTORY_METHOD', payload: { method: 'push', args: ['/some-dest', { selectedClinicId: 'clinic123' }] } }
             ];
@@ -1292,6 +1293,7 @@ describe('Actions', () => {
               { type: 'FETCH_ASSOCIATED_ACCOUNTS_REQUEST' },
               { type: 'FETCH_ASSOCIATED_ACCOUNTS_SUCCESS', payload: { patients: [] }},
               { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'clinicId123' } },
+              { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
               { type: 'LOGIN_SUCCESS', payload: { user } },
               { type: '@@router/CALL_HISTORY_METHOD', payload: { method: 'push', args: [ '/clinic-details/migrate', { selectedClinicId: 'clinicId123' } ] } }
             ];
@@ -1334,6 +1336,7 @@ describe('Actions', () => {
               { type: 'FETCH_ASSOCIATED_ACCOUNTS_REQUEST' },
               { type: 'FETCH_ASSOCIATED_ACCOUNTS_SUCCESS', payload: { patients: [] }},
               { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'clinicId123' } },
+              { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
               { type: 'LOGIN_SUCCESS', payload: { user } },
               { type: '@@router/CALL_HISTORY_METHOD', payload: { method: 'push', args: [ '/clinic-details/migrate', { selectedClinicId: 'clinicId123' } ] } }
             ];
@@ -1469,6 +1472,7 @@ describe('Actions', () => {
               { type: 'FETCH_ASSOCIATED_ACCOUNTS_REQUEST' },
               { type: 'FETCH_ASSOCIATED_ACCOUNTS_SUCCESS', payload: { patients: [] }},
               { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'clinic123' } },
+              { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
               { type: 'LOGIN_SUCCESS', payload: { user } },
               { type: '@@router/CALL_HISTORY_METHOD', payload: { method: 'push', args: ['/clinic-workspace', { selectedClinicId: 'clinic123' }] } }
             ];
@@ -1524,6 +1528,7 @@ describe('Actions', () => {
             { type: 'FETCH_ASSOCIATED_ACCOUNTS_REQUEST' },
             { type: 'FETCH_ASSOCIATED_ACCOUNTS_SUCCESS', payload: { patients: [] }},
             { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'clinic456' } },
+            { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
             { type: 'LOGIN_SUCCESS', payload: { user } },
             { type: '@@router/CALL_HISTORY_METHOD', payload: { method: 'push', args: ['/clinic-workspace', { selectedClinicId: 'clinic456' }] } }
           ];
@@ -1576,6 +1581,7 @@ describe('Actions', () => {
             { type: 'FETCH_ASSOCIATED_ACCOUNTS_REQUEST' },
             { type: 'FETCH_ASSOCIATED_ACCOUNTS_SUCCESS', payload: { patients: [] }},
             { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'clinic123' } },
+            { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
             { type: 'LOGIN_SUCCESS', payload: { user } },
             { type: '@@router/CALL_HISTORY_METHOD', payload: { method: 'push', args: ['/clinic-workspace', { selectedClinicId: 'clinic123' }] } }
           ];
@@ -1792,6 +1798,7 @@ describe('Actions', () => {
             { type: 'FETCH_ASSOCIATED_ACCOUNTS_REQUEST' },
             { type: 'FETCH_ASSOCIATED_ACCOUNTS_SUCCESS', payload: { patients: [] }},
             { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'clinic456' } },
+            { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
             { type: 'LOGIN_SUCCESS', payload: { user } },
             { type: '@@router/CALL_HISTORY_METHOD', payload: { method: 'push', args: ['/newDestination', { selectedClinicId: 'clinic456' }] } }
           ];
@@ -5417,6 +5424,7 @@ describe('Actions', () => {
           { type: 'CREATE_CLINIC_REQUEST' },
           { type: 'CREATE_CLINIC_SUCCESS', payload: { clinic : clinicReturn } },
           { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId : 'new_clinic_id' } },
+          { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
           { type: 'GET_CLINICS_FOR_CLINICIAN_REQUEST' },
           { type: 'GET_CLINICS_FOR_CLINICIAN_SUCCESS', payload: { clinicianId, clinics } },
           { type: 'FETCH_CLINIC_EHR_SETTINGS_REQUEST' },
@@ -9456,6 +9464,7 @@ describe('Actions', () => {
 
         let expectedActions = [
           { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId } },
+          { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
           { type: 'FETCH_CLINIC_PATIENT_COUNTS_REQUEST' },
           { type: 'FETCH_CLINIC_PATIENT_COUNT_SETTINGS_REQUEST' },
           {
@@ -9542,6 +9551,7 @@ describe('Actions', () => {
 
         let expectedActions = [
           { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId } },
+          { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
           {
             type: 'SET_CLINIC_UI_DETAILS',
             payload: {
@@ -9628,6 +9638,7 @@ describe('Actions', () => {
 
         let expectedActions = [
           { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId } },
+          { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
           { type: 'FETCH_CLINIC_PATIENT_COUNTS_REQUEST' },
           { type: 'FETCH_CLINIC_PATIENT_COUNT_SETTINGS_REQUEST' },
           {
@@ -9661,15 +9672,15 @@ describe('Actions', () => {
 
         const actions = store.getActions();
 
-        expect(actions[3].error).to.deep.include({
+        expect(actions[4].error).to.deep.include({
           message: ErrorMessages.ERR_FETCHING_CLINIC_PATIENT_COUNTS,
         });
-        expectedActions[3].error = actions[3].error;
+        expectedActions[4].error = actions[4].error;
 
-        expect(actions[4].error).to.deep.include({
+        expect(actions[5].error).to.deep.include({
           message: ErrorMessages.ERR_FETCHING_CLINIC_PATIENT_COUNT_SETTINGS,
         });
-        expectedActions[4].error = actions[4].error;
+        expectedActions[5].error = actions[5].error;
         expect(actions).to.eql(expectedActions);
 
         expect(api.clinics.getClinicPatientCount.callCount).to.equal(1);
diff --git a/test/unit/routes.test.js b/test/unit/routes.test.js
index 2493363abb..965a677641 100644
--- a/test/unit/routes.test.js
+++ b/test/unit/routes.test.js
@@ -490,6 +490,7 @@ describe('routes', () => {
         { type: 'FETCH_CLINICIAN_INVITES_REQUEST' },
         { type: 'FETCH_CLINICIAN_INVITES_SUCCESS', payload: { invites: [] } },
         { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'newClinic' } },
+        { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
         routeAction('/clinic-details/migrate', { selectedClinicId: null }),
       ];
 
@@ -555,6 +556,7 @@ describe('routes', () => {
         { type: 'FETCH_CLINICIAN_INVITES_REQUEST' },
         { type: 'FETCH_CLINICIAN_INVITES_SUCCESS', payload: { invites: [] } },
         { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'newClinic' } },
+        { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
         routeAction('/clinic-details/migrate', { selectedClinicId: null }),
       ];
 
@@ -1090,6 +1092,7 @@ describe('routes', () => {
 
           let expectedActions = [
             { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'clinic123' } },
+            { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
             { type: 'FETCH_CLINIC_PATIENT_COUNTS_REQUEST' },
             { type: 'FETCH_CLINIC_PATIENT_COUNT_SETTINGS_REQUEST' },
             routeAction('/clinic-details'),
diff --git a/test/unit/utils/navutils.test.js b/test/unit/utils/navutils.test.js
index d32b008d43..b927e833f2 100644
--- a/test/unit/utils/navutils.test.js
+++ b/test/unit/utils/navutils.test.js
@@ -144,6 +144,10 @@ describe('navutils', () => {
             type: 'SELECT_CLINIC_SUCCESS',
             payload: { clinicId: null }, // null is appropriate for switch to private workspace
           },
+          {
+            type: 'tideDashboardFilters/setTideDashboardFilters',
+            payload: undefined,
+          },
           {
             type: '@@router/CALL_HISTORY_METHOD',
             payload: {

From 869f49a16a9b3dd6831cce0db75245e8aa00a798 Mon Sep 17 00:00:00 2001
From: henry-tp <henry.liang@tidepool.org>
Date: Thu, 20 Aug 2026 16:03:44 -0700
Subject: [PATCH 08/23] WEB-4460 fix rebase errors

---
 .../tideDashboardFiltersSlice.js              | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/pages/clinicworkspace/TideDashboardV2/tideDashboardFiltersSlice.js b/app/pages/clinicworkspace/TideDashboardV2/tideDashboardFiltersSlice.js
index e2ef7a0e62..2c862d21c7 100644
--- a/app/pages/clinicworkspace/TideDashboardV2/tideDashboardFiltersSlice.js
+++ b/app/pages/clinicworkspace/TideDashboardV2/tideDashboardFiltersSlice.js
@@ -1,8 +1,5 @@
 import { createSlice } from '@reduxjs/toolkit';
 
-// IMPORTANT: This slice is automatically persisted between user sessions via localStorage.
-// If you don't want your state variable value persisted, use a different redux slice for it.
-
 const getInitialState = () => ({
   lastData: 7,
   patientTags: [],
@@ -15,11 +12,29 @@ const tideDashboardFiltersSlice = createSlice({
   initialState: getInitialState(),
   reducers: {
     setTideDashboardFilters: (_state, action) => action.payload || getInitialState(),
+    setLastDataFilter: (state, action) => {
+      state.lastData = action.payload;
+    },
+    setPatientTagsFilter: (state, action) => {
+      state.patientTags = action.payload;
+    },
+    setClinicSitesFilter: (state, action) => {
+      state.clinicSites = action.payload;
+    },
+    setSummaryPeriodFilter: (state, action) => {
+      state.summaryPeriod = action.payload;
+    },
+    resetTideDashboardFilters: () => getInitialState(),
   },
 });
 
 export const {
   setTideDashboardFilters,
+  setLastDataFilter,
+  setPatientTagsFilter,
+  setClinicSitesFilter,
+  setSummaryPeriodFilter,
+  resetTideDashboardFilters,
 } = tideDashboardFiltersSlice.actions;
 
 export default tideDashboardFiltersSlice.reducer;

From 543820a749fd041a5009b130f5b83dd8ec144fd8 Mon Sep 17 00:00:00 2001
From: henry-tp <henry.liang@tidepool.org>
Date: Mon, 24 Aug 2026 15:16:26 -0700
Subject: [PATCH 09/23] WEB-4460 fix useDerivedDataRecency hook to use redux

---
 .../useDerivedDataRecencyEndpoints.test.js    | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/useDerivedDataRecencyEndpoints.test.js b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/useDerivedDataRecencyEndpoints.test.js
index 72e287c354..5bc81af9cd 100644
--- a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/useDerivedDataRecencyEndpoints.test.js
+++ b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/useDerivedDataRecencyEndpoints.test.js
@@ -9,12 +9,19 @@ import useDerivedDataRecencyEndpoints from '@app/pages/clinicworkspace/TideDashb
 const mockStore = configureStore([thunk]);
 
 describe('useDerivedDataRecencyEndpoints', () => {
-  let store;
+  const renderEndpointsHook = (tideDashboardFilters = {}) => {
+    const store = mockStore({
+      blip: {
+        timePrefs: { timezoneAware: false, timezoneName: null },
+        tideDashboardFilters: tideDashboardFilters,
+      },
+    });
 
-  const renderEndpointsHook = (filters) => renderHook(
-    () => useDerivedDataRecencyEndpoints(filters),
-    { wrapper: ({ children }) => <Provider store={store}>{children}</Provider> }
-  ).result.current;
+    return renderHook(
+      () => useDerivedDataRecencyEndpoints(),
+      { wrapper: ({ children }) => <Provider store={store}>{children}</Provider> }
+    ).result.current;
+  };
 
   beforeEach(() => {
     // Fake only Date so "now" is pinned; the localized ceiling of now is 2025-05-30T00:00:00.000Z
@@ -29,8 +36,6 @@ describe('useDerivedDataRecencyEndpoints', () => {
         'setTimeout', 'clearTimeout',
       ],
     });
-
-    store = mockStore({ blip: { timePrefs: { timezoneAware: false, timezoneName: null } } });
   });
 
   afterEach(() => {
@@ -44,38 +49,31 @@ describe('useDerivedDataRecencyEndpoints', () => {
     ]);
   });
 
-  it('derives the window for the "Within 2 days" option', () => {
+  it('derives the window when the "Within 2 days" option', () => {
     expect(renderEndpointsHook({ lastData: 2 })).toStrictEqual([
       '2025-05-28T00:00:00.000Z', // lastDataFrom
       '2025-05-30T00:00:00.000Z', // lastDataTo
     ]);
   });
 
-  it('derives the window for the "Within 7 days" option', () => {
+  it('derives the window when the "Within 7 days" option', () => {
     expect(renderEndpointsHook({ lastData: 7 })).toStrictEqual([
       '2025-05-23T00:00:00.000Z', // lastDataFrom
       '2025-05-30T00:00:00.000Z', // lastDataTo
     ]);
   });
 
-  it('derives the window for the "Within 14 days" option', () => {
+  it('derives the window when the "Within 14 days" option', () => {
     expect(renderEndpointsHook({ lastData: 14 })).toStrictEqual([
       '2025-05-16T00:00:00.000Z', // lastDataFrom
       '2025-05-30T00:00:00.000Z', // lastDataTo
     ]);
   });
 
-  it('derives the window for the "Within 30 days" option', () => {
+  it('derives the window when the "Within 30 days" option', () => {
     expect(renderEndpointsHook({ lastData: 30 })).toStrictEqual([
       '2025-04-30T00:00:00.000Z', // lastDataFrom
       '2025-05-30T00:00:00.000Z', // lastDataTo
     ]);
   });
-
-  it('defaults to the 7-day tide dashboard window when called without filters', () => {
-    expect(renderEndpointsHook()).toStrictEqual([
-      '2025-05-23T00:00:00.000Z', // lastDataFrom
-      '2025-05-30T00:00:00.000Z', // lastDataTo
-    ]);
-  });
 });

From cebc9c2992cdbad6237eb8156722932ac5e02f47 Mon Sep 17 00:00:00 2001
From: henry-tp <henry.liang@tidepool.org>
Date: Mon, 24 Aug 2026 16:11:48 -0700
Subject: [PATCH 10/23] WEB-4460 add required filters to ActiveFilterTray

---
 .../useDerivedDataRecencyEndpoints.test.js    |  8 ++---
 .../components/ActiveFiltersTray.test.js      | 36 ++++++++++++++-----
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/useDerivedDataRecencyEndpoints.test.js b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/useDerivedDataRecencyEndpoints.test.js
index 5bc81af9cd..1866faa269 100644
--- a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/useDerivedDataRecencyEndpoints.test.js
+++ b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/useDerivedDataRecencyEndpoints.test.js
@@ -49,28 +49,28 @@ describe('useDerivedDataRecencyEndpoints', () => {
     ]);
   });
 
-  it('derives the window when the "Within 2 days" option', () => {
+  it('derives the window for the "Within 2 days" option', () => {
     expect(renderEndpointsHook({ lastData: 2 })).toStrictEqual([
       '2025-05-28T00:00:00.000Z', // lastDataFrom
       '2025-05-30T00:00:00.000Z', // lastDataTo
     ]);
   });
 
-  it('derives the window when the "Within 7 days" option', () => {
+  it('derives the window for the "Within 7 days" option', () => {
     expect(renderEndpointsHook({ lastData: 7 })).toStrictEqual([
       '2025-05-23T00:00:00.000Z', // lastDataFrom
       '2025-05-30T00:00:00.000Z', // lastDataTo
     ]);
   });
 
-  it('derives the window when the "Within 14 days" option', () => {
+  it('derives the window for the "Within 14 days" option', () => {
     expect(renderEndpointsHook({ lastData: 14 })).toStrictEqual([
       '2025-05-16T00:00:00.000Z', // lastDataFrom
       '2025-05-30T00:00:00.000Z', // lastDataTo
     ]);
   });
 
-  it('derives the window when the "Within 30 days" option', () => {
+  it('derives the window for the "Within 30 days" option', () => {
     expect(renderEndpointsHook({ lastData: 30 })).toStrictEqual([
       '2025-04-30T00:00:00.000Z', // lastDataFrom
       '2025-05-30T00:00:00.000Z', // lastDataTo
diff --git a/__tests__/unit/app/pages/clinicworkspace/components/ActiveFiltersTray.test.js b/__tests__/unit/app/pages/clinicworkspace/components/ActiveFiltersTray.test.js
index f0e378517f..091dfcea10 100644
--- a/__tests__/unit/app/pages/clinicworkspace/components/ActiveFiltersTray.test.js
+++ b/__tests__/unit/app/pages/clinicworkspace/components/ActiveFiltersTray.test.js
@@ -9,17 +9,16 @@ import '@app/core/language';
 
 import theme from '@app/themes/baseTheme';
 import ActiveFiltersTray from '@app/pages/clinicworkspace/components/ActiveFiltersTray';
-import { defaultFilterState, SPECIAL_FILTER_STATES } from '@app/pages/clinicworkspace/useClinicPatientsFilters';
+import { defaultFilterState } from '@app/pages/clinicworkspace/useClinicPatientsFilters';
 
 const mockStore = configureStore([thunk]);
 
-const buildState = ({ fetchedPatientCount = 5 } = {}) => ({
+const buildState = () => ({
   blip: {
     selectedClinicId: 'clinic123',
     clinics: {
       'clinic123': {
         id: 'clinic123',
-        fetchedPatientCount,
         patientTags: [
           { id: 'tag1', name: 'Tag One' },
           { id: 'tag2', name: 'Tag Two' },
@@ -35,37 +34,42 @@ const buildState = ({ fetchedPatientCount = 5 } = {}) => ({
 
 const renderTray = ({
   filters = defaultFilterState,
+  patientCount = 0,
   hasSearchActive = false,
   onRemoveFilter = jest.fn(),
   state = buildState(),
 } = {}) => {
   const store = mockStore(state);
 
-  const utils = render(
+  const ui = (props = {}) => (
     <Provider store={store}>
       <ThemeProvider theme={theme}>
         <ActiveFiltersTray
           filters={filters}
+          patientCount={patientCount}
           hasSearchActive={hasSearchActive}
           onRemoveFilter={onRemoveFilter}
+          {...props}
         />
       </ThemeProvider>
     </Provider>
   );
 
-  return { ...utils, onRemoveFilter };
+  const utils = render(ui());
+
+  return { ...utils, ui, onRemoveFilter };
 };
 
 describe('ActiveFiltersTray', () => {
   describe('patient count header', () => {
-    it('renders the fetched patient count', () => {
-      renderTray({ state: buildState({ fetchedPatientCount: 5 }) });
+    it('renders the patient count', () => {
+      renderTray({ patientCount: 5 });
 
       expect(screen.getByText('Showing 5 patients')).toBeInTheDocument();
     });
 
     it('notes the count reflects the search when a search is active', () => {
-      renderTray({ hasSearchActive: true, state: buildState({ fetchedPatientCount: 5 }) });
+      renderTray({ hasSearchActive: true, patientCount: 5 });
 
       expect(screen.getByText('Showing 5 patients that match your search')).toBeInTheDocument();
     });
@@ -110,6 +114,22 @@ describe('ActiveFiltersTray', () => {
     });
   });
 
+  describe('required filters', () => {
+    it('renders a required filter without its remove icon', () => {
+      const { ui, rerender } = renderTray({
+        filters: { ...defaultFilterState, lastData: 14, lastDataType: 'cgm' },
+      });
+
+      // Removable by default: the chip renders with its remove icon
+      expect(screen.getByLabelText('Remove CGM data within 14 days filter')).toBeInTheDocument();
+
+      // Marking the filter required keeps the chip but drops the remove icon
+      rerender(ui({ requiredFilters: { lastData: true } }));
+      expect(screen.getByText('CGM data within 14 days')).toBeInTheDocument();
+      expect(screen.queryByLabelText('Remove CGM data within 14 days filter')).not.toBeInTheDocument();
+    });
+  });
+
   describe('removing a chip', () => {
     it('fires onRemoveFilter with the chip type and value when its remove icon is clicked', async () => {
       const { onRemoveFilter } = renderTray({

From 58b3aad84feb3f6f08c8132caee3bee11cbb66a5 Mon Sep 17 00:00:00 2001
From: henry-tp <henry.liang@tidepool.org>
Date: Mon, 24 Aug 2026 16:47:21 -0700
Subject: [PATCH 11/23] WEB-4460 add tests for filters and emptycontent

---
 .../FilterByDataRecency.test.js               | 66 +++++++++++++++++++
 .../TideDashboardV2/FilterBySites.test.js     | 63 ++++++++++++++++++
 .../FilterBySummaryPeriod.test.js             | 61 +++++++++++++++++
 .../TideDashboardV2/FilterByTags.test.js      | 66 +++++++++++++++++++
 .../TideDashboardV2/TideDashboardV2.test.js   | 45 ++++++++++++-
 .../TideDashboardV2/EmptyContentNode.js       |  2 +-
 6 files changed, 301 insertions(+), 2 deletions(-)
 create mode 100644 __tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterByDataRecency.test.js
 create mode 100644 __tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterBySites.test.js
 create mode 100644 __tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterBySummaryPeriod.test.js
 create mode 100644 __tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterByTags.test.js

diff --git a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterByDataRecency.test.js b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterByDataRecency.test.js
new file mode 100644
index 0000000000..5686027994
--- /dev/null
+++ b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterByDataRecency.test.js
@@ -0,0 +1,66 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { Provider } from 'react-redux';
+import configureStore from 'redux-mock-store';
+import { thunk } from 'redux-thunk';
+import { MemoryRouter } from 'react-router-dom';
+
+import FilterByDataRecency from '@app/pages/clinicworkspace/TideDashboardV2/FilterByDataRecency';
+import { setLastDataFilter } from '@app/pages/clinicworkspace/TideDashboardV2/tideDashboardFiltersSlice';
+import { setOffset } from '@app/pages/clinicworkspace/TideDashboardV2/tideDashboardSlice';
+
+const mockStore = configureStore([thunk]);
+
+describe('FilterByDataRecency', () => {
+  let store;
+
+  const renderComponent = () => render(
+    <Provider store={store}>
+      <MemoryRouter initialEntries={['/clinic-workspace/tide-dashboard']}>
+        <FilterByDataRecency />
+      </MemoryRouter>
+    </Provider>
+  );
+
+  it('dispatches the lastData filter and offset reset when data recency filter is applied', async () => {
+    store = mockStore({
+      blip: {
+        selectedClinicId: 'clinic123',
+        tideDashboardFilters: {
+          lastData: 7,
+          patientTags: [],
+          clinicSites: [],
+          summaryPeriod: '14d',
+        },
+      },
+    });
+
+    renderComponent();
+
+    // Open the dropdown
+    expect(screen.queryByTestId('data-recency-filter-dropdown')).not.toBeInTheDocument();
+    await userEvent.click(screen.getByRole('button', { name: /Data Recency/ }));
+    expect(screen.getByTestId('data-recency-filter-dropdown')).toBeInTheDocument();
+
+    expect(screen.queryByRole('radio', { name: /CGM/ })).not.toBeInTheDocument(); // not selectable in TIDE
+    expect(screen.queryByRole('radio', { name: /BGM/ })).not.toBeInTheDocument(); // not selectable in TIDE
+
+    expect(screen.getByRole('radio', { name: /Today/ })).toBeInTheDocument();
+    expect(screen.getByRole('radio', { name: /Within 2 days/ })).toBeInTheDocument();
+    expect(screen.getByRole('radio', { name: /Within 7 days/ })).toBeChecked();
+    expect(screen.getByRole('radio', { name: /Within 14 days/ })).toBeInTheDocument();
+    expect(screen.queryByRole('radio', { name: /Within 30 days/ })).not.toBeInTheDocument();
+
+    // Select an option
+    await userEvent.click(screen.getByRole('radio', { name: /Within 2 days/ }));
+    expect(store.getActions()).toStrictEqual([]);
+
+    // Applying the filter dispatches the new filter value and resets the page offset
+    await userEvent.click(screen.getByRole('button', { name: /Apply/ }));
+    expect(store.getActions()).toStrictEqual([
+      setLastDataFilter(2),
+      setOffset(0),
+    ]);
+  });
+});
diff --git a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterBySites.test.js b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterBySites.test.js
new file mode 100644
index 0000000000..a1c38240d2
--- /dev/null
+++ b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterBySites.test.js
@@ -0,0 +1,63 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { Provider } from 'react-redux';
+import configureStore from 'redux-mock-store';
+import { thunk } from 'redux-thunk';
+import { MemoryRouter } from 'react-router-dom';
+
+import FilterBySites from '@app/pages/clinicworkspace/TideDashboardV2/FilterBySites';
+import { setClinicSitesFilter } from '@app/pages/clinicworkspace/TideDashboardV2/tideDashboardFiltersSlice';
+import { setOffset } from '@app/pages/clinicworkspace/TideDashboardV2/tideDashboardSlice';
+
+const mockStore = configureStore([thunk]);
+
+describe('FilterBySites', () => {
+  let store;
+
+  const renderComponent = () => render(
+    <Provider store={store}>
+      <MemoryRouter initialEntries={['/clinic-workspace/tide-dashboard']}>
+        <FilterBySites />
+      </MemoryRouter>
+    </Provider>
+  );
+
+  it('dispatches the clinic sites filter and an offset reset when a site filter is applied', async () => {
+    store = mockStore({
+      blip: {
+        selectedClinicId: 'clinic123',
+        clinics: {
+          clinic123: {
+            id: 'clinic123',
+            sites: [{ id: 'site1', name: 'Site Alpha' }, { id: 'site2', name: 'Site Bravo' }],
+          },
+        },
+        tideDashboardFilters: {
+          lastData: 7,
+          patientTags: [],
+          clinicSites: ['site1'],
+          summaryPeriod: '14d',
+        },
+      },
+    });
+
+    renderComponent();
+
+    // Open the dropdown
+    expect(screen.queryByTestId('site-filter-dropdown')).not.toBeInTheDocument();
+    await userEvent.click(screen.getByRole('button', { name: /Clinic Sites/ }));
+    expect(screen.getByTestId('site-filter-dropdown')).toBeInTheDocument();
+
+    // Selecting a site
+    await userEvent.click(screen.getByRole('checkbox', { name: /Site Bravo/ }));
+    expect(store.getActions()).toStrictEqual([]);
+
+    // Applying the filter dispatches the selected sites and resets the page offset
+    await userEvent.click(screen.getByRole('button', { name: /Apply/ }));
+    expect(store.getActions()).toStrictEqual([
+      setClinicSitesFilter(['site1', 'site2']),
+      setOffset(0),
+    ]);
+  });
+});
diff --git a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterBySummaryPeriod.test.js b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterBySummaryPeriod.test.js
new file mode 100644
index 0000000000..baee8ea4c3
--- /dev/null
+++ b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterBySummaryPeriod.test.js
@@ -0,0 +1,61 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { Provider } from 'react-redux';
+import configureStore from 'redux-mock-store';
+import { thunk } from 'redux-thunk';
+import { MemoryRouter } from 'react-router-dom';
+
+import FilterBySummaryPeriod from '@app/pages/clinicworkspace/TideDashboardV2/FilterBySummaryPeriod';
+import { setSummaryPeriodFilter } from '@app/pages/clinicworkspace/TideDashboardV2/tideDashboardFiltersSlice';
+import { setOffset } from '@app/pages/clinicworkspace/TideDashboardV2/tideDashboardSlice';
+
+const mockStore = configureStore([thunk]);
+
+describe('FilterBySummaryPeriod', () => {
+  let store;
+
+  const renderComponent = () => render(
+    <Provider store={store}>
+      <MemoryRouter initialEntries={['/clinic-workspace/tide-dashboard']}>
+        <FilterBySummaryPeriod />
+      </MemoryRouter>
+    </Provider>
+  );
+
+  it('dispatches the summary period filter and an offset reset when a summary period is applied', async () => {
+    store = mockStore({
+      blip: {
+        selectedClinicId: 'clinic123',
+        tideDashboardFilters: {
+          lastData: 7,
+          patientTags: [],
+          clinicSites: [],
+          summaryPeriod: '14d' },
+      },
+    });
+
+    renderComponent();
+
+    // Open the dropdown
+    expect(screen.queryByTestId('summary-period-filter-dropdown')).not.toBeInTheDocument();
+    await userEvent.click(screen.getByRole('button', { name: /Summarizing 14 days of data/ }));
+
+    expect(screen.getByTestId('summary-period-filter-dropdown')).toBeInTheDocument();
+    expect(screen.getByRole('radio', { name: /24 hours/ })).toBeInTheDocument();
+    expect(screen.getByRole('radio', { name: /7 days/ })).toBeInTheDocument();
+    expect(screen.getByRole('radio', { name: /14 days/ })).toBeChecked();
+    expect(screen.getByRole('radio', { name: /30 days/ })).toBeInTheDocument();
+
+    // Selecting a period
+    await userEvent.click(screen.getByRole('radio', { name: /30 days/ }));
+    expect(store.getActions()).toStrictEqual([]);
+
+    // Applying the filter dispatches the new period and resets the page offset
+    await userEvent.click(screen.getByRole('button', { name: /Apply/ }));
+    expect(store.getActions()).toStrictEqual([
+      setSummaryPeriodFilter('30d'),
+      setOffset(0),
+    ]);
+  });
+});
diff --git a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterByTags.test.js b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterByTags.test.js
new file mode 100644
index 0000000000..aad7e27c44
--- /dev/null
+++ b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterByTags.test.js
@@ -0,0 +1,66 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { Provider } from 'react-redux';
+import configureStore from 'redux-mock-store';
+import { thunk } from 'redux-thunk';
+import { MemoryRouter } from 'react-router-dom';
+
+import FilterByTags from '@app/pages/clinicworkspace/TideDashboardV2/FilterByTags';
+import { setPatientTagsFilter } from '@app/pages/clinicworkspace/TideDashboardV2/tideDashboardFiltersSlice';
+import { setOffset } from '@app/pages/clinicworkspace/TideDashboardV2/tideDashboardSlice';
+
+const mockStore = configureStore([thunk]);
+
+describe('FilterByTags', () => {
+  let store;
+
+  const renderComponent = () => render(
+    <Provider store={store}>
+      <MemoryRouter initialEntries={['/clinic-workspace/tide-dashboard']}>
+        <FilterByTags />
+      </MemoryRouter>
+    </Provider>
+  );
+
+  it('dispatches the patient tags filter and an offset reset when a tag filter is applied', async () => {
+    store = mockStore({
+      blip: {
+        selectedClinicId: 'clinic123',
+        clinics: {
+          clinic123: {
+            id: 'clinic123',
+            patientTags: [
+              { id: 'tag1', name: 'Week 1' },
+              { id: 'tag2', name: 'Week 2' },
+            ],
+          },
+        },
+        tideDashboardFilters: {
+          lastData: 7,
+          patientTags: [],
+          clinicSites: [],
+          summaryPeriod: '14d',
+        },
+      },
+    });
+
+    renderComponent();
+
+    // Open the dropdown
+    expect(screen.queryByTestId('tag-filter-dropdown')).not.toBeInTheDocument();
+    await userEvent.click(screen.getByRole('button', { name: /Tags/ }));
+    expect(screen.getByTestId('tag-filter-dropdown')).toBeInTheDocument();
+
+    // Selecting a tag
+    await userEvent.click(screen.getByRole('checkbox', { name: /Week 2/ }));
+    expect(store.getActions()).toStrictEqual([]);
+
+    // Applying the filter dispatches the selected tags and resets the page offset
+    await userEvent.click(screen.getByRole('button', { name: /Apply/ }));
+    expect(store.getActions()).toStrictEqual([
+      setPatientTagsFilter(['tag2']),
+      setOffset(0),
+    ]);
+  });
+});
diff --git a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/TideDashboardV2.test.js b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/TideDashboardV2.test.js
index 78afacb932..c481f12a0d 100644
--- a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/TideDashboardV2.test.js
+++ b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/TideDashboardV2.test.js
@@ -1,7 +1,8 @@
 import React from 'react';
-import { render, screen } from '@testing-library/react';
+import { render, screen, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { Provider } from 'react-redux';
+import { MemoryRouter } from 'react-router-dom';
 import { http, HttpResponse } from 'msw';
 import { setupServer } from 'msw/node';
 import isEqual from 'lodash/isEqual';
@@ -263,4 +264,46 @@ describe('TideDashboardV2', () => {
     expect(screen.getByText('Meeting Targets Patient 2')).toBeInTheDocument();
     expect(screen.queryByText('Low CGM Wear Patient 1')).not.toBeInTheDocument();
   }, TEST_TIMEOUT_MS);
+
+  describe('empty content', () => {
+    it('shows Reset button when no patients match applied filters', async () => {
+      // A tag filter is applied before the dashboard mounts
+      store = setupStore({
+        blip: {
+          selectedClinicId: 'clinic123',
+          clinics: {
+            clinic123: { id: 'clinic123', patientTags: [{ id: 'tag1', name: 'Tag One' }] },
+          },
+          tideDashboardFilters: { lastData: 7, patientTags: ['tag1'], clinicSites: [], summaryPeriod: '14d' },
+        },
+      }, { blip: blipReducer });
+
+      renderComponent();
+
+      // The tag-filtered query returns no patients, so the filtered empty message shows
+      const emptyContent = await screen.findByTestId('tide-dashboard-empty-content');
+      expect(within(emptyContent).getByText('There are no patients with the current filter(s)')).toBeInTheDocument();
+      expect(screen.queryByText('Default Patient 1')).not.toBeInTheDocument();
+
+      // Resetting the filters refetches and shows the unfiltered cohort
+      await userEvent.click(within(emptyContent).getByRole('button', { name: 'Reset All Filters' }));
+      expect(await screen.findByText('Default Patient 1')).toBeInTheDocument();
+      expect(screen.queryByTestId('tide-dashboard-empty-content')).not.toBeInTheDocument();
+    });
+
+    it('shows an empty message without a reset button when there are no patients and no filters applied', async () => {
+      // No patients exist for the unfiltered query
+      server.use(
+        http.get('http://app.tidepool.test/v1/clinics/clinic123/patients', () =>
+          HttpResponse.json({ data: [], meta: { count: 0 } })
+        )
+      );
+
+      renderComponent();
+
+      const emptyContent = await screen.findByTestId('tide-dashboard-empty-content');
+      expect(within(emptyContent).getByText('There are no results to show')).toBeInTheDocument();
+      expect(screen.queryByRole('button', { name: 'Reset All Filters' })).not.toBeInTheDocument();
+    });
+  });
 });
diff --git a/app/pages/clinicworkspace/TideDashboardV2/EmptyContentNode.js b/app/pages/clinicworkspace/TideDashboardV2/EmptyContentNode.js
index 0c444d6b94..a29a9332bf 100644
--- a/app/pages/clinicworkspace/TideDashboardV2/EmptyContentNode.js
+++ b/app/pages/clinicworkspace/TideDashboardV2/EmptyContentNode.js
@@ -34,7 +34,7 @@ const EmptyContentNode = () => {
   const patientQueryState = hasActiveFilters ? PATIENT_QUERY_STATE.FILTER_ONLY : PATIENT_QUERY_STATE.NONE;
 
   return (
-    <Flex sx={{
+    <Flex data-testid="tide-dashboard-empty-content" sx={{
       backgroundColor: colorPalette.primary.bluePrimary00,
       justifyContent: 'center',
       alignItems: 'center',

From 021160229791a358b3b505a0927db4d6775f13f9 Mon Sep 17 00:00:00 2001
From: henry-tp <henry.liang@tidepool.org>
Date: Mon, 24 Aug 2026 16:59:39 -0700
Subject: [PATCH 12/23] WEB-4460 add tests for usePruneInvalidFilters

---
 .../usePruneInvalidFilters.test.js            | 107 ++++++++++++++++++
 .../TideDashboardV2/usePruneInvalidFilters.js |   6 +
 2 files changed, 113 insertions(+)
 create mode 100644 __tests__/unit/app/pages/clinicworkspace/TideDashboardV2/usePruneInvalidFilters.test.js

diff --git a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/usePruneInvalidFilters.test.js b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/usePruneInvalidFilters.test.js
new file mode 100644
index 0000000000..7818db19c9
--- /dev/null
+++ b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/usePruneInvalidFilters.test.js
@@ -0,0 +1,107 @@
+import React from 'react';
+import { Provider } from 'react-redux';
+import { renderHook } from '@testing-library/react-hooks/dom';
+import { thunk } from 'redux-thunk';
+import configureStore from 'redux-mock-store';
+
+import usePruneInvalidFilters from '@app/pages/clinicworkspace/TideDashboardV2/usePruneInvalidFilters';
+import { setPatientTagsFilter, setClinicSitesFilter } from '@app/pages/clinicworkspace/TideDashboardV2/tideDashboardFiltersSlice';
+import { SPECIAL_FILTER_STATES } from '@app/pages/clinicworkspace/useClinicPatientsFilters';
+
+const mockStore = configureStore([thunk]);
+
+describe('usePruneInvalidFilters', () => {
+  let store;
+
+  const clinic = {
+    id: 'clinic123',
+    patientTags: [
+      { id: 'tag1', name: 'Week 1' },
+      { id: 'tag2', name: 'Week 2' },
+      // tag3 is deleted
+    ],
+    sites: [
+      { id: 'site1', name: 'Site Alpha' },
+      { id: 'site2', name: 'Site Bravo' },
+      // site3 is deleted
+    ],
+  };
+
+  const renderPruneHook = ({ filterOverrides = {}, clinics = { clinic123: clinic } } = {}) => {
+    store = mockStore({
+      blip: {
+        selectedClinicId: 'clinic123',
+        clinics,
+        tideDashboardFilters: {
+          lastData: 7,
+          patientTags: [],
+          clinicSites: [],
+          summaryPeriod: '14d',
+          ...filterOverrides,
+        },
+      },
+    });
+
+    renderHook(() => usePruneInvalidFilters(), {
+      wrapper: ({ children }) => <Provider store={store}>{children}</Provider>,
+    });
+  };
+
+  it('prunes filtered tag ids that no longer exist in the clinic', () => {
+    renderPruneHook({ filterOverrides: { patientTags: ['tag1', 'tag3'] } });
+
+    expect(store.getActions()).toStrictEqual([
+      setPatientTagsFilter(['tag1']),
+    ]);
+  });
+
+  it('prunes filtered site ids that no longer exist in the clinic', () => {
+    renderPruneHook({ filterOverrides: { clinicSites: ['site3', 'site2'] } });
+
+    expect(store.getActions()).toStrictEqual([
+      setClinicSitesFilter(['site2']),
+    ]);
+  });
+
+  it('prunes invalid tags and sites in the same mount', () => {
+    renderPruneHook({
+      filterOverrides: {
+        patientTags: ['tag3', 'tag1'],
+        clinicSites: ['site3', 'site2'],
+      },
+    });
+
+    expect(store.getActions()).toStrictEqual([
+      setPatientTagsFilter(['tag1']),
+      setClinicSitesFilter(['site2']),
+    ]);
+  });
+
+  it('dispatches nothing when all filtered tags and sites still exist in the clinic', () => {
+    renderPruneHook({
+      filterOverrides: {
+        patientTags: ['tag1', 'tag2'],
+        clinicSites: ['site1', 'site2'],
+      },
+    });
+
+    expect(store.getActions()).toStrictEqual([]);
+  });
+
+  it('dispatches nothing when no tag or site filters are set', () => {
+    renderPruneHook();
+
+    expect(store.getActions()).toStrictEqual([]);
+  });
+
+  it('preserves the special zero-tags and zero-sites filter states', () => {
+    renderPruneHook({
+      filterOverrides: {
+        patientTags: SPECIAL_FILTER_STATES.ZERO_TAGS,
+        clinicSites: SPECIAL_FILTER_STATES.ZERO_SITES,
+      },
+    });
+
+    expect(store.getActions()).toStrictEqual([]);
+  });
+});
diff --git a/app/pages/clinicworkspace/TideDashboardV2/usePruneInvalidFilters.js b/app/pages/clinicworkspace/TideDashboardV2/usePruneInvalidFilters.js
index 33e20634a6..2eec43412a 100644
--- a/app/pages/clinicworkspace/TideDashboardV2/usePruneInvalidFilters.js
+++ b/app/pages/clinicworkspace/TideDashboardV2/usePruneInvalidFilters.js
@@ -1,7 +1,9 @@
 import { useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { setPatientTagsFilter, setClinicSitesFilter } from './tideDashboardFiltersSlice';
+import { SPECIAL_FILTER_STATES } from '../useClinicPatientsFilters';
 import keyBy from 'lodash/keyBy';
+import isEqual from 'lodash/isEqual';
 
 const usePruneInvalidFilters = () => {
   const dispatch = useDispatch();
@@ -12,6 +14,8 @@ const usePruneInvalidFilters = () => {
   useEffect(() => {
     if (!patientTags?.length || !clinic) return;
 
+    if (isEqual(patientTags, SPECIAL_FILTER_STATES.ZERO_TAGS)) return;
+
     const availableTags = keyBy(clinic.patientTags || [], 'id');
     const prunedTags = patientTags.filter(tagId => !!availableTags[tagId]);
 
@@ -23,6 +27,8 @@ const usePruneInvalidFilters = () => {
   useEffect(() => {
     if (!clinicSites?.length || !clinic) return;
 
+    if (isEqual(clinicSites, SPECIAL_FILTER_STATES.ZERO_SITES)) return;
+
     const availableSites = keyBy(clinic.sites || [], 'id');
     const prunedSites = clinicSites.filter(siteId => !!availableSites[siteId]);
 

From b6107b0d3fd3084baf5c083f3339e050cf61bc1f Mon Sep 17 00:00:00 2001
From: henry-tp <henry.liang@tidepool.org>
Date: Tue, 25 Aug 2026 12:59:00 -0700
Subject: [PATCH 13/23] WEB-4460 migrate tests for async actions

---
 .../useClinicMetricsPageName.test.js          |  24 ++
 .../unit/app/redux/actions/async.test.js      | 180 +++++++++++--
 test/unit/redux/actions/async.test.js         | 243 ------------------
 3 files changed, 187 insertions(+), 260 deletions(-)
 create mode 100644 __tests__/unit/app/pages/clinicworkspace/useClinicMetricsPageName.test.js

diff --git a/__tests__/unit/app/pages/clinicworkspace/useClinicMetricsPageName.test.js b/__tests__/unit/app/pages/clinicworkspace/useClinicMetricsPageName.test.js
new file mode 100644
index 0000000000..45c9b7b564
--- /dev/null
+++ b/__tests__/unit/app/pages/clinicworkspace/useClinicMetricsPageName.test.js
@@ -0,0 +1,24 @@
+import React from 'react';
+import { MemoryRouter } from 'react-router-dom';
+import { renderHook } from '@testing-library/react-hooks/dom';
+
+import useClinicMetricsPageName from '@app/pages/clinicworkspace/useClinicMetricsPageName';
+
+describe('useClinicMetricsPageName', () => {
+  const renderPageNameHook = (route) => renderHook(
+    () => useClinicMetricsPageName(),
+    { wrapper: ({ children }) => <MemoryRouter initialEntries={[route]}>{children}</MemoryRouter> }
+  ).result.current;
+
+  it('returns Population Health arg', () => {
+    expect(renderPageNameHook('/clinic-workspace')).toBe('Population Health');
+  });
+
+  it('returns Population Health arg when backing out from patient data view', () => {
+    expect(renderPageNameHook('/clinic-workspace/patients')).toBe('Population Health');
+  });
+
+  it('returns TIDE Dashboard arg', () => {
+    expect(renderPageNameHook('/clinic-workspace/tide-dashboard')).toBe('TIDE Dashboard');
+  });
+});
diff --git a/__tests__/unit/app/redux/actions/async.test.js b/__tests__/unit/app/redux/actions/async.test.js
index d0159488a7..f3b55b9696 100644
--- a/__tests__/unit/app/redux/actions/async.test.js
+++ b/__tests__/unit/app/redux/actions/async.test.js
@@ -2,28 +2,17 @@
 /* global describe */
 /* global it */
 /* global expect */
-/* global beforeEach */
-/* global before */
-/* global afterEach */
-/* global after */
-/* global context */
 
 import configureStore from 'redux-mock-store';
 import { thunk } from 'redux-thunk';
 import trackingMiddleware from '../../../../../app/redux/utils/trackingMiddleware';
-import moment from 'moment';
-import _ from 'lodash';
-
-import isTSA from 'tidepool-standard-action';
 
 import initialState from '../../../../../app/redux/reducers/initialState';
 
 import * as ErrorMessages from '../../../../../app/redux/constants/errorMessages';
-import * as UserMessages from '../../../../../app/redux/constants/usrMessages';
 
 // need to require() async in order to rewire utils inside
 const async = require('../../../../../app/redux/actions/async');
-const sync = require('../../../../../app/redux/actions/sync');
 
 describe('Actions', () => {
   const trackMetric = jest.fn();
@@ -48,9 +37,6 @@ describe('Actions', () => {
           { type: 'CREATE_CLINIC_SITE_REQUEST' },
           { type: 'CREATE_CLINIC_SITE_SUCCESS', payload: { clinicId, site: newSite } },
         ];
-        _.each(expectedActions, (action) => {
-          expect(isTSA(action)).toBe(true);
-        });
 
         let store = mockStore({ blip: initialState });
         store.dispatch(async.createClinicSite(api, clinicId, { name: 'Site Alpha' }));
@@ -76,9 +62,7 @@ describe('Actions', () => {
           { type: 'CREATE_CLINIC_SITE_REQUEST' },
           { type: 'CREATE_CLINIC_SITE_FAILURE', error: err, meta: { apiError: { status: 500, body: 'Error!' } } },
         ];
-        _.each(expectedActions, (action) => {
-          expect(isTSA(action)).toBe(true);
-        });
+
         let store = mockStore({ blip: initialState });
         store.dispatch(async.createClinicSite(api, clinicId, { name: 'Site Charlie' }));
 
@@ -87,5 +71,167 @@ describe('Actions', () => {
         expect(api.clinics.createClinicSite).toHaveBeenCalledTimes(1);
       });
     });
+
+    describe('selectClinic', () => {
+      const clinicId = 'clinic123';
+
+      const expectedUIDetails = {
+        entitlements: {
+          patientTags: false,
+          clinicSites: false,
+          prescriptions: false,
+          rpmReport: false,
+          summaryDashboard: false,
+          tideDashboard: false,
+        },
+        patientLimitEnforced: false,
+        planName: 'internationalBase',
+        ui: {
+          display: {
+            patientCount: true,
+            patientLimit: false,
+            planName: false,
+            workspacePlan: false,
+            workspaceLimitDescription: false,
+            workspaceLimitFeedback: false,
+            workspaceLimitResolutionLink: false,
+          },
+          text: {
+            planDisplayName: 'Base',
+            limitDescription: undefined,
+            limitFeedback: undefined,
+            limitResolutionLink: undefined,
+          },
+          warnings: {
+            limitApproaching: false,
+            limitReached: false,
+          },
+        },
+      };
+
+      it('should trigger SELECT_CLINIC_SUCCESS, FETCH_CLINIC_PATIENT_COUNTS_SUCCESS, and FETCH_CLINIC_PATIENT_COUNT_SETTINGS_SUCCESS for a successful request', () => {
+        const countResults = { plan: 33 };
+        const settingsResults = { bar: 'baz' };
+
+        let api = {
+          clinics: {
+            getClinicPatientCount: jest.fn().mockImplementation((_arg1, cb) => cb(null, countResults)),
+            getClinicPatientCountSettings: jest.fn().mockImplementation((_arg1, cb) => cb(null, settingsResults)),
+          },
+        };
+
+        let expectedActions = [
+          { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId } },
+          { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
+          { type: 'FETCH_CLINIC_PATIENT_COUNTS_REQUEST' },
+          { type: 'FETCH_CLINIC_PATIENT_COUNT_SETTINGS_REQUEST' },
+          { type: 'FETCH_CLINIC_PATIENT_COUNTS_SUCCESS', payload: { clinicId, patientCounts: countResults } },
+          { type: 'FETCH_CLINIC_PATIENT_COUNT_SETTINGS_SUCCESS', payload: { clinicId, patientCountSettings: settingsResults } },
+          { type: 'SET_CLINIC_UI_DETAILS', payload: { clinicId, uiDetails: expectedUIDetails } },
+        ];
+
+        let store = mockStore({ blip: {
+          ...initialState,
+          clinics: {
+            [clinicId]: {
+              patientCounts: undefined,
+              patientCountSettings: undefined,
+            },
+          },
+        } });
+
+        store.dispatch(async.selectClinic(api, clinicId));
+
+        const actions = store.getActions();
+        expect(actions).toStrictEqual(expectedActions);
+        expect(api.clinics.getClinicPatientCount).toHaveBeenCalledWith(clinicId, expect.any(Function));
+        expect(api.clinics.getClinicPatientCount).toHaveBeenCalledTimes(1);
+        expect(api.clinics.getClinicPatientCountSettings).toHaveBeenCalledWith(clinicId, expect.any(Function));
+        expect(api.clinics.getClinicPatientCountSettings).toHaveBeenCalledTimes(1);
+      });
+
+      it('should trigger SELECT_CLINIC_SUCCESS, but not FETCH_CLINIC_PATIENT_COUNTS_REQUEST or FETCH_CLINIC_PATIENT_COUNT_SETTINGS_REQUEST for a successful request if data available in clinic state', () => {
+        let api = {
+          clinics: {
+            getClinicPatientCount: jest.fn(),
+            getClinicPatientCountSettings: jest.fn(),
+          },
+        };
+
+        let expectedActions = [
+          { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId } },
+          { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
+          { type: 'SET_CLINIC_UI_DETAILS', payload: { clinicId, uiDetails: expectedUIDetails } },
+        ];
+
+        let store = mockStore({ blip: {
+          ...initialState,
+          clinics: {
+            [clinicId]: {
+              patientCounts: { plan: 33 },
+              patientCountSettings: { foo: 'bar' },
+            },
+          },
+        } });
+
+        store.dispatch(async.selectClinic(api, clinicId));
+
+        const actions = store.getActions();
+        expect(actions).toStrictEqual(expectedActions);
+        expect(api.clinics.getClinicPatientCount).not.toHaveBeenCalled();
+        expect(api.clinics.getClinicPatientCountSettings).not.toHaveBeenCalled();
+      });
+
+      it('should trigger FETCH_CLINIC_PATIENT_COUNTS_FAILURE and FETCH_CLINIC_PATIENT_COUNT_SETTINGS_FAILURE and it should call error once for a failed request', () => {
+        let api = {
+          clinics: {
+            getClinicPatientCount: jest.fn().mockImplementation((_arg1, cb) => cb({ status: 500, body: 'Count Error!' }, null)),
+            getClinicPatientCountSettings: jest.fn().mockImplementation((_arg1, cb) => cb({ status: 500, body: 'Settings Error!' }, null)),
+          },
+        };
+
+        let countErr = new Error(ErrorMessages.ERR_FETCHING_CLINIC_PATIENT_COUNTS);
+        countErr.status = 500;
+
+        let settingsErr = new Error(ErrorMessages.ERR_FETCHING_CLINIC_PATIENT_COUNT_SETTINGS);
+        settingsErr.status = 500;
+
+        let expectedActions = [
+          { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId } },
+          { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
+          { type: 'FETCH_CLINIC_PATIENT_COUNTS_REQUEST' },
+          { type: 'FETCH_CLINIC_PATIENT_COUNT_SETTINGS_REQUEST' },
+          {
+            type: 'FETCH_CLINIC_PATIENT_COUNTS_FAILURE',
+            error: countErr,
+            meta: { apiError: { status: 500, body: 'Count Error!' } },
+          },
+          {
+            type: 'FETCH_CLINIC_PATIENT_COUNT_SETTINGS_FAILURE',
+            error: settingsErr,
+            meta: { apiError: { status: 500, body: 'Settings Error!' } },
+          },
+        ];
+
+        let store = mockStore({ blip: {
+          ...initialState,
+          clinics: {
+            [clinicId]: {
+              patientCounts: undefined,
+              patientCountSettings: undefined,
+            },
+          },
+        } });
+
+        store.dispatch(async.selectClinic(api, clinicId));
+
+        const actions = store.getActions();
+        expect(actions).toStrictEqual(expectedActions);
+        expect(api.clinics.getClinicPatientCount).toHaveBeenCalledWith(clinicId, expect.any(Function));
+        expect(api.clinics.getClinicPatientCount).toHaveBeenCalledTimes(1);
+        expect(api.clinics.getClinicPatientCountSettings).toHaveBeenCalledWith(clinicId, expect.any(Function));
+        expect(api.clinics.getClinicPatientCountSettings).toHaveBeenCalledTimes(1);
+      });
+    });
   });
 });
diff --git a/test/unit/redux/actions/async.test.js b/test/unit/redux/actions/async.test.js
index bd3b645435..4fc46e8912 100644
--- a/test/unit/redux/actions/async.test.js
+++ b/test/unit/redux/actions/async.test.js
@@ -9445,249 +9445,6 @@ describe('Actions', () => {
       });
     });
 
-    describe('selectClinic', () => {
-      it('should trigger SELECT_CLINIC_SUCCESS, FETCH_CLINIC_PATIENT_COUNTS_SUCCESS, and FETCH_CLINIC_PATIENT_COUNT_SETTINGS_SUCCESS for a successful request', () => {
-        const clinicId = 'clinic123';
-        const countResults = { plan: 33 };
-        const settingsResults = {bar: 'baz'};
-
-        let api = {
-          clinics: {
-            getClinicPatientCount: sinon
-              .stub()
-              .callsArgWith(1, null, countResults),
-            getClinicPatientCountSettings: sinon
-              .stub()
-              .callsArgWith(1, null, settingsResults),
-          },
-        };
-
-        let expectedActions = [
-          { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId } },
-          { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
-          { type: 'FETCH_CLINIC_PATIENT_COUNTS_REQUEST' },
-          { type: 'FETCH_CLINIC_PATIENT_COUNT_SETTINGS_REQUEST' },
-          {
-            type: 'FETCH_CLINIC_PATIENT_COUNTS_SUCCESS',
-            payload: { clinicId, patientCounts: countResults },
-          },
-          {
-            type: 'FETCH_CLINIC_PATIENT_COUNT_SETTINGS_SUCCESS',
-            payload: { clinicId, patientCountSettings: settingsResults },
-          },
-          {
-            type: 'SET_CLINIC_UI_DETAILS',
-            payload: {
-              clinicId: 'clinic123',
-              uiDetails: {
-                entitlements: {
-                  patientTags: false,
-                  clinicSites: false,
-                  prescriptions: false,
-                  rpmReport: false,
-                  summaryDashboard: false,
-                  tideDashboard: false,
-                },
-                patientLimitEnforced: false,
-                planName: 'internationalBase',
-                ui: {
-                  display: {
-                    patientCount: true,
-                    patientLimit: false,
-                    planName: false,
-                    workspacePlan: false,
-                    workspaceLimitDescription: false,
-                    workspaceLimitFeedback: false,
-                    workspaceLimitResolutionLink: false,
-                  },
-                  text: {
-                    planDisplayName: 'Base',
-                    limitDescription: undefined,
-                    limitFeedback: undefined,
-                    limitResolutionLink: undefined,
-                  },
-                  warnings: {
-                    limitApproaching: false,
-                    limitReached: false,
-                  },
-                },
-              },
-            },
-          },
-        ];
-        _.each(expectedActions, (action) => {
-          expect(isTSA(action)).to.be.true;
-        });
-
-        let store = mockStore({ blip: {
-          ...initialState,
-          clinics: {
-            [clinicId]: {
-              patientCounts: undefined,
-              patientCountSettings: undefined,
-            },
-          },
-        } });
-
-        store.dispatch(
-          async.selectClinic(api, clinicId)
-        );
-
-        const actions = store.getActions();
-        expect(actions).to.eql(expectedActions);
-        expect(api.clinics.getClinicPatientCount.callCount).to.equal(1);
-        expect(api.clinics.getClinicPatientCountSettings.callCount).to.equal(1);
-      });
-
-      it('should trigger SELECT_CLINIC_SUCCESS, but not FETCH_CLINIC_PATIENT_COUNTS_REQUEST or FETCH_CLINIC_PATIENT_COUNT_SETTINGS_REQUEST for a successful request if data available in clinic state', () => {
-        const clinicId = 'clinic123';
-
-        let api = {
-          clinics: {
-            getClinicPatientCount: sinon.stub(),
-            getClinicPatientCountSettings: sinon.stub(),
-          },
-        };
-
-        let expectedActions = [
-          { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId } },
-          { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
-          {
-            type: 'SET_CLINIC_UI_DETAILS',
-            payload: {
-              clinicId: 'clinic123',
-              uiDetails: {
-                entitlements: {
-                  patientTags: false,
-                  clinicSites: false,
-                  prescriptions: false,
-                  rpmReport: false,
-                  summaryDashboard: false,
-                  tideDashboard: false,
-                },
-                patientLimitEnforced: false,
-                planName: 'internationalBase',
-                ui: {
-                  display: {
-                    patientCount: true,
-                    patientLimit: false,
-                    planName: false,
-                    workspacePlan: false,
-                    workspaceLimitDescription: false,
-                    workspaceLimitFeedback: false,
-                    workspaceLimitResolutionLink: false,
-                  },
-                  text: {
-                    planDisplayName: 'Base',
-                    limitDescription: undefined,
-                    limitFeedback: undefined,
-                    limitResolutionLink: undefined,
-                  },
-                  warnings: {
-                    limitApproaching: false,
-                    limitReached: false,
-                  },
-                },
-              },
-            },
-          },
-        ];
-        _.each(expectedActions, (action) => {
-          expect(isTSA(action)).to.be.true;
-        });
-
-        let store = mockStore({ blip: {
-          ...initialState,
-          clinics: {
-            [clinicId]: {
-              patientCounts: { plan: 33 },
-              patientCountSettings: { foo: 'bar' },
-            },
-          },
-        } });
-
-        store.dispatch(
-          async.selectClinic(api, clinicId)
-        );
-
-        const actions = store.getActions();
-        expect(actions).to.eql(expectedActions);
-        expect(api.clinics.getClinicPatientCount.callCount).to.equal(0);
-        expect(api.clinics.getClinicPatientCountSettings.callCount).to.equal(0);
-      });
-
-      it('should trigger FETCH_CLINIC_PATIENT_COUNTS_FAILURE and FETCH_CLINIC_PATIENT_COUNT_SETTINGS_FAILURE and it should call error once for a failed request', () => {
-        const clinicId = 'clinic123';
-
-        let api = {
-          clinics: {
-            getClinicPatientCount: sinon
-              .stub()
-              .callsArgWith(1, { status: 500, body: 'Count Error!' }, null),
-            getClinicPatientCountSettings: sinon
-              .stub()
-              .callsArgWith(1, { status: 500, body: 'Settings Error!' }, null),
-          },
-        };
-
-        let countErr = new Error(ErrorMessages.ERR_FETCHING_CLINIC_PATIENT_COUNTS);
-        countErr.status = 500;
-
-        let settingsErr = new Error(ErrorMessages.ERR_FETCHING_CLINIC_PATIENT_COUNT_SETTINGS);
-        settingsErr.status = 500;
-
-        let expectedActions = [
-          { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId } },
-          { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
-          { type: 'FETCH_CLINIC_PATIENT_COUNTS_REQUEST' },
-          { type: 'FETCH_CLINIC_PATIENT_COUNT_SETTINGS_REQUEST' },
-          {
-            type: 'FETCH_CLINIC_PATIENT_COUNTS_FAILURE',
-            error: countErr,
-            meta: { apiError: { status: 500, body: 'Count Error!' } },
-          },
-          {
-            type: 'FETCH_CLINIC_PATIENT_COUNT_SETTINGS_FAILURE',
-            error: settingsErr,
-            meta: { apiError: { status: 500, body: 'Settings Error!' } },
-          },
-        ];
-        _.each(expectedActions, (action) => {
-          expect(isTSA(action)).to.be.true;
-        });
-
-        let store = mockStore({ blip: {
-          ...initialState,
-          clinics: {
-            [clinicId]: {
-              patientCounts: undefined,
-              patientCountSettings: undefined,
-            },
-          },
-        } });
-
-        store.dispatch(
-          async.selectClinic(api, clinicId)
-        );
-
-        const actions = store.getActions();
-
-        expect(actions[4].error).to.deep.include({
-          message: ErrorMessages.ERR_FETCHING_CLINIC_PATIENT_COUNTS,
-        });
-        expectedActions[4].error = actions[4].error;
-
-        expect(actions[5].error).to.deep.include({
-          message: ErrorMessages.ERR_FETCHING_CLINIC_PATIENT_COUNT_SETTINGS,
-        });
-        expectedActions[5].error = actions[5].error;
-        expect(actions).to.eql(expectedActions);
-
-        expect(api.clinics.getClinicPatientCount.callCount).to.equal(1);
-        expect(api.clinics.getClinicPatientCountSettings.callCount).to.equal(1);
-      });
-    });
-
     describe('fetchPatients', () => {
       let api;
       let store;

From 55247b5bb808be649f0a15cbb9b20fde9207b607 Mon Sep 17 00:00:00 2001
From: henry-tp <henry.liang@tidepool.org>
Date: Tue, 25 Aug 2026 13:37:10 -0700
Subject: [PATCH 14/23] WEB-4460 add tests for localStorage persistence from
 configureStore

---
 .../unit/app/redux/actions/async.test.js      | 12 ++++-
 .../redux/store/configureStore.dev.test.js    | 48 +++++++++++++++++++
 .../redux/store/configureStore.prod.test.js   | 48 +++++++++++++++++++
 3 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 __tests__/unit/app/redux/store/configureStore.dev.test.js
 create mode 100644 __tests__/unit/app/redux/store/configureStore.prod.test.js

diff --git a/__tests__/unit/app/redux/actions/async.test.js b/__tests__/unit/app/redux/actions/async.test.js
index f3b55b9696..34e4fe8794 100644
--- a/__tests__/unit/app/redux/actions/async.test.js
+++ b/__tests__/unit/app/redux/actions/async.test.js
@@ -2,6 +2,7 @@
 /* global describe */
 /* global it */
 /* global expect */
+/* global afterEach */
 
 import configureStore from 'redux-mock-store';
 import { thunk } from 'redux-thunk';
@@ -109,10 +110,18 @@ describe('Actions', () => {
         },
       };
 
+      afterEach(() => {
+        localStorage.clear();
+      });
+
       it('should trigger SELECT_CLINIC_SUCCESS, FETCH_CLINIC_PATIENT_COUNTS_SUCCESS, and FETCH_CLINIC_PATIENT_COUNT_SETTINGS_SUCCESS for a successful request', () => {
         const countResults = { plan: 33 };
         const settingsResults = { bar: 'baz' };
 
+        localStorage.setItem('tideDashboardFilters/user456/clinic123', JSON.stringify({ lastData: 7, patientTags: ['load1'] })); // this one should load
+        localStorage.setItem('tideDashboardFilters/wrongUser/clinic123', JSON.stringify({ lastData: 1 }));
+        localStorage.setItem('tideDashboardFilters/user456/wrongClinic', JSON.stringify({ lastData: 30 }));
+
         let api = {
           clinics: {
             getClinicPatientCount: jest.fn().mockImplementation((_arg1, cb) => cb(null, countResults)),
@@ -122,7 +131,7 @@ describe('Actions', () => {
 
         let expectedActions = [
           { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId } },
-          { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
+          { type: 'tideDashboardFilters/setTideDashboardFilters', payload: { lastData: 7, patientTags: ['load1'] } }, // loads from localState
           { type: 'FETCH_CLINIC_PATIENT_COUNTS_REQUEST' },
           { type: 'FETCH_CLINIC_PATIENT_COUNT_SETTINGS_REQUEST' },
           { type: 'FETCH_CLINIC_PATIENT_COUNTS_SUCCESS', payload: { clinicId, patientCounts: countResults } },
@@ -132,6 +141,7 @@ describe('Actions', () => {
 
         let store = mockStore({ blip: {
           ...initialState,
+          loggedInUserId: 'user456',
           clinics: {
             [clinicId]: {
               patientCounts: undefined,
diff --git a/__tests__/unit/app/redux/store/configureStore.dev.test.js b/__tests__/unit/app/redux/store/configureStore.dev.test.js
new file mode 100644
index 0000000000..1854a68247
--- /dev/null
+++ b/__tests__/unit/app/redux/store/configureStore.dev.test.js
@@ -0,0 +1,48 @@
+/* global jest */
+/* global describe */
+/* global it */
+/* global expect */
+/* global beforeEach */
+/* global afterEach */
+
+import configureStore from '@app/redux/store/configureStore.dev';
+import { setTideDashboardFilters } from '@app/pages/clinicworkspace/TideDashboardV2/tideDashboardFiltersSlice';
+
+describe('configureStore.dev', () => {
+  const api = {
+    metrics: { track: jest.fn() },
+    errors: { log: jest.fn() },
+  };
+
+  beforeEach(() => {
+    jest.useFakeTimers();
+  });
+
+  afterEach(() => {
+    jest.useRealTimers();
+    localStorage.clear();
+  });
+
+  it('should persist select items to localStorage, scoped to the logged-in user and selected clinic', () => {
+    // Log in and select a clinic
+    const store = configureStore(api);
+    store.dispatch({ type: 'FETCH_USER_SUCCESS', payload: { user: { userid: 'user456' } } });
+    store.dispatch({ type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'clinic123' } });
+    store.dispatch(setTideDashboardFilters({ patientTags: ['tag1'], summaryPeriod: '7d' }));
+
+    jest.advanceTimersByTime(1200); // subscriber is throttled to 1 second
+
+    expect(JSON.parse(localStorage.getItem('blipState'))).toStrictEqual({ selectedClinicId: 'clinic123' });
+    expect(JSON.parse(localStorage.getItem('tideDashboardFilters/user456/clinic123'))).toStrictEqual({ patientTags: ['tag1'], summaryPeriod: '7d' });
+  });
+
+  it('should not persist items no clinic is selected', () => {
+    const store = configureStore(api);
+    store.dispatch({ type: 'FETCH_USER_SUCCESS', payload: { user: { userid: 'user456' } } });
+
+    jest.advanceTimersByTime(1200); // subscriber is throttled to 1 second
+
+    expect(JSON.parse(localStorage.getItem('blipState'))).toStrictEqual({ selectedClinicId: null });
+    expect(JSON.parse(localStorage.getItem('tideDashboardFilters/user456/clinic123'))).toStrictEqual(null);
+  });
+});
diff --git a/__tests__/unit/app/redux/store/configureStore.prod.test.js b/__tests__/unit/app/redux/store/configureStore.prod.test.js
new file mode 100644
index 0000000000..71cdf10cb5
--- /dev/null
+++ b/__tests__/unit/app/redux/store/configureStore.prod.test.js
@@ -0,0 +1,48 @@
+/* global jest */
+/* global describe */
+/* global it */
+/* global expect */
+/* global beforeEach */
+/* global afterEach */
+
+import configureStore from '@app/redux/store/configureStore.prod';
+import { setTideDashboardFilters } from '@app/pages/clinicworkspace/TideDashboardV2/tideDashboardFiltersSlice';
+
+describe('configureStore.prod', () => {
+  const api = {
+    metrics: { track: jest.fn() },
+    errors: { log: jest.fn() },
+  };
+
+  beforeEach(() => {
+    jest.useFakeTimers();
+  });
+
+  afterEach(() => {
+    jest.useRealTimers();
+    localStorage.clear();
+  });
+
+  it('should persist select items to localStorage, scoped to the logged-in user and selected clinic', () => {
+    // Log in and select a clinic
+    const store = configureStore(api);
+    store.dispatch({ type: 'FETCH_USER_SUCCESS', payload: { user: { userid: 'user456' } } });
+    store.dispatch({ type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'clinic123' } });
+    store.dispatch(setTideDashboardFilters({ patientTags: ['tag1'], summaryPeriod: '7d' }));
+
+    jest.advanceTimersByTime(1200); // subscriber is throttled to 1 second
+
+    expect(JSON.parse(localStorage.getItem('blipState'))).toStrictEqual({ selectedClinicId: 'clinic123' });
+    expect(JSON.parse(localStorage.getItem('tideDashboardFilters/user456/clinic123'))).toStrictEqual({ patientTags: ['tag1'], summaryPeriod: '7d' });
+  });
+
+  it('should not persist items no clinic is selected', () => {
+    const store = configureStore(api);
+    store.dispatch({ type: 'FETCH_USER_SUCCESS', payload: { user: { userid: 'user456' } } });
+
+    jest.advanceTimersByTime(1200); // subscriber is throttled to 1 second
+
+    expect(JSON.parse(localStorage.getItem('blipState'))).toStrictEqual({ selectedClinicId: null });
+    expect(JSON.parse(localStorage.getItem('tideDashboardFilters/user456/clinic123'))).toStrictEqual(null);
+  });
+});

From 314f3ff128da74b1ccf54d53b7f8c94914ce1c1b Mon Sep 17 00:00:00 2001
From: henry-tp <henry.liang@tidepool.org>
Date: Tue, 25 Aug 2026 14:12:02 -0700
Subject: [PATCH 15/23] WEB-4460 use more conventional style of redux action in
 tests

---
 .../TideDashboardV2/FilterByDataRecency.test.js          | 6 ++----
 .../TideDashboardV2/FilterBySites.test.js                | 6 ++----
 .../TideDashboardV2/FilterBySummaryPeriod.test.js        | 6 ++----
 .../clinicworkspace/TideDashboardV2/FilterByTags.test.js | 6 ++----
 .../TideDashboardV2/usePruneInvalidFilters.test.js       | 9 ++++-----
 5 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterByDataRecency.test.js b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterByDataRecency.test.js
index 5686027994..b724bc0211 100644
--- a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterByDataRecency.test.js
+++ b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterByDataRecency.test.js
@@ -7,8 +7,6 @@ import { thunk } from 'redux-thunk';
 import { MemoryRouter } from 'react-router-dom';
 
 import FilterByDataRecency from '@app/pages/clinicworkspace/TideDashboardV2/FilterByDataRecency';
-import { setLastDataFilter } from '@app/pages/clinicworkspace/TideDashboardV2/tideDashboardFiltersSlice';
-import { setOffset } from '@app/pages/clinicworkspace/TideDashboardV2/tideDashboardSlice';
 
 const mockStore = configureStore([thunk]);
 
@@ -59,8 +57,8 @@ describe('FilterByDataRecency', () => {
     // Applying the filter dispatches the new filter value and resets the page offset
     await userEvent.click(screen.getByRole('button', { name: /Apply/ }));
     expect(store.getActions()).toStrictEqual([
-      setLastDataFilter(2),
-      setOffset(0),
+      { type: 'tideDashboardFilters/setLastDataFilter', payload: 2 },
+      { type: 'tideDashboard/setOffset', payload: 0 },
     ]);
   });
 });
diff --git a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterBySites.test.js b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterBySites.test.js
index a1c38240d2..16d3f108fa 100644
--- a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterBySites.test.js
+++ b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterBySites.test.js
@@ -7,8 +7,6 @@ import { thunk } from 'redux-thunk';
 import { MemoryRouter } from 'react-router-dom';
 
 import FilterBySites from '@app/pages/clinicworkspace/TideDashboardV2/FilterBySites';
-import { setClinicSitesFilter } from '@app/pages/clinicworkspace/TideDashboardV2/tideDashboardFiltersSlice';
-import { setOffset } from '@app/pages/clinicworkspace/TideDashboardV2/tideDashboardSlice';
 
 const mockStore = configureStore([thunk]);
 
@@ -56,8 +54,8 @@ describe('FilterBySites', () => {
     // Applying the filter dispatches the selected sites and resets the page offset
     await userEvent.click(screen.getByRole('button', { name: /Apply/ }));
     expect(store.getActions()).toStrictEqual([
-      setClinicSitesFilter(['site1', 'site2']),
-      setOffset(0),
+      { type: 'tideDashboardFilters/setClinicSitesFilter', payload: ['site1', 'site2'] },
+      { type: 'tideDashboard/setOffset', payload: 0 },
     ]);
   });
 });
diff --git a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterBySummaryPeriod.test.js b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterBySummaryPeriod.test.js
index baee8ea4c3..c43a900289 100644
--- a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterBySummaryPeriod.test.js
+++ b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterBySummaryPeriod.test.js
@@ -7,8 +7,6 @@ import { thunk } from 'redux-thunk';
 import { MemoryRouter } from 'react-router-dom';
 
 import FilterBySummaryPeriod from '@app/pages/clinicworkspace/TideDashboardV2/FilterBySummaryPeriod';
-import { setSummaryPeriodFilter } from '@app/pages/clinicworkspace/TideDashboardV2/tideDashboardFiltersSlice';
-import { setOffset } from '@app/pages/clinicworkspace/TideDashboardV2/tideDashboardSlice';
 
 const mockStore = configureStore([thunk]);
 
@@ -54,8 +52,8 @@ describe('FilterBySummaryPeriod', () => {
     // Applying the filter dispatches the new period and resets the page offset
     await userEvent.click(screen.getByRole('button', { name: /Apply/ }));
     expect(store.getActions()).toStrictEqual([
-      setSummaryPeriodFilter('30d'),
-      setOffset(0),
+      { type: 'tideDashboardFilters/setSummaryPeriodFilter', payload: '30d' },
+      { type: 'tideDashboard/setOffset', payload: 0 },
     ]);
   });
 });
diff --git a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterByTags.test.js b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterByTags.test.js
index aad7e27c44..2e57866f9a 100644
--- a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterByTags.test.js
+++ b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterByTags.test.js
@@ -7,8 +7,6 @@ import { thunk } from 'redux-thunk';
 import { MemoryRouter } from 'react-router-dom';
 
 import FilterByTags from '@app/pages/clinicworkspace/TideDashboardV2/FilterByTags';
-import { setPatientTagsFilter } from '@app/pages/clinicworkspace/TideDashboardV2/tideDashboardFiltersSlice';
-import { setOffset } from '@app/pages/clinicworkspace/TideDashboardV2/tideDashboardSlice';
 
 const mockStore = configureStore([thunk]);
 
@@ -59,8 +57,8 @@ describe('FilterByTags', () => {
     // Applying the filter dispatches the selected tags and resets the page offset
     await userEvent.click(screen.getByRole('button', { name: /Apply/ }));
     expect(store.getActions()).toStrictEqual([
-      setPatientTagsFilter(['tag2']),
-      setOffset(0),
+      { type: 'tideDashboardFilters/setPatientTagsFilter', payload: ['tag2'] },
+      { type: 'tideDashboard/setOffset', payload: 0 },
     ]);
   });
 });
diff --git a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/usePruneInvalidFilters.test.js b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/usePruneInvalidFilters.test.js
index 7818db19c9..eaf20f6f0b 100644
--- a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/usePruneInvalidFilters.test.js
+++ b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/usePruneInvalidFilters.test.js
@@ -5,7 +5,6 @@ import { thunk } from 'redux-thunk';
 import configureStore from 'redux-mock-store';
 
 import usePruneInvalidFilters from '@app/pages/clinicworkspace/TideDashboardV2/usePruneInvalidFilters';
-import { setPatientTagsFilter, setClinicSitesFilter } from '@app/pages/clinicworkspace/TideDashboardV2/tideDashboardFiltersSlice';
 import { SPECIAL_FILTER_STATES } from '@app/pages/clinicworkspace/useClinicPatientsFilters';
 
 const mockStore = configureStore([thunk]);
@@ -51,7 +50,7 @@ describe('usePruneInvalidFilters', () => {
     renderPruneHook({ filterOverrides: { patientTags: ['tag1', 'tag3'] } });
 
     expect(store.getActions()).toStrictEqual([
-      setPatientTagsFilter(['tag1']),
+      { type: 'tideDashboardFilters/setPatientTagsFilter', payload: ['tag1'] },
     ]);
   });
 
@@ -59,7 +58,7 @@ describe('usePruneInvalidFilters', () => {
     renderPruneHook({ filterOverrides: { clinicSites: ['site3', 'site2'] } });
 
     expect(store.getActions()).toStrictEqual([
-      setClinicSitesFilter(['site2']),
+      { type: 'tideDashboardFilters/setClinicSitesFilter', payload: ['site2'] },
     ]);
   });
 
@@ -72,8 +71,8 @@ describe('usePruneInvalidFilters', () => {
     });
 
     expect(store.getActions()).toStrictEqual([
-      setPatientTagsFilter(['tag1']),
-      setClinicSitesFilter(['site2']),
+      { type: 'tideDashboardFilters/setPatientTagsFilter', payload: ['tag1'] },
+      { type: 'tideDashboardFilters/setClinicSitesFilter', payload: ['site2'] },
     ]);
   });
 

From c07e222e7bbbdd6a6b6cb84c12ce6241d3301980 Mon Sep 17 00:00:00 2001
From: henry-tp <henry.liang@tidepool.org>
Date: Thu, 27 Aug 2026 13:05:48 -0700
Subject: [PATCH 16/23] WEB-4460 add test for DEFAULT_WITH_FILTERS

---
 .../TideDashboardV2/TideDashboardV2.test.js   | 74 +++++++++++++------
 1 file changed, 52 insertions(+), 22 deletions(-)

diff --git a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/TideDashboardV2.test.js b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/TideDashboardV2.test.js
index c481f12a0d..74a970df3e 100644
--- a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/TideDashboardV2.test.js
+++ b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/TideDashboardV2.test.js
@@ -120,9 +120,18 @@ const anticipatedQueries = {
     'cgm.timeInVeryHighPercent': '<0.045',
     'cgm.timeCGMUsePercent': '>=0.695',
   },
+  'DEFAULT_WITH_FILTERS': {
+    offset: '0',
+    limit: '12',
+    period: '30d',
+    'cgm.lastDataFrom': '2025-05-23T00:00:00.000Z',
+    'cgm.lastDataTo': '2025-05-30T00:00:00.000Z',
+    tags: 'tag8',
+    sites: 'site9',
+  },
 };
 
-const patientsForCategory = {
+const datasets = {
   [DEFAULT]: [
     { id: 'default-1', fullName: 'Default Patient 1', birthDate: '2001-01-01' },
     { id: 'default-2', fullName: 'Default Patient 2', birthDate: '2002-02-02' },
@@ -155,22 +164,25 @@ const patientsForCategory = {
     { id: 'target-1', fullName: 'Meeting Targets Patient 1', birthDate: '2015-03-15' },
     { id: 'target-2', fullName: 'Meeting Targets Patient 2', birthDate: '2016-04-16' },
   ],
+  'DEFAULT_WITH_FILTERS': [
+    { id: 'filtered-3', fullName: 'Filtered Patient 3', birthDate: '2001-01-01' },
+  ],
 };
 
 const getCorrespondingDataForQuery = (searchParams) => {
-  let datasetName;
+  let matchedDatasetName;
 
   // Look over anticipated queries. If the query matches, return the dataset
-  for (let [category, anticipatedQuery] of entries(anticipatedQueries)) {
+  for (let [datasetName, anticipatedQuery] of entries(anticipatedQueries)) {
     if (isEqual(searchParams, anticipatedQuery)) {
-      datasetName = category;
+      matchedDatasetName = datasetName;
       break;
     }
   }
 
-  if (!datasetName) throw new Error('No data for this query found');
+  if (!matchedDatasetName) throw new Error('No data for this query found');
 
-  return patientsForCategory[datasetName];
+  return datasets[matchedDatasetName];
 };
 
 const server = setupServer(
@@ -265,45 +277,63 @@ describe('TideDashboardV2', () => {
     expect(screen.queryByText('Low CGM Wear Patient 1')).not.toBeInTheDocument();
   }, TEST_TIMEOUT_MS);
 
+  it('fetches with filters', async () => {
+    store = setupStore({
+      blip: {
+        selectedClinicId: 'clinic123',
+        clinics: { clinic123: { id: 'clinic123', patientTags: [{ id: 'tag8', name: 'Tag 8' }], sites: [{ id: 'site9', name: 'Site 9' }] } },
+        tideDashboardFilters: { lastData: 7, patientTags: ['tag8'], clinicSites: ['site9'], summaryPeriod: '30d' },
+      },
+    }, { blip: blipReducer });
+
+    renderComponent();
+
+    expect(await screen.findByText('Filtered Patient 3')).toBeInTheDocument();
+  }, TEST_TIMEOUT_MS);
+
   describe('empty content', () => {
+    beforeEach(() => {
+      let fetchCount = 0;
+
+      server.use(
+        http.get('http://app.tidepool.test/v1/clinics/clinic123/patients', () => {
+          fetchCount += 1;
+
+          return fetchCount <= 1
+            // first fetch -> no patients
+            ? HttpResponse.json({ data: [], meta: { count: 0 } })
+            // refetch -> 1 patient
+            : HttpResponse.json({ data: [{ id: 'default-1', fullName: 'Default Patient 1', birthDate: '2001-01-01' }], meta: { count: 1 } });
+          }
+        )
+      );
+    });
+
     it('shows Reset button when no patients match applied filters', async () => {
       // A tag filter is applied before the dashboard mounts
       store = setupStore({
         blip: {
           selectedClinicId: 'clinic123',
-          clinics: {
-            clinic123: { id: 'clinic123', patientTags: [{ id: 'tag1', name: 'Tag One' }] },
-          },
+          clinics: { clinic123: { id: 'clinic123', patientTags: [{ id: 'tag1', name: 'Tag One' }] } },
           tideDashboardFilters: { lastData: 7, patientTags: ['tag1'], clinicSites: [], summaryPeriod: '14d' },
         },
       }, { blip: blipReducer });
 
       renderComponent();
 
-      // The tag-filtered query returns no patients, so the filtered empty message shows
       const emptyContent = await screen.findByTestId('tide-dashboard-empty-content');
       expect(within(emptyContent).getByText('There are no patients with the current filter(s)')).toBeInTheDocument();
-      expect(screen.queryByText('Default Patient 1')).not.toBeInTheDocument();
-
-      // Resetting the filters refetches and shows the unfiltered cohort
       await userEvent.click(within(emptyContent).getByRole('button', { name: 'Reset All Filters' }));
+
       expect(await screen.findByText('Default Patient 1')).toBeInTheDocument();
-      expect(screen.queryByTestId('tide-dashboard-empty-content')).not.toBeInTheDocument();
     });
 
     it('shows an empty message without a reset button when there are no patients and no filters applied', async () => {
-      // No patients exist for the unfiltered query
-      server.use(
-        http.get('http://app.tidepool.test/v1/clinics/clinic123/patients', () =>
-          HttpResponse.json({ data: [], meta: { count: 0 } })
-        )
-      );
-
       renderComponent();
 
       const emptyContent = await screen.findByTestId('tide-dashboard-empty-content');
       expect(within(emptyContent).getByText('There are no results to show')).toBeInTheDocument();
-      expect(screen.queryByRole('button', { name: 'Reset All Filters' })).not.toBeInTheDocument();
+      expect(screen.queryByRole('button', { name: 'Reset All Filters' })).not.toBeInTheDocument(); // no filters = no button
     });
   });
 });

From e217978cb7501a0e2162f51aee2e967ac87e9b0f Mon Sep 17 00:00:00 2001
From: henry-tp <henry.liang@tidepool.org>
Date: Fri, 28 Aug 2026 16:45:28 -0700
Subject: [PATCH 17/23] WEB-4460 re-run prune hook on clinic change

---
 .../TideDashboardV2/usePruneInvalidFilters.js          | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/pages/clinicworkspace/TideDashboardV2/usePruneInvalidFilters.js b/app/pages/clinicworkspace/TideDashboardV2/usePruneInvalidFilters.js
index 2eec43412a..1713447831 100644
--- a/app/pages/clinicworkspace/TideDashboardV2/usePruneInvalidFilters.js
+++ b/app/pages/clinicworkspace/TideDashboardV2/usePruneInvalidFilters.js
@@ -11,8 +11,10 @@ const usePruneInvalidFilters = () => {
   const clinic = useSelector(state => state.blip.clinics?.[selectedClinicId]);
   const { patientTags, clinicSites } = useSelector(state => state.blip.tideDashboardFilters);
 
+  const clinicId = clinic?.id;
+
   useEffect(() => {
-    if (!patientTags?.length || !clinic) return;
+    if (!patientTags?.length || !clinicId) return;
 
     if (isEqual(patientTags, SPECIAL_FILTER_STATES.ZERO_TAGS)) return;
 
@@ -22,10 +24,10 @@ const usePruneInvalidFilters = () => {
     if (prunedTags.length < patientTags.length) {
       dispatch(setPatientTagsFilter(prunedTags));
     }
-  }, []);
+  }, [clinicId]);
 
   useEffect(() => {
-    if (!clinicSites?.length || !clinic) return;
+    if (!clinicSites?.length || !clinicId) return;
 
     if (isEqual(clinicSites, SPECIAL_FILTER_STATES.ZERO_SITES)) return;
 
@@ -35,7 +37,7 @@ const usePruneInvalidFilters = () => {
     if (prunedSites.length < clinicSites.length) {
       dispatch(setClinicSitesFilter(prunedSites));
     }
-  }, []);
+  }, [clinicId]);
 };
 
 export default usePruneInvalidFilters;

From 704f40c37ac5476ee2b93ef3138de7a81891fecd Mon Sep 17 00:00:00 2001
From: henry-tp <henry.liang@tidepool.org>
Date: Mon, 31 Aug 2026 13:52:52 -0700
Subject: [PATCH 18/23] WEB-4460 move filters into directory

---
 .../{ => filters}/FilterByDataRecency.test.js        |  2 +-
 .../{ => filters}/FilterBySites.test.js              |  2 +-
 .../{ => filters}/FilterBySummaryPeriod.test.js      |  2 +-
 .../{ => filters}/FilterByTags.test.js               |  2 +-
 .../TideDashboardV2/TideDashboardV2.js               | 12 ++++++------
 .../{ => filters}/AppliedFiltersList.js              |  8 ++++----
 .../{ => filters}/FilterByCategory.js                |  4 ++--
 .../{ => filters}/FilterByDataRecency.js             |  8 ++++----
 .../TideDashboardV2/{ => filters}/FilterBySites.js   |  6 +++---
 .../{ => filters}/FilterBySummaryPeriod.js           |  6 +++---
 .../TideDashboardV2/{ => filters}/FilterByTags.js    |  6 +++---
 11 files changed, 29 insertions(+), 29 deletions(-)
 rename __tests__/unit/app/pages/clinicworkspace/TideDashboardV2/{ => filters}/FilterByDataRecency.test.js (98%)
 rename __tests__/unit/app/pages/clinicworkspace/TideDashboardV2/{ => filters}/FilterBySites.test.js (98%)
 rename __tests__/unit/app/pages/clinicworkspace/TideDashboardV2/{ => filters}/FilterBySummaryPeriod.test.js (97%)
 rename __tests__/unit/app/pages/clinicworkspace/TideDashboardV2/{ => filters}/FilterByTags.test.js (98%)
 rename app/pages/clinicworkspace/TideDashboardV2/{ => filters}/AppliedFiltersList.js (87%)
 rename app/pages/clinicworkspace/TideDashboardV2/{ => filters}/FilterByCategory.js (93%)
 rename app/pages/clinicworkspace/TideDashboardV2/{ => filters}/FilterByDataRecency.js (74%)
 rename app/pages/clinicworkspace/TideDashboardV2/{ => filters}/FilterBySites.js (71%)
 rename app/pages/clinicworkspace/TideDashboardV2/{ => filters}/FilterBySummaryPeriod.js (72%)
 rename app/pages/clinicworkspace/TideDashboardV2/{ => filters}/FilterByTags.js (70%)

diff --git a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterByDataRecency.test.js b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/filters/FilterByDataRecency.test.js
similarity index 98%
rename from __tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterByDataRecency.test.js
rename to __tests__/unit/app/pages/clinicworkspace/TideDashboardV2/filters/FilterByDataRecency.test.js
index b724bc0211..957d47e337 100644
--- a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterByDataRecency.test.js
+++ b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/filters/FilterByDataRecency.test.js
@@ -6,7 +6,7 @@ import configureStore from 'redux-mock-store';
 import { thunk } from 'redux-thunk';
 import { MemoryRouter } from 'react-router-dom';
 
-import FilterByDataRecency from '@app/pages/clinicworkspace/TideDashboardV2/FilterByDataRecency';
+import FilterByDataRecency from '@app/pages/clinicworkspace/TideDashboardV2/filters/FilterByDataRecency';
 
 const mockStore = configureStore([thunk]);
 
diff --git a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterBySites.test.js b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/filters/FilterBySites.test.js
similarity index 98%
rename from __tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterBySites.test.js
rename to __tests__/unit/app/pages/clinicworkspace/TideDashboardV2/filters/FilterBySites.test.js
index 16d3f108fa..8ef018fac4 100644
--- a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterBySites.test.js
+++ b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/filters/FilterBySites.test.js
@@ -6,7 +6,7 @@ import configureStore from 'redux-mock-store';
 import { thunk } from 'redux-thunk';
 import { MemoryRouter } from 'react-router-dom';
 
-import FilterBySites from '@app/pages/clinicworkspace/TideDashboardV2/FilterBySites';
+import FilterBySites from '@app/pages/clinicworkspace/TideDashboardV2/filters/FilterBySites';
 
 const mockStore = configureStore([thunk]);
 
diff --git a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterBySummaryPeriod.test.js b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/filters/FilterBySummaryPeriod.test.js
similarity index 97%
rename from __tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterBySummaryPeriod.test.js
rename to __tests__/unit/app/pages/clinicworkspace/TideDashboardV2/filters/FilterBySummaryPeriod.test.js
index c43a900289..cd052c96d5 100644
--- a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterBySummaryPeriod.test.js
+++ b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/filters/FilterBySummaryPeriod.test.js
@@ -6,7 +6,7 @@ import configureStore from 'redux-mock-store';
 import { thunk } from 'redux-thunk';
 import { MemoryRouter } from 'react-router-dom';
 
-import FilterBySummaryPeriod from '@app/pages/clinicworkspace/TideDashboardV2/FilterBySummaryPeriod';
+import FilterBySummaryPeriod from '@app/pages/clinicworkspace/TideDashboardV2/filters/FilterBySummaryPeriod';
 
 const mockStore = configureStore([thunk]);
 
diff --git a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterByTags.test.js b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/filters/FilterByTags.test.js
similarity index 98%
rename from __tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterByTags.test.js
rename to __tests__/unit/app/pages/clinicworkspace/TideDashboardV2/filters/FilterByTags.test.js
index 2e57866f9a..ac0e8ac3a7 100644
--- a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/FilterByTags.test.js
+++ b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/filters/FilterByTags.test.js
@@ -6,7 +6,7 @@ import configureStore from 'redux-mock-store';
 import { thunk } from 'redux-thunk';
 import { MemoryRouter } from 'react-router-dom';
 
-import FilterByTags from '@app/pages/clinicworkspace/TideDashboardV2/FilterByTags';
+import FilterByTags from '@app/pages/clinicworkspace/TideDashboardV2/filters/FilterByTags';
 
 const mockStore = configureStore([thunk]);
 
diff --git a/app/pages/clinicworkspace/TideDashboardV2/TideDashboardV2.js b/app/pages/clinicworkspace/TideDashboardV2/TideDashboardV2.js
index d61e99e93c..1d431c0e5d 100644
--- a/app/pages/clinicworkspace/TideDashboardV2/TideDashboardV2.js
+++ b/app/pages/clinicworkspace/TideDashboardV2/TideDashboardV2.js
@@ -4,10 +4,12 @@ import { useSelector } from 'react-redux';
 import Table from '../../../components/elements/Table';
 import { Flex, Text, Box } from 'theme-ui';
 
-import FilterByCategory from './FilterByCategory';
-import FilterByTags from './FilterByTags';
-import FilterByDataRecency from './FilterByDataRecency';
-import FilterBySummaryPeriod from './FilterBySummaryPeriod';
+import FilterByCategory from './filters/FilterByCategory';
+import FilterByTags from './filters/FilterByTags';
+import FilterBySites from './filters/FilterBySites';
+import FilterByDataRecency from './filters/FilterByDataRecency';
+import FilterBySummaryPeriod from './filters/FilterBySummaryPeriod';
+import AppliedFiltersList from './filters/AppliedFiltersList';
 
 import TableCategoryHeader from './TableCategoryHeader';
 import PaginationController from './PaginationController';
@@ -18,8 +20,6 @@ import useTableColumns from './useTableColumns';
 import EmptyContentNode from './EmptyContentNode';
 import { Redirect, useLocation } from 'react-router-dom';
 import useAuthorizationGate from './useAuthorizationGate';
-import FilterBySites from './FilterBySites';
-import AppliedFiltersList from './AppliedFiltersList';
 
 const Gap = () => <Box sx={{ marginLeft: 'auto' }}></Box>;
 
diff --git a/app/pages/clinicworkspace/TideDashboardV2/AppliedFiltersList.js b/app/pages/clinicworkspace/TideDashboardV2/filters/AppliedFiltersList.js
similarity index 87%
rename from app/pages/clinicworkspace/TideDashboardV2/AppliedFiltersList.js
rename to app/pages/clinicworkspace/TideDashboardV2/filters/AppliedFiltersList.js
index 29bd1a7ea0..bdb8d099ba 100644
--- a/app/pages/clinicworkspace/TideDashboardV2/AppliedFiltersList.js
+++ b/app/pages/clinicworkspace/TideDashboardV2/filters/AppliedFiltersList.js
@@ -4,11 +4,11 @@ import PropTypes from 'prop-types';
 import without from 'lodash/without';
 import noop from 'lodash/noop';
 
-import ActiveFiltersTray from '../components/ActiveFiltersTray';
-import ClearFilterButtons, { PATIENT_QUERY_STATE } from '../components/ClearFilterButtons';
+import ActiveFiltersTray from '../../components/ActiveFiltersTray';
+import ClearFilterButtons, { PATIENT_QUERY_STATE } from '../../components/ClearFilterButtons';
 import { Box } from 'theme-ui';
-import { setClinicSitesFilter, setPatientTagsFilter } from './tideDashboardFiltersSlice';
-import { setOffset } from './tideDashboardSlice';
+import { setClinicSitesFilter, setPatientTagsFilter } from '../tideDashboardFiltersSlice';
+import { setOffset } from '../tideDashboardSlice';
 
 export const getPatientQueryState = (patientTags, clinicSites) => {
   const hasFiltersActive = clinicSites?.length > 0 || patientTags?.length > 0;
diff --git a/app/pages/clinicworkspace/TideDashboardV2/FilterByCategory.js b/app/pages/clinicworkspace/TideDashboardV2/filters/FilterByCategory.js
similarity index 93%
rename from app/pages/clinicworkspace/TideDashboardV2/FilterByCategory.js
rename to app/pages/clinicworkspace/TideDashboardV2/filters/FilterByCategory.js
index d1f68697d4..bb8b8e0850 100644
--- a/app/pages/clinicworkspace/TideDashboardV2/FilterByCategory.js
+++ b/app/pages/clinicworkspace/TideDashboardV2/filters/FilterByCategory.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useSelector, useDispatch } from 'react-redux';
-import { SegmentedControl, Segment } from '../components/SegmentedControl';
-import { setCategory, setOffset, CATEGORY } from './tideDashboardSlice';
+import { SegmentedControl, Segment } from '../../components/SegmentedControl';
+import { setCategory, setOffset, CATEGORY } from '../tideDashboardSlice';
 import { colors as vizColors } from '@tidepool/viz';
 import { Box } from 'theme-ui';
 
diff --git a/app/pages/clinicworkspace/TideDashboardV2/FilterByDataRecency.js b/app/pages/clinicworkspace/TideDashboardV2/filters/FilterByDataRecency.js
similarity index 74%
rename from app/pages/clinicworkspace/TideDashboardV2/FilterByDataRecency.js
rename to app/pages/clinicworkspace/TideDashboardV2/filters/FilterByDataRecency.js
index 48ced003ae..a554ab02d0 100644
--- a/app/pages/clinicworkspace/TideDashboardV2/FilterByDataRecency.js
+++ b/app/pages/clinicworkspace/TideDashboardV2/filters/FilterByDataRecency.js
@@ -1,11 +1,11 @@
 import React from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { setOffset } from './tideDashboardSlice';
-import { setLastDataFilter } from './tideDashboardFiltersSlice';
+import { setOffset } from '../tideDashboardSlice';
+import { setLastDataFilter } from '../tideDashboardFiltersSlice';
 
-import { lastDataFilterOptions } from '../../../core/clinicUtils';
+import { lastDataFilterOptions } from '../../../../core/clinicUtils';
 
-import DataRecencyFilterDropdown from '../components/DataRecencyFilterDropdown';
+import DataRecencyFilterDropdown from '../../components/DataRecencyFilterDropdown';
 
 const FilterByDataRecency = () => {
   const dispatch = useDispatch();
diff --git a/app/pages/clinicworkspace/TideDashboardV2/FilterBySites.js b/app/pages/clinicworkspace/TideDashboardV2/filters/FilterBySites.js
similarity index 71%
rename from app/pages/clinicworkspace/TideDashboardV2/FilterBySites.js
rename to app/pages/clinicworkspace/TideDashboardV2/filters/FilterBySites.js
index 8849379403..4ef745762a 100644
--- a/app/pages/clinicworkspace/TideDashboardV2/FilterBySites.js
+++ b/app/pages/clinicworkspace/TideDashboardV2/filters/FilterBySites.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { setOffset } from './tideDashboardSlice';
-import { setClinicSitesFilter } from './tideDashboardFiltersSlice';
-import SiteFilterDropdown from '../components/SiteFilterDropdown';
+import { setOffset } from '../tideDashboardSlice';
+import { setClinicSitesFilter } from '../tideDashboardFiltersSlice';
+import SiteFilterDropdown from '../../components/SiteFilterDropdown';
 
 const FilterBySites = () => {
   const dispatch = useDispatch();
diff --git a/app/pages/clinicworkspace/TideDashboardV2/FilterBySummaryPeriod.js b/app/pages/clinicworkspace/TideDashboardV2/filters/FilterBySummaryPeriod.js
similarity index 72%
rename from app/pages/clinicworkspace/TideDashboardV2/FilterBySummaryPeriod.js
rename to app/pages/clinicworkspace/TideDashboardV2/filters/FilterBySummaryPeriod.js
index 569a1449c1..aaaf73b2e7 100644
--- a/app/pages/clinicworkspace/TideDashboardV2/FilterBySummaryPeriod.js
+++ b/app/pages/clinicworkspace/TideDashboardV2/filters/FilterBySummaryPeriod.js
@@ -1,9 +1,9 @@
 import React from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 
-import SummaryPeriodFilterDropdown from '../components/SummaryPeriodFilterDropdown';
-import { setSummaryPeriodFilter } from './tideDashboardFiltersSlice';
-import { setOffset } from './tideDashboardSlice';
+import SummaryPeriodFilterDropdown from '../../components/SummaryPeriodFilterDropdown';
+import { setSummaryPeriodFilter } from '../tideDashboardFiltersSlice';
+import { setOffset } from '../tideDashboardSlice';
 
 const FilterBySummaryPeriod = () => {
   const dispatch = useDispatch();
diff --git a/app/pages/clinicworkspace/TideDashboardV2/FilterByTags.js b/app/pages/clinicworkspace/TideDashboardV2/filters/FilterByTags.js
similarity index 70%
rename from app/pages/clinicworkspace/TideDashboardV2/FilterByTags.js
rename to app/pages/clinicworkspace/TideDashboardV2/filters/FilterByTags.js
index eeb5f84f79..6f60cecb7d 100644
--- a/app/pages/clinicworkspace/TideDashboardV2/FilterByTags.js
+++ b/app/pages/clinicworkspace/TideDashboardV2/filters/FilterByTags.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { setOffset } from './tideDashboardSlice';
-import { setPatientTagsFilter } from './tideDashboardFiltersSlice';
-import TagFilterDropdown from '../components/TagFilterDropdown';
+import { setOffset } from '../tideDashboardSlice';
+import { setPatientTagsFilter } from '../tideDashboardFiltersSlice';
+import TagFilterDropdown from '../../components/TagFilterDropdown';
 
 const FilterByTags = () => {
   const dispatch = useDispatch();

From a8ecf236a6ee00ca9918892cb75c66942a680deb Mon Sep 17 00:00:00 2001
From: henry-tp <henry.liang@tidepool.org>
Date: Mon, 31 Aug 2026 14:18:10 -0700
Subject: [PATCH 19/23] WEB-4460 organize filters into specific directory

---
 .../FilterByCGMUse.test.js                    |  0
 .../{ => filters}/ActiveFiltersTray.test.js   |  2 +-
 .../filters}/CGMUseFilterDropdown.test.js     |  2 +-
 .../DataRecencyFilterDropdown.test.js         |  2 +-
 .../{ => filters}/SiteFilterDropdown.test.js  |  2 +-
 .../SummaryPeriodFilterDropdown.test.js       |  2 +-
 .../{ => filters}/TagFilterDropdown.test.js   |  2 +-
 .../TimeInRangeFilterDropdown.test.js         |  2 +-
 .../filters/AppliedFiltersList.js             |  2 +-
 .../filters/FilterByDataRecency.js            |  2 +-
 .../TideDashboardV2/filters/FilterBySites.js  |  2 +-
 .../filters/FilterBySummaryPeriod.js          |  2 +-
 .../TideDashboardV2/filters/FilterByTags.js   |  2 +-
 .../AppliedFiltersList.js                     |  2 +-
 .../clinicPatientsFilters/FilterByCGMUse.js   |  2 +-
 .../FilterByDataRecency.js                    |  2 +-
 .../clinicPatientsFilters/FilterBySites.js    |  2 +-
 .../FilterBySummaryPeriod.js                  |  2 +-
 .../clinicPatientsFilters/FilterByTags.js     |  2 +-
 .../FilterByTimeInRange.js                    |  2 +-
 .../{ => filters}/ActiveFiltersTray.js        | 10 ++++----
 .../{ => filters}/CGMUseFilterDropdown.js     | 10 ++++----
 .../DataRecencyFilterDropdown.js              | 12 +++++-----
 .../{ => filters}/SiteFilterDropdown.js       | 24 +++++++++----------
 .../SummaryPeriodFilterDropdown.js            | 12 +++++-----
 .../{ => filters}/TagFilterDropdown.js        | 24 +++++++++----------
 .../TimeInRangeFilterDropdown.js              | 18 +++++++-------
 27 files changed, 74 insertions(+), 74 deletions(-)
 rename {test/unit => __tests__/unit/app}/pages/clinicworkspace/clinicPatientsFilters/FilterByCGMUse.test.js (100%)
 rename __tests__/unit/app/pages/clinicworkspace/components/{ => filters}/ActiveFiltersTray.test.js (99%)
 rename {test/unit/pages/clinicworkspace/components => __tests__/unit/app/pages/clinicworkspace/components/filters}/CGMUseFilterDropdown.test.js (99%)
 rename __tests__/unit/app/pages/clinicworkspace/components/{ => filters}/DataRecencyFilterDropdown.test.js (99%)
 rename __tests__/unit/app/pages/clinicworkspace/components/{ => filters}/SiteFilterDropdown.test.js (99%)
 rename __tests__/unit/app/pages/clinicworkspace/components/{ => filters}/SummaryPeriodFilterDropdown.test.js (98%)
 rename __tests__/unit/app/pages/clinicworkspace/components/{ => filters}/TagFilterDropdown.test.js (99%)
 rename __tests__/unit/app/pages/clinicworkspace/components/{ => filters}/TimeInRangeFilterDropdown.test.js (99%)
 rename app/pages/clinicworkspace/components/{ => filters}/ActiveFiltersTray.js (96%)
 rename app/pages/clinicworkspace/components/{ => filters}/CGMUseFilterDropdown.js (93%)
 rename app/pages/clinicworkspace/components/{ => filters}/DataRecencyFilterDropdown.js (94%)
 rename app/pages/clinicworkspace/components/{ => filters}/SiteFilterDropdown.js (93%)
 rename app/pages/clinicworkspace/components/{ => filters}/SummaryPeriodFilterDropdown.js (92%)
 rename app/pages/clinicworkspace/components/{ => filters}/TagFilterDropdown.js (93%)
 rename app/pages/clinicworkspace/components/{ => filters}/TimeInRangeFilterDropdown.js (94%)

diff --git a/test/unit/pages/clinicworkspace/clinicPatientsFilters/FilterByCGMUse.test.js b/__tests__/unit/app/pages/clinicworkspace/clinicPatientsFilters/FilterByCGMUse.test.js
similarity index 100%
rename from test/unit/pages/clinicworkspace/clinicPatientsFilters/FilterByCGMUse.test.js
rename to __tests__/unit/app/pages/clinicworkspace/clinicPatientsFilters/FilterByCGMUse.test.js
diff --git a/__tests__/unit/app/pages/clinicworkspace/components/ActiveFiltersTray.test.js b/__tests__/unit/app/pages/clinicworkspace/components/filters/ActiveFiltersTray.test.js
similarity index 99%
rename from __tests__/unit/app/pages/clinicworkspace/components/ActiveFiltersTray.test.js
rename to __tests__/unit/app/pages/clinicworkspace/components/filters/ActiveFiltersTray.test.js
index 091dfcea10..7abd548b98 100644
--- a/__tests__/unit/app/pages/clinicworkspace/components/ActiveFiltersTray.test.js
+++ b/__tests__/unit/app/pages/clinicworkspace/components/filters/ActiveFiltersTray.test.js
@@ -8,7 +8,7 @@ import { ThemeProvider } from 'theme-ui';
 import '@app/core/language';
 
 import theme from '@app/themes/baseTheme';
-import ActiveFiltersTray from '@app/pages/clinicworkspace/components/ActiveFiltersTray';
+import ActiveFiltersTray from '@app/pages/clinicworkspace/components/filters/ActiveFiltersTray';
 import { defaultFilterState } from '@app/pages/clinicworkspace/useClinicPatientsFilters';
 
 const mockStore = configureStore([thunk]);
diff --git a/test/unit/pages/clinicworkspace/components/CGMUseFilterDropdown.test.js b/__tests__/unit/app/pages/clinicworkspace/components/filters/CGMUseFilterDropdown.test.js
similarity index 99%
rename from test/unit/pages/clinicworkspace/components/CGMUseFilterDropdown.test.js
rename to __tests__/unit/app/pages/clinicworkspace/components/filters/CGMUseFilterDropdown.test.js
index dd66c5a5ed..cf43033293 100644
--- a/test/unit/pages/clinicworkspace/components/CGMUseFilterDropdown.test.js
+++ b/__tests__/unit/app/pages/clinicworkspace/components/filters/CGMUseFilterDropdown.test.js
@@ -6,7 +6,7 @@ import configureStore from 'redux-mock-store';
 import { thunk } from 'redux-thunk';
 import { MemoryRouter } from 'react-router-dom';
 
-import CGMUseFilterDropdown from '@app/pages/clinicworkspace/components/CGMUseFilterDropdown';
+import CGMUseFilterDropdown from '@app/pages/clinicworkspace/components/filters/CGMUseFilterDropdown';
 import { trackMetric as mockTrackMetric } from '../../../../../app/core/metricUtils';
 
 const mockStore = configureStore([thunk]);
diff --git a/__tests__/unit/app/pages/clinicworkspace/components/DataRecencyFilterDropdown.test.js b/__tests__/unit/app/pages/clinicworkspace/components/filters/DataRecencyFilterDropdown.test.js
similarity index 99%
rename from __tests__/unit/app/pages/clinicworkspace/components/DataRecencyFilterDropdown.test.js
rename to __tests__/unit/app/pages/clinicworkspace/components/filters/DataRecencyFilterDropdown.test.js
index fa1aae7869..350e40d9ca 100644
--- a/__tests__/unit/app/pages/clinicworkspace/components/DataRecencyFilterDropdown.test.js
+++ b/__tests__/unit/app/pages/clinicworkspace/components/filters/DataRecencyFilterDropdown.test.js
@@ -6,7 +6,7 @@ import configureStore from 'redux-mock-store';
 import { thunk } from 'redux-thunk';
 import { MemoryRouter } from 'react-router-dom';
 
-import DataRecencyFilterDropdown from '@app/pages/clinicworkspace/components/DataRecencyFilterDropdown';
+import DataRecencyFilterDropdown from '@app/pages/clinicworkspace/components/filters/DataRecencyFilterDropdown';
 import { trackMetric as mockTrackMetric } from '../../../../../app/core/metricUtils';
 
 const mockStore = configureStore([thunk]);
diff --git a/__tests__/unit/app/pages/clinicworkspace/components/SiteFilterDropdown.test.js b/__tests__/unit/app/pages/clinicworkspace/components/filters/SiteFilterDropdown.test.js
similarity index 99%
rename from __tests__/unit/app/pages/clinicworkspace/components/SiteFilterDropdown.test.js
rename to __tests__/unit/app/pages/clinicworkspace/components/filters/SiteFilterDropdown.test.js
index a43191333b..4e651f367e 100644
--- a/__tests__/unit/app/pages/clinicworkspace/components/SiteFilterDropdown.test.js
+++ b/__tests__/unit/app/pages/clinicworkspace/components/filters/SiteFilterDropdown.test.js
@@ -6,7 +6,7 @@ import configureStore from 'redux-mock-store';
 import { thunk } from 'redux-thunk';
 import { MemoryRouter } from 'react-router-dom';
 
-import SiteFilterDropdown from '@app/pages/clinicworkspace/components/SiteFilterDropdown';
+import SiteFilterDropdown from '@app/pages/clinicworkspace/components/filters/SiteFilterDropdown';
 import { trackMetric as mockTrackMetric } from '../../../../../app/core/metricUtils';
 import useIsClinicAdmin from '@app/pages/clinicworkspace/useIsClinicAdmin';
 import { SPECIAL_FILTER_STATES } from '@app/pages/clinicworkspace/useClinicPatientsFilters';
diff --git a/__tests__/unit/app/pages/clinicworkspace/components/SummaryPeriodFilterDropdown.test.js b/__tests__/unit/app/pages/clinicworkspace/components/filters/SummaryPeriodFilterDropdown.test.js
similarity index 98%
rename from __tests__/unit/app/pages/clinicworkspace/components/SummaryPeriodFilterDropdown.test.js
rename to __tests__/unit/app/pages/clinicworkspace/components/filters/SummaryPeriodFilterDropdown.test.js
index 9c6946fa7b..a1ffcae930 100644
--- a/__tests__/unit/app/pages/clinicworkspace/components/SummaryPeriodFilterDropdown.test.js
+++ b/__tests__/unit/app/pages/clinicworkspace/components/filters/SummaryPeriodFilterDropdown.test.js
@@ -6,7 +6,7 @@ import configureStore from 'redux-mock-store';
 import { thunk } from 'redux-thunk';
 import { MemoryRouter } from 'react-router-dom';
 
-import SummaryPeriodFilterDropdown from '@app/pages/clinicworkspace/components/SummaryPeriodFilterDropdown';
+import SummaryPeriodFilterDropdown from '@app/pages/clinicworkspace/components/filters/SummaryPeriodFilterDropdown';
 import { trackMetric as mockTrackMetric } from '../../../../../app/core/metricUtils';
 
 const mockStore = configureStore([thunk]);
diff --git a/__tests__/unit/app/pages/clinicworkspace/components/TagFilterDropdown.test.js b/__tests__/unit/app/pages/clinicworkspace/components/filters/TagFilterDropdown.test.js
similarity index 99%
rename from __tests__/unit/app/pages/clinicworkspace/components/TagFilterDropdown.test.js
rename to __tests__/unit/app/pages/clinicworkspace/components/filters/TagFilterDropdown.test.js
index 604e4c6224..3faf8ae63f 100644
--- a/__tests__/unit/app/pages/clinicworkspace/components/TagFilterDropdown.test.js
+++ b/__tests__/unit/app/pages/clinicworkspace/components/filters/TagFilterDropdown.test.js
@@ -6,7 +6,7 @@ import configureStore from 'redux-mock-store';
 import { thunk } from 'redux-thunk';
 import { MemoryRouter } from 'react-router-dom';
 
-import TagFilterDropdown from '@app/pages/clinicworkspace/components/TagFilterDropdown';
+import TagFilterDropdown from '@app/pages/clinicworkspace/components/filters/TagFilterDropdown';
 import { trackMetric as mockTrackMetric } from '../../../../../app/core/metricUtils';
 import useIsClinicAdmin from '@app/pages/clinicworkspace/useIsClinicAdmin';
 import { SPECIAL_FILTER_STATES } from '@app/pages/clinicworkspace/useClinicPatientsFilters';
diff --git a/__tests__/unit/app/pages/clinicworkspace/components/TimeInRangeFilterDropdown.test.js b/__tests__/unit/app/pages/clinicworkspace/components/filters/TimeInRangeFilterDropdown.test.js
similarity index 99%
rename from __tests__/unit/app/pages/clinicworkspace/components/TimeInRangeFilterDropdown.test.js
rename to __tests__/unit/app/pages/clinicworkspace/components/filters/TimeInRangeFilterDropdown.test.js
index 1c673bfa43..79ded58058 100644
--- a/__tests__/unit/app/pages/clinicworkspace/components/TimeInRangeFilterDropdown.test.js
+++ b/__tests__/unit/app/pages/clinicworkspace/components/filters/TimeInRangeFilterDropdown.test.js
@@ -7,7 +7,7 @@ import { thunk } from 'redux-thunk';
 import { MemoryRouter } from 'react-router-dom';
 
 import { useFlags } from 'launchdarkly-react-client-sdk';
-import TimeInRangeFilterDropdown from '@app/pages/clinicworkspace/components/TimeInRangeFilterDropdown';
+import TimeInRangeFilterDropdown from '@app/pages/clinicworkspace/components/filters/TimeInRangeFilterDropdown';
 import { MMOLL_UNITS } from '@app/core/constants';
 import { trackMetric as mockTrackMetric } from '../../../../../app/core/metricUtils';
 
diff --git a/app/pages/clinicworkspace/TideDashboardV2/filters/AppliedFiltersList.js b/app/pages/clinicworkspace/TideDashboardV2/filters/AppliedFiltersList.js
index bdb8d099ba..da4b4767aa 100644
--- a/app/pages/clinicworkspace/TideDashboardV2/filters/AppliedFiltersList.js
+++ b/app/pages/clinicworkspace/TideDashboardV2/filters/AppliedFiltersList.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import without from 'lodash/without';
 import noop from 'lodash/noop';
 
-import ActiveFiltersTray from '../../components/ActiveFiltersTray';
+import ActiveFiltersTray from '../../components/filters/ActiveFiltersTray';
 import ClearFilterButtons, { PATIENT_QUERY_STATE } from '../../components/ClearFilterButtons';
 import { Box } from 'theme-ui';
 import { setClinicSitesFilter, setPatientTagsFilter } from '../tideDashboardFiltersSlice';
diff --git a/app/pages/clinicworkspace/TideDashboardV2/filters/FilterByDataRecency.js b/app/pages/clinicworkspace/TideDashboardV2/filters/FilterByDataRecency.js
index a554ab02d0..ac72ffde5b 100644
--- a/app/pages/clinicworkspace/TideDashboardV2/filters/FilterByDataRecency.js
+++ b/app/pages/clinicworkspace/TideDashboardV2/filters/FilterByDataRecency.js
@@ -5,7 +5,7 @@ import { setLastDataFilter } from '../tideDashboardFiltersSlice';
 
 import { lastDataFilterOptions } from '../../../../core/clinicUtils';
 
-import DataRecencyFilterDropdown from '../../components/DataRecencyFilterDropdown';
+import DataRecencyFilterDropdown from '../../components/filters/DataRecencyFilterDropdown';
 
 const FilterByDataRecency = () => {
   const dispatch = useDispatch();
diff --git a/app/pages/clinicworkspace/TideDashboardV2/filters/FilterBySites.js b/app/pages/clinicworkspace/TideDashboardV2/filters/FilterBySites.js
index 4ef745762a..1d33c9f33f 100644
--- a/app/pages/clinicworkspace/TideDashboardV2/filters/FilterBySites.js
+++ b/app/pages/clinicworkspace/TideDashboardV2/filters/FilterBySites.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { setOffset } from '../tideDashboardSlice';
 import { setClinicSitesFilter } from '../tideDashboardFiltersSlice';
-import SiteFilterDropdown from '../../components/SiteFilterDropdown';
+import SiteFilterDropdown from '../../components/filters/SiteFilterDropdown';
 
 const FilterBySites = () => {
   const dispatch = useDispatch();
diff --git a/app/pages/clinicworkspace/TideDashboardV2/filters/FilterBySummaryPeriod.js b/app/pages/clinicworkspace/TideDashboardV2/filters/FilterBySummaryPeriod.js
index aaaf73b2e7..9fb359cabd 100644
--- a/app/pages/clinicworkspace/TideDashboardV2/filters/FilterBySummaryPeriod.js
+++ b/app/pages/clinicworkspace/TideDashboardV2/filters/FilterBySummaryPeriod.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 
-import SummaryPeriodFilterDropdown from '../../components/SummaryPeriodFilterDropdown';
+import SummaryPeriodFilterDropdown from '../../components/filters/SummaryPeriodFilterDropdown';
 import { setSummaryPeriodFilter } from '../tideDashboardFiltersSlice';
 import { setOffset } from '../tideDashboardSlice';
 
diff --git a/app/pages/clinicworkspace/TideDashboardV2/filters/FilterByTags.js b/app/pages/clinicworkspace/TideDashboardV2/filters/FilterByTags.js
index 6f60cecb7d..ce9c9c7321 100644
--- a/app/pages/clinicworkspace/TideDashboardV2/filters/FilterByTags.js
+++ b/app/pages/clinicworkspace/TideDashboardV2/filters/FilterByTags.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { setOffset } from '../tideDashboardSlice';
 import { setPatientTagsFilter } from '../tideDashboardFiltersSlice';
-import TagFilterDropdown from '../../components/TagFilterDropdown';
+import TagFilterDropdown from '../../components/filters/TagFilterDropdown';
 
 const FilterByTags = () => {
   const dispatch = useDispatch();
diff --git a/app/pages/clinicworkspace/clinicPatientsFilters/AppliedFiltersList.js b/app/pages/clinicworkspace/clinicPatientsFilters/AppliedFiltersList.js
index 3bcb865899..545e016888 100644
--- a/app/pages/clinicworkspace/clinicPatientsFilters/AppliedFiltersList.js
+++ b/app/pages/clinicworkspace/clinicPatientsFilters/AppliedFiltersList.js
@@ -3,7 +3,7 @@ import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
 import without from 'lodash/without';
 
-import ActiveFiltersTray from '../components/ActiveFiltersTray';
+import ActiveFiltersTray from '../components/filters/ActiveFiltersTray';
 import ClearFilterButtons, { PATIENT_QUERY_STATE } from '../components/ClearFilterButtons';
 import { defaultFilterState } from '../useClinicPatientsFilters';
 import { Box } from 'theme-ui';
diff --git a/app/pages/clinicworkspace/clinicPatientsFilters/FilterByCGMUse.js b/app/pages/clinicworkspace/clinicPatientsFilters/FilterByCGMUse.js
index 1c6f76bc25..71d7ef6dce 100644
--- a/app/pages/clinicworkspace/clinicPatientsFilters/FilterByCGMUse.js
+++ b/app/pages/clinicworkspace/clinicPatientsFilters/FilterByCGMUse.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import noop from 'lodash/noop';
 
-import CGMUseFilterDropdown from '../components/CGMUseFilterDropdown';
+import CGMUseFilterDropdown from '../components/filters/CGMUseFilterDropdown';
 
 const FilterByCGMUse = ({
   activeFilters = {},
diff --git a/app/pages/clinicworkspace/clinicPatientsFilters/FilterByDataRecency.js b/app/pages/clinicworkspace/clinicPatientsFilters/FilterByDataRecency.js
index b48b4036bf..8e3d62161e 100644
--- a/app/pages/clinicworkspace/clinicPatientsFilters/FilterByDataRecency.js
+++ b/app/pages/clinicworkspace/clinicPatientsFilters/FilterByDataRecency.js
@@ -6,7 +6,7 @@ import reject from 'lodash/reject';
 
 import { lastDataFilterOptions } from '../../../core/clinicUtils';
 
-import DataRecencyFilterDropdown from '../components/DataRecencyFilterDropdown';
+import DataRecencyFilterDropdown from '../components/filters/DataRecencyFilterDropdown';
 
 const FilterByDataRecency = ({
   activeFilters = {},
diff --git a/app/pages/clinicworkspace/clinicPatientsFilters/FilterBySites.js b/app/pages/clinicworkspace/clinicPatientsFilters/FilterBySites.js
index c0990ce846..bec3afbda5 100644
--- a/app/pages/clinicworkspace/clinicPatientsFilters/FilterBySites.js
+++ b/app/pages/clinicworkspace/clinicPatientsFilters/FilterBySites.js
@@ -5,7 +5,7 @@ import * as actions from '../../../redux/actions';
 import { trackMetric } from '../../../core/metricUtils';
 import noop from 'lodash/noop';
 
-import SiteFilterDropdown from '../components/SiteFilterDropdown';
+import SiteFilterDropdown from '../components/filters/SiteFilterDropdown';
 import useIsClinicAdmin from '../useIsClinicAdmin';
 import useClinicMetricsPageName from '../useClinicMetricsPageName';
 
diff --git a/app/pages/clinicworkspace/clinicPatientsFilters/FilterBySummaryPeriod.js b/app/pages/clinicworkspace/clinicPatientsFilters/FilterBySummaryPeriod.js
index 9e759560a5..e98b5f67d3 100644
--- a/app/pages/clinicworkspace/clinicPatientsFilters/FilterBySummaryPeriod.js
+++ b/app/pages/clinicworkspace/clinicPatientsFilters/FilterBySummaryPeriod.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import noop from 'lodash/noop';
 
-import SummaryPeriodFilterDropdown from '../components/SummaryPeriodFilterDropdown';
+import SummaryPeriodFilterDropdown from '../components/filters/SummaryPeriodFilterDropdown';
 import { summaryPeriodOptions } from '../../../core/clinicUtils';
 
 const FilterBySummaryPeriod = ({
diff --git a/app/pages/clinicworkspace/clinicPatientsFilters/FilterByTags.js b/app/pages/clinicworkspace/clinicPatientsFilters/FilterByTags.js
index 997d1ddf0c..6b0a48c090 100644
--- a/app/pages/clinicworkspace/clinicPatientsFilters/FilterByTags.js
+++ b/app/pages/clinicworkspace/clinicPatientsFilters/FilterByTags.js
@@ -5,7 +5,7 @@ import * as actions from '../../../redux/actions';
 import { trackMetric } from '../../../core/metricUtils';
 import noop from 'lodash/noop';
 
-import TagFilterDropdown from '../components/TagFilterDropdown';
+import TagFilterDropdown from '../components/filters/TagFilterDropdown';
 import useIsClinicAdmin from '../useIsClinicAdmin';
 import useClinicMetricsPageName from '../useClinicMetricsPageName';
 
diff --git a/app/pages/clinicworkspace/clinicPatientsFilters/FilterByTimeInRange.js b/app/pages/clinicworkspace/clinicPatientsFilters/FilterByTimeInRange.js
index 087dfabf00..36ca835686 100644
--- a/app/pages/clinicworkspace/clinicPatientsFilters/FilterByTimeInRange.js
+++ b/app/pages/clinicworkspace/clinicPatientsFilters/FilterByTimeInRange.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import noop from 'lodash/noop';
 
-import TimeInRangeFilterDropdown from '../components/TimeInRangeFilterDropdown';
+import TimeInRangeFilterDropdown from '../components/filters/TimeInRangeFilterDropdown';
 
 const FilterByTimeInRange = ({
   activeFilters = {},
diff --git a/app/pages/clinicworkspace/components/ActiveFiltersTray.js b/app/pages/clinicworkspace/components/filters/ActiveFiltersTray.js
similarity index 96%
rename from app/pages/clinicworkspace/components/ActiveFiltersTray.js
rename to app/pages/clinicworkspace/components/filters/ActiveFiltersTray.js
index 2c0175f962..20ae9bde08 100644
--- a/app/pages/clinicworkspace/components/ActiveFiltersTray.js
+++ b/app/pages/clinicworkspace/components/filters/ActiveFiltersTray.js
@@ -7,16 +7,16 @@ import { colors as vizColors } from '@tidepool/viz';
 
 import CloseRoundedIcon from '@material-ui/icons/CloseRounded';
 import LocationOnOutlinedIcon from '@material-ui/icons/LocationOnOutlined';
-import TagIcon from '../../../core/icons/tagIcon.svg';
+import TagIcon from '../../../../core/icons/tagIcon.svg';
 
 import find from 'lodash/find';
 import isEqual from 'lodash/isEqual';
 import noop from 'lodash/noop';
 
-import Icon from '../../../components/elements/Icon';
-import utils from '../../../core/utils';
-import { transitions } from '../../../themes/baseTheme';
-import { SPECIAL_FILTER_STATES } from '../useClinicPatientsFilters';
+import Icon from '../../../../components/elements/Icon';
+import utils from '../../../../core/utils';
+import { transitions } from '../../../../themes/baseTheme';
+import { SPECIAL_FILTER_STATES } from '../../useClinicPatientsFilters';
 
 const usePrimaryChips = (activeFilters, requiredFilters) => {
   const { t } = useTranslation();
diff --git a/app/pages/clinicworkspace/components/CGMUseFilterDropdown.js b/app/pages/clinicworkspace/components/filters/CGMUseFilterDropdown.js
similarity index 93%
rename from app/pages/clinicworkspace/components/CGMUseFilterDropdown.js
rename to app/pages/clinicworkspace/components/filters/CGMUseFilterDropdown.js
index 9ac8cc3d5a..807f82a6dc 100644
--- a/app/pages/clinicworkspace/components/CGMUseFilterDropdown.js
+++ b/app/pages/clinicworkspace/components/filters/CGMUseFilterDropdown.js
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import { useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
-import { trackMetric } from '../../../core/metricUtils';
+import { trackMetric } from '../../../../core/metricUtils';
 import { colors as vizColors } from '@tidepool/viz';
 
 import { Box, Grid } from 'theme-ui';
@@ -11,10 +11,10 @@ import noop from 'lodash/noop';
 
 import { bindPopover, bindTrigger, usePopupState } from 'material-ui-popup-state/hooks';
 
-import Button from '../../../components/elements/Button';
-import Popover from '../../../components/elements/Popover';
-import RadioGroup from '../../../components/elements/RadioGroup';
-import useClinicMetricsPageName from '../useClinicMetricsPageName';
+import Button from '../../../../components/elements/Button';
+import Popover from '../../../../components/elements/Popover';
+import RadioGroup from '../../../../components/elements/RadioGroup';
+import useClinicMetricsPageName from '../../useClinicMetricsPageName';
 
 const getCgmUseFilterOptions = (t) => [
   { value: '<0.7', label: t('Less than 70%') },
diff --git a/app/pages/clinicworkspace/components/DataRecencyFilterDropdown.js b/app/pages/clinicworkspace/components/filters/DataRecencyFilterDropdown.js
similarity index 94%
rename from app/pages/clinicworkspace/components/DataRecencyFilterDropdown.js
rename to app/pages/clinicworkspace/components/filters/DataRecencyFilterDropdown.js
index 36a7297aff..21db357e18 100644
--- a/app/pages/clinicworkspace/components/DataRecencyFilterDropdown.js
+++ b/app/pages/clinicworkspace/components/filters/DataRecencyFilterDropdown.js
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import { useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
-import { trackMetric } from '../../../core/metricUtils';
+import { trackMetric } from '../../../../core/metricUtils';
 import { colors as vizColors } from '@tidepool/viz';
 
 import { Box, Grid } from 'theme-ui';
@@ -11,11 +11,11 @@ import noop from 'lodash/noop';
 
 import { bindPopover, bindTrigger, usePopupState } from 'material-ui-popup-state/hooks';
 
-import Button from '../../../components/elements/Button';
-import Popover from '../../../components/elements/Popover';
-import RadioGroup from '../../../components/elements/RadioGroup';
-import { lastDataFilterOptions } from '../../../core/clinicUtils';
-import useClinicMetricsPageName from '../useClinicMetricsPageName';
+import Button from '../../../../components/elements/Button';
+import Popover from '../../../../components/elements/Popover';
+import RadioGroup from '../../../../components/elements/RadioGroup';
+import { lastDataFilterOptions } from '../../../../core/clinicUtils';
+import useClinicMetricsPageName from '../../useClinicMetricsPageName';
 
 const DropdownContent = ({
   canSelectLastDataType,
diff --git a/app/pages/clinicworkspace/components/SiteFilterDropdown.js b/app/pages/clinicworkspace/components/filters/SiteFilterDropdown.js
similarity index 93%
rename from app/pages/clinicworkspace/components/SiteFilterDropdown.js
rename to app/pages/clinicworkspace/components/filters/SiteFilterDropdown.js
index 8e9c8ccf70..70a16d6661 100644
--- a/app/pages/clinicworkspace/components/SiteFilterDropdown.js
+++ b/app/pages/clinicworkspace/components/filters/SiteFilterDropdown.js
@@ -9,8 +9,8 @@ import CloseRoundedIcon from '@material-ui/icons/CloseRounded';
 import SearchIcon from '@material-ui/icons/Search';
 import KeyboardArrowDownRoundedIcon from '@material-ui/icons/KeyboardArrowDownRounded';
 import { colors as vizColors } from '@tidepool/viz';
-import utils from '../../../core/utils';
-import { trackMetric } from '../../../core/metricUtils';
+import utils from '../../../../core/utils';
+import { trackMetric } from '../../../../core/metricUtils';
 
 import without from 'lodash/without';
 import map from 'lodash/map';
@@ -20,18 +20,18 @@ import isEmpty from 'lodash/isEmpty';
 
 import { bindPopover, bindTrigger, usePopupState } from 'material-ui-popup-state/hooks';
 
-import Button from '../../../components/elements/Button';
-import Icon from '../../../components/elements/Icon';
-import Pill from '../../../components/elements/Pill';
-import Popover from '../../../components/elements/Popover';
-import Checkbox from '../../../components/elements/Checkbox';
+import Button from '../../../../components/elements/Button';
+import Icon from '../../../../components/elements/Icon';
+import Pill from '../../../../components/elements/Pill';
+import Popover from '../../../../components/elements/Popover';
+import Checkbox from '../../../../components/elements/Checkbox';
 
-import { borders } from '../../../themes/baseTheme';
+import { borders } from '../../../../themes/baseTheme';
 
-import { SPECIAL_FILTER_STATES } from '../useClinicPatientsFilters';
-import useIsClinicAdmin from '../useIsClinicAdmin';
-import useClinicMetricsPageName from '../useClinicMetricsPageName';
-import TextInput from '../../../components/elements/TextInput';
+import { SPECIAL_FILTER_STATES } from '../../useClinicPatientsFilters';
+import useIsClinicAdmin from '../../useIsClinicAdmin';
+import useClinicMetricsPageName from '../../useClinicMetricsPageName';
+import TextInput from '../../../../components/elements/TextInput';
 import styled from '@emotion/styled';
 
 const EditSitesAction = ({ onClick = noop }) => {
diff --git a/app/pages/clinicworkspace/components/SummaryPeriodFilterDropdown.js b/app/pages/clinicworkspace/components/filters/SummaryPeriodFilterDropdown.js
similarity index 92%
rename from app/pages/clinicworkspace/components/SummaryPeriodFilterDropdown.js
rename to app/pages/clinicworkspace/components/filters/SummaryPeriodFilterDropdown.js
index 06c1c3c668..82ed5262ce 100644
--- a/app/pages/clinicworkspace/components/SummaryPeriodFilterDropdown.js
+++ b/app/pages/clinicworkspace/components/filters/SummaryPeriodFilterDropdown.js
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import { useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
-import { trackMetric } from '../../../core/metricUtils';
+import { trackMetric } from '../../../../core/metricUtils';
 import { colors as vizColors } from '@tidepool/viz';
 
 import { Box, Grid } from 'theme-ui';
@@ -12,11 +12,11 @@ import noop from 'lodash/noop';
 
 import { bindPopover, bindTrigger, usePopupState } from 'material-ui-popup-state/hooks';
 
-import Button from '../../../components/elements/Button';
-import Popover from '../../../components/elements/Popover';
-import RadioGroup from '../../../components/elements/RadioGroup';
-import useClinicMetricsPageName from '../useClinicMetricsPageName';
-import { summaryPeriodOptions } from '../../../core/clinicUtils';
+import Button from '../../../../components/elements/Button';
+import Popover from '../../../../components/elements/Popover';
+import RadioGroup from '../../../../components/elements/RadioGroup';
+import useClinicMetricsPageName from '../../useClinicMetricsPageName';
+import { summaryPeriodOptions } from '../../../../core/clinicUtils';
 
 const getSummaryPeriodSelectLabel = (t, activeSummaryPeriod) => {
   switch (activeSummaryPeriod) {
diff --git a/app/pages/clinicworkspace/components/TagFilterDropdown.js b/app/pages/clinicworkspace/components/filters/TagFilterDropdown.js
similarity index 93%
rename from app/pages/clinicworkspace/components/TagFilterDropdown.js
rename to app/pages/clinicworkspace/components/filters/TagFilterDropdown.js
index 741a8a5493..2e6e70c217 100644
--- a/app/pages/clinicworkspace/components/TagFilterDropdown.js
+++ b/app/pages/clinicworkspace/components/filters/TagFilterDropdown.js
@@ -9,8 +9,8 @@ import CloseRoundedIcon from '@material-ui/icons/CloseRounded';
 import SearchIcon from '@material-ui/icons/Search';
 import KeyboardArrowDownRoundedIcon from '@material-ui/icons/KeyboardArrowDownRounded';
 import { colors as vizColors } from '@tidepool/viz';
-import utils from '../../../core/utils';
-import { trackMetric } from '../../../core/metricUtils';
+import utils from '../../../../core/utils';
+import { trackMetric } from '../../../../core/metricUtils';
 
 import without from 'lodash/without';
 import map from 'lodash/map';
@@ -20,18 +20,18 @@ import isEmpty from 'lodash/isEmpty';
 
 import { bindPopover, bindTrigger, usePopupState } from 'material-ui-popup-state/hooks';
 
-import Button from '../../../components/elements/Button';
-import Icon from '../../../components/elements/Icon';
-import Pill from '../../../components/elements/Pill';
-import Popover from '../../../components/elements/Popover';
-import Checkbox from '../../../components/elements/Checkbox';
+import Button from '../../../../components/elements/Button';
+import Icon from '../../../../components/elements/Icon';
+import Pill from '../../../../components/elements/Pill';
+import Popover from '../../../../components/elements/Popover';
+import Checkbox from '../../../../components/elements/Checkbox';
 
-import { borders } from '../../../themes/baseTheme';
+import { borders } from '../../../../themes/baseTheme';
 
-import { SPECIAL_FILTER_STATES } from '../useClinicPatientsFilters';
-import useIsClinicAdmin from '../useIsClinicAdmin';
-import useClinicMetricsPageName from '../useClinicMetricsPageName';
-import TextInput from '../../../components/elements/TextInput';
+import { SPECIAL_FILTER_STATES } from '../../useClinicPatientsFilters';
+import useIsClinicAdmin from '../../useIsClinicAdmin';
+import useClinicMetricsPageName from '../../useClinicMetricsPageName';
+import TextInput from '../../../../components/elements/TextInput';
 import styled from '@emotion/styled';
 
 const EditTagsAction = ({ onClick = noop }) => {
diff --git a/app/pages/clinicworkspace/components/TimeInRangeFilterDropdown.js b/app/pages/clinicworkspace/components/filters/TimeInRangeFilterDropdown.js
similarity index 94%
rename from app/pages/clinicworkspace/components/TimeInRangeFilterDropdown.js
rename to app/pages/clinicworkspace/components/filters/TimeInRangeFilterDropdown.js
index 08ce8c0a0d..ef693fd1f0 100644
--- a/app/pages/clinicworkspace/components/TimeInRangeFilterDropdown.js
+++ b/app/pages/clinicworkspace/components/filters/TimeInRangeFilterDropdown.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
 import { useFlags } from 'launchdarkly-react-client-sdk';
-import { trackMetric } from '../../../core/metricUtils';
+import { trackMetric } from '../../../../core/metricUtils';
 import { colors as vizColors, utils as vizUtils } from '@tidepool/viz';
 
 import { Box, Flex, Grid, Text } from 'theme-ui';
@@ -16,17 +16,17 @@ import noop from 'lodash/noop';
 
 import { bindPopover, bindTrigger, usePopupState } from 'material-ui-popup-state/hooks';
 
-import Button from '../../../components/elements/Button';
-import Pill from '../../../components/elements/Pill';
-import Popover from '../../../components/elements/Popover';
-import Checkbox from '../../../components/elements/Checkbox';
+import Button from '../../../../components/elements/Button';
+import Pill from '../../../../components/elements/Pill';
+import Popover from '../../../../components/elements/Popover';
+import Checkbox from '../../../../components/elements/Checkbox';
 
-import { colors } from '../../../themes/baseTheme';
-import { MGDL_UNITS } from '../../../core/constants';
+import { colors } from '../../../../themes/baseTheme';
+import { MGDL_UNITS } from '../../../../core/constants';
 
 const { reshapeBgClassesToBgBounds, generateBgRangeLabels } = vizUtils.bg;
-import useClinicMetricsPageName from '../useClinicMetricsPageName';
-import { timeInRangeFilterThresholds } from '../../../core/clinicUtils';
+import useClinicMetricsPageName from '../../useClinicMetricsPageName';
+import { timeInRangeFilterThresholds } from '../../../../core/clinicUtils';
 
 const getRangeDefinition = (t, { comparator, threshold, bgRange, isBounded }) => {
   if (isBounded) {

From 74dc5ed47d727a4a0d00ca7b2be2cf7d49e4760f Mon Sep 17 00:00:00 2001
From: henry-tp <henry.liang@tidepool.org>
Date: Tue, 1 Sep 2026 09:40:59 -0700
Subject: [PATCH 20/23] WEB-4460 group requiredFilters for clarity

---
 .../TideDashboardV2/filters/AppliedFiltersList.js     | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/pages/clinicworkspace/TideDashboardV2/filters/AppliedFiltersList.js b/app/pages/clinicworkspace/TideDashboardV2/filters/AppliedFiltersList.js
index da4b4767aa..be0786bd58 100644
--- a/app/pages/clinicworkspace/TideDashboardV2/filters/AppliedFiltersList.js
+++ b/app/pages/clinicworkspace/TideDashboardV2/filters/AppliedFiltersList.js
@@ -23,12 +23,9 @@ const AppliedFiltersList = ({ patientCount = 0 }) => {
 
   const { lastData, clinicSites, patientTags } = useSelector(state => state.blip.tideDashboardFilters);
 
-  const activeFilters = {
-    lastDataType: 'cgm',
-    lastData,
-    clinicSites,
-    patientTags,
-  };
+  // Last Data is a required filter to be applied
+  const requiredFilters = { lastData: true };
+  const activeFilters = { lastDataType: 'cgm', lastData, clinicSites, patientTags };
 
   const handleResetFilters = () => {
     dispatch(setPatientTagsFilter([]));
@@ -59,7 +56,7 @@ const AppliedFiltersList = ({ patientCount = 0 }) => {
       patientCount={patientCount}
       hasSearchActive={false} // No patient search in TIDE Dashboard
       filters={activeFilters}
-      requiredFilters={{ lastData: true }}
+      requiredFilters={requiredFilters}
       onRemoveFilter={handleRemoveFilter}
       rightContent={
         <Box sx={{ fontSize: 0 }}>

From 9540776b19ed645251bd47f69158914e2488dc98 Mon Sep 17 00:00:00 2001
From: henry-tp <henry.liang@tidepool.org>
Date: Thu, 3 Sep 2026 17:09:35 -0700
Subject: [PATCH 21/23] WEB-4460 address automated comment feedback

---
 __tests__/unit/app/redux/store/configureStore.dev.test.js   | 1 +
 __tests__/unit/app/redux/store/configureStore.prod.test.js  | 1 +
 .../TideDashboardV2/filters/AppliedFiltersList.js           | 6 ++++--
 .../components/filters/DataRecencyFilterDropdown.js         | 2 ++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/__tests__/unit/app/redux/store/configureStore.dev.test.js b/__tests__/unit/app/redux/store/configureStore.dev.test.js
index 1854a68247..b3f282fcaf 100644
--- a/__tests__/unit/app/redux/store/configureStore.dev.test.js
+++ b/__tests__/unit/app/redux/store/configureStore.dev.test.js
@@ -15,6 +15,7 @@ describe('configureStore.dev', () => {
   };
 
   beforeEach(() => {
+    jest.clearAllMocks();
     jest.useFakeTimers();
   });
 
diff --git a/__tests__/unit/app/redux/store/configureStore.prod.test.js b/__tests__/unit/app/redux/store/configureStore.prod.test.js
index 71cdf10cb5..7fbc0adac2 100644
--- a/__tests__/unit/app/redux/store/configureStore.prod.test.js
+++ b/__tests__/unit/app/redux/store/configureStore.prod.test.js
@@ -15,6 +15,7 @@ describe('configureStore.prod', () => {
   };
 
   beforeEach(() => {
+    jest.clearAllMocks()
     jest.useFakeTimers();
   });
 
diff --git a/app/pages/clinicworkspace/TideDashboardV2/filters/AppliedFiltersList.js b/app/pages/clinicworkspace/TideDashboardV2/filters/AppliedFiltersList.js
index be0786bd58..05126ec7a4 100644
--- a/app/pages/clinicworkspace/TideDashboardV2/filters/AppliedFiltersList.js
+++ b/app/pages/clinicworkspace/TideDashboardV2/filters/AppliedFiltersList.js
@@ -35,17 +35,19 @@ const AppliedFiltersList = ({ patientCount = 0 }) => {
 
   const handleRemoveFilter = (filterKey, value) => {
     switch (filterKey) {
-      case 'patientTags':
+      case 'patientTags': {
         const updatedTags = without(patientTags, value);
         dispatch(setPatientTagsFilter(updatedTags));
         dispatch(setOffset(0));
         break;
+      }
 
-      case 'clinicSites':
+      case 'clinicSites': {
         const updatedSites = without(clinicSites, value);
         dispatch(setClinicSitesFilter(updatedSites));
         dispatch(setOffset(0));
         break;
+      }
     }
   };
 
diff --git a/app/pages/clinicworkspace/components/filters/DataRecencyFilterDropdown.js b/app/pages/clinicworkspace/components/filters/DataRecencyFilterDropdown.js
index 21db357e18..3d0d85d566 100644
--- a/app/pages/clinicworkspace/components/filters/DataRecencyFilterDropdown.js
+++ b/app/pages/clinicworkspace/components/filters/DataRecencyFilterDropdown.js
@@ -208,6 +208,8 @@ DataRecencyFilterDropdown.propTypes = {
     value: PropTypes.number.isRequired,
     label: PropTypes.string.isRequired,
   })),
+  canSelectLastDataType: PropTypes.bool,
+  canClearSelection: PropTypes.bool,
 };
 
 export default DataRecencyFilterDropdown;

From 0b9cc4a7d6fc69dfd08ab60dab92e1ec56c4331d Mon Sep 17 00:00:00 2001
From: henry-tp <henry.liang@tidepool.org>
Date: Thu, 3 Sep 2026 17:27:11 -0700
Subject: [PATCH 22/23] WEB-4460 use atomic state setting for
 tideDashboardFilters

---
 .../tideDashboardFiltersSlice.test.js         | 41 +++++++++++++++++++
 .../unit/app/redux/actions/async.test.js      |  9 ++--
 .../tideDashboardFiltersSlice.js              |  6 +++
 app/redux/actions/async.js                    |  5 +--
 app/redux/actions/sync.js                     |  5 ++-
 .../clinic/WorkspaceSwitcher.test.js          |  6 +--
 test/unit/pages/clinicdetails.test.js         |  3 +-
 test/unit/pages/workspaces/workspaces.test.js |  6 +--
 test/unit/redux/actions/async.test.js         | 24 ++++-------
 test/unit/redux/actions/sync.test.js          |  4 +-
 test/unit/routes.test.js                      |  9 ++--
 test/unit/utils/navutils.test.js              |  6 +--
 12 files changed, 74 insertions(+), 50 deletions(-)
 create mode 100644 __tests__/unit/app/pages/clinicworkspace/TideDashboardV2/tideDashboardFiltersSlice.test.js

diff --git a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/tideDashboardFiltersSlice.test.js b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/tideDashboardFiltersSlice.test.js
new file mode 100644
index 0000000000..7595e45e82
--- /dev/null
+++ b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/tideDashboardFiltersSlice.test.js
@@ -0,0 +1,41 @@
+/* global describe */
+/* global it */
+/* global expect */
+
+import reducer from '@app/pages/clinicworkspace/TideDashboardV2/tideDashboardFiltersSlice';
+
+describe('tideDashboardFiltersSlice', () => {
+  const defaultFilters = { lastData: 7, patientTags: [], clinicSites: [], summaryPeriod: '14d' };
+  const appliedFilters = { lastData: 30, patientTags: ['tag1'], clinicSites: ['site1'], summaryPeriod: '30d' };
+
+  describe('SELECT_CLINIC_SUCCESS', () => {
+    it('should hydrate the filters carried on the clinic selection', () => {
+      const persistedFilters = { lastData: 14, patientTags: ['tag2'], clinicSites: [], summaryPeriod: '7d' };
+
+      const state = reducer(appliedFilters, {
+        type: 'SELECT_CLINIC_SUCCESS',
+        payload: { clinicId: 'clinic123', tideDashboardFilters: persistedFilters },
+      });
+
+      expect(state).toStrictEqual(persistedFilters);
+    });
+
+    it('should reset to the default filters when the clinic selection carries none', () => {
+      // Selecting a clinic with nothing persisted
+      let state = reducer(appliedFilters, {
+        type: 'SELECT_CLINIC_SUCCESS',
+        payload: { clinicId: 'clinic123', tideDashboardFilters: undefined },
+      });
+
+      expect(state).toStrictEqual(defaultFilters);
+
+      // Unsetting the clinic
+      state = reducer(appliedFilters, {
+        type: 'SELECT_CLINIC_SUCCESS',
+        payload: { clinicId: null },
+      });
+
+      expect(state).toStrictEqual(defaultFilters);
+    });
+  });
+});
diff --git a/__tests__/unit/app/redux/actions/async.test.js b/__tests__/unit/app/redux/actions/async.test.js
index 34e4fe8794..4c30ed7a71 100644
--- a/__tests__/unit/app/redux/actions/async.test.js
+++ b/__tests__/unit/app/redux/actions/async.test.js
@@ -130,8 +130,7 @@ describe('Actions', () => {
         };
 
         let expectedActions = [
-          { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId } },
-          { type: 'tideDashboardFilters/setTideDashboardFilters', payload: { lastData: 7, patientTags: ['load1'] } }, // loads from localState
+          { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId, tideDashboardFilters: { lastData: 7, patientTags: ['load1'] } } }, // filters load from localState
           { type: 'FETCH_CLINIC_PATIENT_COUNTS_REQUEST' },
           { type: 'FETCH_CLINIC_PATIENT_COUNT_SETTINGS_REQUEST' },
           { type: 'FETCH_CLINIC_PATIENT_COUNTS_SUCCESS', payload: { clinicId, patientCounts: countResults } },
@@ -169,8 +168,7 @@ describe('Actions', () => {
         };
 
         let expectedActions = [
-          { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId } },
-          { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
+          { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId, tideDashboardFilters: undefined } },
           { type: 'SET_CLINIC_UI_DETAILS', payload: { clinicId, uiDetails: expectedUIDetails } },
         ];
 
@@ -207,8 +205,7 @@ describe('Actions', () => {
         settingsErr.status = 500;
 
         let expectedActions = [
-          { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId } },
-          { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
+          { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId, tideDashboardFilters: undefined } },
           { type: 'FETCH_CLINIC_PATIENT_COUNTS_REQUEST' },
           { type: 'FETCH_CLINIC_PATIENT_COUNT_SETTINGS_REQUEST' },
           {
diff --git a/app/pages/clinicworkspace/TideDashboardV2/tideDashboardFiltersSlice.js b/app/pages/clinicworkspace/TideDashboardV2/tideDashboardFiltersSlice.js
index 2c862d21c7..e24dae61e2 100644
--- a/app/pages/clinicworkspace/TideDashboardV2/tideDashboardFiltersSlice.js
+++ b/app/pages/clinicworkspace/TideDashboardV2/tideDashboardFiltersSlice.js
@@ -1,4 +1,5 @@
 import { createSlice } from '@reduxjs/toolkit';
+import { SELECT_CLINIC_SUCCESS } from '../../../redux/constants/actionTypes';
 
 const getInitialState = () => ({
   lastData: 7,
@@ -26,6 +27,11 @@ const tideDashboardFiltersSlice = createSlice({
     },
     resetTideDashboardFilters: () => getInitialState(),
   },
+  extraReducers: (builder) => {
+    builder.addCase(SELECT_CLINIC_SUCCESS, (_state, action) => {
+      return action.payload?.tideDashboardFilters || getInitialState();
+    });
+  },
 });
 
 export const {
diff --git a/app/redux/actions/async.js b/app/redux/actions/async.js
index 5037e8ae5c..30de11200c 100644
--- a/app/redux/actions/async.js
+++ b/app/redux/actions/async.js
@@ -19,7 +19,6 @@ import { clinicUIDetails } from '../../core/clinicUtils.js';
 import { getDismissedAltRangeBannerKey, isRangeWithNonStandardTarget } from '../../providers/AppBanner/appBannerHelpers.js';
 import { getGlycemicRangesPreset } from '../../core/glycemicRangesUtils.js';
 import { getTideDashboardFiltersKey, loadLocalState } from '../store/localStorage';
-import { setTideDashboardFilters } from '../../pages/clinicworkspace/TideDashboardV2/tideDashboardFiltersSlice';
 
 // Exported as a mutable reference to allow location to be swapped in tests
 export const _win = { location: window.location };
@@ -3155,13 +3154,11 @@ export function fetchRpmReportPatients(api, clinicId, options) {
  */
 export function selectClinic(api, clinicId) {
   return (dispatch, getState) => {
-    dispatch(sync.selectClinicSuccess(clinicId));
-
     const { blip: { clinics = {}, loggedInUserId } } = getState();
 
     const tideDashboardFiltersKey = getTideDashboardFiltersKey(loggedInUserId, clinicId);
     const tideDashboardFilters = loggedInUserId && clinicId ? loadLocalState(tideDashboardFiltersKey) : undefined;
-    dispatch(setTideDashboardFilters(tideDashboardFilters));
+    dispatch(sync.selectClinicSuccess(clinicId, tideDashboardFilters));
 
     const clinic = clinics[clinicId];
 
diff --git a/app/redux/actions/sync.js b/app/redux/actions/sync.js
index 52574be736..9577a9134f 100644
--- a/app/redux/actions/sync.js
+++ b/app/redux/actions/sync.js
@@ -2114,11 +2114,12 @@ export function getClinicsForClinicianFailure(error, apiError) {
   };
 }
 
-export function selectClinicSuccess(clinicId) {
+export function selectClinicSuccess(clinicId, tideDashboardFilters) {
   return {
     type: ActionTypes.SELECT_CLINIC_SUCCESS,
     payload: {
-      clinicId
+      clinicId,
+      tideDashboardFilters,
     },
   };
 }
diff --git a/test/unit/components/clinic/WorkspaceSwitcher.test.js b/test/unit/components/clinic/WorkspaceSwitcher.test.js
index f5f8f32d29..f31ee82d74 100644
--- a/test/unit/components/clinic/WorkspaceSwitcher.test.js
+++ b/test/unit/components/clinic/WorkspaceSwitcher.test.js
@@ -209,12 +209,9 @@ describe('WorkspaceSwitcher', () => {
           type: 'SELECT_CLINIC_SUCCESS',
           payload: {
             clinicId: null,
+            tideDashboardFilters: undefined,
           },
         },
-        {
-          type: 'tideDashboardFilters/setTideDashboardFilters',
-          payload: undefined,
-        },
         {
           type: '@@router/CALL_HISTORY_METHOD',
           payload: {
@@ -252,6 +249,7 @@ describe('WorkspaceSwitcher', () => {
           type: 'SELECT_CLINIC_SUCCESS',
           payload: {
             clinicId: 'clinicID456',
+            tideDashboardFilters: undefined,
           },
         },
         {
diff --git a/test/unit/pages/clinicdetails.test.js b/test/unit/pages/clinicdetails.test.js
index 877c451170..29730f9404 100644
--- a/test/unit/pages/clinicdetails.test.js
+++ b/test/unit/pages/clinicdetails.test.js
@@ -474,8 +474,7 @@ describe('ClinicDetails', () => {
         const expectedActions = [
           { type: 'CREATE_CLINIC_REQUEST' },
           { type: 'CREATE_CLINIC_SUCCESS', payload: { clinic: { id: 'newClinic123' } } },
-          { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'newClinic123' } },
-          { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
+          { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'newClinic123', tideDashboardFilters: undefined } },
           { type: 'GET_CLINICS_FOR_CLINICIAN_REQUEST' },
           { type: 'GET_CLINICS_FOR_CLINICIAN_SUCCESS', payload: { clinics: [{ clinic: { id: 'newClinic123' } }], clinicianId: 'clinicianUserId123' } },
           { type: 'FETCH_CLINIC_EHR_SETTINGS_REQUEST' },
diff --git a/test/unit/pages/workspaces/workspaces.test.js b/test/unit/pages/workspaces/workspaces.test.js
index a352c8b1c2..1343264eae 100644
--- a/test/unit/pages/workspaces/workspaces.test.js
+++ b/test/unit/pages/workspaces/workspaces.test.js
@@ -310,8 +310,7 @@ describe('Workspaces', () => {
       store.clearActions();
       fireEvent.click(button);
       expect(store.getActions()).to.eql([
-        { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: null } },
-        { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
+        { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: null, tideDashboardFilters: undefined } },
         {
           type: '@@router/CALL_HISTORY_METHOD',
           payload: {
@@ -361,8 +360,7 @@ describe('Workspaces', () => {
       expect(store.getActions()).to.eql([
         { type: 'SET_PATIENT_LIST_SEARCH_TEXT_INPUT', payload: { textInput: '' } },
         { type: 'SET_IS_PATIENT_LIST_VISIBLE', payload: { isVisible: false } },
-        { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'clinicID456' } },
-        { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
+        { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'clinicID456', tideDashboardFilters: undefined } },
         { type: 'FETCH_CLINIC_PATIENT_COUNTS_REQUEST' },
         { type: 'FETCH_CLINIC_PATIENT_COUNT_SETTINGS_REQUEST' },
         {
diff --git a/test/unit/redux/actions/async.test.js b/test/unit/redux/actions/async.test.js
index 4fc46e8912..7e1b4c73bf 100644
--- a/test/unit/redux/actions/async.test.js
+++ b/test/unit/redux/actions/async.test.js
@@ -1202,8 +1202,7 @@ describe('Actions', () => {
               { type: 'FETCH_CLINICIAN_INVITES_SUCCESS', payload: { invites: [{ inviteId: 'invite123' }] }},
               { type: 'FETCH_ASSOCIATED_ACCOUNTS_REQUEST' },
               { type: 'FETCH_ASSOCIATED_ACCOUNTS_SUCCESS', payload: { patients: [] }},
-              { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'clinic123' }},
-              { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
+              { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'clinic123', tideDashboardFilters: undefined }},
               { type: 'LOGIN_SUCCESS', payload: { user } },
               { type: '@@router/CALL_HISTORY_METHOD', payload: { method: 'push', args: ['/some-dest', { selectedClinicId: 'clinic123' }] } }
             ];
@@ -1292,8 +1291,7 @@ describe('Actions', () => {
               { type: 'FETCH_CLINICIAN_INVITES_SUCCESS', payload: { invites: [] }},
               { type: 'FETCH_ASSOCIATED_ACCOUNTS_REQUEST' },
               { type: 'FETCH_ASSOCIATED_ACCOUNTS_SUCCESS', payload: { patients: [] }},
-              { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'clinicId123' } },
-              { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
+              { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'clinicId123', tideDashboardFilters: undefined } },
               { type: 'LOGIN_SUCCESS', payload: { user } },
               { type: '@@router/CALL_HISTORY_METHOD', payload: { method: 'push', args: [ '/clinic-details/migrate', { selectedClinicId: 'clinicId123' } ] } }
             ];
@@ -1335,8 +1333,7 @@ describe('Actions', () => {
               { type: 'FETCH_CLINICIAN_INVITES_SUCCESS', payload: { invites: [] }},
               { type: 'FETCH_ASSOCIATED_ACCOUNTS_REQUEST' },
               { type: 'FETCH_ASSOCIATED_ACCOUNTS_SUCCESS', payload: { patients: [] }},
-              { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'clinicId123' } },
-              { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
+              { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'clinicId123', tideDashboardFilters: undefined } },
               { type: 'LOGIN_SUCCESS', payload: { user } },
               { type: '@@router/CALL_HISTORY_METHOD', payload: { method: 'push', args: [ '/clinic-details/migrate', { selectedClinicId: 'clinicId123' } ] } }
             ];
@@ -1471,8 +1468,7 @@ describe('Actions', () => {
               { type: 'FETCH_CLINICIAN_INVITES_SUCCESS', payload: { invites: [] }},
               { type: 'FETCH_ASSOCIATED_ACCOUNTS_REQUEST' },
               { type: 'FETCH_ASSOCIATED_ACCOUNTS_SUCCESS', payload: { patients: [] }},
-              { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'clinic123' } },
-              { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
+              { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'clinic123', tideDashboardFilters: undefined } },
               { type: 'LOGIN_SUCCESS', payload: { user } },
               { type: '@@router/CALL_HISTORY_METHOD', payload: { method: 'push', args: ['/clinic-workspace', { selectedClinicId: 'clinic123' }] } }
             ];
@@ -1527,8 +1523,7 @@ describe('Actions', () => {
             { type: 'FETCH_CLINICIAN_INVITES_SUCCESS', payload: { invites: [] }},
             { type: 'FETCH_ASSOCIATED_ACCOUNTS_REQUEST' },
             { type: 'FETCH_ASSOCIATED_ACCOUNTS_SUCCESS', payload: { patients: [] }},
-            { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'clinic456' } },
-            { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
+            { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'clinic456', tideDashboardFilters: undefined } },
             { type: 'LOGIN_SUCCESS', payload: { user } },
             { type: '@@router/CALL_HISTORY_METHOD', payload: { method: 'push', args: ['/clinic-workspace', { selectedClinicId: 'clinic456' }] } }
           ];
@@ -1580,8 +1575,7 @@ describe('Actions', () => {
             { type: 'FETCH_CLINICIAN_INVITES_SUCCESS', payload: { invites: [] }},
             { type: 'FETCH_ASSOCIATED_ACCOUNTS_REQUEST' },
             { type: 'FETCH_ASSOCIATED_ACCOUNTS_SUCCESS', payload: { patients: [] }},
-            { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'clinic123' } },
-            { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
+            { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'clinic123', tideDashboardFilters: undefined } },
             { type: 'LOGIN_SUCCESS', payload: { user } },
             { type: '@@router/CALL_HISTORY_METHOD', payload: { method: 'push', args: ['/clinic-workspace', { selectedClinicId: 'clinic123' }] } }
           ];
@@ -1797,8 +1791,7 @@ describe('Actions', () => {
             { type: 'FETCH_CLINICIAN_INVITES_SUCCESS', payload: { invites: [] }},
             { type: 'FETCH_ASSOCIATED_ACCOUNTS_REQUEST' },
             { type: 'FETCH_ASSOCIATED_ACCOUNTS_SUCCESS', payload: { patients: [] }},
-            { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'clinic456' } },
-            { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
+            { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'clinic456', tideDashboardFilters: undefined } },
             { type: 'LOGIN_SUCCESS', payload: { user } },
             { type: '@@router/CALL_HISTORY_METHOD', payload: { method: 'push', args: ['/newDestination', { selectedClinicId: 'clinic456' }] } }
           ];
@@ -5423,8 +5416,7 @@ describe('Actions', () => {
         let expectedActions = [
           { type: 'CREATE_CLINIC_REQUEST' },
           { type: 'CREATE_CLINIC_SUCCESS', payload: { clinic : clinicReturn } },
-          { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId : 'new_clinic_id' } },
-          { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
+          { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId : 'new_clinic_id', tideDashboardFilters: undefined } },
           { type: 'GET_CLINICS_FOR_CLINICIAN_REQUEST' },
           { type: 'GET_CLINICS_FOR_CLINICIAN_SUCCESS', payload: { clinicianId, clinics } },
           { type: 'FETCH_CLINIC_EHR_SETTINGS_REQUEST' },
diff --git a/test/unit/redux/actions/sync.test.js b/test/unit/redux/actions/sync.test.js
index 89cf13118d..116a8ff746 100644
--- a/test/unit/redux/actions/sync.test.js
+++ b/test/unit/redux/actions/sync.test.js
@@ -3576,9 +3576,11 @@ describe('Actions', () => {
 
       it('type should equal SELECT_CLINIC_SUCCESS', () => {
         let clinicId = 'clinicId'
-        let action = sync.selectClinicSuccess(clinicId);
+        let tideDashboardFilters = { lastData: 30, patientTags: ['tag1'] };
+        let action = sync.selectClinicSuccess(clinicId, tideDashboardFilters);
         expect(action.type).to.equal('SELECT_CLINIC_SUCCESS');
         expect(action.payload.clinicId).to.equal(clinicId);
+        expect(action.payload.tideDashboardFilters).to.eql(tideDashboardFilters);
       });
     });
 
diff --git a/test/unit/routes.test.js b/test/unit/routes.test.js
index 965a677641..5cc7dca096 100644
--- a/test/unit/routes.test.js
+++ b/test/unit/routes.test.js
@@ -489,8 +489,7 @@ describe('routes', () => {
         { type: 'FETCH_CLINIC_MRN_SETTINGS_SUCCESS', payload: { clinicId: 'newClinic', settings: {} } },
         { type: 'FETCH_CLINICIAN_INVITES_REQUEST' },
         { type: 'FETCH_CLINICIAN_INVITES_SUCCESS', payload: { invites: [] } },
-        { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'newClinic' } },
-        { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
+        { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'newClinic', tideDashboardFilters: undefined } },
         routeAction('/clinic-details/migrate', { selectedClinicId: null }),
       ];
 
@@ -555,8 +554,7 @@ describe('routes', () => {
         { type: 'FETCH_CLINIC_MRN_SETTINGS_SUCCESS', payload: { clinicId: 'newClinic', settings: {} } },
         { type: 'FETCH_CLINICIAN_INVITES_REQUEST' },
         { type: 'FETCH_CLINICIAN_INVITES_SUCCESS', payload: { invites: [] } },
-        { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'newClinic' } },
-        { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
+        { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'newClinic', tideDashboardFilters: undefined } },
         routeAction('/clinic-details/migrate', { selectedClinicId: null }),
       ];
 
@@ -1091,8 +1089,7 @@ describe('routes', () => {
           });
 
           let expectedActions = [
-            { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'clinic123' } },
-            { type: 'tideDashboardFilters/setTideDashboardFilters', payload: undefined },
+            { type: 'SELECT_CLINIC_SUCCESS', payload: { clinicId: 'clinic123', tideDashboardFilters: undefined } },
             { type: 'FETCH_CLINIC_PATIENT_COUNTS_REQUEST' },
             { type: 'FETCH_CLINIC_PATIENT_COUNT_SETTINGS_REQUEST' },
             routeAction('/clinic-details'),
diff --git a/test/unit/utils/navutils.test.js b/test/unit/utils/navutils.test.js
index b927e833f2..a76319d5c1 100644
--- a/test/unit/utils/navutils.test.js
+++ b/test/unit/utils/navutils.test.js
@@ -142,11 +142,7 @@ describe('navutils', () => {
           },
           {
             type: 'SELECT_CLINIC_SUCCESS',
-            payload: { clinicId: null }, // null is appropriate for switch to private workspace
-          },
-          {
-            type: 'tideDashboardFilters/setTideDashboardFilters',
-            payload: undefined,
+            payload: { clinicId: null, tideDashboardFilters: undefined }, // null is appropriate for switch to private workspace
           },
           {
             type: '@@router/CALL_HISTORY_METHOD',

From 3cb89ebaee7bbf6233d1586eed07e5005d310e0a Mon Sep 17 00:00:00 2001
From: henry-tp <henry.liang@tidepool.org>
Date: Sat, 5 Sep 2026 19:41:29 -0700
Subject: [PATCH 23/23] WEB-4460 remove dup import

---
 .../clinicworkspace/TideDashboardV2/TideDashboardV2.test.js      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/TideDashboardV2.test.js b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/TideDashboardV2.test.js
index 74a970df3e..39514ce732 100644
--- a/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/TideDashboardV2.test.js
+++ b/__tests__/unit/app/pages/clinicworkspace/TideDashboardV2/TideDashboardV2.test.js
@@ -12,7 +12,6 @@ import { setupStore } from '@tests/utils/setupStore';
 import blipReducer from '@app/redux/reducers';
 import { CATEGORY } from '@app/pages/clinicworkspace/TideDashboardV2/tideDashboardSlice';
 import TideDashboardV2 from '@app/pages/clinicworkspace/TideDashboardV2/TideDashboardV2';
-import { MemoryRouter } from 'react-router-dom';
 
 // Pin the data recency window to a stable [lastDataFrom, lastDataTo]
 jest.mock('@app/pages/clinicworkspace/TideDashboardV2/useDerivedDataRecencyEndpoints', () => ({