From 23b7f1d2905f57b22efea7baa7ba3f147b279c6a Mon Sep 17 00:00:00 2001 From: Pranav C Date: Mon, 15 Nov 2021 11:36:32 +0530 Subject: [PATCH] fix: disable localstorage sync in embedded Signed-off-by: Pranav C --- packages/nc-gui/components/base/shareBase.vue | 10 ++--- packages/nc-gui/plugins/localStorage.js | 45 ++++++++++--------- 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/packages/nc-gui/components/base/shareBase.vue b/packages/nc-gui/components/base/shareBase.vue index 83cb3444de..c9851c0021 100644 --- a/packages/nc-gui/components/base/shareBase.vue +++ b/packages/nc-gui/components/base/shareBase.vue @@ -127,11 +127,11 @@ export default { generateEmbeddableIframe() { copyTextToClipboard(``) +src="${this.url}?embed" +frameborder="0" +width="100%" +height="700" +style="background: transparent; ">`) this.$toast.success('Copied embeddable html code!').goAway(3000) } } diff --git a/packages/nc-gui/plugins/localStorage.js b/packages/nc-gui/plugins/localStorage.js index 9155633ecd..2081289517 100644 --- a/packages/nc-gui/plugins/localStorage.js +++ b/packages/nc-gui/plugins/localStorage.js @@ -5,7 +5,7 @@ import isDev from '../helpers/xutils' const ls = new SecureLS({ isCompression: false }) -export default async({ store, $vuetify: { theme } }) => { +export default async({ store, $vuetify: { theme }, route }) => { /** * */ @@ -36,27 +36,30 @@ export default async({ store, $vuetify: { theme } }) => { // if (process.client) { // // window.onNuxtReady(async (nuxt) => { - - createPersistedState({ - fetchBeforeUse: true, - async rehydrated(store) { - window.rehydrated = true - console.log(store.state.windows) - console.log('Date difference ', await store.dispatch('windows/ActGetExpiryDate')) - }, - paths: ['users', 'sqlClient', 'apiClient', 'panelSize', 'windows', 'graphqlClient', 'apiClientSwagger', 'app'], - ...( - isDev() - ? {} - : { - storage: { - getItem: key => ls.get(key), - setItem: (key, value) => ls.set(key, value), - removeItem: key => ls.remove(key) + if (route && route.query && 'embed' in route.query) { + window.rehydrated = true + } else { + createPersistedState({ + fetchBeforeUse: true, + async rehydrated(store) { + window.rehydrated = true + console.log(store.state.windows) + console.log('Date difference ', await store.dispatch('windows/ActGetExpiryDate')) + }, + paths: ['users', 'sqlClient', 'apiClient', 'panelSize', 'windows', 'graphqlClient', 'apiClientSwagger', 'app'], + ...( + isDev() + ? {} + : { + storage: { + getItem: key => ls.get(key), + setItem: (key, value) => ls.set(key, value), + removeItem: key => ls.remove(key) + } } - } - ) - })(store) // vuex plugins can be connected to store, even after creation + ) + })(store) // vuex plugins can be connected to store, even after creation + } } /**