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
2 changes: 2 additions & 0 deletions server/src/data/db/schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -721,6 +721,7 @@ export const knowledgeFolders = pgTable(
updatedAt: timestamp("updated_at", { withTimezone: true })
.defaultNow()
.notNull(),
deletedAt: timestamp("deleted_at", { withTimezone: true }),
},
(table) => [
index("ix_knowledge_folders_parent_folder_id").on(table.parentFolderId),
Expand Down Expand Up @@ -748,6 +749,7 @@ export const knowledgeItems = pgTable(
updatedAt: timestamp("updated_at", { withTimezone: true })
.defaultNow()
.notNull(),
deletedAt: timestamp("deleted_at", { withTimezone: true }),
},
(table) => [
index("ix_knowledge_items_folder_id").on(table.folderId),
Expand Down
101 changes: 93 additions & 8 deletions server/src/data/repository/knowledge-repo.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { asc, eq, isNull } from "drizzle-orm";
import { and, asc, eq, inArray, isNull } from "drizzle-orm";
import {
files,
knowledgeAttachments,
Expand Down Expand Up @@ -41,7 +41,12 @@ export class KnowledgeRepository {
return await db
.select()
.from(knowledgeFolders)
.where(isNull(knowledgeFolders.parentFolderId))
.where(
and(
isNull(knowledgeFolders.parentFolderId),
isNull(knowledgeFolders.deletedAt),
),
)
.orderBy(asc(knowledgeFolders.title));
}

Expand All @@ -59,7 +64,12 @@ export class KnowledgeRepository {
const [folder] = await db
.select()
.from(knowledgeFolders)
.where(eq(knowledgeFolders.folderId, cursor))
.where(
and(
eq(knowledgeFolders.folderId, cursor),
isNull(knowledgeFolders.deletedAt),
),
)
.limit(1);
if (!folder) break;
chain.push(folder);
Expand All @@ -76,7 +86,12 @@ export class KnowledgeRepository {
return await db
.select()
.from(knowledgeFolders)
.where(eq(knowledgeFolders.parentFolderId, parentFolderId))
.where(
and(
eq(knowledgeFolders.parentFolderId, parentFolderId),
isNull(knowledgeFolders.deletedAt),
),
)
.orderBy(asc(knowledgeFolders.title));
}

Expand All @@ -87,7 +102,12 @@ export class KnowledgeRepository {
return await db
.select()
.from(knowledgeItems)
.where(eq(knowledgeItems.folderId, folderId))
.where(
and(
eq(knowledgeItems.folderId, folderId),
isNull(knowledgeItems.deletedAt),
),
)
.orderBy(asc(knowledgeItems.name));
}

Expand All @@ -99,7 +119,12 @@ export class KnowledgeRepository {
const [item] = await db
.select()
.from(knowledgeItems)
.where(eq(knowledgeItems.itemId, itemId))
.where(
and(
eq(knowledgeItems.itemId, itemId),
isNull(knowledgeItems.deletedAt),
),
)
.limit(1);

if (!item) {
Expand Down Expand Up @@ -342,11 +367,66 @@ export class KnowledgeRepository {
return deleted?.fileId ?? null;
}

async deleteFolder(folderId: string) {
await this.ensureFolderExists(folderId);

const allFolderIds: string[] = [folderId];
const queue: string[] = [folderId];

while (queue.length > 0) {
const parentId = queue.shift()!;
const children = await db
.select({ folderId: knowledgeFolders.folderId })
.from(knowledgeFolders)
.where(
and(
eq(knowledgeFolders.parentFolderId, parentId),
isNull(knowledgeFolders.deletedAt),
),
);
for (const child of children) {
allFolderIds.push(child.folderId);
queue.push(child.folderId);
}
}

const now = new Date();
await db.transaction(async (tx) => {
await tx
.update(knowledgeItems)
.set({ deletedAt: now })
.where(
and(
inArray(knowledgeItems.folderId, allFolderIds),
isNull(knowledgeItems.deletedAt),
),
);
await tx
.update(knowledgeFolders)
.set({ deletedAt: now })
.where(inArray(knowledgeFolders.folderId, allFolderIds));
});
}

async deleteItem(itemId: string) {
await this.ensureItemExists(itemId);

await db
.update(knowledgeItems)
.set({ deletedAt: new Date() })
.where(eq(knowledgeItems.itemId, itemId));
}

private async ensureFolderExists(folderId: string): Promise<void> {
const [folder] = await db
.select({ folderId: knowledgeFolders.folderId })
.from(knowledgeFolders)
.where(eq(knowledgeFolders.folderId, folderId))
.where(
and(
eq(knowledgeFolders.folderId, folderId),
isNull(knowledgeFolders.deletedAt),
),
)
.limit(1);

if (!folder) {
Expand All @@ -358,7 +438,12 @@ export class KnowledgeRepository {
const [item] = await db
.select({ itemId: knowledgeItems.itemId })
.from(knowledgeItems)
.where(eq(knowledgeItems.itemId, itemId))
.where(
and(
eq(knowledgeItems.itemId, itemId),
isNull(knowledgeItems.deletedAt),
),
)
.limit(1);

if (!item) {
Expand Down
38 changes: 38 additions & 0 deletions server/src/routers/knowledge.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ import {
createFolderInputSchema,
createItemAttachmentInputSchema,
createItemInputSchema,
deleteFolderInputSchema,
deleteItemAttachmentInputSchema,
deleteItemInputSchema,
getFolderAncestorsInputSchema,
getFoldersInFolderInputSchema,
getItemAttachmentInputSchema,
Expand Down Expand Up @@ -261,6 +263,40 @@ const replaceItemAttachment = protectedProcedure
}),
);

const deleteFolder = protectedProcedure
.input(deleteFolderInputSchema)
.output(simpleOkSchema)
.meta({
openapi: {
method: "POST",
path: "/knowledge.deleteFolder",
summary: "Soft-delete a folder and all its contents",
tags: ["Knowledge"],
},
})
.mutation(({ input }) =>
withErrorHandling("deleteFolder", async () => {
return await knowledgeService.deleteFolder(input.folderId);
}),
);

const deleteItem = protectedProcedure
.input(deleteItemInputSchema)
.output(simpleOkSchema)
.meta({
openapi: {
method: "POST",
path: "/knowledge.deleteItem",
summary: "Soft-delete a knowledge item",
tags: ["Knowledge"],
},
})
.mutation(({ input }) =>
withErrorHandling("deleteItem", async () => {
return await knowledgeService.deleteItem(input.itemId);
}),
);

const deleteItemAttachment = protectedProcedure
.input(deleteItemAttachmentInputSchema)
.output(simpleOkSchema)
Expand Down Expand Up @@ -292,5 +328,7 @@ export const knowledgeRouter = router({
updateItem,
createItemAttachment,
replaceItemAttachment,
deleteFolder,
deleteItem,
deleteItemAttachment,
});
10 changes: 10 additions & 0 deletions server/src/service/knowledge-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,16 @@ export class KnowledgeService {
return attachment;
}

async deleteFolder(folderId: string) {
await this.knowledgeRepo.deleteFolder(folderId);
return { ok: true };
}

async deleteItem(itemId: string) {
await this.knowledgeRepo.deleteItem(itemId);
return { ok: true };
}

async deleteItemAttachment(itemId: string) {
const oldFileId = await this.knowledgeRepo.deleteItemAttachment(itemId);

Expand Down
8 changes: 8 additions & 0 deletions server/src/types/knowledge-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,12 @@ export const deleteItemAttachmentInputSchema = z.object({
itemId: uuidSchema,
});

export const deleteFolderInputSchema = z.object({
folderId: uuidSchema,
});

export const deleteItemInputSchema = z.object({
itemId: uuidSchema,
});

export const simpleOkSchema = z.object({ ok: z.boolean() });
2 changes: 1 addition & 1 deletion web/src/app/admin/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"use client";

import type { RoleKey } from "@server/data/roles";
import { BarChart2, ShieldCheck, UserPlus, Users } from "lucide-react";
import { BarChart2, ShieldCheck, UserPlus } from "lucide-react";
import type { Route } from "next";
import Link from "next/link";
import { AuthGuard } from "@/components/auth/auth-guard";
Expand Down
Loading
Loading