Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
chore: worksheet folder fix and optimize (#18111)
ecmadao8852b120c7f2
diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/SheetTree.vue b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/SheetTree.vueindex 950852cc30..60f5168639 100644--- a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/SheetTree.vue+++ b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/SheetTree.vue@@ -55,7 +55,7 @@:selected-keys="selectedKeys":checked-keys="checkedKeys"@drop="handleDrop"- @update:expanded-keys="(keys: string[]) => expandedKeys = new Set(keys)"+ @update:expanded-keys="onExpandedKeysUpdate"@update:checked-keys="onCheckedKeysUpdate"/></template>@@ -146,6 +146,7 @@ import { useSQLEditorContext } from "@/views/sql-editor/context";import SharePopover from "@/views/sql-editor/EditorCommon/SharePopover.vue";import {openWorksheetByName,+ revealNodes,revealWorksheets,type SheetViewMode,useSheetContext,@@ -193,7 +194,10 @@ const {handleSharePanelShow,handleMenuShow,handleClickOutside: handleContextMenuClickOutside,-} = useDropdown(props.view);+} = useDropdown(+ props.view,+ computed(() => worksheetFilter.value)+);const expandedKeysArray = computed(() => Array.from(expandedKeys.value));const treeData = computed(() => [sheetTree.value]);@@ -221,10 +225,20 @@ const onCheckedKeysUpdate = (checkedNodes.value = options.filter((node) => node) as WorksheetFolderNode[];};+const onExpandedKeysUpdate = (keys: string[]) => {+ if (expandedKeys.value.size > 1 && keys.length === 0) {+ // do not clear the expanded keys+ return;+ }+ expandedKeys.value = new Set(keys);+};+watch(() => checkable.value,- () => {- checkedNodes.value = [];+ (check) => {+ if (!check) {+ checkedNodes.value = [];+ }});@@ -749,6 +763,7 @@ const handleContextMenuSelect = async (key: DropdownOptionType) => {break;case "multi-select":checkable.value = true;+ checkedNodes.value = revealNodes(contextMenuContext.node, (n) => n);break;default:break;@@ -862,9 +877,16 @@ const handleDuplicateFolderName = (};const handleDrop = async ({ node, dragNode }: TreeDropInfo) => {- const parentNode = node as WorksheetFolderNode;- const draggedNode = dragNode as WorksheetFolderNode;+ let parentNode = node as WorksheetFolderNode | undefined;+ if (parentNode && parentNode.worksheet) {+ // CANNOT drop a node into the worksheet node.+ parentNode = findParentNode(sheetTree.value, parentNode.key);+ }+ if (!parentNode) {+ return;+ }+ const draggedNode = dragNode as WorksheetFolderNode;const oldParentNode = findParentNode(sheetTree.value, draggedNode.key);if (!oldParentNode) {return;@@ -874,10 +896,8 @@ const handleDrop = async ({ node, dragNode }: TreeDropInfo) => {return;}- const nodeKeys = draggedNode.key.split("/");- const oldParentKey = nodeKeys.slice(0, -1).join("/");- const nodeKey = nodeKeys.slice(-1)[0];- const newKey = folderContext.ensureFolderPath(`${parentNode.key}/${nodeKey}`);+ const nodeId = draggedNode.key.split("/").slice(-1)[0];+ const newKey = folderContext.ensureFolderPath(`${parentNode.key}/${nodeId}`);const merge = await handleDuplicateFolderName(parentNode, newKey);if (!merge) {@@ -887,8 +907,9 @@ const handleDrop = async ({ node, dragNode }: TreeDropInfo) => {const shouldCloseOldParent =!draggedNode.worksheet && oldParentNode.children.length === 1;- await updateWorksheetFolders(draggedNode, oldParentKey, parentNode.key);+ await updateWorksheetFolders(draggedNode, oldParentNode.key, parentNode.key);if (!draggedNode.worksheet) {+ // if the dragged node is a folder, we also need to move it in the folder context.folderContext.moveFolder(draggedNode.key, newKey);}diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/dropdown.ts b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/dropdown.tsindex 05a6494f4c..a0e4bf6505 100644--- a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/dropdown.ts+++ b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/dropdown.ts@@ -9,13 +9,21 @@ import {TrashIcon,} from "lucide-vue-next";import { type DropdownOption } from "naive-ui";-import { computed, type FunctionalComponent, h, reactive, watch } from "vue";+import {+ type ComputedRef,+ computed,+ type FunctionalComponent,+ h,+ reactive,+ watch,+} from "vue";import { t } from "@/plugins/i18n";import { useCurrentUserV1, useWorkSheetStore } from "@/store";import { type Position } from "@/types";import { isWorksheetWritableV1 } from "@/utils";import type {SheetViewMode,+ WorksheetFilter,WorksheetFolderNode,} from "@/views/sql-editor/Sheet";@@ -39,7 +47,10 @@ interface DropdownContext {node?: WorksheetFolderNode;}-export const useDropdown = (viewMode: SheetViewMode) => {+export const useDropdown = (+ viewMode: SheetViewMode,+ filter: ComputedRef<WorksheetFilter>+) => {const me = useCurrentUserV1();const sheetStore = useWorkSheetStore();@@ -136,24 +147,26 @@ export const useDropdown = (viewMode: SheetViewMode) => {);}} else {- items.push({- icon: FolderIcon,- key: "add-folder",- label: t("sql-editor.tab.context-menu.actions.add-folder"),- });+ if (!filter.value.keyword) {+ items.push({+ icon: FolderIcon,+ key: "add-folder",+ label: t("sql-editor.tab.context-menu.actions.add-folder"),+ });+ }if (viewMode === "my") {- items.push(- {+ if (!filter.value.keyword) {+ items.push({icon: FileCodeIcon,key: "add-worksheet",label: t("sql-editor.tab.context-menu.actions.add-worksheet"),- },- {- icon: ListCheckIcon,- key: "multi-select",- label: t("sql-editor.tab.context-menu.actions.multi-select"),- }- );+ });+ }+ items.push({+ icon: ListCheckIcon,+ key: "multi-select",+ label: t("sql-editor.tab.context-menu.actions.multi-select"),+ });}if (context.node.editable) {items.push(diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/WorksheetPane.vue b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/WorksheetPane.vueindex 7970992e60..90ad125e7e 100644--- a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/WorksheetPane.vue+++ b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/WorksheetPane.vue@@ -27,13 +27,14 @@</div><div class="flex-1 flex flex-col gap-y-2 overflow-y-auto worksheet-scroll"><SheetTree v-for="view in views" :key="view" :view="view" />+ <NEmpty v-if="views.length === 0" class="mt-10" /></div></div></template><script setup lang="tsx">import { FunnelIcon } from "lucide-vue-next";-import { type DropdownOption, NButton, NDropdown } from "naive-ui";+import { type DropdownOption, NButton, NDropdown, NEmpty } from "naive-ui";import { computed, ref } from "vue";import { SearchBox } from "@/components/v2";import { t } from "@/plugins/i18n";diff --git a/frontend/src/views/sql-editor/Sheet/context.ts b/frontend/src/views/sql-editor/Sheet/context.tsindex 839b83e422..3b1eb1fc70 100644--- a/frontend/src/views/sql-editor/Sheet/context.ts+++ b/frontend/src/views/sql-editor/Sheet/context.ts@@ -53,7 +53,7 @@ export interface WorksheetFolderNode extends TreeOption {children: WorksheetFolderNode[];}-interface WorksheetFilter {+export interface WorksheetFilter {keyword: string;onlyShowStarred: boolean;showMine: boolean;@@ -353,20 +353,31 @@ export const useSheetContextByView = (view: SheetViewMode) => {return context.viewContexts[view];};-export const revealWorksheets = <T>(+export const revealNodes = <T>(node: WorksheetFolderNode,callback: (node: WorksheetFolderNode) => T | undefined): T[] => {- if (node.worksheet) {- const worksheet = callback(node);- return worksheet ? [worksheet] : [];+ const results: T[] = [];+ const item = callback(node);+ if (item) {+ results.push(item);}-- const worksheets: T[] = [];for (const child of node.children) {- worksheets.push(...revealWorksheets(child, callback));+ results.push(...revealNodes(child, callback));}- return worksheets;+ return results;+};++export const revealWorksheets = <T>(+ node: WorksheetFolderNode,+ callback: (node: WorksheetFolderNode) => T | undefined+): T[] => {+ return revealNodes(node, (node) => {+ if (!node.worksheet) {+ return undefined;+ }+ return callback(node);+ });};export const provideSheetContext = () => {