From 654170b31ae90bbd8b46d89239a561848739da2f Mon Sep 17 00:00:00 2001 From: Joshen Lim Date: Fri, 22 Mar 2024 10:30:49 +0700 Subject: [PATCH] Fix storage explorer deleting parent folder doesnt delete sub folders despite them being empty already (#22125) * Fix storage explorer deleting parent folder doesnt delete sub folders despite them being empty already * Add row id column options to stripe wrapper for tables which can be updated * Remove commented out lines * Remove rowid column changes --- .../storageExplorer/StorageExplorerStore.tsx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/studio/localStores/storageExplorer/StorageExplorerStore.tsx b/apps/studio/localStores/storageExplorer/StorageExplorerStore.tsx index fd525d6b9b0..88f72d9052e 100644 --- a/apps/studio/localStores/storageExplorer/StorageExplorerStore.tsx +++ b/apps/studio/localStores/storageExplorer/StorageExplorerStore.tsx @@ -1188,15 +1188,15 @@ class StorageExplorerStore { const files = await this.getAllItemsAlongFolder(folder) await this.deleteFiles(files, isDeleteFolder) - const isFolderOpen = this.openedFolders[this.openedFolders.length - 1]?.name === folder.name - if (isFolderOpen) { - this.popColumnAtIndex(folder.columnIndex) - this.popOpenedFoldersAtIndex(folder.columnIndex - 1) - } + this.popColumnAtIndex(folder.columnIndex) + this.popOpenedFoldersAtIndex(folder.columnIndex - 1) - const parentFolderPrefix = this.openedFolders.map((folder) => folder.name).join('/') - if (parentFolderPrefix.length > 0) { - await this.validateParentFolderEmpty(parentFolderPrefix) + if (folder.columnIndex > 0) { + const parentFolderPrefix = this.openedFolders + .slice(0, folder.columnIndex) + .map((folder) => folder.name) + .join('/') + if (parentFolderPrefix.length > 0) await this.validateParentFolderEmpty(parentFolderPrefix) } await this.refetchAllOpenedFolders()