chore: organize ts types, fix eslint errors

app/(app)/settings/actions.ts

@@ -8,19 +8,23 @@ import {
   settingsFormSchema,
 } from "@/forms/settings"
 import { userFormSchema } from "@/forms/users"
+import { ActionState } from "@/lib/actions"
 import { getCurrentUser } from "@/lib/auth"
 import { codeFromName, randomHexColor } from "@/lib/utils"
 import { createCategory, deleteCategory, updateCategory } from "@/models/categories"
 import { createCurrency, deleteCurrency, updateCurrency } from "@/models/currencies"
 import { createField, deleteField, updateField } from "@/models/fields"
 import { createProject, deleteProject, updateProject } from "@/models/projects"
-import { updateSettings } from "@/models/settings"
+import { SettingsMap, updateSettings } from "@/models/settings"
 import { updateUser } from "@/models/users"
-import { Prisma } from "@prisma/client"
+import { Prisma, User } from "@prisma/client"
 import { revalidatePath } from "next/cache"
 import { redirect } from "next/navigation"
 
-export async function saveSettingsAction(prevState: any, formData: FormData) {
+export async function saveSettingsAction(
+  _prevState: ActionState<SettingsMap> | null,
+  formData: FormData
+): Promise<ActionState<SettingsMap>> {
   const user = await getCurrentUser()
   const validatedForm = settingsFormSchema.safeParse(Object.fromEntries(formData))
 
@@ -29,7 +33,10 @@ export async function saveSettingsAction(prevState: any, formData: FormData) {
   }
 
   for (const key in validatedForm.data) {
-    await updateSettings(user.id, key, validatedForm.data[key as keyof typeof validatedForm.data])
+    const value = validatedForm.data[key as keyof typeof validatedForm.data]
+    if (value !== undefined) {
+      await updateSettings(user.id, key, value)
+    }
   }
 
   revalidatePath("/settings")
@@ -37,7 +44,10 @@ export async function saveSettingsAction(prevState: any, formData: FormData) {
   // return { success: true }
 }
 
-export async function saveProfileAction(prevState: any, formData: FormData) {
+export async function saveProfileAction(
+  _prevState: ActionState<User> | null,
+  formData: FormData
+): Promise<ActionState<User>> {
   const user = await getCurrentUser()
   const validatedForm = userFormSchema.safeParse(Object.fromEntries(formData))
 

app/(app)/settings/backups/actions.ts

@@ -1,5 +1,6 @@
 "use server"
 
+import { ActionState } from "@/lib/actions"
 import { getCurrentUser } from "@/lib/auth"
 import { prisma } from "@/lib/db"
 import { getUserUploadsDirectory } from "@/lib/files"
@@ -12,7 +13,14 @@ const SUPPORTED_BACKUP_VERSIONS = ["1.0"]
 const REMOVE_EXISTING_DATA = true
 const MAX_BACKUP_SIZE = 256 * 1024 * 1024 // 256MB
 
-export async function restoreBackupAction(prevState: any, formData: FormData) {
+type BackupRestoreResult = {
+  counters: Record<string, number>
+}
+
+export async function restoreBackupAction(
+  _prevState: ActionState<BackupRestoreResult> | null,
+  formData: FormData
+): Promise<ActionState<BackupRestoreResult>> {
   const user = await getCurrentUser()
   const userUploadsDirectory = await getUserUploadsDirectory(user)
   const file = formData.get("file") as File
@@ -32,7 +40,7 @@ export async function restoreBackupAction(prevState: any, formData: FormData) {
     const fileData = Buffer.from(fileBuffer)
     zip = await JSZip.loadAsync(fileData)
   } catch (error) {
-    return { success: false, error: "Bad zip archive" }
+    return { success: false, error: "Bad zip archive: " + (error as Error).message }
   }
 
   // Check metadata and start restoring
@@ -133,7 +141,7 @@ export async function restoreBackupAction(prevState: any, formData: FormData) {
       }
     }
 
-    return { success: true, message: "Restore completed successfully", counters }
+    return { success: true, data: { counters } }
   } catch (error) {
     console.error("Error restoring from backup:", error)
     return {

app/(app)/settings/backups/data/route.ts

@@ -9,7 +9,7 @@ import path from "path"
 const MAX_FILE_SIZE = 64 * 1024 * 1024 // 64MB
 const BACKUP_VERSION = "1.0"
 
-export async function GET(request: Request) {
+export async function GET() {
   const user = await getCurrentUser()
   const userUploadsDirectory = await getUserUploadsDirectory(user)
 
@@ -87,7 +87,7 @@ export async function GET(request: Request) {
 }
 
 async function getAllFilePaths(dirPath: string): Promise<string[]> {
-  let filePaths: string[] = []
+  const filePaths: string[] = []
 
   async function readDirectoryRecursively(currentPath: string) {
     const isDirExists = await fileExists(currentPath)

app/(app)/settings/backups/page.tsx

@@ -62,7 +62,7 @@ export default function BackupSettingsPage() {
           <h2 className="text-xl font-semibold">Backup restored successfully</h2>
           <p className="text-sm text-muted-foreground">You can now continue using the app. Import stats:</p>
           <ul className="list-disc list-inside">
-            {Object.entries(restoreState.counters || {}).map(([key, value]) => (
+            {Object.entries(restoreState.data?.counters || {}).map(([key, value]) => (
               <li key={key}>
                 <span className="font-bold">{key}</span>: {value} items
               </li>

app/(app)/settings/fields/page.tsx

@@ -17,8 +17,9 @@ export default async function FieldsSettingsPage() {
     <div className="container">
       <h1 className="text-2xl font-bold mb-2">Custom Fields</h1>
       <p className="text-sm text-gray-500 mb-6 max-w-prose">
-        You can add new fields to your transactions. Standard fields can't be removed but you can tweak their prompts or
-        hide them. If you don't want a field to be analyzed by AI but filled in by hand, leave the "LLM prompt" empty.
+        You can add new fields to your transactions. Standard fields can&apos;t be removed but you can tweak their
+        prompts or hide them. If you don&apos;t want a field to be analyzed by AI but filled in by hand, leave the
+        &quot;LLM prompt&quot; empty.
       </p>
       <CrudTable
         items={fieldsWithActions}