From f42fdcf74e5c0b8113180a255210ed848e3ec582 Mon Sep 17 00:00:00 2001
From: Vasily Zubarev <me@vas3k.ru>
Date: Fri, 9 May 2025 16:43:03 +0200
Subject: [PATCH] feat: isRequired for fields now respected

---
 app/(app)/settings/actions.ts        |  2 ++
 app/(app)/settings/fields/page.tsx   |  7 ++++
 components/forms/select-category.tsx |  3 ++
 components/forms/select-currency.tsx |  3 ++
 components/forms/select-project.tsx  |  3 ++
 components/forms/select-type.tsx     | 10 +++++-
 components/forms/simple.tsx          | 29 +++++++++++-----
 components/transactions/edit.tsx     | 51 ++++++++++++++++++++++++----
 components/transactions/list.tsx     | 19 ++++++++++-
 forms/settings.ts                    |  1 +
 models/defaults.ts                   |  4 +--
 11 files changed, 114 insertions(+), 18 deletions(-)

diff --git a/app/(app)/settings/actions.ts b/app/(app)/settings/actions.ts
index 730d392..4907e43 100644
--- a/app/(app)/settings/actions.ts
+++ b/app/(app)/settings/actions.ts
@@ -240,6 +240,7 @@ export async function addFieldAction(userId: string, data: Prisma.FieldCreateInp
     llm_prompt: validatedForm.data.llm_prompt,
     isVisibleInList: validatedForm.data.isVisibleInList,
     isVisibleInAnalysis: validatedForm.data.isVisibleInAnalysis,
+    isRequired: validatedForm.data.isRequired,
     isExtra: true,
   })
   revalidatePath("/settings/fields")
@@ -260,6 +261,7 @@ export async function editFieldAction(userId: string, code: string, data: Prisma
     llm_prompt: validatedForm.data.llm_prompt,
     isVisibleInList: validatedForm.data.isVisibleInList,
     isVisibleInAnalysis: validatedForm.data.isVisibleInAnalysis,
+    isRequired: validatedForm.data.isRequired,
   })
   revalidatePath("/settings/fields")
 
diff --git a/app/(app)/settings/fields/page.tsx b/app/(app)/settings/fields/page.tsx
index 70dc27f..9a1e34d 100644
--- a/app/(app)/settings/fields/page.tsx
+++ b/app/(app)/settings/fields/page.tsx
@@ -48,6 +48,13 @@ export default async function FieldsSettingsPage() {
             defaultValue: false,
             editable: true,
           },
+          {
+            key: "isRequired",
+            label: "Is required",
+            type: "checkbox",
+            defaultValue: false,
+            editable: true,
+          },
         ]}
         onDelete={async (code) => {
           "use server"
diff --git a/components/forms/select-category.tsx b/components/forms/select-category.tsx
index 5d48bde..4cfa92f 100644
--- a/components/forms/select-category.tsx
+++ b/components/forms/select-category.tsx
@@ -11,6 +11,7 @@ export const FormSelectCategory = ({
   emptyValue,
   placeholder,
   hideIfEmpty = false,
+  isRequired = false,
   ...props
 }: {
   title: string
@@ -18,6 +19,7 @@ export const FormSelectCategory = ({
   emptyValue?: string
   placeholder?: string
   hideIfEmpty?: boolean
+  isRequired?: boolean
 } & SelectProps) => {
   const items = useMemo(
     () => categories.map((category) => ({ code: category.code, name: category.name, color: category.color })),
@@ -30,6 +32,7 @@ export const FormSelectCategory = ({
       emptyValue={emptyValue}
       placeholder={placeholder}
       hideIfEmpty={hideIfEmpty}
+      isRequired={isRequired}
       {...props}
     />
   )
diff --git a/components/forms/select-currency.tsx b/components/forms/select-currency.tsx
index 715559c..d5a002a 100644
--- a/components/forms/select-currency.tsx
+++ b/components/forms/select-currency.tsx
@@ -8,6 +8,7 @@ export const FormSelectCurrency = ({
   emptyValue,
   placeholder,
   hideIfEmpty = false,
+  isRequired = false,
   ...props
 }: {
   currencies: { code: string; name: string }[]
@@ -15,6 +16,7 @@ export const FormSelectCurrency = ({
   emptyValue?: string
   placeholder?: string
   hideIfEmpty?: boolean
+  isRequired?: boolean
 } & SelectProps) => {
   const items = useMemo(
     () =>
@@ -32,6 +34,7 @@ export const FormSelectCurrency = ({
       emptyValue={emptyValue}
       placeholder={placeholder}
       hideIfEmpty={hideIfEmpty}
+      isRequired={isRequired}
       {...props}
     />
   )
diff --git a/components/forms/select-project.tsx b/components/forms/select-project.tsx
index a74b218..28b737f 100644
--- a/components/forms/select-project.tsx
+++ b/components/forms/select-project.tsx
@@ -8,6 +8,7 @@ export const FormSelectProject = ({
   emptyValue,
   placeholder,
   hideIfEmpty = false,
+  isRequired = false,
   ...props
 }: {
   title: string
@@ -15,6 +16,7 @@ export const FormSelectProject = ({
   emptyValue?: string
   placeholder?: string
   hideIfEmpty?: boolean
+  isRequired?: boolean
 } & SelectProps) => {
   return (
     <FormSelect
@@ -23,6 +25,7 @@ export const FormSelectProject = ({
       emptyValue={emptyValue}
       placeholder={placeholder}
       hideIfEmpty={hideIfEmpty}
+      isRequired={isRequired}
       {...props}
     />
   )
diff --git a/components/forms/select-type.tsx b/components/forms/select-type.tsx
index 7dc01d4..4f725e9 100644
--- a/components/forms/select-type.tsx
+++ b/components/forms/select-type.tsx
@@ -6,8 +6,15 @@ export const FormSelectType = ({
   emptyValue,
   placeholder,
   hideIfEmpty = false,
+  isRequired = false,
   ...props
-}: { title: string; emptyValue?: string; placeholder?: string; hideIfEmpty?: boolean } & SelectProps) => {
+}: {
+  title: string
+  emptyValue?: string
+  placeholder?: string
+  hideIfEmpty?: boolean
+  isRequired?: boolean
+} & SelectProps) => {
   const items = [
     { code: "expense", name: "Expense", badge: "↓" },
     { code: "income", name: "Income", badge: "↑" },
@@ -22,6 +29,7 @@ export const FormSelectType = ({
       emptyValue={emptyValue}
       placeholder={placeholder}
       hideIfEmpty={hideIfEmpty}
+      isRequired={isRequired}
       {...props}
     />
   )
diff --git a/components/forms/simple.tsx b/components/forms/simple.tsx
index 9e2103a..4556e78 100644
--- a/components/forms/simple.tsx
+++ b/components/forms/simple.tsx
@@ -16,17 +16,20 @@ import { InputHTMLAttributes, TextareaHTMLAttributes, useEffect, useRef, useStat
 type FormInputProps = InputHTMLAttributes<HTMLInputElement> & {
   title?: string
   hideIfEmpty?: boolean
+  isRequired?: boolean
 }
 
-export function FormInput({ title, hideIfEmpty = false, ...props }: FormInputProps) {
-  if (hideIfEmpty && (!props.defaultValue || props.defaultValue.toString().trim() === "") && !props.value) {
+export function FormInput({ title, hideIfEmpty = false, isRequired = false, ...props }: FormInputProps) {
+  const isEmpty = (!props.defaultValue || props.defaultValue.toString().trim() === "") && !props.value
+
+  if (hideIfEmpty && isEmpty) {
     return null
   }
 
   return (
     <label className="flex flex-col gap-1">
       {title && <span className="text-sm font-medium">{title}</span>}
-      <Input {...props} className={cn("bg-background", props.className)} />
+      <Input {...props} className={cn("bg-background", isRequired && isEmpty && "bg-yellow-50", props.className)} />
     </label>
   )
 }
@@ -34,10 +37,12 @@ export function FormInput({ title, hideIfEmpty = false, ...props }: FormInputPro
 type FormTextareaProps = TextareaHTMLAttributes<HTMLTextAreaElement> & {
   title?: string
   hideIfEmpty?: boolean
+  isRequired?: boolean
 }
 
-export function FormTextarea({ title, hideIfEmpty = false, ...props }: FormTextareaProps) {
+export function FormTextarea({ title, hideIfEmpty = false, isRequired = false, ...props }: FormTextareaProps) {
   const textareaRef = useRef<HTMLTextAreaElement>(null)
+  const isEmpty = (!props.defaultValue || props.defaultValue.toString().trim() === "") && !props.value
 
   useEffect(() => {
     const textarea = textareaRef.current
@@ -54,14 +59,18 @@ export function FormTextarea({ title, hideIfEmpty = false, ...props }: FormTexta
     return () => textarea.removeEventListener("input", resize)
   }, [props.value, props.defaultValue])
 
-  if (hideIfEmpty && (!props.defaultValue || props.defaultValue.toString().trim() === "") && !props.value) {
+  if (hideIfEmpty && isEmpty) {
     return null
   }
 
   return (
     <label className="flex flex-col gap-1">
       {title && <span className="text-sm font-medium">{title}</span>}
-      <Textarea ref={textareaRef} {...props} className={cn("bg-background", props.className)} />
+      <Textarea
+        ref={textareaRef}
+        {...props}
+        className={cn("bg-background", isRequired && isEmpty && "bg-yellow-50", props.className)}
+      />
     </label>
   )
 }
@@ -72,6 +81,7 @@ export const FormSelect = ({
   emptyValue,
   placeholder,
   hideIfEmpty = false,
+  isRequired = false,
   ...props
 }: {
   items: Array<{ code: string; name: string; color?: string; badge?: string }>
@@ -79,8 +89,11 @@ export const FormSelect = ({
   emptyValue?: string
   placeholder?: string
   hideIfEmpty?: boolean
+  isRequired?: boolean
 } & SelectProps) => {
-  if (hideIfEmpty && (!props.defaultValue || props.defaultValue.toString().trim() === "") && !props.value) {
+  const isEmpty = (!props.defaultValue || props.defaultValue.toString().trim() === "") && !props.value
+
+  if (hideIfEmpty && isEmpty) {
     return null
   }
 
@@ -88,7 +101,7 @@ export const FormSelect = ({
     <span className="flex flex-col gap-1">
       {title && <span className="text-sm font-medium">{title}</span>}
       <Select {...props}>
-        <SelectTrigger className="w-full min-w-[150px] bg-background">
+        <SelectTrigger className={cn("w-full min-w-[150px] bg-background", isRequired && isEmpty && "bg-yellow-50")}>
           <SelectValue placeholder={placeholder} />
         </SelectTrigger>
         <SelectContent>
diff --git a/components/transactions/edit.tsx b/components/transactions/edit.tsx
index 57710d6..8e40d75 100644
--- a/components/transactions/edit.tsx
+++ b/components/transactions/edit.tsx
@@ -85,11 +85,26 @@ export default function TransactionEditForm({
     <form action={saveAction} className="space-y-4">
       <input type="hidden" name="transactionId" value={transaction.id} />
 
-      <FormInput title={fieldMap.name.name} name="name" defaultValue={formData.name} />
+      <FormInput
+        title={fieldMap.name.name}
+        name="name"
+        defaultValue={formData.name}
+        isRequired={fieldMap.name.isRequired}
+      />
 
-      <FormInput title={fieldMap.merchant.name} name="merchant" defaultValue={formData.merchant} />
+      <FormInput
+        title={fieldMap.merchant.name}
+        name="merchant"
+        defaultValue={formData.merchant}
+        isRequired={fieldMap.merchant.isRequired}
+      />
 
-      <FormInput title={fieldMap.description.name} name="description" defaultValue={formData.description} />
+      <FormInput
+        title={fieldMap.description.name}
+        name="description"
+        defaultValue={formData.description}
+        isRequired={fieldMap.description.isRequired}
+      />
 
       <div className="flex flex-row gap-4">
         <FormInput
@@ -99,6 +114,7 @@ export default function TransactionEditForm({
           name="total"
           defaultValue={formData.total.toFixed(2)}
           className="w-32"
+          isRequired={fieldMap.total.isRequired}
         />
 
         <FormSelectCurrency
@@ -109,9 +125,15 @@ export default function TransactionEditForm({
             setFormData({ ...formData, currencyCode: value })
           }}
           currencies={currencies}
+          isRequired={fieldMap.currencyCode.isRequired}
         />
 
-        <FormSelectType title={fieldMap.type.name} name="type" defaultValue={formData.type} />
+        <FormSelectType
+          title={fieldMap.type.name}
+          name="type"
+          defaultValue={formData.type}
+          isRequired={fieldMap.type.isRequired}
+        />
       </div>
 
       {formData.currencyCode !== settings.default_currency || formData.convertedTotal !== 0 ? (
@@ -122,6 +144,7 @@ export default function TransactionEditForm({
             step="0.01"
             name="convertedTotal"
             defaultValue={formData.convertedTotal.toFixed(2)}
+            isRequired={fieldMap.convertedTotal.isRequired}
           />
           {(!formData.convertedCurrencyCode || formData.convertedCurrencyCode !== settings.default_currency) && (
             <FormSelectCurrency
@@ -129,6 +152,7 @@ export default function TransactionEditForm({
               name="convertedCurrencyCode"
               defaultValue={formData.convertedCurrencyCode || settings.default_currency}
               currencies={currencies}
+              isRequired={fieldMap.convertedCurrencyCode.isRequired}
             />
           )}
         </div>
@@ -137,7 +161,13 @@ export default function TransactionEditForm({
       )}
 
       <div className="flex flex-row flex-grow gap-4">
-        <FormInput title={fieldMap.issuedAt.name} type="date" name="issuedAt" defaultValue={formData.issuedAt} />
+        <FormInput
+          title={fieldMap.issuedAt.name}
+          type="date"
+          name="issuedAt"
+          defaultValue={formData.issuedAt}
+          isRequired={fieldMap.issuedAt.isRequired}
+        />
       </div>
 
       <div className="flex flex-row gap-4">
@@ -146,6 +176,7 @@ export default function TransactionEditForm({
           categories={categories}
           name="categoryCode"
           defaultValue={formData.categoryCode}
+          isRequired={fieldMap.categoryCode.isRequired}
         />
 
         <FormSelectProject
@@ -153,10 +184,17 @@ export default function TransactionEditForm({
           projects={projects}
           name="projectCode"
           defaultValue={formData.projectCode}
+          isRequired={fieldMap.projectCode.isRequired}
         />
       </div>
 
-      <FormTextarea title={fieldMap.note.name} name="note" defaultValue={formData.note} className="h-24" />
+      <FormTextarea
+        title={fieldMap.note.name}
+        name="note"
+        defaultValue={formData.note}
+        className="h-24"
+        isRequired={fieldMap.note.isRequired}
+      />
       {extraFields.map((field) => (
         <FormInput
           key={field.code}
@@ -164,6 +202,7 @@ export default function TransactionEditForm({
           title={field.name}
           name={field.code}
           defaultValue={formData[field.code as keyof typeof formData] || ""}
+          isRequired={field.isRequired}
         />
       ))}
 
diff --git a/components/transactions/list.tsx b/components/transactions/list.tsx
index da29495..f558271 100644
--- a/components/transactions/list.tsx
+++ b/components/transactions/list.tsx
@@ -230,6 +230,19 @@ export function TransactionList({ transactions, fields = [] }: { transactions: T
     ) : null
   }
 
+  // Function to check if a transaction is incomplete
+  const isTransactionIncomplete = (transaction: Transaction): boolean => {
+    const requiredFields = fields.filter((field) => field.isRequired)
+
+    return requiredFields.some((field) => {
+      const value = field.isExtra
+        ? (transaction.extra as Record<string, any>)?.[field.code]
+        : transaction[field.code as keyof Transaction]
+
+      return value === undefined || value === null || value === "" || value === 0
+    })
+  }
+
   return (
     <div className="rounded-md border">
       <Table>
@@ -257,7 +270,11 @@ export function TransactionList({ transactions, fields = [] }: { transactions: T
           {transactions.map((transaction) => (
             <TableRow
               key={transaction.id}
-              className={cn(selectedIds.includes(transaction.id) && "bg-muted", "cursor-pointer hover:bg-muted/50")}
+              className={cn(
+                isTransactionIncomplete(transaction) && "bg-yellow-50",
+                selectedIds.includes(transaction.id) && "bg-muted",
+                "cursor-pointer hover:bg-muted/50"
+              )}
               onClick={() => handleRowClick(transaction.id)}
             >
               <TableCell onClick={(e) => e.stopPropagation()}>
diff --git a/forms/settings.ts b/forms/settings.ts
index 8f1e515..ae3e305 100644
--- a/forms/settings.ts
+++ b/forms/settings.ts
@@ -34,4 +34,5 @@ export const fieldFormSchema = z.object({
   llm_prompt: z.string().max(512).nullable().optional(),
   isVisibleInList: z.boolean().optional(),
   isVisibleInAnalysis: z.boolean().optional(),
+  isRequired: z.boolean().optional(),
 })
diff --git a/models/defaults.ts b/models/defaults.ts
index 3357c67..5470f13 100644
--- a/models/defaults.ts
+++ b/models/defaults.ts
@@ -317,7 +317,7 @@ export const DEFAULT_FIELDS = [
     llm_prompt: "issued at date (YYYY-MM-DD format)",
     isVisibleInList: true,
     isVisibleInAnalysis: true,
-    isRequired: false,
+    isRequired: true,
     isExtra: false,
   },
   {
@@ -357,7 +357,7 @@ export const DEFAULT_FIELDS = [
     llm_prompt: "total total of the transaction",
     isVisibleInList: true,
     isVisibleInAnalysis: true,
-    isRequired: false,
+    isRequired: true,
     isExtra: false,
   },
   {