重构

src/app/(features)/dictionary/SearchResult.tsx

@@ -1,18 +1,19 @@
 import { Plus, RefreshCw } from "lucide-react";
 import { toast } from "sonner";
 import { authClient } from "@/lib/auth-client";
-import { Folder } from "../../../../generated/prisma/browser";
 import { DictionaryEntry } from "./DictionaryEntry";
 import { useTranslations } from "next-intl";
 import { performDictionaryLookup } from "./utils";
 import { TSharedItem } from "@/shared";
+import { TSharedFolder } from "@/shared/folder-type";
+import { actionCreatePair } from "@/modules/folder";
 
 interface SearchResultProps {
     searchResult: TSharedItem;
     searchQuery: string;
     queryLang: string;
     definitionLang: string;
-    folders: Folder[];
+    folders: TSharedFolder[];
     selectedFolderId: number | null;
     onFolderSelect: (folderId: number | null) => void;
     onResultUpdate: (newResult: TSharedItem) => void;
@@ -66,12 +67,12 @@ export function SearchResult({
         }
 
         const entry = searchResult.entries[0];
-        createPair({
+        actionCreatePair({
             text1: searchResult.standardForm,
             text2: entry.definition,
             language1: queryLang,
             language2: definitionLang,
-            ipa1: isDictWordResponse(searchResult) && (entry as DictWordEntry).ipa ? (entry as DictWordEntry).ipa : undefined,
+            ipa1: entry.ipa,
             folderId: selectedFolderId,
         })
             .then(() => {

src/app/(features)/dictionary/page.tsx

@@ -3,13 +3,15 @@
 import { useState, useEffect } from "react";
 import Container from "@/components/ui/Container";
 import { authClient } from "@/lib/auth-client";
-import { Folder } from "../../../../generated/prisma/browser";
 import { SearchForm } from "./SearchForm";
 import { SearchResult } from "./SearchResult";
 import { useTranslations } from "next-intl";
 import { POPULAR_LANGUAGES } from "./constants";
 import { performDictionaryLookup } from "./utils";
 import { TSharedItem } from "@/shared";
+import { actionGetFoldersByUserId } from "@/modules/folder";
+import { TSharedFolder } from "@/shared/folder-type";
+import { toast } from "sonner";
 
 export default function DictionaryPage() {
     const t = useTranslations("dictionary");
@@ -20,20 +22,24 @@ export default function DictionaryPage() {
     const [queryLang, setQueryLang] = useState("english");
     const [definitionLang, setDefinitionLang] = useState("chinese");
     const [selectedFolderId, setSelectedFolderId] = useState<number | null>(null);
-    const [folders, setFolders] = useState<Folder[]>([]);
+    const [folders, setFolders] = useState<TSharedFolder[]>([]);
     const { data: session } = authClient.useSession();
 
     // 加载用户的文件夹列表
     useEffect(() => {
         if (session) {
-            getFoldersByUserId(session.user.id as string)
+            actionGetFoldersByUserId(session.user.id as string)
+                .then(result => {
+                    if (!result.success || !result.data) throw result.message;
+                    return result.data;
+                })
                 .then((loadedFolders) => {
                     setFolders(loadedFolders);
                     // 如果有文件夹且未选择，默认选择第一个
                     if (loadedFolders.length > 0 && !selectedFolderId) {
                         setSelectedFolderId(loadedFolders[0].id);
                     }
-                });
+                }).catch(e => toast.error);
         }
     }, [session, selectedFolderId]);
 

src/app/(features)/dictionary/utils.ts

@@ -1,14 +1,14 @@
 import { toast } from "sonner";
-import { lookUpDictionaryAction } from "@/modules/dictionary/dictionary-action";
-import { DictionaryActionInputDto, DictionaryActionOutputDto } from "@/modules/dictionary";
+import { actionLookUpDictionary } from "@/modules/dictionary/dictionary-action";
+import { ActionInputLookUpDictionary, ActionOutputLookUpDictionary } from "@/modules/dictionary";
 import { TSharedItem } from "@/shared";
 
 export async function performDictionaryLookup(
-    options: DictionaryActionInputDto,
+    options: ActionInputLookUpDictionary,
     t?: (key: string) => string
 ): Promise<TSharedItem | null> {
     const { text, queryLang, definitionLang, forceRelook = false, userId } = options;
-    const result = await lookUpDictionaryAction({
+    const result = await actionLookUpDictionary({
         text,
         queryLang,
         definitionLang,