update: data source
This commit is contained in:
@@ -1,9 +1,10 @@
|
||||
import { type MouseEvent as ReactMouseEvent, useEffect } from "react";
|
||||
import { type MouseEvent as ReactMouseEvent, useEffect, useMemo } from "react";
|
||||
|
||||
import Icon from "../../components/common/Icon";
|
||||
import type {
|
||||
ScriptItem,
|
||||
WorkspaceDirectory,
|
||||
ResourceItem,
|
||||
} from "~/services/api";
|
||||
|
||||
export type WorkspaceTreeTarget = {
|
||||
@@ -23,6 +24,8 @@ type WorkspaceTreeProps = {
|
||||
target: WorkspaceTreeTarget,
|
||||
) => void;
|
||||
readOnly?: boolean;
|
||||
dataResources?: ResourceItem[];
|
||||
onCopyResourcePath?: (jupyterPath: string) => void;
|
||||
// 唯一标识此 group(通常 `__group__<owner_user_id>`),让多个 owner 的 group 各自独立展开。
|
||||
groupKey: string;
|
||||
expandedPaths: Set<string>;
|
||||
@@ -33,6 +36,7 @@ type WorkspaceTreeProps = {
|
||||
type WorkspaceTreeItemsProps = Omit<WorkspaceTreeProps, "title" | "readOnly"> & {
|
||||
path: string;
|
||||
depth: number;
|
||||
onCopyResourcePath?: (jupyterPath: string) => void;
|
||||
};
|
||||
|
||||
function formatTime(value: string) {
|
||||
@@ -50,6 +54,11 @@ export function scriptIcon(item: ScriptItem) {
|
||||
}
|
||||
|
||||
function ownedScriptPath(item: ScriptItem) {
|
||||
// 数据资源的 relative_path 已经是 jupyter 路径(无 ULID 前缀);脚本相对路径形如
|
||||
// `{ulid}/{ws_id}/{user_id}/...`,需要剥前两层。
|
||||
if (item.script_id.startsWith("data:")) {
|
||||
return item.relative_path.replaceAll("\\", "/");
|
||||
}
|
||||
return item.relative_path.replaceAll("\\", "/").split("/").slice(2).join("/");
|
||||
}
|
||||
|
||||
@@ -67,12 +76,58 @@ export function WorkspaceTreeGroup({
|
||||
onSelect,
|
||||
onContextMenu,
|
||||
readOnly = false,
|
||||
dataResources,
|
||||
onCopyResourcePath,
|
||||
groupKey,
|
||||
expandedPaths,
|
||||
onToggle,
|
||||
loadingChildrenPaths,
|
||||
}: WorkspaceTreeProps) {
|
||||
const open = expandedPaths.has(groupKey);
|
||||
const dataResourceScripts = useMemo(() => {
|
||||
if (!dataResources) return [];
|
||||
return dataResources.map((r) => ({
|
||||
script_id: `data:${r.resource_id}`,
|
||||
workspace_id: r.workspace_id,
|
||||
current_object_id: r.storage_object_id,
|
||||
owner_user_id: r.owner_user_id,
|
||||
owner_display_name: null,
|
||||
script_name: r.resource_name,
|
||||
script_type: "python" as const,
|
||||
visibility: r.visibility,
|
||||
status: r.status,
|
||||
is_locked: false,
|
||||
// relative_path 直接是 jupyter 路径(与 Python/Notebook 同层渲染,不再带虚拟前缀)
|
||||
relative_path: r.jupyter_accessible_path,
|
||||
jupyter_path: r.jupyter_accessible_path,
|
||||
content_hash: r.file.content_hash ?? "",
|
||||
size_bytes: r.file.size_bytes,
|
||||
created_at: r.created_at,
|
||||
updated_at: r.updated_at,
|
||||
} as unknown as ScriptItem));
|
||||
}, [dataResources]);
|
||||
|
||||
const dataResourceDirectories = useMemo(() => {
|
||||
if (!dataResources) return [];
|
||||
const dirSet = new Set<string>();
|
||||
for (const r of dataResources) {
|
||||
const parts = r.jupyter_accessible_path.split("/");
|
||||
parts.pop();
|
||||
let acc = "";
|
||||
for (const p of parts) {
|
||||
acc = acc ? `${acc}/${p}` : p;
|
||||
dirSet.add(acc);
|
||||
}
|
||||
}
|
||||
return [...dirSet].map((path) => ({
|
||||
path,
|
||||
name: path.split("/").pop() ?? path,
|
||||
parent_path: path.includes("/")
|
||||
? path.split("/").slice(0, -1).join("/")
|
||||
: "",
|
||||
}));
|
||||
}, [dataResources]);
|
||||
|
||||
// 首次挂载自动展开(保留原本 useState(true) 的默认展开行为)。
|
||||
// toggleExpanded 内识别 `__group__` 前缀,不会触发 loadChildren。
|
||||
useEffect(() => {
|
||||
@@ -103,16 +158,22 @@ export function WorkspaceTreeGroup({
|
||||
groupKey={groupKey}
|
||||
path=""
|
||||
depth={0}
|
||||
scripts={scripts}
|
||||
directories={directories}
|
||||
scripts={[...scripts, ...dataResourceScripts]}
|
||||
// 数据资源目录与真实/推断目录按 path 去重
|
||||
directories={[
|
||||
...new Map(
|
||||
[...directories, ...dataResourceDirectories].map((d) => [d.path, d]),
|
||||
).values(),
|
||||
]}
|
||||
selectedId={selectedId}
|
||||
onSelect={onSelect}
|
||||
onContextMenu={onContextMenu}
|
||||
expandedPaths={expandedPaths}
|
||||
onToggle={onToggle}
|
||||
loadingChildrenPaths={loadingChildrenPaths}
|
||||
onCopyResourcePath={onCopyResourcePath}
|
||||
/>
|
||||
{scripts.length === 0 && directories.length === 0 && (
|
||||
{scripts.length === 0 && directories.length === 0 && dataResourceScripts.length === 0 && (
|
||||
<p className="tree-group__empty">
|
||||
{readOnly ? "暂无文件" : "右键此目录即可新建或上传"}
|
||||
</p>
|
||||
@@ -132,6 +193,7 @@ function WorkspaceTreeItems({
|
||||
selectedId,
|
||||
onSelect,
|
||||
onContextMenu,
|
||||
onCopyResourcePath,
|
||||
expandedPaths,
|
||||
onToggle,
|
||||
loadingChildrenPaths,
|
||||
@@ -158,6 +220,7 @@ function WorkspaceTreeItems({
|
||||
expandedPaths={expandedPaths}
|
||||
onToggle={onToggle}
|
||||
loadingChildrenPaths={loadingChildrenPaths}
|
||||
onCopyResourcePath={onCopyResourcePath}
|
||||
/>
|
||||
))}
|
||||
{childScripts.map((item) => (
|
||||
@@ -168,7 +231,13 @@ function WorkspaceTreeItems({
|
||||
style={{ paddingLeft: 20 + depth * 16 }}
|
||||
key={item.script_id}
|
||||
type="button"
|
||||
onClick={() => onSelect(item.script_id)}
|
||||
onClick={() => {
|
||||
if (item.script_id.startsWith("data:") && onCopyResourcePath) {
|
||||
onCopyResourcePath(item.relative_path);
|
||||
} else {
|
||||
onSelect(item.script_id);
|
||||
}
|
||||
}}
|
||||
onContextMenu={onContextMenu
|
||||
? (event) => onContextMenu(event, {
|
||||
kind: "file",
|
||||
@@ -177,8 +246,10 @@ function WorkspaceTreeItems({
|
||||
})
|
||||
: undefined}
|
||||
>
|
||||
<span className={`file-icon file-icon--${item.script_type}`}>
|
||||
<Icon name={scriptIcon(item)} size={17} />
|
||||
<span className={`file-icon file-icon--${
|
||||
item.script_id.startsWith("data:") ? "data" : item.script_type
|
||||
}`}>
|
||||
<Icon name={item.script_id.startsWith("data:") ? "database" : scriptIcon(item)} size={17} />
|
||||
</span>
|
||||
<span className="script-row__copy">
|
||||
<strong title={item.script_name}>{item.script_name}</strong>
|
||||
@@ -207,6 +278,7 @@ function DirectoryBranch({
|
||||
selectedId,
|
||||
onSelect,
|
||||
onContextMenu,
|
||||
onCopyResourcePath,
|
||||
expandedPaths,
|
||||
onToggle,
|
||||
loadingChildrenPaths,
|
||||
@@ -250,6 +322,7 @@ function DirectoryBranch({
|
||||
expandedPaths={expandedPaths}
|
||||
onToggle={onToggle}
|
||||
loadingChildrenPaths={loadingChildrenPaths}
|
||||
onCopyResourcePath={onCopyResourcePath}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user