@@ -1,8 +1,9 @@
|
||||
import Link from "next/link";
|
||||
import { and, desc, eq, isNull, sql } from "drizzle-orm";
|
||||
import { and, desc, eq, inArray, isNull, sql } from "drizzle-orm";
|
||||
import { auth } from "@/auth";
|
||||
import { db } from "@/lib/db/client";
|
||||
import { memories, projects } from "@/lib/db/schema";
|
||||
import { getAccessibleProjects, getUserGroupNames } from "@/lib/access";
|
||||
import { Container, PageHeader } from "@/app/_components/ui/container";
|
||||
import { Card } from "@/app/_components/ui/card";
|
||||
import { Badge } from "@/app/_components/ui/badge";
|
||||
@@ -13,8 +14,21 @@ export const dynamic = "force-dynamic";
|
||||
export default async function ProjectsPage() {
|
||||
const session = await auth();
|
||||
const userId = session!.user.id;
|
||||
const groupNames = await getUserGroupNames(userId);
|
||||
|
||||
const rows = await db
|
||||
// The project list is owned ∪ shared: projects the user owns PLUS
|
||||
// projects shared with one of their groups (any access). Visibility was
|
||||
// previously owner-only (`eq(projects.userId, userId)`), which hid
|
||||
// projects another user shared in via project_shares even though
|
||||
// project.identify already reported them as {shared, access}.
|
||||
const accessible = await getAccessibleProjects(userId, groupNames);
|
||||
const accessById = new Map(accessible.map((p) => [p.projectId, p.access]));
|
||||
const accessibleIds = accessible.map((p) => p.projectId);
|
||||
|
||||
const rows =
|
||||
accessibleIds.length === 0
|
||||
? []
|
||||
: await db
|
||||
.select({
|
||||
id: projects.id,
|
||||
key: projects.key,
|
||||
@@ -28,7 +42,7 @@ export default async function ProjectsPage() {
|
||||
memories,
|
||||
and(eq(memories.projectId, projects.id), isNull(memories.deletedAt)),
|
||||
)
|
||||
.where(eq(projects.userId, userId))
|
||||
.where(inArray(projects.id, accessibleIds))
|
||||
.groupBy(projects.id)
|
||||
.orderBy(desc(sql`max(${memories.createdAt})`));
|
||||
|
||||
@@ -57,6 +71,9 @@ export default async function ProjectsPage() {
|
||||
<div className="flex items-center gap-2">
|
||||
<span className="font-mono text-sm text-fg truncate">{p.key}</span>
|
||||
<Badge>{p.memoryCount}</Badge>
|
||||
{accessById.get(p.id) !== "owner" ? (
|
||||
<Badge tone="accent">shared · {accessById.get(p.id)}</Badge>
|
||||
) : null}
|
||||
</div>
|
||||
{p.displayName && p.displayName !== p.key ? (
|
||||
<div className="text-xs text-fg-muted truncate mt-0.5">{p.displayName}</div>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { and, desc, eq, inArray, isNull, or, sql } from "drizzle-orm";
|
||||
import { and, arrayContains, desc, eq, inArray, isNull, or } from "drizzle-orm";
|
||||
import { db } from "@/lib/db/client";
|
||||
import {
|
||||
memories,
|
||||
@@ -465,7 +465,13 @@ const memoryList: ToolDef = {
|
||||
}
|
||||
|
||||
if (parsed.data.tags && parsed.data.tags.length > 0) {
|
||||
where.push(sql`${memories.tags} @> ${parsed.data.tags}::text[]`);
|
||||
// Require ALL listed tags (array containment). Use Drizzle's
|
||||
// arrayContains so the JS array binds as a single text[] param
|
||||
// (via the column's toDriver) rather than being expanded into
|
||||
// positional params — a raw `${tags}::text[]` template expands to
|
||||
// `($1)::text[]` / `($1,$2)::text[]`, which Postgres rejects as a
|
||||
// malformed array literal / record cast.
|
||||
where.push(arrayContains(memories.tags, parsed.data.tags));
|
||||
}
|
||||
|
||||
const rows = await db
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { and, desc, eq, inArray, isNull, or, sql } from "drizzle-orm";
|
||||
import { and, arrayContains, desc, eq, inArray, isNull, or } from "drizzle-orm";
|
||||
import { db } from "@/lib/db/client";
|
||||
import { snippets, projects } from "@/lib/db/schema";
|
||||
import type { Snippet } from "@/lib/db/schema";
|
||||
@@ -349,7 +349,13 @@ export async function listSnippets(
|
||||
}
|
||||
|
||||
if (tags && tags.length > 0) {
|
||||
where.push(sql`${snippets.tags} @> ${tags}::text[]`);
|
||||
// Require ALL listed tags (array containment). Use Drizzle's
|
||||
// arrayContains so the JS array binds as a single text[] param
|
||||
// (via the column's toDriver) rather than being expanded into
|
||||
// positional params — a raw `${tags}::text[]` template expands to
|
||||
// `($1)::text[]` / `($1,$2)::text[]`, which Postgres rejects as a
|
||||
// malformed array literal / record cast.
|
||||
where.push(arrayContains(snippets.tags, tags));
|
||||
}
|
||||
|
||||
const rows = await db
|
||||
|
||||
Reference in New Issue
Block a user