dont use reactivity on config

beekeeper-studio · Feb 1, 2024 · a5f3a90 · a5f3a90
1 parent 8bc5f30
commit a5f3a90
Show file tree

Hide file tree

Showing 14 changed files with 216 additions and 284 deletions.
diff --git a/apps/studio/src/App.vue b/apps/studio/src/App.vue
@@ -62,7 +62,7 @@ export default Vue.extend({
 
       return this.$store.state.connection
     },
-    ...mapGetters(['storeInitialized']),
+    ...mapState(['storeInitialized']),
     ...mapGetters({
       'themeValue': 'settings/themeValue',
       'menuStyle': 'settings/menuStyle'

diff --git a/apps/studio/src/background.ts b/apps/studio/src/background.ts
@@ -74,7 +74,6 @@ async function initBasics() {
   log.debug("Building the window")
   log.debug("managing updates")
   manageUpdates()
-  manageConfigs()
   ipcMain.on(AppEvent.openExternally, (_e: electron.IpcMainEvent, args: any[]) => {
     const url = args[0]
     if (!url) return

diff --git a/apps/studio/src/background/config_manager.ts b/apps/studio/src/background/config_manager.ts
diff --git a/apps/studio/src/common/AppEvent.ts b/apps/studio/src/common/AppEvent.ts
@@ -34,9 +34,6 @@ export enum AppEvent {
   togglePinTableList = 'togglePinTableList',
   dropzoneEnter = 'dropzoneEnter',
   dropzoneDrop = 'dropzoneDrop',
-  configChanged = 'configChanged',
-  configStateManagerReady = 'configStateManagerReady',
-  saveUserConfig = 'updateUserConfig',
 }
 
 export interface RootBinding {

diff --git a/apps/studio/src/components/TabQueryEditor.vue b/apps/studio/src/components/TabQueryEditor.vue
@@ -385,8 +385,8 @@
       }
     },
     computed: {
-      ...mapGetters(['dialect', 'dialectData', 'defaultSchema', 'storeInitialized']),
-      ...mapState(['usedConfig', 'connection', 'database', 'tables']),
+      ...mapGetters(['dialect', 'dialectData', 'defaultSchema']),
+      ...mapState(['usedConfig', 'connection', 'database', 'tables', 'storeInitialized']),
       ...mapState('data/queries', {'savedQueries': 'items'}),
       ...mapState('settings', ['settings']),
       ...mapState('tabs', { 'activeTab': 'active' }),

diff --git a/apps/studio/src/components/data/DataManager.vue b/apps/studio/src/components/data/DataManager.vue
@@ -15,7 +15,7 @@ export default Vue.extend({
   }),
   mounted() {
     this.mountAndRefresh()
-    this.$store.commit('dataManagerInitialized')
+    this.$store.commit('storeInitialized', true)
     this.interval = setInterval(this.poll, globals.dataCheckInterval)
   },
   beforeDestroy() {

diff --git a/apps/studio/src/components/tableview/TableTable.vue b/apps/studio/src/components/tableview/TableTable.vue
@@ -307,9 +307,9 @@ export default Vue.extend({
   },
   computed: {
     ...mapState(['tables', 'tablesInitialLoaded', 'usedConfig', 'database', 'workspaceId']),
-    ...mapGetters(['dialectData', 'dialect', 'config']),
+    ...mapGetters(['dialectData', 'dialect']),
     limit() {
-      return Number(this.config.ui.tableTable.pageSize)
+      return Number(this.$bkConfig.ui.tableTable.pageSize)
     },
     columnsWithFilterAndOrder() {
       if (!this.tabulator || !this.table) return []
@@ -692,10 +692,7 @@ export default Vue.extend({
     },
     pendingChangesCount() {
       this.tab.unsavedChanges = this.pendingChangesCount > 0
-    },
-    limit() {
-      this.tabulator.setPageSize(this.limit)
-    },
+    }
   },
   beforeDestroy() {
     if(this.interval) clearInterval(this.interval)

diff --git a/apps/studio/src/main.ts b/apps/studio/src/main.ts
@@ -172,7 +172,6 @@ import { HeaderSortTabulatorModule } from './plugins/HeaderSortTabulatorModule'
       store,
     })
     await app.$store.dispatch('settings/initializeSettings')
-    await app.$store.dispatch('configs/initialize')
     const handler = new AppEventHandler(ipcRenderer, app)
     handler.registerCallbacks()
     app.$mount('#app')

diff --git a/apps/studio/src/plugins/ConfigPlugin.js b/apps/studio/src/plugins/ConfigPlugin.js