Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

### 新增

- Organization Phase 3(任务切片):宿主内 Tasks。Dashboard `/organization/tasks` 与 `/organization/tasks/:id` 使用共享 `dashboard/src/org-ui` 的 `TasksPage` / `TaskDetailPage`。CRUD、状态流转、子任务与人工评论走 `/api/org-module/tasks*`,SQLite 在 `{FREEOS_HOME}/org/tasks.sqlite`。这是组织待办,不是 Octop cron,也不是项目/Chat 对话。`freeos org export-standalone` 同时列出 Tasks。未迁:Chat、附件上传、边车任务库、其余 Open-12。
- Organization Phase 3(知识切片):宿主内 Knowledge。Dashboard `/organization/knowledge` 使用共享 `dashboard/src/org-ui` 的 `KnowledgePage`。列表/详情/笔记走 `/api/org-module/knowledge*`,包装已有 `KnowledgeService`(Octop `knowledge_bases` / `knowledge_documents`),与 Chat 检索同一套行。不克隆 openXYOS sidecar notes/files DB。上传、文件夹、嵌入模型仍在 `/knowledge-bases`。`freeos org export-standalone` 同时列出 Knowledge。未迁:Chat、边车知识库、其余 Open-12。
- Organization Phase 3(技能切片):宿主内 Skills。Dashboard `/organization/skills` 使用共享 `dashboard/src/org-ui` 的 `SkillsPage`。列表/详情走 `GET /api/org-module/skills` 与 `GET /api/org-module/skills/{slug}`,生成/发布仍是已有 `POST …/generate|publish`(`{FREEOS_HOME}/org-skills`,`skill_bridge`)。宿主 skill packages 只读列出,编辑仍在「个性化 → 技能包」。这不是第二套技能运行时。`freeos org export-standalone` 同时列出 Skills。未迁:Chat、边车市场/插件中心、其余 Open-12。
- Organization Phase 3(员工目录切片):宿主内 Employees。Dashboard `/organization/employees` 与 `/organization/employees/:id` 使用共享 `dashboard/src/org-ui` 的 `EmployeesPage` / `EmployeeDetailPage`。目录 list/detail/create/update 走 `/api/org-module/org/employees*`,与组织架构共用 `{FREEOS_HOME}/org/org_chart.sqlite`,不另开第二套员工库。lifecycle 同事仍是 `GET /api/org-module/employees`。`freeos org export-standalone` 同时列出 Announcements、Org chart、Employees。未迁:Chat、人才市场/备选/离职清算、绩效、汇报线、技能绑定、头像、其余 Open-12。
Expand Down
6 changes: 5 additions & 1 deletion dashboard/src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@
"navSkills": "Skills",
"navGovernance": "Governance",
"navKnowledge": "Knowledge",
"navTasks": "Tasks",
"announcementsTitle": "Announcements",
"announcementsBody": "Publish notices and track who has read them. This page lives in the host — no sidecar or second port.",
"openAnnouncements": "Open announcements",
Expand All @@ -205,7 +206,10 @@
"openGovernance": "Open governance",
"knowledgeTitle": "Knowledge",
"knowledgeBody": "Lists the same FreeOS knowledge bases Chat retrieves from. Notes become host documents — no sidecar knowledge DB.",
"openKnowledge": "Open knowledge"
"openKnowledge": "Open knowledge",
"tasksTitle": "Tasks",
"tasksBody": "Organization work items on the host org store (FREEOS_HOME/org). Not Octop cron, not project chat, and not a sidecar.",
"openTasks": "Open tasks"
},
"systemSettings": {
"subtitle": "Workbench, remote desktop, and host administration in one place."
Expand Down
6 changes: 5 additions & 1 deletion dashboard/src/locales/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@
"navSkills": "技能",
"navGovernance": "治理",
"navKnowledge": "知识",
"navTasks": "任务",
"announcementsTitle": "通知公告",
"announcementsBody": "发布公告并跟踪已读。此页跑在宿主内,不需要边车或第二端口。",
"openAnnouncements": "打开通知公告",
Expand All @@ -205,7 +206,10 @@
"openGovernance": "打开治理",
"knowledgeTitle": "知识",
"knowledgeBody": "列出 Chat 检索用的同一套 FreeOS 知识库。笔记写入宿主文档,没有边车知识库。",
"openKnowledge": "打开知识"
"openKnowledge": "打开知识",
"tasksTitle": "任务",
"tasksBody": "宿主组织库里的待办(FREEOS_HOME/org)。不是 Octop 定时任务,也不是项目对话或边车。",
"openTasks": "打开任务"
},
"systemSettings": {
"subtitle": "工作台、远程桌面与主机管理集中在这里。"
Expand Down
7 changes: 7 additions & 0 deletions dashboard/src/org-ui/api/createClient.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,12 @@ describe("createOrgApiClient", () => {
stats: { bases: 1, documents: 0, shared: 0, owned: 1 },
};
}
if (path === "/org-module/tasks") {
return {
success: true,
data: [{ id: 3, title: "Ship Tasks slice", status: "todo" }],
};
}
throw new Error(`unexpected ${path}`);
});
const client = createOrgApiClient({ fetchJson });
Expand All @@ -79,6 +85,7 @@ describe("createOrgApiClient", () => {
expect((await client.governance.pauses()).pauses[0]?.pause_id).toBe("p1");
expect((await client.skills.list()).skills[0]?.slug).toBe("org-employees");
expect((await client.knowledge.list()).bases[0]?.name).toBe("Policies");
expect((await client.tasks.list())[0]?.title).toBe("Ship Tasks slice");
expect(fetchJson).toHaveBeenCalled();
});

Expand Down
200 changes: 199 additions & 1 deletion dashboard/src/org-ui/api/createClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -365,13 +365,94 @@ export interface OrgKnowledgeClient {
): Promise<OrgKnowledgeDocument>;
}

export type OrgTaskStatus = "todo" | "in_progress" | "review" | "done";
export type OrgTaskPriority = "low" | "medium" | "high" | "critical";

export interface OrgTask {
id: number;
title: string;
description?: string;
status: OrgTaskStatus | string;
priority: OrgTaskPriority | string;
assigned_to?: number | null;
assignee_name?: string | null;
created_by?: number;
creator_name?: string;
created_at?: string;
updated_at?: string | null;
subtask_count?: number;
subtask_done?: number;
comment_count?: number;
subtasks?: OrgTaskSubtask[];
comments?: OrgTaskComment[];
}

export interface OrgTaskSubtask {
id: number;
task_id: number;
title: string;
completed: number;
sort_order: number;
}

export interface OrgTaskComment {
id: number;
task_id: number;
user_id?: number | null;
user_name?: string;
content: string;
comment_type: string;
created_at: string;
}

export interface OrgTaskStats {
total: number;
todo: number;
in_progress: number;
review: number;
done: number;
}

export interface OrgTaskWrite {
title?: string;
description?: string;
priority?: string;
assigned_to?: number | null;
}

export interface OrgTaskListParams {
status?: string;
priority?: string;
assigned_to?: number;
search?: string;
}

export interface OrgTasksClient {
list(params?: OrgTaskListParams): Promise<OrgTask[]>;
stats(): Promise<OrgTaskStats>;
get(id: number): Promise<OrgTask>;
create(body: OrgTaskWrite): Promise<OrgTask>;
update(id: number, body: OrgTaskWrite): Promise<OrgTask>;
remove(id: number): Promise<void>;
transition(id: number, to: string): Promise<OrgTask>;
addSubtask(id: number, title: string): Promise<OrgTaskSubtask>;
updateSubtask(
id: number,
subtaskId: number,
body: { title?: string; completed?: boolean | number },
): Promise<OrgTaskSubtask>;
removeSubtask(id: number, subtaskId: number): Promise<void>;
addComment(id: number, content: string): Promise<OrgTaskComment>;
}

export interface OrgApiClient {
announcements: OrgAnnouncementsClient;
org: OrgChartClient;
employees: OrgEmployeesClient;
governance: OrgGovernanceClient;
skills: OrgSkillsClient;
knowledge: OrgKnowledgeClient;
tasks: OrgTasksClient;
}

async function unwrap<T>(payload: OrgEnvelope<T>): Promise<T> {
Expand All @@ -392,12 +473,14 @@ export function createOrgApiClient(opts: {
governancePrefix?: string;
skillsPrefix?: string;
knowledgePrefix?: string;
tasksPrefix?: string;
}): OrgApiClient {
const prefix = opts.announcementsPrefix ?? "/org-module/announcements";
const orgPrefix = opts.orgPrefix ?? "/org-module/org";
const governancePrefix = opts.governancePrefix ?? "/org-module/governance";
const skillsPrefix = opts.skillsPrefix ?? "/org-module/skills";
const knowledgePrefix = opts.knowledgePrefix ?? "/org-module/knowledge";
const tasksPrefix = opts.tasksPrefix ?? "/org-module/tasks";
const fetchJson = opts.fetchJson;

const announcements: OrgAnnouncementsClient = {
Expand Down Expand Up @@ -689,5 +772,120 @@ export function createOrgApiClient(opts: {
},
};

return { announcements, org, employees, governance, skills, knowledge };
const tasks: OrgTasksClient = {
async list(params = {}) {
const query = new URLSearchParams();
if (params.status) query.set("status", params.status);
if (params.priority) query.set("priority", params.priority);
if (params.assigned_to != null) {
query.set("assigned_to", String(params.assigned_to));
}
if (params.search) query.set("search", params.search);
const suffix = query.toString() ? `?${query.toString()}` : "";
return unwrap(
await fetchJson<OrgEnvelope<OrgTask[]>>(`${tasksPrefix}${suffix}`),
);
},
async stats() {
return unwrap(
await fetchJson<OrgEnvelope<OrgTaskStats>>(`${tasksPrefix}/stats`),
);
},
async get(id) {
return unwrap(
await fetchJson<OrgEnvelope<OrgTask>>(`${tasksPrefix}/${id}`),
);
},
async create(body) {
return unwrap(
await fetchJson<OrgEnvelope<OrgTask>>(tasksPrefix, {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify(body),
}),
);
},
async update(id, body) {
return unwrap(
await fetchJson<OrgEnvelope<OrgTask>>(`${tasksPrefix}/${id}`, {
method: "PUT",
headers: { "Content-Type": "application/json" },
body: JSON.stringify(body),
}),
);
},
async remove(id) {
await unwrap(
await fetchJson<OrgEnvelope<undefined>>(`${tasksPrefix}/${id}`, {
method: "DELETE",
}),
);
},
async transition(id, to) {
return unwrap(
await fetchJson<OrgEnvelope<OrgTask>>(
`${tasksPrefix}/${id}/transition`,
{
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ to }),
},
),
);
},
async addSubtask(id, title) {
return unwrap(
await fetchJson<OrgEnvelope<OrgTaskSubtask>>(
`${tasksPrefix}/${id}/subtasks`,
{
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ title }),
},
),
);
},
async updateSubtask(id, subtaskId, body) {
return unwrap(
await fetchJson<OrgEnvelope<OrgTaskSubtask>>(
`${tasksPrefix}/${id}/subtasks/${subtaskId}`,
{
method: "PUT",
headers: { "Content-Type": "application/json" },
body: JSON.stringify(body),
},
),
);
},
async removeSubtask(id, subtaskId) {
await unwrap(
await fetchJson<OrgEnvelope<undefined>>(
`${tasksPrefix}/${id}/subtasks/${subtaskId}`,
{ method: "DELETE" },
),
);
},
async addComment(id, content) {
return unwrap(
await fetchJson<OrgEnvelope<OrgTaskComment>>(
`${tasksPrefix}/${id}/comments`,
{
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ content }),
},
),
);
},
};

return {
announcements,
org,
employees,
governance,
skills,
knowledge,
tasks,
};
}
1 change: 1 addition & 0 deletions dashboard/src/org-ui/contract.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export const SHARED_ORG_UI_MODULES = [
"skills",
"governance",
"knowledge",
"tasks",
] as const;

export type SharedOrgUiModule = (typeof SHARED_ORG_UI_MODULES)[number];
13 changes: 13 additions & 0 deletions dashboard/src/org-ui/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,15 @@ export type {
OrgKnowledgePreview,
OrgKnowledgeStats,
OrgKnowledgeWrite,
OrgTask,
OrgTaskComment,
OrgTaskListParams,
OrgTaskPriority,
OrgTaskStats,
OrgTaskStatus,
OrgTaskSubtask,
OrgTaskWrite,
OrgTasksClient,
OrgSkill,
OrgSkillCatalogRow,
OrgSkillGenerateResult,
Expand All @@ -54,6 +63,10 @@ export { GovernancePage } from "./pages/governance/GovernancePage";
export type { GovernancePageProps } from "./pages/governance/GovernancePage";
export { KnowledgePage } from "./pages/knowledge/KnowledgePage";
export type { KnowledgePageProps } from "./pages/knowledge/KnowledgePage";
export { TasksPage } from "./pages/tasks/TasksPage";
export type { TasksPageProps } from "./pages/tasks/TasksPage";
export { TaskDetailPage } from "./pages/tasks/TaskDetailPage";
export type { TaskDetailPageProps } from "./pages/tasks/TaskDetailPage";
export type {
IdentityBridge,
OrgFetcher,
Expand Down
Loading
Loading