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
24 changes: 24 additions & 0 deletions server/src/data/repository/knowledge-repo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,30 @@ export class KnowledgeRepository {
.orderBy(asc(knowledgeFolders.title));
}

/**
* Get a folder by id plus all its ancestors up to the root.
* Returns an array starting from the given folder up to the root.
*/
async getFolderWithAncestors(folderId: string) {
const chain: (typeof knowledgeFolders.$inferSelect)[] = [];
let cursor: string | null = folderId;
const seen = new Set<string>();

while (cursor && !seen.has(cursor)) {
seen.add(cursor);
const [folder] = await db
.select()
.from(knowledgeFolders)
.where(eq(knowledgeFolders.folderId, cursor))
.limit(1);
if (!folder) break;
chain.push(folder);
cursor = folder.parentFolderId;
}

return chain;
}

/**
* Get child folders for a parent folder.
*/
Expand Down
19 changes: 19 additions & 0 deletions server/src/routers/knowledge.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
createItemAttachmentInputSchema,
createItemInputSchema,
deleteItemAttachmentInputSchema,
getFolderAncestorsInputSchema,
getFoldersInFolderInputSchema,
getItemAttachmentInputSchema,
getItemInputSchema,
Expand Down Expand Up @@ -45,6 +46,23 @@ const getRootFolders = protectedProcedure
}),
);

const getFolderAncestors = protectedProcedure
.input(getFolderAncestorsInputSchema)
.output(z.array(knowledgeFolderOutputSchema))
.meta({
openapi: {
method: "POST",
path: "/knowledge.getFolderAncestors",
summary: "Get a folder and all its ancestors up to the root",
tags: ["Knowledge"],
},
})
.query(({ input }) =>
withErrorHandling("getFolderAncestors", async () => {
return await knowledgeService.getFolderWithAncestors(input.folderId);
}),
);

const getFoldersInFolder = protectedProcedure
.input(getFoldersInFolderInputSchema)
.output(z.array(knowledgeFolderOutputSchema))
Expand Down Expand Up @@ -262,6 +280,7 @@ const deleteItemAttachment = protectedProcedure

export const knowledgeRouter = router({
getRootFolders,
getFolderAncestors,
getFoldersInFolder,
getItemsInFolder,
getItem,
Expand Down
4 changes: 4 additions & 0 deletions server/src/service/knowledge-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ export class KnowledgeService {
return await this.knowledgeRepo.getChildFolders(parentFolderId);
}

async getFolderWithAncestors(folderId: string) {
return await this.knowledgeRepo.getFolderWithAncestors(folderId);
}

async getItemsByFolder(folderId: string) {
return await this.knowledgeRepo.getItemsByFolder(folderId);
}
Expand Down
4 changes: 4 additions & 0 deletions server/src/types/knowledge-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ export const knowledgeAttachmentWithFileOutputSchema =
metadata: z.unknown().nullable(),
});

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

export const getFoldersInFolderInputSchema = z.object({
parentFolderId: uuidSchema,
});
Expand Down
21 changes: 15 additions & 6 deletions web/src/app/knowledge/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,15 @@ function KnowledgePage() {
}) as Promise<ItemRecord[]>,
});

const folderAncestorsQuery = useQuery({
queryKey: ["knowledge", "folders", "ancestors", currentFolderId],
enabled: Boolean(currentFolderId),
queryFn: () =>
trpcClient.knowledge.getFolderAncestors.query({
folderId: currentFolderId ?? "",
}) as Promise<FolderRecord[]>,
});

const openedItemQuery = useQuery({
queryKey: ["knowledge", "item", openedItemId],
enabled: Boolean(openedItemId),
Expand Down Expand Up @@ -170,6 +179,10 @@ function KnowledgePage() {
registerFolders((childFoldersQuery.data ?? []) as FolderRecord[]);
}, [childFoldersQuery.data, registerFolders]);

useEffect(() => {
registerFolders((folderAncestorsQuery.data ?? []) as FolderRecord[]);
}, [folderAncestorsQuery.data, registerFolders]);

const folders = currentFolderId
? ((childFoldersQuery.data ?? []) as FolderRecord[])
: ((rootFoldersQuery.data ?? []) as FolderRecord[]);
Expand Down Expand Up @@ -552,10 +565,9 @@ function KnowledgePage() {
</div>

<div>
<div className="grid grid-cols-[minmax(0,1fr)_16rem_6rem] border-y bg-muted/40 px-4 py-2 text-xs font-semibold uppercase tracking-wide text-muted-foreground">
<div className="grid grid-cols-[minmax(0,1fr)_16rem] border-y bg-muted/40 px-4 py-2 text-xs font-semibold uppercase tracking-wide text-muted-foreground">
<span>Name</span>
<span>Date Modified</span>
<span>Size</span>
</div>
<div className="max-h-[65vh] overflow-y-auto">
{loading ? (
Expand All @@ -579,7 +591,7 @@ function KnowledgePage() {
key={`${row.kind}-${row.id}`}
type="button"
className={cn(
"grid w-full grid-cols-[minmax(0,1fr)_16rem_6rem] cursor-pointer items-center px-4 py-2 text-left",
"grid w-full grid-cols-[minmax(0,1fr)_16rem] cursor-pointer items-center px-4 py-2 text-left",
isSelected
? "border-l-2 border-primary bg-primary/20"
: "border-l-2 border-transparent hover:bg-primary/5",
Expand Down Expand Up @@ -614,9 +626,6 @@ function KnowledgePage() {
<span className="text-sm text-muted-foreground">
{formatDate(row.updatedAt)}
</span>
<span className="text-sm text-muted-foreground">
</span>
</button>
);
})
Expand Down
Loading