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
14 changes: 13 additions & 1 deletion src/app/common/settings.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,19 @@ export class SettingsService extends AsyncHandler {
(user) => !!user,
).catch(() => null);
if (!user) return;
const data = await showMetadata(user.id, 'settings');
// Nothing awaits init(), so a failed load must not reject.
// The defaults stay in use until the next page load.
const data = await showMetadata(user.id, 'settings').catch((err) => {
log(
'Settings',
'Failed to load user settings',
[err as object],
'warn',
true,
);
return null;
});
if (!data) return;
this._user_settings.set((data.details || {}) as HashMap);
this._initDarkMode();
this._applyTheme();
Expand Down
17 changes: 17 additions & 0 deletions src/tests/common/settings.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ vi.mock('../../app/common/general', () => ({
log: vi.fn(),
}));

import { showMetadata } from '@placeos/ts-client';

import { log } from '../../app/common/general';
import { DEFAULT_SETTINGS } from '../../app/common/settings';
import { SettingsService } from '../../app/common/settings.service';

Expand Down Expand Up @@ -102,6 +105,20 @@ describe('SettingsService', () => {
expect(service.app_name).toBeDefined();
expect(typeof service.app_name).toBe('string');
});

it('should not reject when user settings fail to load', async () => {
vi.mocked(showMetadata).mockRejectedValueOnce(
new TypeError('Load failed'),
);
await expect(service.init()).resolves.toBeUndefined();
expect(log).toHaveBeenCalledWith(
'Settings',
'Failed to load user settings',
[expect.any(TypeError)],
'warn',
true,
);
});
});

describe('title getter/setter', () => {
Expand Down
Loading