fixed issue with table columns loading and resetting tabulator

beekeeper-studio · Dec 13, 2023 · 837ea23 · 837ea23
1 parent 744d50a
commit 837ea23
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/apps/studio/src/background.ts b/apps/studio/src/background.ts
@@ -32,7 +32,7 @@ function initUserDirectory(d: string) {
 
 const transports = [log.transports.console, log.transports.file]
 if (platformInfo.isDevelopment || platformInfo.debugEnabled) {
-  transports.forEach(t => t.level = 'debug')
+  transports.forEach(t => t.level = 'silly')
 } else {
   transports.forEach(t => t.level = 'warn')
 }

diff --git a/apps/studio/src/components/common/TabWithTable.vue b/apps/studio/src/components/common/TabWithTable.vue
@@ -26,15 +26,23 @@
 
 <script lang="ts">
 import Vue from 'vue'
+import rawLog from 'electron-log'
 import { mapState } from 'vuex'
+
+const log = rawLog.scope('TabWithTable')
+
 export default Vue.extend({
   props: ['tab'],
   computed: {
     ...mapState(['tables', 'tablesInitialLoaded']),
     table() {
-      console.log("table changed")
       return this.tab.findTable(this.tables)
     },
+  },
+  watch: {
+    table() {
+      log.debug("table changed!", this.table)
+    }
   }
 })
 </script>

diff --git a/apps/studio/src/components/tableinfo/TableRelations.vue b/apps/studio/src/components/tableinfo/TableRelations.vue
@@ -197,7 +197,8 @@ export default Vue.extend({
           editable,
           editor: 'list',
           editorParams: {
-            values: this.table.columns.map((c) => escapeHtml(c.columnName))
+            // @ts-expect-error Incorrectly typed
+            valuesLookup: () => this.table.columns.map((c) => escapeHtml(c.columnName))
           }
         },
         ...( showSchema ? [{
@@ -206,7 +207,8 @@ export default Vue.extend({
           editable,
           editor: 'list' as any,
           editorParams: {
-            values: this.schemas.map((s) => escapeHtml(s))
+            // @ts-expect-error Incorrectly typed
+            valuesLookup: () => this.schemas.map((s) => escapeHtml(s))
           },
           cellEdited: (cell) => cell.getRow().getCell('toTable')?.setValue(null)
         }] : []),
@@ -297,8 +299,10 @@ export default Vue.extend({
         await this.$store.dispatch('updateTableColumns', tableData)
         tableData = this.findTable(schema, table)
       }
-      
-      return await tableData.columns.map((c: TableColumn) => escapeHtml(c.columnName)) || []
+
+      const result = await tableData.columns.map((c: TableColumn) => escapeHtml(c.columnName)) || []
+      console.log("getcolumns", result)
+      return result
     },
     getPayload(): RelationAlterations {
       const additions: CreateRelationSpec[] = this.newRows.map((row: RowComponent) => {

diff --git a/shared/src/lib/tabulator/helpers.ts b/shared/src/lib/tabulator/helpers.ts
@@ -140,6 +140,7 @@ export const TabulatorStateWatchers = {
   table: {
     deep: true,
     handler() {
+      log.debug("table changed - initializing Tabulator")
       this.initializeTabulator()
     }
   }