fix: tighten sharing and shadcn composition
CI / checks (push) Successful in 12m55s
CI / build (push) Successful in 15m16s

This commit is contained in:
ginnoir
2026-06-13 05:20:01 -05:00
parent e1774c802d
commit a312d4ce39
42 changed files with 1539 additions and 417 deletions
+3 -2
View File
@@ -1,7 +1,7 @@
import type { ModuleManifest, WidgetContext } from "../_core/module";
import { z } from "zod";
import { listLists, listWidgetItems, searchItems, searchLists } from "./server/queries";
import { loadListForShare, type ListShareData } from "./server/share-queries";
import { canShareList, loadListForShare, type ListShareData } from "./server/share-queries";
import { ListSharedView } from "./components/shared-view";
import { ListWidget } from "./components/list-widget";
@@ -34,7 +34,8 @@ const manifest: ModuleManifest = {
share: { canShare: true, defaultCapabilities: ["read", "write"] },
search: { search: searchLists },
resolveUrl: (id) => `/lists/${id}`,
loadForShare: (id) => loadListForShare(id),
canShareEntity: canShareList,
loadForShare: loadListForShare,
renderSharedView: ({ data, capabilities, token }) => (
<ListSharedView data={data as ListShareData} canWrite={capabilities.write} token={token} />
),
+17 -3
View File
@@ -1,5 +1,6 @@
import { asc, eq } from "drizzle-orm";
import { and, asc, eq } from "drizzle-orm";
import { db } from "@/lib/db";
import type { PublicShareContext, ShareContext } from "@/modules/_core/module";
import { listItems, lists } from "../schema";
export type ListShareItem = {
@@ -19,7 +20,20 @@ export type ListShareData = {
items: ListShareItem[];
};
export async function loadListForShare(id: string): Promise<ListShareData | null> {
export async function canShareList(id: string, ctx: ShareContext): Promise<boolean> {
const [list] = await db
.select({ id: lists.id })
.from(lists)
.where(and(eq(lists.id, id), eq(lists.householdId, ctx.householdId)))
.limit(1);
return !!list;
}
export async function loadListForShare(
id: string,
ctx: PublicShareContext,
): Promise<ListShareData | null> {
const [list] = await db
.select({
id: lists.id,
@@ -28,7 +42,7 @@ export async function loadListForShare(id: string): Promise<ListShareData | null
householdId: lists.householdId,
})
.from(lists)
.where(eq(lists.id, id))
.where(and(eq(lists.id, id), eq(lists.householdId, ctx.householdId)))
.limit(1);
if (!list) return null;