feat(scripts): 跨 owner 懒加载目录树 + 跨用户可见 workspace/public
修两个后端接口问题:
1) /api/v1/workspace-directories 返回为空,目录树结构消失
2) 同 workspace 内脚本/数据互相可见但默认排除 private
后端改动
--------
* list_scripts / list_resources / list_workspace_directories 新增
owner_user_id 可选 query 参数;缺省 = 当前请求者本人(scope 到
workspace/{me}/...),传值时 scope 到该 owner 的子树。前端根加载
默认只见自己一级,其他成员以折叠分组呈现。
* visibility 过滤统一:非 admin 请求者只返回 owner==me 或
visibility ∈ {workspace, public};admin 跳过。owner=me 含自己
的 private,owner=other 只剩其 workspace/public,排除他人 private。
* create_workspace_directory 两个分支 visibility 默认 'public'
(非 private),使跨 owner 目录树可见;响应新增 owner_user_id 字段。
* platform.list_members 鉴权从 system_admin_context 放宽为
系统管理员或该 workspace 活跃成员(让普通用户也能渲染同
workspace 成员名册,用于跨 owner 分组)。
* main.py 注册 platform 模块(随 list_members 改动补齐导入)。
* .env.example 同步 common/config.py 26 个字段。
前端改动
--------
* ScriptExplorer.memberScriptGroups 改由 members 列表播种分组,
display_name 取 members.display_name;inferredDirectories 现在按
owner_user_id 标记,统一跨 owner 目录渲染。删除脚本目录页头与
树分组标题的工作副本数量角标。
* WorkspaceTree 新增 ownerUserId 透传到 store.toggleExpanded;
仅"我"的分组 mount 时 auto-expand,他人分组默认折叠,展开才
调 loadOwnerGroup / owner-scoped loadScripts / loadChildren。
* scriptWorkspaceStore 引入 namespaced cache key
(ownerCacheKey = `${ownerUserId ?? me}:${path}`),loadedScriptPaths
/ loadedChildPaths / loadedOwnerGroups 全部按 owner 隔离;
toggleExpanded 用 loadPath === undefined 区分 group 头与真实
目录,修"他人子目录点击不触发接口"的 loadPath 前缀误判 bug。
* api.ts / AuthContext 透传 ownerUserId 给 listScripts /
listResources / listWorkspaceDirectories。
文档
----
* API.md: §3.2 创建目录 visibility 默认 public + 响应加 owner_user_id;
§3.3.1 GET directories 加 owner_user_id 参数 + 响应字段;
§3.4 GET scripts 改写为 owner 作用域 + visibility 过滤语义;
§五.1 GET data-resources 新增,同一套统一语义;
§7 intro 例外 — GET members 对系统管理员或 workspace 活跃成员开放。
* DEVELOP.md: Code layout 重写以反映 backend api/services/clients/
schemas 拆分 + schedule domain/scheduling/application/execution/
infrastructure 拆分 + common 子包(auth/storage/backends);
Configuration 系统补全 26 个 settings 字段;新增
"Owner-scoping + visibility (cross-owner browsing)" 小节;
Per-service dev 注释用 uv run 的源布局要求;Add a new DAG endpoint /
storage bucket 路径改为 backend/src/backend/api/* 与 services/*。
测试
----
* test_list_scripts_parent_path.py /
test_resources.py 补充 owner_user_id 参数化直接调用 + LIKE
前缀断言(workspace/{owner}/... 前缀)。
Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
tao.chen
@@ -28,8 +28,11 @@ type WorkspaceTreeProps = {
|
||||
onCopyResourcePath?: (jupyterPath: string) => void;
|
||||
// 唯一标识此 group（通常 `__group__<owner_user_id>`），让多个 owner 的 group 各自独立展开。
|
||||
groupKey: string;
|
||||
// 该 group 所属 owner 的 user_id —— 透传给 store.toggleExpanded，使他人
|
||||
// 分组展开时走 loadOwnerGroup / 带 owner 的 loadScripts（懒加载）。
|
||||
ownerUserId: string;
|
||||
expandedPaths: Set<string>;
|
||||
onToggle: (path: string, loadPath?: string) => void;
|
||||
onToggle: (path: string, loadPath?: string, ownerUserId?: string) => void;
|
||||
loadingChildrenPaths: Set<string>;
|
||||
};
|
||||
|
||||
@@ -79,6 +82,7 @@ export function WorkspaceTreeGroup({
|
||||
dataResources,
|
||||
onCopyResourcePath,
|
||||
groupKey,
|
||||
ownerUserId,
|
||||
expandedPaths,
|
||||
onToggle,
|
||||
loadingChildrenPaths,
|
||||
@@ -125,14 +129,16 @@ export function WorkspaceTreeGroup({
|
||||
parent_path: path.includes("/")
|
||||
? path.split("/").slice(0, -1).join("/")
|
||||
: "",
|
||||
owner_user_id: ownerUserId,
|
||||
}));
|
||||
}, [dataResources]);
|
||||
}, [dataResources, ownerUserId]);
|
||||
|
||||
// 首次挂载自动展开（保留原本 useState(true) 的默认展开行为）。
|
||||
// toggleExpanded 内识别 `__group__` 前缀，不会触发 loadChildren。
|
||||
// 默认只展开"我"的分组（!readOnly）；其他成员分组默认折叠，点击才
|
||||
// 按需拉取其可见内容（懒加载设计）。原本对所有 group 无条件 onToggle
|
||||
// 会让所有 owner 的内容在根加载时就被全量拉取，违背"默认只拉取自己的一级"。
|
||||
useEffect(() => {
|
||||
if (!expandedPaths.has(groupKey)) {
|
||||
void onToggle(groupKey);
|
||||
if (!readOnly && !expandedPaths.has(groupKey)) {
|
||||
void onToggle(groupKey, undefined, ownerUserId);
|
||||
}
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [groupKey]);
|
||||
@@ -142,7 +148,7 @@ export function WorkspaceTreeGroup({
|
||||
className={`tree-group__title${open ? " is-open" : ""}`}
|
||||
type="button"
|
||||
aria-expanded={open}
|
||||
onClick={() => onToggle(groupKey)}
|
||||
onClick={() => onToggle(groupKey, undefined, ownerUserId)}
|
||||
onContextMenu={onContextMenu
|
||||
? (event) => onContextMenu(event, { kind: "root", path: "" })
|
||||
: undefined}
|
||||
@@ -150,12 +156,12 @@ export function WorkspaceTreeGroup({
|
||||
<Icon name="chevron" size={14} />
|
||||
<Icon name="folder" size={17} />
|
||||
<span>{title}</span>
|
||||
<em>{scripts.length + (dataResources ?? []).length}</em>
|
||||
</button>
|
||||
{open && (
|
||||
<div className="tree-group__items">
|
||||
<WorkspaceTreeItems
|
||||
groupKey={groupKey}
|
||||
ownerUserId={ownerUserId}
|
||||
path=""
|
||||
depth={0}
|
||||
scripts={[...scripts, ...dataResourceScripts]}
|
||||
@@ -186,6 +192,7 @@ export function WorkspaceTreeGroup({
|
||||
|
||||
function WorkspaceTreeItems({
|
||||
groupKey,
|
||||
ownerUserId,
|
||||
path,
|
||||
depth,
|
||||
scripts,
|
||||
@@ -210,6 +217,7 @@ function WorkspaceTreeItems({
|
||||
<DirectoryBranch
|
||||
key={directory.path}
|
||||
groupKey={groupKey}
|
||||
ownerUserId={ownerUserId}
|
||||
directory={directory}
|
||||
depth={depth}
|
||||
scripts={scripts}
|
||||
@@ -271,6 +279,7 @@ function WorkspaceTreeItems({
|
||||
|
||||
function DirectoryBranch({
|
||||
groupKey,
|
||||
ownerUserId,
|
||||
directory,
|
||||
depth,
|
||||
scripts,
|
||||
@@ -294,7 +303,7 @@ function DirectoryBranch({
|
||||
className="directory-row"
|
||||
style={{ paddingLeft: 10 + depth * 16 }}
|
||||
type="button"
|
||||
onClick={() => onToggle(expandKey, directory.path)}
|
||||
onClick={() => onToggle(expandKey, directory.path, ownerUserId)}
|
||||
onContextMenu={onContextMenu
|
||||
? (event) => onContextMenu(event, {
|
||||
kind: "directory",
|
||||
@@ -312,6 +321,7 @@ function DirectoryBranch({
|
||||
{open && (
|
||||
<WorkspaceTreeItems
|
||||
groupKey={groupKey}
|
||||
ownerUserId={ownerUserId}
|
||||
path={directory.path}
|
||||
depth={depth + 1}
|
||||
scripts={scripts}
|
||||
|
||||
Reference in New Issue
Block a user