Skip to content

Commit d70a10b

Browse files
authored
refactor(filters): has active filters (#2248)
Signed-off-by: Adam Setch <[email protected]>
1 parent 33a2cb6 commit d70a10b

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

src/renderer/components/AllRead.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { type FC, useContext, useMemo } from 'react';
22

33
import { Constants } from '../constants';
44
import { AppContext } from '../context/App';
5-
import { hasAnyFiltersSet } from '../utils/notifications/filters/filter';
5+
import { hasActiveFilters } from '../utils/notifications/filters/filter';
66
import { EmojiSplash } from './layout/EmojiSplash';
77

88
interface IAllRead {
@@ -12,7 +12,7 @@ interface IAllRead {
1212
export const AllRead: FC<IAllRead> = ({ fullHeight = true }: IAllRead) => {
1313
const { settings } = useContext(AppContext);
1414

15-
const hasFilters = hasAnyFiltersSet(settings);
15+
const hasFilters = hasActiveFilters(settings);
1616

1717
const emoji = useMemo(
1818
() =>

src/renderer/components/Sidebar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {
2222
openGitHubNotifications,
2323
openGitHubPulls,
2424
} from '../utils/links';
25-
import { hasAnyFiltersSet } from '../utils/notifications/filters/filter';
25+
import { hasActiveFilters } from '../utils/notifications/filters/filter';
2626
import { getNotificationCount } from '../utils/notifications/notifications';
2727
import { LogoIcon } from './icons/LogoIcon';
2828

@@ -119,7 +119,7 @@ export const Sidebar: FC = () => {
119119
sx={sidebarButtonStyle}
120120
tooltipDirection="e"
121121
unsafeDisableTooltip={false}
122-
variant={hasAnyFiltersSet(settings) ? 'primary' : 'invisible'}
122+
variant={hasActiveFilters(settings) ? 'primary' : 'invisible'}
123123
/>
124124
)}
125125

src/renderer/utils/notifications/filters/filter.test.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import type { Owner } from '../../../typesGitHub';
66
import {
77
filterBaseNotifications,
88
filterDetailedNotifications,
9-
hasAnyFiltersSet,
9+
hasActiveFilters,
1010
} from './filter';
1111

1212
describe('renderer/utils/notifications/filters/filter.ts', () => {
@@ -182,57 +182,57 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
182182
});
183183
});
184184

185-
describe('has filters', () => {
185+
describe('hasActiveFilters', () => {
186186
it('default filter settings', () => {
187-
expect(hasAnyFiltersSet(defaultSettings)).toBe(false);
187+
expect(hasActiveFilters(defaultSettings)).toBe(false);
188188
});
189189

190190
it('non-default search token includes filters', () => {
191191
const settings: SettingsState = {
192192
...defaultSettings,
193193
filterIncludeSearchTokens: ['author:gitify' as SearchToken],
194194
};
195-
expect(hasAnyFiltersSet(settings)).toBe(true);
195+
expect(hasActiveFilters(settings)).toBe(true);
196196
});
197197

198198
it('non-default search token excludes filters', () => {
199199
const settings: SettingsState = {
200200
...defaultSettings,
201201
filterExcludeSearchTokens: ['org:github' as SearchToken],
202202
};
203-
expect(hasAnyFiltersSet(settings)).toBe(true);
203+
expect(hasActiveFilters(settings)).toBe(true);
204204
});
205205

206206
it('non-default user type filters', () => {
207207
const settings: SettingsState = {
208208
...defaultSettings,
209209
filterUserTypes: ['Bot'],
210210
};
211-
expect(hasAnyFiltersSet(settings)).toBe(true);
211+
expect(hasActiveFilters(settings)).toBe(true);
212212
});
213213

214214
it('non-default subject type filters', () => {
215215
const settings: SettingsState = {
216216
...defaultSettings,
217217
filterSubjectTypes: ['Issue'],
218218
};
219-
expect(hasAnyFiltersSet(settings)).toBe(true);
219+
expect(hasActiveFilters(settings)).toBe(true);
220220
});
221221

222222
it('non-default state filters', () => {
223223
const settings: SettingsState = {
224224
...defaultSettings,
225225
filterStates: ['draft', 'merged'],
226226
};
227-
expect(hasAnyFiltersSet(settings)).toBe(true);
227+
expect(hasActiveFilters(settings)).toBe(true);
228228
});
229229

230230
it('non-default reason filters', () => {
231231
const settings: SettingsState = {
232232
...defaultSettings,
233233
filterReasons: ['subscribed', 'manual'],
234234
};
235-
expect(hasAnyFiltersSet(settings)).toBe(true);
235+
expect(hasActiveFilters(settings)).toBe(true);
236236
});
237237
});
238238
});

src/renderer/utils/notifications/filters/filter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ export function filterDetailedNotifications(
7474
});
7575
}
7676

77-
export function hasAnyFiltersSet(settings: SettingsState): boolean {
77+
export function hasActiveFilters(settings: SettingsState): boolean {
7878
return (
7979
userTypeFilter.hasFilters(settings) ||
8080
hasIncludeSearchFilters(settings) ||

0 commit comments

Comments
 (0)