Skip to content

refactor: split default and mock settings into sections #1377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 15, 2024
Merged

refactor: split default and mock settings into sections #1377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2f99c8
refactor: split default and mock settings into sections
setchy Jul 13, 2024
417decd
refactor: split default and mock settings into sections
setchy Jul 13, 2024
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
38 changes: 27 additions & 11 deletions src/__mocks__/state-mocks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,26 +71,42 @@ export const mockAuth: AuthState = {

export const mockToken = 'token-123-456' as Token;

export const mockSettings: SettingsState = {
participating: false,
playSound: true,
showNotifications: true,
hideBots: false,
showNotificationsCountInTray: false,
openAtStartup: false,
const mockApperanceSettings = {
theme: Theme.SYSTEM,
zoomPercentage: 100,
detailedNotifications: true,
markAsDoneOnOpen: false,
showAccountHostname: false,
delayNotificationState: false,
showPills: true,
showNumber: true,
keyboardShortcut: true,
showAccountHostname: false,
};

const mockNotificationSettings = {
groupBy: GroupBy.REPOSITORY,
participating: false,
markAsDoneOnOpen: false,
delayNotificationState: false,
};

const mockSystemSettings = {
keyboardShortcut: true,
showNotificationsCountInTray: false,
showNotifications: true,
playSound: true,
openAtStartup: false,
};

const mockFilters = {
hideBots: false,
filterReasons: [],
};

export const mockSettings: SettingsState = {
...mockApperanceSettings,
...mockNotificationSettings,
...mockSystemSettings,
...mockFilters,
};

export const mockState: GitifyState = {
auth: mockAuth,
settings: mockSettings,
Expand Down
42 changes: 27 additions & 15 deletions src/context/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,27 +52,39 @@ const defaultAuth: AuthState = {
user: null,
};

export const defaultFilters = {
hideBots: false,
filterReasons: [],
};

export const defaultSettings: SettingsState = {
participating: false,
playSound: true,
showNotifications: true,
showNotificationsCountInTray: false,
openAtStartup: false,
const defaultApperanceSettings = {
theme: Theme.SYSTEM,
zoomPercentage: 100,
detailedNotifications: true,
markAsDoneOnOpen: false,
showAccountHostname: false,
delayNotificationState: false,
showPills: true,
showNumber: true,
keyboardShortcut: true,
showAccountHostname: false,
};

const defaultNotificationSettings = {
groupBy: GroupBy.REPOSITORY,
participating: false,
markAsDoneOnOpen: false,
delayNotificationState: false,
};

const defaultSystemSettings = {
keyboardShortcut: true,
showNotificationsCountInTray: false,
showNotifications: true,
playSound: true,
openAtStartup: false,
};

export const defaultFilters = {
hideBots: false,
filterReasons: [],
};

export const defaultSettings: SettingsState = {
...defaultApperanceSettings,
...defaultNotificationSettings,
...defaultSystemSettings,
...defaultFilters,
};

Expand Down