From d98e31af458ed42e678072879265267e8148c627 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Wed, 22 Jan 2020 02:44:39 +0200 Subject: [PATCH] snapshot/source mismatch case --- .../style_switcher/style_switcher.js | 53 ++++++++++++++++--- .../style_switcher/style_switcher.vue | 18 ++++++- src/i18n/en.json | 7 ++- 3 files changed, 68 insertions(+), 10 deletions(-) diff --git a/src/components/style_switcher/style_switcher.js b/src/components/style_switcher/style_switcher.js index 195c6b35..3b538ac7 100644 --- a/src/components/style_switcher/style_switcher.js +++ b/src/components/style_switcher/style_switcher.js @@ -160,6 +160,9 @@ export default { ) } } else if (origin === 'localStorage') { + if (type === 'snapshot_source_mismatch') { + return t(pre + 'snapshot_source_mismatch') + } // FE upgraded from v2 if (themeEngineVersion === 2) { return t(pre + 'upgraded_from_v2') @@ -345,7 +348,10 @@ export default { source.radii = this.currentRadii } - const theme = this.previewTheme + const theme = { + themeEngineVersion: CURRENT_VERSION, + ...this.previewTheme + } return { // To separate from other random JSON files and possible future source formats @@ -381,17 +387,34 @@ export default { const version = (origin === 'localstorage' && !theme.colors) ? 'l1' : fileVersion + const snapshotEngineVersion = (theme || {}).themeEngineVersion const themeEngineVersion = (source || {}).themeEngineVersion || 2 const versionsMatch = themeEngineVersion === CURRENT_VERSION + console.log( + theme !== undefined, + source !== undefined, + themeEngineVersion !== snapshotEngineVersion + ) + const sourceSnapshotMismatch = ( + theme !== undefined && + source !== undefined && + themeEngineVersion !== snapshotEngineVersion + ) // Force loading of source if user requested it or if snapshot // is unavailable const forcedSourceLoad = (source && forceUseSource) || !theme - if (!versionsMatch && + if (!(versionsMatch && !sourceSnapshotMismatch) && !forcedSourceLoad && version !== 'l1' && origin !== 'defaults' ) { - if (!theme) { + if (sourceSnapshotMismatch) { + this.themeWarning = { + origin, + themeEngineVersion, + type: 'snapshot_source_mismatch' + } + } else if (!theme) { this.themeWarning = { origin, noActionsPossible: true, @@ -428,7 +451,19 @@ export default { } this.dismissWarning() }, - loadThemeFromLocalStorage (confirmLoadSource = false) { + forceSnapshot() { + const { origin } = this.themeWarning + switch (origin) { + case 'localstorage': + this.loadThemeFromLocalStorage(false, true) + break + case 'file': + console.err('Forcing snapshout from file is not supported yet') + break + } + this.dismissWarning() + }, + loadThemeFromLocalStorage (confirmLoadSource = false, forceSnapshot = false) { const { customTheme: theme, customThemeSource: source @@ -442,7 +477,10 @@ export default { ) } else { this.loadTheme( - { theme, source }, + { + theme, + source: forceSnapshot ? theme : source + }, 'localStorage', confirmLoadSource ) @@ -451,7 +489,10 @@ export default { setCustomTheme () { this.$store.dispatch('setOption', { name: 'customTheme', - value: this.previewTheme + value: { + themeEngineVersion: CURRENT_VERSION, + ...this.previewTheme + } }) this.$store.dispatch('setOption', { name: 'customThemeSource', diff --git a/src/components/style_switcher/style_switcher.vue b/src/components/style_switcher/style_switcher.vue index 79c2fcd3..793d68f1 100644 --- a/src/components/style_switcher/style_switcher.vue +++ b/src/components/style_switcher/style_switcher.vue @@ -7,7 +7,21 @@ {{ themeWarningHelp }}
-