diff --git a/src/renderer/components/AllRead.tsx b/src/renderer/components/AllRead.tsx index 7de8f6276..a047d0de0 100644 --- a/src/renderer/components/AllRead.tsx +++ b/src/renderer/components/AllRead.tsx @@ -2,7 +2,7 @@ import { type FC, useContext, useMemo } from 'react'; import { Constants } from '../constants'; import { AppContext } from '../context/App'; -import { hasAnyFiltersSet } from '../utils/notifications/filters/filter'; +import { hasActiveFilters } from '../utils/notifications/filters/filter'; import { EmojiSplash } from './layout/EmojiSplash'; interface IAllRead { @@ -12,7 +12,7 @@ interface IAllRead { export const AllRead: FC = ({ fullHeight = true }: IAllRead) => { const { settings } = useContext(AppContext); - const hasFilters = hasAnyFiltersSet(settings); + const hasFilters = hasActiveFilters(settings); const emoji = useMemo( () => diff --git a/src/renderer/components/Sidebar.tsx b/src/renderer/components/Sidebar.tsx index c599a7518..b127be877 100644 --- a/src/renderer/components/Sidebar.tsx +++ b/src/renderer/components/Sidebar.tsx @@ -22,7 +22,7 @@ import { openGitHubNotifications, openGitHubPulls, } from '../utils/links'; -import { hasAnyFiltersSet } from '../utils/notifications/filters/filter'; +import { hasActiveFilters } from '../utils/notifications/filters/filter'; import { getNotificationCount } from '../utils/notifications/notifications'; import { LogoIcon } from './icons/LogoIcon'; @@ -119,7 +119,7 @@ export const Sidebar: FC = () => { sx={sidebarButtonStyle} tooltipDirection="e" unsafeDisableTooltip={false} - variant={hasAnyFiltersSet(settings) ? 'primary' : 'invisible'} + variant={hasActiveFilters(settings) ? 'primary' : 'invisible'} /> )} diff --git a/src/renderer/utils/notifications/filters/filter.test.ts b/src/renderer/utils/notifications/filters/filter.test.ts index 5ade78f89..11f38902f 100644 --- a/src/renderer/utils/notifications/filters/filter.test.ts +++ b/src/renderer/utils/notifications/filters/filter.test.ts @@ -6,7 +6,7 @@ import type { Owner } from '../../../typesGitHub'; import { filterBaseNotifications, filterDetailedNotifications, - hasAnyFiltersSet, + hasActiveFilters, } from './filter'; describe('renderer/utils/notifications/filters/filter.ts', () => { @@ -182,9 +182,9 @@ describe('renderer/utils/notifications/filters/filter.ts', () => { }); }); - describe('has filters', () => { + describe('hasActiveFilters', () => { it('default filter settings', () => { - expect(hasAnyFiltersSet(defaultSettings)).toBe(false); + expect(hasActiveFilters(defaultSettings)).toBe(false); }); it('non-default search token includes filters', () => { @@ -192,7 +192,7 @@ describe('renderer/utils/notifications/filters/filter.ts', () => { ...defaultSettings, filterIncludeSearchTokens: ['author:gitify' as SearchToken], }; - expect(hasAnyFiltersSet(settings)).toBe(true); + expect(hasActiveFilters(settings)).toBe(true); }); it('non-default search token excludes filters', () => { @@ -200,7 +200,7 @@ describe('renderer/utils/notifications/filters/filter.ts', () => { ...defaultSettings, filterExcludeSearchTokens: ['org:github' as SearchToken], }; - expect(hasAnyFiltersSet(settings)).toBe(true); + expect(hasActiveFilters(settings)).toBe(true); }); it('non-default user type filters', () => { @@ -208,7 +208,7 @@ describe('renderer/utils/notifications/filters/filter.ts', () => { ...defaultSettings, filterUserTypes: ['Bot'], }; - expect(hasAnyFiltersSet(settings)).toBe(true); + expect(hasActiveFilters(settings)).toBe(true); }); it('non-default subject type filters', () => { @@ -216,7 +216,7 @@ describe('renderer/utils/notifications/filters/filter.ts', () => { ...defaultSettings, filterSubjectTypes: ['Issue'], }; - expect(hasAnyFiltersSet(settings)).toBe(true); + expect(hasActiveFilters(settings)).toBe(true); }); it('non-default state filters', () => { @@ -224,7 +224,7 @@ describe('renderer/utils/notifications/filters/filter.ts', () => { ...defaultSettings, filterStates: ['draft', 'merged'], }; - expect(hasAnyFiltersSet(settings)).toBe(true); + expect(hasActiveFilters(settings)).toBe(true); }); it('non-default reason filters', () => { @@ -232,7 +232,7 @@ describe('renderer/utils/notifications/filters/filter.ts', () => { ...defaultSettings, filterReasons: ['subscribed', 'manual'], }; - expect(hasAnyFiltersSet(settings)).toBe(true); + expect(hasActiveFilters(settings)).toBe(true); }); }); }); diff --git a/src/renderer/utils/notifications/filters/filter.ts b/src/renderer/utils/notifications/filters/filter.ts index 2c1c93011..89ea66992 100644 --- a/src/renderer/utils/notifications/filters/filter.ts +++ b/src/renderer/utils/notifications/filters/filter.ts @@ -74,7 +74,7 @@ export function filterDetailedNotifications( }); } -export function hasAnyFiltersSet(settings: SettingsState): boolean { +export function hasActiveFilters(settings: SettingsState): boolean { return ( userTypeFilter.hasFilters(settings) || hasIncludeSearchFilters(settings) ||