Skip to content

A self-hostable bookmark-everything app (links, notes and images) with AI-based automatic tagging and full text search

refactor: refactor bulk actions to store bookmark ids (#2767)

Mohamed Bassem517b87f51b21
diff --git a/apps/web/components/dashboard/BulkBookmarksAction.tsx b/apps/web/components/dashboard/BulkBookmarksAction.tsx
index 0e74b985..2657a27f 100644
--- a/apps/web/components/dashboard/BulkBookmarksAction.tsx
+++ b/apps/web/components/dashboard/BulkBookmarksAction.tsx
@@ -41,10 +41,15 @@ const MAX_CONCURRENT_BULK_ACTIONS = 50;
export default function BulkBookmarksAction() {
const { t } = useTranslation();
const {
- selectedBookmarks,
+ selectedBookmarkIds,
+ visibleBookmarks,
isBulkEditEnabled,
listContext: withinListContext,
} = useBulkActionsStore();
+ const selectedBookmarks = React.useMemo(() => {
+ const selected = new Set(selectedBookmarkIds);
+ return visibleBookmarks.filter((bookmark) => selected.has(bookmark.id));
+ }, [selectedBookmarkIds, visibleBookmarks]);
const setIsBulkEditEnabled = useBulkActionsStore(
(state) => state.setIsBulkEditEnabled,
);
diff --git a/apps/web/components/dashboard/bookmarks/BookmarkLayoutAdaptingCard.tsx b/apps/web/components/dashboard/bookmarks/BookmarkLayoutAdaptingCard.tsx
index 996b255a..8a1b4258 100644
--- a/apps/web/components/dashboard/bookmarks/BookmarkLayoutAdaptingCard.tsx
+++ b/apps/web/components/dashboard/bookmarks/BookmarkLayoutAdaptingCard.tsx
@@ -2,7 +2,7 @@
import type { BookmarksLayoutTypes } from "@/lib/userLocalSettings/types";
import type { ReactNode } from "react";
-import { useCallback, useEffect, useState } from "react";
+import { useCallback } from "react";
import Image from "next/image";
import Link from "next/link";
import { useSession } from "@/lib/auth/client";
@@ -116,16 +116,14 @@ function OwnerIndicator({ bookmark }: { bookmark: ZBookmark }) {
}
function MultiBookmarkSelector({ bookmark }: { bookmark: ZBookmark }) {
- const { selectedBookmarks, isBulkEditEnabled } = useBulkActionsStore();
+ const isSelected = useBulkActionsStore((s) =>
+ s.isBookmarkSelected(bookmark.id),
+ );
+ const isBulkEditEnabled = useBulkActionsStore((s) => s.isBulkEditEnabled);
const toggleBookmark = useBulkActionsStore((state) => state.toggleBookmark);
- const [isSelected, setIsSelected] = useState(false);
const { theme } = useTheme();
const { data: session } = useSession();
- useEffect(() => {
- setIsSelected(selectedBookmarks.some((item) => item.id === bookmark.id));
- }, [selectedBookmarks]);
-
// Don't show selector for non-owned bookmarks or when bulk edit is disabled
const isOwner = session?.user?.id === bookmark.userId;
if (!isBulkEditEnabled || !isOwner) return null;
@@ -153,7 +151,7 @@ function MultiBookmarkSelector({ bookmark }: { bookmark: ZBookmark }) {
},
theme === "dark" ? "bg-white" : "bg-black",
)}
- onClick={() => toggleBookmark(bookmark)}
+ onClick={() => toggleBookmark(bookmark.id)}
>
<div className="absolute right-2 top-2 z-50 opacity-100">
<div
diff --git a/apps/web/lib/bulkActions.ts b/apps/web/lib/bulkActions.ts
index ef814331..b19caf01 100644
--- a/apps/web/lib/bulkActions.ts
+++ b/apps/web/lib/bulkActions.ts
@@ -5,55 +5,63 @@ import type { ZBookmark } from "@karakeep/shared/types/bookmarks";
import { ZBookmarkList } from "@karakeep/shared/types/lists";
interface BookmarkState {
- selectedBookmarks: ZBookmark[];
+ selectedBookmarkIds: string[];
visibleBookmarks: ZBookmark[];
isBulkEditEnabled: boolean;
setIsBulkEditEnabled: (isEnabled: boolean) => void;
- toggleBookmark: (bookmark: ZBookmark) => void;
+ toggleBookmark: (bookmarkId: string) => void;
setVisibleBookmarks: (visibleBookmarks: ZBookmark[]) => void;
selectAll: () => void;
unSelectAll: () => void;
+ isBookmarkSelected: (bookmarkId: string) => boolean;
isEverythingSelected: () => boolean;
setListContext: (listContext: ZBookmarkList | undefined) => void;
listContext: ZBookmarkList | undefined;
}
const useBulkActionsStore = create<BookmarkState>((set, get) => ({
- selectedBookmarks: [],
+ selectedBookmarkIds: [],
visibleBookmarks: [],
isBulkEditEnabled: false,
listContext: undefined,
- toggleBookmark: (bookmark: ZBookmark) => {
- const selectedBookmarks = get().selectedBookmarks;
- const isBookmarkAlreadySelected = selectedBookmarks.some(
- (b) => b.id === bookmark.id,
- );
+ toggleBookmark: (bookmarkId: string) => {
+ const selectedBookmarkIds = get().selectedBookmarkIds;
+ const isBookmarkAlreadySelected = selectedBookmarkIds.includes(bookmarkId);
if (isBookmarkAlreadySelected) {
set({
- selectedBookmarks: selectedBookmarks.filter(
- (b) => b.id !== bookmark.id,
+ selectedBookmarkIds: selectedBookmarkIds.filter(
+ (id) => id !== bookmarkId,
),
});
} else {
- set({ selectedBookmarks: [...selectedBookmarks, bookmark] });
+ set({ selectedBookmarkIds: [...selectedBookmarkIds, bookmarkId] });
}
},
selectAll: () => {
- set({ selectedBookmarks: get().visibleBookmarks });
+ set({ selectedBookmarkIds: get().visibleBookmarks.map((b) => b.id) });
},
unSelectAll: () => {
- set({ selectedBookmarks: [] });
+ set({ selectedBookmarkIds: [] });
+ },
+
+ isBookmarkSelected: (bookmarkId: string) => {
+ return get().selectedBookmarkIds.includes(bookmarkId);
},
isEverythingSelected: () => {
- return get().selectedBookmarks.length === get().visibleBookmarks.length;
+ const { selectedBookmarkIds, visibleBookmarks } = get();
+ if (visibleBookmarks.length === 0) {
+ return false;
+ }
+ const selected = new Set(selectedBookmarkIds);
+ return visibleBookmarks.every((bookmark) => selected.has(bookmark.id));
},
setIsBulkEditEnabled: (isEnabled) => {
set({ isBulkEditEnabled: isEnabled });
- set({ selectedBookmarks: [] });
+ set({ selectedBookmarkIds: [] });
},
setVisibleBookmarks: (visibleBookmarks: ZBookmark[]) => {