Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

chore: support multi-selecting worksheets and performing operations (#18105)

ecmadao300de18e0af0
diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.json
index e61d864878..16f173ebcc 100644
--- a/frontend/src/locales/en-US.json
+++ b/frontend/src/locales/en-US.json
@@ -2075,7 +2075,8 @@
"close-all": "Close all",
"rename": "Rename",
"add-folder": "Add folder",
- "add-worksheet": "Add worksheet"
+ "add-worksheet": "Add worksheet",
+ "multi-select": "Multi-select"
}
}
},
@@ -2360,7 +2361,8 @@
"confirm-to-delete-sheet-title": "Confirm to delete this worksheet?",
"confirm-to-duplicate-sheet": "Confirm to duplicate this worksheet?"
},
- "search-sheets": "Search Sheets"
+ "search-sheets": "Search Sheets",
+ "move-worksheets": "Move worksheets"
},
"sql-review": {
"title": "SQL Review",
diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.json
index 93f3186648..e4f704d3c0 100644
--- a/frontend/src/locales/es-ES.json
+++ b/frontend/src/locales/es-ES.json
@@ -2047,7 +2047,7 @@
"project-write-desc": "Tanto el propietario de la hoja como los usuarios del proyecto con permiso \"bb.worksheets.get\" pueden leer/escribir",
"create-read-only-data-source": "Ir a crear",
"save-sheet": "Guardar hoja",
- "choose-folder": "Seleccionar carpeta",
+ "choose-folder": "Seleccionar o crear una carpeta",
"choose-folder-tips": "Puedes crear una nueva carpeta introduciendo una ruta que no exista. Las carpetas deben unirse con una barra diagonal (\"/\").",
"save-sheet-input-placeholder": "Por favor, ingresa un nombre para la hoja",
"format": "Formato",
@@ -2075,7 +2075,8 @@
"close-all": "Cierra todo",
"rename": "Rebautizar",
"add-folder": "Agregar carpeta",
- "add-worksheet": "Agregar hoja de trabajo"
+ "add-worksheet": "Agregar hoja de trabajo",
+ "multi-select": "Selección múltiple"
}
}
},
@@ -2360,7 +2361,8 @@
"confirm-to-delete-sheet-title": "¿Confirmar la eliminación de esta hoja de cálculo?",
"confirm-to-duplicate-sheet": "¿Confirmar para duplicar esta hoja?"
},
- "search-sheets": "Hojas de búsqueda"
+ "search-sheets": "Hojas de búsqueda",
+ "move-worksheets": "Hojas de trabajo de movimiento"
},
"sql-review": {
"title": "Revisión de SQL",
diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.json
index 9e03c836ec..e4ba55406f 100644
--- a/frontend/src/locales/ja-JP.json
+++ b/frontend/src/locales/ja-JP.json
@@ -2047,7 +2047,7 @@
"project-write-desc": "シート所有者と「bb.worksheets.get」権限を持つプロジェクトユーザーの両方が読み取り/書き込みできます。",
"create-read-only-data-source": "作成に行く",
"save-sheet": "ワークシートの保存",
- "choose-folder": "フォルダを選択",
+ "choose-folder": "フォルダを選択または作成",
"choose-folder-tips": "存在しないパスを入力することで新しいフォルダを作成できます。フォルダは「/」で結合する必要があります。",
"save-sheet-input-placeholder": "ワークシート名を入力してください",
"format": "フォーマット",
@@ -2075,7 +2075,8 @@
"close-all": "すべて閉じる",
"rename": "名前の変更",
"add-folder": "フォルダを追加",
- "add-worksheet": "ワークシートを追加"
+ "add-worksheet": "ワークシートを追加",
+ "multi-select": "複数選択"
}
}
},
@@ -2360,7 +2361,8 @@
"confirm-to-delete-sheet-title": "このワークシートを削除しますか?",
"confirm-to-duplicate-sheet": "このワークシートをコピーしてもよろしいですか?"
},
- "search-sheets": "ワークシートの検索"
+ "search-sheets": "ワークシートの検索",
+ "move-worksheets": "ワークシートを移動する"
},
"sql-review": {
"title": "SQL監査ポリシー",
diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.json
index 8f816488af..76ec0882c7 100644
--- a/frontend/src/locales/vi-VN.json
+++ b/frontend/src/locales/vi-VN.json
@@ -2047,7 +2047,7 @@
"project-write-desc": "Cả chủ sở hữu trang tính và người dùng dự án có quyền \"bb.worksheets.get\" đều có thể đọc/ghi",
"create-read-only-data-source": "Đi tới tạo",
"save-sheet": "Lưu trang tính",
- "choose-folder": "Chọn thư mục",
+ "choose-folder": "Chọn hoặc tạo thư mục",
"choose-folder-tips": "Bạn có thể tạo một thư mục mới bằng cách nhập một đường dẫn không tồn tại. Các thư mục phải được nối bằng dấu \"/\".",
"save-sheet-input-placeholder": "Vui lòng nhập tên trang tính",
"format": "Định dạng",
@@ -2075,7 +2075,8 @@
"close-all": "Đóng tất cả",
"rename": "Đổi tên",
"add-folder": "Thêm thư mục",
- "add-worksheet": "Thêm bảng tính"
+ "add-worksheet": "Thêm bảng tính",
+ "multi-select": "Chọn nhiều"
}
}
},
@@ -2360,7 +2361,8 @@
"confirm-to-delete-sheet-title": "Xác nhận xóa bảng tính này?",
"confirm-to-duplicate-sheet": "Xác nhận nhân bản trang tính này?"
},
- "search-sheets": "Tìm kiếm Trang tính"
+ "search-sheets": "Tìm kiếm Trang tính",
+ "move-worksheets": "Di chuyển các trang tính"
},
"sql-review": {
"title": "Đánh giá SQL",
diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.json
index 849e4fea57..ce60bdd601 100644
--- a/frontend/src/locales/zh-CN.json
+++ b/frontend/src/locales/zh-CN.json
@@ -2047,7 +2047,7 @@
"project-write-desc": "工作表所有者和具有“bb.worksheets.get”权限的项目用户都可以读/写",
"create-read-only-data-source": "前去创建",
"save-sheet": "保存工作表",
- "choose-folder": "选择文件夹",
+ "choose-folder": "选择或创建文件夹",
"choose-folder-tips": "您可以通过输入不存在的路径来创建新文件夹。文件夹之间应以“/”连接。",
"save-sheet-input-placeholder": "请输入工作表名称",
"format": "格式化",
@@ -2075,7 +2075,8 @@
"close-all": "关闭所有",
"rename": "重命名",
"add-folder": "添加文件夹",
- "add-worksheet": "添加工作表"
+ "add-worksheet": "添加工作表",
+ "multi-select": "多选"
}
}
},
@@ -2360,7 +2361,8 @@
"confirm-to-delete-sheet-title": "确认删除此工作表?",
"confirm-to-duplicate-sheet": "确定要复制这条工作表?"
},
- "search-sheets": "搜索工作表"
+ "search-sheets": "搜索工作表",
+ "move-worksheets": "移动工作表"
},
"sql-review": {
"title": "SQL 审核策略",
diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/FolderForm.vue b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/FolderForm.vue
new file mode 100644
index 0000000000..2cef58eb6f
--- /dev/null
+++ b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/FolderForm.vue
@@ -0,0 +1,139 @@
+<template>
+ <div class="flex flex-col gap-y-2">
+ <div>
+ <p>{{ $t("sql-editor.choose-folder") }}</p>
+ <span class="textinfolabel">
+ {{ $t("sql-editor.choose-folder-tips") }}
+ </span>
+ </div>
+ <NPopover
+ placement="bottom"
+ :show="showPopover"
+ :show-arrow="false"
+ trigger="manual"
+ :width="folderInputRef?.wrapperElRef?.clientWidth"
+ >
+ <template #trigger>
+ <NInput
+ ref="folderInputRef"
+ :value="formattedFolderPath.split('/').join(' / ')"
+ :placeholder="$t('sql-editor.choose-folder')"
+ @focus="onFocus"
+ @update:value="onInput"
+ />
+ </template>
+ <NTree
+ ref="folderTreeRef"
+ block-line
+ block-node
+ virtual-scroll
+ :clearable="false"
+ :filterable="true"
+ :pattern="folderPath"
+ :checkable="false"
+ :check-on-click="true"
+ :selectable="true"
+ :selected-keys="[folderPath]"
+ :multiple="false"
+ :data="folderTree.children"
+ :render-prefix="renderPrefix"
+ :expanded-keys="expandedKeysArray"
+ @update:expanded-keys="(keys: string[]) => expandedKeys = new Set(keys)"
+ @update:selected-keys="onSelect"
+ />
+ </NPopover>
+ </div>
+</template>
+
+<script lang="tsx" setup>
+import { onClickOutside } from "@vueuse/core";
+import { NInput, NPopover, NTree, type TreeOption } from "naive-ui";
+import { computed, nextTick, ref, watch } from "vue";
+import TreeNodePrefix from "@/views/sql-editor/AsidePanel/WorksheetPane/SheetList/TreeNodePrefix.vue";
+import type { WorksheetFolderNode } from "@/views/sql-editor/Sheet";
+import { useSheetContextByView } from "@/views/sql-editor/Sheet";
+
+const props = defineProps<{
+ folder: string;
+}>();
+
+const emits = defineEmits<{
+ (event: "update:folder", folder: string): void;
+}>();
+
+const folderPath = ref<string>("");
+
+watch(
+ () => props.folder,
+ (val) => (folderPath.value = val),
+ { immediate: true }
+);
+
+watch(
+ () => folderPath.value,
+ (val) => emits("update:folder", val)
+);
+
+const { folderTree, folderContext } = useSheetContextByView("my");
+
+const expandedKeys = ref<Set<string>>(new Set([]));
+const expandedKeysArray = computed(() => Array.from(expandedKeys.value));
+const folderInputRef = ref<InstanceType<typeof NInput>>();
+const folderTreeRef = ref<InstanceType<typeof NTree>>();
+const showPopover = ref<boolean>(false);
+
+onClickOutside(folderTreeRef, () => {
+ showPopover.value = false;
+});
+
+const formattedFolderPath = computed(() => {
+ let val = folderPath.value.replace(folderContext.rootPath.value, "");
+ if (val[0] === "/") {
+ val = val.slice(1);
+ }
+ return val;
+});
+
+const onFocus = () => {
+ showPopover.value = true;
+};
+
+const onSelect = (keys: string[]) => {
+ folderPath.value = keys[0] ?? "";
+ nextTick(() => (showPopover.value = false));
+};
+
+const onInput = (val: string) => {
+ let changedVal = val;
+ if (val.endsWith(" /")) {
+ changedVal = val.slice(0, -2);
+ }
+ const rawPath = changedVal
+ .split("/")
+ .map((p) => p.trim())
+ .join("/");
+ folderPath.value = rawPath;
+};
+
+const renderPrefix = ({ option }: { option: TreeOption }) => {
+ const node = option as WorksheetFolderNode;
+ return (
+ <TreeNodePrefix
+ node={node}
+ expandedKeys={expandedKeys.value}
+ rootPath={folderContext.rootPath.value}
+ view={"my"}
+ />
+ );
+};
+
+defineExpose({
+ folderPath: formattedFolderPath,
+ folders: computed(() =>
+ formattedFolderPath.value
+ .split("/")
+ .map((p) => p.trim())
+ .filter((p) => p)
+ ),
+});
+</script>
diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/SheetTree.vue b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/SheetTree.vue
index 93207b135a..c1f76f8014 100644
--- a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/SheetTree.vue
+++ b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/SheetTree.vue
@@ -4,28 +4,61 @@
<BBSpin :size="16" />
</div>
- <!-- TODO(ed): do we need to support batch operations? -->
- <!-- For example, batch select worksheets then move the folder or delete -->
- <NTree
- v-else
- block-line
- block-node
- :keyboard="false"
- :draggable="!editingNode"
- :data="[sheetTree]"
- :multiple="false"
- :show-irrelevant-nodes="false"
- :filter="filterNode(folderContext.rootPath.value)"
- :pattern="worksheetFilter.keyword"
- :render-suffix="renderSuffix"
- :render-prefix="renderPrefix"
- :render-label="renderLabel"
- :node-props="nodeProps"
- :expanded-keys="expandedKeysArray"
- :selected-keys="selectedKeys"
- @drop="handleDrop"
- @update:expanded-keys="(keys: string[]) => expandedKeys = new Set(keys)"
- />
+ <template v-else>
+ <div v-if="checkable" class="px-1 flex items-center justify-start flex-wrap gap-y-1 gap-x-1 bg-blue-100 py-2">
+ <NButton
+ quaternary
+ size="tiny"
+ :disabled="checkedNodes.length === 0" @click="handleMultiDelete"
+ >
+ <template #icon>
+ <TrashIcon />
+ </template>
+ {{ t("common.delete") }}
+ </NButton>
+ <NButton
+ quaternary
+ size="tiny"
+ :disabled="checkedWorksheets.length === 0"
+ @click="showReorgModal = true"
+ >
+ <template #icon>
+ <FolderInputIcon />
+ </template>
+ {{ $t('sheet.move-worksheets') }}
+ </NButton>
+ <NButton quaternary size="tiny" @click="checkable = false">
+ <template #icon>
+ <XIcon />
+ </template>
+ {{$t("common.cancel")}}
+ </NButton>
+ </div>
+ <NTree
+ block-line
+ block-node
+ :keyboard="false"
+ :draggable="!editingNode && !checkable"
+ :data="treeData"
+ :multiple="false"
+ cascade
+ :selectable="true"
+ :checkable="checkable"
+ :show-irrelevant-nodes="false"
+ :filter="filterNode(folderContext.rootPath.value)"
+ :pattern="worksheetFilter.keyword"
+ :render-suffix="renderSuffix"
+ :render-prefix="renderPrefix"
+ :render-label="renderLabel"
+ :node-props="nodeProps"
+ :expanded-keys="expandedKeysArray"
+ :selected-keys="selectedKeys"
+ :checked-keys="checkedKeys"
+ @drop="handleDrop"
+ @update:expanded-keys="(keys: string[]) => expandedKeys = new Set(keys)"
+ @update:checked-keys="onCheckedKeysUpdate"
+ />
+ </template>
<NDropdown
class="worksheet-menu"
@@ -54,14 +87,35 @@
@on-updated="handleContextMenuClickOutside"
/>
</NPopover>
+
+ <BBModal
+ :show="showReorgModal"
+ :title="$t('sheet.move-worksheets')"
+ @close="() => showReorgModal = false"
+ >
+ <div class="flex flex-col gap-y-3 w-lg max-w-[calc(100vw-8rem)]">
+ <FolderForm ref="folderFormRef" :folder="''" />
+ <div class="flex justify-end gap-x-2 mt-4">
+ <NButton @click="showReorgModal = false">{{ $t("common.close") }}</NButton>
+ <NButton
+ type="primary"
+ @click="handleMoveWorksheets"
+ >
+ {{ $t("common.save") }}
+ </NButton>
+ </div>
+ </div>
+ </BBModal>
</div>
</template>
<script setup lang="tsx">
import { create } from "@bufbuild/protobuf";
import { useDebounceFn } from "@vueuse/core";
+import { FolderInputIcon, TrashIcon, XIcon } from "lucide-vue-next";
import {
type DialogReactive,
+ NButton,
NDropdown,
NInput,
NPopover,
@@ -71,8 +125,8 @@ import {
useDialog,
} from "naive-ui";
import { storeToRefs } from "pinia";
-import { computed, nextTick, watch } from "vue";
-import { BBSpin } from "@/bbkit";
+import { computed, nextTick, ref, watch } from "vue";
+import { BBModal, BBSpin } from "@/bbkit";
import { HighlightLabelText } from "@/components/v2";
import { useEmitteryEventListener } from "@/composables/useEmitteryEventListener";
import { t } from "@/plugins/i18n";
@@ -97,10 +151,11 @@ import {
type SheetViewMode,
useSheetContext,
useSheetContextByView,
- type WorsheetFolderNode,
+ type WorksheetFolderNode,
} from "@/views/sql-editor/Sheet";
import { filterNode } from "./common";
import { type DropdownOptionType, useDropdown } from "./dropdown";
+import FolderForm from "./FolderForm.vue";
import TreeNodePrefix from "./TreeNodePrefix.vue";
import TreeNodeSuffix from "./TreeNodeSuffix.vue";
@@ -142,6 +197,37 @@ const {
} = useDropdown(props.view);
const expandedKeysArray = computed(() => Array.from(expandedKeys.value));
+const treeData = computed(() => [sheetTree.value]);
+
+// multi-select operations
+const checkedNodes = ref<WorksheetFolderNode[]>([]);
+const checkedKeys = computed(() => checkedNodes.value.map((node) => node.key));
+const checkable = ref(false);
+const showReorgModal = ref(false);
+const checkedWorksheets = computed(() => {
+ const worksheets: string[] = [];
+ for (const node of checkedNodes.value) {
+ if (node.worksheet) {
+ worksheets.push(node.worksheet.name);
+ }
+ }
+ return worksheets;
+});
+const folderFormRef = ref<InstanceType<typeof FolderForm>>();
+
+const onCheckedKeysUpdate = (
+ _: Array<string | number>,
+ options: Array<TreeOption | null>
+) => {
+ checkedNodes.value = options.filter((node) => node) as WorksheetFolderNode[];
+};
+
+watch(
+ () => checkable.value,
+ () => {
+ checkedNodes.value = [];
+ }
+);
watch(
isInitialized,
@@ -175,7 +261,7 @@ const handleWorksheetToggleStar = useDebounceFn(
);
const renderPrefix = ({ option }: { option: TreeOption }) => {
- const node = option as WorsheetFolderNode;
+ const node = option as WorksheetFolderNode;
return (
<TreeNodePrefix
node={node}
@@ -187,7 +273,7 @@ const renderPrefix = ({ option }: { option: TreeOption }) => {
};
const renderSuffix = ({ option }: { option: TreeOption }) => {
- const node = option as WorsheetFolderNode;
+ const node = option as WorksheetFolderNode;
return (
<TreeNodeSuffix
node={node}
@@ -272,7 +358,7 @@ const handleRenameNode = useDebounceFn(async () => {
}, DEBOUNCE_SEARCH_DELAY);
const renderLabel = ({ option }: { option: TreeOption }) => {
- const node = option as WorsheetFolderNode;
+ const node = option as WorksheetFolderNode;
if (editingNode.value && editingNode.value.node.key === node.key) {
return (
@@ -315,7 +401,7 @@ const renderLabel = ({ option }: { option: TreeOption }) => {
};
const nodeProps = ({ option }: { option: TreeOption }) => {
- const node = option as WorsheetFolderNode;
+ const node = option as WorksheetFolderNode;
return {
"data-item-key": node.key,
@@ -365,10 +451,51 @@ const deleteWorksheets = async (worksheets: string[]) => {
}
};
-const handleDeleteFolder = (node: WorsheetFolderNode) => {
- const worksheets = revealWorksheets(node, (node) => node.worksheet?.name);
+const handleMoveWorksheets = async () => {
+ const folders = folderFormRef.value?.folders ?? [];
+ await batchUpdateWorksheetFolders(
+ checkedWorksheets.value.map((worksheet) => ({
+ name: worksheet,
+ folders,
+ }))
+ );
+ showReorgModal.value = false;
+ checkable.value = false;
+};
+
+const handleMultiDelete = async () => {
+ const folders: string[] = [];
+ for (const node of checkedNodes.value) {
+ if (node.key === folderContext.rootPath.value || node.worksheet) {
+ continue;
+ }
+ if (
+ folders.length > 0 &&
+ folderContext.isSubFolder({
+ parent: folders.slice(-1)[0],
+ path: node.key,
+ dig: true,
+ })
+ ) {
+ continue;
+ }
+ folders.push(node.key);
+ }
+ await handleDeleteFolders(folders, [...checkedWorksheets.value]);
+ checkable.value = false;
+};
+
+const handleDeleteFolders = (folders: string[], worksheets: string[]) => {
+ const _defer = defer<boolean>();
+ const cleanFolders = () => {
+ for (const folder of folders) {
+ folderContext.removeFolder(folder);
+ }
+ };
+
if (worksheets.length === 0) {
- folderContext.removeFolder(node.key);
+ cleanFolders();
+ _defer.resolve(true);
} else {
const dialogInstance = $dialog.create({
title: t("sheet.hint-tips.non-empty-folder-title"),
@@ -385,8 +512,9 @@ const handleDeleteFolder = (node: WorsheetFolderNode) => {
onNegativeClick: async () => {
dialogInstance.loading = true;
await deleteWorksheets(worksheets);
- folderContext.removeFolder(node.key);
+ cleanFolders();
dialogInstance.destroy();
+ _defer.resolve(true);
},
positiveText: t("sheet.hint-tips.move-to-root-folder"),
onPositiveClick: async () => {
@@ -397,15 +525,18 @@ const handleDeleteFolder = (node: WorsheetFolderNode) => {
folders: [],
}))
);
- folderContext.removeFolder(node.key);
+ cleanFolders();
dialogInstance.destroy();
+ _defer.resolve(true);
},
showIcon: false,
onClose() {
dialogInstance.destroy();
+ _defer.resolve(false);
},
});
}
+ return _defer.promise;
};
const handleDeleteSheet = (worksheetName: string) => {
@@ -513,7 +644,7 @@ useEmitteryEventListener(events, "on-built", ({ viewMode }) => {
// Generate unique folder name based on existing children
// Returns "new folder", "new folder2", "new folder3", etc.
// Optimized: children are already sorted, so iterate in reverse to find max quickly
-const generateNewFolderName = (children: WorsheetFolderNode[]): string => {
+const generateNewFolderName = (children: WorksheetFolderNode[]): string => {
const baseName = "new folder";
const regex = /^new folder(\d+)$/;
@@ -565,7 +696,11 @@ const handleContextMenuSelect = async (key: DropdownOptionType) => {
if (contextMenuContext.node.worksheet) {
handleDeleteSheet(contextMenuContext.node.worksheet.name);
} else {
- handleDeleteFolder(contextMenuContext.node);
+ const worksheets = revealWorksheets(
+ contextMenuContext.node,
+ (node) => node.worksheet?.name
+ );
+ handleDeleteFolders([contextMenuContext.node.key], worksheets);
}
break;
case "duplicate":
@@ -615,6 +750,9 @@ const handleContextMenuSelect = async (key: DropdownOptionType) => {
editorContext.showConnectionPanel.value = true;
});
break;
+ case "multi-select":
+ checkable.value = true;
+ break;
default:
break;
}
@@ -622,9 +760,9 @@ const handleContextMenuSelect = async (key: DropdownOptionType) => {
};
const findParentNode = (
- node: WorsheetFolderNode,
+ node: WorksheetFolderNode,
key: string
-): WorsheetFolderNode | undefined => {
+): WorksheetFolderNode | undefined => {
if (node.key === key) {
return;
}
@@ -641,15 +779,17 @@ const findParentNode = (
};
const updateWorksheetFolders = async (
- node: WorsheetFolderNode,
+ node: WorksheetFolderNode,
oldParentKey: string,
newParentKey: string
) => {
- const worksheets = revealWorksheets(node, (node: WorsheetFolderNode) => {
+ const worksheets = revealWorksheets(node, (node: WorksheetFolderNode) => {
if (node.worksheet) {
const newFullPath = node.key.replace(oldParentKey, newParentKey);
- node.worksheet.folders = getFoldersForWorksheet(newFullPath);
- return node.worksheet;
+ return {
+ name: node.worksheet.name,
+ folders: getFoldersForWorksheet(newFullPath),
+ };
}
});
await batchUpdateWorksheetFolders(
@@ -683,8 +823,8 @@ const replaceExpandedKeys = (oldKey: string, newKey: string) => {
}
};
-const handleDuplicateFolderName = async (
- parentNode: WorsheetFolderNode | undefined,
+const handleDuplicateFolderName = (
+ parentNode: WorksheetFolderNode | undefined,
key: string
) => {
const sameNode = parentNode?.children.find((child) => child.key === key);
@@ -701,11 +841,11 @@ const handleDuplicateFolderName = async (
closable: true,
maskClosable: true,
closeOnEsc: true,
- async onPositiveClick() {
+ onPositiveClick() {
dialogInstance.destroy();
_defer.resolve(true);
},
- async onNegativeClick() {
+ onNegativeClick() {
dialogInstance.destroy();
_defer.resolve(false);
},
@@ -725,8 +865,8 @@ const handleDuplicateFolderName = async (
};
const handleDrop = async ({ node, dragNode }: TreeDropInfo) => {
- const parentNode = node as WorsheetFolderNode;
- const draggedNode = dragNode as WorsheetFolderNode;
+ const parentNode = node as WorksheetFolderNode;
+ const draggedNode = dragNode as WorksheetFolderNode;
const oldParentNode = findParentNode(sheetTree.value, draggedNode.key);
if (!oldParentNode) {
diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/TreeNodePrefix.vue b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/TreeNodePrefix.vue
index 4f09d9528d..8dee947c13 100644
--- a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/TreeNodePrefix.vue
+++ b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/TreeNodePrefix.vue
@@ -42,11 +42,11 @@ import {
} from "lucide-vue-next";
import type {
SheetViewMode,
- WorsheetFolderNode,
+ WorksheetFolderNode,
} from "@/views/sql-editor/Sheet";
defineProps<{
- node: WorsheetFolderNode;
+ node: WorksheetFolderNode;
expandedKeys: Set<string>;
rootPath: string;
view: SheetViewMode;
diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/TreeNodeSuffix.vue b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/TreeNodeSuffix.vue
index 7a06a05c1e..678e78c17a 100644
--- a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/TreeNodeSuffix.vue
+++ b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/TreeNodeSuffix.vue
@@ -70,17 +70,17 @@ import {
import { Worksheet_Visibility } from "@/types/proto-es/v1/worksheet_service_pb";
import type {
SheetViewMode,
- WorsheetFolderNode,
+ WorksheetFolderNode,
} from "@/views/sql-editor/Sheet";
const props = defineProps<{
- node: WorsheetFolderNode;
+ node: WorksheetFolderNode;
view: SheetViewMode;
}>();
const emit = defineEmits<{
- (e: "contextMenuShow", event: MouseEvent, node: WorsheetFolderNode): void;
- (e: "sharePanelShow", event: MouseEvent, node: WorsheetFolderNode): void;
+ (e: "contextMenuShow", event: MouseEvent, node: WorksheetFolderNode): void;
+ (e: "sharePanelShow", event: MouseEvent, node: WorksheetFolderNode): void;
(e: "toggleStar", item: { worksheet: string; starred: boolean }): void;
}>();
diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/dropdown.ts b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/dropdown.ts
index 0ec0f15b82..05a6494f4c 100644
--- a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/dropdown.ts
+++ b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/dropdown.ts
@@ -2,19 +2,21 @@ import {
FileCodeIcon,
FilesIcon,
FolderIcon,
+ ListCheckIcon,
+ type LucideProps,
PencilLineIcon,
Share2Icon,
TrashIcon,
} from "lucide-vue-next";
import { type DropdownOption } from "naive-ui";
-import { computed, h, reactive, watch } from "vue";
+import { 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,
- WorsheetFolderNode,
+ WorksheetFolderNode,
} from "@/views/sql-editor/Sheet";
export type DropdownOptionType =
@@ -23,6 +25,7 @@ export type DropdownOptionType =
| "delete"
| "add-folder"
| "add-worksheet"
+ | "multi-select"
| "duplicate";
type WorksheetDropdown = DropdownOption & {
@@ -33,7 +36,7 @@ interface DropdownContext {
position: Position;
showDropdown: boolean;
showSharePanel: boolean;
- node?: WorsheetFolderNode;
+ node?: WorksheetFolderNode;
}
export const useDropdown = (viewMode: SheetViewMode) => {
@@ -89,7 +92,16 @@ export const useDropdown = (viewMode: SheetViewMode) => {
return [];
}
- const items: WorksheetDropdown[] = [];
+ const items: {
+ icon: FunctionalComponent<
+ LucideProps,
+ Record<string, any>,
+ any,
+ Record<string, any>
+ >;
+ key: DropdownOptionType;
+ label: string;
+ }[] = [];
if (context.node.worksheet) {
if (!worksheetEntity.value) {
return [];
@@ -97,13 +109,13 @@ export const useDropdown = (viewMode: SheetViewMode) => {
const isCreator =
worksheetEntity.value.creator === `users/${me.value.email}`;
items.push({
- icon: () => h(FilesIcon, { class: "w-4 text-gray-600" }),
+ icon: FilesIcon,
key: "duplicate",
label: isCreator ? t("common.duplicate") : t("common.fork"),
});
if (isCreator) {
items.push({
- icon: () => h(Share2Icon, { class: "w-4 text-gray-600" }),
+ icon: Share2Icon,
key: "share",
label: t("common.share"),
});
@@ -112,12 +124,12 @@ export const useDropdown = (viewMode: SheetViewMode) => {
if (canWriteSheet) {
items.push(
{
- icon: () => h(PencilLineIcon, { class: "w-4 text-gray-600" }),
+ icon: PencilLineIcon,
key: "rename",
label: t("sql-editor.tab.context-menu.actions.rename"),
},
{
- icon: () => h(TrashIcon, { class: "w-4 text-gray-600" }),
+ icon: TrashIcon,
key: "delete",
label: t("common.delete"),
}
@@ -125,26 +137,33 @@ export const useDropdown = (viewMode: SheetViewMode) => {
}
} else {
items.push({
- icon: () => h(FolderIcon, { class: "w-4 text-gray-600" }),
+ icon: FolderIcon,
key: "add-folder",
label: t("sql-editor.tab.context-menu.actions.add-folder"),
});
if (viewMode === "my") {
- items.push({
- icon: () => h(FileCodeIcon, { class: "w-4 text-gray-600" }),
- key: "add-worksheet",
- label: t("sql-editor.tab.context-menu.actions.add-worksheet"),
- });
+ 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"),
+ }
+ );
}
if (context.node.editable) {
items.push(
{
- icon: () => h(PencilLineIcon, { class: "w-4 text-gray-600" }),
+ icon: PencilLineIcon,
key: "rename",
label: t("sql-editor.tab.context-menu.actions.rename"),
},
{
- icon: () => h(TrashIcon, { class: "w-4 text-gray-600" }),
+ icon: TrashIcon,
key: "delete",
label: t("common.delete"),
}
@@ -152,10 +171,14 @@ export const useDropdown = (viewMode: SheetViewMode) => {
}
}
- return items;
+ return items.map((item) => ({
+ icon: () => h(item.icon, { class: "w-4 text-gray-600" }),
+ key: item.key,
+ label: item.label,
+ }));
});
- const resetData = (e: MouseEvent, node: WorsheetFolderNode) => {
+ const resetData = (e: MouseEvent, node: WorksheetFolderNode) => {
e.preventDefault();
e.stopPropagation();
context.node = node;
@@ -165,12 +188,12 @@ export const useDropdown = (viewMode: SheetViewMode) => {
};
};
- const handleMenuShow = (e: MouseEvent, node: WorsheetFolderNode) => {
+ const handleMenuShow = (e: MouseEvent, node: WorksheetFolderNode) => {
resetData(e, node);
context.showDropdown = true;
};
- const handleSharePanelShow = (e: MouseEvent, node: WorsheetFolderNode) => {
+ const handleSharePanelShow = (e: MouseEvent, node: WorksheetFolderNode) => {
resetData(e, node);
context.showSharePanel = true;
};
diff --git a/frontend/src/views/sql-editor/EditorCommon/SaveSheetModal.vue b/frontend/src/views/sql-editor/EditorCommon/SaveSheetModal.vue
index c1363f8a25..083f989049 100644
--- a/frontend/src/views/sql-editor/EditorCommon/SaveSheetModal.vue
+++ b/frontend/src/views/sql-editor/EditorCommon/SaveSheetModal.vue
@@ -15,50 +15,7 @@
:maxlength="200"
/>
</div>
- <div class="flex flex-col gap-y-2">
- <div>
- <p>{{ $t("sql-editor.choose-folder") }}</p>
- <span class="textinfolabel">
- {{ $t("sql-editor.choose-folder-tips") }}
- </span>
- </div>
- <NPopover
- placement="bottom"
- :show="showPopover"
- :show-arrow="false"
- trigger="manual"
- :width="folderInputRef?.wrapperElRef?.clientWidth"
- >
- <template #trigger>
- <NInput
- ref="folderInputRef"
- :value="formattedFolderPath.split('/').join(' / ')"
- :placeholder="$t('sql-editor.choose-folder')"
- @focus="onFocus"
- @update:value="onInput"
- />
- </template>
- <NTree
- ref="folderTreeRef"
- block-line
- block-node
- virtual-scroll
- :clearable="false"
- :filterable="true"
- :pattern="pendingEdit.folder"
- :checkable="false"
- :check-on-click="true"
- :selectable="true"
- :selected-keys="[pendingEdit.folder]"
- :multiple="false"
- :data="folderTree.children"
- :render-prefix="renderPrefix"
- :expanded-keys="expandedKeysArray"
- @update:expanded-keys="(keys: string[]) => expandedKeys = new Set(keys)"
- @update:selected-keys="onSelect"
- />
- </NPopover>
- </div>
+ <FolderForm ref="folderFormRef" :folder="pendingEdit.folder" />
<div class="flex justify-end gap-x-2 mt-4">
<NButton @click="close">{{ $t("common.close") }}</NButton>
<NButton
@@ -75,9 +32,8 @@
<script lang="tsx" setup>
import { create } from "@bufbuild/protobuf";
-import { onClickOutside } from "@vueuse/core";
-import { NButton, NInput, NPopover, NTree, type TreeOption } from "naive-ui";
-import { computed, nextTick, ref } from "vue";
+import { NButton, NInput } from "naive-ui";
+import { ref } from "vue";
import { BBModal } from "@/bbkit";
import RequiredStar from "@/components/RequiredStar.vue";
import { useEmitteryEventListener } from "@/composables/useEmitteryEventListener";
@@ -90,16 +46,15 @@ import {
WorksheetSchema,
} from "@/types/proto-es/v1/worksheet_service_pb";
import { extractWorksheetUID } from "@/utils";
-import TreeNodePrefix from "@/views/sql-editor/AsidePanel/WorksheetPane/SheetList/TreeNodePrefix.vue";
-import type { WorsheetFolderNode } from "@/views/sql-editor/Sheet";
+import FolderForm from "@/views/sql-editor/AsidePanel/WorksheetPane/SheetList/FolderForm.vue";
import { useSheetContextByView } from "@/views/sql-editor/Sheet";
import { useSQLEditorContext } from "../context";
const tabStore = useSQLEditorTabStore();
const worksheetV1Store = useWorkSheetStore();
const { events: editorEvents } = useSQLEditorContext();
-const { folderTree, folderContext, getPwdForWorksheet, getPathesForWorksheet } =
- useSheetContextByView("my");
+const { getPwdForWorksheet } = useSheetContextByView("my");
+const folderFormRef = ref<InstanceType<typeof FolderForm>>();
const pendingEdit = ref<{
title: string;
@@ -109,25 +64,8 @@ const pendingEdit = ref<{
title: "",
folder: "",
});
-const expandedKeys = ref<Set<string>>(new Set([]));
-const expandedKeysArray = computed(() => Array.from(expandedKeys.value));
-const folderInputRef = ref<InstanceType<typeof NInput>>();
-const folderTreeRef = ref<InstanceType<typeof NTree>>();
-const showPopover = ref<boolean>(false);
const showModal = ref(false);
-onClickOutside(folderTreeRef, () => {
- showPopover.value = false;
-});
-
-const formattedFolderPath = computed(() => {
- let val = pendingEdit.value.folder.replace(folderContext.rootPath.value, "");
- if (val[0] === "/") {
- val = val.slice(1);
- }
- return val;
-});
-
const doSaveSheet = async () => {
if (!pendingEdit.value.rawTab) {
return close();
@@ -169,11 +107,8 @@ const doSaveSheet = async () => {
}
if (worksheetEntity) {
- if (formattedFolderPath.value) {
- const folders = formattedFolderPath.value
- .split("/")
- .map((p) => p.trim())
- .filter((p) => p);
+ const folders = folderFormRef.value?.folders ?? [];
+ if (folders.length > 0) {
await worksheetV1Store.upsertWorksheetOrganizer(
{
worksheet: worksheetEntity.name,
@@ -182,12 +117,6 @@ const doSaveSheet = async () => {
},
["folders"]
);
-
- const folderPathes = new Set<string>([]);
- for (const path of getPathesForWorksheet({ folders })) {
- folderPathes.add(path);
- }
- folderContext.mergeFolders(folderPathes);
}
tabStore.updateTab(pendingEdit.value.rawTab.id, {
@@ -200,27 +129,6 @@ const doSaveSheet = async () => {
showModal.value = false;
};
-const onFocus = () => {
- showPopover.value = true;
-};
-
-const onSelect = (keys: string[]) => {
- pendingEdit.value.folder = keys[0] ?? "";
- nextTick(() => (showPopover.value = false));
-};
-
-const onInput = (val: string) => {
- let changedVal = val;
- if (val.endsWith(" /")) {
- changedVal = val.slice(0, -2);
- }
- const rawPath = changedVal
- .split("/")
- .map((p) => p.trim())
- .join("/");
- pendingEdit.value.folder = rawPath;
-};
-
const needShowModal = (tab: SQLEditorTab) => {
// If the sheet is saved, we don't need to show the name popup.
return !tab.worksheet;
@@ -247,16 +155,4 @@ useEmitteryEventListener(editorEvents, "save-sheet", ({ tab, editTitle }) => {
}
doSaveSheet();
});
-
-const renderPrefix = ({ option }: { option: TreeOption }) => {
- const node = option as WorsheetFolderNode;
- return (
- <TreeNodePrefix
- node={node}
- expandedKeys={expandedKeys.value}
- rootPath={folderContext.rootPath.value}
- view={"my"}
- />
- );
-};
</script>
diff --git a/frontend/src/views/sql-editor/SQLEditorHomePage.vue b/frontend/src/views/sql-editor/SQLEditorHomePage.vue
index 159d545cb7..0cb295f1b5 100644
--- a/frontend/src/views/sql-editor/SQLEditorHomePage.vue
+++ b/frontend/src/views/sql-editor/SQLEditorHomePage.vue
@@ -4,7 +4,7 @@
class="default-theme flex flex-col flex-1 overflow-hidden"
:dbl-click-splitter="false"
>
- <Pane v-if="windowWidth >= 800" size="20">
+ <Pane v-if="windowWidth >= 800" size="30">
<AsidePanel />
</Pane>
<template v-else>
diff --git a/frontend/src/views/sql-editor/Sheet/context.ts b/frontend/src/views/sql-editor/Sheet/context.ts
index c993466656..356747a8c1 100644
--- a/frontend/src/views/sql-editor/Sheet/context.ts
+++ b/frontend/src/views/sql-editor/Sheet/context.ts
@@ -44,13 +44,13 @@ export interface WorksheetLikeItem {
type: "worksheet" | "draft";
}
-export interface WorsheetFolderNode extends TreeOption {
+export interface WorksheetFolderNode extends TreeOption {
key: string;
label: string;
editable: boolean;
empty?: boolean;
worksheet?: WorksheetLikeItem;
- children: WorsheetFolderNode[];
+ children: WorksheetFolderNode[];
}
interface WorksheetFilter {
@@ -99,14 +99,14 @@ const useSheetTreeByView = (
}
});
- const getRootTreeNode = (): WorsheetFolderNode => ({
+ const getRootTreeNode = (): WorksheetFolderNode => ({
isLeaf: false,
children: [],
key: folderContext.rootPath.value,
label: rootNodeLabel.value,
editable: false,
});
- const sheetTree = ref<WorsheetFolderNode>(getRootTreeNode());
+ const sheetTree = ref<WorksheetFolderNode>(getRootTreeNode());
const worksheetList = computed((): Worksheet[] => {
let list: Worksheet[] = [];
@@ -170,7 +170,7 @@ const useSheetTreeByView = (
const getKeyForWorksheet = (worksheet: WorksheetLikeItem): string => {
return [
getPwdForWorksheet(worksheet),
- `bytebase-${worksheet.type}-${worksheet.name}`,
+ `bytebase-${worksheet.type}-${worksheet.name.split("/").slice(-1)[0]}`,
].join("/");
};
@@ -183,7 +183,7 @@ const useSheetTreeByView = (
};
const buildTree = (
- parent: WorsheetFolderNode,
+ parent: WorksheetFolderNode,
worksheetsByFolder: Map<string, WorksheetLikeItem[]>
) => {
parent.children = folderContext
@@ -220,7 +220,9 @@ const useSheetTreeByView = (
parent.children.push(...sheets);
parent.empty = sheets.length === 0 && empty;
- parent.isLeaf = parent.children.length === 0;
+ if (parent.key !== folderContext.rootPath.value) {
+ parent.isLeaf = parent.children.length === 0;
+ }
return parent;
};
@@ -228,6 +230,14 @@ const useSheetTreeByView = (
const folderTree = computed(() => buildTree(getRootTreeNode(), new Map()));
const rebuildTree = useDebounceFn(() => {
+ const folderPathes = new Set<string>([]);
+ for (const worksheet of sheetLikeItemList.value) {
+ for (const path of getPathesForWorksheet(worksheet)) {
+ folderPathes.add(path);
+ }
+ }
+ folderContext.mergeFolders(folderPathes);
+
const worksheetsByFolder = new Map<string, WorksheetLikeItem[]>();
for (const worksheet of sheetLikeItemList.value) {
const pwd = getPwdForWorksheet(worksheet);
@@ -242,10 +252,18 @@ const useSheetTreeByView = (
}, DEBOUNCE_SEARCH_DELAY);
// Watch only relevant properties: folder structure and worksheet name/folders
- // No deep watch needed - computed will track changes to name, folders automatically
+ // Use deep comparison to avoid unnecessary triggers when array references change
+ // but content is the same
watch(
[() => folderContext.folders.value, () => sheetLikeItemList.value],
- () => {
+ ([newFolders, newSheetList], [oldFolders, oldSheetList]) => {
+ // Only rebuild if the actual content changed, not just the array reference
+ if (
+ isEqual(newFolders, oldFolders) &&
+ isEqual(newSheetList, oldSheetList)
+ ) {
+ return;
+ }
rebuildTree();
}
);
@@ -277,13 +295,13 @@ const useSheetTreeByView = (
return;
}
- const folderPathes = new Set<string>([]);
- for (const worksheet of sheetLikeItemList.value) {
- for (const path of getPathesForWorksheet(worksheet)) {
- folderPathes.add(path);
- }
- }
- folderContext.mergeFolders(folderPathes);
+ // const folderPathes = new Set<string>([]);
+ // for (const worksheet of sheetLikeItemList.value) {
+ // for (const path of getPathesForWorksheet(worksheet)) {
+ // folderPathes.add(path);
+ // }
+ // }
+ // folderContext.mergeFolders(folderPathes);
rebuildTree();
isInitialized.value = true;
@@ -314,7 +332,7 @@ export type SheetContext = {
filterChanged: ComputedRef<boolean>;
expandedKeys: Ref<Set<string>>;
selectedKeys: Ref<string[]>;
- editingNode: Ref<{ node: WorsheetFolderNode; rawLabel: string } | undefined>;
+ editingNode: Ref<{ node: WorksheetFolderNode; rawLabel: string } | undefined>;
isWorksheetCreator: (worksheet: Worksheet) => boolean;
batchUpdateWorksheetFolders: (
worksheets: { name: string; folders: string[] }[]
@@ -333,8 +351,8 @@ export const useSheetContextByView = (view: SheetViewMode) => {
};
export const revealWorksheets = <T>(
- node: WorsheetFolderNode,
- callback: (node: WorsheetFolderNode) => T | undefined
+ node: WorksheetFolderNode,
+ callback: (node: WorksheetFolderNode) => T | undefined
): T[] => {
if (node.worksheet) {
const worksheet = callback(node);
@@ -472,6 +490,9 @@ export const provideSheetContext = () => {
const batchUpdateWorksheetFolders = async (
worksheets: { name: string; folders: string[] }[]
) => {
+ if (worksheets.length === 0) {
+ return;
+ }
await worksheetV1Store.batchUpsertWorksheetOrganizers(
worksheets.map((worksheet) => ({
organizer: {
@@ -493,7 +514,7 @@ export const provideSheetContext = () => {
filterChanged,
isWorksheetCreator,
editingNode: ref<
- { node: WorsheetFolderNode; rawLabel: string } | undefined
+ { node: WorksheetFolderNode; rawLabel: string } | undefined
>(),
batchUpdateWorksheetFolders,
};
diff --git a/frontend/src/views/sql-editor/Sheet/folder.ts b/frontend/src/views/sql-editor/Sheet/folder.ts
index 5f0a734b24..cab2baa2a6 100644
--- a/frontend/src/views/sql-editor/Sheet/folder.ts
+++ b/frontend/src/views/sql-editor/Sheet/folder.ts
@@ -17,8 +17,9 @@ export const useFolderByView = (
);
const localCache = useDynamicLocalStorage<Set<string>>(
localCacheKey,
- new Set()
+ new Set([rootPath.value])
);
+ localCache.value.add(rootPath.value);
const folders = computed(() => sortBy([...localCache.value]));
@@ -98,17 +99,21 @@ export const useFolderByView = (
}
}
+ const newSet = new Set(localCache.value);
for (const item of pendingUpdatePathes) {
- localCache.value.delete(item.old);
- localCache.value.add(item.new);
+ newSet.delete(item.old);
+ newSet.add(item.new);
}
+ localCache.value = newSet;
};
const mergeFolders = (pathes: Set<string>) => {
+ const newSet = new Set(localCache.value);
for (const folder of pathes.values()) {
const validPath = ensureFolderPath(folder);
- localCache.value.add(validPath);
+ newSet.add(validPath);
}
+ localCache.value = newSet;
};
const listSubFolders = (parent: string) => {