1 files changed, 23 insertions, 95 deletions

diff --git a/apps/web/lib/hooks/useBookmarkImport.ts b/apps/web/lib/hooks/useBookmarkImport.ts
index 0d9bbaaf..35c04c1b 100644
--- a/apps/web/lib/hooks/useBookmarkImport.ts
+++ b/apps/web/lib/hooks/useBookmarkImport.ts
@@ -1,29 +1,17 @@
 "use client";
 
 import { useState } from "react";
-import { toast } from "@/components/ui/use-toast";
+import { toast } from "@/components/ui/sonner";
 import { useTranslation } from "@/lib/i18n/client";
-import { useMutation } from "@tanstack/react-query";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
 
-import {
-  useCreateBookmarkWithPostHook,
-  useUpdateBookmarkTags,
-} from "@karakeep/shared-react/hooks/bookmarks";
-import {
-  useAddBookmarkToList,
-  useCreateBookmarkList,
-} from "@karakeep/shared-react/hooks/lists";
-import { api } from "@karakeep/shared-react/trpc";
+import { useCreateBookmarkList } from "@karakeep/shared-react/hooks/lists";
+import { useTRPC } from "@karakeep/shared-react/trpc";
 import {
   importBookmarksFromFile,
   ImportSource,
-  ParsedBookmark,
   parseImportFile,
 } from "@karakeep/shared/import-export";
-import {
-  BookmarkTypes,
-  MAX_BOOKMARK_TITLE_LENGTH,
-} from "@karakeep/shared/types/bookmarks";
 
 import { useCreateImportSession } from "./useImportSessions";
 
@@ -34,18 +22,22 @@ export interface ImportProgress {
 
 export function useBookmarkImport() {
   const { t } = useTranslation();
+  const api = useTRPC();
 
   const [importProgress, setImportProgress] = useState<ImportProgress | null>(
     null,
   );
   const [quotaError, setQuotaError] = useState<string | null>(null);
 
-  const apiUtils = api.useUtils();
+  const queryClient = useQueryClient();
   const { mutateAsync: createImportSession } = useCreateImportSession();
-  const { mutateAsync: createBookmark } = useCreateBookmarkWithPostHook();
   const { mutateAsync: createList } = useCreateBookmarkList();
-  const { mutateAsync: addToList } = useAddBookmarkToList();
-  const { mutateAsync: updateTags } = useUpdateBookmarkTags();
+  const { mutateAsync: stageImportedBookmarks } = useMutation(
+    api.importSessions.stageImportedBookmarks.mutationOptions(),
+  );
+  const { mutateAsync: finalizeImportStaging } = useMutation(
+    api.importSessions.finalizeImportStaging.mutationOptions(),
+  );
 
   const uploadBookmarkFileMutation = useMutation({
     mutationFn: async ({
@@ -65,8 +57,9 @@ export function useBookmarkImport() {
 
       // Check quota before proceeding
       if (bookmarkCount > 0) {
-        const quotaUsage =
-          await apiUtils.client.subscriptions.getQuotaUsage.query();
+        const quotaUsage = await queryClient.fetchQuery(
+          api.subscriptions.getQuotaUsage.queryOptions(),
+        );
 
         if (
           !quotaUsage.bookmarks.unlimited &&
@@ -84,7 +77,6 @@ export function useBookmarkImport() {
       }
 
       // Proceed with import if quota check passes
-      // Use a custom parser to avoid re-parsing the file
       const result = await importBookmarksFromFile(
         {
           file,
@@ -93,65 +85,9 @@ export function useBookmarkImport() {
           deps: {
             createImportSession,
             createList,
-            createBookmark: async (
-              bookmark: ParsedBookmark,
-              sessionId: string,
-            ) => {
-              if (bookmark.content === undefined) {
-                throw new Error("Content is undefined");
-              }
-              const created = await createBookmark({
-                crawlPriority: "low",
-                title: bookmark.title.substring(0, MAX_BOOKMARK_TITLE_LENGTH),
-                createdAt: bookmark.addDate
-                  ? new Date(bookmark.addDate * 1000)
-                  : undefined,
-                note: bookmark.notes,
-                archived: bookmark.archived,
-                importSessionId: sessionId,
-                source: "import",
-                ...(bookmark.content.type === BookmarkTypes.LINK
-                  ? {
-                      type: BookmarkTypes.LINK,
-                      url: bookmark.content.url,
-                    }
-                  : {
-                      type: BookmarkTypes.TEXT,
-                      text: bookmark.content.text,
-                    }),
-              });
-              return created as { id: string; alreadyExists?: boolean };
-            },
-            addBookmarkToLists: async ({
-              bookmarkId,
-              listIds,
-            }: {
-              bookmarkId: string;
-              listIds: string[];
-            }) => {
-              await Promise.all(
-                listIds.map((listId) =>
-                  addToList({
-                    bookmarkId,
-                    listId,
-                  }),
-                ),
-              );
-            },
-            updateBookmarkTags: async ({
-              bookmarkId,
-              tags,
-            }: {
-              bookmarkId: string;
-              tags: string[];
-            }) => {
-              if (tags.length > 0) {
-                await updateTags({
-                  bookmarkId,
-                  attach: tags.map((t) => ({ tagName: t })),
-                  detach: [],
-                });
-              }
+            stageImportedBookmarks,
+            finalizeImportStaging: async (sessionId: string) => {
+              await finalizeImportStaging({ importSessionId: sessionId });
             },
           },
           onProgress: (done, total) => setImportProgress({ done, total }),
@@ -172,19 +108,11 @@ export function useBookmarkImport() {
         toast({ description: "No bookmarks found in the file." });
         return;
       }
-      const { successes, failures, alreadyExisted } = result.counts;
-      if (successes > 0 || alreadyExisted > 0) {
-        toast({
-          description: `Imported ${successes} bookmarks into import session. Background processing will start automatically.`,
-          variant: "default",
-        });
-      }
-      if (failures > 0) {
-        toast({
-          description: `Failed to import ${failures} bookmarks. Check console for details.`,
-          variant: "destructive",
-        });
-      }
+
+      toast({
+        description: `Staged ${result.counts.total} bookmarks for import. Background processing will start automatically.`,
+        variant: "default",
+      });
     },
     onError: (error) => {
       setImportProgress(null);