mirrors/shlink-web-client
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink-web-client.git synced 2025-01-09 17:57:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #551 from acelaya-forks/feature/white-screen

Browse source 
Ensured settings migration function does not crash if settings are no…
This commit is contained in:
Alejandro Celaya 2022-01-01 09:45:10 +01:00 committed by GitHub
commit 7794876d7c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/settings/helpers/index.ts
View file

@ -1,6 +1,10 @@
import { ShlinkState } from '../../container/types'; import { ShlinkState } from '../../container/types';
export const migrateDeprecatedSettings = (state: ShlinkState): ShlinkState => { export const migrateDeprecatedSettings = (state: Partial<ShlinkState>): Partial<ShlinkState> => {
if (!state.settings) {
return state;
}
// The "last180Days" interval had a typo, with a lowercase d // The "last180Days" interval had a typo, with a lowercase d
if ((state.settings.visits?.defaultInterval as any) === 'last180days') { if ((state.settings.visits?.defaultInterval as any) === 'last180days') {
state.settings.visits && (state.settings.visits.defaultInterval = 'last180Days'); state.settings.visits && (state.settings.visits.defaultInterval = 'last180Days');

4
test/settings/helpers/index.test.ts
View file

@ -4,6 +4,10 @@ import { ShlinkState } from '../../../src/container/types';
describe('settings-helpers', () => { describe('settings-helpers', () => {
describe('migrateDeprecatedSettings', () => { describe('migrateDeprecatedSettings', () => {
it('returns object as is if settings are not set', () => {
expect(migrateDeprecatedSettings({})).toEqual({});
});
it('updates settings as expected', () => { it('updates settings as expected', () => {
const state = Mock.of<ShlinkState>({ const state = Mock.of<ShlinkState>({
settings: { settings: {