Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/renderer/components/AllRead.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -12,7 +12,7 @@ interface IAllRead {
export const AllRead: FC<IAllRead> = ({ fullHeight = true }: IAllRead) => {
const { settings } = useContext(AppContext);

const hasFilters = hasAnyFiltersSet(settings);
const hasFilters = hasActiveFilters(settings);

const emoji = useMemo(
() =>
Expand Down
4 changes: 2 additions & 2 deletions src/renderer/components/Sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -119,7 +119,7 @@ export const Sidebar: FC = () => {
sx={sidebarButtonStyle}
tooltipDirection="e"
unsafeDisableTooltip={false}
variant={hasAnyFiltersSet(settings) ? 'primary' : 'invisible'}
variant={hasActiveFilters(settings) ? 'primary' : 'invisible'}
/>
)}

Expand Down
18 changes: 9 additions & 9 deletions src/renderer/utils/notifications/filters/filter.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import type { Owner } from '../../../typesGitHub';
import {
filterBaseNotifications,
filterDetailedNotifications,
hasAnyFiltersSet,
hasActiveFilters,
} from './filter';

describe('renderer/utils/notifications/filters/filter.ts', () => {
Expand Down Expand Up @@ -182,57 +182,57 @@ 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', () => {
const settings: SettingsState = {
...defaultSettings,
filterIncludeSearchTokens: ['author:gitify' as SearchToken],
};
expect(hasAnyFiltersSet(settings)).toBe(true);
expect(hasActiveFilters(settings)).toBe(true);
});

it('non-default search token excludes filters', () => {
const settings: SettingsState = {
...defaultSettings,
filterExcludeSearchTokens: ['org:github' as SearchToken],
};
expect(hasAnyFiltersSet(settings)).toBe(true);
expect(hasActiveFilters(settings)).toBe(true);
});

it('non-default user type filters', () => {
const settings: SettingsState = {
...defaultSettings,
filterUserTypes: ['Bot'],
};
expect(hasAnyFiltersSet(settings)).toBe(true);
expect(hasActiveFilters(settings)).toBe(true);
});

it('non-default subject type filters', () => {
const settings: SettingsState = {
...defaultSettings,
filterSubjectTypes: ['Issue'],
};
expect(hasAnyFiltersSet(settings)).toBe(true);
expect(hasActiveFilters(settings)).toBe(true);
});

it('non-default state filters', () => {
const settings: SettingsState = {
...defaultSettings,
filterStates: ['draft', 'merged'],
};
expect(hasAnyFiltersSet(settings)).toBe(true);
expect(hasActiveFilters(settings)).toBe(true);
});

it('non-default reason filters', () => {
const settings: SettingsState = {
...defaultSettings,
filterReasons: ['subscribed', 'manual'],
};
expect(hasAnyFiltersSet(settings)).toBe(true);
expect(hasActiveFilters(settings)).toBe(true);
});
});
});
2 changes: 1 addition & 1 deletion src/renderer/utils/notifications/filters/filter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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) ||
Expand Down
Loading