Merge remote-tracking branch 'origin/sec-patch' into table-v2

1 files changed, 62 insertions, 3 deletions

diff --git a/lib/items-tech/table/add-items-dialog.tsx b/lib/items-tech/table/add-items-dialog.tsx
index 01a072da..a4c644b6 100644
--- a/lib/items-tech/table/add-items-dialog.tsx
+++ b/lib/items-tech/table/add-items-dialog.tsx
@@ -34,7 +34,7 @@ import {
 } from "@/components/ui/select"

 import { toast } from "sonner"

 

-import { createShipbuildingItem, createOffshoreTopItem, createOffshoreHullItem } from "../service"

+import { createShipbuildingItem, createOffshoreTopItem, createOffshoreHullItem, getShipTypes } from "../service"

 import { ItemType } from "./delete-items-dialog"

 

 // 조선 공종 유형 정의

@@ -88,6 +88,8 @@ export function AddItemDialog({ itemType }: AddItemDialogProps) {
   const router = useRouter()

   const [open, setOpen] = React.useState(false)

   const [isAddPending, startAddTransition] = React.useTransition()

+  const [shipTypeOptions, setShipTypeOptions] = React.useState<string[]>([])

+  const [isShipTypeLoading, setIsShipTypeLoading] = React.useState(false)

 

   // 기본값 설정

   const getDefaultValues = () => {

@@ -97,7 +99,7 @@ export function AddItemDialog({ itemType }: AddItemDialogProps) {
     }

 

     if (itemType === 'shipbuilding') {

-      defaults.shipTypes = "OPTION"

+      defaults.shipTypes = ""

     } else {

       defaults.itemList = ""

       defaults.subItemList = ""

@@ -124,6 +126,42 @@ export function AddItemDialog({ itemType }: AddItemDialogProps) {
     defaultValues: getDefaultValues(),

   })

 

+  // shipTypes 목록 로드 (조선 아이템 생성 시)

+  React.useEffect(() => {

+    if (itemType !== 'shipbuilding' || !open) return

+

+    let isMounted = true

+    const loadShipTypes = async () => {

+      try {

+        setIsShipTypeLoading(true)

+        const { data, error } = await getShipTypes()

+        if (!isMounted) return

+        if (error) {

+          toast.error("선종 목록을 불러오지 못했습니다")

+          return

+        }

+        const options = (data || []).filter((v): v is string => Boolean(v))

+        setShipTypeOptions(options)

+        // 기본값 자동 설정

+        if (options.length > 0 && !form.getValues("shipTypes")) {

+          form.setValue("shipTypes", options[0])

+        }

+      } catch (err) {

+        console.error("shipTypes load error:", err)

+        if (isMounted) {

+          toast.error("선종 목록 로드 중 오류가 발생했습니다")

+        }

+      } finally {

+        if (isMounted) setIsShipTypeLoading(false)

+      }

+    }

+

+    loadShipTypes()

+    return () => {

+      isMounted = false

+    }

+  }, [itemType, open, form])

+

   const onSubmit = async (data: ItemFormValues) => {

     startAddTransition(async () => {

       try {

@@ -276,7 +314,28 @@ export function AddItemDialog({ itemType }: AddItemDialogProps) {
                     <FormItem>

                       <FormLabel>선종 <span style={{ color: 'red' }}>*</span></FormLabel>

                       <FormControl>

-                        <Input placeholder="선종을 입력하세요" {...field} />

+                        <Select

+                          onValueChange={field.onChange}

+                          value={field.value ?? ""}

+                          disabled={isShipTypeLoading || shipTypeOptions.length === 0}

+                        >

+                          <SelectTrigger>

+                            <SelectValue placeholder={isShipTypeLoading ? "불러오는 중..." : "선종을 선택하세요"} />

+                          </SelectTrigger>

+                          <SelectContent>

+                            {shipTypeOptions.length === 0 ? (

+                              <div className="px-3 py-2 text-sm text-muted-foreground">

+                                {isShipTypeLoading ? "불러오는 중..." : "선종 없음"}

+                              </div>

+                            ) : (

+                              shipTypeOptions.map((type) => (

+                                <SelectItem key={type} value={type}>

+                                  {type}

+                                </SelectItem>

+                              ))

+                            )}

+                          </SelectContent>

+                        </Select>

                       </FormControl>

                       <FormMessage />

                     </FormItem>