Browse Source

Merge pull request #9949 from nocodb/nc-feat/persist-extension-sidebar-state

feat(ui): persist extension sidebar state per base
pull/9960/head
Aman Desai 1 week ago committed by GitHub
parent
commit
5a8f6a9998
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 15
      packages/nc-gui/.patches/splitpanes@3.1.5.patch
  2. 50
      packages/nc-gui/composables/useExtensions.ts

15
packages/nc-gui/.patches/splitpanes@3.1.5.patch

@ -0,0 +1,15 @@
diff --git a/dist/splitpanes.es.js b/dist/splitpanes.es.js
index 6a8e64363e592840123438b1a5959a580440b325..0b2ddee308cfbc48bef9351286b218d8cc1ace7b 100644
--- a/dist/splitpanes.es.js
+++ b/dist/splitpanes.es.js
@@ -160,7 +160,9 @@ const M = {
},
requestUpdate({ target: e, ...i }) {
const s = this.indexedPanes[e._.uid];
- Object.entries(i).forEach(([n, t]) => s[n] = t);
+ if (s) {
+ Object.entries(i).forEach(([n, t]) => s[n] = t);
+ }
},
onPaneAdd(e) {
let i = -1;

50
packages/nc-gui/composables/useExtensions.ts

@ -1,4 +1,5 @@
import { ExtensionsEvents } from '#imports' import { ExtensionsEvents } from '#imports'
import { useStorage } from '@vueuse/core'
const extensionsState = createGlobalState(() => { const extensionsState = createGlobalState(() => {
const baseExtensions = ref<Record<string, any>>({}) const baseExtensions = ref<Record<string, any>>({})
@ -6,6 +7,14 @@ const extensionsState = createGlobalState(() => {
return { baseExtensions } return { baseExtensions }
}) })
interface ExtensionPanelState {
width: number
isOpen: boolean
}
const extensionsPanelState = createGlobalState(() =>
useStorage<Record<string, ExtensionPanelState>>('nc-extensions-global-state', {}),
)
export interface ExtensionManifest { export interface ExtensionManifest {
id: string id: string
title: string title: string
@ -76,8 +85,6 @@ export const useExtensions = createSharedComposable(() => {
// Object to store description content for each extension // Object to store description content for each extension
const descriptionContent = ref<Record<string, string>>({}) const descriptionContent = ref<Record<string, string>>({})
const extensionPanelSize = ref(40)
const activeBaseExtensions = computed(() => { const activeBaseExtensions = computed(() => {
if (!base.value || !base.value.id) { if (!base.value || !base.value.id) {
return null return null
@ -85,9 +92,36 @@ export const useExtensions = createSharedComposable(() => {
return baseExtensions.value[base.value.id] return baseExtensions.value[base.value.id]
}) })
const isPanelExpanded = computed(() => { const panelState = extensionsPanelState()
return activeBaseExtensions.value ? activeBaseExtensions.value.expanded : false
}) const extensionPanelSize = ref(40)
const isPanelExpanded = ref(false)
const savePanelState = () => {
panelState.value = {
...panelState.value,
[base.value.id!]: {
width: extensionPanelSize.value,
isOpen: isPanelExpanded.value,
},
}
}
watch(
base,
() => {
extensionPanelSize.value = +panelState.value[base.value.id!]?.width || 40
isPanelExpanded.value = panelState.value[base.value.id!]?.isOpen || false
},
{ immediate: true },
)
// Debounce since width is updated continuously when user drags.
watchDebounced([extensionPanelSize, isPanelExpanded], savePanelState, { debounce: 500, maxWait: 1000 })
const toggleExtensionPanel = () => {
isPanelExpanded.value = !isPanelExpanded.value
}
const extensionList = computed<ExtensionType[]>(() => { const extensionList = computed<ExtensionType[]>(() => {
return (activeBaseExtensions.value ? activeBaseExtensions.value.extensions : []) return (activeBaseExtensions.value ? activeBaseExtensions.value.extensions : [])
@ -97,12 +131,6 @@ export const useExtensions = createSharedComposable(() => {
}) })
}) })
const toggleExtensionPanel = () => {
if (activeBaseExtensions.value) {
activeBaseExtensions.value.expanded = !activeBaseExtensions.value.expanded
}
}
const addExtension = async (extension: any) => { const addExtension = async (extension: any) => {
if (!base.value || !base.value.id || !baseExtensions.value[base.value.id]) { if (!base.value || !base.value.id || !baseExtensions.value[base.value.id]) {
return return

Loading…
Cancel
Save