From 5bdb2d944a08f63772497e203f47533ffb640d82 Mon Sep 17 00:00:00 2001 From: Mohamed Bassem Date: Sun, 13 Apr 2025 18:29:14 +0000 Subject: fix: Dont download html content by default in the bookmark grid. Fixes #1198 --- .../mobile/app/dashboard/bookmarks/[slug]/info.tsx | 4 ++- .../components/bookmarks/UpdatingBookmarkList.tsx | 4 +-- apps/web/app/api/bookmarks/export/route.tsx | 1 + .../web/app/api/v1/bookmarks/[bookmarkId]/route.ts | 6 +++- apps/web/app/api/v1/bookmarks/route.ts | 2 ++ .../app/api/v1/lists/[listId]/bookmarks/route.ts | 3 +- .../web/app/api/v1/tags/[tagId]/bookmarks/route.ts | 3 +- apps/web/app/api/v1/utils/types.ts | 5 +++ .../components/dashboard/bookmarks/Bookmarks.tsx | 6 ++-- .../dashboard/bookmarks/UpdatableBookmarksGrid.tsx | 4 +-- .../action-buttons/ArchiveBookmarkButton.tsx | 9 +++++- .../dashboard/preview/LinkContentSection.tsx | 36 +++++++++++++--------- 12 files changed, 58 insertions(+), 25 deletions(-) (limited to 'apps') diff --git a/apps/mobile/app/dashboard/bookmarks/[slug]/info.tsx b/apps/mobile/app/dashboard/bookmarks/[slug]/info.tsx index ebd3a1e2..6d02af53 100644 --- a/apps/mobile/app/dashboard/bookmarks/[slug]/info.tsx +++ b/apps/mobile/app/dashboard/bookmarks/[slug]/info.tsx @@ -147,7 +147,9 @@ const ViewBookmarkPage = () => { data: bookmark, isPending, refetch, - } = useAutoRefreshingBookmarkQuery({ bookmarkId: slug }); + } = useAutoRefreshingBookmarkQuery({ + bookmarkId: slug, + }); if (isPending) { return ; diff --git a/apps/mobile/components/bookmarks/UpdatingBookmarkList.tsx b/apps/mobile/components/bookmarks/UpdatingBookmarkList.tsx index 115d44c9..e627ee16 100644 --- a/apps/mobile/components/bookmarks/UpdatingBookmarkList.tsx +++ b/apps/mobile/components/bookmarks/UpdatingBookmarkList.tsx @@ -11,7 +11,7 @@ export default function UpdatingBookmarkList({ query, header, }: { - query: Omit; // Sort order is not supported in mobile yet + query: Omit; // Sort order is not supported in mobile yet header?: React.ReactElement; }) { const apiUtils = api.useUtils(); @@ -24,7 +24,7 @@ export default function UpdatingBookmarkList({ isFetchingNextPage, refetch, } = api.bookmarks.getBookmarks.useInfiniteQuery( - { ...query, useCursorV2: true }, + { ...query, useCursorV2: true, includeContent: false }, { initialCursor: null, getNextPageParam: (lastPage) => lastPage.nextCursor, diff --git a/apps/web/app/api/bookmarks/export/route.tsx b/apps/web/app/api/bookmarks/export/route.tsx index 4e04757f..669fb1c7 100644 --- a/apps/web/app/api/bookmarks/export/route.tsx +++ b/apps/web/app/api/bookmarks/export/route.tsx @@ -13,6 +13,7 @@ export async function GET(request: Request) { const req = { limit: MAX_NUM_BOOKMARKS_PER_PAGE, useCursorV2: true, + includeContent: true, }; let resp = await api.bookmarks.getBookmarks(req); diff --git a/apps/web/app/api/v1/bookmarks/[bookmarkId]/route.ts b/apps/web/app/api/v1/bookmarks/[bookmarkId]/route.ts index db78f17c..fa551894 100644 --- a/apps/web/app/api/v1/bookmarks/[bookmarkId]/route.ts +++ b/apps/web/app/api/v1/bookmarks/[bookmarkId]/route.ts @@ -3,6 +3,8 @@ import { buildHandler } from "@/app/api/v1/utils/handler"; import { zUpdateBookmarksRequestSchema } from "@karakeep/shared/types/bookmarks"; +import { zGetBookmarkSearchParamsSchema } from "../../utils/types"; + export const dynamic = "force-dynamic"; export const GET = ( @@ -11,9 +13,11 @@ export const GET = ( ) => buildHandler({ req, - handler: async ({ api }) => { + searchParamsSchema: zGetBookmarkSearchParamsSchema, + handler: async ({ api, searchParams }) => { const bookmark = await api.bookmarks.getBookmark({ bookmarkId: params.bookmarkId, + includeContent: searchParams.includeContent, }); return { status: 200, resp: bookmark }; }, diff --git a/apps/web/app/api/v1/bookmarks/route.ts b/apps/web/app/api/v1/bookmarks/route.ts index 7b6954c6..1605d2b5 100644 --- a/apps/web/app/api/v1/bookmarks/route.ts +++ b/apps/web/app/api/v1/bookmarks/route.ts @@ -16,6 +16,8 @@ export const GET = (req: NextRequest) => .object({ favourited: zStringBool.optional(), archived: zStringBool.optional(), + // TODO: Change the default to false in a couple of releases. + includeContent: zStringBool.optional().default("true"), }) .and(zPagination), handler: async ({ api, searchParams }) => { diff --git a/apps/web/app/api/v1/lists/[listId]/bookmarks/route.ts b/apps/web/app/api/v1/lists/[listId]/bookmarks/route.ts index 72d4aa5f..3977413a 100644 --- a/apps/web/app/api/v1/lists/[listId]/bookmarks/route.ts +++ b/apps/web/app/api/v1/lists/[listId]/bookmarks/route.ts @@ -1,13 +1,14 @@ import { NextRequest } from "next/server"; import { buildHandler } from "@/app/api/v1/utils/handler"; import { adaptPagination, zPagination } from "@/app/api/v1/utils/pagination"; +import { zGetBookmarkSearchParamsSchema } from "@/app/api/v1/utils/types"; export const dynamic = "force-dynamic"; export const GET = (req: NextRequest, params: { params: { listId: string } }) => buildHandler({ req, - searchParamsSchema: zPagination, + searchParamsSchema: zPagination.and(zGetBookmarkSearchParamsSchema), handler: async ({ api, searchParams }) => { const bookmarks = await api.bookmarks.getBookmarks({ listId: params.params.listId, diff --git a/apps/web/app/api/v1/tags/[tagId]/bookmarks/route.ts b/apps/web/app/api/v1/tags/[tagId]/bookmarks/route.ts index 98133ec7..cfc0af51 100644 --- a/apps/web/app/api/v1/tags/[tagId]/bookmarks/route.ts +++ b/apps/web/app/api/v1/tags/[tagId]/bookmarks/route.ts @@ -1,6 +1,7 @@ import { NextRequest } from "next/server"; import { buildHandler } from "@/app/api/v1/utils/handler"; import { adaptPagination, zPagination } from "@/app/api/v1/utils/pagination"; +import { zGetBookmarkSearchParamsSchema } from "@/app/api/v1/utils/types"; export const dynamic = "force-dynamic"; @@ -10,7 +11,7 @@ export const GET = ( ) => buildHandler({ req, - searchParamsSchema: zPagination, + searchParamsSchema: zPagination.and(zGetBookmarkSearchParamsSchema), handler: async ({ api, searchParams }) => { const bookmarks = await api.bookmarks.getBookmarks({ tagId: params.tagId, diff --git a/apps/web/app/api/v1/utils/types.ts b/apps/web/app/api/v1/utils/types.ts index c0e20dff..f0fe6231 100644 --- a/apps/web/app/api/v1/utils/types.ts +++ b/apps/web/app/api/v1/utils/types.ts @@ -4,3 +4,8 @@ export const zStringBool = z .string() .refine((val) => val === "true" || val === "false", "Must be true or false") .transform((val) => val === "true"); + +export const zGetBookmarkSearchParamsSchema = z.object({ + // TODO: Change the default to false in a couple of releases. + includeContent: zStringBool.optional().default("true"), +}); diff --git a/apps/web/components/dashboard/bookmarks/Bookmarks.tsx b/apps/web/components/dashboard/bookmarks/Bookmarks.tsx index af2e4990..9f7a900e 100644 --- a/apps/web/components/dashboard/bookmarks/Bookmarks.tsx +++ b/apps/web/components/dashboard/bookmarks/Bookmarks.tsx @@ -13,7 +13,7 @@ export default async function Bookmarks({ showDivider, showEditorCard = false, }: { - query: Omit; // Sort order is handled by the store + query: Omit; // Sort order is handled by the store header?: React.ReactNode; showDivider?: boolean; showEditorCard?: boolean; @@ -23,7 +23,9 @@ export default async function Bookmarks({ redirect("/"); } - const bookmarks = await api.bookmarks.getBookmarks(query); + const bookmarks = await api.bookmarks.getBookmarks({ + ...query, + }); return (
diff --git a/apps/web/components/dashboard/bookmarks/UpdatableBookmarksGrid.tsx b/apps/web/components/dashboard/bookmarks/UpdatableBookmarksGrid.tsx index 03ea9708..da65b9d9 100644 --- a/apps/web/components/dashboard/bookmarks/UpdatableBookmarksGrid.tsx +++ b/apps/web/components/dashboard/bookmarks/UpdatableBookmarksGrid.tsx @@ -18,14 +18,14 @@ export default function UpdatableBookmarksGrid({ bookmarks: initialBookmarks, showEditorCard = false, }: { - query: Omit; // Sort order is handled by the store + query: Omit; // Sort order is handled by the store bookmarks: ZGetBookmarksResponse; showEditorCard?: boolean; itemsPerPage?: number; }) { const sortOrder = useSortOrderStore((state) => state.sortOrder); - const finalQuery = { ...query, sortOrder }; + const finalQuery = { ...query, sortOrder, includeContent: false }; const { data, fetchNextPage, hasNextPage, isFetchingNextPage, refetch } = api.bookmarks.getBookmarks.useInfiniteQuery( diff --git a/apps/web/components/dashboard/bookmarks/action-buttons/ArchiveBookmarkButton.tsx b/apps/web/components/dashboard/bookmarks/action-buttons/ArchiveBookmarkButton.tsx index 3b8da82f..d45cfc82 100644 --- a/apps/web/components/dashboard/bookmarks/action-buttons/ArchiveBookmarkButton.tsx +++ b/apps/web/components/dashboard/bookmarks/action-buttons/ArchiveBookmarkButton.tsx @@ -15,7 +15,14 @@ const ArchiveBookmarkButton = React.forwardRef< HTMLButtonElement, ArchiveBookmarkButtonProps >(({ bookmarkId, onDone, ...props }, ref) => { - const { data } = api.bookmarks.getBookmark.useQuery({ bookmarkId }); + const { data } = api.bookmarks.getBookmark.useQuery( + { bookmarkId }, + { + select: (data) => ({ + archived: data.archived, + }), + }, + ); const { mutate: updateBookmark, isPending: isArchivingBookmark } = useUpdateBookmark({ diff --git a/apps/web/components/dashboard/preview/LinkContentSection.tsx b/apps/web/components/dashboard/preview/LinkContentSection.tsx index f37f110e..dd419fcd 100644 --- a/apps/web/components/dashboard/preview/LinkContentSection.tsx +++ b/apps/web/components/dashboard/preview/LinkContentSection.tsx @@ -1,6 +1,7 @@ import { useState } from "react"; import Image from "next/image"; import BookmarkHTMLHighlighter from "@/components/dashboard/preview/BookmarkHtmlHighlighter"; +import { FullPageSpinner } from "@/components/ui/full-page-spinner"; import { Select, SelectContent, @@ -52,16 +53,23 @@ function ScreenshotSection({ link }: { link: ZBookmarkedLink }) { ); } -function CachedContentSection({ - bookmarkId, - link, -}: { - bookmarkId: string; - link: ZBookmarkedLink; -}) { - const { data } = api.highlights.getForBookmark.useQuery({ +function CachedContentSection({ bookmarkId }: { bookmarkId: string }) { + const { data: highlights } = api.highlights.getForBookmark.useQuery({ bookmarkId, }); + const { data: cachedContent, isPending: isCachedContentLoading } = + api.bookmarks.getBookmark.useQuery( + { + bookmarkId, + includeContent: true, + }, + { + select: (data) => + data.content.type == BookmarkTypes.LINK + ? data.content.htmlContent + : null, + }, + ); const { mutate: createHighlight } = useCreateHighlight({ onSuccess: () => { @@ -106,16 +114,18 @@ function CachedContentSection({ }); let content; - if (!link.htmlContent) { + if (isCachedContentLoading) { + content = ; + } else if (!cachedContent) { content = (
Failed to fetch link content ...
); } else { content = ( deleteHighlight({ highlightId: h.id, @@ -171,9 +181,7 @@ export default function LinkContentSection({ let content; if (section === "cached") { - content = ( - - ); + content = ; } else if (section === "archive") { content = ; } else if (section === "video") { -- cgit v1.2.3-70-g09d2