clone/nocodb
1
0
Fork 0
mirror of https://github.com/nocodb/nocodb.git synced 2026-05-04 15:06:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: avoid trying to load workspace while deleting and after deleting workspace

Browse Source
This commit is contained in:
Pranav C
2025-03-17 13:30:05 +00:00
parent 032dd76ddd
commit 2e29132b3d
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/nc-gui/components/workspace/CollaboratorsList.vue
View File

@@ -11,17 +11,15 @@ const { user } = useGlobal()
const workspaceStore = useWorkspace()
const { removeCollaborator, updateCollaborator: _updateCollaborator, loadWorkspace } = workspaceStore
const { removeCollaborator, updateCollaborator: _updateCollaborator } = workspaceStore
const { collaborators, activeWorkspace, workspacesList, isCollaboratorsLoading } = storeToRefs(workspaceStore)
const currentWorkspace = computedAsync(async () => {
if (props.workspaceId) {
const ws = workspacesList.value.find((workspace) => workspace.id === props.workspaceId)
if (!ws) {
await loadWorkspace(props.workspaceId)
return workspacesList.value.find((workspace) => workspace.id === props.workspaceId)
if (ws) {
return ws
}
}
return activeWorkspace.value ?? workspacesList.value[0]

3
packages/nc-gui/components/workspace/View.vue
View File

@@ -13,13 +13,14 @@ const { isUIAllowed } = useRoles()
const workspaceStore = useWorkspace()
const { loadRoles } = useRoles()
const { activeWorkspace: _activeWorkspace, workspaces } = storeToRefs(workspaceStore)
const { activeWorkspace: _activeWorkspace, workspaces, deletingWorkspace } = storeToRefs(workspaceStore)
const { loadCollaborators, loadWorkspace } = workspaceStore
const orgStore = useOrg()
const { orgId, org } = storeToRefs(orgStore)
const currentWorkspace = computedAsync(async () => {
if (deletingWorkspace.value) return
let ws
if (props.workspaceId) {
ws = workspaces.value.get(props.workspaceId)