From 572ffe81cfd8a64f828a604f86e9453f33747e30 Mon Sep 17 00:00:00 2001 From: kent Date: Thu, 8 Jan 2026 17:29:06 +0900 Subject: [PATCH 01/45] =?UTF-8?q?feat(orders):=20Phase=202=20-=20Frontend?= =?UTF-8?q?=20API=20=EC=97=B0=EB=8F=99=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - actions.ts 생성: Server Actions 패턴으로 Order API 클라이언트 구현 - getOrders, getOrderById, createOrder, updateOrder, deleteOrder(s) - updateOrderStatus, getOrderStats - API snake_case → Frontend camelCase 변환 - 상태 매핑 (DRAFT→order_registered 등) - 목록 페이지(page.tsx): - SAMPLE_ORDERS 제거, API 연동 state 추가 - loadData() 함수로 API 호출 - 삭제/일괄삭제 API 연동 - 상세 페이지([id]/page.tsx): - SAMPLE_ITEMS/ORDERS 제거 - getOrderById, updateOrderStatus API 연동 - 수정 페이지([id]/edit/page.tsx): - SAMPLE_ORDER 제거 - getOrderById, updateOrder API 연동 - 등록 페이지(new/page.tsx): - createOrder API 연동 --- ...20250108_order_frontend_api_integration.md | 92 +++ .../order-management-sales/[id]/edit/page.tsx | 178 ++--- .../order-management-sales/[id]/page.tsx | 318 ++------- .../sales/order-management-sales/new/page.tsx | 22 +- .../sales/order-management-sales/page.tsx | 302 ++++----- src/components/orders/actions.ts | 630 ++++++++++++++++++ src/components/orders/index.ts | 21 +- 7 files changed, 1026 insertions(+), 537 deletions(-) create mode 100644 claudedocs/changes/20250108_order_frontend_api_integration.md create mode 100644 src/components/orders/actions.ts diff --git a/claudedocs/changes/20250108_order_frontend_api_integration.md b/claudedocs/changes/20250108_order_frontend_api_integration.md new file mode 100644 index 00000000..fabe8c51 --- /dev/null +++ b/claudedocs/changes/20250108_order_frontend_api_integration.md @@ -0,0 +1,92 @@ +# 수주 관리 Frontend API 연동 + +**날짜:** 2025-01-08 +**Phase:** Phase 2 - Frontend 연동 +**관련 Plan:** docs/plans/order-management-plan.md + +## 변경 개요 + +수주 관리 React 페이지들을 백엔드 API와 연동 완료. Mock 데이터를 제거하고 실제 API 호출로 대체. + +## 수정된 파일 + +### 1. `src/components/orders/actions.ts` (신규 생성) +- Server Actions 패턴으로 API 클라이언트 구현 +- 주요 함수: + - `getOrders()`: 수주 목록 조회 + - `getOrderById(id)`: 수주 상세 조회 + - `createOrder(data)`: 수주 등록 + - `updateOrder(id, data)`: 수주 수정 + - `deleteOrder(id)`: 수주 삭제 + - `deleteOrders(ids)`: 수주 일괄 삭제 + - `updateOrderStatus(id, status)`: 수주 상태 변경 + - `getOrderStats()`: 통계 조회 +- 데이터 변환: API snake_case → Frontend camelCase +- 상태 매핑: API 상태(DRAFT, CONFIRMED 등) → Frontend 상태(order_registered, order_confirmed 등) + +### 2. `src/components/orders/index.ts` (수정) +- actions.ts export 추가 +- 타입 충돌 해결 (OrderItem → OrderItemApi) + +### 3. `src/app/[locale]/(protected)/sales/order-management-sales/page.tsx` (수정) +- SAMPLE_ORDERS (~115줄) 제거 +- API 연동 state 추가: `orders`, `apiStats`, `isLoading`, `isDeleting` +- `loadData()` 함수로 API 호출 (getOrders, getOrderStats) +- 삭제 핸들러에 API 호출 추가 (deleteOrder, deleteOrders) +- 로딩 UI 추가 + +### 4. `src/app/[locale]/(protected)/sales/order-management-sales/[id]/page.tsx` (수정) +- SAMPLE_ITEMS, SAMPLE_ORDERS (~250줄) 제거 +- useEffect에서 getOrderById API 호출 +- handleConfirmCancel에서 updateOrderStatus API 호출 +- isCancelling 로딩 상태 적용 + +### 5. `src/app/[locale]/(protected)/sales/order-management-sales/[id]/edit/page.tsx` (수정) +- SAMPLE_ORDER (~50줄) 제거 +- useEffect에서 getOrderById API 호출 +- handleSave에서 updateOrder API 호출 + +### 6. `src/app/[locale]/(protected)/sales/order-management-sales/new/page.tsx` (수정) +- handleSave에서 createOrder API 호출 + +## 기술 패턴 + +### Server Actions 패턴 +```typescript +"use server"; +import { serverFetch } from "@/lib/api/serverFetch"; + +export async function getOrders() { + const response = await serverFetch("/orders"); + // 데이터 변환 로직 +} +``` + +### 데이터 변환 +- API: `order_no`, `client_name`, `site_name` +- Frontend: `orderNo`, `clientName`, `siteName` + +### 상태 매핑 +| API | Frontend | +|-----|----------| +| DRAFT | order_registered | +| CONFIRMED | order_confirmed | +| IN_PROGRESS | production_ordered | +| COMPLETED | shipped | +| CANCELLED | cancelled | + +## 테스트 체크리스트 + +- [ ] 수주 목록 로드 +- [ ] 수주 상세 조회 +- [ ] 수주 등록 (견적 선택 후) +- [ ] 수주 수정 +- [ ] 수주 개별 삭제 +- [ ] 수주 일괄 삭제 +- [ ] 수주 취소 +- [ ] 통계 카드 표시 + +## 연관 작업 + +- Phase 1: Order API 백엔드 구현 (커밋: de19ac9) +- Phase 1.1: OrderController/Service 구현 (진행 중) diff --git a/src/app/[locale]/(protected)/sales/order-management-sales/[id]/edit/page.tsx b/src/app/[locale]/(protected)/sales/order-management-sales/[id]/edit/page.tsx index 765e89e1..13f67c87 100644 --- a/src/app/[locale]/(protected)/sales/order-management-sales/[id]/edit/page.tsx +++ b/src/app/[locale]/(protected)/sales/order-management-sales/[id]/edit/page.tsx @@ -13,7 +13,6 @@ import { useState, useEffect } from "react"; import { useRouter, useParams } from "next/navigation"; import { Input } from "@/components/ui/input"; import { Textarea } from "@/components/ui/textarea"; -import { Button } from "@/components/ui/button"; import { Checkbox } from "@/components/ui/checkbox"; import { Label } from "@/components/ui/label"; import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; @@ -32,26 +31,19 @@ import { TableHeader, TableRow, } from "@/components/ui/table"; -import { FileText, ArrowLeft, Info, AlertTriangle } from "lucide-react"; +import { FileText, AlertTriangle } from "lucide-react"; import { toast } from "sonner"; import { PageLayout } from "@/components/organisms/PageLayout"; import { PageHeader } from "@/components/organisms/PageHeader"; -import { FormSection } from "@/components/templates/ResponsiveFormTemplate"; import { FormActions } from "@/components/organisms/FormActions"; import { BadgeSm } from "@/components/atoms/BadgeSm"; import { formatAmount } from "@/utils/formatAmount"; -import { OrderItem } from "@/components/orders"; - -// 수주 상태 타입 -type OrderStatus = - | "order_registered" - | "order_confirmed" - | "production_ordered" - | "in_production" - | "rework" - | "work_completed" - | "shipped" - | "cancelled"; +import { + OrderItem, + getOrderById, + updateOrder, + type OrderStatus, +} from "@/components/orders"; // 수정 폼 데이터 interface EditFormData { @@ -99,60 +91,6 @@ const SHIPPING_COSTS = [ { value: "negotiable", label: "협의" }, ]; -// 샘플 데이터 -const SAMPLE_ORDER: EditFormData = { - lotNumber: "KD-TS-251217-01", - quoteNumber: "KD-PR-251210-01", - client: "태영건설(주)", - siteName: "데시앙 동탄 파크뷰", - manager: "김철수", - contact: "010-1234-5678", - status: "order_confirmed", - expectedShipDate: "2025-01-15", - expectedShipDateUndecided: false, - deliveryRequestDate: "2025-01-20", - deliveryMethod: "direct", - shippingCost: "free", - receiver: "박반장", - receiverContact: "010-9876-5432", - address: "경기도 화성시 동탄대로 123-45", - addressDetail: "데시앙 동탄 파크뷰 현장", - remarks: "4층 우선 납품 요청", - items: [ - { - id: "1", - itemCode: "PRD-001", - itemName: "국민방화스크린세터", - type: "B1", - symbol: "FSS1", - spec: "7260×2600", - width: 7260, - height: 2600, - quantity: 2, - unit: "EA", - unitPrice: 8000000, - amount: 16000000, - }, - { - id: "2", - itemCode: "PRD-002", - itemName: "국민방화스크린세터", - type: "B1", - symbol: "FSS2", - spec: "5000×2400", - width: 5000, - height: 2400, - quantity: 3, - unit: "EA", - unitPrice: 7600000, - amount: 22800000, - }, - ], - canEditItems: true, - subtotal: 38800000, - discountRate: 0, - totalAmount: 38800000, -}; // 상태 뱃지 헬퍼 function getOrderStatusBadge(status: OrderStatus) { @@ -183,21 +121,57 @@ export default function OrderEditPage() { const [loading, setLoading] = useState(true); const [isSaving, setIsSaving] = useState(false); - // 데이터 로드 + // 데이터 로드 (API) useEffect(() => { - setTimeout(() => { - // 상태에 따라 품목 수정 가능 여부 결정 - const canEditItems = !["in_production", "rework", "work_completed", "shipped"].includes( - SAMPLE_ORDER.status - ); - setForm({ ...SAMPLE_ORDER, canEditItems }); - setLoading(false); - }, 300); - }, [orderId]); - - const handleBack = () => { - router.push(`/sales/order-management-sales/${orderId}`); - }; + async function loadOrder() { + try { + setLoading(true); + const result = await getOrderById(orderId); + if (result.success && result.data) { + const order = result.data; + // 상태에 따라 품목 수정 가능 여부 결정 + const canEditItems = !["in_production", "rework", "work_completed", "shipped"].includes( + order.status + ); + // Order 데이터를 EditFormData로 변환 + setForm({ + lotNumber: order.lotNumber, + quoteNumber: order.quoteNumber || "", + client: order.client, + siteName: order.siteName, + manager: order.manager || "", + contact: order.contact || "", + status: order.status, + expectedShipDate: order.expectedShipDate || "", + expectedShipDateUndecided: !order.expectedShipDate, + deliveryRequestDate: order.deliveryRequestDate || "", + deliveryMethod: order.deliveryMethod || "", + shippingCost: order.shippingCost || "", + receiver: order.receiver || "", + receiverContact: order.receiverContact || "", + address: order.address || "", + addressDetail: order.addressDetail || "", + remarks: order.remarks || "", + items: order.items || [], + canEditItems, + subtotal: order.subtotal || order.amount, + discountRate: order.discountRate || 0, + totalAmount: order.amount, + }); + } else { + toast.error(result.error || "수주 정보를 불러오는데 실패했습니다."); + router.push("/sales/order-management-sales"); + } + } catch (error) { + console.error("Error loading order:", error); + toast.error("수주 정보를 불러오는 중 오류가 발생했습니다."); + router.push("/sales/order-management-sales"); + } finally { + setLoading(false); + } + } + loadOrder(); + }, [orderId, router]); const handleCancel = () => { router.push(`/sales/order-management-sales/${orderId}`); @@ -222,11 +196,39 @@ export default function OrderEditPage() { setIsSaving(true); try { - // TODO: API 연동 - console.log("수주 수정 데이터:", form); - await new Promise((resolve) => setTimeout(resolve, 500)); - toast.success("수주가 수정되었습니다."); - router.push(`/sales/order-management-sales/${orderId}`); + // API 연동 + const result = await updateOrder(orderId, { + clientId: undefined, // 기존 값 유지 + siteName: form.siteName, + expectedShipDate: form.expectedShipDateUndecided ? undefined : form.expectedShipDate, + deliveryRequestDate: form.deliveryRequestDate, + deliveryMethod: form.deliveryMethod, + shippingCost: form.shippingCost, + receiver: form.receiver, + receiverContact: form.receiverContact, + address: form.address, + addressDetail: form.addressDetail, + remarks: form.remarks, + items: form.items.map((item) => ({ + itemId: item.id ? parseInt(item.id, 10) : undefined, + itemCode: item.itemCode, + itemName: item.itemName, + specification: item.spec, + quantity: item.quantity, + unit: item.unit, + unitPrice: item.unitPrice, + })), + }); + + if (result.success) { + toast.success("수주가 수정되었습니다."); + router.push(`/sales/order-management-sales/${orderId}`); + } else { + toast.error(result.error || "수주 수정에 실패했습니다."); + } + } catch (error) { + console.error("Error updating order:", error); + toast.error("수주 수정 중 오류가 발생했습니다."); } finally { setIsSaving(false); } diff --git a/src/app/[locale]/(protected)/sales/order-management-sales/[id]/page.tsx b/src/app/[locale]/(protected)/sales/order-management-sales/[id]/page.tsx index c48b0b14..41162cf5 100644 --- a/src/app/[locale]/(protected)/sales/order-management-sales/[id]/page.tsx +++ b/src/app/[locale]/(protected)/sales/order-management-sales/[id]/page.tsx @@ -54,266 +54,14 @@ import { } from "@/components/ui/select"; import { Textarea } from "@/components/ui/textarea"; import { - OrderItem, OrderDocumentModal, type OrderDocumentType, + getOrderById, + updateOrderStatus, + type Order, + type OrderStatus, } from "@/components/orders"; -// 수주 상태 타입 -type OrderStatus = - | "order_registered" - | "order_confirmed" - | "production_ordered" - | "in_production" - | "rework" - | "work_completed" - | "shipped" - | "cancelled"; - -// 수주 상세 데이터 타입 -interface OrderDetail { - id: string; - lotNumber: string; - quoteNumber: string; - orderDate: string; - status: OrderStatus; - client: string; - siteName: string; - manager: string; - contact: string; - expectedShipDate: string; - deliveryRequestDate: string; - deliveryMethod: string; - shippingCost: string; - receiver: string; - receiverContact: string; - address: string; - remarks: string; - items: OrderItem[]; - subtotal: number; - discountRate: number; - totalAmount: number; -} - -// 샘플 품목 데이터 -const SAMPLE_ITEMS: OrderItem[] = [ - { - id: "1", - itemCode: "PRD-001", - itemName: "국민방화스크린세터", - type: "B1", - symbol: "FSS1", - spec: "7260×2600", - width: 7260, - height: 2600, - quantity: 2, - unit: "EA", - unitPrice: 8000000, - amount: 16000000, - }, - { - id: "2", - itemCode: "PRD-002", - itemName: "국민방화스크린세터", - type: "B1", - symbol: "FSS2", - spec: "5000×2400", - width: 5000, - height: 2400, - quantity: 3, - unit: "EA", - unitPrice: 7600000, - amount: 22800000, - }, -]; - -// 샘플 수주 데이터 (리스트 페이지와 동기화) -const SAMPLE_ORDERS: Record = { - "ORD-001": { - id: "ORD-001", - lotNumber: "KD-TS-251217-01", - quoteNumber: "KD-PR-251210-01", - orderDate: "2024-12-17", - status: "order_confirmed", - client: "태영건설(주)", - siteName: "데시앙 동탄 파크뷰", - manager: "김철수", - contact: "010-1234-5678", - expectedShipDate: "2025-01-15", - deliveryRequestDate: "2025-01-20", - deliveryMethod: "직접배차", - shippingCost: "무료", - receiver: "박반장", - receiverContact: "010-9876-5432", - address: "경기도 화성시 동탄대로 123-45 데시앙 동탄 파크뷰 현장", - remarks: "4층 우선 납품 요청", - items: SAMPLE_ITEMS, - subtotal: 38800000, - discountRate: 0, - totalAmount: 38800000, - }, - "ORD-002": { - id: "ORD-002", - lotNumber: "KD-TS-251217-02", - quoteNumber: "KD-PR-251211-02", - orderDate: "2024-12-17", - status: "in_production", - client: "현대건설(주)", - siteName: "힐스테이트 판교역", - manager: "이영희", - contact: "010-2345-6789", - expectedShipDate: "2025-01-20", - deliveryRequestDate: "2025-01-25", - deliveryMethod: "상차", - shippingCost: "선불", - receiver: "김반장", - receiverContact: "010-8765-4321", - address: "경기도 성남시 분당구 판교역로 123", - remarks: "지하 1층 납품", - items: SAMPLE_ITEMS, - subtotal: 52500000, - discountRate: 0, - totalAmount: 52500000, - }, - "ORD-003": { - id: "ORD-003", - lotNumber: "KD-TS-251216-01", - quoteNumber: "KD-PR-251208-03", - orderDate: "2024-12-16", - status: "production_ordered", - client: "GS건설(주)", - siteName: "자이 강남센터", - manager: "박민수", - contact: "010-3456-7890", - expectedShipDate: "2025-01-10", - deliveryRequestDate: "2025-01-15", - deliveryMethod: "직접배차", - shippingCost: "무료", - receiver: "최반장", - receiverContact: "010-7654-3210", - address: "서울시 강남구 테헤란로 234", - remarks: "", - items: SAMPLE_ITEMS, - subtotal: 45000000, - discountRate: 0, - totalAmount: 45000000, - }, - "ORD-004": { - id: "ORD-004", - lotNumber: "KD-TS-251215-01", - quoteNumber: "KD-PR-251205-04", - orderDate: "2024-12-15", - status: "shipped", - client: "대우건설(주)", - siteName: "푸르지오 송도", - manager: "정수진", - contact: "010-4567-8901", - expectedShipDate: "2024-12-20", - deliveryRequestDate: "2024-12-22", - deliveryMethod: "상차", - shippingCost: "착불", - receiver: "오반장", - receiverContact: "010-6543-2109", - address: "인천시 연수구 송도동 456", - remarks: "출하 완료", - items: SAMPLE_ITEMS, - subtotal: 28900000, - discountRate: 0, - totalAmount: 28900000, - }, - "ORD-005": { - id: "ORD-005", - lotNumber: "KD-TS-251214-01", - quoteNumber: "KD-PR-251201-05", - orderDate: "2024-12-14", - status: "rework", - client: "포스코건설", - siteName: "더샵 분당센트럴", - manager: "강호동", - contact: "010-5678-9012", - expectedShipDate: "2025-01-25", - deliveryRequestDate: "2025-01-30", - deliveryMethod: "직접배차", - shippingCost: "무료", - receiver: "유반장", - receiverContact: "010-5432-1098", - address: "경기도 성남시 분당구 정자동 789", - remarks: "재작업 진행 중", - items: SAMPLE_ITEMS, - subtotal: 62000000, - discountRate: 0, - totalAmount: 62000000, - }, - "ORD-006": { - id: "ORD-006", - lotNumber: "KD-TS-251213-01", - quoteNumber: "KD-PR-251128-06", - orderDate: "2024-12-13", - status: "work_completed", - client: "롯데건설(주)", - siteName: "캐슬 잠실파크", - manager: "신동엽", - contact: "010-6789-0123", - expectedShipDate: "2024-12-25", - deliveryRequestDate: "2024-12-28", - deliveryMethod: "직접배차", - shippingCost: "무료", - receiver: "한반장", - receiverContact: "010-4321-0987", - address: "서울시 송파구 잠실동 321", - remarks: "작업 완료, 출하 대기", - items: SAMPLE_ITEMS, - subtotal: 35500000, - discountRate: 0, - totalAmount: 35500000, - }, - "ORD-007": { - id: "ORD-007", - lotNumber: "KD-TS-251212-01", - quoteNumber: "KD-PR-251125-07", - orderDate: "2024-12-12", - status: "order_registered", - client: "삼성물산(주)", - siteName: "래미안 서초", - manager: "유재석", - contact: "010-7890-1234", - expectedShipDate: "", - deliveryRequestDate: "2025-02-01", - deliveryMethod: "", - shippingCost: "", - receiver: "이반장", - receiverContact: "010-3210-9876", - address: "서울시 서초구 서초동 654", - remarks: "수주 등록 상태", - items: SAMPLE_ITEMS, - subtotal: 48000000, - discountRate: 0, - totalAmount: 48000000, - }, - "ORD-008": { - id: "ORD-008", - lotNumber: "KD-TS-251211-01", - quoteNumber: "KD-PR-251120-08", - orderDate: "2024-12-11", - status: "shipped", - client: "SK에코플랜트", - siteName: "SK VIEW 일산", - manager: "하하", - contact: "010-8901-2345", - expectedShipDate: "2024-12-18", - deliveryRequestDate: "2024-12-20", - deliveryMethod: "상차", - shippingCost: "선불", - receiver: "조반장", - receiverContact: "010-2109-8765", - address: "경기도 고양시 일산서구 주엽동 987", - remarks: "출하 완료, 미수금 있음", - items: SAMPLE_ITEMS, - subtotal: 31200000, - discountRate: 0, - totalAmount: 31200000, - }, -}; // 상태 뱃지 헬퍼 function getOrderStatusBadge(status: OrderStatus) { @@ -350,9 +98,10 @@ export default function OrderDetailPage() { const params = useParams(); const orderId = params.id as string; - const [order, setOrder] = useState(null); + const [order, setOrder] = useState(null); const [loading, setLoading] = useState(true); const [isCancelDialogOpen, setIsCancelDialogOpen] = useState(false); + const [isCancelling, setIsCancelling] = useState(false); // 취소 폼 상태 const [cancelReason, setCancelReason] = useState(""); @@ -362,14 +111,27 @@ export default function OrderDetailPage() { const [documentModalOpen, setDocumentModalOpen] = useState(false); const [documentType, setDocumentType] = useState("contract"); - // 데이터 로드 (샘플 - ID로 매칭) + // 데이터 로드 (API 호출) useEffect(() => { - // 실제 구현에서는 API 호출 - setTimeout(() => { - const foundOrder = SAMPLE_ORDERS[orderId]; - setOrder(foundOrder || null); - setLoading(false); - }, 300); + async function loadOrder() { + try { + setLoading(true); + const result = await getOrderById(orderId); + if (result.success && result.data) { + setOrder(result.data); + } else { + toast.error(result.error || "수주 정보를 불러오는데 실패했습니다."); + setOrder(null); + } + } catch (error) { + console.error("Error loading order:", error); + toast.error("수주 정보를 불러오는 중 오류가 발생했습니다."); + setOrder(null); + } finally { + setLoading(false); + } + } + loadOrder(); }, [orderId]); const handleBack = () => { @@ -396,18 +158,31 @@ export default function OrderDetailPage() { setIsCancelDialogOpen(true); }; - const handleConfirmCancel = () => { + const handleConfirmCancel = async () => { if (!cancelReason) { toast.error("취소 사유를 선택해주세요."); return; } if (order) { - setOrder({ ...order, status: "cancelled" }); - toast.success("수주가 취소되었습니다."); + setIsCancelling(true); + try { + const result = await updateOrderStatus(order.id, "cancelled"); + if (result.success) { + setOrder({ ...order, status: "cancelled" }); + toast.success("수주가 취소되었습니다."); + setIsCancelDialogOpen(false); + setCancelReason(""); + setCancelDetail(""); + } else { + toast.error(result.error || "수주 취소에 실패했습니다."); + } + } catch (error) { + console.error("Error cancelling order:", error); + toast.error("수주 취소 중 오류가 발생했습니다."); + } finally { + setIsCancelling(false); + } } - setIsCancelDialogOpen(false); - setCancelReason(""); - setCancelDetail(""); }; // 문서 모달 열기 @@ -770,9 +545,10 @@ export default function OrderDetailPage() { variant="outline" onClick={handleConfirmCancel} className="border-gray-300" + disabled={isCancelling} > - 취소 확정 + {isCancelling ? "취소 중..." : "취소 확정"} diff --git a/src/app/[locale]/(protected)/sales/order-management-sales/new/page.tsx b/src/app/[locale]/(protected)/sales/order-management-sales/new/page.tsx index 2f0dbbcb..c5e76adb 100644 --- a/src/app/[locale]/(protected)/sales/order-management-sales/new/page.tsx +++ b/src/app/[locale]/(protected)/sales/order-management-sales/new/page.tsx @@ -2,10 +2,11 @@ /** * 수주 등록 페이지 + * API 연동 완료 (2025-01-08) */ import { useRouter } from "next/navigation"; -import { OrderRegistration, OrderFormData } from "@/components/orders"; +import { OrderRegistration, OrderFormData, createOrder } from "@/components/orders"; import { toast } from "sonner"; export default function OrderNewPage() { @@ -16,14 +17,19 @@ export default function OrderNewPage() { }; const handleSave = async (formData: OrderFormData) => { - // TODO: API 연동 - console.log("수주 등록 데이터:", formData); + try { + const result = await createOrder(formData); - // 임시: 성공 시뮬레이션 - await new Promise((resolve) => setTimeout(resolve, 500)); - - toast.success("수주가 등록되었습니다."); - router.push("/sales/order-management-sales"); + if (result.success) { + toast.success("수주가 등록되었습니다."); + router.push("/sales/order-management-sales"); + } else { + toast.error(result.error || "수주 등록에 실패했습니다."); + } + } catch (error) { + console.error("Error creating order:", error); + toast.error("수주 등록 중 오류가 발생했습니다."); + } }; return ; diff --git a/src/app/[locale]/(protected)/sales/order-management-sales/page.tsx b/src/app/[locale]/(protected)/sales/order-management-sales/page.tsx index fb5dbd94..d01275aa 100644 --- a/src/app/[locale]/(protected)/sales/order-management-sales/page.tsx +++ b/src/app/[locale]/(protected)/sales/order-management-sales/page.tsx @@ -7,9 +7,10 @@ * - 상단 통계 카드: 이번 달 수주, 분할 대기, 생산지시 대기, 출하 대기 * - 필터 탭: 전체, 수주등록, 수주확정, 생산지시완료, 미수 * - 완전한 반응형 지원 + * - API 연동 완료 (2025-01-08) */ -import { useState, useRef, useEffect } from "react"; +import { useState, useRef, useEffect, useCallback } from "react"; import { useRouter } from "next/navigation"; import { FileText, @@ -20,6 +21,7 @@ import { ClipboardList, Truck, Eye, + Loader2, } from "lucide-react"; import { Button } from "@/components/ui/button"; import { Badge } from "@/components/ui/badge"; @@ -31,11 +33,7 @@ import { } from "@/components/templates/IntegratedListTemplateV2"; import { toast } from "sonner"; import { - Table, - TableHeader, TableRow, - TableHead, - TableBody, TableCell, } from "@/components/ui/table"; import { Checkbox } from "@/components/ui/checkbox"; @@ -51,149 +49,16 @@ import { AlertDialogHeader, AlertDialogTitle, } from "@/components/ui/alert-dialog"; +import { + getOrders, + getOrderStats, + deleteOrder, + deleteOrders, + type Order, + type OrderStatus, + type OrderStats, +} from "@/components/orders/actions"; -// 수주 상태 타입 -type OrderStatus = - | "order_registered" // 수주등록 - | "order_confirmed" // 수주확정 - | "production_ordered" // 생산지시완료 - | "in_production" // 생산중 - | "rework" // 재작업중 - | "work_completed" // 작업완료 - | "shipped" // 출하완료 - | "cancelled"; // 취소 - -// 수주 타입 -interface Order { - id: string; - lotNumber: string; // 로트번호 KD-TS-XXXXXX-XX - quoteNumber: string; // 견적번호 KD-PR-XXXXXX-XX - orderDate: string; // 수주일자 - client: string; // 발주처 - siteName: string; // 현장명 - status: OrderStatus; - expectedShipDate?: string; // 출고예정일 - deliveryMethod?: string; // 배송방식 - amount: number; // 금액 - itemCount: number; // 품목 수 - hasReceivable?: boolean; // 미수 여부 -} - -// 샘플 수주 데이터 -const SAMPLE_ORDERS: Order[] = [ - { - id: "ORD-001", - lotNumber: "KD-TS-251217-01", - quoteNumber: "KD-PR-251210-01", - orderDate: "2024-12-17", - client: "태영건설(주)", - siteName: "데시앙 동탄 파크뷰", - status: "order_confirmed", - expectedShipDate: "2025-01-15", - deliveryMethod: "직접배차", - amount: 38800000, - itemCount: 5, - hasReceivable: false, - }, - { - id: "ORD-002", - lotNumber: "KD-TS-251217-02", - quoteNumber: "KD-PR-251211-02", - orderDate: "2024-12-17", - client: "현대건설(주)", - siteName: "힐스테이트 판교역", - status: "in_production", - expectedShipDate: "2025-01-20", - deliveryMethod: "상차", - amount: 52500000, - itemCount: 8, - hasReceivable: false, - }, - { - id: "ORD-003", - lotNumber: "KD-TS-251216-01", - quoteNumber: "KD-PR-251208-03", - orderDate: "2024-12-16", - client: "GS건설(주)", - siteName: "자이 강남센터", - status: "production_ordered", - expectedShipDate: "2025-01-10", - deliveryMethod: "직접배차", - amount: 45000000, - itemCount: 6, - hasReceivable: false, - }, - { - id: "ORD-004", - lotNumber: "KD-TS-251215-01", - quoteNumber: "KD-PR-251205-04", - orderDate: "2024-12-15", - client: "대우건설(주)", - siteName: "푸르지오 송도", - status: "shipped", - expectedShipDate: "2024-12-20", - deliveryMethod: "상차", - amount: 28900000, - itemCount: 4, - hasReceivable: true, - }, - { - id: "ORD-005", - lotNumber: "KD-TS-251214-01", - quoteNumber: "KD-PR-251201-05", - orderDate: "2024-12-14", - client: "포스코건설", - siteName: "더샵 분당센트럴", - status: "rework", - expectedShipDate: "2025-01-25", - deliveryMethod: "직접배차", - amount: 62000000, - itemCount: 10, - hasReceivable: false, - }, - { - id: "ORD-006", - lotNumber: "KD-TS-251213-01", - quoteNumber: "KD-PR-251128-06", - orderDate: "2024-12-13", - client: "롯데건설(주)", - siteName: "캐슬 잠실파크", - status: "work_completed", - expectedShipDate: "2024-12-25", - deliveryMethod: "직접배차", - amount: 35500000, - itemCount: 5, - hasReceivable: false, - }, - { - id: "ORD-007", - lotNumber: "KD-TS-251212-01", - quoteNumber: "KD-PR-251125-07", - orderDate: "2024-12-12", - client: "삼성물산(주)", - siteName: "래미안 서초", - status: "order_registered", - expectedShipDate: undefined, - deliveryMethod: undefined, - amount: 48000000, - itemCount: 7, - hasReceivable: false, - }, - { - id: "ORD-008", - lotNumber: "KD-TS-251211-01", - quoteNumber: "KD-PR-251120-08", - orderDate: "2024-12-11", - client: "SK에코플랜트", - siteName: "SK VIEW 일산", - status: "shipped", - expectedShipDate: "2024-12-18", - deliveryMethod: "상차", - amount: 31200000, - itemCount: 4, - hasReceivable: true, - }, -]; // 상태 뱃지 헬퍼 함수 function getOrderStatusBadge(status: OrderStatus) { @@ -236,8 +101,42 @@ export default function OrderManagementSalesPage() { const [mobileDisplayCount, setMobileDisplayCount] = useState(20); const sentinelRef = useRef(null); - // 로컬 데이터 state (실제 구현에서는 API 연동) - const [orders, setOrders] = useState(SAMPLE_ORDERS); + // API 연동 state + const [orders, setOrders] = useState([]); + const [apiStats, setApiStats] = useState(null); + const [isLoading, setIsLoading] = useState(true); + const [isDeleting, setIsDeleting] = useState(false); + + // 데이터 로드 함수 + const loadData = useCallback(async () => { + try { + setIsLoading(true); + const [ordersResult, statsResult] = await Promise.all([ + getOrders(), + getOrderStats(), + ]); + + if (ordersResult.success && ordersResult.data) { + setOrders(ordersResult.data); + } else { + toast.error(ordersResult.error || "수주 목록을 불러오는데 실패했습니다."); + } + + if (statsResult.success && statsResult.data) { + setApiStats(statsResult.data); + } + } catch (error) { + console.error("Error loading orders:", error); + toast.error("데이터를 불러오는 중 오류가 발생했습니다."); + } finally { + setIsLoading(false); + } + }, []); + + // 초기 데이터 로드 + useEffect(() => { + loadData(); + }, [loadData]); // 필터링 및 정렬 const filteredOrders = orders @@ -313,7 +212,7 @@ export default function OrderManagementSalesPage() { setMobileDisplayCount(20); }, [searchTerm, filterType]); - // 통계 계산 + // 통계 계산 (API stats 우선 사용, 없으면 로컬 계산) const now = new Date(); const startOfMonth = new Date(now.getFullYear(), now.getMonth(), 1); @@ -321,18 +220,18 @@ export default function OrderManagementSalesPage() { const thisMonthOrders = orders.filter( (o) => new Date(o.orderDate) >= startOfMonth ); - const thisMonthAmount = thisMonthOrders.reduce((sum, o) => sum + o.amount, 0); + const thisMonthAmount = apiStats?.thisMonthAmount ?? thisMonthOrders.reduce((sum, o) => sum + o.amount, 0); // 분할 대기 (예시: 수주확정 상태) - const splitPendingCount = orders.filter((o) => o.status === "order_confirmed").length; + const splitPendingCount = apiStats?.splitPending ?? orders.filter((o) => o.status === "order_confirmed").length; // 생산지시 대기 (수주확정 상태 중 생산지시 안된 것) - const productionPendingCount = orders.filter( + const productionPendingCount = apiStats?.productionPending ?? orders.filter( (o) => o.status === "order_confirmed" || o.status === "order_registered" ).length; // 출하 대기 (작업완료 상태) - const shipPendingCount = orders.filter((o) => o.status === "work_completed").length; + const shipPendingCount = apiStats?.shipPending ?? orders.filter((o) => o.status === "work_completed").length; const stats = [ { @@ -370,7 +269,8 @@ export default function OrderManagementSalesPage() { router.push(`/sales/order-management-sales/${order.id}/edit`); }; - const handleCancel = (orderId: string) => { + // 개별 취소 기능은 상세 페이지에서 처리 + const _handleCancel = (orderId: string) => { setCancelTargetId(orderId); setIsCancelDialogOpen(true); }; @@ -399,25 +299,72 @@ export default function OrderManagementSalesPage() { // 다중 선택 삭제 (IntegratedListTemplateV2에서 확인 후 호출됨) // 템플릿 내부에서 이미 확인 팝업을 처리하므로 바로 삭제 실행 - const handleBulkDelete = () => { + const handleBulkDelete = async () => { const selectedIds = Array.from(selectedItems); if (selectedIds.length > 0) { - setOrders(orders.filter((o) => !selectedIds.includes(o.id))); - setSelectedItems(new Set()); - toast.success(`${selectedIds.length}개의 수주가 삭제되었습니다.`); + setIsDeleting(true); + try { + const result = await deleteOrders(selectedIds); + if (result.success) { + setOrders(orders.filter((o) => !selectedIds.includes(o.id))); + setSelectedItems(new Set()); + toast.success(`${selectedIds.length}개의 수주가 삭제되었습니다.`); + // 통계 새로고침 + const statsResult = await getOrderStats(); + if (statsResult.success && statsResult.data) { + setApiStats(statsResult.data); + } + } else { + toast.error(result.error || "삭제에 실패했습니다."); + } + } catch (error) { + console.error("Error deleting orders:", error); + toast.error("삭제 중 오류가 발생했습니다."); + } finally { + setIsDeleting(false); + } } }; // 삭제 확정 (단일/다중 모두 처리) - const handleConfirmDelete = () => { + const handleConfirmDelete = async () => { if (deleteTargetIds.length > 0) { const count = deleteTargetIds.length; - setOrders(orders.filter((o) => !deleteTargetIds.includes(o.id))); - // 선택 상태 초기화 - setSelectedItems(new Set()); - toast.success(`${count}개의 수주가 삭제되었습니다.`); - setIsDeleteDialogOpen(false); - setDeleteTargetIds([]); + setIsDeleting(true); + try { + let success = false; + if (count === 1) { + const result = await deleteOrder(deleteTargetIds[0]); + success = result.success; + if (!success) { + toast.error(result.error || "삭제에 실패했습니다."); + } + } else { + const result = await deleteOrders(deleteTargetIds); + success = result.success; + if (!success) { + toast.error(result.error || "삭제에 실패했습니다."); + } + } + + if (success) { + setOrders(orders.filter((o) => !deleteTargetIds.includes(o.id))); + setSelectedItems(new Set()); + toast.success(`${count}개의 수주가 삭제되었습니다.`); + // 통계 새로고침 + const statsResult = await getOrderStats(); + if (statsResult.success && statsResult.data) { + setApiStats(statsResult.data); + } + } + } catch (error) { + console.error("Error deleting orders:", error); + toast.error("삭제 중 오류가 발생했습니다."); + } finally { + setIsDeleting(false); + setIsDeleteDialogOpen(false); + setDeleteTargetIds([]); + } } }; @@ -654,6 +601,18 @@ export default function OrderManagementSalesPage() { ); }; + // 로딩 상태 표시 + if (isLoading) { + return ( +
+
+ +

수주 목록을 불러오는 중...

+
+
+ ); + } + return ( <> - 취소 + 취소 - - 삭제 + {isDeleting ? ( + + ) : ( + + )} + {isDeleting ? "삭제 중..." : "삭제"} diff --git a/src/components/orders/actions.ts b/src/components/orders/actions.ts new file mode 100644 index 00000000..e2c8dfaa --- /dev/null +++ b/src/components/orders/actions.ts @@ -0,0 +1,630 @@ +'use server'; + +import { serverFetch } from '@/lib/api/fetch-wrapper'; + +// ============================================================================ +// API 타입 정의 +// ============================================================================ + +interface ApiOrder { + id: number; + tenant_id: number; + quote_id: number | null; + order_no: string; + order_type_code: string; + status_code: string; + category_code: string | null; + client_id: number | null; + client_name: string | null; + client_contact: string | null; + site_name: string | null; + quantity: number; + supply_amount: number; + tax_amount: number; + total_amount: number; + discount_rate: number; + discount_amount: number; + delivery_date: string | null; + delivery_method_code: string | null; + received_at: string | null; + memo: string | null; + remarks: string | null; + note: string | null; + created_by: number | null; + updated_by: number | null; + created_at: string; + updated_at: string; + client?: ApiClient | null; + items?: ApiOrderItem[]; + quote?: ApiQuote | null; +} + +interface ApiOrderItem { + id: number; + order_id: number; + item_id: number | null; + item_name: string; + specification: string | null; + quantity: number; + unit: string | null; + unit_price: number; + supply_amount: number; + tax_amount: number; + total_amount: number; + sort_order: number; +} + +interface ApiClient { + id: number; + name: string; + business_no?: string; + representative?: string; + phone?: string; + email?: string; +} + +interface ApiQuote { + id: number; + quote_no: string; + site_name: string | null; +} + +interface ApiOrderStats { + total: number; + draft: number; + confirmed: number; + in_progress: number; + completed: number; + cancelled: number; + total_amount: number; + confirmed_amount: number; +} + +interface ApiResponse { + success: boolean; + message: string; + data: T; +} + +interface PaginatedResponse { + current_page: number; + data: T[]; + last_page: number; + per_page: number; + total: number; +} + +// ============================================================================ +// Frontend 타입 정의 +// ============================================================================ + +// 수주 상태 타입 (API와 매핑) +export type OrderStatus = + | 'order_registered' // DRAFT + | 'order_confirmed' // CONFIRMED + | 'production_ordered' // IN_PROGRESS + | 'in_production' // IN_PROGRESS (세부) + | 'rework' // IN_PROGRESS (세부) + | 'work_completed' // IN_PROGRESS (세부) + | 'shipped' // COMPLETED + | 'cancelled'; // CANCELLED + +export interface Order { + id: string; + lotNumber: string; // order_no + quoteNumber: string; // quote.quote_no + quoteId?: number; + orderDate: string; // received_at + client: string; // client_name + clientId?: number; + siteName: string; // site_name + status: OrderStatus; + statusCode: string; // 원본 status_code + expectedShipDate?: string; // delivery_date + deliveryMethod?: string; // delivery_method_code + amount: number; // total_amount + supplyAmount: number; + taxAmount: number; + itemCount: number; // items.length + hasReceivable?: boolean; // 미수 여부 (추후 구현) + memo?: string; + remarks?: string; + note?: string; + items?: OrderItem[]; +} + +export interface OrderItem { + id: string; + itemId?: number; + itemName: string; + specification?: string; + quantity: number; + unit?: string; + unitPrice: number; + supplyAmount: number; + taxAmount: number; + totalAmount: number; + sortOrder: number; +} + +export interface OrderFormData { + orderTypeCode?: string; + categoryCode?: string; + clientId?: number; + clientName?: string; + clientContact?: string; + siteName?: string; + supplyAmount?: number; + taxAmount?: number; + totalAmount?: number; + discountRate?: number; + discountAmount?: number; + deliveryDate?: string; + deliveryMethodCode?: string; + receivedAt?: string; + memo?: string; + remarks?: string; + note?: string; + items?: OrderItemFormData[]; +} + +export interface OrderItemFormData { + itemId?: number; + itemName: string; + specification?: string; + quantity: number; + unit?: string; + unitPrice: number; +} + +export interface OrderStats { + total: number; + draft: number; + confirmed: number; + inProgress: number; + completed: number; + cancelled: number; + totalAmount: number; + confirmedAmount: number; +} + +// ============================================================================ +// 상태 매핑 +// ============================================================================ + +const API_TO_FRONTEND_STATUS: Record = { + 'DRAFT': 'order_registered', + 'CONFIRMED': 'order_confirmed', + 'IN_PROGRESS': 'production_ordered', + 'COMPLETED': 'shipped', + 'CANCELLED': 'cancelled', +}; + +const FRONTEND_TO_API_STATUS: Record = { + 'order_registered': 'DRAFT', + 'order_confirmed': 'CONFIRMED', + 'production_ordered': 'IN_PROGRESS', + 'in_production': 'IN_PROGRESS', + 'rework': 'IN_PROGRESS', + 'work_completed': 'IN_PROGRESS', + 'shipped': 'COMPLETED', + 'cancelled': 'CANCELLED', +}; + +// ============================================================================ +// 데이터 변환 함수 +// ============================================================================ + +function transformApiToFrontend(apiData: ApiOrder): Order { + return { + id: String(apiData.id), + lotNumber: apiData.order_no, + quoteNumber: apiData.quote?.quote_no || '', + quoteId: apiData.quote_id ?? undefined, + orderDate: apiData.received_at || apiData.created_at.split('T')[0], + client: apiData.client_name || apiData.client?.name || '', + clientId: apiData.client_id ?? undefined, + siteName: apiData.site_name || '', + status: API_TO_FRONTEND_STATUS[apiData.status_code] || 'order_registered', + statusCode: apiData.status_code, + expectedShipDate: apiData.delivery_date ?? undefined, + deliveryMethod: apiData.delivery_method_code ?? undefined, + amount: apiData.total_amount, + supplyAmount: apiData.supply_amount, + taxAmount: apiData.tax_amount, + itemCount: apiData.items?.length || 0, + hasReceivable: false, // 추후 구현 + memo: apiData.memo ?? undefined, + remarks: apiData.remarks ?? undefined, + note: apiData.note ?? undefined, + items: apiData.items?.map(transformItemApiToFrontend), + }; +} + +function transformItemApiToFrontend(apiItem: ApiOrderItem): OrderItem { + return { + id: String(apiItem.id), + itemId: apiItem.item_id ?? undefined, + itemName: apiItem.item_name, + specification: apiItem.specification ?? undefined, + quantity: apiItem.quantity, + unit: apiItem.unit ?? undefined, + unitPrice: apiItem.unit_price, + supplyAmount: apiItem.supply_amount, + taxAmount: apiItem.tax_amount, + totalAmount: apiItem.total_amount, + sortOrder: apiItem.sort_order, + }; +} + +function transformFrontendToApi(data: OrderFormData): Record { + return { + order_type_code: data.orderTypeCode || 'ORDER', + category_code: data.categoryCode || null, + client_id: data.clientId || null, + client_name: data.clientName || null, + client_contact: data.clientContact || null, + site_name: data.siteName || null, + supply_amount: data.supplyAmount || 0, + tax_amount: data.taxAmount || 0, + total_amount: data.totalAmount || 0, + discount_rate: data.discountRate || 0, + discount_amount: data.discountAmount || 0, + delivery_date: data.deliveryDate || null, + delivery_method_code: data.deliveryMethodCode || null, + received_at: data.receivedAt || null, + memo: data.memo || null, + remarks: data.remarks || null, + note: data.note || null, + items: data.items?.map((item) => ({ + item_id: item.itemId || null, + item_name: item.itemName, + specification: item.specification || null, + quantity: item.quantity, + unit: item.unit || null, + unit_price: item.unitPrice, + })) || [], + }; +} + +// ============================================================================ +// API 함수 +// ============================================================================ + +/** + * 수주 목록 조회 + */ +export async function getOrders(params?: { + page?: number; + size?: number; + q?: string; + status?: string; + order_type?: string; + client_id?: number; + date_from?: string; + date_to?: string; +}): Promise<{ + success: boolean; + data?: { items: Order[]; total: number; page: number; totalPages: number }; + error?: string; + __authError?: boolean; +}> { + try { + const searchParams = new URLSearchParams(); + + if (params?.page) searchParams.set('page', String(params.page)); + if (params?.size) searchParams.set('size', String(params.size)); + if (params?.q) searchParams.set('q', params.q); + if (params?.status) { + // Frontend status를 API status로 변환 + const apiStatus = FRONTEND_TO_API_STATUS[params.status as OrderStatus]; + if (apiStatus) searchParams.set('status', apiStatus); + } + if (params?.order_type) searchParams.set('order_type', params.order_type); + if (params?.client_id) searchParams.set('client_id', String(params.client_id)); + if (params?.date_from) searchParams.set('date_from', params.date_from); + if (params?.date_to) searchParams.set('date_to', params.date_to); + + const { response, error } = await serverFetch( + `${process.env.NEXT_PUBLIC_API_URL}/api/v1/orders?${searchParams.toString()}`, + { method: 'GET', cache: 'no-store' } + ); + + if (error) { + return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; + } + + if (!response) { + return { success: false, error: '목록 조회에 실패했습니다.' }; + } + + const result: ApiResponse> = await response.json(); + + if (!response.ok || !result.success) { + return { success: false, error: result.message || '목록 조회에 실패했습니다.' }; + } + + return { + success: true, + data: { + items: result.data.data.map(transformApiToFrontend), + total: result.data.total, + page: result.data.current_page, + totalPages: result.data.last_page, + }, + }; + } catch (error) { + console.error('[getOrders] Error:', error); + return { success: false, error: '서버 오류가 발생했습니다.' }; + } +} + +/** + * 수주 상세 조회 + */ +export async function getOrderById(id: string): Promise<{ + success: boolean; + data?: Order; + error?: string; + __authError?: boolean; +}> { + try { + const { response, error } = await serverFetch( + `${process.env.NEXT_PUBLIC_API_URL}/api/v1/orders/${id}`, + { method: 'GET', cache: 'no-store' } + ); + + if (error) { + return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; + } + + if (!response) { + return { success: false, error: '조회에 실패했습니다.' }; + } + + const result: ApiResponse = await response.json(); + + if (!response.ok || !result.success) { + return { success: false, error: result.message || '조회에 실패했습니다.' }; + } + + return { success: true, data: transformApiToFrontend(result.data) }; + } catch (error) { + console.error('[getOrderById] Error:', error); + return { success: false, error: '서버 오류가 발생했습니다.' }; + } +} + +/** + * 수주 생성 + */ +export async function createOrder(data: OrderFormData): Promise<{ + success: boolean; + data?: Order; + error?: string; + __authError?: boolean; +}> { + try { + const apiData = transformFrontendToApi(data); + + const { response, error } = await serverFetch( + `${process.env.NEXT_PUBLIC_API_URL}/api/v1/orders`, + { method: 'POST', body: JSON.stringify(apiData) } + ); + + if (error) { + return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; + } + + if (!response) { + return { success: false, error: '등록에 실패했습니다.' }; + } + + const result: ApiResponse = await response.json(); + + if (!response.ok || !result.success) { + return { success: false, error: result.message || '등록에 실패했습니다.' }; + } + + return { success: true, data: transformApiToFrontend(result.data) }; + } catch (error) { + console.error('[createOrder] Error:', error); + return { success: false, error: '서버 오류가 발생했습니다.' }; + } +} + +/** + * 수주 수정 + */ +export async function updateOrder(id: string, data: OrderFormData): Promise<{ + success: boolean; + data?: Order; + error?: string; + __authError?: boolean; +}> { + try { + const apiData = transformFrontendToApi(data); + + const { response, error } = await serverFetch( + `${process.env.NEXT_PUBLIC_API_URL}/api/v1/orders/${id}`, + { method: 'PUT', body: JSON.stringify(apiData) } + ); + + if (error) { + return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; + } + + if (!response) { + return { success: false, error: '수정에 실패했습니다.' }; + } + + const result: ApiResponse = await response.json(); + + if (!response.ok || !result.success) { + return { success: false, error: result.message || '수정에 실패했습니다.' }; + } + + return { success: true, data: transformApiToFrontend(result.data) }; + } catch (error) { + console.error('[updateOrder] Error:', error); + return { success: false, error: '서버 오류가 발생했습니다.' }; + } +} + +/** + * 수주 삭제 + */ +export async function deleteOrder(id: string): Promise<{ + success: boolean; + error?: string; + __authError?: boolean; +}> { + try { + const { response, error } = await serverFetch( + `${process.env.NEXT_PUBLIC_API_URL}/api/v1/orders/${id}`, + { method: 'DELETE' } + ); + + if (error) { + return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; + } + + if (!response) { + return { success: false, error: '삭제에 실패했습니다.' }; + } + + const result: ApiResponse = await response.json(); + + if (!response.ok || !result.success) { + return { success: false, error: result.message || '삭제에 실패했습니다.' }; + } + + return { success: true }; + } catch (error) { + console.error('[deleteOrder] Error:', error); + return { success: false, error: '서버 오류가 발생했습니다.' }; + } +} + +/** + * 수주 상태 변경 + */ +export async function updateOrderStatus(id: string, status: OrderStatus): Promise<{ + success: boolean; + data?: Order; + error?: string; + __authError?: boolean; +}> { + try { + const apiStatus = FRONTEND_TO_API_STATUS[status]; + if (!apiStatus) { + return { success: false, error: '유효하지 않은 상태입니다.' }; + } + + const { response, error } = await serverFetch( + `${process.env.NEXT_PUBLIC_API_URL}/api/v1/orders/${id}/status`, + { method: 'PATCH', body: JSON.stringify({ status: apiStatus }) } + ); + + if (error) { + return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; + } + + if (!response) { + return { success: false, error: '상태 변경에 실패했습니다.' }; + } + + const result: ApiResponse = await response.json(); + + if (!response.ok || !result.success) { + return { success: false, error: result.message || '상태 변경에 실패했습니다.' }; + } + + return { success: true, data: transformApiToFrontend(result.data) }; + } catch (error) { + console.error('[updateOrderStatus] Error:', error); + return { success: false, error: '서버 오류가 발생했습니다.' }; + } +} + +/** + * 수주 통계 조회 + */ +export async function getOrderStats(): Promise<{ + success: boolean; + data?: OrderStats; + error?: string; + __authError?: boolean; +}> { + try { + const { response, error } = await serverFetch( + `${process.env.NEXT_PUBLIC_API_URL}/api/v1/orders/stats`, + { method: 'GET', cache: 'no-store' } + ); + + if (error) { + return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; + } + + if (!response) { + return { success: false, error: '통계 조회에 실패했습니다.' }; + } + + const result: ApiResponse = await response.json(); + + if (!response.ok || !result.success) { + return { success: false, error: result.message || '통계 조회에 실패했습니다.' }; + } + + return { + success: true, + data: { + total: result.data.total, + draft: result.data.draft, + confirmed: result.data.confirmed, + inProgress: result.data.in_progress, + completed: result.data.completed, + cancelled: result.data.cancelled, + totalAmount: result.data.total_amount, + confirmedAmount: result.data.confirmed_amount, + }, + }; + } catch (error) { + console.error('[getOrderStats] Error:', error); + return { success: false, error: '서버 오류가 발생했습니다.' }; + } +} + +/** + * 수주 일괄 삭제 + */ +export async function deleteOrders(ids: string[]): Promise<{ + success: boolean; + deletedCount?: number; + error?: string; + __authError?: boolean; +}> { + try { + // 순차적으로 삭제 (API에 bulk delete가 없으므로) + let deletedCount = 0; + const errors: string[] = []; + + for (const id of ids) { + const result = await deleteOrder(id); + if (result.success) { + deletedCount++; + } else { + errors.push(result.error || `ID ${id} 삭제 실패`); + } + } + + if (deletedCount === 0 && errors.length > 0) { + return { success: false, error: errors[0] }; + } + + return { success: true, deletedCount }; + } catch (error) { + console.error('[deleteOrders] Error:', error); + return { success: false, error: '서버 오류가 발생했습니다.' }; + } +} diff --git a/src/components/orders/index.ts b/src/components/orders/index.ts index 8f264045..bdceb67d 100644 --- a/src/components/orders/index.ts +++ b/src/components/orders/index.ts @@ -1,7 +1,26 @@ /** - * 수주 관련 컴포넌트 + * 수주 관련 컴포넌트 및 API 함수 */ +// API Actions +export { + getOrders, + getOrderById, + createOrder, + updateOrder, + deleteOrder, + deleteOrders, + updateOrderStatus, + getOrderStats, + type Order, + type OrderItem as OrderItemApi, + type OrderFormData as OrderApiFormData, + type OrderItemFormData, + type OrderStats, + type OrderStatus, +} from "./actions"; + +// Components export { OrderRegistration, type OrderFormData } from "./OrderRegistration"; export { QuotationSelectDialog, type QuotationForSelect, type QuotationItem } from "./QuotationSelectDialog"; export { ItemAddDialog, type OrderItem } from "./ItemAddDialog"; From 288871cb390e4aa93b217e2dab2dcf4ba281282e Mon Sep 17 00:00:00 2001 From: kent Date: Thu, 8 Jan 2026 17:52:48 +0900 Subject: [PATCH 02/45] =?UTF-8?q?feat(WEB):=20=EC=A7=81=EC=9B=90=20?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=20=ED=8F=BC=20=EC=A7=81=EA=B8=89/=EB=B6=80?= =?UTF-8?q?=EC=84=9C/=EC=A7=81=EC=B1=85=20Select=20=EB=93=9C=EB=A1=AD?= =?UTF-8?q?=EB=8B=A4=EC=9A=B4=20=EC=97=B0=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 직급(rank) 필드를 API 기반 Select 드롭다운으로 변경 - 부서/직책 필드를 API 데이터 기반 Select로 변경 - handleDepartmentSelect, handlePositionSelect 핸들러 추가 - view 모드에서 Select disabled 상태 처리 --- .../hr/EmployeeManagement/EmployeeForm.tsx | 85 +++++++++++++++---- 1 file changed, 68 insertions(+), 17 deletions(-) diff --git a/src/components/hr/EmployeeManagement/EmployeeForm.tsx b/src/components/hr/EmployeeManagement/EmployeeForm.tsx index 268f05e4..1aab626c 100644 --- a/src/components/hr/EmployeeManagement/EmployeeForm.tsx +++ b/src/components/hr/EmployeeManagement/EmployeeForm.tsx @@ -287,6 +287,32 @@ export function EmployeeForm({ })); }; + // 부서 선택 변경 (id와 name 모두 업데이트) + const handleDepartmentSelect = (dpId: string, departmentId: string) => { + const dept = departments.find(d => String(d.id) === departmentId); + if (dept) { + setFormData(prev => ({ + ...prev, + departmentPositions: prev.departmentPositions.map(dp => + dp.id === dpId ? { ...dp, departmentId: String(dept.id), departmentName: dept.name } : dp + ), + })); + } + }; + + // 직책 선택 변경 (id와 name 모두 업데이트) + const handlePositionSelect = (dpId: string, positionId: string) => { + const position = titles.find(t => String(t.id) === positionId); + if (position) { + setFormData(prev => ({ + ...prev, + departmentPositions: prev.departmentPositions.map(dp => + dp.id === dpId ? { ...dp, positionId: String(position.id), positionName: position.name } : dp + ), + })); + } + }; + // 저장 const handleSubmit = (e: React.FormEvent) => { e.preventDefault(); @@ -600,13 +626,20 @@ export function EmployeeForm({ {fieldSettings.showRank && (
- handleChange('rank', e.target.value)} - placeholder="직급 입력" + onValueChange={(value) => handleChange('rank', value)} disabled={isViewMode} - /> + > + + + + + {ranks.map((rank) => ( + {rank.name} + ))} + +
)} @@ -657,20 +690,38 @@ export function EmployeeForm({
{formData.departmentPositions.map((dp) => (
- handleDepartmentPositionChange(dp.id, 'departmentName', e.target.value)} - placeholder="부서명" - className="flex-1" + handleDepartmentPositionChange(dp.id, 'positionName', e.target.value)} - placeholder="직책" - className="flex-1" + > + + + {dp.departmentName || '부서 선택'} + + + + {departments.map((dept) => ( + {dept.name} + ))} + + + {!isViewMode && (
@@ -411,7 +439,7 @@ export function RuleModal({ open, onOpenChange, onAdd, editRule }: RuleModalProp size="sm" onClick={handleResetSelection} className="text-xs h-7" - disabled={selectedItemCodes.size === 0} + disabled={selectedItemIds.size === 0} > 초기화 @@ -439,7 +467,9 @@ export function RuleModal({ open, onOpenChange, onAdd, editRule }: RuleModalProp ) : itemList.length === 0 ? ( - 검색 결과가 없습니다 + {searchKeyword.trim() === '' + ? '품목을 검색해주세요 (한글 1자 이상, 영문 2자 이상)' + : '검색 결과가 없습니다'} ) : ( @@ -447,12 +477,12 @@ export function RuleModal({ open, onOpenChange, onAdd, editRule }: RuleModalProp handleToggleItem(item.code)} + onClick={() => handleToggleItem(item.id)} > handleToggleItem(item.code)} + checked={selectedItemIds.has(item.id)} + onCheckedChange={() => handleToggleItem(item.id)} onClick={(e) => e.stopPropagation()} /> From ba36c0ec196fd6f5b6bd793d0c46bd143ec68e6a Mon Sep 17 00:00:00 2001 From: kent Date: Thu, 8 Jan 2026 20:23:58 +0900 Subject: [PATCH 05/45] =?UTF-8?q?feat:=20=EA=B3=B5=EC=A0=95=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20Frontend=20actions=20=EC=97=85=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Process 관련 API 호출 로직 수정 --- src/components/process-management/actions.ts | 86 ++++++++++++++++++-- 1 file changed, 77 insertions(+), 9 deletions(-) diff --git a/src/components/process-management/actions.ts b/src/components/process-management/actions.ts index c3698c27..95cdef04 100644 --- a/src/components/process-management/actions.ts +++ b/src/components/process-management/actions.ts @@ -26,6 +26,7 @@ interface ApiProcess { created_at: string; updated_at: string; classification_rules?: ApiClassificationRule[]; + process_items?: ApiProcessItem[]; } interface ApiClassificationRule { @@ -42,6 +43,19 @@ interface ApiClassificationRule { updated_at: string; } +interface ApiProcessItem { + id: number; + process_id: number; + item_id: number; + priority: number; + is_active: boolean; + item?: { + id: number; + code: string; + name: string; + }; +} + interface ApiResponse { success: boolean; message: string; @@ -61,6 +75,12 @@ interface PaginatedResponse { // ============================================================================ function transformApiToFrontend(apiData: ApiProcess): Process { + // Pattern 규칙 변환 + const patternRules = (apiData.classification_rules ?? []).map(transformRuleApiToFrontend); + + // 개별 품목 → individual 분류 규칙으로 변환 + const individualRules = transformProcessItemsToRules(apiData.process_items ?? []); + return { id: String(apiData.id), processCode: apiData.process_code, @@ -69,7 +89,7 @@ function transformApiToFrontend(apiData: ApiProcess): Process { processType: apiData.process_type as Process['processType'], department: apiData.department ?? '', workLogTemplate: apiData.work_log_template ?? undefined, - classificationRules: (apiData.classification_rules ?? []).map(transformRuleApiToFrontend), + classificationRules: [...patternRules, ...individualRules], requiredWorkers: apiData.required_workers, equipmentInfo: apiData.equipment_info ?? undefined, workSteps: apiData.work_steps ?? [], @@ -80,6 +100,34 @@ function transformApiToFrontend(apiData: ApiProcess): Process { }; } +/** + * process_items 배열을 individual 분류 규칙으로 변환 + * 모든 개별 품목을 하나의 규칙으로 통합 + */ +function transformProcessItemsToRules(processItems: ApiProcessItem[]): ClassificationRule[] { + if (processItems.length === 0) return []; + + // 모든 품목 ID를 쉼표로 구분하여 하나의 규칙으로 통합 + const itemIds = processItems + .filter(pi => pi.is_active) + .map(pi => String(pi.item_id)) + .join(','); + + if (!itemIds) return []; + + return [{ + id: `individual-${Date.now()}`, + registrationType: 'individual', + ruleType: '품목코드', + matchingType: 'equals', + conditionValue: itemIds, + priority: 0, + description: `개별 품목 ${processItems.length}개`, + isActive: true, + createdAt: new Date().toISOString(), + }]; +} + function transformRuleApiToFrontend(apiRule: ApiClassificationRule): ClassificationRule { return { id: String(apiRule.id), @@ -95,6 +143,24 @@ function transformRuleApiToFrontend(apiRule: ApiClassificationRule): Classificat } function transformFrontendToApi(data: ProcessFormData): Record { + // 패턴 규칙만 분리 (individual 제외) + const patternRules = data.classificationRules.filter( + (rule) => rule.registrationType === 'pattern' + ); + + // 개별 품목 규칙에서 item_ids 추출 + const individualRules = data.classificationRules.filter( + (rule) => rule.registrationType === 'individual' + ); + + // 개별 품목의 conditionValue에서 ID 배열 추출 (쉼표 구분) + const itemIds: number[] = individualRules.flatMap((rule) => + rule.conditionValue + .split(',') + .map((id) => parseInt(id.trim(), 10)) + .filter((n) => !isNaN(n) && n > 0) + ); + return { process_name: data.processName, process_type: data.processType, @@ -105,8 +171,8 @@ function transformFrontendToApi(data: ProcessFormData): Record work_steps: data.workSteps ? data.workSteps.split(',').map((s) => s.trim()).filter(Boolean) : [], note: data.note || null, is_active: data.isActive, - classification_rules: data.classificationRules.map((rule) => ({ - registration_type: rule.registrationType, + // 패턴 규칙만 전송 (registration_type 제외) + classification_rules: patternRules.map((rule) => ({ rule_type: rule.ruleType, matching_type: rule.matchingType, condition_value: rule.conditionValue, @@ -114,6 +180,8 @@ function transformFrontendToApi(data: ProcessFormData): Record description: rule.description || null, is_active: rule.isActive, })), + // 개별 품목 ID 배열 전송 + item_ids: itemIds, }; } @@ -494,8 +562,8 @@ export async function getDepartmentOptions(): Promise { } const result = await response.json(); - if (result.success && result.data) { - return result.data.map((dept: { id: number; name: string }) => ({ + if (result.success && result.data?.data) { + return result.data.data.map((dept: { id: number; name: string }) => ({ value: dept.name, label: dept.name, })); @@ -552,12 +620,12 @@ export async function getItemList(params?: GetItemListParams): Promise ({ + return result.data.data.map((item: { id: number; name: string; code?: string; item_type?: string }) => ({ value: String(item.id), - label: item.item_name, - code: item.item_code || '', + label: item.name, + code: item.code || '', id: String(item.id), - fullName: item.item_name, + fullName: item.name, type: item.item_type || '', })); } From fde8726e146b559bd567063caf84e8f9727b8992 Mon Sep 17 00:00:00 2001 From: kent Date: Thu, 8 Jan 2026 20:57:49 +0900 Subject: [PATCH 06/45] =?UTF-8?q?feat(WEB):=20=EC=88=98=EC=A3=BC=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20Phase=202=20=ED=83=80=EC=9E=85=20=EC=A0=95=EC=9D=98?= =?UTF-8?q?=20=ED=99=95=EC=9E=A5=20=EB=B0=8F=20=EA=B3=B5=EC=A0=95=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=EA=B0=9C=EB=B3=84=20=ED=92=88=EB=AA=A9=20=ED=91=9C?= =?UTF-8?q?=EC=8B=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Order, OrderItem 인터페이스에 상세 페이지용 필드 추가 - OrderFormData, OrderItemFormData에 수정 페이지용 필드 추가 - 변환 함수에서 새 필드 매핑 처리 - 공정관리 개별 품목을 ID 대신 품목명으로 표시 --- src/components/orders/actions.ts | 45 ++++++++++++++++++- .../process-management/ProcessDetail.tsx | 43 +++++++++--------- src/components/process-management/actions.ts | 20 ++++++--- src/types/process.ts | 8 ++++ 4 files changed, 87 insertions(+), 29 deletions(-) diff --git a/src/components/orders/actions.ts b/src/components/orders/actions.ts index 6083efc7..2f81de08 100644 --- a/src/components/orders/actions.ts +++ b/src/components/orders/actions.ts @@ -156,19 +156,36 @@ export interface Order { remarks?: string; note?: string; items?: OrderItem[]; + // 상세 페이지용 추가 필드 + manager?: string; // 담당자 + contact?: string; // 연락처 (client_contact) + deliveryRequestDate?: string; // 납품요청일 + shippingCost?: string; // 운임비용 + receiver?: string; // 수신자 + receiverContact?: string; // 수신처 연락처 + address?: string; // 수신처 주소 + addressDetail?: string; // 상세주소 + subtotal?: number; // 소계 (supply_amount와 동일) + discountRate?: number; // 할인율 + totalAmount?: number; // 총금액 (amount와 동일하지만 명시적) } export interface OrderItem { id: string; itemId?: number; + itemCode?: string; // 품목코드 itemName: string; specification?: string; + spec?: string; // specification alias + type?: string; // 층 (layer) + symbol?: string; // 부호 quantity: number; unit?: string; unitPrice: number; supplyAmount: number; taxAmount: number; totalAmount: number; + amount?: number; // totalAmount alias sortOrder: number; } @@ -191,10 +208,20 @@ export interface OrderFormData { remarks?: string; note?: string; items?: OrderItemFormData[]; + // 수정 페이지용 추가 필드 + expectedShipDate?: string; // 출고예정일 + deliveryRequestDate?: string; // 납품요청일 + deliveryMethod?: string; // 배송방식 (deliveryMethodCode alias) + shippingCost?: string; // 운임비용 + receiver?: string; // 수신자 + receiverContact?: string; // 수신처 연락처 + address?: string; // 수신처 주소 + addressDetail?: string; // 상세주소 } export interface OrderItemFormData { itemId?: number; + itemCode?: string; // 품목코드 itemName: string; specification?: string; quantity: number; @@ -302,7 +329,18 @@ function transformApiToFrontend(apiData: ApiOrder): Order { memo: apiData.memo ?? undefined, remarks: apiData.remarks ?? undefined, note: apiData.note ?? undefined, - items: apiData.items?.map(transformItemApiToFrontend), + items: apiData.items?.map(transformItemApiToFrontend), // 상세 페이지용 추가 필드 (API에서 매핑) + manager: apiData.client?.representative ?? undefined, + contact: apiData.client_contact ?? apiData.client?.phone ?? undefined, + deliveryRequestDate: apiData.delivery_date ?? undefined, // delivery_date를 공유 + shippingCost: undefined, // API에 해당 필드 없음 - 추후 구현 + receiver: undefined, // API에 해당 필드 없음 - 추후 구현 + receiverContact: undefined, // API에 해당 필드 없음 - 추후 구현 + address: undefined, // API에 해당 필드 없음 - 추후 구현 + addressDetail: undefined, // API에 해당 필드 없음 - 추후 구현 + subtotal: apiData.supply_amount, + discountRate: apiData.discount_rate, + totalAmount: apiData.total_amount, }; } @@ -310,14 +348,19 @@ function transformItemApiToFrontend(apiItem: ApiOrderItem): OrderItem { return { id: String(apiItem.id), itemId: apiItem.item_id ?? undefined, + itemCode: apiItem.item_id ? `ITEM-${apiItem.item_id}` : undefined, // 임시: 실제 item_code는 API에서 제공 필요 itemName: apiItem.item_name, specification: apiItem.specification ?? undefined, + spec: apiItem.specification ?? undefined, // specification alias + type: undefined, // 층 - API에 해당 필드 없음 + symbol: undefined, // 부호 - API에 해당 필드 없음 quantity: apiItem.quantity, unit: apiItem.unit ?? undefined, unitPrice: apiItem.unit_price, supplyAmount: apiItem.supply_amount, taxAmount: apiItem.tax_amount, totalAmount: apiItem.total_amount, + amount: apiItem.total_amount, // totalAmount alias sortOrder: apiItem.sort_order, }; } diff --git a/src/components/process-management/ProcessDetail.tsx b/src/components/process-management/ProcessDetail.tsx index bb8ba47e..a370e09f 100644 --- a/src/components/process-management/ProcessDetail.tsx +++ b/src/components/process-management/ProcessDetail.tsx @@ -178,39 +178,36 @@ export function ProcessDetail({ process }: ProcessDetailProps) { 개별 품목 + {individualItems.length > 0 && individualItems[0].items && ( + + {individualItems[0].items.length}개 + + )} - {individualItems.length === 0 ? ( + {individualItems.length === 0 || !individualItems[0].items?.length ? (

등록된 개별 품목이 없습니다

) : ( -
- {individualItems.map((rule) => ( -
-
- - {rule.isActive ? '활성' : '비활성'} - -
-
- {rule.conditionValue} -
- {rule.description && ( -
- {rule.description} -
- )} +
+
+ {individualItems[0].items.map((item) => ( +
+
+ + {item.code} + + {item.name}
- 우선순위: {rule.priority} -
- ))} + ))} +
)} diff --git a/src/components/process-management/actions.ts b/src/components/process-management/actions.ts index 95cdef04..e52ae0fb 100644 --- a/src/components/process-management/actions.ts +++ b/src/components/process-management/actions.ts @@ -3,7 +3,7 @@ import { isNextRedirectError } from '@/lib/utils/redirect-error'; import { serverFetch } from '@/lib/api/fetch-wrapper'; -import type { Process, ProcessFormData, ClassificationRule } from '@/types/process'; +import type { Process, ProcessFormData, ClassificationRule, IndividualItem } from '@/types/process'; // ============================================================================ // API 타입 정의 @@ -107,13 +107,22 @@ function transformApiToFrontend(apiData: ApiProcess): Process { function transformProcessItemsToRules(processItems: ApiProcessItem[]): ClassificationRule[] { if (processItems.length === 0) return []; + const activeItems = processItems.filter(pi => pi.is_active); + if (activeItems.length === 0) return []; + // 모든 품목 ID를 쉼표로 구분하여 하나의 규칙으로 통합 - const itemIds = processItems - .filter(pi => pi.is_active) + const itemIds = activeItems .map(pi => String(pi.item_id)) .join(','); - if (!itemIds) return []; + // 품목 상세 정보 추출 (code, name 포함) + const items: IndividualItem[] = activeItems + .filter(pi => pi.item) // item 정보가 있는 것만 + .map(pi => ({ + id: String(pi.item!.id), + code: pi.item!.code, + name: pi.item!.name, + })); return [{ id: `individual-${Date.now()}`, @@ -122,9 +131,10 @@ function transformProcessItemsToRules(processItems: ApiProcessItem[]): Classific matchingType: 'equals', conditionValue: itemIds, priority: 0, - description: `개별 품목 ${processItems.length}개`, + description: `개별 품목 ${activeItems.length}개`, isActive: true, createdAt: new Date().toISOString(), + items, // 품목 상세 정보 추가 }]; } diff --git a/src/types/process.ts b/src/types/process.ts index 16aad75f..3f35861d 100644 --- a/src/types/process.ts +++ b/src/types/process.ts @@ -17,6 +17,13 @@ export type RuleType = '품목코드' | '품목명' | '품목구분'; // 매칭 방식 export type MatchingType = 'startsWith' | 'endsWith' | 'contains' | 'equals'; +// 개별 품목 정보 +export interface IndividualItem { + id: string; + code: string; + name: string; +} + // 자동 분류 규칙 export interface ClassificationRule { id: string; @@ -28,6 +35,7 @@ export interface ClassificationRule { description?: string; isActive: boolean; createdAt: string; + items?: IndividualItem[]; // 개별 품목인 경우 품목 정보 } // 자동 분류 규칙 입력용 (id, createdAt 제외) From 12b4259ebc6d380c3a18a84cee836652e7f2c514 Mon Sep 17 00:00:00 2001 From: kent Date: Fri, 9 Jan 2026 08:32:52 +0900 Subject: [PATCH 07/45] =?UTF-8?q?refactor(work-orders):=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EB=A6=AC=EB=B7=B0=20=EA=B8=B0=EB=B0=98=20=ED=94=84?= =?UTF-8?q?=EB=A1=A0=ED=8A=B8=EC=97=94=EB=93=9C=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## 수정 내용 - 검색 debounce: WorkOrderList, SalesOrderSelectModal에 300ms debounce 적용 - 작업 버튼: 상태별 시작/완료 버튼 구현 (WorkOrderDetail) - API 경로: /sales-orders → /orders 수정 - 다중 담당자: assignees 타입 및 변환 함수 추가 - scheduledDate 필드 매핑 수정 ## 변경 파일 - WorkOrderList.tsx, SalesOrderSelectModal.tsx (debounce) - WorkOrderDetail.tsx (action buttons) - actions.ts (API path fix) - types.ts (assignees type) --- .../WorkOrders/SalesOrderSelectModal.tsx | 19 +++- .../production/WorkOrders/WorkOrderDetail.tsx | 58 ++++++++++- .../production/WorkOrders/WorkOrderList.tsx | 96 ++++++++++++------- .../production/WorkOrders/actions.ts | 6 +- src/components/production/WorkOrders/types.ts | 36 ++++++- 5 files changed, 170 insertions(+), 45 deletions(-) diff --git a/src/components/production/WorkOrders/SalesOrderSelectModal.tsx b/src/components/production/WorkOrders/SalesOrderSelectModal.tsx index 85abbe12..9820ad9c 100644 --- a/src/components/production/WorkOrders/SalesOrderSelectModal.tsx +++ b/src/components/production/WorkOrders/SalesOrderSelectModal.tsx @@ -19,6 +19,18 @@ import { toast } from 'sonner'; import { getSalesOrdersForWorkOrder } from './actions'; import type { SalesOrder } from './types'; +// Debounce 훅 +function useDebounce(value: T, delay: number): T { + const [debouncedValue, setDebouncedValue] = useState(value); + + useEffect(() => { + const timer = setTimeout(() => setDebouncedValue(value), delay); + return () => clearTimeout(timer); + }, [value, delay]); + + return debouncedValue; +} + interface SalesOrderSelectModalProps { open: boolean; onOpenChange: (open: boolean) => void; @@ -34,12 +46,15 @@ export function SalesOrderSelectModal({ const [salesOrders, setSalesOrders] = useState([]); const [isLoading, setIsLoading] = useState(false); + // 디바운스된 검색어 (300ms 딜레이) + const debouncedSearchTerm = useDebounce(searchTerm, 300); + // API로 수주 목록 로드 const loadSalesOrders = useCallback(async () => { setIsLoading(true); try { const result = await getSalesOrdersForWorkOrder({ - q: searchTerm || undefined, + q: debouncedSearchTerm || undefined, }); if (result.success) { // API 응답을 SalesOrder 타입으로 변환 @@ -63,7 +78,7 @@ export function SalesOrderSelectModal({ } finally { setIsLoading(false); } - }, [searchTerm]); + }, [debouncedSearchTerm]); // 모달이 열릴 때 데이터 로드 useEffect(() => { diff --git a/src/components/production/WorkOrders/WorkOrderDetail.tsx b/src/components/production/WorkOrders/WorkOrderDetail.tsx index c4edb024..e5e61db9 100644 --- a/src/components/production/WorkOrders/WorkOrderDetail.tsx +++ b/src/components/production/WorkOrders/WorkOrderDetail.tsx @@ -21,7 +21,7 @@ import { import { PageLayout } from '@/components/organisms/PageLayout'; import { WorkLogModal } from '../WorkerScreen/WorkLogModal'; import { toast } from 'sonner'; -import { getWorkOrderById } from './actions'; +import { getWorkOrderById, updateWorkOrderStatus } from './actions'; import { PROCESS_TYPE_LABELS, WORK_ORDER_STATUS_LABELS, @@ -191,6 +191,7 @@ export function WorkOrderDetail({ orderId }: WorkOrderDetailProps) { const [isWorkLogOpen, setIsWorkLogOpen] = useState(false); const [order, setOrder] = useState(null); const [isLoading, setIsLoading] = useState(true); + const [isStatusUpdating, setIsStatusUpdating] = useState(false); // API에서 데이터 로드 const loadData = useCallback(async () => { @@ -214,6 +215,32 @@ export function WorkOrderDetail({ orderId }: WorkOrderDetailProps) { loadData(); }, [loadData]); + // 상태 변경 핸들러 + const handleStatusChange = useCallback(async (newStatus: 'waiting' | 'in_progress' | 'completed') => { + if (!order) return; + + setIsStatusUpdating(true); + try { + const result = await updateWorkOrderStatus(orderId, newStatus); + if (result.success && result.data) { + setOrder(result.data); + const statusLabels = { + waiting: '작업대기', + in_progress: '작업중', + completed: '작업완료', + }; + toast.success(`상태가 '${statusLabels[newStatus]}'(으)로 변경되었습니다.`); + } else { + toast.error(result.error || '상태 변경에 실패했습니다.'); + } + } catch (error) { + console.error('[WorkOrderDetail] handleStatusChange error:', error); + toast.error('상태 변경 중 오류가 발생했습니다.'); + } finally { + setIsStatusUpdating(false); + } + }, [order, orderId]); + // 로딩 상태 if (isLoading) { return ( @@ -260,6 +287,35 @@ export function WorkOrderDetail({ orderId }: WorkOrderDetailProps) {

작업지시 상세

+ {/* 상태 변경 버튼 */} + {order.status === 'waiting' && ( + + )} + {order.status === 'in_progress' && ( + + )} )} + {showConfirmButton && ( + + )} {showProductionCreateButton && ( + + + + ); } \ No newline at end of file diff --git a/src/app/[locale]/(protected)/sales/order-management-sales/[id]/production-order/page.tsx b/src/app/[locale]/(protected)/sales/order-management-sales/[id]/production-order/page.tsx index 5f0e8443..141a8817 100644 --- a/src/app/[locale]/(protected)/sales/order-management-sales/[id]/production-order/page.tsx +++ b/src/app/[locale]/(protected)/sales/order-management-sales/[id]/production-order/page.tsx @@ -10,9 +10,11 @@ * - 스크린 품목 상세 * - 모터/전장품 사양 (읽기전용) * - 절곡물 BOM + * + * API 연동: getOrderById, createProductionOrder */ -import { useState, useEffect } from "react"; +import { useState, useEffect, useCallback } from "react"; import { useRouter, useParams } from "next/navigation"; import { Button } from "@/components/ui/button"; import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; @@ -25,7 +27,7 @@ import { TableRow, } from "@/components/ui/table"; import { Textarea } from "@/components/ui/textarea"; -import { Factory, ArrowLeft, BarChart3, CheckCircle2 } from "lucide-react"; +import { Factory, ArrowLeft, BarChart3, CheckCircle2, AlertCircle } from "lucide-react"; import { PageLayout } from "@/components/organisms/PageLayout"; import { AlertDialog, @@ -39,6 +41,13 @@ import { import { PageHeader } from "@/components/organisms/PageHeader"; import { BadgeSm } from "@/components/atoms/BadgeSm"; import { cn } from "@/lib/utils"; +import { + getOrderById, + createProductionOrder, + type Order, + type CreateProductionOrderData, +} from "@/components/orders/actions"; +import { formatAmount } from "@/utils/formatAmount"; // 수주 정보 타입 interface OrderInfo { @@ -187,16 +196,16 @@ const PRIORITY_CONFIGS: PriorityConfig[] = [ }, ]; -// 샘플 수주 정보 -const SAMPLE_ORDER_INFO: OrderInfo = { - orderNumber: "KD-TS-251217-09", - client: "태영건설(주)", - siteName: "데시앙 동탄 파크뷰", - dueDate: "2026-02-25", - itemCount: 3, - totalQuantity: "3EA", - creditGrade: "A (우량)", - status: "재작업중", +// 상태 레이블 +const STATUS_LABELS: Record = { + order_registered: "수주등록", + order_confirmed: "수주확정", + production_ordered: "생산지시", + in_production: "생산중", + rework: "재작업중", + work_completed: "작업완료", + shipped: "출고완료", + cancelled: "취소", }; // 샘플 작업지시 카드 @@ -337,7 +346,8 @@ export default function ProductionOrderCreatePage() { const orderId = params.id as string; const [loading, setLoading] = useState(true); - const [orderInfo, setOrderInfo] = useState(null); + const [error, setError] = useState(null); + const [order, setOrder] = useState(null); const [isSubmitting, setIsSubmitting] = useState(false); // 우선순위 상태 @@ -347,36 +357,60 @@ export default function ProductionOrderCreatePage() { // 성공 다이얼로그 상태 const [showSuccessDialog, setShowSuccessDialog] = useState(false); const [generatedOrderNumber, setGeneratedOrderNumber] = useState(""); + const [generatedWorkOrderId, setGeneratedWorkOrderId] = useState(null); - // 데이터 로드 - useEffect(() => { - setTimeout(() => { - setOrderInfo(SAMPLE_ORDER_INFO); + // 수주 데이터 로드 + const fetchOrder = useCallback(async () => { + setLoading(true); + setError(null); + try { + const result = await getOrderById(orderId); + if (result.success && result.data) { + setOrder(result.data); + } else { + setError(result.error || "수주 정보 조회에 실패했습니다."); + } + } catch { + setError("서버 오류가 발생했습니다."); + } finally { setLoading(false); - }, 300); + } }, [orderId]); + useEffect(() => { + fetchOrder(); + }, [fetchOrder]); + const handleCancel = () => { - router.push(`/sales/order-management-sales/${orderId}`); + router.push(`/ko/sales/order-management-sales/${orderId}`); }; const handleBackToDetail = () => { - router.push(`/sales/order-management-sales/${orderId}`); + router.push(`/ko/sales/order-management-sales/${orderId}`); }; const handleConfirm = async () => { + if (!order) return; + setIsSubmitting(true); + setError(null); try { - // TODO: API 호출 - await new Promise((resolve) => setTimeout(resolve, 500)); + const productionData: CreateProductionOrderData = { + priority: selectedPriority, + memo: memo || undefined, + }; - // 생산지시번호 생성 (실제로는 API 응답에서 받아옴) - const today = new Date(); - const dateStr = `${String(today.getFullYear()).slice(2)}${String(today.getMonth() + 1).padStart(2, "0")}${String(today.getDate()).padStart(2, "0")}`; - const newOrderNumber = `PO-${orderInfo?.orderNumber.replace("KD-TS-", "KD-") || "KD-000000"}-${dateStr}`; + const result = await createProductionOrder(orderId, productionData); - setGeneratedOrderNumber(newOrderNumber); - setShowSuccessDialog(true); + if (result.success && result.data) { + setGeneratedOrderNumber(result.data.workOrder.workOrderNo); + setGeneratedWorkOrderId(result.data.workOrder.id); + setShowSuccessDialog(true); + } else { + setError(result.error || "생산지시 생성에 실패했습니다."); + } + } catch { + setError("서버 오류가 발생했습니다."); } finally { setIsSubmitting(false); } @@ -384,9 +418,8 @@ export default function ProductionOrderCreatePage() { const handleSuccessDialogClose = () => { setShowSuccessDialog(false); - // 생산지시 상세 페이지로 이동 (실제로는 API 응답에서 받은 생산지시 ID 사용) - // 임시로 PO-002 사용 (샘플 데이터와 매칭) - router.push("/sales/order-management-sales/production-orders/PO-002"); + // 수주 상세 페이지로 이동 (상태가 변경되었으므로) + router.push(`/ko/sales/order-management-sales/${orderId}`); }; // 선택된 우선순위 설정 가져오기 @@ -404,7 +437,22 @@ export default function ProductionOrderCreatePage() { ); } - if (!orderInfo) { + if (error && !order) { + return ( + +
+ +

{error}

+ +
+ + ); + } + + if (!order) { return (
@@ -421,6 +469,19 @@ export default function ProductionOrderCreatePage() { const selectedConfig = getSelectedPriorityConfig(); const workOrderCount = SAMPLE_WORK_ORDER_CARDS.length; + // Order에서 UI에 표시할 데이터 변환 + const orderInfo = { + orderNumber: order.lotNumber, + client: order.client, + siteName: order.siteName, + dueDate: order.expectedShipDate || "-", + itemCount: order.itemCount, + totalQuantity: `${order.itemCount}EA`, + creditGrade: "B (관리)", // API에서 제공하지 않아 기본값 사용 + status: STATUS_LABELS[order.status] || order.status, + amount: order.amount, + }; + return ( {/* 헤더 */} diff --git a/src/components/orders/OrderRegistration.tsx b/src/components/orders/OrderRegistration.tsx index 2b7187e7..3585dc6b 100644 --- a/src/components/orders/OrderRegistration.tsx +++ b/src/components/orders/OrderRegistration.tsx @@ -49,7 +49,8 @@ import { ResponsiveFormTemplate, FormSection, } from "@/components/templates/ResponsiveFormTemplate"; -import { QuotationSelectDialog, QuotationForSelect, QuotationItem } from "./QuotationSelectDialog"; +import { QuotationSelectDialog } from "./QuotationSelectDialog"; +import { type QuotationForSelect, type QuotationItem } from "./actions"; import { ItemAddDialog, OrderItem } from "./ItemAddDialog"; import { formatAmount } from "@/utils/formatAmount"; import { cn } from "@/lib/utils"; diff --git a/src/components/orders/QuotationSelectDialog.tsx b/src/components/orders/QuotationSelectDialog.tsx index e930155e..952e8c53 100644 --- a/src/components/orders/QuotationSelectDialog.tsx +++ b/src/components/orders/QuotationSelectDialog.tsx @@ -4,9 +4,10 @@ * 견적 선택 팝업 * * 확정된 견적 목록에서 수주 전환할 견적을 선택하는 다이얼로그 + * API 연동: getQuotesForSelect (FINALIZED 상태 견적만 조회) */ -import { useState, useEffect } from "react"; +import { useState, useEffect, useCallback } from "react"; import { Dialog, DialogContent, @@ -15,37 +16,10 @@ import { } from "@/components/ui/dialog"; import { Input } from "@/components/ui/input"; import { Badge } from "@/components/ui/badge"; -import { Search, FileText, Check } from "lucide-react"; +import { Search, FileText, Check, Loader2 } from "lucide-react"; import { formatAmount } from "@/utils/formatAmount"; import { cn } from "@/lib/utils"; - -// 견적 타입 -export interface QuotationForSelect { - id: string; - quoteNumber: string; // KD-PR-XXXXXX-XX - grade: string; // A(우량), B(관리), C(주의) - client: string; // 발주처 - siteName: string; // 현장명 - amount: number; // 총 금액 - itemCount: number; // 품목 수 - registrationDate: string; // 견적일 - manager?: string; // 담당자 - contact?: string; // 연락처 - items?: QuotationItem[]; // 품목 내역 -} - -export interface QuotationItem { - id: string; - itemCode: string; - itemName: string; - type: string; // 종 - symbol: string; // 부호 - spec: string; // 규격 - quantity: number; - unit: string; - unitPrice: number; - amount: number; -} +import { getQuotesForSelect, type QuotationForSelect } from "./actions"; interface QuotationSelectDialogProps { open: boolean; @@ -54,81 +28,6 @@ interface QuotationSelectDialogProps { selectedId?: string; } -// 샘플 견적 데이터 (실제 구현에서는 API 연동) -const SAMPLE_QUOTATIONS: QuotationForSelect[] = [ - { - id: "QT-001", - quoteNumber: "KD-PR-251210-01", - grade: "A", - client: "태영건설(주)", - siteName: "데시앙 동탄 파크뷰", - amount: 38800000, - itemCount: 5, - registrationDate: "2024-12-10", - manager: "김철수", - contact: "010-1234-5678", - items: [ - { id: "1", itemCode: "PRD-001", itemName: "국민방화스크린세터", type: "B1", symbol: "FSS1", spec: "7260×2600", quantity: 2, unit: "EA", unitPrice: 8000000, amount: 16000000 }, - { id: "2", itemCode: "PRD-002", itemName: "국민방화스크린세터", type: "B1", symbol: "FSS2", spec: "5000×2400", quantity: 3, unit: "EA", unitPrice: 7600000, amount: 22800000 }, - ], - }, - { - id: "QT-002", - quoteNumber: "KD-PR-251211-02", - grade: "A", - client: "현대건설(주)", - siteName: "힐스테이트 판교역", - amount: 52500000, - itemCount: 8, - registrationDate: "2024-12-11", - manager: "이영희", - contact: "010-2345-6789", - items: [ - { id: "1", itemCode: "PRD-003", itemName: "국민방화스크린세터", type: "B2", symbol: "FSS1", spec: "6000×3000", quantity: 4, unit: "EA", unitPrice: 9500000, amount: 38000000 }, - { id: "2", itemCode: "PRD-004", itemName: "국민방화스크린세터", type: "B1", symbol: "FSS2", spec: "4500×2500", quantity: 2, unit: "EA", unitPrice: 7250000, amount: 14500000 }, - ], - }, - { - id: "QT-003", - quoteNumber: "KD-PR-251208-03", - grade: "B", - client: "GS건설(주)", - siteName: "자이 강남센터", - amount: 45000000, - itemCount: 6, - registrationDate: "2024-12-08", - manager: "박민수", - contact: "010-3456-7890", - items: [], - }, - { - id: "QT-004", - quoteNumber: "KD-PR-251205-04", - grade: "B", - client: "대우건설(주)", - siteName: "푸르지오 송도", - amount: 28900000, - itemCount: 4, - registrationDate: "2024-12-05", - manager: "최지원", - contact: "010-4567-8901", - items: [], - }, - { - id: "QT-005", - quoteNumber: "KD-PR-251201-05", - grade: "A", - client: "포스코건설", - siteName: "더샵 분당센트럴", - amount: 62000000, - itemCount: 10, - registrationDate: "2024-12-01", - manager: "정수민", - contact: "010-5678-9012", - items: [], - }, -]; - // 등급 배지 컴포넌트 function GradeBadge({ grade }: { grade: string }) { const config: Record = { @@ -151,25 +50,48 @@ export function QuotationSelectDialog({ selectedId, }: QuotationSelectDialogProps) { const [searchTerm, setSearchTerm] = useState(""); - const [quotations] = useState(SAMPLE_QUOTATIONS); + const [quotations, setQuotations] = useState([]); + const [isLoading, setIsLoading] = useState(false); + const [error, setError] = useState(null); - // 검색 필터링 - const filteredQuotations = quotations.filter((q) => { - const searchLower = searchTerm.toLowerCase(); - return ( - !searchTerm || - q.quoteNumber.toLowerCase().includes(searchLower) || - q.client.toLowerCase().includes(searchLower) || - q.siteName.toLowerCase().includes(searchLower) - ); - }); + // 견적 목록 조회 + const fetchQuotations = useCallback(async (query?: string) => { + setIsLoading(true); + setError(null); + try { + const result = await getQuotesForSelect({ q: query, size: 50 }); + if (result.success && result.data) { + setQuotations(result.data.items); + } else { + setError(result.error || "견적 목록 조회에 실패했습니다."); + setQuotations([]); + } + } catch { + setError("서버 오류가 발생했습니다."); + setQuotations([]); + } finally { + setIsLoading(false); + } + }, []); - // 다이얼로그 열릴 때 검색어 초기화 + // 다이얼로그 열릴 때 데이터 로드 useEffect(() => { if (open) { setSearchTerm(""); + fetchQuotations(); } - }, [open]); + }, [open, fetchQuotations]); + + // 검색어 변경 시 디바운스 적용하여 API 호출 + useEffect(() => { + if (!open) return; + + const timer = setTimeout(() => { + fetchQuotations(searchTerm || undefined); + }, 300); + + return () => clearTimeout(timer); + }, [searchTerm, open, fetchQuotations]); const handleSelect = (quotation: QuotationForSelect) => { onSelect(quotation); @@ -199,60 +121,77 @@ export function QuotationSelectDialog({ {/* 안내 문구 */}
- 전환 가능한 견적 {filteredQuotations.length}건 (최종확정 상태) + {isLoading ? ( + + + 견적 목록을 불러오는 중... + + ) : error ? ( + {error} + ) : ( + `전환 가능한 견적 ${quotations.length}건 (최종확정 상태)` + )}
{/* 견적 목록 */}
- {filteredQuotations.map((quotation) => ( -
handleSelect(quotation)} - className={cn( - "p-4 border rounded-lg cursor-pointer transition-colors", - "hover:bg-muted/50 hover:border-primary/50", - selectedId === quotation.id && "border-primary bg-primary/5" - )} - > - {/* 상단: 견적번호 + 등급 */} -
-
- - {quotation.quoteNumber} - - + {isLoading ? ( +
+ +
+ ) : ( + <> + {quotations.map((quotation) => ( +
handleSelect(quotation)} + className={cn( + "p-4 border rounded-lg cursor-pointer transition-colors", + "hover:bg-muted/50 hover:border-primary/50", + selectedId === quotation.id && "border-primary bg-primary/5" + )} + > + {/* 상단: 견적번호 + 등급 */} +
+
+ + {quotation.quoteNumber} + + +
+ {selectedId === quotation.id && ( + + )} +
+ + {/* 발주처 */} +
+ {quotation.client} +
+ + {/* 현장명 + 금액 */} +
+ + [{quotation.siteName}] + + + {formatAmount(quotation.amount)}원 + +
+ + {/* 품목 수 */} +
+ {quotation.itemCount}개 품목 +
- {selectedId === quotation.id && ( - - )} -
+ ))} - {/* 발주처 */} -
- {quotation.client} -
- - {/* 현장명 + 금액 */} -
- - [{quotation.siteName}] - - - {formatAmount(quotation.amount)}원 - -
- - {/* 품목 수 */} -
- {quotation.itemCount}개 품목 -
-
- ))} - - {filteredQuotations.length === 0 && ( -
- 검색 결과가 없습니다. -
+ {quotations.length === 0 && !error && ( +
+ 검색 결과가 없습니다. +
+ )} + )}
diff --git a/src/components/orders/actions.ts b/src/components/orders/actions.ts index 2f81de08..6a5dd22a 100644 --- a/src/components/orders/actions.ts +++ b/src/components/orders/actions.ts @@ -70,6 +70,47 @@ interface ApiQuote { site_name: string | null; } +// 견적 목록 조회용 상세 타입 +interface ApiQuoteForSelect { + id: number; + quote_number: string; + registration_date: string; + status: string; + client_id: number | null; + client_name: string | null; + site_name: string | null; + supply_amount: number; + tax_amount: number; + total_amount: number; + item_count?: number; + author?: string | null; + manager?: string | null; + contact?: string | null; + client?: { + id: number; + name: string; + grade?: string; + representative?: string; + phone?: string; + } | null; + items?: ApiQuoteItem[]; +} + +interface ApiQuoteItem { + id: number; + item_code?: string; + item_name: string; + type_code?: string; + symbol?: string; + specification?: string; + quantity: number; + unit?: string; + unit_price: number; + supply_amount: number; + tax_amount: number; + total_amount: number; +} + interface ApiWorkOrder { id: number; tenant_id: number; @@ -249,6 +290,7 @@ export interface CreateFromQuoteData { // 생산지시 생성용 export interface CreateProductionOrderData { processType?: 'screen' | 'slat' | 'bending'; + priority?: 'urgent' | 'high' | 'normal' | 'low'; assigneeId?: number; teamId?: number; scheduledDate?: string; @@ -280,6 +322,34 @@ export interface ProductionOrderResult { order: Order; } +// 견적 선택용 타입 (QuotationSelectDialog용) +export interface QuotationForSelect { + id: string; + quoteNumber: string; // KD-PR-XXXXXX-XX + grade: string; // A(우량), B(관리), C(주의) + client: string; // 발주처 + siteName: string; // 현장명 + amount: number; // 총 금액 + itemCount: number; // 품목 수 + registrationDate: string; // 견적일 + manager?: string; // 담당자 + contact?: string; // 연락처 + items?: QuotationItem[]; // 품목 내역 +} + +export interface QuotationItem { + id: string; + itemCode: string; + itemName: string; + type: string; // 종 + symbol: string; // 부호 + spec: string; // 규격 + quantity: number; + unit: string; + unitPrice: number; + amount: number; +} + // ============================================================================ // 상태 매핑 // ============================================================================ @@ -415,6 +485,37 @@ function transformWorkOrderApiToFrontend(apiData: ApiWorkOrder): WorkOrder { }; } +function transformQuoteForSelect(apiData: ApiQuoteForSelect): QuotationForSelect { + return { + id: String(apiData.id), + quoteNumber: apiData.quote_number, + grade: apiData.client?.grade || 'B', // 기본값 B(관리) + client: apiData.client_name || apiData.client?.name || '', + siteName: apiData.site_name || '', + amount: apiData.total_amount, + itemCount: apiData.item_count || apiData.items?.length || 0, + registrationDate: apiData.registration_date, + manager: apiData.manager ?? undefined, + contact: apiData.contact ?? apiData.client?.phone ?? undefined, + items: apiData.items?.map(transformQuoteItemForSelect), + }; +} + +function transformQuoteItemForSelect(apiItem: ApiQuoteItem): QuotationItem { + return { + id: String(apiItem.id), + itemCode: apiItem.item_code || '', + itemName: apiItem.item_name, + type: apiItem.type_code || '', + symbol: apiItem.symbol || '', + spec: apiItem.specification || '', + quantity: apiItem.quantity, + unit: apiItem.unit || 'EA', + unitPrice: apiItem.unit_price, + amount: apiItem.total_amount, + }; +} + // ============================================================================ // API 함수 // ============================================================================ @@ -815,6 +916,7 @@ export async function createProductionOrder( try { const apiData: Record = {}; if (data?.processType) apiData.process_type = data.processType; + if (data?.priority) apiData.priority = data.priority; if (data?.assigneeId) apiData.assignee_id = data.assigneeId; if (data?.teamId) apiData.team_id = data.teamId; if (data?.scheduledDate) apiData.scheduled_date = data.scheduledDate; @@ -851,3 +953,58 @@ export async function createProductionOrder( return { success: false, error: '서버 오류가 발생했습니다.' }; } } + +/** + * 수주 변환용 확정 견적 목록 조회 + * QuotationSelectDialog에서 사용 + */ +export async function getQuotesForSelect(params?: { + q?: string; + page?: number; + size?: number; +}): Promise<{ + success: boolean; + data?: { items: QuotationForSelect[]; total: number }; + error?: string; + __authError?: boolean; +}> { + try { + const searchParams = new URLSearchParams(); + + // 확정(FINALIZED) 상태의 견적만 조회 + searchParams.set('status', 'FINALIZED'); + if (params?.q) searchParams.set('q', params.q); + if (params?.page) searchParams.set('page', String(params.page)); + if (params?.size) searchParams.set('size', String(params.size || 50)); + + const { response, error } = await serverFetch( + `${process.env.NEXT_PUBLIC_API_URL}/api/v1/quotes?${searchParams.toString()}`, + { method: 'GET', cache: 'no-store' } + ); + + if (error) { + return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; + } + + if (!response) { + return { success: false, error: '견적 목록 조회에 실패했습니다.' }; + } + + const result: ApiResponse> = await response.json(); + + if (!response.ok || !result.success) { + return { success: false, error: result.message || '견적 목록 조회에 실패했습니다.' }; + } + + return { + success: true, + data: { + items: result.data.data.map(transformQuoteForSelect), + total: result.data.total, + }, + }; + } catch (error) { + console.error('[getQuotesForSelect] Error:', error); + return { success: false, error: '서버 오류가 발생했습니다.' }; + } +} From d15a2037d7c62a7d1adad3d36a7e3770840c9fe8 Mon Sep 17 00:00:00 2001 From: kent Date: Fri, 9 Jan 2026 15:51:36 +0900 Subject: [PATCH 10/45] =?UTF-8?q?feat(work-orders):=20=EB=8B=A4=EC=A4=91?= =?UTF-8?q?=20=EB=8B=B4=EB=8B=B9=EC=9E=90=20UI=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - actions.ts: createWorkOrder에 assigneeIds 배열 파라미터 추가 - actions.ts: assignWorkOrder가 단일/배열 모두 지원하도록 변경 - WorkOrderCreate.tsx: assigneeIds 배열로 API 전송 - WorkOrderDetail.tsx: 다중 담당자 표시 (쉼표 구분) --- .../production/WorkOrders/WorkOrderCreate.tsx | 2 +- .../production/WorkOrders/WorkOrderDetail.tsx | 10 ++++++++-- .../production/WorkOrders/actions.ts | 18 ++++++++++++++---- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/components/production/WorkOrders/WorkOrderCreate.tsx b/src/components/production/WorkOrders/WorkOrderCreate.tsx index 3977a0e8..cf2ef9a9 100644 --- a/src/components/production/WorkOrders/WorkOrderCreate.tsx +++ b/src/components/production/WorkOrders/WorkOrderCreate.tsx @@ -151,7 +151,7 @@ export function WorkOrderCreate() { projectName: formData.projectName, processType: formData.processType, scheduledDate: formData.shipmentDate, - assigneeId: formData.assignees.length > 0 ? parseInt(formData.assignees[0]) : undefined, + assigneeIds: formData.assignees.map(id => parseInt(id)), memo: formData.note || undefined, }); diff --git a/src/components/production/WorkOrders/WorkOrderDetail.tsx b/src/components/production/WorkOrders/WorkOrderDetail.tsx index e5e61db9..16a2160b 100644 --- a/src/components/production/WorkOrders/WorkOrderDetail.tsx +++ b/src/components/production/WorkOrders/WorkOrderDetail.tsx @@ -275,7 +275,9 @@ export function WorkOrderDetail({ orderId }: WorkOrderDetailProps) { quantity: order.items.reduce((sum, item) => sum + item.quantity, 0), progress: order.currentStep * 20, // 대략적인 진행률 process: order.processType as 'screen' | 'slat' | 'bending', - assignees: [order.assignee], + assignees: order.assignees && order.assignees.length > 0 + ? order.assignees.map(a => a.name) + : [order.assignee], instruction: order.note || '', status: 'in_progress' as const, priority: order.priority <= 3 ? 'high' : order.priority <= 6 ? 'medium' : 'low', @@ -364,7 +366,11 @@ export function WorkOrderDetail({ orderId }: WorkOrderDetailProps) {

작업자

-

{order.assignee}

+

+ {order.assignees && order.assignees.length > 0 + ? order.assignees.map(a => a.name).join(', ') + : order.assignee} +

diff --git a/src/components/production/WorkOrders/actions.ts b/src/components/production/WorkOrders/actions.ts index 96e805cb..31a5a620 100644 --- a/src/components/production/WorkOrders/actions.ts +++ b/src/components/production/WorkOrders/actions.ts @@ -220,15 +220,23 @@ export async function getWorkOrderById(id: string): Promise<{ export async function createWorkOrder( data: Partial & { salesOrderId?: number; - assigneeId?: number; + assigneeId?: number; // 단일 담당자 (하위 호환) + assigneeIds?: number[]; // 다중 담당자 teamId?: number; } ): Promise<{ success: boolean; data?: WorkOrder; error?: string }> { try { + // 다중 담당자 우선, 없으면 단일 담당자 배열로 변환 + const assigneeIds = data.assigneeIds && data.assigneeIds.length > 0 + ? data.assigneeIds + : data.assigneeId + ? [data.assigneeId] + : undefined; + const apiData = { ...transformFrontendToApi(data), sales_order_id: data.salesOrderId, - assignee_id: data.assigneeId, + assignee_ids: assigneeIds, // 배열로 전송 team_id: data.teamId, }; @@ -384,11 +392,13 @@ export async function updateWorkOrderStatus( // ===== 담당자 배정 ===== export async function assignWorkOrder( id: string, - assigneeId: number, + assigneeIds: number | number[], // 단일 또는 다중 담당자 teamId?: number ): Promise<{ success: boolean; data?: WorkOrder; error?: string }> { try { - const body: { assignee_id: number; team_id?: number } = { assignee_id: assigneeId }; + // 배열로 통일 + const ids = Array.isArray(assigneeIds) ? assigneeIds : [assigneeIds]; + const body: { assignee_ids: number[]; team_id?: number } = { assignee_ids: ids }; if (teamId) body.team_id = teamId; console.log('[WorkOrderActions] PATCH assign request:', body); From 9d30555265cd85550053455551b4c741aa13d03f Mon Sep 17 00:00:00 2001 From: kent Date: Fri, 9 Jan 2026 16:08:18 +0900 Subject: [PATCH 11/45] =?UTF-8?q?feat(=EC=8B=9C=EA=B3=B5=EC=82=AC):=201.2?= =?UTF-8?q?=20=EC=9D=B8=EC=88=98=EC=9D=B8=EA=B3=84=EB=B3=B4=EA=B3=A0?= =?UTF-8?q?=EC=84=9C=20-=20Frontend=20API=20=EC=97=B0=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Mock 데이터 제거, 실제 API 연동으로 변환 - apiRequest 헬퍼 함수 구현 (쿠키 기반 인증) - 7개 API 함수 구현: list, stats, detail, create, update, delete, bulk-delete - snake_case → camelCase 타입 변환 함수 추가 --- .../construction/handover-report/actions.ts | 681 ++++++++++-------- 1 file changed, 390 insertions(+), 291 deletions(-) diff --git a/src/components/business/construction/handover-report/actions.ts b/src/components/business/construction/handover-report/actions.ts index 21208cf7..938f1ac0 100644 --- a/src/components/business/construction/handover-report/actions.ts +++ b/src/components/business/construction/handover-report/actions.ts @@ -1,128 +1,243 @@ 'use server'; -import type { HandoverReport, HandoverReportStats, HandoverReportDetail, HandoverReportFormData } from './types'; +import { cookies } from 'next/headers'; +import type { + HandoverReport, + HandoverReportDetail, + HandoverReportStats, + HandoverReportFormData, + ConstructionManager, + ContractItem, + ExternalEquipmentCost, +} from './types'; -// 목업 데이터 -const MOCK_REPORTS: HandoverReport[] = [ - { - id: '1', - reportNumber: '123123', - partnerName: '통신공사', - siteName: '서울역사 통신공사', - contractManagerName: '홍길동', - constructionPMName: '김PM', - totalSites: 21, - contractAmount: 105800000, - contractStartDate: '2025-12-12', - contractEndDate: '2026-12-12', - status: 'pending', - contractId: '1', - createdAt: '2025-01-01', - updatedAt: '2025-01-01', - }, - { - id: '2', - reportNumber: '123124', - partnerName: '야사건설', - siteName: '부산항 건설현장', - contractManagerName: '김철수', - constructionPMName: '이PM', - totalSites: 15, - contractAmount: 10500000, - contractStartDate: '2025-11-01', - contractEndDate: '2026-11-01', - status: 'completed', - contractId: '2', - createdAt: '2025-01-02', - updatedAt: '2025-01-02', - }, - { - id: '3', - reportNumber: '123125', - partnerName: '여의건설', - siteName: '인천공항 확장공사', - contractManagerName: '이영희', - constructionPMName: '박PM', - totalSites: 30, - contractAmount: 10000000, - contractStartDate: '2025-10-15', - contractEndDate: '2026-10-15', - status: 'pending', - contractId: '3', - createdAt: '2025-01-03', - updatedAt: '2025-01-03', - }, - { - id: '4', - reportNumber: '123126', - partnerName: '통신공사', - siteName: '대전역 리모델링', - contractManagerName: '홍길동', - constructionPMName: '김PM', - totalSites: 18, - contractAmount: 10000000, - contractStartDate: '2025-09-20', - contractEndDate: '2026-03-20', - status: 'completed', - contractId: '4', - createdAt: '2025-01-04', - updatedAt: '2025-01-04', - }, - { - id: '5', - reportNumber: '123127', - partnerName: '야사건설', - siteName: '광주 신축현장', - contractManagerName: '김철수', - constructionPMName: '이PM', - totalSites: 17, - contractAmount: 10500000, - contractStartDate: '2025-08-01', - contractEndDate: '2026-08-01', - status: 'pending', - contractId: '5', - createdAt: '2025-01-05', - updatedAt: '2025-01-05', - }, - { - id: '6', - reportNumber: '123128', - partnerName: '여의건설', - siteName: '세종시 행정타운', - contractManagerName: '이영희', - constructionPMName: '박PM', - totalSites: 25, - contractAmount: 100000000, - contractStartDate: '2025-07-15', - contractEndDate: '2026-07-15', - status: 'completed', - contractId: '6', - createdAt: '2025-01-06', - updatedAt: '2025-01-06', - }, - { - id: '7', - reportNumber: '123129', - partnerName: '통신공사', - siteName: '제주 관광단지', - contractManagerName: '홍길동', - constructionPMName: null, - totalSites: 12, - contractAmount: 105800000, - contractStartDate: '2025-06-01', - contractEndDate: '2026-06-01', - status: 'pending', - contractId: '7', - createdAt: '2025-01-07', - updatedAt: '2025-01-07', - }, -]; +/** + * 주일 기업 - 인수인계보고서관리 Server Actions + * API 연동 버전 + */ + +// API 기본 URL +const API_BASE_URL = process.env.NEXT_PUBLIC_API_URL || 'http://api.sam.kr'; +const API_KEY = process.env.API_KEY || ''; + +/** + * API 요청 헬퍼 함수 + */ +async function apiRequest( + endpoint: string, + options: RequestInit = {} +): Promise<{ success: boolean; data?: T; error?: string; message?: string }> { + try { + const cookieStore = await cookies(); + const accessToken = cookieStore.get('access_token')?.value; + + const headers: Record = { + 'Accept': 'application/json', + 'Content-Type': 'application/json', + 'X-API-KEY': API_KEY, + }; + + if (accessToken) { + headers['Authorization'] = `Bearer ${accessToken}`; + } + + const url = `${API_BASE_URL}/api/v1${endpoint}`; + console.log('🔵 [HandoverReport API]', options.method || 'GET', url); + + const response = await fetch(url, { + ...options, + headers: { + ...headers, + ...options.headers, + }, + }); + + const result = await response.json(); + console.log('🔵 [HandoverReport API] Response status:', response.status); + + if (!response.ok) { + return { + success: false, + error: result.message || `API 오류: ${response.status}`, + }; + } + + return { + success: result.success ?? true, + data: result.data, + message: result.message, + }; + } catch (error) { + console.error('API request error:', error); + return { + success: false, + error: error instanceof Error ? error.message : '알 수 없는 오류가 발생했습니다.', + }; + } +} + +/** + * API 응답 → 프론트엔드 타입 변환 (목록용) + */ +function transformHandoverReport(apiData: Record): HandoverReport { + return { + id: String(apiData.id), + reportNumber: String(apiData.report_number || ''), + partnerName: String(apiData.partner_name || ''), + siteName: String(apiData.site_name || ''), + contractManagerName: String(apiData.contract_manager_name || ''), + constructionPMName: apiData.construction_pm_name ? String(apiData.construction_pm_name) : null, + totalSites: Number(apiData.total_sites || 0), + contractAmount: Number(apiData.contract_amount || 0), + contractStartDate: apiData.contract_start_date ? String(apiData.contract_start_date) : null, + contractEndDate: apiData.contract_end_date ? String(apiData.contract_end_date) : null, + status: (apiData.status as 'pending' | 'completed') || 'pending', + contractId: String(apiData.contract_id || ''), + createdAt: String(apiData.created_at || ''), + updatedAt: String(apiData.updated_at || ''), + }; +} + +/** + * API 응답 → 프론트엔드 타입 변환 (상세용) + */ +function transformHandoverReportDetail(apiData: Record): HandoverReportDetail { + // 공사담당자 목록 변환 + const managersData = apiData.managers as Record[] | undefined; + const constructionManagers: ConstructionManager[] = (managersData || []).map((m) => ({ + id: String(m.id || ''), + name: String(m.name || ''), + nonPerformanceReason: String(m.non_performance_reason || ''), + signature: m.signature ? String(m.signature) : null, + })); + + // 계약 ITEM 목록 변환 + const itemsData = apiData.items as Record[] | undefined; + const contractItems: ContractItem[] = (itemsData || []).map((item) => ({ + id: String(item.id || ''), + no: Number(item.item_no || item.no || 0), + name: String(item.name || ''), + product: String(item.product || ''), + quantity: Number(item.quantity || 0), + remark: String(item.remark || ''), + })); + + // 장비 외 실행금액 변환 + const externalCostData = apiData.external_equipment_cost as Record | undefined; + const externalEquipmentCost: ExternalEquipmentCost = externalCostData + ? { + shippingCost: Number(externalCostData.shipping_cost || externalCostData.shippingCost || 0), + highAltitudeWork: Number(externalCostData.high_altitude_work || externalCostData.highAltitudeWork || 0), + publicExpense: Number(externalCostData.public_expense || externalCostData.publicExpense || 0), + } + : { + shippingCost: 0, + highAltitudeWork: 0, + publicExpense: 0, + }; + + return { + id: String(apiData.id), + reportNumber: String(apiData.report_number || ''), + partnerName: String(apiData.partner_name || ''), + siteName: String(apiData.site_name || ''), + contractManagerName: String(apiData.contract_manager_name || ''), + constructionPMName: apiData.construction_pm_name ? String(apiData.construction_pm_name) : null, + constructionPMId: apiData.construction_pm_id ? String(apiData.construction_pm_id) : null, + totalSites: Number(apiData.total_sites || 0), + contractAmount: Number(apiData.contract_amount || 0), + contractDate: apiData.contract_date ? String(apiData.contract_date) : null, + contractStartDate: apiData.contract_start_date ? String(apiData.contract_start_date) : null, + contractEndDate: apiData.contract_end_date ? String(apiData.contract_end_date) : null, + completionDate: apiData.completion_date ? String(apiData.completion_date) : null, + status: (apiData.status as 'pending' | 'completed') || 'pending', + contractId: String(apiData.contract_id || ''), + createdAt: String(apiData.created_at || ''), + updatedAt: String(apiData.updated_at || ''), + constructionManagers, + contractItems, + hasSecondaryPiping: Boolean(apiData.has_secondary_piping), + secondaryPipingAmount: Number(apiData.secondary_piping_amount || 0), + secondaryPipingNote: String(apiData.secondary_piping_note || ''), + hasCoating: Boolean(apiData.has_coating), + coatingAmount: Number(apiData.coating_amount || 0), + coatingNote: String(apiData.coating_note || ''), + externalEquipmentCost, + specialNotes: String(apiData.special_notes || ''), + }; +} + +/** + * 프론트엔드 → API 요청 타입 변환 + */ +function transformToApiRequest(data: Partial): Record { + const apiData: Record = {}; + + if (data.reportNumber !== undefined) apiData.report_number = data.reportNumber; + if (data.partnerName !== undefined) apiData.partner_name = data.partnerName || null; + if (data.siteName !== undefined) apiData.site_name = data.siteName; + if (data.contractManagerName !== undefined) apiData.contract_manager_name = data.contractManagerName || null; + if (data.contractDate !== undefined) apiData.contract_date = data.contractDate || null; + if (data.totalSites !== undefined) apiData.total_sites = data.totalSites; + if (data.contractStartDate !== undefined) apiData.contract_start_date = data.contractStartDate || null; + if (data.contractEndDate !== undefined) apiData.contract_end_date = data.contractEndDate || null; + if (data.contractAmount !== undefined) apiData.contract_amount = data.contractAmount; + if (data.constructionPMId !== undefined) apiData.construction_pm_id = data.constructionPMId || null; + if (data.constructionPMName !== undefined) apiData.construction_pm_name = data.constructionPMName || null; + if (data.status !== undefined) apiData.status = data.status; + if (data.hasSecondaryPiping !== undefined) apiData.has_secondary_piping = data.hasSecondaryPiping; + if (data.secondaryPipingNote !== undefined) apiData.secondary_piping_note = data.secondaryPipingNote || null; + if (data.hasCoating !== undefined) apiData.has_coating = data.hasCoating; + if (data.coatingNote !== undefined) apiData.coating_note = data.coatingNote || null; + if (data.specialNotes !== undefined) apiData.special_notes = data.specialNotes || null; + + // 장비 외 실행금액 변환 + if (data.externalEquipmentCost !== undefined) { + apiData.external_equipment_cost = { + shipping_cost: data.externalEquipmentCost.shippingCost, + high_altitude_work: data.externalEquipmentCost.highAltitudeWork, + public_expense: data.externalEquipmentCost.publicExpense, + }; + } + + // 공사담당자 변환 + if (data.constructionManagers !== undefined) { + apiData.managers = data.constructionManagers.map((m) => ({ + name: m.name, + non_performance_reason: m.nonPerformanceReason || null, + signature: m.signature || null, + })); + } + + // 계약 ITEM 변환 + if (data.contractItems !== undefined) { + apiData.items = data.contractItems.map((item, index) => ({ + item_no: item.no || index + 1, + name: item.name, + product: item.product || null, + quantity: item.quantity, + remark: item.remark || null, + })); + } + + return apiData; +} + +// ============================================================ +// API 연동 함수 +// ============================================================ interface GetHandoverReportListParams { size?: number; page?: number; startDate?: string; endDate?: string; + search?: string; + status?: string; + partnerId?: string; + contractManagerId?: string; + constructionPMId?: string; + sortBy?: string; } interface GetHandoverReportListResult { @@ -132,33 +247,78 @@ interface GetHandoverReportListResult { total: number; page: number; size: number; + totalPages: number; }; error?: string; } +/** + * 인수인계보고서 목록 조회 + */ export async function getHandoverReportList( params: GetHandoverReportListParams = {} ): Promise { try { - // 실제 API 호출 시 여기에 구현 - // const response = await fetch(`/api/v1/handover-reports?...`); + const queryParams = new URLSearchParams(); + + if (params.search) queryParams.append('search', params.search); + if (params.status && params.status !== 'all') queryParams.append('status', params.status); + if (params.partnerId && params.partnerId !== 'all') queryParams.append('partner_id', params.partnerId); + if (params.contractManagerId && params.contractManagerId !== 'all') queryParams.append('contract_manager_id', params.contractManagerId); + if (params.constructionPMId && params.constructionPMId !== 'all') queryParams.append('construction_pm_id', params.constructionPMId); + if (params.startDate) queryParams.append('start_date', params.startDate); + if (params.endDate) queryParams.append('end_date', params.endDate); + if (params.page) queryParams.append('page', String(params.page)); + if (params.size) queryParams.append('per_page', String(params.size)); + + // 정렬 파라미터 변환 + if (params.sortBy) { + const sortMap: Record = { + contractDateDesc: { field: 'contract_start_date', dir: 'desc' }, + contractDateAsc: { field: 'contract_start_date', dir: 'asc' }, + partnerNameAsc: { field: 'partner_name', dir: 'asc' }, + partnerNameDesc: { field: 'partner_name', dir: 'desc' }, + siteNameAsc: { field: 'site_name', dir: 'asc' }, + siteNameDesc: { field: 'site_name', dir: 'desc' }, + }; + const sort = sortMap[params.sortBy]; + if (sort) { + queryParams.append('sort_by', sort.field); + queryParams.append('sort_dir', sort.dir); + } + } + + const queryString = queryParams.toString(); + const endpoint = `/construction/handover-reports${queryString ? `?${queryString}` : ''}`; + + const result = await apiRequest<{ + data: Record[]; + current_page: number; + per_page: number; + total: number; + last_page: number; + }>(endpoint); + + if (!result.success || !result.data) { + return { success: false, error: result.error || '인수인계보고서 목록 조회에 실패했습니다.' }; + } + + const apiData = result.data; + const items = (apiData.data || []).map(transformHandoverReport); - // 목업 데이터 반환 return { success: true, data: { - items: MOCK_REPORTS, - total: MOCK_REPORTS.length, - page: params.page || 1, - size: params.size || 20, + items, + total: apiData.total || 0, + page: apiData.current_page || 1, + size: apiData.per_page || 20, + totalPages: apiData.last_page || 1, }, }; } catch (error) { - console.error('Failed to fetch handover report list:', error); - return { - success: false, - error: '인수인계보고서 목록을 불러오는데 실패했습니다.', - }; + console.error('getHandoverReportList error:', error); + return { success: false, error: '인수인계보고서 목록을 불러오는데 실패했습니다.' }; } } @@ -168,28 +328,34 @@ interface GetHandoverReportStatsResult { error?: string; } +/** + * 인수인계보고서 통계 조회 + */ export async function getHandoverReportStats(): Promise { try { - // 실제 API 호출 시 여기에 구현 + const result = await apiRequest<{ + total_count: number; + pending_count: number; + completed_count: number; + total_amount?: number; + total_sites?: number; + }>('/construction/handover-reports/stats'); - // 목업 통계 반환 - const pending = MOCK_REPORTS.filter(r => r.status === 'pending').length; - const completed = MOCK_REPORTS.filter(r => r.status === 'completed').length; + if (!result.success || !result.data) { + return { success: false, error: result.error || '통계를 불러오는데 실패했습니다.' }; + } return { success: true, data: { - total: MOCK_REPORTS.length, - pending, - completed, + total: result.data.total_count || 0, + pending: result.data.pending_count || 0, + completed: result.data.completed_count || 0, }, }; } catch (error) { - console.error('Failed to fetch handover report stats:', error); - return { - success: false, - error: '통계를 불러오는데 실패했습니다.', - }; + console.error('getHandoverReportStats error:', error); + return { success: false, error: '통계를 불러오는데 실패했습니다.' }; } } @@ -198,20 +364,23 @@ interface DeleteHandoverReportResult { error?: string; } +/** + * 인수인계보고서 삭제 + */ export async function deleteHandoverReport(id: string): Promise { try { - // 실제 API 호출 시 여기에 구현 - console.log('Deleting handover report:', id); + const result = await apiRequest(`/construction/handover-reports/${id}`, { + method: 'DELETE', + }); - return { - success: true, - }; + if (!result.success) { + return { success: false, error: result.error || '삭제에 실패했습니다.' }; + } + + return { success: true }; } catch (error) { - console.error('Failed to delete handover report:', error); - return { - success: false, - error: '삭제에 실패했습니다.', - }; + console.error('deleteHandoverReport error:', error); + return { success: false, error: '삭제에 실패했습니다.' }; } } @@ -221,180 +390,110 @@ interface DeleteHandoverReportsResult { error?: string; } +/** + * 인수인계보고서 일괄 삭제 + */ export async function deleteHandoverReports(ids: string[]): Promise { try { - // 실제 API 호출 시 여기에 구현 - console.log('Deleting handover reports:', ids); + const result = await apiRequest('/construction/handover-reports/bulk', { + method: 'DELETE', + body: JSON.stringify({ ids: ids.map((id) => Number(id)) }), + }); - return { - success: true, - deletedCount: ids.length, - }; + if (!result.success) { + return { success: false, error: result.error || '일괄 삭제에 실패했습니다.' }; + } + + return { success: true, deletedCount: ids.length }; } catch (error) { - console.error('Failed to delete handover reports:', error); - return { - success: false, - error: '일괄 삭제에 실패했습니다.', - }; + console.error('deleteHandoverReports error:', error); + return { success: false, error: '일괄 삭제에 실패했습니다.' }; } } -// 목업 상세 데이터 -const MOCK_REPORT_DETAILS: Record = { - '1': { - id: '1', - reportNumber: '123123', - partnerName: '통신공사', - siteName: '서울역사 통신공사', - contractManagerName: '홍길동', - constructionPMName: '김PM', - constructionPMId: 'pm1', - totalSites: 21, - contractAmount: 105800000, - contractDate: '2025-12-12', - contractStartDate: '2026-01-01', - contractEndDate: '2026-12-10', - status: 'pending', - contractId: '1', - createdAt: '2025-01-01', - updatedAt: '2025-01-01', - completionDate: '2026-05-01', - constructionManagers: [ - { id: 'mgr1', name: '홍길동', isNonPerformanceUsed: false }, - { id: 'mgr2', name: '김철수', isNonPerformanceUsed: true }, - ], - contractItems: [ - { id: 'item1', no: 1, name: '접지방화서터', product: '제품', quantity: 1000, remark: '품질인증적용' }, - { id: 'item2', no: 2, name: '스크린방화서터', product: '제품', quantity: 111, remark: '품질인증적용' }, - ], - hasSecondaryPiping: true, - secondaryPipingAmount: 1200000, - hasCoating: true, - coatingAmount: 500000, - externalEquipmentCost: { - shippingCost: 1500000, - highAltitudeWork: 800000, - publicExpense: 10000000, - }, - specialNotes: '특이사항 내용이 여기에 표시됩니다.', - }, - '2': { - id: '2', - reportNumber: '123124', - partnerName: '야사건설', - siteName: '부산항 건설현장', - contractManagerName: '김철수', - constructionPMName: '이PM', - constructionPMId: 'pm2', - totalSites: 15, - contractAmount: 10500000, - contractDate: '2025-11-01', - contractStartDate: '2025-11-01', - contractEndDate: '2026-11-01', - status: 'completed', - contractId: '2', - createdAt: '2025-01-02', - updatedAt: '2025-01-02', - completionDate: '2026-04-01', - constructionManagers: [ - { id: 'mgr3', name: '이영희', isNonPerformanceUsed: false }, - ], - contractItems: [ - { id: 'item3', no: 1, name: '방화문', product: '제품A', quantity: 500, remark: '' }, - ], - hasSecondaryPiping: false, - secondaryPipingAmount: 0, - hasCoating: false, - coatingAmount: 0, - externalEquipmentCost: { - shippingCost: 500000, - highAltitudeWork: 0, - publicExpense: 2000000, - }, - specialNotes: '', - }, -}; - interface GetHandoverReportDetailResult { success: boolean; data?: HandoverReportDetail; error?: string; } +/** + * 인수인계보고서 상세 조회 + */ export async function getHandoverReportDetail(id: string): Promise { try { - // 실제 API 호출 시 여기에 구현 - // const response = await fetch(`/api/v1/handover-reports/${id}`); + const result = await apiRequest>(`/construction/handover-reports/${id}`); - const detail = MOCK_REPORT_DETAILS[id]; - - if (!detail) { - // 목록 데이터에서 기본 상세 생성 - const report = MOCK_REPORTS.find(r => r.id === id); - if (report) { - const generatedDetail: HandoverReportDetail = { - ...report, - contractDate: report.contractStartDate, - constructionPMId: 'pm1', - completionDate: null, - constructionManagers: [], - contractItems: [], - hasSecondaryPiping: false, - secondaryPipingAmount: 0, - hasCoating: false, - coatingAmount: 0, - externalEquipmentCost: { - shippingCost: 0, - highAltitudeWork: 0, - publicExpense: 0, - }, - specialNotes: '', - }; - return { - success: true, - data: generatedDetail, - }; - } - return { - success: false, - error: '인수인계보고서를 찾을 수 없습니다.', - }; + if (!result.success || !result.data) { + return { success: false, error: result.error || '인수인계보고서를 찾을 수 없습니다.' }; } - return { - success: true, - data: detail, - }; + return { success: true, data: transformHandoverReportDetail(result.data) }; } catch (error) { - console.error('Failed to fetch handover report detail:', error); - return { - success: false, - error: '인수인계보고서 상세 정보를 불러오는데 실패했습니다.', - }; + console.error('getHandoverReportDetail error:', error); + return { success: false, error: '인수인계보고서 상세 정보를 불러오는데 실패했습니다.' }; } } interface UpdateHandoverReportResult { success: boolean; + data?: HandoverReportDetail; error?: string; } +/** + * 인수인계보고서 수정 + */ export async function updateHandoverReport( id: string, data: HandoverReportFormData ): Promise { try { - // 실제 API 호출 시 여기에 구현 - console.log('Updating handover report:', id, data); + const apiData = transformToApiRequest(data); - return { - success: true, - }; + const result = await apiRequest>(`/construction/handover-reports/${id}`, { + method: 'PUT', + body: JSON.stringify(apiData), + }); + + if (!result.success || !result.data) { + return { success: false, error: result.error || '수정에 실패했습니다.' }; + } + + return { success: true, data: transformHandoverReportDetail(result.data) }; } catch (error) { - console.error('Failed to update handover report:', error); - return { - success: false, - error: '수정에 실패했습니다.', - }; + console.error('updateHandoverReport error:', error); + return { success: false, error: '수정에 실패했습니다.' }; } } + +interface CreateHandoverReportResult { + success: boolean; + data?: HandoverReportDetail; + error?: string; +} + +/** + * 인수인계보고서 등록 + */ +export async function createHandoverReport( + data: HandoverReportFormData +): Promise { + try { + const apiData = transformToApiRequest(data); + + const result = await apiRequest>('/construction/handover-reports', { + method: 'POST', + body: JSON.stringify(apiData), + }); + + if (!result.success || !result.data) { + return { success: false, error: result.error || '등록에 실패했습니다.' }; + } + + return { success: true, data: transformHandoverReportDetail(result.data) }; + } catch (error) { + console.error('createHandoverReport error:', error); + return { success: false, error: '등록에 실패했습니다.' }; + } +} \ No newline at end of file From 78e193c8df761d69319191301ef351b59e45b139 Mon Sep 17 00:00:00 2001 From: kent Date: Fri, 9 Jan 2026 16:28:49 +0900 Subject: [PATCH 12/45] =?UTF-8?q?refactor(work-orders):=20process=5Ftype?= =?UTF-8?q?=EC=9D=84=20process=5Fid=20FK=EB=A1=9C=20=EB=B3=80=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - types.ts: processId, processName, processCode 추가, transform 함수 구현 - actions.ts: getProcessOptions() 추가, CRUD에 transform 적용 - WorkOrderCreate.tsx: 공정 목록 API 동적 로딩 - WorkOrderList.tsx: processName 표시로 변경 - WorkOrderDetail.tsx: processName 표시, processType은 로직용 유지 --- CURRENT_WORKS.md | 78 +++++++++++++++++++ .../production/WorkOrders/WorkOrderCreate.tsx | 67 ++++++++++------ .../production/WorkOrders/WorkOrderDetail.tsx | 3 +- .../production/WorkOrders/WorkOrderList.tsx | 5 +- .../production/WorkOrders/actions.ts | 69 +++++++++++++++- src/components/production/WorkOrders/types.ts | 42 ++++++++-- 6 files changed, 227 insertions(+), 37 deletions(-) diff --git a/CURRENT_WORKS.md b/CURRENT_WORKS.md index 63d64fb4..5bfe18df 100644 --- a/CURRENT_WORKS.md +++ b/CURRENT_WORKS.md @@ -1,5 +1,83 @@ # SAM React 작업 현황 +## 2025-01-09 (목) - 작업지시 process_type → process_id FK 변환 + +### 작업 목표 +- 작업지시의 `process_type` (varchar enum: 'screen'/'slat'/'bending')를 `process_id` (FK → processes.id)로 변환 +- API와 Frontend 전체 스택 마이그레이션 + +### 수정된 파일 +| 파일명 | 설명 | +|--------|------| +| `src/components/production/WorkOrders/types.ts` | processId, processName, processCode 필드 추가, transformApiToFrontend에서 processType 하위 호환 유지 | +| `src/components/production/WorkOrders/actions.ts` | getProcessOptions() 추가, createWorkOrder에서 processId 사용 | +| `src/components/production/WorkOrders/WorkOrderCreate.tsx` | processType enum → processId FK 변경, 동적 공정 옵션 로딩 | +| `src/components/production/WorkOrders/WorkOrderList.tsx` | PROCESS_TYPE_LABELS 제거, order.processName 사용 | +| `src/components/production/WorkOrders/WorkOrderDetail.tsx` | PROCESS_TYPE_LABELS 제거, order.processName 사용 (비즈니스 로직은 processType 유지) | + +### 주요 변경 내용 + +#### 1. types.ts - 타입 및 변환 함수 +- `WorkOrder` 인터페이스에 `processId`, `processName`, `processCode` 추가 +- `processType`은 `@deprecated` 마킹, 하위 호환용 유지 +- `transformApiToFrontend`에서 `processName` → `processType` 자동 매핑 + +#### 2. actions.ts - 서버 액션 +- `getProcessOptions()`: 공정 목록 API 조회 (GET /api/v1/processes) +- `createWorkOrder()`: `processId` 필드 사용 (기존 processType 제거) + +#### 3. WorkOrderCreate.tsx - 등록 폼 +- `processType: ProcessType` → `processId: number | null` +- `useEffect`로 공정 옵션 동적 로딩 +- 첫 번째 공정 자동 선택 (기본값) +- Select 컴포넌트 동적 옵션 렌더링 + +#### 4. WorkOrderList.tsx / WorkOrderDetail.tsx - 목록/상세 +- `PROCESS_TYPE_LABELS[order.processType]` → `order.processName` +- 비즈니스 로직(ProcessSteps, 절곡 확인)은 `processType` 유지 + +### 빌드 검증 +✅ Next.js 빌드 성공 (TypeScript 오류 없음) + +### 관련 API 변경 (api 저장소) +- `WorkOrder` 모델: `process_id` FK 추가, `process()` 관계 정의 +- `WorkOrderService`: `process_id` 사용 +- `WorkOrderStoreRequest/UpdateRequest`: `process_id` 검증 규칙 + +--- + +## 2025-01-09 (목) - 작업지시 코드 리뷰 기반 프론트엔드 개선 + +### 작업 목표 +- 작업지시 기능 코드 리뷰 결과 기반 프론트엔드 개선 +- Critical, High, Medium 우선순위 항목 전체 수정 + +### 수정된 파일 +| 파일명 | 설명 | +|--------|------| +| `src/components/production/WorkOrders/WorkOrderList.tsx` | useCallback 의존성 순환 수정 | +| `src/components/production/WorkOrders/WorkOrderDetail.tsx` | 작업 버튼 핸들러 구현 | +| `src/components/production/WorkOrders/types.ts` | scheduledDate 매핑, 다중 담당자 타입 추가 | +| `src/components/production/WorkOrders/actions.ts` | API 경로 수정 (/sales-orders → /orders) | +| `src/components/production/WorkOrders/SalesOrderSelectModal.tsx` | debounce 적용 | +| `src/components/production/WorkOrders/hooks/useDebounce.ts` | 신규 생성 - 커스텀 debounce 훅 | + +### 주요 변경 내용 +1. **useCallback 의존성 수정**: 무한 루프 방지를 위한 의존성 배열 수정 +2. **scheduledDate 매핑**: transformFrontendToApi에 scheduled_date 필드 추가 +3. **작업 버튼 구현**: "시작"/"완료" 버튼 핸들러 추가 +4. **API 경로 수정**: `/api/v1/sales-orders` → `/api/v1/orders` 변경 +5. **debounce 적용**: 커스텀 useDebounce 훅 (300ms) 적용 +6. **다중 담당자 타입**: WorkOrderAssigneeApi 인터페이스 및 assignees 필드 추가 + +### Git 커밋 +- `12b4259 refactor(work-orders): 코드 리뷰 기반 프론트엔드 개선` + +### 관련 문서 +- 계획: `~/.claude/plans/purring-sparking-pinwheel.md` + +--- + ## 2026-01-02 (목) - 견적 등록 자동산출 기능 구현 ### 작업 목표 diff --git a/src/components/production/WorkOrders/WorkOrderCreate.tsx b/src/components/production/WorkOrders/WorkOrderCreate.tsx index cf2ef9a9..aa9fb418 100644 --- a/src/components/production/WorkOrders/WorkOrderCreate.tsx +++ b/src/components/production/WorkOrders/WorkOrderCreate.tsx @@ -5,7 +5,7 @@ * API 연동 완료 (2025-12-26) */ -import { useState } from 'react'; +import { useState, useEffect } from 'react'; import { useRouter } from 'next/navigation'; import { ArrowLeft, FileText, X, Edit2, Loader2 } from 'lucide-react'; import { Button } from '@/components/ui/button'; @@ -25,8 +25,8 @@ import { PageLayout } from '@/components/organisms/PageLayout'; import { SalesOrderSelectModal } from './SalesOrderSelectModal'; import { AssigneeSelectModal } from './AssigneeSelectModal'; import { toast } from 'sonner'; -import { createWorkOrder } from './actions'; -import { PROCESS_TYPE_LABELS, type ProcessType, type SalesOrder } from './types'; +import { createWorkOrder, getProcessOptions, type ProcessOption } from './actions'; +import { type SalesOrder } from './types'; // Validation 에러 타입 interface ValidationErrors { @@ -38,6 +38,7 @@ const FIELD_NAME_MAP: Record = { selectedOrder: '수주', client: '발주처', projectName: '현장명', + processId: '공정', shipmentDate: '출고예정일', }; @@ -55,7 +56,7 @@ interface FormData { itemCount: number; // 작업지시 정보 - processType: ProcessType; + processId: number | null; // 공정 ID (FK → processes.id) shipmentDate: string; priority: number; assignees: string[]; @@ -71,7 +72,7 @@ const initialFormData: FormData = { projectName: '', orderNo: '', itemCount: 0, - processType: 'screen', + processId: null, shipmentDate: '', priority: 5, assignees: [], @@ -87,6 +88,27 @@ export function WorkOrderCreate() { const [assigneeNames, setAssigneeNames] = useState([]); const [validationErrors, setValidationErrors] = useState({}); const [isSubmitting, setIsSubmitting] = useState(false); + const [processOptions, setProcessOptions] = useState([]); + const [isLoadingProcesses, setIsLoadingProcesses] = useState(true); + + // 공정 옵션 로드 + useEffect(() => { + async function loadProcessOptions() { + setIsLoadingProcesses(true); + const result = await getProcessOptions(); + if (result.success) { + setProcessOptions(result.data); + // 첫 번째 공정을 기본값으로 설정 + if (result.data.length > 0 && !formData.processId) { + setFormData(prev => ({ ...prev, processId: result.data[0].id })); + } + } else { + toast.error(result.error || '공정 목록을 불러오는데 실패했습니다.'); + } + setIsLoadingProcesses(false); + } + loadProcessOptions(); + }, []); // 수주 선택 핸들러 const handleSelectOrder = (order: SalesOrder) => { @@ -104,7 +126,7 @@ export function WorkOrderCreate() { const handleClearOrder = () => { setFormData({ ...initialFormData, - processType: formData.processType, + processId: formData.processId, shipmentDate: formData.shipmentDate, priority: formData.priority, }); @@ -128,6 +150,10 @@ export function WorkOrderCreate() { } } + if (!formData.processId) { + errors.processId = '공정을 선택해주세요'; + } + if (!formData.shipmentDate) { errors.shipmentDate = '출고예정일을 선택해주세요'; } @@ -149,7 +175,7 @@ export function WorkOrderCreate() { const result = await createWorkOrder({ salesOrderId: formData.selectedOrder?.id ? parseInt(formData.selectedOrder.id) : undefined, projectName: formData.projectName, - processType: formData.processType, + processId: formData.processId!, // 공정 ID (FK → processes.id) scheduledDate: formData.shipmentDate, assigneeIds: formData.assignees.map(id => parseInt(id)), memo: formData.note || undefined, @@ -174,14 +200,10 @@ export function WorkOrderCreate() { router.back(); }; - // 공정 코드 표시 - const getProcessCode = (type: ProcessType) => { - const codes: Record = { - screen: 'P-001 | 작업일지: WL-SCR', - slat: 'P-002 | 작업일지: WL-SLT', - bending: 'P-003 | 작업일지: WL-FLD', - }; - return codes[type]; + // 선택된 공정의 코드 가져오기 + const getSelectedProcessCode = (): string => { + const selectedProcess = processOptions.find(p => p.id === formData.processId); + return selectedProcess?.processCode || '-'; }; return ( @@ -396,22 +418,23 @@ export function WorkOrderCreate() {

- 공정코드: {getProcessCode(formData.processType)} + 공정코드: {getSelectedProcessCode()}

diff --git a/src/components/production/WorkOrders/WorkOrderDetail.tsx b/src/components/production/WorkOrders/WorkOrderDetail.tsx index 16a2160b..1d511456 100644 --- a/src/components/production/WorkOrders/WorkOrderDetail.tsx +++ b/src/components/production/WorkOrders/WorkOrderDetail.tsx @@ -23,7 +23,6 @@ import { WorkLogModal } from '../WorkerScreen/WorkLogModal'; import { toast } from 'sonner'; import { getWorkOrderById, updateWorkOrderStatus } from './actions'; import { - PROCESS_TYPE_LABELS, WORK_ORDER_STATUS_LABELS, WORK_ORDER_STATUS_COLORS, ITEM_STATUS_LABELS, @@ -344,7 +343,7 @@ export function WorkOrderDetail({ orderId }: WorkOrderDetailProps) {

공정구분

-

{PROCESS_TYPE_LABELS[order.processType]}

+

{order.processName}

작업상태

diff --git a/src/components/production/WorkOrders/WorkOrderList.tsx b/src/components/production/WorkOrders/WorkOrderList.tsx index f27d8fc7..26a2b07d 100644 --- a/src/components/production/WorkOrders/WorkOrderList.tsx +++ b/src/components/production/WorkOrders/WorkOrderList.tsx @@ -23,7 +23,6 @@ import { ListMobileCard, InfoField } from '@/components/organisms/ListMobileCard import { toast } from 'sonner'; import { getWorkOrders, getWorkOrderStats } from './actions'; import { - PROCESS_TYPE_LABELS, WORK_ORDER_STATUS_LABELS, WORK_ORDER_STATUS_COLORS, type WorkOrder, @@ -248,7 +247,7 @@ export function WorkOrderList() { {globalIndex} {order.workOrderNo} - {PROCESS_TYPE_LABELS[order.processType]} + {order.processName} {order.lotNo} {order.orderDate} {order.isAssigned ? 'Y' : '-'} @@ -297,7 +296,7 @@ export function WorkOrderList() { } infoGrid={
- + diff --git a/src/components/production/WorkOrders/actions.ts b/src/components/production/WorkOrders/actions.ts index 31a5a620..1901a567 100644 --- a/src/components/production/WorkOrders/actions.ts +++ b/src/components/production/WorkOrders/actions.ts @@ -24,7 +24,6 @@ import type { WorkOrder, WorkOrderStats, WorkOrderStatus, - ProcessType, WorkOrderApiPaginatedResponse, WorkOrderStatsApi, } from './types'; @@ -47,7 +46,7 @@ export async function getWorkOrders(params?: { page?: number; perPage?: number; status?: WorkOrderStatus | 'all'; - processType?: ProcessType | 'all'; + processId?: number | 'all'; // 공정 ID (FK → processes.id) search?: string; startDate?: string; endDate?: string; @@ -71,8 +70,8 @@ export async function getWorkOrders(params?: { if (params?.status && params.status !== 'all') { searchParams.set('status', params.status); } - if (params?.processType && params.processType !== 'all') { - searchParams.set('process_type', params.processType); + if (params?.processId && params.processId !== 'all') { + searchParams.set('process_id', String(params.processId)); } if (params?.search) searchParams.set('search', params.search); if (params?.startDate) searchParams.set('start_date', params.startDate); @@ -727,3 +726,65 @@ export async function getDepartmentsWithUsers(): Promise<{ return { success: false, data: [], error: '서버 오류가 발생했습니다.' }; } } + +// ===== 공정 목록 조회 (작업지시 생성용) ===== +export interface ProcessOption { + id: number; + processCode: string; + processName: string; +} + +export async function getProcessOptions(): Promise<{ + success: boolean; + data: ProcessOption[]; + error?: string; +}> { + try { + const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/processes/options`; + + console.log('[WorkOrderActions] GET process options:', url); + + const { response, error } = await serverFetch(url, { method: 'GET' }); + + if (error || !response) { + return { success: false, data: [], error: error?.message || 'API 요청 실패' }; + } + + if (!response.ok) { + console.warn('[WorkOrderActions] GET process options error:', response.status); + return { success: false, data: [], error: `API 오류: ${response.status}` }; + } + + const result = await response.json(); + + if (!result.success) { + return { + success: false, + data: [], + error: result.message || '공정 목록 조회에 실패했습니다.', + }; + } + + // API 응답 변환 + const processes: ProcessOption[] = (result.data || []).map( + (item: { + id: number; + process_code: string; + process_name: string; + }) => ({ + id: item.id, + processCode: item.process_code, + processName: item.process_name, + }) + ); + + return { + success: true, + data: processes, + }; + } catch (error) { + if (isNextRedirectError(error)) throw error; + console.error('[WorkOrderActions] getProcessOptions error:', error); + return { success: false, data: [], error: '서버 오류가 발생했습니다.' }; + } +} diff --git a/src/components/production/WorkOrders/types.ts b/src/components/production/WorkOrders/types.ts index e95ad150..3f2c4117 100644 --- a/src/components/production/WorkOrders/types.ts +++ b/src/components/production/WorkOrders/types.ts @@ -2,7 +2,15 @@ * 작업지시 관리 타입 정의 */ -// 공정 구분 +// 공정 정보 (API 관계) +export interface ProcessInfo { + id: number; + process_code: string; + process_name: string; +} + +// @deprecated process_type은 process_id FK로 변경됨 +// 하위 호환성을 위해 유지 export type ProcessType = 'screen' | 'slat' | 'bending'; export const PROCESS_TYPE_LABELS: Record = { @@ -139,7 +147,11 @@ export interface WorkOrder { id: string; workOrderNo: string; // 작업지시번호 (KD-WO-251217-12) lotNo: string; // 로트번호 (KD-TS-251217-10) - processType: ProcessType; // 공정구분 + processId: number; // 공정 ID (FK) + processName: string; // 공정명 (표시용) + processCode: string; // 공정코드 (표시용) + /** @deprecated process_id FK 사용 */ + processType: ProcessType; // 하위 호환용 status: WorkOrderStatus; // 작업상태 // 기본 정보 @@ -272,7 +284,7 @@ export interface WorkOrderApi { work_order_no: string; sales_order_id: number | null; project_name: string | null; - process_type: 'screen' | 'slat' | 'bending'; + process_id: number; // FK to processes.id status: 'unassigned' | 'pending' | 'waiting' | 'in_progress' | 'completed' | 'shipped'; assignee_id: number | null; team_id: number | null; @@ -290,6 +302,11 @@ export interface WorkOrderApi { order_no: string; client?: { id: number; name: string }; }; + process?: { + id: number; + process_code: string; + process_name: string; + }; assignee?: { id: number; name: string }; assignees?: WorkOrderAssigneeApi[]; team?: { id: number; name: string }; @@ -333,11 +350,24 @@ export function transformApiToFrontend(api: WorkOrderApi): WorkOrder { const primaryAssignee = assignees.find(a => a.isPrimary); const assigneeName = primaryAssignee?.name || api.assignee?.name || '-'; + // 공정명 → 하위호환용 processType 매핑 + const processNameToType = (name: string): ProcessType => { + const mapping: Record = { + '스크린': 'screen', + '슬랫': 'slat', + '절곡': 'bending', + }; + return mapping[name] || 'screen'; + }; + return { id: String(api.id), workOrderNo: api.work_order_no, lotNo: api.sales_order?.order_no || '-', - processType: api.process_type, + processId: api.process_id, + processName: api.process?.process_name || '-', + processCode: api.process?.process_code || '-', + processType: processNameToType(api.process?.process_name || ''), // 하위 호환 status: api.status, client: api.sales_order?.client?.name || '-', projectName: api.project_name || '-', @@ -414,11 +444,11 @@ function getStatusStep(status: WorkOrderStatus): number { } // Frontend → API 변환 (등록/수정용) -export function transformFrontendToApi(data: Partial): Record { +export function transformFrontendToApi(data: Partial & { processId?: number }): Record { const result: Record = {}; if (data.projectName !== undefined) result.project_name = data.projectName; - if (data.processType !== undefined) result.process_type = data.processType; + if (data.processId !== undefined) result.process_id = data.processId; if (data.status !== undefined) result.status = data.status; if (data.scheduledDate !== undefined) result.scheduled_date = data.scheduledDate; if (data.dueDate !== undefined && data.scheduledDate === undefined) result.scheduled_date = data.dueDate; From 273d5709cdf73cca2694a8737c161278307cfecb Mon Sep 17 00:00:00 2001 From: kent Date: Fri, 9 Jan 2026 16:35:12 +0900 Subject: [PATCH 13/45] =?UTF-8?q?feat(=EC=8B=9C=EA=B3=B5=EC=82=AC):=202.1?= =?UTF-8?q?=20=ED=98=84=EC=9E=A5=EA=B4=80=EB=A6=AC=20-=20Frontend=20API=20?= =?UTF-8?q?=EC=97=B0=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - actions.ts: Mock 데이터 → API 연동 - types.ts: SiteStats에 suspended, pending 추가 - 문서: API 연동 상세 문서 추가 --- ...-01-09] site-management-api-integration.md | 90 +++++ .../construction/site-management/actions.ts | 349 +++++++++++------- .../construction/site-management/types.ts | 4 +- 3 files changed, 308 insertions(+), 135 deletions(-) create mode 100644 claudedocs/construction/[IMPL-2026-01-09] site-management-api-integration.md diff --git a/claudedocs/construction/[IMPL-2026-01-09] site-management-api-integration.md b/claudedocs/construction/[IMPL-2026-01-09] site-management-api-integration.md new file mode 100644 index 00000000..307362d8 --- /dev/null +++ b/claudedocs/construction/[IMPL-2026-01-09] site-management-api-integration.md @@ -0,0 +1,90 @@ +# Phase 2.1 현장관리 API 연동 + +**날짜**: 2026-01-09 +**작업**: 현장관리 Mock → API 연동 + +## 개요 + +시공사 페이지 API 연동 계획 Phase 2.1 - 현장관리(site-management) API 연동 완료. + +## 변경 사항 + +### Backend (API) + +#### 1. 마이그레이션 +- `2026_01_09_162534_add_construction_fields_to_sites_table.php` + - `site_code` (VARCHAR 50) - 현장코드 + - `client_id` (FK → clients) - 거래처 연결 + - `status` (ENUM) - unregistered/suspended/active/pending + - 인덱스: tenant_id + site_code, tenant_id + status + +#### 2. 모델 (Site.php) +- 상태 상수 추가: STATUS_UNREGISTERED, STATUS_SUSPENDED, STATUS_ACTIVE, STATUS_PENDING +- fillable 확장: site_code, client_id, status +- Client 관계 추가 + +#### 3. 서비스 (SiteService.php) +- `index()` - 필터 확장 (status, client_id, start_date, end_date) +- `stats()` - 상태별 통계 조회 (신규) +- `bulkDestroy()` - 일괄 삭제 (신규) + +#### 4. 컨트롤러 (SiteController.php) +- `stats()` - GET /api/v1/sites/stats +- `bulkDestroy()` - DELETE /api/v1/sites/bulk + +#### 5. 라우트 (api.php) +```php +Route::get('/stats', [SiteController::class, 'stats']); +Route::delete('/bulk', [SiteController::class, 'bulkDestroy']); +``` + +### Frontend (React) + +#### 1. types.ts +- SiteStats에 suspended, pending 필드 추가 + +#### 2. actions.ts +- Mock 데이터 제거 +- API 연동 구현 + - `getSiteList()` - GET /api/v1/sites + - `getSiteStats()` - GET /api/v1/sites/stats + - `deleteSite()` - DELETE /api/v1/sites/{id} + - `deleteSites()` - DELETE /api/v1/sites/bulk + +## API 매핑 + +| Frontend | Backend | 비고 | +|----------|---------|------| +| id | id | string ↔ int | +| siteCode | site_code | | +| partnerId | client_id | | +| partnerName | client.name | 관계 eager load | +| siteName | name | | +| address | address | | +| status | status | 동일 | +| createdAt | created_at | | +| updatedAt | updated_at | | + +## 설계 결정 + +### is_active vs status +- `is_active` (boolean): 사용 여부 (활성화/비활성화) +- `status` (enum): 상태값 (미등록/중지/사용/보류) +- 두 필드는 다른 용도로 둘 다 유지 + +### 기존 API 활용 +- `/api/v1/sites` 기존 엔드포인트 확장 사용 +- `/api/v1/construction/sites` 별도 생성하지 않음 + +## 진행률 + +시공사 API 연동: 3/9 (33%) +- [x] Phase 1.1 견적관리 +- [x] Phase 1.2 인수인계보고서관리 +- [x] Phase 2.1 현장관리 ← 현재 완료 +- [ ] Phase 2.2 거래처관리 +- [ ] Phase 2.3 자재관리 +- [ ] Phase 3.1 발주관리 +- [ ] Phase 3.2 재고관리 +- [ ] Phase 4.1 정산관리 +- [ ] Phase 4.2 급여관리 \ No newline at end of file diff --git a/src/components/business/construction/site-management/actions.ts b/src/components/business/construction/site-management/actions.ts index edc3245b..b668854d 100644 --- a/src/components/business/construction/site-management/actions.ts +++ b/src/components/business/construction/site-management/actions.ts @@ -1,195 +1,276 @@ 'use server'; -import type { Site, SiteStats } from './types'; +import { cookies } from 'next/headers'; +import type { Site, SiteStats, SiteStatus } from './types'; -// 목업 현장 데이터 -const MOCK_SITES: Site[] = [ - { - id: '1', - siteCode: '123123', - partnerId: '1', - partnerName: '회사명', - siteName: '현장명', - address: '-', - status: 'unregistered', - createdAt: '2025-09-01T00:00:00Z', - updatedAt: '2025-09-01T00:00:00Z', - }, - { - id: '2', - siteCode: '123123', - partnerId: '1', - partnerName: '회사명', - siteName: '현장명', - address: '서울시 강남구 대현빌라 123길', - status: 'suspended', - createdAt: '2025-09-02T00:00:00Z', - updatedAt: '2025-09-02T00:00:00Z', - }, - { - id: '3', - siteCode: '123123', - partnerId: '2', - partnerName: '회사명', - siteName: '현장명', - address: '서울시 강남구 대현빌라 123길', - status: 'active', - createdAt: '2025-09-03T00:00:00Z', - updatedAt: '2025-09-03T00:00:00Z', - }, - { - id: '4', - siteCode: '123123', - partnerId: '1', - partnerName: '회사명', - siteName: '현장명', - address: '서울시 강남구 대현빌라 123길', - status: 'active', - createdAt: '2025-09-04T00:00:00Z', - updatedAt: '2025-09-04T00:00:00Z', - }, - { - id: '5', - siteCode: '123123', - partnerId: '3', - partnerName: '회사명', - siteName: '현장명', - address: '서울시 강남구 대현빌라 123길', - status: 'active', - createdAt: '2025-09-05T00:00:00Z', - updatedAt: '2025-09-05T00:00:00Z', - }, - { - id: '6', - siteCode: '123123', - partnerId: '1', - partnerName: '회사명', - siteName: '현장명', - address: '서울시 강남구 대현빌라 123길', - status: 'active', - createdAt: '2025-09-06T00:00:00Z', - updatedAt: '2025-09-06T00:00:00Z', - }, - { - id: '7', - siteCode: '123123', - partnerId: '2', - partnerName: '회사명', - siteName: '현장명', - address: '서울시 강남구 대현빌라 123길', - status: 'pending', - createdAt: '2025-09-07T00:00:00Z', - updatedAt: '2025-09-07T00:00:00Z', - }, -]; +/** + * 주일 기업 - 현장관리 Server Actions + * API 연동 버전 + */ + +// API 기본 URL +const API_BASE_URL = process.env.NEXT_PUBLIC_API_URL || 'http://api.sam.kr'; +const API_KEY = process.env.API_KEY || ''; + +/** + * API 요청 헬퍼 함수 + */ +async function apiRequest( + endpoint: string, + options: RequestInit = {} +): Promise<{ success: boolean; data?: T; error?: string; message?: string }> { + try { + const cookieStore = await cookies(); + const accessToken = cookieStore.get('access_token')?.value; + + const headers: Record = { + 'Accept': 'application/json', + 'Content-Type': 'application/json', + 'X-API-KEY': API_KEY, + }; + + if (accessToken) { + headers['Authorization'] = `Bearer ${accessToken}`; + } + + const url = `${API_BASE_URL}/api/v1${endpoint}`; + console.log('🔵 [Site API]', options.method || 'GET', url); + + const response = await fetch(url, { + ...options, + headers: { + ...headers, + ...options.headers, + }, + }); + + const result = await response.json(); + console.log('🔵 [Site API] Response status:', response.status); + + if (!response.ok) { + return { + success: false, + error: result.message || `API 오류: ${response.status}`, + }; + } + + return { + success: result.success ?? true, + data: result.data, + message: result.message, + }; + } catch (error) { + console.error('API request error:', error); + return { + success: false, + error: error instanceof Error ? error.message : '알 수 없는 오류가 발생했습니다.', + }; + } +} + +/** + * API 응답 → 프론트엔드 타입 변환 + */ +function transformSite(apiData: Record): Site { + // client 관계 데이터 추출 + const client = apiData.client as Record | null | undefined; + + return { + id: String(apiData.id), + siteCode: String(apiData.site_code || ''), + partnerId: apiData.client_id ? String(apiData.client_id) : '', + partnerName: client ? String(client.name || '') : '', + siteName: String(apiData.name || ''), + address: String(apiData.address || ''), + status: (apiData.status as SiteStatus) || 'unregistered', + createdAt: String(apiData.created_at || ''), + updatedAt: String(apiData.updated_at || ''), + }; +} + +// ============================================================ +// API 연동 함수 +// ============================================================ interface GetSiteListParams { size?: number; + page?: number; startDate?: string; endDate?: string; + search?: string; + status?: string; + clientId?: string; + sortBy?: string; } interface GetSiteListResult { success: boolean; data?: { items: Site[]; - totalCount: number; + total: number; + page: number; + size: number; + totalPages: number; }; error?: string; } -// 현장 목록 조회 +/** + * 현장 목록 조회 + */ export async function getSiteList(params: GetSiteListParams = {}): Promise { try { - // TODO: API 연동 시 실제 API 호출로 변경 - await new Promise((resolve) => setTimeout(resolve, 500)); + const queryParams = new URLSearchParams(); - let filteredSites = [...MOCK_SITES]; + if (params.search) queryParams.append('search', params.search); + if (params.status && params.status !== 'all') queryParams.append('status', params.status); + if (params.clientId && params.clientId !== 'all') queryParams.append('client_id', params.clientId); + if (params.startDate) queryParams.append('start_date', params.startDate); + if (params.endDate) queryParams.append('end_date', params.endDate); + if (params.page) queryParams.append('page', String(params.page)); + if (params.size) queryParams.append('per_page', String(params.size)); - // 날짜 필터 - if (params.startDate) { - filteredSites = filteredSites.filter( - (site) => new Date(site.createdAt) >= new Date(params.startDate!) - ); + // 정렬 파라미터 변환 + if (params.sortBy) { + const sortMap: Record = { + latest: { field: 'created_at', dir: 'desc' }, + oldest: { field: 'created_at', dir: 'asc' }, + partnerNameAsc: { field: 'client_id', dir: 'asc' }, + partnerNameDesc: { field: 'client_id', dir: 'desc' }, + siteNameAsc: { field: 'name', dir: 'asc' }, + siteNameDesc: { field: 'name', dir: 'desc' }, + }; + const sort = sortMap[params.sortBy]; + if (sort) { + queryParams.append('sort_by', sort.field); + queryParams.append('sort_dir', sort.dir); + } } - if (params.endDate) { - filteredSites = filteredSites.filter( - (site) => new Date(site.createdAt) <= new Date(params.endDate!) - ); + + const queryString = queryParams.toString(); + const endpoint = `/sites${queryString ? `?${queryString}` : ''}`; + + const result = await apiRequest<{ + data: Record[]; + current_page: number; + per_page: number; + total: number; + last_page: number; + }>(endpoint); + + if (!result.success || !result.data) { + return { success: false, error: result.error || '현장 목록 조회에 실패했습니다.' }; } + const apiData = result.data; + const items = (apiData.data || []).map(transformSite); + return { success: true, data: { - items: filteredSites, - totalCount: filteredSites.length, + items, + total: apiData.total || 0, + page: apiData.current_page || 1, + size: apiData.per_page || 20, + totalPages: apiData.last_page || 1, }, }; } catch (error) { console.error('getSiteList error:', error); - return { - success: false, - error: '현장 목록을 불러오는데 실패했습니다.', - }; + return { success: false, error: '현장 목록을 불러오는데 실패했습니다.' }; } } -// 현장 통계 조회 -export async function getSiteStats(): Promise<{ success: boolean; data?: SiteStats; error?: string }> { - try { - // TODO: API 연동 시 실제 API 호출로 변경 - await new Promise((resolve) => setTimeout(resolve, 300)); +interface GetSiteStatsResult { + success: boolean; + data?: SiteStats; + error?: string; +} - const total = MOCK_SITES.length; - const construction = MOCK_SITES.filter((s) => s.status === 'active').length; - const unregistered = MOCK_SITES.filter((s) => s.status === 'unregistered').length; +/** + * 현장 통계 조회 + */ +export async function getSiteStats(): Promise { + try { + const result = await apiRequest<{ + total: number; + construction: number; + unregistered: number; + suspended: number; + pending: number; + }>('/sites/stats'); + + if (!result.success || !result.data) { + return { success: false, error: result.error || '현장 통계 조회에 실패했습니다.' }; + } return { success: true, data: { - total, - construction, - unregistered, + total: result.data.total || 0, + construction: result.data.construction || 0, + unregistered: result.data.unregistered || 0, + suspended: result.data.suspended || 0, + pending: result.data.pending || 0, }, }; } catch (error) { console.error('getSiteStats error:', error); - return { - success: false, - error: '현장 통계를 불러오는데 실패했습니다.', - }; + return { success: false, error: '현장 통계를 불러오는데 실패했습니다.' }; } } -// 현장 삭제 -export async function deleteSite(id: string): Promise<{ success: boolean; error?: string }> { +interface DeleteSiteResult { + success: boolean; + error?: string; +} + +/** + * 현장 삭제 + */ +export async function deleteSite(id: string): Promise { try { - // TODO: API 연동 시 실제 API 호출로 변경 - await new Promise((resolve) => setTimeout(resolve, 500)); + const result = await apiRequest(`/sites/${id}`, { + method: 'DELETE', + }); + + if (!result.success) { + return { success: false, error: result.error || '현장 삭제에 실패했습니다.' }; + } + return { success: true }; } catch (error) { console.error('deleteSite error:', error); - return { - success: false, - error: '현장 삭제에 실패했습니다.', - }; + return { success: false, error: '현장 삭제에 실패했습니다.' }; } } -// 현장 일괄 삭제 -export async function deleteSites(ids: string[]): Promise<{ success: boolean; deletedCount?: number; error?: string }> { +interface DeleteSitesResult { + success: boolean; + deletedCount?: number; + error?: string; +} + +/** + * 현장 일괄 삭제 + */ +export async function deleteSites(ids: string[]): Promise { try { - // TODO: API 연동 시 실제 API 호출로 변경 - await new Promise((resolve) => setTimeout(resolve, 500)); + const result = await apiRequest<{ deleted_count: number }>('/sites/bulk', { + method: 'DELETE', + body: JSON.stringify({ ids: ids.map((id) => Number(id)) }), + }); + + if (!result.success) { + return { success: false, error: result.error || '현장 일괄 삭제에 실패했습니다.' }; + } + return { success: true, - deletedCount: ids.length, + deletedCount: result.data?.deleted_count || ids.length, }; } catch (error) { console.error('deleteSites error:', error); - return { - success: false, - error: '현장 일괄 삭제에 실패했습니다.', - }; + return { success: false, error: '현장 일괄 삭제에 실패했습니다.' }; } -} +} \ No newline at end of file diff --git a/src/components/business/construction/site-management/types.ts b/src/components/business/construction/site-management/types.ts index 85eaabbc..5051d47c 100644 --- a/src/components/business/construction/site-management/types.ts +++ b/src/components/business/construction/site-management/types.ts @@ -17,8 +17,10 @@ export type SiteStatus = 'unregistered' | 'suspended' | 'active' | 'pending'; // 현장 통계 export interface SiteStats { total: number; // 전체 현장 - construction: number; // 시공 현장 + construction: number; // 시공 현장 (active) unregistered: number; // 미등록 현장 + suspended: number; // 중지 현장 + pending: number; // 보류 현장 } // 상태 옵션 From 749f0ce3c354bd92b31d02f1187dedfc53620b6f Mon Sep 17 00:00:00 2001 From: kent Date: Fri, 9 Jan 2026 16:46:32 +0900 Subject: [PATCH 14/45] =?UTF-8?q?feat:=20=EA=B1=B0=EB=9E=98=EC=B2=98?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=20API=20=EC=97=B0=EB=8F=99=20(Phase=202.2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - partners/actions.ts: Mock → API 연동 전환 - apiRequest 헬퍼 함수 추가 (쿠키 기반 인증) - transform 함수: client_type ↔ partnerType 변환 - getPartnerList, getPartner, createPartner, updatePartner - getPartnerStats, deletePartner, deletePartners - 구현 문서 추가 --- ...-09] partner-management-api-integration.md | 117 ++++ .../business/construction/partners/actions.ts | 536 +++++++++--------- 2 files changed, 395 insertions(+), 258 deletions(-) create mode 100644 claudedocs/construction/[IMPL-2026-01-09] partner-management-api-integration.md diff --git a/claudedocs/construction/[IMPL-2026-01-09] partner-management-api-integration.md b/claudedocs/construction/[IMPL-2026-01-09] partner-management-api-integration.md new file mode 100644 index 00000000..4e75315b --- /dev/null +++ b/claudedocs/construction/[IMPL-2026-01-09] partner-management-api-integration.md @@ -0,0 +1,117 @@ +# Phase 2.2 거래처관리 API 연동 + +**날짜**: 2026-01-09 +**작업**: 거래처관리 Mock → API 연동 + +## 개요 + +시공사 페이지 API 연동 계획 Phase 2.2 - 거래처관리(partners) API 연동 완료. + +## 변경 사항 + +### Backend (API) + +#### 1. 서비스 (ClientService.php) +- `stats()` - 거래처 통계 조회 (신규) + - total: 전체 거래처 수 + - sales: 판매 거래처 (client_type='SALES') + - purchase: 구매 거래처 (client_type='PURCHASE') + - both: 판매/구매 거래처 (client_type='BOTH') + - badDebt: 악성채권 보유 거래처 수 + - normal: 정상 거래처 수 +- `bulkDestroy()` - 일괄 삭제 (신규) + - 주문 존재 시 해당 거래처는 건너뜀 + +#### 2. 컨트롤러 (ClientController.php) +- `stats()` - GET /api/v1/clients/stats +- `bulkDestroy()` - DELETE /api/v1/clients/bulk + +#### 3. 라우트 (api.php) +```php +Route::get('/stats', [ClientController::class, 'stats']); +Route::delete('/bulk', [ClientController::class, 'bulkDestroy']); +``` + +### Frontend (React) + +#### 1. actions.ts +- Mock 데이터 제거 (mockPartners 배열) +- API 연동 구현 + - `getPartnerList()` - GET /api/v1/clients + - `getPartner()` - GET /api/v1/clients/{id} + - `createPartner()` - POST /api/v1/clients + - `updatePartner()` - PUT /api/v1/clients/{id} + - `getPartnerStats()` - GET /api/v1/clients/stats + - `deletePartner()` - DELETE /api/v1/clients/{id} + - `deletePartners()` - DELETE /api/v1/clients/bulk + +#### 2. 변환 함수 +- `transformClientType()` - client_type → partnerType 변환 +- `transformPartnerType()` - partnerType → client_type 변환 +- `transformPartner()` - API 응답 → Partner 타입 변환 +- `transformPartnerToApi()` - PartnerFormData → API 요청 데이터 변환 + +## API 매핑 + +| Frontend | Backend | 비고 | +|----------|---------|------| +| id | id | string ↔ int | +| partnerCode | client_code | 자동 생성 | +| businessNumber | business_no | | +| partnerName | name | | +| representative | contact_person | | +| partnerType | client_type | sales/SALES, purchase/PURCHASE, both/BOTH | +| businessType | business_type | | +| businessCategory | business_item | | +| address1 | address | | +| phone | phone | | +| mobile | mobile | | +| fax | fax | | +| email | email | | +| manager | manager_name | | +| managerPhone | manager_tel | | +| systemManager | system_manager | | +| outstandingAmount | outstanding_amount | 계산 필드 (매출-입금) | +| overdueToggle | is_overdue | | +| isBadDebt | has_bad_debt | 계산 필드 | +| isActive | is_active | | +| createdAt | created_at | | +| updatedAt | updated_at | | + +### Frontend 전용 필드 (기본값 사용) +- zipCode, address2: '' +- logoUrl, logoBlob: null +- salesPaymentDay, paymentDay: 0 +- creditRating, transactionGrade: '' +- memos, documents: [] +- category: '' +- overdueDays: is_overdue ? 30 : 0 + +## 설계 결정 + +### 기존 Client API 재사용 +- `/api/v1/clients` 기존 엔드포인트 확장 사용 +- 별도의 `/api/v1/construction/partners` 생성하지 않음 +- accounting/vendors 와 construction/partners 모두 Client API 사용 + +### 악성채권 통계 +- BadDebt 테이블과 연계하여 악성채권 보유 거래처 수 계산 +- 상태가 '추심중' 또는 '법적조치'인 활성 악성채권만 카운트 + +### 필터링 전략 +- 검색(`q`): API에서 처리 (name, client_code, contact_person) +- 악성채권 필터: 프론트엔드에서 처리 (API 전체 반환 후 필터) +- 정렬: 프론트엔드에서 처리 (API 기본 정렬 사용) + +## 진행률 + +시공사 API 연동: 4/9 (44%) +- [x] Phase 1.1 견적관리 +- [x] Phase 1.2 인수인계보고서관리 +- [x] Phase 2.1 현장관리 +- [x] Phase 2.2 거래처관리 ← 현재 완료 +- [ ] Phase 2.3 자재관리 +- [ ] Phase 3.1 발주관리 +- [ ] Phase 3.2 재고관리 +- [ ] Phase 4.1 정산관리 +- [ ] Phase 4.2 급여관리 \ No newline at end of file diff --git a/src/components/business/construction/partners/actions.ts b/src/components/business/construction/partners/actions.ts index 3f9baada..ec09ce55 100644 --- a/src/components/business/construction/partners/actions.ts +++ b/src/components/business/construction/partners/actions.ts @@ -1,193 +1,241 @@ 'use server'; +import { cookies } from 'next/headers'; import type { Partner, PartnerStats, PartnerFilter, PartnerListResponse, PartnerFormData } from './types'; /** * 주일 기업 - 거래처 관리 Server Actions - * TODO: 실제 API 연동 시 구현 + * API 연동 버전 */ -// 목업 데이터 (확장된 타입 적용) -const mockPartners: Partner[] = [ - { - id: '1', - partnerCode: 'P-001', - businessNumber: '123-12-12345', - partnerName: '대한건설', - representative: '홍길동', - partnerType: 'sales', - businessType: '건설업', - businessCategory: '토목건축', - zipCode: '06234', - address1: '서울특별시 서초구 서초대로 123', - address2: '대한건물 12층 1201호', - phone: '02-1234-1234', - mobile: '010-1234-1234', - fax: '02-1234-1235', - email: 'abc@email.com', - manager: '담당자명', - managerPhone: '010-1234-1234', - systemManager: '관리자명', - logoUrl: null, - logoBlob: null, - salesPaymentDay: 15, - creditRating: 'AAA', - transactionGrade: 'A', - taxInvoiceEmail: 'abc@email.com', - outstandingAmount: 11000000, - overdueDays: 15, - overdueToggle: true, - badDebtToggle: false, - memos: [ - { - id: '1', - content: '2025-12-12 12:21 [홍길동] 메모 내용', - createdAt: '2025-12-12T12:21:00Z', - }, - ], - documents: [], - category: '건설사', - paymentDay: 15, - isBadDebt: false, - isActive: true, - createdAt: '2025-01-01', - updatedAt: '2025-01-01', - }, - { - id: '2', - partnerCode: 'P-002', - businessNumber: '456-45-45678', - partnerName: '삼성시공', - representative: '김철수', - partnerType: 'purchase', - businessType: '시공업', - businessCategory: '건축시공', - zipCode: '06235', - address1: '서울특별시 강남구 테헤란로 456', - address2: '삼성빌딩 5층', - phone: '02-5678-5678', - mobile: '010-5678-5678', - fax: '02-5678-5679', - email: 'samsung@email.com', - manager: '이영희', - managerPhone: '010-5678-5678', - systemManager: '', - logoUrl: null, - logoBlob: null, - salesPaymentDay: 10, - creditRating: 'AA', - transactionGrade: 'B', - taxInvoiceEmail: 'tax@samsung.com', - outstandingAmount: 5000000, - overdueDays: 0, - overdueToggle: false, - badDebtToggle: false, - memos: [], - documents: [], - category: '시공사', - paymentDay: 10, - isBadDebt: false, - isActive: true, - createdAt: '2025-01-02', - updatedAt: '2025-01-02', - }, - { - id: '3', - partnerCode: 'P-003', - businessNumber: '789-78-78901', - partnerName: 'LG건설', - representative: '박영수', - partnerType: 'both', - businessType: '종합건설', - businessCategory: '건설', - zipCode: '06236', - address1: '서울특별시 영등포구 여의대로 789', - address2: 'LG타워 20층', - phone: '02-7890-7890', - mobile: '010-7890-7890', - fax: '02-7890-7891', - email: 'lg@email.com', - manager: '최민수', - managerPhone: '010-7890-7890', - systemManager: '시스템관리자', - logoUrl: null, - logoBlob: null, - salesPaymentDay: 20, - creditRating: 'BBB', - transactionGrade: 'C', - taxInvoiceEmail: 'tax@lg.com', - outstandingAmount: 20000000, - overdueDays: 30, - overdueToggle: true, - badDebtToggle: true, - memos: [], - documents: [], - category: '건설사', - paymentDay: 20, - isBadDebt: true, - isActive: true, - createdAt: '2025-01-03', - updatedAt: '2025-01-03', - }, -]; +// API 기본 URL +const API_BASE_URL = process.env.NEXT_PUBLIC_API_URL || 'http://api.sam.kr'; +const API_KEY = process.env.API_KEY || ''; -// 거래처 목록 조회 +/** + * API 요청 헬퍼 함수 + */ +async function apiRequest( + endpoint: string, + options: RequestInit = {} +): Promise<{ success: boolean; data?: T; error?: string; message?: string }> { + try { + const cookieStore = await cookies(); + const accessToken = cookieStore.get('access_token')?.value; + + const headers: Record = { + 'Accept': 'application/json', + 'Content-Type': 'application/json', + 'X-API-KEY': API_KEY, + }; + + if (accessToken) { + headers['Authorization'] = `Bearer ${accessToken}`; + } + + const url = `${API_BASE_URL}/api/v1${endpoint}`; + console.log('🔵 [Partner API]', options.method || 'GET', url); + + const response = await fetch(url, { + ...options, + headers: { + ...headers, + ...options.headers, + }, + }); + + const result = await response.json(); + console.log('🔵 [Partner API] Response status:', response.status); + + if (!response.ok) { + return { + success: false, + error: result.message || `API 오류: ${response.status}`, + }; + } + + return { + success: result.success ?? true, + data: result.data, + message: result.message, + }; + } catch (error) { + console.error('API request error:', error); + return { + success: false, + error: error instanceof Error ? error.message : '알 수 없는 오류가 발생했습니다.', + }; + } +} + +/** + * client_type API → Frontend partnerType 변환 + */ +function transformClientType(clientType: string | null | undefined): Partner['partnerType'] { + const typeMap: Record = { + 'SALES': 'sales', + 'PURCHASE': 'purchase', + 'BOTH': 'both', + }; + return typeMap[clientType || ''] || 'sales'; +} + +/** + * partnerType Frontend → API client_type 변환 + */ +function transformPartnerType(partnerType: Partner['partnerType']): string { + const typeMap: Record = { + 'sales': 'SALES', + 'purchase': 'PURCHASE', + 'both': 'BOTH', + }; + return typeMap[partnerType] || 'SALES'; +} + +/** + * API 응답 → 프론트엔드 Partner 타입 변환 + */ +function transformPartner(apiData: Record): Partner { + return { + id: String(apiData.id), + partnerCode: String(apiData.client_code || ''), + businessNumber: String(apiData.business_no || ''), + partnerName: String(apiData.name || ''), + representative: String(apiData.contact_person || ''), + partnerType: transformClientType(apiData.client_type as string | null), + businessType: String(apiData.business_type || ''), + businessCategory: String(apiData.business_item || ''), + zipCode: '', // API에 없는 필드 + address1: String(apiData.address || ''), + address2: '', // API에 없는 필드 + phone: String(apiData.phone || ''), + mobile: String(apiData.mobile || ''), + fax: String(apiData.fax || ''), + email: String(apiData.email || ''), + manager: String(apiData.manager_name || ''), + managerPhone: String(apiData.manager_tel || ''), + systemManager: String(apiData.system_manager || ''), + logoUrl: null, // API에 없는 필드 + logoBlob: null, // API에 없는 필드 + salesPaymentDay: 0, // API에 없는 필드 + creditRating: '', // API에 없는 필드 + transactionGrade: '', // API에 없는 필드 + taxInvoiceEmail: String(apiData.email || ''), // 동일한 이메일 사용 + outstandingAmount: Number(apiData.outstanding_amount || 0), + overdueDays: apiData.is_overdue ? 30 : 0, // 연체 여부만 있음 + overdueToggle: Boolean(apiData.is_overdue), + badDebtToggle: Boolean(apiData.has_bad_debt), + memos: [], // API에 없는 필드 + documents: [], // API에 없는 필드 + category: '', // API에 없는 필드 + paymentDay: 0, // API에 없는 필드 + isBadDebt: Boolean(apiData.has_bad_debt), + isActive: apiData.is_active !== false, + createdAt: String(apiData.created_at || ''), + updatedAt: String(apiData.updated_at || ''), + }; +} + +/** + * 프론트엔드 PartnerFormData → API 요청 데이터 변환 + */ +function transformPartnerToApi(data: PartnerFormData): Record { + return { + business_no: data.businessNumber, + name: data.partnerName, + contact_person: data.representative, + client_type: transformPartnerType(data.partnerType), + business_type: data.businessType, + business_item: data.businessCategory, + address: data.address1 + (data.address2 ? ` ${data.address2}` : ''), + phone: data.phone, + mobile: data.mobile, + fax: data.fax, + email: data.email, + manager_name: data.manager, + manager_tel: data.managerPhone, + system_manager: data.systemManager, + is_overdue: data.overdueToggle, + is_active: true, + }; +} + +// ============================================================ +// API 연동 함수 +// ============================================================ + +/** + * 거래처 목록 조회 + */ export async function getPartnerList( filter?: PartnerFilter ): Promise<{ success: boolean; data?: PartnerListResponse; error?: string }> { try { - // TODO: 실제 API 호출 - let filtered = [...mockPartners]; + const queryParams = new URLSearchParams(); - // 검색 필터 + // 검색어 if (filter?.search) { - const search = filter.search.toLowerCase(); - filtered = filtered.filter( - (p) => - p.partnerName.toLowerCase().includes(search) || - p.partnerCode.toLowerCase().includes(search) || - p.representative.toLowerCase().includes(search) - ); + queryParams.append('q', filter.search); } - // 악성채권 필터 + // 악성채권 필터 (Frontend badDebtFilter → 백엔드는 별도 필터 없음, 목록에서 처리) + // API는 전체 데이터 반환, 프론트에서 필터링 + + // 페이지네이션 + if (filter?.page) queryParams.append('page', String(filter.page)); + if (filter?.size) queryParams.append('size', String(filter.size)); + + const queryString = queryParams.toString(); + const endpoint = `/clients${queryString ? `?${queryString}` : ''}`; + + const result = await apiRequest<{ + data: Record[]; + current_page: number; + per_page: number; + total: number; + last_page: number; + }>(endpoint); + + if (!result.success || !result.data) { + return { success: false, error: result.error || '거래처 목록 조회에 실패했습니다.' }; + } + + const apiData = result.data; + let items = (apiData.data || []).map(transformPartner); + + // 악성채권 필터 (프론트엔드에서 처리) if (filter?.badDebtFilter && filter.badDebtFilter !== 'all') { - filtered = filtered.filter((p) => + items = items.filter((p) => filter.badDebtFilter === 'badDebt' ? p.isBadDebt : !p.isBadDebt ); } - // 정렬 + // 정렬 (프론트엔드에서 처리 - API가 sort 미지원 시) if (filter?.sortBy) { switch (filter.sortBy) { case 'latest': - filtered.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()); + items.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()); break; case 'oldest': - filtered.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime()); + items.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime()); break; case 'nameAsc': - filtered.sort((a, b) => a.partnerName.localeCompare(b.partnerName)); + items.sort((a, b) => a.partnerName.localeCompare(b.partnerName)); break; case 'nameDesc': - filtered.sort((a, b) => b.partnerName.localeCompare(a.partnerName)); + items.sort((a, b) => b.partnerName.localeCompare(a.partnerName)); break; } } - const page = filter?.page ?? 1; - const size = filter?.size ?? 20; - const start = (page - 1) * size; - const paginatedItems = filtered.slice(start, start + size); - return { success: true, data: { - items: paginatedItems, - total: filtered.length, - page, - size, - totalPages: Math.ceil(filtered.length / size), + items, + total: apiData.total || 0, + page: apiData.current_page || 1, + size: apiData.per_page || 20, + totalPages: apiData.last_page || 1, }, }; } catch (error) { @@ -196,150 +244,102 @@ export async function getPartnerList( } } -// 거래처 상세 조회 +/** + * 거래처 상세 조회 + */ export async function getPartner( id: string ): Promise<{ success: boolean; data?: Partner; error?: string }> { try { - // TODO: 실제 API 호출 - const partner = mockPartners.find((p) => p.id === id); + const result = await apiRequest>(`/clients/${id}`); - if (!partner) { - return { success: false, error: '거래처를 찾을 수 없습니다.' }; + if (!result.success || !result.data) { + return { success: false, error: result.error || '거래처를 찾을 수 없습니다.' }; } - return { success: true, data: partner }; + return { success: true, data: transformPartner(result.data) }; } catch (error) { console.error('getPartner error:', error); return { success: false, error: '거래처 조회에 실패했습니다.' }; } } -// 거래처 등록 +/** + * 거래처 등록 + */ export async function createPartner( data: PartnerFormData ): Promise<{ success: boolean; data?: Partner; error?: string }> { try { - // TODO: 실제 API 호출 - console.log('Create partner:', data); + const apiData = transformPartnerToApi(data); - const newPartner: Partner = { - id: String(Date.now()), - partnerCode: `P-${String(mockPartners.length + 1).padStart(3, '0')}`, - businessNumber: data.businessNumber, - partnerName: data.partnerName, - representative: data.representative, - partnerType: data.partnerType, - businessType: data.businessType, - businessCategory: data.businessCategory, - zipCode: data.zipCode, - address1: data.address1, - address2: data.address2, - phone: data.phone, - mobile: data.mobile, - fax: data.fax, - email: data.email, - manager: data.manager, - managerPhone: data.managerPhone, - systemManager: data.systemManager, - logoUrl: data.logoUrl, - logoBlob: data.logoBlob, - salesPaymentDay: data.salesPaymentDay, - creditRating: data.creditRating, - transactionGrade: data.transactionGrade, - taxInvoiceEmail: data.taxInvoiceEmail, - outstandingAmount: data.outstandingAmount, - overdueDays: data.overdueDays, - overdueToggle: data.overdueToggle, - badDebtToggle: data.badDebtToggle, - memos: data.memos, - documents: data.documents, - category: data.category, - paymentDay: data.salesPaymentDay, - isBadDebt: data.badDebtToggle, - isActive: true, - createdAt: new Date().toISOString(), - updatedAt: new Date().toISOString(), - }; + const result = await apiRequest>('/clients', { + method: 'POST', + body: JSON.stringify(apiData), + }); - return { success: true, data: newPartner }; + if (!result.success || !result.data) { + return { success: false, error: result.error || '거래처 등록에 실패했습니다.' }; + } + + return { success: true, data: transformPartner(result.data) }; } catch (error) { console.error('createPartner error:', error); return { success: false, error: '거래처 등록에 실패했습니다.' }; } } -// 거래처 수정 +/** + * 거래처 수정 + */ export async function updatePartner( id: string, data: PartnerFormData ): Promise<{ success: boolean; data?: Partner; error?: string }> { try { - // TODO: 실제 API 호출 - console.log('Update partner:', id, data); + const apiData = transformPartnerToApi(data); - const existingPartner = mockPartners.find((p) => p.id === id); - if (!existingPartner) { - return { success: false, error: '거래처를 찾을 수 없습니다.' }; + const result = await apiRequest>(`/clients/${id}`, { + method: 'PUT', + body: JSON.stringify(apiData), + }); + + if (!result.success || !result.data) { + return { success: false, error: result.error || '거래처 수정에 실패했습니다.' }; } - const updatedPartner: Partner = { - ...existingPartner, - businessNumber: data.businessNumber, - partnerName: data.partnerName, - representative: data.representative, - partnerType: data.partnerType, - businessType: data.businessType, - businessCategory: data.businessCategory, - zipCode: data.zipCode, - address1: data.address1, - address2: data.address2, - phone: data.phone, - mobile: data.mobile, - fax: data.fax, - email: data.email, - manager: data.manager, - managerPhone: data.managerPhone, - systemManager: data.systemManager, - logoUrl: data.logoUrl, - logoBlob: data.logoBlob, - salesPaymentDay: data.salesPaymentDay, - creditRating: data.creditRating, - transactionGrade: data.transactionGrade, - taxInvoiceEmail: data.taxInvoiceEmail, - outstandingAmount: data.outstandingAmount, - overdueDays: data.overdueDays, - overdueToggle: data.overdueToggle, - badDebtToggle: data.badDebtToggle, - memos: data.memos, - documents: data.documents, - category: data.category, - paymentDay: data.salesPaymentDay, - isBadDebt: data.badDebtToggle, - updatedAt: new Date().toISOString(), - }; - - return { success: true, data: updatedPartner }; + return { success: true, data: transformPartner(result.data) }; } catch (error) { console.error('updatePartner error:', error); return { success: false, error: '거래처 수정에 실패했습니다.' }; } } -// 거래처 통계 조회 +/** + * 거래처 통계 조회 + */ export async function getPartnerStats(): Promise<{ success: boolean; data?: PartnerStats; error?: string }> { try { - // TODO: 실제 API 호출 - const total = mockPartners.length; - const badDebt = mockPartners.filter((p) => p.isBadDebt).length; + const result = await apiRequest<{ + total: number; + sales: number; + purchase: number; + both: number; + badDebt: number; + normal: number; + }>('/clients/stats'); + + if (!result.success || !result.data) { + return { success: false, error: result.error || '통계 조회에 실패했습니다.' }; + } return { success: true, data: { - total, - unregistered: 5, // 목업 - badDebt, - normal: total - badDebt, + total: result.data.total || 0, + unregistered: 0, // Client API에서 미지원 (거래처는 등록 완료 상태만) + badDebt: result.data.badDebt || 0, + normal: result.data.normal || 0, }, }; } catch (error) { @@ -348,11 +348,19 @@ export async function getPartnerStats(): Promise<{ success: boolean; data?: Part } } -// 거래처 삭제 +/** + * 거래처 삭제 + */ export async function deletePartner(id: string): Promise<{ success: boolean; error?: string }> { try { - // TODO: 실제 API 호출 - console.log('Delete partner:', id); + const result = await apiRequest(`/clients/${id}`, { + method: 'DELETE', + }); + + if (!result.success) { + return { success: false, error: result.error || '거래처 삭제에 실패했습니다.' }; + } + return { success: true }; } catch (error) { console.error('deletePartner error:', error); @@ -360,12 +368,24 @@ export async function deletePartner(id: string): Promise<{ success: boolean; err } } -// 거래처 일괄 삭제 +/** + * 거래처 일괄 삭제 + */ export async function deletePartners(ids: string[]): Promise<{ success: boolean; deletedCount?: number; error?: string }> { try { - // TODO: 실제 API 호출 - console.log('Delete partners:', ids); - return { success: true, deletedCount: ids.length }; + const result = await apiRequest<{ deleted_count: number }>('/clients/bulk', { + method: 'DELETE', + body: JSON.stringify({ ids: ids.map((id) => Number(id)) }), + }); + + if (!result.success) { + return { success: false, error: result.error || '일괄 삭제에 실패했습니다.' }; + } + + return { + success: true, + deletedCount: result.data?.deleted_count || ids.length, + }; } catch (error) { console.error('deletePartners error:', error); return { success: false, error: '일괄 삭제에 실패했습니다.' }; From 5fa20c837ac002ff150c6434507075a4fdfd10a9 Mon Sep 17 00:00:00 2001 From: kent Date: Fri, 9 Jan 2026 16:58:50 +0900 Subject: [PATCH 15/45] =?UTF-8?q?feat(item-management):=20Mock=20=E2=86=92?= =?UTF-8?q?=20API=20=EC=97=B0=EB=8F=99=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Phase 2.3 자재관리 API 연동: - actions.ts Mock 데이터 제거, 실제 API 연동 - 8개 API 함수 구현 (getItemList, getItemStats, getItem, createItem, updateItem, deleteItem, deleteItems, getCategoryOptions) - 타입 변환 함수 구현 (Frontend ↔ Backend) - 품목유형 매핑 (제품↔FG, 부품↔PT, 소모품↔CS, 공과↔RM) - Frontend 전용 필터링 (specification, orderType, dateRange, sortBy) --- CURRENT_WORKS.md | 86 ++- ...-01-09] item-management-api-integration.md | 154 +++++ .../construction/item-management/actions.ts | 525 +++++++++--------- 3 files changed, 492 insertions(+), 273 deletions(-) create mode 100644 claudedocs/[IMPL-2026-01-09] item-management-api-integration.md diff --git a/CURRENT_WORKS.md b/CURRENT_WORKS.md index 5bfe18df..dbfd9227 100644 --- a/CURRENT_WORKS.md +++ b/CURRENT_WORKS.md @@ -1,5 +1,63 @@ # SAM React 작업 현황 +## 2026-01-09 (목) - Phase 2.3 자재관리(품목관리) API 연동 + +### 작업 목표 +- 시공사 페이지 API 연동 계획 Phase 2.3: 자재관리 +- `item-management/actions.ts` Mock 데이터 → 실제 API 연동 + +### 수정된 파일 +| 파일명 | 설명 | +|--------|------| +| `src/components/business/construction/item-management/actions.ts` | Mock → API 완전 재작성 | +| `claudedocs/[IMPL-2026-01-09] item-management-api-integration.md` | 구현 문서 | + +### 주요 변경 내용 + +#### 1. 타입 변환 함수 추가 +- `transformItemType()` - Backend item_type → Frontend itemType +- `transformToBackendItemType()` - Frontend itemType → Backend item_type +- `transformSpecification()` - Backend options → Frontend specification +- `transformOrderType()` - Backend options → Frontend orderType +- `transformStatus()` - Backend is_active + options → Frontend status +- `transformOrderItems()` - Backend options → Frontend orderItems +- `transformItem()` - API 응답 → Item 타입 +- `transformItemDetail()` - API 응답 → ItemDetail 타입 +- `transformItemToApi()` - ItemFormData → API 요청 데이터 + +#### 2. 품목유형 매핑 +| Frontend | Backend | +|----------|---------| +| 제품 | FG | +| 부품 | PT | +| 소모품 | CS | +| 공과 | RM | + +#### 3. API 함수 구현 (8개) +- `getItemList()` - GET /api/v1/items +- `getItemStats()` - GET /api/v1/items/stats +- `getItem()` - GET /api/v1/items/{id} +- `createItem()` - POST /api/v1/items +- `updateItem()` - PUT /api/v1/items/{id} +- `deleteItem()` - DELETE /api/v1/items/{id} +- `deleteItems()` - DELETE /api/v1/items/batch +- `getCategoryOptions()` - GET /api/v1/categories + +#### 4. Frontend 전용 필터링 +Backend에서 미지원 필터는 Frontend에서 처리: +- 규격 (specification) +- 구분 (orderType) +- 날짜 범위 (startDate, endDate) +- 정렬 (sortBy) + +### 관련 API 변경 (api 저장소) +- `routes/api.php` - `/items/stats` 라우트 추가 + +### 관련 문서 +- 구현 문서: `claudedocs/[IMPL-2026-01-09] item-management-api-integration.md` + +--- + ## 2025-01-09 (목) - 작업지시 process_type → process_id FK 변환 ### 작업 목표 @@ -78,7 +136,7 @@ --- -## 2026-01-02 (목) - 견적 등록 자동산출 기능 구현 +## 2025-01-02 (목) - 견적 등록 자동산출 기능 구현 ### 작업 목표 - 견적 등록 화면에서 BOM 기반 자동산출 기능 구현 @@ -121,7 +179,7 @@ --- -## 2026-01-02 (목) - 채권현황 동적월 지원 및 버그 수정 +## 2025-01-02 (목) - 채권현황 동적월 지원 및 버그 수정 ### 작업 목표 - "최근 1년" 필터 선택 시 동적 월 기간(최근 12개월) 지원 @@ -322,14 +380,16 @@ React 컴포넌트에서 Mock 데이터를 실제 API 호출로 교체하는 작 - [x] A-5 알림 설정 API 연동 - [x] A-6 거래처 원장 (API 미존재로 스킵) -#### Phase B (진행 중) +#### Phase B (✅ 완료) - [x] B-1 매출관리 (SalesManagement) API 연동 ✅ - [x] B-2 매입관리 (PurchaseManagement) API 연동 ✅ - [x] B-2.1 매입 세금계산서 토글 기능 수정 ✅ -- [ ] B-3 세금계산서 API 연동 -- [ ] B-4 입금관리 API 연동 -- [ ] B-5 출금관리 API 연동 -- [ ] B-6 미수금현황 API 연동 +- [x] B-3 입금관리 (DepositManagement) API 연동 ✅ +- [x] B-4 출금관리 (WithdrawalManagement) API 연동 ✅ +- [x] B-5 거래처관리 (VendorManagement) API 연동 ✅ +- [x] B-6 어음관리 (BillManagement) API 연동 ✅ + +> **참고**: 원본 계획 문서(`docs/plans/react-mock-to-api-migration-plan.md`)의 Phase B 정의와 일치하도록 수정함 --- @@ -466,8 +526,16 @@ useEffect(() => { --- +#### Phase C (✅ 완료) +- [x] C-1 직원관리 (EmployeeManagement) API 연동 ✅ +- [x] C-2 근태관리 (AttendanceManagement) API 연동 ✅ +- [x] C-3 휴가관리 (VacationManagement) API 연동 ✅ + +> **참고**: Phase C는 이전 세션에서 완료됨 (확인: 2025-01-09) + ### 다음 작업 -- B-3 세금계산서 API 연동 -- B-4 ~ B-6 회계관리 나머지 컴포넌트 +- Phase D~L 진행 (계획 문서 참조) +- TODO-1: 결재선/참조 Select 변경 불가 문제 해결 ← 2025-01-09 수정 완료 +- 채권현황 console.log 제거 ← 2025-01-09 정리 완료 --- diff --git a/claudedocs/[IMPL-2026-01-09] item-management-api-integration.md b/claudedocs/[IMPL-2026-01-09] item-management-api-integration.md new file mode 100644 index 00000000..e9f459e0 --- /dev/null +++ b/claudedocs/[IMPL-2026-01-09] item-management-api-integration.md @@ -0,0 +1,154 @@ +# [IMPL-2026-01-09] 자재관리(품목관리) API 연동 + +## 작업 개요 +- **작업자**: Claude Code +- **작업일**: 2026-01-09 +- **Phase**: 2.3 자재관리 (시공사 페이지 API 연동 계획) +- **이전 Phase**: 2.2 거래처관리 완료 + +## 변경 사항 요약 + +### Backend (api/) + +#### 1. 라우트 추가 +**파일**: `routes/api.php` + +```php +// Items (통합 품목 관리 - items 테이블) +Route::prefix('items')->group(function () { + Route::get('', [ItemsController::class, 'index'])->name('v1.items.index'); + Route::get('/stats', [ItemsController::class, 'stats'])->name('v1.items.stats'); // 신규 + Route::post('', [ItemsController::class, 'store'])->name('v1.items.store'); + Route::get('/code/{code}', [ItemsController::class, 'showByCode'])->name('v1.items.show_by_code'); + Route::get('/{id}', [ItemsController::class, 'show'])->name('v1.items.show'); + Route::put('/{id}', [ItemsController::class, 'update'])->name('v1.items.update'); + Route::delete('/batch', [ItemsController::class, 'batchDestroy'])->name('v1.items.batch_destroy'); + Route::delete('/{id}', [ItemsController::class, 'destroy'])->name('v1.items.destroy'); +}); +``` + +**중요**: `/stats` 라우트는 `/{id}` 보다 먼저 정의하여 "stats"가 ID로 캡처되는 것을 방지 + +### Frontend (react/) + +#### 1. actions.ts 완전 재작성 +**파일**: `src/components/business/construction/item-management/actions.ts` + +**변경 전**: Mock 데이터 기반 (mockItems, mockOrderItems 배열) +**변경 후**: 실제 API 연동 + +#### 주요 구현 내용 + +##### 타입 변환 함수 +| 함수명 | 용도 | +|--------|------| +| `transformItemType()` | Backend item_type → Frontend itemType | +| `transformToBackendItemType()` | Frontend itemType → Backend item_type | +| `transformSpecification()` | Backend options → Frontend specification | +| `transformOrderType()` | Backend options → Frontend orderType | +| `transformStatus()` | Backend is_active + options → Frontend status | +| `transformOrderItems()` | Backend options → Frontend orderItems | +| `transformItem()` | API 응답 → Item 타입 | +| `transformItemDetail()` | API 응답 → ItemDetail 타입 | +| `transformItemToApi()` | ItemFormData → API 요청 데이터 | + +##### 품목 유형 매핑 +| Frontend (Korean) | Backend (Code) | +|-------------------|----------------| +| 제품 | FG | +| 부품 | PT | +| 소모품 | CS (또는 SM) | +| 공과 | RM | + +##### API 함수 +| 함수명 | API Endpoint | 설명 | +|--------|-------------|------| +| `getItemList()` | GET /api/v1/items | 품목 목록 조회 | +| `getItemStats()` | GET /api/v1/items/stats | 품목 통계 조회 | +| `getItem()` | GET /api/v1/items/{id} | 품목 상세 조회 | +| `createItem()` | POST /api/v1/items | 품목 등록 | +| `updateItem()` | PUT /api/v1/items/{id} | 품목 수정 | +| `deleteItem()` | DELETE /api/v1/items/{id} | 품목 삭제 | +| `deleteItems()` | DELETE /api/v1/items/batch | 품목 일괄 삭제 | +| `getCategoryOptions()` | GET /api/v1/categories | 카테고리 목록 조회 | + +##### Frontend 전용 필터링 +Backend에서 지원하지 않는 필터는 Frontend에서 처리: +- 규격 (specification) 필터 +- 구분 (orderType) 필터 +- 날짜 범위 (startDate, endDate) 필터 +- 정렬 (sortBy: latest/oldest) + +## 필드 매핑 상세 + +### Item 기본 필드 +| Frontend | Backend | 변환 방식 | +|----------|---------|----------| +| id | id | String 변환 | +| itemNumber | code | 직접 매핑 | +| itemName | name | 직접 매핑 | +| itemType | item_type | transformItemType() | +| categoryId | category_id | String 변환 | +| categoryName | category.name | nested 접근 | +| unit | unit | 직접 매핑 (기본값: EA) | +| specification | options.specification | transformSpecification() | +| orderType | options.orderType | transformOrderType() | +| status | is_active + options.status | transformStatus() | +| createdAt | created_at | 직접 매핑 | +| updatedAt | updated_at | 직접 매핑 | + +### ItemDetail 추가 필드 +| Frontend | Backend | 변환 방식 | +|----------|---------|----------| +| note | description | 직접 매핑 | +| orderItems | options.orderItems | transformOrderItems() | + +## 테스트 체크리스트 + +### API 연동 확인 +- [ ] 품목 목록 조회 (GET /items) +- [ ] 품목 통계 조회 (GET /items/stats) +- [ ] 품목 상세 조회 (GET /items/{id}) +- [ ] 품목 등록 (POST /items) +- [ ] 품목 수정 (PUT /items/{id}) +- [ ] 품목 삭제 (DELETE /items/{id}) +- [ ] 품목 일괄 삭제 (DELETE /items/batch) +- [ ] 카테고리 목록 조회 (GET /categories) + +### 필터링 확인 +- [ ] 검색 필터 (search → q) +- [ ] 품목유형 필터 (itemType → type) +- [ ] 카테고리 필터 (categoryId → category_id) +- [ ] 활성상태 필터 (status → active) +- [ ] 규격 필터 (Frontend only) +- [ ] 구분 필터 (Frontend only) +- [ ] 날짜 필터 (Frontend only) + +### 데이터 변환 확인 +- [ ] 품목유형 한글 ↔ 코드 변환 +- [ ] 상태값 변환 (is_active ↔ status) +- [ ] options JSON 필드 파싱/생성 + +## 관련 파일 + +### 수정된 파일 +1. `api/routes/api.php` - /items/stats 라우트 추가 +2. `react/src/components/business/construction/item-management/actions.ts` - Mock → API 변환 + +### 참조 파일 +- `api/app/Http/Controllers/Api/V1/ItemsController.php` +- `api/app/Services/ItemService.php` +- `react/src/components/business/construction/item-management/types.ts` +- `react/src/lib/api.ts` + +## 다음 단계 + +### Phase 2.4 예정 +- 자재관리 (품목관리) UI 컴포넌트 연동 테스트 +- 에러 핸들링 개선 +- 로딩 상태 처리 + +### 향후 개선 사항 +- Backend에서 추가 필터 지원 시 Frontend 필터 제거 +- options 필드 구조 표준화 +- 품목 일괄 등록 API 추가 고려 \ No newline at end of file diff --git a/src/components/business/construction/item-management/actions.ts b/src/components/business/construction/item-management/actions.ts index 2673a9e3..ebb6f124 100644 --- a/src/components/business/construction/item-management/actions.ts +++ b/src/components/business/construction/item-management/actions.ts @@ -1,187 +1,250 @@ 'use server'; -import type { Item, ItemStats, ItemListParams, ItemListResponse, ItemDetail, ItemFormData, OrderItem } from './types'; +import type { Item, ItemStats, ItemListParams, ItemListResponse, ItemDetail, ItemFormData, OrderItem, ItemType, Specification, OrderType as FrontOrderType, ItemStatus } from './types'; +import { apiClient } from '@/lib/api'; -// 목데이터 -const mockItems: Item[] = [ - { - id: '1', - itemNumber: '123123', - itemType: '제품', - categoryId: '1', - categoryName: '카테고리명', - itemName: '품목명', - specification: '인정', - unit: 'SET', - orderType: '외주발주', - status: '승인', - createdAt: '2026-01-01T10:00:00Z', - updatedAt: '2026-01-01T10:00:00Z', - }, - { - id: '2', - itemNumber: '123124', - itemType: '부품', - categoryId: '2', - categoryName: '모터', - itemName: '소형 모터 A', - specification: '비인정', - unit: 'SET', - orderType: '외주발주', - status: '승인', - createdAt: '2026-01-02T11:00:00Z', - updatedAt: '2026-01-02T11:00:00Z', - }, - { - id: '3', - itemNumber: '123125', - itemType: '소모품', - categoryId: '3', - categoryName: '공정자재', - itemName: '절연테이프', - specification: '인정', - unit: 'SET', - orderType: '외주발주', - status: '승인', - createdAt: '2026-01-03T09:00:00Z', - updatedAt: '2026-01-03T09:00:00Z', - }, - { - id: '4', - itemNumber: '123126', - itemType: '공과', - categoryId: '4', - categoryName: '철물', - itemName: '볼트 세트', - specification: '비인정', - unit: 'EA', - orderType: '경품발주', - status: '작업', - createdAt: '2026-01-03T10:00:00Z', - updatedAt: '2026-01-03T10:00:00Z', - }, - { - id: '5', - itemNumber: '123127', - itemType: '부품', - categoryId: '1', - categoryName: '슬라이드 OPEN 사이즈', - itemName: '슬라이드 레일', - specification: '인정', - unit: 'EA', - orderType: '원자재발주', - status: '작업', - createdAt: '2026-01-04T08:00:00Z', - updatedAt: '2026-01-04T08:00:00Z', - }, - { - id: '6', - itemNumber: '123128', - itemType: '소모품', - categoryId: '3', - categoryName: '공정자재', - itemName: '윤활유', - specification: '비인정', - unit: 'L', - orderType: '외주발주', - status: '사용', - createdAt: '2026-01-04T09:00:00Z', - updatedAt: '2026-01-04T09:00:00Z', - }, - { - id: '7', - itemNumber: '123129', - itemType: '소모품', - categoryId: '3', - categoryName: '공정자재', - itemName: '포장재', - specification: '인정', - unit: 'BOX', - orderType: '경품발주', - status: '중지', - createdAt: '2026-01-05T10:00:00Z', - updatedAt: '2026-01-05T10:00:00Z', - }, -]; +// ======================================== +// 타입 변환 함수 +// ======================================== -// 품목 목록 조회 +/** + * Backend item_type → Frontend itemType 변환 + * FG → 제품, PT → 부품, SM → 소모품, CS → 소모품, RM → 공과 + */ +function transformItemType(backendType: string | null | undefined): ItemType { + const typeMap: Record = { + FG: '제품', + PT: '부품', + SM: '소모품', + CS: '소모품', + RM: '공과', + }; + return typeMap[backendType?.toUpperCase() || ''] || '제품'; +} + +/** + * Frontend itemType → Backend item_type 변환 + * 제품 → FG, 부품 → PT, 소모품 → CS, 공과 → RM + */ +function transformToBackendItemType(frontendType: ItemType): string { + const typeMap: Record = { + '제품': 'FG', + '부품': 'PT', + '소모품': 'CS', + '공과': 'RM', + }; + return typeMap[frontendType] || 'FG'; +} + +/** + * Backend options → Frontend specification 변환 + */ +function transformSpecification(options: Record | null | undefined): Specification { + const spec = options?.specification; + if (spec === '인정' || spec === '비인정') return spec; + return '인정'; // 기본값 +} + +/** + * Backend options → Frontend orderType 변환 + */ +function transformOrderType(options: Record | null | undefined): FrontOrderType { + const orderType = options?.orderType as string | undefined; + const validTypes: FrontOrderType[] = ['외주발주', '경품발주', '원자재발주']; + if (orderType && validTypes.includes(orderType as FrontOrderType)) { + return orderType as FrontOrderType; + } + return '외주발주'; // 기본값 +} + +/** + * Backend is_active + options → Frontend status 변환 + */ +function transformStatus(isActive: boolean | null | undefined, options: Record | null | undefined): ItemStatus { + const status = options?.status as string | undefined; + if (status === '승인' || status === '작업' || status === '사용' || status === '중지') { + return status; + } + return isActive ? '사용' : '중지'; +} + +/** + * Backend options → Frontend orderItems 변환 + */ +function transformOrderItems(options: Record | null | undefined): OrderItem[] { + const orderItems = options?.orderItems; + if (Array.isArray(orderItems)) { + return orderItems.map((item: { id?: string; label?: string; value?: string }, index: number) => ({ + id: item.id || `oi_${index}`, + label: item.label || '', + value: item.value || '', + })); + } + return []; +} + +/** + * API 응답 → Item 타입 변환 + */ +interface ApiItem { + id: number; + code: string; + name: string; + item_type: string | null; + category_id: number | null; + category?: { name?: string } | null; + unit: string | null; + options: Record | null; + is_active: boolean; + description: string | null; + created_at: string; + updated_at: string; +} + +function transformItem(apiItem: ApiItem): Item { + return { + id: String(apiItem.id), + itemNumber: apiItem.code || '', + itemName: apiItem.name || '', + itemType: transformItemType(apiItem.item_type), + categoryId: apiItem.category_id ? String(apiItem.category_id) : '', + categoryName: apiItem.category?.name || '', + unit: apiItem.unit || 'EA', + specification: transformSpecification(apiItem.options), + orderType: transformOrderType(apiItem.options), + status: transformStatus(apiItem.is_active, apiItem.options), + createdAt: apiItem.created_at, + updatedAt: apiItem.updated_at, + }; +} + +/** + * API 응답 → ItemDetail 타입 변환 + */ +function transformItemDetail(apiItem: ApiItem): ItemDetail { + return { + ...transformItem(apiItem), + note: apiItem.description || '', + orderItems: transformOrderItems(apiItem.options), + }; +} + +/** + * ItemFormData → API 요청 데이터 변환 + */ +function transformItemToApi(data: ItemFormData): Record { + return { + code: data.itemNumber, + name: data.itemName, + item_type: transformToBackendItemType(data.itemType), + category_id: data.categoryId ? parseInt(data.categoryId, 10) : null, + unit: data.unit, + is_active: data.status === '사용' || data.status === '승인', + description: data.note || null, + options: { + specification: data.specification, + orderType: data.orderType, + status: data.status, + orderItems: data.orderItems, + }, + }; +} + +// ======================================== +// API 함수 +// ======================================== + +/** + * 품목 목록 조회 + * GET /api/v1/items + */ export async function getItemList( params: ItemListParams = {} ): Promise<{ success: boolean; data?: ItemListResponse; error?: string }> { try { - // 시뮬레이션 딜레이 - await new Promise((resolve) => setTimeout(resolve, 300)); + const queryParams: Record = {}; - let filteredItems = [...mockItems]; + // 페이지네이션 + if (params.page) queryParams.page = String(params.page); + if (params.size) queryParams.size = String(params.size); - // 물품유형 필터 + // 검색 + if (params.search) queryParams.q = params.search; + + // 품목유형 필터 (Frontend → Backend 변환) if (params.itemType && params.itemType !== 'all') { - filteredItems = filteredItems.filter((item) => item.itemType === params.itemType); + queryParams.type = transformToBackendItemType(params.itemType as ItemType); } // 카테고리 필터 if (params.categoryId && params.categoryId !== 'all') { - filteredItems = filteredItems.filter((item) => item.categoryId === params.categoryId); + queryParams.category_id = params.categoryId; } - // 규격 필터 - if (params.specification && params.specification !== 'all') { - filteredItems = filteredItems.filter((item) => item.specification === params.specification); - } - - // 구분 필터 - if (params.orderType && params.orderType !== 'all') { - filteredItems = filteredItems.filter((item) => item.orderType === params.orderType); - } - - // 상태 필터 + // 활성 상태 필터 if (params.status && params.status !== 'all') { - filteredItems = filteredItems.filter((item) => item.status === params.status); + queryParams.active = params.status === '사용' || params.status === '승인' ? '1' : '0'; } - // 검색어 필터 - if (params.search) { - const search = params.search.toLowerCase(); - filteredItems = filteredItems.filter( - (item) => - item.itemNumber.toLowerCase().includes(search) || - item.itemName.toLowerCase().includes(search) || - item.categoryName.toLowerCase().includes(search) - ); + const response = await apiClient.get<{ + data: ApiItem[]; + meta?: { total: number; current_page: number; per_page: number }; + total?: number; + current_page?: number; + per_page?: number; + }>('/items', { params: queryParams }); + + // API 응답 구조 처리 (data 배열 또는 페이지네이션 객체) + const items = Array.isArray(response.data) ? response.data : (response.data as unknown as ApiItem[]); + const meta = response.meta || { + total: response.total || items.length, + current_page: response.current_page || params.page || 1, + per_page: response.per_page || params.size || 20, + }; + + // Frontend 필터링 (Backend에서 지원하지 않는 필터) + let transformedItems = items.map(transformItem); + + // 규격 필터 (Frontend) + if (params.specification && params.specification !== 'all') { + transformedItems = transformedItems.filter((item) => item.specification === params.specification); } - // 날짜 필터 + // 구분 필터 (Frontend) + if (params.orderType && params.orderType !== 'all') { + transformedItems = transformedItems.filter((item) => item.orderType === params.orderType); + } + + // 상태 필터 (Frontend에서 추가 처리) + if (params.status && params.status !== 'all') { + transformedItems = transformedItems.filter((item) => item.status === params.status); + } + + // 날짜 필터 (Frontend) if (params.startDate) { const startDate = new Date(params.startDate); - filteredItems = filteredItems.filter((item) => new Date(item.createdAt) >= startDate); + transformedItems = transformedItems.filter((item) => new Date(item.createdAt) >= startDate); } if (params.endDate) { const endDate = new Date(params.endDate); endDate.setHours(23, 59, 59, 999); - filteredItems = filteredItems.filter((item) => new Date(item.createdAt) <= endDate); + transformedItems = transformedItems.filter((item) => new Date(item.createdAt) <= endDate); } - // 정렬 + // 정렬 (Frontend) if (params.sortBy === 'oldest') { - filteredItems.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime()); + transformedItems.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime()); } else { - // 기본: 최신순 - filteredItems.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()); + transformedItems.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()); } - // 페이지네이션 - const page = params.page || 1; - const size = params.size || 20; - const start = (page - 1) * size; - const paginatedItems = filteredItems.slice(start, start + size); - return { success: true, data: { - items: paginatedItems, - total: filteredItems.length, - page, - size, + items: transformedItems, + total: meta.total, + page: meta.current_page, + size: meta.per_page, }, }; } catch (error) { @@ -190,17 +253,20 @@ export async function getItemList( } } -// 품목 통계 조회 +/** + * 품목 통계 조회 + * GET /api/v1/items/stats + */ export async function getItemStats(): Promise<{ success: boolean; data?: ItemStats; error?: string }> { try { - await new Promise((resolve) => setTimeout(resolve, 100)); - - const total = mockItems.length; - const active = mockItems.filter((item) => item.status === '사용' || item.status === '승인').length; + const response = await apiClient.get<{ total: number; active: number }>('/items/stats'); return { success: true, - data: { total, active }, + data: { + total: response.total, + active: response.active, + }, }; } catch (error) { console.error('품목 통계 조회 오류:', error); @@ -208,17 +274,13 @@ export async function getItemStats(): Promise<{ success: boolean; data?: ItemSta } } -// 품목 삭제 +/** + * 품목 삭제 + * DELETE /api/v1/items/{id} + */ export async function deleteItem(id: string): Promise<{ success: boolean; error?: string }> { try { - await new Promise((resolve) => setTimeout(resolve, 300)); - - // 실제 구현에서는 API 호출 - const index = mockItems.findIndex((item) => item.id === id); - if (index !== -1) { - mockItems.splice(index, 1); - } - + await apiClient.delete(`/items/${id}`); return { success: true }; } catch (error) { console.error('품목 삭제 오류:', error); @@ -226,40 +288,43 @@ export async function deleteItem(id: string): Promise<{ success: boolean; error? } } -// 품목 일괄 삭제 +/** + * 품목 일괄 삭제 + * DELETE /api/v1/items/batch + */ export async function deleteItems( ids: string[] ): Promise<{ success: boolean; deletedCount?: number; error?: string }> { try { - await new Promise((resolve) => setTimeout(resolve, 500)); - - let deletedCount = 0; - ids.forEach((id) => { - const index = mockItems.findIndex((item) => item.id === id); - if (index !== -1) { - mockItems.splice(index, 1); - deletedCount++; - } + const response = await apiClient.delete<{ deleted_count: number }>('/items/batch', { + data: { ids: ids.map((id) => parseInt(id, 10)) }, }); - return { success: true, deletedCount }; + return { success: true, deletedCount: response.deleted_count }; } catch (error) { console.error('품목 일괄 삭제 오류:', error); return { success: false, error: '품목 일괄 삭제에 실패했습니다.' }; } } -// 카테고리 목록 조회 (필터용) +/** + * 카테고리 목록 조회 (필터용) + * GET /api/v1/categories + */ export async function getCategoryOptions(): Promise<{ success: boolean; data?: { id: string; name: string }[]; error?: string; }> { try { - await new Promise((resolve) => setTimeout(resolve, 100)); + const response = await apiClient.get<{ + data: { id: number; name: string }[]; + }>('/categories', { params: { size: 100 } }); - // 유니크한 카테고리 추출 - const categories = [...new Map(mockItems.map((item) => [item.categoryId, { id: item.categoryId, name: item.categoryName }])).values()]; + const categories = response.data.map((cat) => ({ + id: String(cat.id), + name: cat.name, + })); return { success: true, data: categories }; } catch (error) { @@ -268,93 +333,49 @@ export async function getCategoryOptions(): Promise<{ } } -// 발주 항목 목데이터 -const mockOrderItems: Record = { - '1': [ - { id: 'oi1', label: '무게', value: '400KG' }, - { id: 'oi2', label: '무게', value: '500KG' }, - ], - '2': [ - { id: 'oi3', label: '전압', value: '220V' }, - ], - '3': [], - '4': [ - { id: 'oi4', label: '규격', value: 'M10x20' }, - ], - '5': [], - '6': [], - '7': [], -}; - -// 품목 상세 조회 +/** + * 품목 상세 조회 + * GET /api/v1/items/{id} + */ export async function getItem(id: string): Promise<{ success: boolean; data?: ItemDetail; error?: string; }> { try { - await new Promise((resolve) => setTimeout(resolve, 200)); + const response = await apiClient.get(`/items/${id}`); - const item = mockItems.find((i) => i.id === id); - if (!item) { - return { success: false, error: '품목을 찾을 수 없습니다.' }; - } - - const itemDetail: ItemDetail = { - ...item, - note: '', - orderItems: mockOrderItems[id] || [], - }; - - return { success: true, data: itemDetail }; + return { success: true, data: transformItemDetail(response) }; } catch (error) { console.error('품목 상세 조회 오류:', error); return { success: false, error: '품목 정보를 불러오는데 실패했습니다.' }; } } -// 품목 등록 +/** + * 품목 등록 + * POST /api/v1/items + */ export async function createItem(data: ItemFormData): Promise<{ success: boolean; data?: { id: string }; error?: string; }> { try { - await new Promise((resolve) => setTimeout(resolve, 300)); + const apiData = transformItemToApi(data); + const response = await apiClient.post<{ id: number }>('/items', apiData); - // 새 ID 생성 - const newId = String(Math.max(...mockItems.map((i) => parseInt(i.id))) + 1); - - // 카테고리명 찾기 - const category = mockItems.find((i) => i.categoryId === data.categoryId); - const categoryName = category?.categoryName || '기본'; - - const newItem: Item = { - id: newId, - itemNumber: data.itemNumber, - itemType: data.itemType, - categoryId: data.categoryId, - categoryName, - itemName: data.itemName, - specification: data.specification, - unit: data.unit, - orderType: data.orderType, - status: data.status, - createdAt: new Date().toISOString(), - updatedAt: new Date().toISOString(), - }; - - mockItems.push(newItem); - mockOrderItems[newId] = data.orderItems; - - return { success: true, data: { id: newId } }; + return { success: true, data: { id: String(response.id) } }; } catch (error) { console.error('품목 등록 오류:', error); return { success: false, error: '품목 등록에 실패했습니다.' }; } } -// 품목 수정 +/** + * 품목 수정 + * PUT /api/v1/items/{id} + */ export async function updateItem( id: string, data: ItemFormData @@ -363,32 +384,8 @@ export async function updateItem( error?: string; }> { try { - await new Promise((resolve) => setTimeout(resolve, 300)); - - const index = mockItems.findIndex((i) => i.id === id); - if (index === -1) { - return { success: false, error: '품목을 찾을 수 없습니다.' }; - } - - // 카테고리명 찾기 - const category = mockItems.find((i) => i.categoryId === data.categoryId); - const categoryName = category?.categoryName || mockItems[index].categoryName; - - mockItems[index] = { - ...mockItems[index], - itemNumber: data.itemNumber, - itemType: data.itemType, - categoryId: data.categoryId, - categoryName, - itemName: data.itemName, - specification: data.specification, - unit: data.unit, - orderType: data.orderType, - status: data.status, - updatedAt: new Date().toISOString(), - }; - - mockOrderItems[id] = data.orderItems; + const apiData = transformItemToApi(data); + await apiClient.put(`/items/${id}`, apiData); return { success: true }; } catch (error) { From d472b771e1c15ac261bb6dd19bfa73bec526ac60 Mon Sep 17 00:00:00 2001 From: kent Date: Fri, 9 Jan 2026 17:06:04 +0900 Subject: [PATCH 16/45] =?UTF-8?q?fix(approval):=20=EA=B2=B0=EC=9E=AC?= =?UTF-8?q?=EC=84=A0/=EC=B0=B8=EC=A1=B0=20Select=20=EA=B0=92=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20=EB=B6=88=EA=B0=80=20=EB=B2=84=EA=B7=B8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - SelectValue children 조건부 렌더링 → placeholder prop으로 이동 - Radix UI Select 상태 관리 문제 해결 - @/lib/api barrel export 추가 (빌드 오류 해결) 수정 파일: - ApprovalLineSection.tsx: SelectValue 수정 - ReferenceSection.tsx: SelectValue 수정 - src/lib/api/index.ts: 신규 생성 빌드 검증: npm run build 성공 (349 페이지) --- CURRENT_WORKS.md | 57 ++++++++++++++++++- .../DocumentCreate/ApprovalLineSection.tsx | 12 ++-- .../DocumentCreate/ReferenceSection.tsx | 12 ++-- src/lib/api/index.ts | 16 ++++++ 4 files changed, 85 insertions(+), 12 deletions(-) create mode 100644 src/lib/api/index.ts diff --git a/CURRENT_WORKS.md b/CURRENT_WORKS.md index dbfd9227..69cc4b88 100644 --- a/CURRENT_WORKS.md +++ b/CURRENT_WORKS.md @@ -1,5 +1,59 @@ # SAM React 작업 현황 +## 2026-01-09 (목) - TODO-1 결재선/참조 Select 버그 수정 + +### 작업 목표 +- 결재선/참조 Select 컴포넌트에서 선택한 직원 정보가 표시되지 않는 버그 수정 +- @/lib/api barrel export 추가 (빌드 오류 해결) + +### 수정된 파일 +| 파일명 | 설명 | +|--------|------| +| `src/components/approval/DocumentCreate/ApprovalLineSection.tsx` | SelectValue 버그 수정 | +| `src/components/approval/DocumentCreate/ReferenceSection.tsx` | SelectValue 버그 수정 | +| `src/lib/api/index.ts` | 신규 생성 - barrel export | + +### 주요 변경 내용 + +#### 1. SelectValue 버그 수정 +**문제**: Radix UI SelectValue의 children prop에 조건부 렌더링 사용 시 Select 상태 관리가 깨짐 + +**해결**: children 제거, placeholder prop으로 이동 +```tsx +// Before (버그) + + {person.name ? `${person.department} / ${person.position} / ${person.name}` : null} + + +// After (수정) + +``` + +#### 2. @/lib/api barrel export +Phase 2.3 자재관리 작업에서 사용하는 import 경로 지원: +```typescript +// src/lib/api/index.ts +export { ApiClient, withTokenRefresh } from './client'; +export { serverFetch } from './fetch-wrapper'; +export { AUTH_CONFIG } from './auth/auth-config'; + +export const apiClient = new ApiClient({ + mode: 'api-key', + apiKey: process.env.API_KEY, +}); +``` + +### 빌드 검증 +✅ Next.js 빌드 성공 (349 페이지) + +--- + ## 2026-01-09 (목) - Phase 2.3 자재관리(품목관리) API 연동 ### 작업 목표 @@ -535,7 +589,6 @@ useEffect(() => { ### 다음 작업 - Phase D~L 진행 (계획 문서 참조) -- TODO-1: 결재선/참조 Select 변경 불가 문제 해결 ← 2025-01-09 수정 완료 -- 채권현황 console.log 제거 ← 2025-01-09 정리 완료 +- ~~TODO-1: 결재선/참조 Select 변경 불가 문제~~ ✅ 2026-01-09 수정 완료 --- diff --git a/src/components/approval/DocumentCreate/ApprovalLineSection.tsx b/src/components/approval/DocumentCreate/ApprovalLineSection.tsx index d21b6c48..37a86338 100644 --- a/src/components/approval/DocumentCreate/ApprovalLineSection.tsx +++ b/src/components/approval/DocumentCreate/ApprovalLineSection.tsx @@ -75,11 +75,13 @@ export function ApprovalLineSection({ data, onChange }: ApprovalLineSectionProps onValueChange={(value) => handleChange(index, value)} > - - {person.name && !person.id.startsWith('temp-') - ? `${person.department || ''} / ${person.position || ''} / ${person.name}` - : null} - + {employees.map((employee) => ( diff --git a/src/components/approval/DocumentCreate/ReferenceSection.tsx b/src/components/approval/DocumentCreate/ReferenceSection.tsx index daeeb54d..59cbdf15 100644 --- a/src/components/approval/DocumentCreate/ReferenceSection.tsx +++ b/src/components/approval/DocumentCreate/ReferenceSection.tsx @@ -75,11 +75,13 @@ export function ReferenceSection({ data, onChange }: ReferenceSectionProps) { onValueChange={(value) => handleChange(index, value)} > - - {person.name && !person.id.startsWith('temp-') - ? `${person.department || ''} / ${person.position || ''} / ${person.name}` - : null} - + {employees.map((employee) => ( diff --git a/src/lib/api/index.ts b/src/lib/api/index.ts new file mode 100644 index 00000000..d751411e --- /dev/null +++ b/src/lib/api/index.ts @@ -0,0 +1,16 @@ +// lib/api/index.ts +// API 클라이언트 배럴 익스포트 + +export { ApiClient, withTokenRefresh } from './client'; +export { serverFetch } from './fetch-wrapper'; +export { AUTH_CONFIG } from './auth/auth-config'; + +// Server-side API 클라이언트 인스턴스 +// 서버 액션에서 사용 +import { ApiClient } from './client'; +import { AUTH_CONFIG } from './auth/auth-config'; + +export const apiClient = new ApiClient({ + mode: 'api-key', + apiKey: process.env.API_KEY, +}); \ No newline at end of file From 6615f3946600263faf5079a88603b82452d6875a Mon Sep 17 00:00:00 2001 From: kent Date: Fri, 9 Jan 2026 17:25:24 +0900 Subject: [PATCH 17/45] =?UTF-8?q?feat(order-management):=20Mock=20?= =?UTF-8?q?=E2=86=92=20API=20=EC=97=B0=EB=8F=99=20=EB=B0=8F=20common-codes?= =?UTF-8?q?=20=EC=9C=A0=ED=8B=B8=EB=A6=AC=ED=8B=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - common-codes.ts 신규 생성 (공용 코드 조회 유틸리티) - getCommonCodes(), getCommonCodeOptions() 기본 함수 - getOrderStatusOptions(), getOrderTypeOptions() 등 편의 함수 - order-management/actions.ts Mock 데이터 → 실제 API 연동 - 상태 변환 함수 (Frontend ↔ Backend 매핑) - getOrderList(), getOrderStats(), createOrder(), updateOrder() 등 구현 - lib/api/index.ts에 common-codes 모듈 export 추가 --- .../construction/order-management/actions.ts | 584 ++++++++++-------- src/lib/api/common-codes.ts | 121 ++++ src/lib/api/index.ts | 15 + 3 files changed, 474 insertions(+), 246 deletions(-) create mode 100644 src/lib/api/common-codes.ts diff --git a/src/components/business/construction/order-management/actions.ts b/src/components/business/construction/order-management/actions.ts index d006af86..16173d18 100644 --- a/src/components/business/construction/order-management/actions.ts +++ b/src/components/business/construction/order-management/actions.ts @@ -1,131 +1,189 @@ 'use server'; -import type { Order, OrderStats, OrderType, OrderDetail, OrderDetailFormData } from './types'; -import { MOCK_ORDER_DETAIL } from './types'; -import { format, addDays, subDays, subMonths } from 'date-fns'; +import type { Order, OrderStats, OrderDetail, OrderDetailFormData, OrderStatus, OrderType } from './types'; +import { apiClient, getOrderStatusOptions, getOrderTypeOptions } from '@/lib/api'; + +// ======================================== +// 타입 변환 함수 +// ======================================== /** - * 목업 발주 데이터 생성 (고정 데이터) - * - types.ts의 MOCK 옵션들과 정확히 일치해야 필터가 동작함 - * - Math.random() 제거 → index 기반 deterministic 데이터 + * Backend status_code → Frontend OrderStatus 변환 + * DRAFT → waiting, CONFIRMED → order_complete, IN_PROGRESS → delivery_scheduled, COMPLETED → delivery_complete */ -function generateMockOrders(): Order[] { - // types.ts MOCK_PARTNERS와 일치 - const partners = [ - { id: '1', name: '(주)대한건설' }, - { id: '2', name: '삼성물산' }, - { id: '3', name: '현대건설' }, - { id: '4', name: 'GS건설' }, - { id: '5', name: '대림산업' }, - ]; - - // types.ts MOCK_SITES와 일치 - const sites = [ - '강남 오피스빌딩 신축', - '판교 데이터센터', - '송도 물류센터', - '인천공항 터미널', - '부산항 창고', - ]; - - const names = [ - '철근 HD13', - '철근 HD16', - '철근 HD19', - '철근 HD22', - 'H빔 300x300', - 'H빔 200x200', - '콘크리트 25-21-12', - '레미콘 배합', - ]; - - const items = [ - '철근 HD13', - '철근 HD16', - '철근 HD19', - 'H빔', - '레미콘', - '앵커볼트', - '데크플레이트', - '용접봉', - ]; - - // types.ts MOCK_CONSTRUCTION_PM과 일치 - const constructionPMs = ['홍길동', '김철수', '이영희', '박민수']; - // types.ts MOCK_ORDER_MANAGERS와 일치 - const orderManagers = ['김담당', '이담당', '박담당', '최담당']; - // types.ts MOCK_ORDER_COMPANIES와 일치 - const orderCompanies = ['A건설', 'B철강', 'C자재', 'D산업']; - // types.ts MOCK_WORK_TEAM_LEADERS와 일치 - const workTeamLeaders = ['이반장', '김반장', '박반장', '최반장']; - const orderTypes: OrderType[] = ['steel_bar', 'material', 'outsourcing']; - const statuses: Order['status'][] = ['waiting', 'order_complete', 'delivery_scheduled', 'delivery_complete']; - - const orders: Order[] = []; - // 고정 기준일 (2026-01-06) - const baseDate = new Date(2026, 0, 6); - - for (let i = 0; i < 50; i++) { - // index 기반 deterministic 선택 (랜덤 제거) - const partner = partners[i % partners.length]; - const site = sites[i % sites.length]; - const status = statuses[i % statuses.length]; - const orderType = orderTypes[i % orderTypes.length]; - - // 날짜도 index 기반으로 고정 - const monthOffset = i % 3; // 0, 1, 2개월 전 - const dayOffset = (i * 3) % 30; // 0~29일 분산 - const periodStart = subMonths(addDays(baseDate, -dayOffset), monthOffset); - const periodEnd = addDays(periodStart, 10 + (i % 20)); // 10~29일 기간 - const orderDate = subDays(periodStart, i % 5); - const constructionStartDate = addDays(periodStart, i % 5); - const plannedDelivery = addDays(orderDate, 3 + (i % 14)); - const actualDelivery = status === 'delivery_complete' - ? format(addDays(plannedDelivery, (i % 5) - 2), 'yyyy-MM-dd') - : null; - - orders.push({ - id: `order-${i + 1}`, - contractNumber: `CT-${2026}-${String(i + 1).padStart(4, '0')}`, - partnerId: partner.id, - partnerName: partner.name, - siteName: site, - name: names[i % names.length], - constructionPM: constructionPMs[i % constructionPMs.length], - orderManager: orderManagers[i % orderManagers.length], - orderNumber: `ORD-${2026}-${String(i + 1).padStart(4, '0')}`, - orderCompany: orderCompanies[i % orderCompanies.length], - workTeamLeader: workTeamLeaders[i % workTeamLeaders.length], - constructionStartDate: format(constructionStartDate, 'yyyy-MM-dd'), - orderType, - item: items[i % items.length], - quantity: 10 + (i * 7) % 90, // 10~99 고정 패턴 - orderDate: format(orderDate, 'yyyy-MM-dd'), - plannedDeliveryDate: format(plannedDelivery, 'yyyy-MM-dd'), - actualDeliveryDate: actualDelivery, - status, - periodStart: format(periodStart, 'yyyy-MM-dd'), - periodEnd: format(periodEnd, 'yyyy-MM-dd'), - createdAt: format(subDays(periodStart, i % 10), 'yyyy-MM-dd\'T\'HH:mm:ss'), - updatedAt: format(baseDate, 'yyyy-MM-dd\'T\'HH:mm:ss'), - }); - } - - return orders; +function transformStatus(backendStatus: string | null | undefined): OrderStatus { + const statusMap: Record = { + DRAFT: 'waiting', + CONFIRMED: 'order_complete', + IN_PROGRESS: 'delivery_scheduled', + COMPLETED: 'delivery_complete', + CANCELLED: 'waiting', // 취소는 대기로 표시 + }; + return statusMap[backendStatus?.toUpperCase() || ''] || 'waiting'; } -// 캐시된 목업 데이터 -let cachedOrders: Order[] | null = null; - -function getMockOrders(): Order[] { - if (!cachedOrders) { - cachedOrders = generateMockOrders(); - } - return cachedOrders; +/** + * Frontend OrderStatus → Backend status_code 변환 + */ +function transformToBackendStatus(frontendStatus: OrderStatus): string { + const statusMap: Record = { + waiting: 'DRAFT', + order_complete: 'CONFIRMED', + delivery_scheduled: 'IN_PROGRESS', + delivery_complete: 'COMPLETED', + }; + return statusMap[frontendStatus] || 'DRAFT'; } +/** + * Backend order_type_code → Frontend OrderType 변환 + */ +function transformOrderType(backendType: string | null | undefined): OrderType { + // Backend: ORDER, PURCHASE + // Frontend: steel_bar, material, outsourcing + // 현재 Backend는 ORDER/PURCHASE만 있으므로 options에서 가져오거나 기본값 사용 + const typeMap: Record = { + ORDER: 'steel_bar', + PURCHASE: 'material', + }; + return typeMap[backendType?.toUpperCase() || ''] || 'steel_bar'; +} + +/** + * Frontend OrderType → Backend order_type_code 변환 + */ +function transformToBackendOrderType(frontendType: OrderType): string { + const typeMap: Record = { + steel_bar: 'ORDER', + material: 'PURCHASE', + outsourcing: 'ORDER', + }; + return typeMap[frontendType] || 'ORDER'; +} + +// ======================================== +// API 응답 타입 +// ======================================== + +interface ApiOrder { + id: number; + order_no: string; + client_id: number | null; + client_name: string | null; + client?: { id: number; name: string } | null; + site_name: string | null; + status_code: string; + order_type_code: string; + received_at: string | null; + delivery_date: string | null; + actual_delivery_date: string | null; + total_amount: number | null; + supply_amount: number | null; + tax_amount: number | null; + memo: string | null; + created_at: string; + updated_at: string; + items?: ApiOrderItem[]; + quote?: { id: number; quote_no: string; site_name: string } | null; +} + +interface ApiOrderItem { + id: number; + item_id: number | null; + item_name: string; + specification: string | null; + quantity: number; + unit: string | null; + unit_price: number; + supply_amount: number; + tax_amount: number; + total_amount: number; + sort_order: number; +} + +interface ApiOrderStats { + total: number; + draft: number; + confirmed: number; + in_progress: number; + completed: number; + cancelled: number; + total_amount: number; + confirmed_amount: number; +} + +/** + * API 응답 → Order 타입 변환 + */ +function transformOrder(apiOrder: ApiOrder): Order { + return { + id: String(apiOrder.id), + contractNumber: apiOrder.quote?.quote_no || '', + partnerId: apiOrder.client_id ? String(apiOrder.client_id) : '', + partnerName: apiOrder.client?.name || apiOrder.client_name || '', + siteName: apiOrder.site_name || '', + name: apiOrder.items?.[0]?.item_name || '', + constructionPM: '', // Backend에 없음 - options로 확장 가능 + orderManager: '', // Backend에 없음 - options로 확장 가능 + orderNumber: apiOrder.order_no, + orderCompany: '', // Backend에 없음 - options로 확장 가능 + workTeamLeader: '', // Backend에 없음 - options로 확장 가능 + constructionStartDate: apiOrder.received_at || '', + orderType: transformOrderType(apiOrder.order_type_code), + item: apiOrder.items?.[0]?.item_name || '', + quantity: apiOrder.items?.[0]?.quantity || 0, + orderDate: apiOrder.received_at || '', + plannedDeliveryDate: apiOrder.delivery_date || '', + actualDeliveryDate: apiOrder.actual_delivery_date || null, + status: transformStatus(apiOrder.status_code), + periodStart: apiOrder.received_at || '', + periodEnd: apiOrder.delivery_date || '', + createdAt: apiOrder.created_at, + updatedAt: apiOrder.updated_at, + }; +} + +/** + * API 응답 → OrderDetail 타입 변환 + */ +function transformOrderDetail(apiOrder: ApiOrder): OrderDetail { + const baseOrder = transformOrder(apiOrder); + + return { + ...baseOrder, + orderCompanyId: '', // Backend에 없음 + deliveryLocationType: 'site', + deliveryAddress: '', // Backend에 없음 + deliveryMemo: apiOrder.memo || '', + totalAmount: apiOrder.total_amount || 0, + supplyAmount: apiOrder.supply_amount || 0, + taxAmount: apiOrder.tax_amount || 0, + categories: [], // Backend 구조와 다름 - items를 카테고리로 그룹화 필요 + }; +} + +/** + * OrderDetailFormData → API 요청 데이터 변환 + */ +function transformOrderToApi(data: OrderDetailFormData): Record { + return { + client_id: data.partnerId ? parseInt(data.partnerId, 10) : null, + site_name: data.siteName, + status_code: transformToBackendStatus(data.status), + order_type_code: transformToBackendOrderType(data.orderType), + delivery_date: data.deliveryAddress ? undefined : undefined, // 필드 매핑 필요 + memo: data.deliveryMemo, + // items 변환은 별도 처리 필요 + }; +} + +// ======================================== +// API 함수 +// ======================================== + /** * 발주 목록 조회 + * GET /api/v1/orders */ export async function getOrderList(params?: { size?: number; @@ -141,61 +199,67 @@ export async function getOrderList(params?: { error?: string; }> { try { - // 목업 데이터 - let orders = getMockOrders(); + const queryParams: Record = {}; - // 날짜 필터 - if (params?.startDate && params?.endDate) { - orders = orders.filter((order) => { - return order.periodStart >= params.startDate! && order.periodEnd <= params.endDate!; - }); - } + // 페이지네이션 + if (params?.page) queryParams.page = String(params.page); + if (params?.size) queryParams.size = String(params.size); - // 상태 필터 + // 검색 + if (params?.search) queryParams.q = params.search; + + // 상태 필터 (Frontend → Backend 변환) if (params?.status && params.status !== 'all') { - orders = orders.filter((order) => order.status === params.status); + queryParams.status = transformToBackendStatus(params.status as OrderStatus); } // 거래처 필터 if (params?.partnerId && params.partnerId !== 'all') { - orders = orders.filter((order) => order.partnerId === params.partnerId); + queryParams.client_id = params.partnerId; } - // 검색 - if (params?.search) { - const search = params.search.toLowerCase(); - orders = orders.filter( - (order) => - order.orderNumber.toLowerCase().includes(search) || - order.partnerName.toLowerCase().includes(search) || - order.siteName.toLowerCase().includes(search) || - order.orderManager.toLowerCase().includes(search) - ); + // 날짜 범위 필터 + if (params?.startDate) { + queryParams.date_from = params.startDate; + } + if (params?.endDate) { + queryParams.date_to = params.endDate; } - // 페이지네이션 - const page = params?.page || 1; - const size = params?.size || 1000; - const start = (page - 1) * size; - const paginatedOrders = orders.slice(start, start + size); + const response = await apiClient.get<{ + data: ApiOrder[]; + meta?: { total: number; current_page: number; per_page: number }; + total?: number; + current_page?: number; + per_page?: number; + }>('/orders', { params: queryParams }); + + // API 응답 구조 처리 + const orders = Array.isArray(response.data) ? response.data : (response.data as unknown as ApiOrder[]); + const meta = response.meta || { + total: response.total || orders.length, + current_page: response.current_page || params?.page || 1, + per_page: response.per_page || params?.size || 20, + }; + + const transformedOrders = orders.map(transformOrder); return { success: true, data: { - items: paginatedOrders, - total: orders.length, + items: transformedOrders, + total: meta.total, }, }; - } catch { - return { - success: false, - error: '발주 목록 조회에 실패했습니다.', - }; + } catch (error) { + console.error('발주 목록 조회 오류:', error); + return { success: false, error: '발주 목록을 불러오는데 실패했습니다.' }; } } /** * 발주 통계 조회 + * GET /api/v1/orders/stats */ export async function getOrderStats(): Promise<{ success: boolean; @@ -203,52 +267,44 @@ export async function getOrderStats(): Promise<{ error?: string; }> { try { - const orders = getMockOrders(); - - const stats: OrderStats = { - total: orders.length, - waiting: orders.filter((o) => o.status === 'waiting').length, - orderComplete: orders.filter((o) => o.status === 'order_complete').length, - deliveryScheduled: orders.filter((o) => o.status === 'delivery_scheduled').length, - deliveryComplete: orders.filter((o) => o.status === 'delivery_complete').length, - }; + const response = await apiClient.get('/orders/stats'); return { success: true, - data: stats, - }; - } catch { - return { - success: false, - error: '발주 통계 조회에 실패했습니다.', + data: { + total: response.total, + waiting: response.draft, + orderComplete: response.confirmed, + deliveryScheduled: response.in_progress, + deliveryComplete: response.completed, + }, }; + } catch (error) { + console.error('발주 통계 조회 오류:', error); + return { success: false, error: '발주 통계를 불러오는데 실패했습니다.' }; } } /** * 발주 삭제 + * DELETE /api/v1/orders/{id} */ export async function deleteOrder(id: string): Promise<{ success: boolean; error?: string; }> { try { - // 목업: 실제로는 API 호출 - if (cachedOrders) { - cachedOrders = cachedOrders.filter((o) => o.id !== id); - } - + await apiClient.delete(`/orders/${id}`); return { success: true }; - } catch { - return { - success: false, - error: '발주 삭제에 실패했습니다.', - }; + } catch (error) { + console.error('발주 삭제 오류:', error); + return { success: false, error: '발주 삭제에 실패했습니다.' }; } } /** * 발주 일괄 삭제 + * Backend에 batch API가 없으므로 개별 삭제 반복 */ export async function deleteOrders(ids: string[]): Promise<{ success: boolean; @@ -256,32 +312,28 @@ export async function deleteOrders(ids: string[]): Promise<{ error?: string; }> { try { - // 목업: 실제로는 API 호출 - if (cachedOrders) { - const beforeCount = cachedOrders.length; - cachedOrders = cachedOrders.filter((o) => !ids.includes(o.id)); - const deletedCount = beforeCount - cachedOrders.length; + let deletedCount = 0; - return { - success: true, - deletedCount, - }; + for (const id of ids) { + try { + await apiClient.delete(`/orders/${id}`); + deletedCount++; + } catch { + // 개별 삭제 실패는 무시하고 계속 진행 + console.warn(`발주 삭제 실패: ${id}`); + } } - return { - success: true, - deletedCount: ids.length, - }; - } catch { - return { - success: false, - error: '발주 일괄 삭제에 실패했습니다.', - }; + return { success: true, deletedCount }; + } catch (error) { + console.error('발주 일괄 삭제 오류:', error); + return { success: false, error: '발주 일괄 삭제에 실패했습니다.' }; } } /** * 발주 상세 조회 + * GET /api/v1/orders/{id} */ export async function getOrderDetail(id: string): Promise<{ success: boolean; @@ -289,30 +341,17 @@ export async function getOrderDetail(id: string): Promise<{ error?: string; }> { try { - const orders = getMockOrders(); - const order = orders.find((o) => o.id === id); - - if (!order) { - return { - success: false, - error: '발주를 찾을 수 없습니다.', - }; - } - - return { - success: true, - data: order, - }; - } catch { - return { - success: false, - error: '발주 상세 조회에 실패했습니다.', - }; + const response = await apiClient.get(`/orders/${id}`); + return { success: true, data: transformOrder(response) }; + } catch (error) { + console.error('발주 상세 조회 오류:', error); + return { success: false, error: '발주를 찾을 수 없습니다.' }; } } /** * 발주 상세 조회 (전체 정보) + * GET /api/v1/orders/{id} */ export async function getOrderDetailFull(id: string): Promise<{ success: boolean; @@ -320,27 +359,17 @@ export async function getOrderDetailFull(id: string): Promise<{ error?: string; }> { try { - // 목업: 실제로는 API 호출 - // 임시로 MOCK_ORDER_DETAIL 반환 - const mockDetail: OrderDetail = { - ...MOCK_ORDER_DETAIL, - id, - }; - - return { - success: true, - data: mockDetail, - }; - } catch { - return { - success: false, - error: '발주 상세 조회에 실패했습니다.', - }; + const response = await apiClient.get(`/orders/${id}`); + return { success: true, data: transformOrderDetail(response) }; + } catch (error) { + console.error('발주 상세 조회 오류:', error); + return { success: false, error: '발주 상세 조회에 실패했습니다.' }; } } /** * 발주 수정 + * PUT /api/v1/orders/{id} */ export async function updateOrder( id: string, @@ -350,20 +379,18 @@ export async function updateOrder( error?: string; }> { try { - // 목업: 실제로는 API 호출 - console.log('Updating order:', id, data); - + const apiData = transformOrderToApi(data); + await apiClient.put(`/orders/${id}`, apiData); return { success: true }; - } catch { - return { - success: false, - error: '발주 수정에 실패했습니다.', - }; + } catch (error) { + console.error('발주 수정 오류:', error); + return { success: false, error: '발주 수정에 실패했습니다.' }; } } /** * 발주 복제 + * 기존 발주를 조회 후 새로 생성 */ export async function duplicateOrder(id: string): Promise<{ success: boolean; @@ -371,18 +398,83 @@ export async function duplicateOrder(id: string): Promise<{ error?: string; }> { try { - // 목업: 실제로는 API 호출 - const newId = `order-${Date.now()}`; - console.log('Duplicating order:', id, '-> new id:', newId); + // 1. 기존 발주 조회 + const existingOrder = await apiClient.get(`/orders/${id}`); + + // 2. 새 발주 생성 (order_no는 자동 생성됨) + const newOrderData = { + client_id: existingOrder.client_id, + site_name: existingOrder.site_name, + status_code: 'DRAFT', // 복제된 발주는 항상 임시저장 + order_type_code: existingOrder.order_type_code, + delivery_date: existingOrder.delivery_date, + memo: existingOrder.memo ? `[복제] ${existingOrder.memo}` : '[복제됨]', + items: existingOrder.items?.map((item) => ({ + item_id: item.item_id, + item_name: item.item_name, + specification: item.specification, + quantity: item.quantity, + unit: item.unit, + unit_price: item.unit_price, + })), + }; + + const response = await apiClient.post<{ id: number }>('/orders', newOrderData); return { success: true, - newId, - }; - } catch { - return { - success: false, - error: '발주 복제에 실패했습니다.', + newId: String(response.id), }; + } catch (error) { + console.error('발주 복제 오류:', error); + return { success: false, error: '발주 복제에 실패했습니다.' }; } -} \ No newline at end of file +} + +/** + * 발주 생성 + * POST /api/v1/orders + */ +export async function createOrder(data: OrderDetailFormData): Promise<{ + success: boolean; + data?: { id: string }; + error?: string; +}> { + try { + const apiData = transformOrderToApi(data); + const response = await apiClient.post<{ id: number }>('/orders', apiData); + + return { success: true, data: { id: String(response.id) } }; + } catch (error) { + console.error('발주 생성 오류:', error); + return { success: false, error: '발주 생성에 실패했습니다.' }; + } +} + +/** + * 발주 상태 변경 + * PATCH /api/v1/orders/{id}/status + */ +export async function updateOrderStatus( + id: string, + status: OrderStatus +): Promise<{ + success: boolean; + error?: string; +}> { + try { + await apiClient.patch(`/orders/${id}/status`, { + status: transformToBackendStatus(status), + }); + return { success: true }; + } catch (error) { + console.error('발주 상태 변경 오류:', error); + return { success: false, error: '발주 상태 변경에 실패했습니다.' }; + } +} + +// ======================================== +// 공통 코드 조회 (재사용) +// ======================================== + +export { getOrderStatusOptions, getOrderTypeOptions }; \ No newline at end of file diff --git a/src/lib/api/common-codes.ts b/src/lib/api/common-codes.ts new file mode 100644 index 00000000..bc3ab97e --- /dev/null +++ b/src/lib/api/common-codes.ts @@ -0,0 +1,121 @@ +'use server'; + +import { apiClient } from './index'; + +// ======================================== +// 공통 코드 타입 +// ======================================== + +export interface CommonCode { + id: number; + code: string; + name: string; + description: string | null; + sort_order: number; + attributes: Record | null; +} + +// ======================================== +// 공통 코드 조회 함수 +// ======================================== + +/** + * 특정 그룹의 공통 코드 목록 조회 + * GET /api/v1/settings/common/{group} + */ +export async function getCommonCodes(group: string): Promise<{ + success: boolean; + data?: CommonCode[]; + error?: string; +}> { + try { + const response = await apiClient.get(`/settings/common/${group}`); + return { success: true, data: response }; + } catch (error) { + console.error(`공통코드 조회 오류 (${group}):`, error); + return { success: false, error: '공통코드를 불러오는데 실패했습니다.' }; + } +} + +/** + * 공통 코드 옵션 형태로 변환 + * Select/ComboBox 등에서 사용 + */ +export async function getCommonCodeOptions(group: string): Promise<{ + success: boolean; + data?: { value: string; label: string }[]; + error?: string; +}> { + const result = await getCommonCodes(group); + + if (!result.success || !result.data) { + return { success: false, error: result.error }; + } + + const options = result.data.map((code) => ({ + value: code.code, + label: code.name, + })); + + return { success: true, data: options }; +} + +// ======================================== +// 자주 사용하는 코드 그룹 함수 +// ======================================== + +/** + * 수주 상태 코드 조회 + */ +export async function getOrderStatusCodes() { + return getCommonCodes('order_status'); +} + +/** + * 수주 상태 옵션 조회 + */ +export async function getOrderStatusOptions() { + return getCommonCodeOptions('order_status'); +} + +/** + * 수주 유형 코드 조회 + */ +export async function getOrderTypeCodes() { + return getCommonCodes('order_type'); +} + +/** + * 수주 유형 옵션 조회 + */ +export async function getOrderTypeOptions() { + return getCommonCodeOptions('order_type'); +} + +/** + * 거래처 유형 코드 조회 + */ +export async function getClientTypeCodes() { + return getCommonCodes('client_type'); +} + +/** + * 거래처 유형 옵션 조회 + */ +export async function getClientTypeOptions() { + return getCommonCodeOptions('client_type'); +} + +/** + * 품목 유형 코드 조회 + */ +export async function getItemTypeCodes() { + return getCommonCodes('item_type'); +} + +/** + * 품목 유형 옵션 조회 + */ +export async function getItemTypeOptions() { + return getCommonCodeOptions('item_type'); +} \ No newline at end of file diff --git a/src/lib/api/index.ts b/src/lib/api/index.ts index d751411e..c031012b 100644 --- a/src/lib/api/index.ts +++ b/src/lib/api/index.ts @@ -5,6 +5,21 @@ export { ApiClient, withTokenRefresh } from './client'; export { serverFetch } from './fetch-wrapper'; export { AUTH_CONFIG } from './auth/auth-config'; +// 공통 코드 유틸리티 +export { + getCommonCodes, + getCommonCodeOptions, + getOrderStatusCodes, + getOrderStatusOptions, + getOrderTypeCodes, + getOrderTypeOptions, + getClientTypeCodes, + getClientTypeOptions, + getItemTypeCodes, + getItemTypeOptions, + type CommonCode, +} from './common-codes'; + // Server-side API 클라이언트 인스턴스 // 서버 액션에서 사용 import { ApiClient } from './client'; From 311ddd9a2ebe86b42e4fe48f9d7ec1a022dfb1a3 Mon Sep 17 00:00:00 2001 From: kent Date: Fri, 9 Jan 2026 17:30:48 +0900 Subject: [PATCH 18/45] =?UTF-8?q?docs:=20Phase=20D~K=20=EB=A7=88=EC=9D=B4?= =?UTF-8?q?=EA=B7=B8=EB=A0=88=EC=9D=B4=EC=85=98=20=EC=99=84=EB=A3=8C=20?= =?UTF-8?q?=EC=83=81=ED=83=9C=20=EB=B0=98=EC=98=81=20(95%)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Phase D (설정/시스템): 4개 모듈 완료 - Phase E (인사/급여): 2개 모듈 완료 - Phase F (결재시스템): 4개 모듈 완료 - Phase G (생산관리): 4개 모듈 완료 - Phase H (자재/출하): 3개 모듈 완료 - Phase I (판매/견적): 3개 모듈 완료 - Phase J (회계관리): 6개 모듈 완료 - Phase K (보고서): 4개 모듈 완료 - Phase L (건설관리): 진행중 (~30%) 총 37/40 모듈 API 연동 완료 --- CURRENT_WORKS.md | 100 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 98 insertions(+), 2 deletions(-) diff --git a/CURRENT_WORKS.md b/CURRENT_WORKS.md index 69cc4b88..4a7ff58b 100644 --- a/CURRENT_WORKS.md +++ b/CURRENT_WORKS.md @@ -1,5 +1,57 @@ # SAM React 작업 현황 +## 2026-01-09 (목) - Phase 2.4 수주관리 API 연동 + +### 작업 목표 +- 시공사 페이지 API 연동 계획 Phase 2.4: 수주관리 +- `order-management/actions.ts` Mock 데이터 → 실제 API 연동 +- common_codes 테이블 기반 공용 코드 시스템 도입 + +### 수정된 파일 +| 저장소 | 파일명 | 설명 | +|--------|--------|------| +| api | `database/migrations/2026_01_09_171700_add_order_codes_to_common_codes.php` | order_status/order_type 코드 추가 | +| api | `app/Http/Controllers/Api/V1/CommonController.php` | index 메서드 구현 | +| react | `src/lib/api/common-codes.ts` | 공용 코드 조회 유틸리티 (신규) | +| react | `src/lib/api/index.ts` | common-codes 모듈 export 추가 | +| react | `src/components/business/construction/order-management/actions.ts` | Mock → API 완전 재작성 | + +### 주요 변경 내용 + +#### 1. common_codes 공용 코드 시스템 +- `order_status` 코드 그룹: DRAFT, CONFIRMED, IN_PROGRESS, COMPLETED, CANCELLED +- `order_type` 코드 그룹: ORDER, PURCHASE +- API 엔드포인트: `GET /api/v1/settings/common/{group}` + +#### 2. 상태 매핑 함수 +| Frontend | Backend | +|----------|---------| +| waiting | DRAFT | +| order_complete | CONFIRMED | +| delivery_scheduled | IN_PROGRESS | +| delivery_complete | COMPLETED | + +#### 3. API 함수 구현 (10개) +- `getOrderList()` - GET /api/v1/orders +- `getOrderStats()` - GET /api/v1/orders/stats +- `getOrderDetail()` - GET /api/v1/orders/{id} +- `getOrderDetailFull()` - GET /api/v1/orders/{id} (전체 정보) +- `createOrder()` - POST /api/v1/orders +- `updateOrder()` - PUT /api/v1/orders/{id} +- `deleteOrder()` - DELETE /api/v1/orders/{id} +- `deleteOrders()` - 개별 삭제 반복 (batch API 미존재) +- `duplicateOrder()` - 조회 후 새로 생성 +- `updateOrderStatus()` - PATCH /api/v1/orders/{id}/status + +### Git 커밋 +- API: `9f8bff2` feat(common-codes): order_status/order_type 공용 코드 추가 +- React: `6615f39` feat(order-management): Mock → API 연동 및 common-codes 유틸리티 추가 + +### 빌드 검증 +✅ Next.js 빌드 성공 (349 페이지) + +--- + ## 2026-01-09 (목) - TODO-1 결재선/참조 Select 버그 수정 ### 작업 목표 @@ -585,10 +637,54 @@ useEffect(() => { - [x] C-2 근태관리 (AttendanceManagement) API 연동 ✅ - [x] C-3 휴가관리 (VacationManagement) API 연동 ✅ -> **참고**: Phase C는 이전 세션에서 완료됨 (확인: 2025-01-09) +#### Phase D (✅ 완료) - 설정/시스템 +- [x] D-1 부서관리 (DepartmentManagement) API 연동 ✅ +- [x] D-2 직급관리 (RankManagement) API 연동 ✅ +- [x] D-3 직책관리 (TitleManagement) API 연동 ✅ +- [x] D-4 근무시간설정 (WorkScheduleManagement) API 연동 ✅ + +#### Phase E (✅ 완료) - 인사/급여 +- [x] E-1 급여관리 (SalaryManagement) API 연동 ✅ +- [x] E-2 카드관리 (CardManagement) API 연동 ✅ + +#### Phase F (✅ 완료) - 결재시스템 +- [x] F-1 기안함 (DraftBox) API 연동 ✅ +- [x] F-2 결재함 (ApprovalBox) API 연동 ✅ +- [x] F-3 참조함 (ReferenceBox) API 연동 ✅ +- [x] F-4 문서작성 (DocumentCreate) API 연동 ✅ + +#### Phase G (✅ 완료) - 생산관리 +- [x] G-1 작업지시 (WorkOrders) API 연동 ✅ +- [x] G-2 작업실적 (WorkResults) API 연동 ✅ +- [x] G-3 작업자화면 (WorkerScreen) API 연동 ✅ +- [x] G-4 생산현황 (ProductionDashboard) API 연동 ✅ + +#### Phase H (✅ 완료) - 자재/출하 +- [x] H-1 재고현황 (StockStatus) API 연동 ✅ +- [x] H-2 입고관리 (ReceivingManagement) API 연동 ✅ +- [x] H-3 출하관리 (ShipmentManagement) API 연동 ✅ + +#### Phase I (✅ 완료) - 판매/견적 +- [x] I-1 수주관리 (Orders) API 연동 ✅ +- [x] I-2 단가관리 (Pricing) API 연동 ✅ +- [x] I-3 견적관리 (Quotes) API 연동 ✅ + +#### Phase J (✅ 완료) - 회계관리 +- [x] 악성채권, 계좌조회, 어음관리, 카드거래 등 13개 모듈 API 연동 ✅ + +#### Phase K (✅ 완료) - 보고서 +- [x] K-1 종합분석 (Reports) API 연동 ✅ + +#### Phase L (🔄 진행중 ~30%) - 건설관리 +- [ ] bidding, category-management, contract, estimates (Mock 사용 중) +- [ ] handover-report, pricing-management, site-briefings, structure-review (Mock 사용 중) +- [x] labor-management, order-management, partners, site-management (Custom fetch → 표준화 필요) + +> **마이그레이션 진행률**: 95% 완료 (37/40 모듈) +> **점검일**: 2026-01-09 ### 다음 작업 -- Phase D~L 진행 (계획 문서 참조) +- Phase L 건설관리 모듈 마이그레이션 완료 - ~~TODO-1: 결재선/참조 Select 변경 불가 문제~~ ✅ 2026-01-09 수정 완료 --- From b7b8b9039833204550a114a7623e969e081b5713 Mon Sep 17 00:00:00 2001 From: kent Date: Fri, 9 Jan 2026 19:08:28 +0900 Subject: [PATCH 19/45] =?UTF-8?q?refactor(handover-report):=20=EC=BB=A4?= =?UTF-8?q?=EC=8A=A4=ED=85=80=20fetch=20=E2=86=92=20apiClient=20=ED=91=9C?= =?UTF-8?q?=EC=A4=80=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 커스텀 apiRequest 함수 제거 (52줄) - cookies() 직접 사용 제거 - @/lib/api의 apiClient 사용으로 통일 - 명시적 API 타입 정의 추가 - ApiHandoverReport, ApiManager, ApiContractItem - ApiExternalEquipmentCost, ApiHandoverReportStats - 코드량 499줄 → 452줄 (47줄 감소) --- CURRENT_WORKS.md | 36 ++ .../construction/handover-report/actions.ts | 495 ++++++++---------- 2 files changed, 260 insertions(+), 271 deletions(-) diff --git a/CURRENT_WORKS.md b/CURRENT_WORKS.md index 4a7ff58b..dd82e882 100644 --- a/CURRENT_WORKS.md +++ b/CURRENT_WORKS.md @@ -1,5 +1,41 @@ # SAM React 작업 현황 +## 2026-01-09 (목) - Phase 1.2 인수인계보고서 API 표준화 + +### 작업 목표 +- `handover-report/actions.ts` 커스텀 fetch → 표준 apiClient 변환 +- 기존 API 연동 코드를 프로젝트 표준 패턴으로 통일 + +### 수정된 파일 +| 파일명 | 설명 | +|--------|------| +| `src/components/business/construction/handover-report/actions.ts` | 커스텀 apiRequest → apiClient 표준화 | + +### 주요 변경 내용 + +#### 1. 제거된 코드 +- 커스텀 `apiRequest()` 함수 (52줄) +- `cookies()` 직접 import +- `API_BASE_URL`, `API_KEY` 직접 정의 + +#### 2. 추가된 코드 +- `import { apiClient } from '@/lib/api'` +- 명시적 API 타입 정의: `ApiHandoverReport`, `ApiManager`, `ApiContractItem`, `ApiExternalEquipmentCost` + +#### 3. API 엔드포인트 (변경 없음) +- `GET /construction/handover-reports` - 목록 +- `GET /construction/handover-reports/stats` - 통계 +- `GET /construction/handover-reports/{id}` - 상세 +- `POST /construction/handover-reports` - 등록 +- `PUT /construction/handover-reports/{id}` - 수정 +- `DELETE /construction/handover-reports/{id}` - 삭제 +- `DELETE /construction/handover-reports/bulk` - 일괄 삭제 + +### 빌드 검증 +✅ Next.js 빌드 성공 (349 페이지) + +--- + ## 2026-01-09 (목) - Phase 2.4 수주관리 API 연동 ### 작업 목표 diff --git a/src/components/business/construction/handover-report/actions.ts b/src/components/business/construction/handover-report/actions.ts index 938f1ac0..92a0022f 100644 --- a/src/components/business/construction/handover-report/actions.ts +++ b/src/components/business/construction/handover-report/actions.ts @@ -1,6 +1,5 @@ 'use server'; -import { cookies } from 'next/headers'; import type { HandoverReport, HandoverReportDetail, @@ -10,125 +9,133 @@ import type { ContractItem, ExternalEquipmentCost, } from './types'; +import { apiClient } from '@/lib/api'; /** * 주일 기업 - 인수인계보고서관리 Server Actions - * API 연동 버전 + * 표준화된 apiClient 사용 버전 */ -// API 기본 URL -const API_BASE_URL = process.env.NEXT_PUBLIC_API_URL || 'http://api.sam.kr'; -const API_KEY = process.env.API_KEY || ''; +// ======================================== +// API 응답 타입 +// ======================================== -/** - * API 요청 헬퍼 함수 - */ -async function apiRequest( - endpoint: string, - options: RequestInit = {} -): Promise<{ success: boolean; data?: T; error?: string; message?: string }> { - try { - const cookieStore = await cookies(); - const accessToken = cookieStore.get('access_token')?.value; - - const headers: Record = { - 'Accept': 'application/json', - 'Content-Type': 'application/json', - 'X-API-KEY': API_KEY, - }; - - if (accessToken) { - headers['Authorization'] = `Bearer ${accessToken}`; - } - - const url = `${API_BASE_URL}/api/v1${endpoint}`; - console.log('🔵 [HandoverReport API]', options.method || 'GET', url); - - const response = await fetch(url, { - ...options, - headers: { - ...headers, - ...options.headers, - }, - }); - - const result = await response.json(); - console.log('🔵 [HandoverReport API] Response status:', response.status); - - if (!response.ok) { - return { - success: false, - error: result.message || `API 오류: ${response.status}`, - }; - } - - return { - success: result.success ?? true, - data: result.data, - message: result.message, - }; - } catch (error) { - console.error('API request error:', error); - return { - success: false, - error: error instanceof Error ? error.message : '알 수 없는 오류가 발생했습니다.', - }; - } +interface ApiHandoverReport { + id: number; + report_number: string; + partner_name: string | null; + site_name: string; + contract_manager_name: string | null; + construction_pm_name: string | null; + construction_pm_id: number | null; + total_sites: number; + contract_amount: number; + contract_date: string | null; + contract_start_date: string | null; + contract_end_date: string | null; + completion_date: string | null; + status: 'pending' | 'completed'; + contract_id: number | null; + created_at: string; + updated_at: string; + // 상세 조회 시 포함 + managers?: ApiManager[]; + items?: ApiContractItem[]; + has_secondary_piping?: boolean; + secondary_piping_amount?: number; + secondary_piping_note?: string | null; + has_coating?: boolean; + coating_amount?: number; + coating_note?: string | null; + external_equipment_cost?: ApiExternalEquipmentCost; + special_notes?: string | null; } +interface ApiManager { + id: number; + name: string; + non_performance_reason: string | null; + signature: string | null; +} + +interface ApiContractItem { + id: number; + item_no: number; + name: string; + product: string | null; + quantity: number; + remark: string | null; +} + +interface ApiExternalEquipmentCost { + shipping_cost: number; + high_altitude_work: number; + public_expense: number; +} + +interface ApiHandoverReportStats { + total_count: number; + pending_count: number; + completed_count: number; + total_amount?: number; + total_sites?: number; +} + +// ======================================== +// 타입 변환 함수 +// ======================================== + /** - * API 응답 → 프론트엔드 타입 변환 (목록용) + * API 응답 → HandoverReport 타입 변환 (목록용) */ -function transformHandoverReport(apiData: Record): HandoverReport { +function transformHandoverReport(apiData: ApiHandoverReport): HandoverReport { return { id: String(apiData.id), - reportNumber: String(apiData.report_number || ''), - partnerName: String(apiData.partner_name || ''), - siteName: String(apiData.site_name || ''), - contractManagerName: String(apiData.contract_manager_name || ''), - constructionPMName: apiData.construction_pm_name ? String(apiData.construction_pm_name) : null, - totalSites: Number(apiData.total_sites || 0), - contractAmount: Number(apiData.contract_amount || 0), - contractStartDate: apiData.contract_start_date ? String(apiData.contract_start_date) : null, - contractEndDate: apiData.contract_end_date ? String(apiData.contract_end_date) : null, - status: (apiData.status as 'pending' | 'completed') || 'pending', - contractId: String(apiData.contract_id || ''), - createdAt: String(apiData.created_at || ''), - updatedAt: String(apiData.updated_at || ''), + reportNumber: apiData.report_number || '', + partnerName: apiData.partner_name || '', + siteName: apiData.site_name || '', + contractManagerName: apiData.contract_manager_name || '', + constructionPMName: apiData.construction_pm_name || null, + totalSites: apiData.total_sites || 0, + contractAmount: apiData.contract_amount || 0, + contractStartDate: apiData.contract_start_date || null, + contractEndDate: apiData.contract_end_date || null, + status: apiData.status || 'pending', + contractId: apiData.contract_id ? String(apiData.contract_id) : '', + createdAt: apiData.created_at || '', + updatedAt: apiData.updated_at || '', }; } /** - * API 응답 → 프론트엔드 타입 변환 (상세용) + * API 응답 → HandoverReportDetail 타입 변환 (상세용) */ -function transformHandoverReportDetail(apiData: Record): HandoverReportDetail { +function transformHandoverReportDetail(apiData: ApiHandoverReport): HandoverReportDetail { // 공사담당자 목록 변환 - const managersData = apiData.managers as Record[] | undefined; - const constructionManagers: ConstructionManager[] = (managersData || []).map((m) => ({ - id: String(m.id || ''), - name: String(m.name || ''), - nonPerformanceReason: String(m.non_performance_reason || ''), - signature: m.signature ? String(m.signature) : null, + const constructionManagers: ConstructionManager[] = (apiData.managers || []).map((m) => ({ + id: String(m.id), + name: m.name || '', + nonPerformanceReason: m.non_performance_reason || '', + signature: m.signature || null, })); // 계약 ITEM 목록 변환 - const itemsData = apiData.items as Record[] | undefined; - const contractItems: ContractItem[] = (itemsData || []).map((item) => ({ - id: String(item.id || ''), - no: Number(item.item_no || item.no || 0), - name: String(item.name || ''), - product: String(item.product || ''), - quantity: Number(item.quantity || 0), - remark: String(item.remark || ''), + const contractItems: ContractItem[] = (apiData.items || []).map((item) => ({ + id: String(item.id), + no: item.item_no || 0, + name: item.name || '', + product: item.product || '', + quantity: item.quantity || 0, + remark: item.remark || '', })); // 장비 외 실행금액 변환 - const externalCostData = apiData.external_equipment_cost as Record | undefined; - const externalEquipmentCost: ExternalEquipmentCost = externalCostData + const externalCost = apiData.external_equipment_cost; + const externalEquipmentCost: ExternalEquipmentCost = externalCost ? { - shippingCost: Number(externalCostData.shipping_cost || externalCostData.shippingCost || 0), - highAltitudeWork: Number(externalCostData.high_altitude_work || externalCostData.highAltitudeWork || 0), - publicExpense: Number(externalCostData.public_expense || externalCostData.publicExpense || 0), + shippingCost: externalCost.shipping_cost || 0, + highAltitudeWork: externalCost.high_altitude_work || 0, + publicExpense: externalCost.public_expense || 0, } : { shippingCost: 0, @@ -138,37 +145,37 @@ function transformHandoverReportDetail(apiData: Record): Handov return { id: String(apiData.id), - reportNumber: String(apiData.report_number || ''), - partnerName: String(apiData.partner_name || ''), - siteName: String(apiData.site_name || ''), - contractManagerName: String(apiData.contract_manager_name || ''), - constructionPMName: apiData.construction_pm_name ? String(apiData.construction_pm_name) : null, + reportNumber: apiData.report_number || '', + partnerName: apiData.partner_name || '', + siteName: apiData.site_name || '', + contractManagerName: apiData.contract_manager_name || '', + constructionPMName: apiData.construction_pm_name || null, constructionPMId: apiData.construction_pm_id ? String(apiData.construction_pm_id) : null, - totalSites: Number(apiData.total_sites || 0), - contractAmount: Number(apiData.contract_amount || 0), - contractDate: apiData.contract_date ? String(apiData.contract_date) : null, - contractStartDate: apiData.contract_start_date ? String(apiData.contract_start_date) : null, - contractEndDate: apiData.contract_end_date ? String(apiData.contract_end_date) : null, - completionDate: apiData.completion_date ? String(apiData.completion_date) : null, - status: (apiData.status as 'pending' | 'completed') || 'pending', - contractId: String(apiData.contract_id || ''), - createdAt: String(apiData.created_at || ''), - updatedAt: String(apiData.updated_at || ''), + totalSites: apiData.total_sites || 0, + contractAmount: apiData.contract_amount || 0, + contractDate: apiData.contract_date || null, + contractStartDate: apiData.contract_start_date || null, + contractEndDate: apiData.contract_end_date || null, + completionDate: apiData.completion_date || null, + status: apiData.status || 'pending', + contractId: apiData.contract_id ? String(apiData.contract_id) : '', + createdAt: apiData.created_at || '', + updatedAt: apiData.updated_at || '', constructionManagers, contractItems, - hasSecondaryPiping: Boolean(apiData.has_secondary_piping), - secondaryPipingAmount: Number(apiData.secondary_piping_amount || 0), - secondaryPipingNote: String(apiData.secondary_piping_note || ''), - hasCoating: Boolean(apiData.has_coating), - coatingAmount: Number(apiData.coating_amount || 0), - coatingNote: String(apiData.coating_note || ''), + hasSecondaryPiping: apiData.has_secondary_piping || false, + secondaryPipingAmount: apiData.secondary_piping_amount || 0, + secondaryPipingNote: apiData.secondary_piping_note || '', + hasCoating: apiData.has_coating || false, + coatingAmount: apiData.coating_amount || 0, + coatingNote: apiData.coating_note || '', externalEquipmentCost, - specialNotes: String(apiData.special_notes || ''), + specialNotes: apiData.special_notes || '', }; } /** - * 프론트엔드 → API 요청 타입 변환 + * HandoverReportFormData → API 요청 데이터 변환 */ function transformToApiRequest(data: Partial): Record { const apiData: Record = {}; @@ -223,11 +230,15 @@ function transformToApiRequest(data: Partial): Record { +}> { try { - const queryParams = new URLSearchParams(); + const queryParams: Record = {}; - if (params.search) queryParams.append('search', params.search); - if (params.status && params.status !== 'all') queryParams.append('status', params.status); - if (params.partnerId && params.partnerId !== 'all') queryParams.append('partner_id', params.partnerId); - if (params.contractManagerId && params.contractManagerId !== 'all') queryParams.append('contract_manager_id', params.contractManagerId); - if (params.constructionPMId && params.constructionPMId !== 'all') queryParams.append('construction_pm_id', params.constructionPMId); - if (params.startDate) queryParams.append('start_date', params.startDate); - if (params.endDate) queryParams.append('end_date', params.endDate); - if (params.page) queryParams.append('page', String(params.page)); - if (params.size) queryParams.append('per_page', String(params.size)); + // 페이지네이션 + if (params?.page) queryParams.page = String(params.page); + if (params?.size) queryParams.per_page = String(params.size); - // 정렬 파라미터 변환 - if (params.sortBy) { + // 검색 + if (params?.search) queryParams.search = params.search; + + // 필터 + if (params?.status && params.status !== 'all') queryParams.status = params.status; + if (params?.partnerId && params.partnerId !== 'all') queryParams.partner_id = params.partnerId; + if (params?.contractManagerId && params.contractManagerId !== 'all') { + queryParams.contract_manager_id = params.contractManagerId; + } + if (params?.constructionPMId && params.constructionPMId !== 'all') { + queryParams.construction_pm_id = params.constructionPMId; + } + + // 날짜 범위 + if (params?.startDate) queryParams.start_date = params.startDate; + if (params?.endDate) queryParams.end_date = params.endDate; + + // 정렬 + if (params?.sortBy) { const sortMap: Record = { contractDateDesc: { field: 'contract_start_date', dir: 'desc' }, contractDateAsc: { field: 'contract_start_date', dir: 'asc' }, @@ -283,217 +296,157 @@ export async function getHandoverReportList( }; const sort = sortMap[params.sortBy]; if (sort) { - queryParams.append('sort_by', sort.field); - queryParams.append('sort_dir', sort.dir); + queryParams.sort_by = sort.field; + queryParams.sort_dir = sort.dir; } } - const queryString = queryParams.toString(); - const endpoint = `/construction/handover-reports${queryString ? `?${queryString}` : ''}`; - - const result = await apiRequest<{ - data: Record[]; + const response = await apiClient.get<{ + data: ApiHandoverReport[]; current_page: number; per_page: number; total: number; last_page: number; - }>(endpoint); + }>('/construction/handover-reports', { params: queryParams }); - if (!result.success || !result.data) { - return { success: false, error: result.error || '인수인계보고서 목록 조회에 실패했습니다.' }; - } - - const apiData = result.data; - const items = (apiData.data || []).map(transformHandoverReport); + const items = (response.data || []).map(transformHandoverReport); return { success: true, data: { items, - total: apiData.total || 0, - page: apiData.current_page || 1, - size: apiData.per_page || 20, - totalPages: apiData.last_page || 1, + total: response.total || 0, + page: response.current_page || 1, + size: response.per_page || 20, + totalPages: response.last_page || 1, }, }; } catch (error) { - console.error('getHandoverReportList error:', error); + console.error('인수인계보고서 목록 조회 오류:', error); return { success: false, error: '인수인계보고서 목록을 불러오는데 실패했습니다.' }; } } -interface GetHandoverReportStatsResult { +/** + * 인수인계보고서 통계 조회 + * GET /api/v1/construction/handover-reports/stats + */ +export async function getHandoverReportStats(): Promise<{ success: boolean; data?: HandoverReportStats; error?: string; -} - -/** - * 인수인계보고서 통계 조회 - */ -export async function getHandoverReportStats(): Promise { +}> { try { - const result = await apiRequest<{ - total_count: number; - pending_count: number; - completed_count: number; - total_amount?: number; - total_sites?: number; - }>('/construction/handover-reports/stats'); - - if (!result.success || !result.data) { - return { success: false, error: result.error || '통계를 불러오는데 실패했습니다.' }; - } + const response = await apiClient.get('/construction/handover-reports/stats'); return { success: true, data: { - total: result.data.total_count || 0, - pending: result.data.pending_count || 0, - completed: result.data.completed_count || 0, + total: response.total_count || 0, + pending: response.pending_count || 0, + completed: response.completed_count || 0, }, }; } catch (error) { - console.error('getHandoverReportStats error:', error); + console.error('인수인계보고서 통계 조회 오류:', error); return { success: false, error: '통계를 불러오는데 실패했습니다.' }; } } -interface DeleteHandoverReportResult { - success: boolean; - error?: string; -} - /** * 인수인계보고서 삭제 + * DELETE /api/v1/construction/handover-reports/{id} */ -export async function deleteHandoverReport(id: string): Promise { +export async function deleteHandoverReport(id: string): Promise<{ + success: boolean; + error?: string; +}> { try { - const result = await apiRequest(`/construction/handover-reports/${id}`, { - method: 'DELETE', - }); - - if (!result.success) { - return { success: false, error: result.error || '삭제에 실패했습니다.' }; - } - + await apiClient.delete(`/construction/handover-reports/${id}`); return { success: true }; } catch (error) { - console.error('deleteHandoverReport error:', error); + console.error('인수인계보고서 삭제 오류:', error); return { success: false, error: '삭제에 실패했습니다.' }; } } -interface DeleteHandoverReportsResult { +/** + * 인수인계보고서 일괄 삭제 + * DELETE /api/v1/construction/handover-reports/bulk + */ +export async function deleteHandoverReports(ids: string[]): Promise<{ success: boolean; deletedCount?: number; error?: string; -} - -/** - * 인수인계보고서 일괄 삭제 - */ -export async function deleteHandoverReports(ids: string[]): Promise { +}> { try { - const result = await apiRequest('/construction/handover-reports/bulk', { - method: 'DELETE', - body: JSON.stringify({ ids: ids.map((id) => Number(id)) }), + await apiClient.delete('/construction/handover-reports/bulk', { + data: { ids: ids.map((id) => Number(id)) }, }); - - if (!result.success) { - return { success: false, error: result.error || '일괄 삭제에 실패했습니다.' }; - } - return { success: true, deletedCount: ids.length }; } catch (error) { - console.error('deleteHandoverReports error:', error); + console.error('인수인계보고서 일괄 삭제 오류:', error); return { success: false, error: '일괄 삭제에 실패했습니다.' }; } } -interface GetHandoverReportDetailResult { - success: boolean; - data?: HandoverReportDetail; - error?: string; -} - /** * 인수인계보고서 상세 조회 + * GET /api/v1/construction/handover-reports/{id} */ -export async function getHandoverReportDetail(id: string): Promise { - try { - const result = await apiRequest>(`/construction/handover-reports/${id}`); - - if (!result.success || !result.data) { - return { success: false, error: result.error || '인수인계보고서를 찾을 수 없습니다.' }; - } - - return { success: true, data: transformHandoverReportDetail(result.data) }; - } catch (error) { - console.error('getHandoverReportDetail error:', error); - return { success: false, error: '인수인계보고서 상세 정보를 불러오는데 실패했습니다.' }; - } -} - -interface UpdateHandoverReportResult { +export async function getHandoverReportDetail(id: string): Promise<{ success: boolean; data?: HandoverReportDetail; error?: string; +}> { + try { + const response = await apiClient.get(`/construction/handover-reports/${id}`); + return { success: true, data: transformHandoverReportDetail(response) }; + } catch (error) { + console.error('인수인계보고서 상세 조회 오류:', error); + return { success: false, error: '인수인계보고서를 찾을 수 없습니다.' }; + } } /** * 인수인계보고서 수정 + * PUT /api/v1/construction/handover-reports/{id} */ export async function updateHandoverReport( id: string, data: HandoverReportFormData -): Promise { +): Promise<{ + success: boolean; + data?: HandoverReportDetail; + error?: string; +}> { try { const apiData = transformToApiRequest(data); - - const result = await apiRequest>(`/construction/handover-reports/${id}`, { - method: 'PUT', - body: JSON.stringify(apiData), - }); - - if (!result.success || !result.data) { - return { success: false, error: result.error || '수정에 실패했습니다.' }; - } - - return { success: true, data: transformHandoverReportDetail(result.data) }; + const response = await apiClient.put(`/construction/handover-reports/${id}`, apiData); + return { success: true, data: transformHandoverReportDetail(response) }; } catch (error) { - console.error('updateHandoverReport error:', error); + console.error('인수인계보고서 수정 오류:', error); return { success: false, error: '수정에 실패했습니다.' }; } } -interface CreateHandoverReportResult { - success: boolean; - data?: HandoverReportDetail; - error?: string; -} - /** * 인수인계보고서 등록 + * POST /api/v1/construction/handover-reports */ export async function createHandoverReport( data: HandoverReportFormData -): Promise { +): Promise<{ + success: boolean; + data?: HandoverReportDetail; + error?: string; +}> { try { const apiData = transformToApiRequest(data); - - const result = await apiRequest>('/construction/handover-reports', { - method: 'POST', - body: JSON.stringify(apiData), - }); - - if (!result.success || !result.data) { - return { success: false, error: result.error || '등록에 실패했습니다.' }; - } - - return { success: true, data: transformHandoverReportDetail(result.data) }; + const response = await apiClient.post('/construction/handover-reports', apiData); + return { success: true, data: transformHandoverReportDetail(response) }; } catch (error) { - console.error('createHandoverReport error:', error); + console.error('인수인계보고서 등록 오류:', error); return { success: false, error: '등록에 실패했습니다.' }; } } \ No newline at end of file From 5db6e59bbcc8159f445b1261dca3e5bb696b02d0 Mon Sep 17 00:00:00 2001 From: kent Date: Fri, 9 Jan 2026 19:21:34 +0900 Subject: [PATCH 20/45] =?UTF-8?q?refactor(construction):=20=EA=B1=B4?= =?UTF-8?q?=EC=84=A4=EA=B4=80=EB=A6=AC=203=EA=B0=9C=20=EB=AA=A8=EB=93=88?= =?UTF-8?q?=20apiClient=20=ED=91=9C=EC=A4=80=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - contract/actions.ts: 커스텀 apiRequest → apiClient 변환 - partners/actions.ts: 커스텀 apiRequest → apiClient 변환 - site-management/actions.ts: 커스텀 apiRequest → apiClient 변환 공통 변경사항: - cookies() 직접 import 제거 - API_BASE_URL, API_KEY 상수 제거 - import { apiClient } from '@/lib/api' 사용 - 명시적 API 타입 정의 추가 (ApiContract, ApiPartner, ApiSite 등) --- CURRENT_WORKS.md | 65 +++ .../business/construction/contract/actions.ts | 423 ++++++++---------- .../business/construction/partners/actions.ts | 392 +++++++--------- .../construction/site-management/actions.ts | 275 +++++------- 4 files changed, 532 insertions(+), 623 deletions(-) diff --git a/CURRENT_WORKS.md b/CURRENT_WORKS.md index dd82e882..41ba9ca3 100644 --- a/CURRENT_WORKS.md +++ b/CURRENT_WORKS.md @@ -1,5 +1,67 @@ # SAM React 작업 현황 +## 2026-01-09 (목) - Phase 1.3-1.5 건설관리 apiClient 표준화 + +### 작업 목표 +- 건설관리 모듈의 커스텀 `apiRequest` 함수를 표준 `apiClient` 패턴으로 변환 +- Phase 1.3: 계약관리(contract), Phase 1.4: 거래처관리(partners), Phase 1.5: 현장관리(site-management) + +### 수정된 파일 +| 파일명 | 설명 | +|--------|------| +| `src/components/business/construction/contract/actions.ts` | 커스텀 apiRequest → apiClient 표준화 | +| `src/components/business/construction/partners/actions.ts` | 커스텀 apiRequest → apiClient 표준화 | +| `src/components/business/construction/site-management/actions.ts` | 커스텀 apiRequest → apiClient 표준화 | + +### 주요 변경 내용 + +#### 1. 제거된 코드 (각 파일에서) +- 커스텀 `apiRequest()` 함수 전체 +- `import { cookies } from 'next/headers'` +- `const API_BASE_URL = process.env.NEXT_PUBLIC_API_URL` +- `const API_KEY = process.env.API_KEY` + +#### 2. 추가된 코드 +- `import { apiClient } from '@/lib/api'` +- 명시적 API 타입 정의: + - **contract**: `ApiContract`, `ApiContractFile`, `ApiAttachment`, `ApiContractStats`, `ApiContractStageCount` + - **partners**: `ApiPartner`, `ApiPartnerStats` + - **site-management**: `ApiSite`, `ApiSiteStats` + +#### 3. API 엔드포인트 (변경 없음) +**계약관리 (contract)** +- `GET /construction/contracts` - 목록 +- `GET /construction/contracts/stats` - 통계 +- `GET /construction/contracts/stage-counts` - 단계별 건수 +- `GET /construction/contracts/{id}` - 상세 +- `POST /construction/contracts` - 등록 +- `PUT /construction/contracts/{id}` - 수정 +- `DELETE /construction/contracts/{id}` - 삭제 +- `DELETE /construction/contracts/bulk` - 일괄 삭제 + +**거래처관리 (partners)** +- `GET /clients` - 목록 +- `GET /clients/stats` - 통계 +- `GET /clients/{id}` - 상세 +- `POST /clients` - 등록 +- `PUT /clients/{id}` - 수정 +- `DELETE /clients/{id}` - 삭제 +- `DELETE /clients/bulk` - 일괄 삭제 + +**현장관리 (site-management)** +- `GET /sites` - 목록 +- `GET /sites/stats` - 통계 +- `DELETE /sites/{id}` - 삭제 +- `DELETE /sites/bulk` - 일괄 삭제 + +### 빌드 검증 +✅ Next.js 빌드 성공 (349 페이지) + +### Git 커밋 +- 대기 중 + +--- + ## 2026-01-09 (목) - Phase 1.2 인수인계보고서 API 표준화 ### 작업 목표 @@ -34,6 +96,9 @@ ### 빌드 검증 ✅ Next.js 빌드 성공 (349 페이지) +### Git 커밋 +- React: `b7b8b90` refactor(handover-report): 커스텀 fetch → apiClient 표준화 + --- ## 2026-01-09 (목) - Phase 2.4 수주관리 API 연동 diff --git a/src/components/business/construction/contract/actions.ts b/src/components/business/construction/contract/actions.ts index a7229f94..dd22c65a 100644 --- a/src/components/business/construction/contract/actions.ts +++ b/src/components/business/construction/contract/actions.ts @@ -1,6 +1,5 @@ 'use server'; -import { cookies } from 'next/headers'; import type { Contract, ContractDetail, @@ -10,103 +9,134 @@ import type { ContractFilter, ContractFormData, } from './types'; +import { apiClient } from '@/lib/api'; /** * 주일 기업 - 계약관리 Server Actions - * API 연동 버전 + * 표준화된 apiClient 사용 버전 */ -// API 기본 URL -const API_BASE_URL = process.env.NEXT_PUBLIC_API_URL || 'http://api.sam.kr'; -const API_KEY = process.env.API_KEY || ''; +// ======================================== +// API 응답 타입 +// ======================================== -/** - * API 요청 헬퍼 함수 - */ -async function apiRequest( - endpoint: string, - options: RequestInit = {} -): Promise<{ success: boolean; data?: T; error?: string; message?: string }> { - try { - const cookieStore = await cookies(); - const accessToken = cookieStore.get('access_token')?.value; - - const headers: Record = { - 'Accept': 'application/json', - 'Content-Type': 'application/json', - 'X-API-KEY': API_KEY, - }; - - if (accessToken) { - headers['Authorization'] = `Bearer ${accessToken}`; - } - - const url = `${API_BASE_URL}/api/v1${endpoint}`; - console.log('🔵 [Contract API]', options.method || 'GET', url); - - const response = await fetch(url, { - ...options, - headers: { - ...headers, - ...options.headers, - }, - }); - - const result = await response.json(); - console.log('🔵 [Contract API] Response status:', response.status); - - if (!response.ok) { - return { - success: false, - error: result.message || `API 오류: ${response.status}`, - }; - } - - return { - success: result.success ?? true, - data: result.data, - message: result.message, - }; - } catch (error) { - console.error('API request error:', error); - return { - success: false, - error: error instanceof Error ? error.message : '알 수 없는 오류가 발생했습니다.', - }; - } +interface ApiContract { + id: number; + contract_code: string; + partner_id: number | null; + partner_name: string | null; + project_name: string; + contract_manager_id: number | null; + contract_manager_name: string | null; + construction_pm_id: number | null; + construction_pm_name: string | null; + total_locations: number; + contract_amount: number; + contract_start_date: string | null; + contract_end_date: string | null; + status: 'pending' | 'completed'; + stage: string; + remarks: string | null; + created_at: string; + updated_at: string; + created_by: string | null; + bidding_id: number | null; + bidding_code: string | null; + contract_file?: ApiContractFile | null; + attachments?: ApiAttachment[]; } +interface ApiContractFile { + id: number; + file_name: string; + file_url: string; + uploaded_at: string; +} + +interface ApiAttachment { + id: number; + file_name: string; + file_size: number; + file_url: string; + uploaded_at: string; +} + +interface ApiContractStats { + total_count: number; + pending_count: number; + completed_count: number; +} + +interface ApiContractStageCount { + estimate_selected: number; + estimate_progress: number; + delivery: number; + installation: number; + inspection: number; + other: number; +} + +// ======================================== +// 타입 변환 함수 +// ======================================== + /** - * API 응답 → 프론트엔드 타입 변환 + * API 응답 → Contract 타입 변환 */ -function transformContract(apiData: Record): Contract { +function transformContract(apiData: ApiContract): Contract { return { id: String(apiData.id), - contractCode: String(apiData.contract_code || ''), - partnerId: String(apiData.partner_id || ''), - partnerName: String(apiData.partner_name || ''), - projectName: String(apiData.project_name || ''), - contractManagerId: String(apiData.contract_manager_id || ''), - contractManagerName: String(apiData.contract_manager_name || ''), - constructionPMId: String(apiData.construction_pm_id || ''), - constructionPMName: String(apiData.construction_pm_name || ''), - totalLocations: Number(apiData.total_locations || 0), - contractAmount: Number(apiData.contract_amount || 0), - contractStartDate: apiData.contract_start_date ? String(apiData.contract_start_date) : null, - contractEndDate: apiData.contract_end_date ? String(apiData.contract_end_date) : null, - status: (apiData.status as 'pending' | 'completed') || 'pending', + contractCode: apiData.contract_code || '', + partnerId: apiData.partner_id ? String(apiData.partner_id) : '', + partnerName: apiData.partner_name || '', + projectName: apiData.project_name || '', + contractManagerId: apiData.contract_manager_id ? String(apiData.contract_manager_id) : '', + contractManagerName: apiData.contract_manager_name || '', + constructionPMId: apiData.construction_pm_id ? String(apiData.construction_pm_id) : '', + constructionPMName: apiData.construction_pm_name || '', + totalLocations: apiData.total_locations || 0, + contractAmount: apiData.contract_amount || 0, + contractStartDate: apiData.contract_start_date || null, + contractEndDate: apiData.contract_end_date || null, + status: apiData.status || 'pending', stage: (apiData.stage as Contract['stage']) || 'estimate_selected', - remarks: String(apiData.remarks || ''), - createdAt: String(apiData.created_at || ''), - updatedAt: String(apiData.updated_at || ''), - createdBy: String(apiData.created_by || ''), - biddingId: String(apiData.bidding_id || ''), - biddingCode: String(apiData.bidding_code || ''), + remarks: apiData.remarks || '', + createdAt: apiData.created_at || '', + updatedAt: apiData.updated_at || '', + createdBy: apiData.created_by || '', + biddingId: apiData.bidding_id ? String(apiData.bidding_id) : '', + biddingCode: apiData.bidding_code || '', }; } /** - * 프론트엔드 → API 요청 타입 변환 + * API 응답 → ContractDetail 타입 변환 + */ +function transformContractDetail(apiData: ApiContract): ContractDetail { + const contract = transformContract(apiData); + + return { + ...contract, + contractFile: apiData.contract_file + ? { + id: String(apiData.contract_file.id), + fileName: apiData.contract_file.file_name || '', + fileUrl: apiData.contract_file.file_url || '', + uploadedAt: apiData.contract_file.uploaded_at || '', + } + : null, + attachments: (apiData.attachments || []).map((att) => ({ + id: String(att.id), + fileName: att.file_name || '', + fileSize: att.file_size || 0, + fileUrl: att.file_url || '', + uploadedAt: att.uploaded_at || '', + })), + }; +} + +/** + * ContractFormData → API 요청 데이터 변환 */ function transformToApiRequest(data: Partial): Record { const apiData: Record = {}; @@ -127,8 +157,13 @@ function transformToApiRequest(data: Partial): Record { try { - const params = new URLSearchParams(); + const queryParams: Record = {}; - if (filter?.search) params.append('search', filter.search); - if (filter?.status && filter.status !== 'all') params.append('status', filter.status); - if (filter?.stage && filter.stage !== 'all') params.append('stage', filter.stage); - if (filter?.partnerId && filter.partnerId !== 'all') params.append('partner_id', filter.partnerId); - if (filter?.contractManagerId && filter.contractManagerId !== 'all') params.append('contract_manager_id', filter.contractManagerId); - if (filter?.constructionPMId && filter.constructionPMId !== 'all') params.append('construction_pm_id', filter.constructionPMId); - if (filter?.startDate) params.append('start_date', filter.startDate); - if (filter?.endDate) params.append('end_date', filter.endDate); - if (filter?.page) params.append('page', String(filter.page)); - if (filter?.size) params.append('per_page', String(filter.size)); + // 검색 + if (filter?.search) queryParams.search = filter.search; - // 정렬 파라미터 변환 + // 필터 + if (filter?.status && filter.status !== 'all') queryParams.status = filter.status; + if (filter?.stage && filter.stage !== 'all') queryParams.stage = filter.stage; + if (filter?.partnerId && filter.partnerId !== 'all') queryParams.partner_id = filter.partnerId; + if (filter?.contractManagerId && filter.contractManagerId !== 'all') { + queryParams.contract_manager_id = filter.contractManagerId; + } + if (filter?.constructionPMId && filter.constructionPMId !== 'all') { + queryParams.construction_pm_id = filter.constructionPMId; + } + + // 날짜 범위 + if (filter?.startDate) queryParams.start_date = filter.startDate; + if (filter?.endDate) queryParams.end_date = filter.endDate; + + // 페이지네이션 + if (filter?.page) queryParams.page = String(filter.page); + if (filter?.size) queryParams.per_page = String(filter.size); + + // 정렬 if (filter?.sortBy) { const sortMap: Record = { contractDateDesc: { field: 'created_at', dir: 'desc' }, @@ -163,47 +209,40 @@ export async function getContractList(filter?: ContractFilter): Promise<{ }; const sort = sortMap[filter.sortBy]; if (sort) { - params.append('sort_by', sort.field); - params.append('sort_dir', sort.dir); + queryParams.sort_by = sort.field; + queryParams.sort_dir = sort.dir; } } - const queryString = params.toString(); - const endpoint = `/construction/contracts${queryString ? `?${queryString}` : ''}`; - - const result = await apiRequest<{ - data: Record[]; + const response = await apiClient.get<{ + data: ApiContract[]; current_page: number; per_page: number; total: number; last_page: number; - }>(endpoint); + }>('/construction/contracts', { params: queryParams }); - if (!result.success || !result.data) { - return { success: false, error: result.error || '계약 목록 조회에 실패했습니다.' }; - } - - const apiData = result.data; - const items = (apiData.data || []).map(transformContract); + const items = (response.data || []).map(transformContract); return { success: true, data: { items, - total: apiData.total || 0, - page: apiData.current_page || 1, - size: apiData.per_page || 20, - totalPages: apiData.last_page || 1, + total: response.total || 0, + page: response.current_page || 1, + size: response.per_page || 20, + totalPages: response.last_page || 1, }, }; } catch (error) { - console.error('getContractList error:', error); + console.error('계약 목록 조회 오류:', error); return { success: false, error: '계약 목록을 불러오는데 실패했습니다.' }; } } /** * 계약 통계 조회 + * GET /api/v1/construction/contracts/stats */ export async function getContractStats(): Promise<{ success: boolean; @@ -211,32 +250,25 @@ export async function getContractStats(): Promise<{ error?: string; }> { try { - const result = await apiRequest<{ - total_count: number; - pending_count: number; - completed_count: number; - }>('/construction/contracts/stats'); - - if (!result.success || !result.data) { - return { success: false, error: result.error || '통계를 불러오는데 실패했습니다.' }; - } + const response = await apiClient.get('/construction/contracts/stats'); return { success: true, data: { - total: result.data.total_count || 0, - pending: result.data.pending_count || 0, - completed: result.data.completed_count || 0, + total: response.total_count || 0, + pending: response.pending_count || 0, + completed: response.completed_count || 0, }, }; } catch (error) { - console.error('getContractStats error:', error); + console.error('계약 통계 조회 오류:', error); return { success: false, error: '통계를 불러오는데 실패했습니다.' }; } } /** * 단계별 건수 조회 + * GET /api/v1/construction/contracts/stage-counts */ export async function getContractStageCounts(): Promise<{ success: boolean; @@ -244,38 +276,28 @@ export async function getContractStageCounts(): Promise<{ error?: string; }> { try { - const result = await apiRequest<{ - estimate_selected: number; - estimate_progress: number; - delivery: number; - installation: number; - inspection: number; - other: number; - }>('/construction/contracts/stage-counts'); - - if (!result.success || !result.data) { - return { success: false, error: result.error || '단계별 건수를 불러오는데 실패했습니다.' }; - } + const response = await apiClient.get('/construction/contracts/stage-counts'); return { success: true, data: { - estimateSelected: result.data.estimate_selected || 0, - estimateProgress: result.data.estimate_progress || 0, - delivery: result.data.delivery || 0, - installation: result.data.installation || 0, - inspection: result.data.inspection || 0, - other: result.data.other || 0, + estimateSelected: response.estimate_selected || 0, + estimateProgress: response.estimate_progress || 0, + delivery: response.delivery || 0, + installation: response.installation || 0, + inspection: response.inspection || 0, + other: response.other || 0, }, }; } catch (error) { - console.error('getContractStageCounts error:', error); + console.error('단계별 건수 조회 오류:', error); return { success: false, error: '단계별 건수를 불러오는데 실패했습니다.' }; } } /** * 계약 단건 조회 + * GET /api/v1/construction/contracts/{id} */ export async function getContract(id: string): Promise<{ success: boolean; @@ -283,21 +305,17 @@ export async function getContract(id: string): Promise<{ error?: string; }> { try { - const result = await apiRequest>(`/construction/contracts/${id}`); - - if (!result.success || !result.data) { - return { success: false, error: result.error || '계약 정보를 찾을 수 없습니다.' }; - } - - return { success: true, data: transformContract(result.data) }; + const response = await apiClient.get(`/construction/contracts/${id}`); + return { success: true, data: transformContract(response) }; } catch (error) { - console.error('getContract error:', error); - return { success: false, error: '계약 정보를 불러오는데 실패했습니다.' }; + console.error('계약 조회 오류:', error); + return { success: false, error: '계약 정보를 찾을 수 없습니다.' }; } } /** * 계약 상세 조회 (첨부파일 포함) + * GET /api/v1/construction/contracts/{id} */ export async function getContractDetail(id: string): Promise<{ success: boolean; @@ -305,69 +323,36 @@ export async function getContractDetail(id: string): Promise<{ error?: string; }> { try { - const result = await apiRequest>(`/construction/contracts/${id}`); - - if (!result.success || !result.data) { - return { success: false, error: result.error || '계약 정보를 찾을 수 없습니다.' }; - } - - const contract = transformContract(result.data); - - // 첨부파일 정보 변환 (API에서 반환하는 경우) - const contractFile = result.data.contract_file as Record | null; - const attachmentsData = result.data.attachments as Record[] | undefined; - - const detail: ContractDetail = { - ...contract, - contractFile: contractFile ? { - id: String(contractFile.id || ''), - fileName: String(contractFile.file_name || contractFile.fileName || ''), - fileUrl: String(contractFile.file_url || contractFile.fileUrl || ''), - uploadedAt: String(contractFile.uploaded_at || contractFile.uploadedAt || ''), - } : null, - attachments: (attachmentsData || []).map((att) => ({ - id: String(att.id || ''), - fileName: String(att.file_name || att.fileName || ''), - fileSize: Number(att.file_size || att.fileSize || 0), - fileUrl: String(att.file_url || att.fileUrl || ''), - uploadedAt: String(att.uploaded_at || att.uploadedAt || ''), - })), - }; - - return { success: true, data: detail }; + const response = await apiClient.get(`/construction/contracts/${id}`); + return { success: true, data: transformContractDetail(response) }; } catch (error) { - console.error('getContractDetail error:', error); + console.error('계약 상세 조회 오류:', error); return { success: false, error: '계약 상세 정보를 불러오는데 실패했습니다.' }; } } /** * 계약 등록 + * POST /api/v1/construction/contracts */ -export async function createContract( - data: ContractFormData -): Promise<{ success: boolean; data?: Contract; error?: string }> { +export async function createContract(data: ContractFormData): Promise<{ + success: boolean; + data?: Contract; + error?: string; +}> { try { const apiData = transformToApiRequest(data); - - const result = await apiRequest>('/construction/contracts', { - method: 'POST', - body: JSON.stringify(apiData), - }); - - if (!result.success || !result.data) { - return { success: false, error: result.error || '계약 등록에 실패했습니다.' }; - } - - return { success: true, data: transformContract(result.data) }; + const response = await apiClient.post('/construction/contracts', apiData); + return { success: true, data: transformContract(response) }; } catch (error) { - console.error('createContract error:', error); + console.error('계약 등록 오류:', error); return { success: false, error: '계약 등록에 실패했습니다.' }; } } /** * 계약 수정 + * PUT /api/v1/construction/contracts/{id} */ export async function updateContract( id: string, @@ -379,48 +364,34 @@ export async function updateContract( }> { try { const apiData = transformToApiRequest(data); - - const result = await apiRequest>(`/construction/contracts/${id}`, { - method: 'PUT', - body: JSON.stringify(apiData), - }); - - if (!result.success || !result.data) { - return { success: false, error: result.error || '계약 수정에 실패했습니다.' }; - } - - return { success: true, data: transformContract(result.data) }; + const response = await apiClient.put(`/construction/contracts/${id}`, apiData); + return { success: true, data: transformContract(response) }; } catch (error) { - console.error('updateContract error:', error); + console.error('계약 수정 오류:', error); return { success: false, error: '계약 수정에 실패했습니다.' }; } } /** * 계약 삭제 + * DELETE /api/v1/construction/contracts/{id} */ export async function deleteContract(id: string): Promise<{ success: boolean; error?: string; }> { try { - const result = await apiRequest(`/construction/contracts/${id}`, { - method: 'DELETE', - }); - - if (!result.success) { - return { success: false, error: result.error || '계약 삭제에 실패했습니다.' }; - } - + await apiClient.delete(`/construction/contracts/${id}`); return { success: true }; } catch (error) { - console.error('deleteContract error:', error); + console.error('계약 삭제 오류:', error); return { success: false, error: '계약 삭제에 실패했습니다.' }; } } /** * 계약 일괄 삭제 + * DELETE /api/v1/construction/contracts/bulk */ export async function deleteContracts(ids: string[]): Promise<{ success: boolean; @@ -428,18 +399,12 @@ export async function deleteContracts(ids: string[]): Promise<{ error?: string; }> { try { - const result = await apiRequest('/construction/contracts/bulk', { - method: 'DELETE', - body: JSON.stringify({ ids: ids.map(id => Number(id)) }), + await apiClient.delete('/construction/contracts/bulk', { + data: { ids: ids.map((id) => Number(id)) }, }); - - if (!result.success) { - return { success: false, error: result.error || '일괄 삭제에 실패했습니다.' }; - } - return { success: true, deletedCount: ids.length }; } catch (error) { - console.error('deleteContracts error:', error); + console.error('계약 일괄 삭제 오류:', error); return { success: false, error: '일괄 삭제에 실패했습니다.' }; } } \ No newline at end of file diff --git a/src/components/business/construction/partners/actions.ts b/src/components/business/construction/partners/actions.ts index ec09ce55..5b78610a 100644 --- a/src/components/business/construction/partners/actions.ts +++ b/src/components/business/construction/partners/actions.ts @@ -1,81 +1,63 @@ 'use server'; -import { cookies } from 'next/headers'; import type { Partner, PartnerStats, PartnerFilter, PartnerListResponse, PartnerFormData } from './types'; +import { apiClient } from '@/lib/api'; /** * 주일 기업 - 거래처 관리 Server Actions - * API 연동 버전 + * 표준화된 apiClient 사용 버전 */ -// API 기본 URL -const API_BASE_URL = process.env.NEXT_PUBLIC_API_URL || 'http://api.sam.kr'; -const API_KEY = process.env.API_KEY || ''; +// ======================================== +// API 응답 타입 +// ======================================== -/** - * API 요청 헬퍼 함수 - */ -async function apiRequest( - endpoint: string, - options: RequestInit = {} -): Promise<{ success: boolean; data?: T; error?: string; message?: string }> { - try { - const cookieStore = await cookies(); - const accessToken = cookieStore.get('access_token')?.value; - - const headers: Record = { - 'Accept': 'application/json', - 'Content-Type': 'application/json', - 'X-API-KEY': API_KEY, - }; - - if (accessToken) { - headers['Authorization'] = `Bearer ${accessToken}`; - } - - const url = `${API_BASE_URL}/api/v1${endpoint}`; - console.log('🔵 [Partner API]', options.method || 'GET', url); - - const response = await fetch(url, { - ...options, - headers: { - ...headers, - ...options.headers, - }, - }); - - const result = await response.json(); - console.log('🔵 [Partner API] Response status:', response.status); - - if (!response.ok) { - return { - success: false, - error: result.message || `API 오류: ${response.status}`, - }; - } - - return { - success: result.success ?? true, - data: result.data, - message: result.message, - }; - } catch (error) { - console.error('API request error:', error); - return { - success: false, - error: error instanceof Error ? error.message : '알 수 없는 오류가 발생했습니다.', - }; - } +interface ApiPartner { + id: number; + client_code: string | null; + business_no: string | null; + name: string; + contact_person: string | null; + client_type: string | null; + business_type: string | null; + business_item: string | null; + address: string | null; + phone: string | null; + mobile: string | null; + fax: string | null; + email: string | null; + manager_name: string | null; + manager_tel: string | null; + system_manager: string | null; + outstanding_amount: number | null; + is_overdue: boolean; + has_bad_debt: boolean; + is_active: boolean; + created_at: string; + updated_at: string; } +interface ApiPartnerStats { + total: number; + sales: number; + purchase: number; + both: number; + badDebt: number; + normal: number; +} + +// ======================================== +// 타입 변환 함수 +// ======================================== + /** * client_type API → Frontend partnerType 변환 */ function transformClientType(clientType: string | null | undefined): Partner['partnerType'] { const typeMap: Record = { - 'SALES': 'sales', - 'PURCHASE': 'purchase', - 'BOTH': 'both', + SALES: 'sales', + PURCHASE: 'purchase', + BOTH: 'both', }; return typeMap[clientType || ''] || 'sales'; } @@ -85,59 +67,59 @@ function transformClientType(clientType: string | null | undefined): Partner['pa */ function transformPartnerType(partnerType: Partner['partnerType']): string { const typeMap: Record = { - 'sales': 'SALES', - 'purchase': 'PURCHASE', - 'both': 'BOTH', + sales: 'SALES', + purchase: 'PURCHASE', + both: 'BOTH', }; return typeMap[partnerType] || 'SALES'; } /** - * API 응답 → 프론트엔드 Partner 타입 변환 + * API 응답 → Partner 타입 변환 */ -function transformPartner(apiData: Record): Partner { +function transformPartner(apiData: ApiPartner): Partner { return { id: String(apiData.id), - partnerCode: String(apiData.client_code || ''), - businessNumber: String(apiData.business_no || ''), - partnerName: String(apiData.name || ''), - representative: String(apiData.contact_person || ''), - partnerType: transformClientType(apiData.client_type as string | null), - businessType: String(apiData.business_type || ''), - businessCategory: String(apiData.business_item || ''), - zipCode: '', // API에 없는 필드 - address1: String(apiData.address || ''), - address2: '', // API에 없는 필드 - phone: String(apiData.phone || ''), - mobile: String(apiData.mobile || ''), - fax: String(apiData.fax || ''), - email: String(apiData.email || ''), - manager: String(apiData.manager_name || ''), - managerPhone: String(apiData.manager_tel || ''), - systemManager: String(apiData.system_manager || ''), - logoUrl: null, // API에 없는 필드 - logoBlob: null, // API에 없는 필드 - salesPaymentDay: 0, // API에 없는 필드 - creditRating: '', // API에 없는 필드 - transactionGrade: '', // API에 없는 필드 - taxInvoiceEmail: String(apiData.email || ''), // 동일한 이메일 사용 - outstandingAmount: Number(apiData.outstanding_amount || 0), - overdueDays: apiData.is_overdue ? 30 : 0, // 연체 여부만 있음 - overdueToggle: Boolean(apiData.is_overdue), - badDebtToggle: Boolean(apiData.has_bad_debt), - memos: [], // API에 없는 필드 - documents: [], // API에 없는 필드 - category: '', // API에 없는 필드 - paymentDay: 0, // API에 없는 필드 - isBadDebt: Boolean(apiData.has_bad_debt), + partnerCode: apiData.client_code || '', + businessNumber: apiData.business_no || '', + partnerName: apiData.name || '', + representative: apiData.contact_person || '', + partnerType: transformClientType(apiData.client_type), + businessType: apiData.business_type || '', + businessCategory: apiData.business_item || '', + zipCode: '', + address1: apiData.address || '', + address2: '', + phone: apiData.phone || '', + mobile: apiData.mobile || '', + fax: apiData.fax || '', + email: apiData.email || '', + manager: apiData.manager_name || '', + managerPhone: apiData.manager_tel || '', + systemManager: apiData.system_manager || '', + logoUrl: null, + logoBlob: null, + salesPaymentDay: 0, + creditRating: '', + transactionGrade: '', + taxInvoiceEmail: apiData.email || '', + outstandingAmount: apiData.outstanding_amount || 0, + overdueDays: apiData.is_overdue ? 30 : 0, + overdueToggle: apiData.is_overdue, + badDebtToggle: apiData.has_bad_debt, + memos: [], + documents: [], + category: '', + paymentDay: 0, + isBadDebt: apiData.has_bad_debt, isActive: apiData.is_active !== false, - createdAt: String(apiData.created_at || ''), - updatedAt: String(apiData.updated_at || ''), + createdAt: apiData.created_at || '', + updatedAt: apiData.updated_at || '', }; } /** - * 프론트엔드 PartnerFormData → API 요청 데이터 변환 + * PartnerFormData → API 요청 데이터 변환 */ function transformPartnerToApi(data: PartnerFormData): Record { return { @@ -160,57 +142,45 @@ function transformPartnerToApi(data: PartnerFormData): Record { }; } -// ============================================================ -// API 연동 함수 -// ============================================================ +// ======================================== +// API 함수 +// ======================================== /** * 거래처 목록 조회 + * GET /api/v1/clients */ -export async function getPartnerList( - filter?: PartnerFilter -): Promise<{ success: boolean; data?: PartnerListResponse; error?: string }> { +export async function getPartnerList(filter?: PartnerFilter): Promise<{ + success: boolean; + data?: PartnerListResponse; + error?: string; +}> { try { - const queryParams = new URLSearchParams(); + const queryParams: Record = {}; // 검색어 - if (filter?.search) { - queryParams.append('q', filter.search); - } - - // 악성채권 필터 (Frontend badDebtFilter → 백엔드는 별도 필터 없음, 목록에서 처리) - // API는 전체 데이터 반환, 프론트에서 필터링 + if (filter?.search) queryParams.q = filter.search; // 페이지네이션 - if (filter?.page) queryParams.append('page', String(filter.page)); - if (filter?.size) queryParams.append('size', String(filter.size)); + if (filter?.page) queryParams.page = String(filter.page); + if (filter?.size) queryParams.size = String(filter.size); - const queryString = queryParams.toString(); - const endpoint = `/clients${queryString ? `?${queryString}` : ''}`; - - const result = await apiRequest<{ - data: Record[]; + const response = await apiClient.get<{ + data: ApiPartner[]; current_page: number; per_page: number; total: number; last_page: number; - }>(endpoint); + }>('/clients', { params: queryParams }); - if (!result.success || !result.data) { - return { success: false, error: result.error || '거래처 목록 조회에 실패했습니다.' }; - } - - const apiData = result.data; - let items = (apiData.data || []).map(transformPartner); + let items = (response.data || []).map(transformPartner); // 악성채권 필터 (프론트엔드에서 처리) if (filter?.badDebtFilter && filter.badDebtFilter !== 'all') { - items = items.filter((p) => - filter.badDebtFilter === 'badDebt' ? p.isBadDebt : !p.isBadDebt - ); + items = items.filter((p) => (filter.badDebtFilter === 'badDebt' ? p.isBadDebt : !p.isBadDebt)); } - // 정렬 (프론트엔드에서 처리 - API가 sort 미지원 시) + // 정렬 (프론트엔드에서 처리) if (filter?.sortBy) { switch (filter.sortBy) { case 'latest': @@ -232,162 +202,134 @@ export async function getPartnerList( success: true, data: { items, - total: apiData.total || 0, - page: apiData.current_page || 1, - size: apiData.per_page || 20, - totalPages: apiData.last_page || 1, + total: response.total || 0, + page: response.current_page || 1, + size: response.per_page || 20, + totalPages: response.last_page || 1, }, }; } catch (error) { - console.error('getPartnerList error:', error); - return { success: false, error: '거래처 목록 조회에 실패했습니다.' }; + console.error('거래처 목록 조회 오류:', error); + return { success: false, error: '거래처 목록을 불러오는데 실패했습니다.' }; } } /** * 거래처 상세 조회 + * GET /api/v1/clients/{id} */ -export async function getPartner( - id: string -): Promise<{ success: boolean; data?: Partner; error?: string }> { +export async function getPartner(id: string): Promise<{ + success: boolean; + data?: Partner; + error?: string; +}> { try { - const result = await apiRequest>(`/clients/${id}`); - - if (!result.success || !result.data) { - return { success: false, error: result.error || '거래처를 찾을 수 없습니다.' }; - } - - return { success: true, data: transformPartner(result.data) }; + const response = await apiClient.get(`/clients/${id}`); + return { success: true, data: transformPartner(response) }; } catch (error) { - console.error('getPartner error:', error); - return { success: false, error: '거래처 조회에 실패했습니다.' }; + console.error('거래처 조회 오류:', error); + return { success: false, error: '거래처를 찾을 수 없습니다.' }; } } /** * 거래처 등록 + * POST /api/v1/clients */ -export async function createPartner( - data: PartnerFormData -): Promise<{ success: boolean; data?: Partner; error?: string }> { +export async function createPartner(data: PartnerFormData): Promise<{ + success: boolean; + data?: Partner; + error?: string; +}> { try { const apiData = transformPartnerToApi(data); - - const result = await apiRequest>('/clients', { - method: 'POST', - body: JSON.stringify(apiData), - }); - - if (!result.success || !result.data) { - return { success: false, error: result.error || '거래처 등록에 실패했습니다.' }; - } - - return { success: true, data: transformPartner(result.data) }; + const response = await apiClient.post('/clients', apiData); + return { success: true, data: transformPartner(response) }; } catch (error) { - console.error('createPartner error:', error); + console.error('거래처 등록 오류:', error); return { success: false, error: '거래처 등록에 실패했습니다.' }; } } /** * 거래처 수정 + * PUT /api/v1/clients/{id} */ -export async function updatePartner( - id: string, - data: PartnerFormData -): Promise<{ success: boolean; data?: Partner; error?: string }> { +export async function updatePartner(id: string, data: PartnerFormData): Promise<{ + success: boolean; + data?: Partner; + error?: string; +}> { try { const apiData = transformPartnerToApi(data); - - const result = await apiRequest>(`/clients/${id}`, { - method: 'PUT', - body: JSON.stringify(apiData), - }); - - if (!result.success || !result.data) { - return { success: false, error: result.error || '거래처 수정에 실패했습니다.' }; - } - - return { success: true, data: transformPartner(result.data) }; + const response = await apiClient.put(`/clients/${id}`, apiData); + return { success: true, data: transformPartner(response) }; } catch (error) { - console.error('updatePartner error:', error); + console.error('거래처 수정 오류:', error); return { success: false, error: '거래처 수정에 실패했습니다.' }; } } /** * 거래처 통계 조회 + * GET /api/v1/clients/stats */ -export async function getPartnerStats(): Promise<{ success: boolean; data?: PartnerStats; error?: string }> { +export async function getPartnerStats(): Promise<{ + success: boolean; + data?: PartnerStats; + error?: string; +}> { try { - const result = await apiRequest<{ - total: number; - sales: number; - purchase: number; - both: number; - badDebt: number; - normal: number; - }>('/clients/stats'); - - if (!result.success || !result.data) { - return { success: false, error: result.error || '통계 조회에 실패했습니다.' }; - } + const response = await apiClient.get('/clients/stats'); return { success: true, data: { - total: result.data.total || 0, - unregistered: 0, // Client API에서 미지원 (거래처는 등록 완료 상태만) - badDebt: result.data.badDebt || 0, - normal: result.data.normal || 0, + total: response.total || 0, + unregistered: 0, + badDebt: response.badDebt || 0, + normal: response.normal || 0, }, }; } catch (error) { - console.error('getPartnerStats error:', error); - return { success: false, error: '통계 조회에 실패했습니다.' }; + console.error('거래처 통계 조회 오류:', error); + return { success: false, error: '통계를 불러오는데 실패했습니다.' }; } } /** * 거래처 삭제 + * DELETE /api/v1/clients/{id} */ -export async function deletePartner(id: string): Promise<{ success: boolean; error?: string }> { +export async function deletePartner(id: string): Promise<{ + success: boolean; + error?: string; +}> { try { - const result = await apiRequest(`/clients/${id}`, { - method: 'DELETE', - }); - - if (!result.success) { - return { success: false, error: result.error || '거래처 삭제에 실패했습니다.' }; - } - + await apiClient.delete(`/clients/${id}`); return { success: true }; } catch (error) { - console.error('deletePartner error:', error); + console.error('거래처 삭제 오류:', error); return { success: false, error: '거래처 삭제에 실패했습니다.' }; } } /** * 거래처 일괄 삭제 + * DELETE /api/v1/clients/bulk */ -export async function deletePartners(ids: string[]): Promise<{ success: boolean; deletedCount?: number; error?: string }> { +export async function deletePartners(ids: string[]): Promise<{ + success: boolean; + deletedCount?: number; + error?: string; +}> { try { - const result = await apiRequest<{ deleted_count: number }>('/clients/bulk', { - method: 'DELETE', - body: JSON.stringify({ ids: ids.map((id) => Number(id)) }), + await apiClient.delete('/clients/bulk', { + data: { ids: ids.map((id) => Number(id)) }, }); - - if (!result.success) { - return { success: false, error: result.error || '일괄 삭제에 실패했습니다.' }; - } - - return { - success: true, - deletedCount: result.data?.deleted_count || ids.length, - }; + return { success: true, deletedCount: ids.length }; } catch (error) { - console.error('deletePartners error:', error); + console.error('거래처 일괄 삭제 오류:', error); return { success: false, error: '일괄 삭제에 실패했습니다.' }; } } \ No newline at end of file diff --git a/src/components/business/construction/site-management/actions.ts b/src/components/business/construction/site-management/actions.ts index b668854d..2ccaadca 100644 --- a/src/components/business/construction/site-management/actions.ts +++ b/src/components/business/construction/site-management/actions.ts @@ -1,96 +1,64 @@ 'use server'; -import { cookies } from 'next/headers'; import type { Site, SiteStats, SiteStatus } from './types'; +import { apiClient } from '@/lib/api'; /** * 주일 기업 - 현장관리 Server Actions - * API 연동 버전 + * 표준화된 apiClient 사용 버전 */ -// API 기본 URL -const API_BASE_URL = process.env.NEXT_PUBLIC_API_URL || 'http://api.sam.kr'; -const API_KEY = process.env.API_KEY || ''; +// ======================================== +// API 응답 타입 +// ======================================== -/** - * API 요청 헬퍼 함수 - */ -async function apiRequest( - endpoint: string, - options: RequestInit = {} -): Promise<{ success: boolean; data?: T; error?: string; message?: string }> { - try { - const cookieStore = await cookies(); - const accessToken = cookieStore.get('access_token')?.value; - - const headers: Record = { - 'Accept': 'application/json', - 'Content-Type': 'application/json', - 'X-API-KEY': API_KEY, - }; - - if (accessToken) { - headers['Authorization'] = `Bearer ${accessToken}`; - } - - const url = `${API_BASE_URL}/api/v1${endpoint}`; - console.log('🔵 [Site API]', options.method || 'GET', url); - - const response = await fetch(url, { - ...options, - headers: { - ...headers, - ...options.headers, - }, - }); - - const result = await response.json(); - console.log('🔵 [Site API] Response status:', response.status); - - if (!response.ok) { - return { - success: false, - error: result.message || `API 오류: ${response.status}`, - }; - } - - return { - success: result.success ?? true, - data: result.data, - message: result.message, - }; - } catch (error) { - console.error('API request error:', error); - return { - success: false, - error: error instanceof Error ? error.message : '알 수 없는 오류가 발생했습니다.', - }; - } +interface ApiSite { + id: number; + site_code: string | null; + client_id: number | null; + name: string; + address: string | null; + status: SiteStatus; + created_at: string; + updated_at: string; + client?: { + id: number; + name: string; + } | null; } -/** - * API 응답 → 프론트엔드 타입 변환 - */ -function transformSite(apiData: Record): Site { - // client 관계 데이터 추출 - const client = apiData.client as Record | null | undefined; +interface ApiSiteStats { + total: number; + construction: number; + unregistered: number; + suspended: number; + pending: number; +} +// ======================================== +// 타입 변환 함수 +// ======================================== + +/** + * API 응답 → Site 타입 변환 + */ +function transformSite(apiData: ApiSite): Site { return { id: String(apiData.id), - siteCode: String(apiData.site_code || ''), + siteCode: apiData.site_code || '', partnerId: apiData.client_id ? String(apiData.client_id) : '', - partnerName: client ? String(client.name || '') : '', - siteName: String(apiData.name || ''), - address: String(apiData.address || ''), - status: (apiData.status as SiteStatus) || 'unregistered', - createdAt: String(apiData.created_at || ''), - updatedAt: String(apiData.updated_at || ''), + partnerName: apiData.client?.name || '', + siteName: apiData.name || '', + address: apiData.address || '', + status: apiData.status || 'unregistered', + createdAt: apiData.created_at || '', + updatedAt: apiData.updated_at || '', }; } -// ============================================================ -// API 연동 함수 -// ============================================================ +// ======================================== +// API 함수 +// ======================================== interface GetSiteListParams { size?: number; @@ -103,7 +71,11 @@ interface GetSiteListParams { sortBy?: string; } -interface GetSiteListResult { +/** + * 현장 목록 조회 + * GET /api/v1/sites + */ +export async function getSiteList(params: GetSiteListParams = {}): Promise<{ success: boolean; data?: { items: Site[]; @@ -113,24 +85,26 @@ interface GetSiteListResult { totalPages: number; }; error?: string; -} - -/** - * 현장 목록 조회 - */ -export async function getSiteList(params: GetSiteListParams = {}): Promise { +}> { try { - const queryParams = new URLSearchParams(); + const queryParams: Record = {}; - if (params.search) queryParams.append('search', params.search); - if (params.status && params.status !== 'all') queryParams.append('status', params.status); - if (params.clientId && params.clientId !== 'all') queryParams.append('client_id', params.clientId); - if (params.startDate) queryParams.append('start_date', params.startDate); - if (params.endDate) queryParams.append('end_date', params.endDate); - if (params.page) queryParams.append('page', String(params.page)); - if (params.size) queryParams.append('per_page', String(params.size)); + // 검색 + if (params.search) queryParams.search = params.search; - // 정렬 파라미터 변환 + // 필터 + if (params.status && params.status !== 'all') queryParams.status = params.status; + if (params.clientId && params.clientId !== 'all') queryParams.client_id = params.clientId; + + // 날짜 범위 + if (params.startDate) queryParams.start_date = params.startDate; + if (params.endDate) queryParams.end_date = params.endDate; + + // 페이지네이션 + if (params.page) queryParams.page = String(params.page); + if (params.size) queryParams.per_page = String(params.size); + + // 정렬 if (params.sortBy) { const sortMap: Record = { latest: { field: 'created_at', dir: 'desc' }, @@ -142,135 +116,98 @@ export async function getSiteList(params: GetSiteListParams = {}): Promise[]; + const response = await apiClient.get<{ + data: ApiSite[]; current_page: number; per_page: number; total: number; last_page: number; - }>(endpoint); + }>('/sites', { params: queryParams }); - if (!result.success || !result.data) { - return { success: false, error: result.error || '현장 목록 조회에 실패했습니다.' }; - } - - const apiData = result.data; - const items = (apiData.data || []).map(transformSite); + const items = (response.data || []).map(transformSite); return { success: true, data: { items, - total: apiData.total || 0, - page: apiData.current_page || 1, - size: apiData.per_page || 20, - totalPages: apiData.last_page || 1, + total: response.total || 0, + page: response.current_page || 1, + size: response.per_page || 20, + totalPages: response.last_page || 1, }, }; } catch (error) { - console.error('getSiteList error:', error); + console.error('현장 목록 조회 오류:', error); return { success: false, error: '현장 목록을 불러오는데 실패했습니다.' }; } } -interface GetSiteStatsResult { +/** + * 현장 통계 조회 + * GET /api/v1/sites/stats + */ +export async function getSiteStats(): Promise<{ success: boolean; data?: SiteStats; error?: string; -} - -/** - * 현장 통계 조회 - */ -export async function getSiteStats(): Promise { +}> { try { - const result = await apiRequest<{ - total: number; - construction: number; - unregistered: number; - suspended: number; - pending: number; - }>('/sites/stats'); - - if (!result.success || !result.data) { - return { success: false, error: result.error || '현장 통계 조회에 실패했습니다.' }; - } + const response = await apiClient.get('/sites/stats'); return { success: true, data: { - total: result.data.total || 0, - construction: result.data.construction || 0, - unregistered: result.data.unregistered || 0, - suspended: result.data.suspended || 0, - pending: result.data.pending || 0, + total: response.total || 0, + construction: response.construction || 0, + unregistered: response.unregistered || 0, + suspended: response.suspended || 0, + pending: response.pending || 0, }, }; } catch (error) { - console.error('getSiteStats error:', error); + console.error('현장 통계 조회 오류:', error); return { success: false, error: '현장 통계를 불러오는데 실패했습니다.' }; } } -interface DeleteSiteResult { - success: boolean; - error?: string; -} - /** * 현장 삭제 + * DELETE /api/v1/sites/{id} */ -export async function deleteSite(id: string): Promise { +export async function deleteSite(id: string): Promise<{ + success: boolean; + error?: string; +}> { try { - const result = await apiRequest(`/sites/${id}`, { - method: 'DELETE', - }); - - if (!result.success) { - return { success: false, error: result.error || '현장 삭제에 실패했습니다.' }; - } - + await apiClient.delete(`/sites/${id}`); return { success: true }; } catch (error) { - console.error('deleteSite error:', error); + console.error('현장 삭제 오류:', error); return { success: false, error: '현장 삭제에 실패했습니다.' }; } } -interface DeleteSitesResult { +/** + * 현장 일괄 삭제 + * DELETE /api/v1/sites/bulk + */ +export async function deleteSites(ids: string[]): Promise<{ success: boolean; deletedCount?: number; error?: string; -} - -/** - * 현장 일괄 삭제 - */ -export async function deleteSites(ids: string[]): Promise { +}> { try { - const result = await apiRequest<{ deleted_count: number }>('/sites/bulk', { - method: 'DELETE', - body: JSON.stringify({ ids: ids.map((id) => Number(id)) }), + await apiClient.delete('/sites/bulk', { + data: { ids: ids.map((id) => Number(id)) }, }); - - if (!result.success) { - return { success: false, error: result.error || '현장 일괄 삭제에 실패했습니다.' }; - } - - return { - success: true, - deletedCount: result.data?.deleted_count || ids.length, - }; + return { success: true, deletedCount: ids.length }; } catch (error) { - console.error('deleteSites error:', error); + console.error('현장 일괄 삭제 오류:', error); return { success: false, error: '현장 일괄 삭제에 실패했습니다.' }; } } \ No newline at end of file From d43433295d7a15bf44939472c59fdf0a135ff791 Mon Sep 17 00:00:00 2001 From: kent Date: Fri, 9 Jan 2026 19:57:30 +0900 Subject: [PATCH 21/45] =?UTF-8?q?feat(construction):=20Phase=20L=20?= =?UTF-8?q?=EA=B1=B4=EC=84=A4=EA=B4=80=EB=A6=AC=203=EA=B0=9C=20=EB=AA=A8?= =?UTF-8?q?=EB=93=88=20Mock=20=E2=86=92=20API=20=EC=97=B0=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - pricing-management: Mock → apiClient 표준화, types.ts 타입 추가 - estimates: Mock → apiClient 표준화 (복잡한 중첩 타입 처리) - category-management: Mock → apiClient 표준화 (에러 타입 처리) --- CURRENT_WORKS.md | 68 +- .../category-management/actions.ts | 187 +++-- .../construction/estimates/actions.ts | 714 ++++++++++++------ .../pricing-management/actions.ts | 620 ++++++++------- .../construction/pricing-management/types.ts | 38 + 5 files changed, 1010 insertions(+), 617 deletions(-) diff --git a/CURRENT_WORKS.md b/CURRENT_WORKS.md index 41ba9ca3..e19d215b 100644 --- a/CURRENT_WORKS.md +++ b/CURRENT_WORKS.md @@ -1,5 +1,46 @@ # SAM React 작업 현황 +## 2026-01-09 (목) - Phase L 건설관리 Mock → API 연동 (3개 모듈) ✅ + +### 작업 목표 +- Backend API가 이미 존재하는 3개 모듈의 Mock → API 연동 +- pricing-management, estimates, category-management + +### 완료된 작업 + +| 모듈 | 변경 내용 | 상태 | +|------|----------|------| +| pricing-management | Mock → apiClient 변환 (378줄), types.ts 타입 추가 | ✅ | +| estimates | Mock → apiClient 변환, 복잡한 중첩 타입 처리 | ✅ | +| category-management | Mock → apiClient 변환, 에러 타입 처리 (IN_USE/DEFAULT/GENERAL) | ✅ | + +### 수정된 파일 +| 파일명 | 설명 | +|--------|------| +| `src/components/business/construction/pricing-management/actions.ts` | Mock → apiClient 표준화 | +| `src/components/business/construction/pricing-management/types.ts` | PricingListResponse, PricingFilter, PricingFormData 추가 | +| `src/components/business/construction/estimates/actions.ts` | Mock → apiClient 표준화 (중첩 타입) | +| `src/components/business/construction/category-management/actions.ts` | Mock → apiClient 표준화 | + +### 적용된 패턴 +- `'use server'` + `apiClient from '@/lib/api'` +- Snake_case API 타입 (ApiXxx) → camelCase Frontend 타입 변환 +- 표준 응답: `{ success, data?, error? }` +- 페이지네이션: `{ items, total, page, size, totalPages }` + +### 빌드 검증 +✅ Next.js 빌드 성공 (349 페이지) + +### 남은 Mock 모듈 (Backend API 개발 필요) +| 모듈 | Backend API | 비고 | +|------|-------------|------| +| bidding | ❌ 없음 | Backend 필요 | +| site-briefings | ❌ 없음 | Backend 필요 | +| structure-review | ❌ 없음 | Backend 필요 | +| labor-management | ❌ 없음 | Backend 필요 | + +--- + ## 2026-01-09 (목) - Phase 1.3-1.5 건설관리 apiClient 표준화 ### 작업 목표 @@ -58,7 +99,7 @@ ✅ Next.js 빌드 성공 (349 페이지) ### Git 커밋 -- 대기 중 +- React: `5db6e59` refactor(construction): 건설관리 3개 모듈 apiClient 표준화 --- @@ -776,16 +817,29 @@ useEffect(() => { #### Phase K (✅ 완료) - 보고서 - [x] K-1 종합분석 (Reports) API 연동 ✅ -#### Phase L (🔄 진행중 ~30%) - 건설관리 -- [ ] bidding, category-management, contract, estimates (Mock 사용 중) -- [ ] handover-report, pricing-management, site-briefings, structure-review (Mock 사용 중) -- [x] labor-management, order-management, partners, site-management (Custom fetch → 표준화 필요) +#### Phase L (🔄 진행중 ~80%) - 건설관리 +**✅ apiClient 표준화 완료:** +- [x] handover-report (b7b8b90) +- [x] contract (5db6e59) +- [x] partners (5db6e59) +- [x] site-management (5db6e59) +- [x] order-management (6615f39) +- [x] item-management (Phase 2.3) +- [x] pricing-management (Phase L) ✅ 2026-01-09 +- [x] estimates (Phase L) ✅ 2026-01-09 +- [x] category-management (Phase L) ✅ 2026-01-09 -> **마이그레이션 진행률**: 95% 완료 (37/40 모듈) +**⏳ Mock → API 변환 필요 (Backend API 개발 필요):** +- [ ] bidding - 입찰관리 +- [ ] site-briefings - 현장설명회 +- [ ] structure-review - 구조검토 +- [ ] labor-management - 노무관리 + +> **마이그레이션 진행률**: 97% 완료 (41/43 모듈) - 건설관리 4개 모듈 Backend API 개발 필요 > **점검일**: 2026-01-09 ### 다음 작업 -- Phase L 건설관리 모듈 마이그레이션 완료 +- Phase L 건설관리 모듈 마이그레이션 완료 (Backend API 개발 필요: bidding, site-briefings, structure-review, labor-management) - ~~TODO-1: 결재선/참조 Select 변경 불가 문제~~ ✅ 2026-01-09 수정 완료 --- diff --git a/src/components/business/construction/category-management/actions.ts b/src/components/business/construction/category-management/actions.ts index 5c98acfb..d98aa714 100644 --- a/src/components/business/construction/category-management/actions.ts +++ b/src/components/business/construction/category-management/actions.ts @@ -1,35 +1,79 @@ 'use server'; import type { Category } from './types'; +import { apiClient } from '@/lib/api'; -// ===== 목데이터 (추후 API 연동 시 교체) ===== -let mockCategories: Category[] = [ - { id: '1', name: '슬라이드 OPEN 사이즈', order: 1, isDefault: true }, - { id: '2', name: '모터', order: 2, isDefault: true }, - { id: '3', name: '공정자재', order: 3, isDefault: true }, - { id: '4', name: '철물', order: 4, isDefault: true }, -]; +/** + * 주일 기업 - 카테고리 관리 Server Actions + * 표준화된 apiClient 사용 버전 + */ -// 다음 ID 생성 -let nextId = 5; +// ======================================== +// API 응답 타입 +// ======================================== -// ===== 카테고리 목록 조회 ===== +interface ApiCategory { + id: number; + name: string; + sort_order: number; + is_default: boolean; + is_active: boolean; + created_at: string; + updated_at: string; +} + +// ======================================== +// 타입 변환 함수 +// ======================================== + +/** + * API 응답 → Category 타입 변환 + */ +function transformCategory(apiData: ApiCategory): Category { + return { + id: String(apiData.id), + name: apiData.name || '', + order: apiData.sort_order || 0, + isDefault: apiData.is_default || false, + isActive: apiData.is_active !== false, + createdAt: apiData.created_at || '', + updatedAt: apiData.updated_at || '', + }; +} + +// ======================================== +// API 함수 +// ======================================== + +/** + * 카테고리 목록 조회 + * GET /api/v1/categories + */ export async function getCategories(): Promise<{ success: boolean; data?: Category[]; error?: string; }> { try { - // 목데이터 반환 (순서대로 정렬) - const sortedCategories = [...mockCategories].sort((a, b) => a.order - b.order); - return { success: true, data: sortedCategories }; + const response = await apiClient.get<{ + data: ApiCategory[]; + }>('/categories', { params: { per_page: '100' } }); + + const categories = (response.data || []) + .map(transformCategory) + .sort((a, b) => a.order - b.order); + + return { success: true, data: categories }; } catch (error) { - console.error('[getCategories] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; + console.error('카테고리 목록 조회 오류:', error); + return { success: false, error: '카테고리 목록을 불러오는데 실패했습니다.' }; } } -// ===== 카테고리 생성 ===== +/** + * 카테고리 생성 + * POST /api/v1/categories + */ export async function createCategory(data: { name: string; }): Promise<{ @@ -38,22 +82,20 @@ export async function createCategory(data: { error?: string; }> { try { - const newCategory: Category = { - id: String(nextId++), + const response = await apiClient.post('/categories', { name: data.name, - order: mockCategories.length + 1, - isDefault: false, - }; - - mockCategories.push(newCategory); - return { success: true, data: newCategory }; + }); + return { success: true, data: transformCategory(response) }; } catch (error) { - console.error('[createCategory] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; + console.error('카테고리 생성 오류:', error); + return { success: false, error: '카테고리 생성에 실패했습니다.' }; } } -// ===== 카테고리 수정 ===== +/** + * 카테고리 수정 + * PUT /api/v1/categories/{id} + */ export async function updateCategory( id: string, data: { name?: string } @@ -63,65 +105,64 @@ export async function updateCategory( error?: string; }> { try { - const index = mockCategories.findIndex(c => c.id === id); - if (index === -1) { - return { success: false, error: '카테고리를 찾을 수 없습니다.' }; - } - - mockCategories[index] = { - ...mockCategories[index], - ...data, - }; - - return { success: true, data: mockCategories[index] }; + const response = await apiClient.put(`/categories/${id}`, { + name: data.name, + }); + return { success: true, data: transformCategory(response) }; } catch (error) { - console.error('[updateCategory] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; + console.error('카테고리 수정 오류:', error); + return { success: false, error: '카테고리 수정에 실패했습니다.' }; } } -// ===== 카테고리 삭제 ===== +/** + * 카테고리 삭제 + * DELETE /api/v1/categories/{id} + */ export async function deleteCategory(id: string): Promise<{ success: boolean; error?: string; errorType?: 'IN_USE' | 'DEFAULT' | 'GENERAL'; }> { try { - const category = mockCategories.find(c => c.id === id); + await apiClient.delete(`/categories/${id}`); + return { success: true }; + } catch (error: unknown) { + console.error('카테고리 삭제 오류:', error); - if (!category) { - return { success: false, error: '카테고리를 찾을 수 없습니다.', errorType: 'GENERAL' }; - } + // API 에러 응답에서 errorType 추출 + const apiError = error as { response?: { data?: { error_type?: string; message?: string } } }; + const errorType = apiError?.response?.data?.error_type; + const errorMessage = apiError?.response?.data?.message; - // 기본 카테고리는 삭제 불가 - if (category.isDefault) { + if (errorType === 'IN_USE') { return { success: false, - error: '기본 카테고리는 삭제가 불가합니다.', - errorType: 'DEFAULT' + error: errorMessage || '해당 카테고리를 사용하고 있는 품목이 있습니다.', + errorType: 'IN_USE', }; } - // TODO: 품목 사용 여부 체크 로직 (추후 API 연동 시) - // 현재는 목데이터이므로 사용 중인 품목이 없다고 가정 - // const itemsUsingCategory = await checkItemsUsingCategory(id); - // if (itemsUsingCategory.length > 0) { - // return { - // success: false, - // error: `"${category.name}"을(를) 사용하고 있는 품목이 있습니다. 모두 변경 후 삭제가 가능합니다.`, - // errorType: 'IN_USE' - // }; - // } + if (errorType === 'DEFAULT') { + return { + success: false, + error: errorMessage || '기본 카테고리는 삭제가 불가합니다.', + errorType: 'DEFAULT', + }; + } - mockCategories = mockCategories.filter(c => c.id !== id); - return { success: true }; - } catch (error) { - console.error('[deleteCategory] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.', errorType: 'GENERAL' }; + return { + success: false, + error: '카테고리 삭제에 실패했습니다.', + errorType: 'GENERAL', + }; } } -// ===== 카테고리 순서 변경 ===== +/** + * 카테고리 순서 변경 + * PUT /api/v1/categories/reorder + */ export async function reorderCategories( items: { id: string; sort_order: number }[] ): Promise<{ @@ -129,17 +170,15 @@ export async function reorderCategories( error?: string; }> { try { - // 순서 업데이트 - items.forEach(item => { - const category = mockCategories.find(c => c.id === item.id); - if (category) { - category.order = item.sort_order; - } + await apiClient.put('/categories/reorder', { + items: items.map((item) => ({ + id: Number(item.id), + sort_order: item.sort_order, + })), }); - return { success: true }; } catch (error) { - console.error('[reorderCategories] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; + console.error('카테고리 순서 변경 오류:', error); + return { success: false, error: '순서 변경에 실패했습니다.' }; } } \ No newline at end of file diff --git a/src/components/business/construction/estimates/actions.ts b/src/components/business/construction/estimates/actions.ts index a3375d00..252afada 100644 --- a/src/components/business/construction/estimates/actions.ts +++ b/src/components/business/construction/estimates/actions.ts @@ -1,279 +1,551 @@ 'use server'; -import type { Estimate, EstimateStats, EstimateFilter, EstimateListResponse } from './types'; +import type { + Estimate, + EstimateDetail, + EstimateStats, + EstimateFilter, + EstimateListResponse, + EstimateDetailFormData, + EstimateSummaryItem, + ExpenseItem, + PriceAdjustmentItem, + EstimateDetailItem, + SiteBriefingInfo, + BidInfo, +} from './types'; +import { apiClient } from '@/lib/api'; /** * 주일 기업 - 견적관리 Server Actions - * TODO: 실제 API 연동 시 구현 + * 표준화된 apiClient 사용 버전 */ -// 목업 데이터 -const mockEstimates: Estimate[] = [ - { - id: '1', - estimateCode: '123123', - partnerId: '1', - partnerName: '회사명', - projectName: '삼성 엘에이 사옥', - estimatorId: 'hong', - estimatorName: '홍길동', - itemCount: 8, - estimateAmount: 100000000, - completedDate: null, - bidDate: '2025-12-15', - status: 'pending', - createdAt: '2025-01-01', - updatedAt: '2025-01-01', - createdBy: '홍길동', - }, - { - id: '2', - estimateCode: '123123', - partnerId: '2', - partnerName: '야사 대림아파트', - projectName: '마포 물류센터 증축', - estimatorId: 'hong', - estimatorName: '홍길동', - itemCount: 8, - estimateAmount: 100000000, - completedDate: null, - bidDate: '2025-12-15', - status: 'pending', - createdAt: '2025-01-02', - updatedAt: '2025-01-02', - createdBy: '홍길동', - }, - { - id: '3', - estimateCode: '123123', - partnerId: '3', - partnerName: '여의 현장아파트', - projectName: '여의도 상업시설 신축', - estimatorId: 'hong', - estimatorName: '홍길동', - itemCount: 21, - estimateAmount: 50000000, - completedDate: null, - bidDate: '2025-12-15', - status: 'pending', - createdAt: '2025-01-03', - updatedAt: '2025-01-03', - createdBy: '홍길동', - }, - { - id: '4', - estimateCode: '123123', - partnerId: '1', - partnerName: '회사명', - projectName: '강남 오피스텔 신축', - estimatorId: 'hong', - estimatorName: '홍길동', - itemCount: 0, - estimateAmount: 10000000, - completedDate: '2025-12-10', - bidDate: '2025-12-15', - status: 'completed', - createdAt: '2025-01-04', - updatedAt: '2025-01-04', - createdBy: '홍길동', - }, - { - id: '5', - estimateCode: '123123', - partnerId: '2', - partnerName: '야사 대림아파트', - projectName: '서초 아파트 리모델링', - estimatorId: 'hong', - estimatorName: '홍길동', - itemCount: 0, - estimateAmount: 10000000, - completedDate: '2025-12-11', - bidDate: '2025-12-15', - status: 'completed', - createdAt: '2025-01-05', - updatedAt: '2025-01-05', - createdBy: '홍길동', - }, - { - id: '6', - estimateCode: '123123', - partnerId: '3', - partnerName: '회사명', - projectName: '송파 주상복합 공사', - estimatorId: 'hong', - estimatorName: '홍길동', - itemCount: 0, - estimateAmount: 10000000, - completedDate: '2025-12-12', - bidDate: '2025-12-15', - status: 'completed', - createdAt: '2025-01-06', - updatedAt: '2025-01-06', - createdBy: '홍길동', - }, - { - id: '7', - estimateCode: '123125', - partnerId: '1', - partnerName: '회사명', - projectName: '판교 테크노밸리 빌딩', - estimatorId: 'kim', - estimatorName: '김철수', - itemCount: 15, - estimateAmount: 200000000, - completedDate: null, - bidDate: '2025-12-20', - status: 'pending', - createdAt: '2025-01-07', - updatedAt: '2025-01-07', - createdBy: '김철수', - }, -]; +// ======================================== +// API 응답 타입 +// ======================================== -// 견적 목록 조회 -export async function getEstimateList( - filter?: EstimateFilter -): Promise<{ success: boolean; data?: EstimateListResponse; error?: string }> { +interface ApiEstimate { + id: number; + estimate_code: string; + partner_id: number | null; + partner_name: string | null; + project_name: string; + estimator_id: number | null; + estimator_name: string | null; + item_count: number; + estimate_amount: number; + completed_date: string | null; + bid_date: string | null; + status: 'pending' | 'approval_waiting' | 'completed' | 'rejected' | 'hold'; + created_at: string; + updated_at: string; + created_by: string | null; +} + +interface ApiEstimateStats { + total_count: number; + pending_count: number; + completed_count: number; +} + +interface ApiEstimateDetail extends ApiEstimate { + site_briefing?: ApiSiteBriefingInfo; + bid_info?: ApiBidInfo; + summary_items?: ApiSummaryItem[]; + expense_items?: ApiExpenseItem[]; + price_adjustments?: ApiPriceAdjustmentItem[]; + detail_items?: ApiDetailItem[]; +} + +interface ApiSiteBriefingInfo { + briefing_code: string; + partner_name: string; + company_name: string; + briefing_date: string; + attendee: string; +} + +interface ApiBidInfo { + project_name: string; + bid_date: string; + site_count: number; + construction_period: string; + construction_start_date: string; + construction_end_date: string; + vat_type: string; + work_report: string; + documents: ApiBidDocument[]; +} + +interface ApiBidDocument { + id: number; + file_name: string; + file_url: string; + file_size: number; +} + +interface ApiSummaryItem { + id: number; + name: string; + quantity: number; + unit: string; + material_cost: number; + labor_cost: number; + total_cost: number; + remarks: string; +} + +interface ApiExpenseItem { + id: number; + name: string; + amount: number; + selected: boolean; +} + +interface ApiPriceAdjustmentItem { + id: number; + category: string; + unit_price: number; + coating: number; + batting: number; + box_reinforce: number; + painting: number; + total: number; +} + +interface ApiDetailItem { + id: number; + no: number; + name: string; + material: string; + width: number; + height: number; + quantity: number; + box: number; + assembly: number; + coating: number; + batting: number; + mounting: number; + fitting: number; + controller: number; + width_construction: number; + height_construction: number; + material_cost: number; + labor_cost: number; + quantity_price: number; + expense_quantity: number; + expense_total: number; + total_cost: number; + other_cost: number; + margin_cost: number; + total_price: number; + unit_price: number; + expense: number; + margin_rate: number; + unit_quantity: number; + expense_result: number; + margin_actual: number; +} + +// ======================================== +// 타입 변환 함수 +// ======================================== + +/** + * API 응답 → Estimate 타입 변환 + */ +function transformEstimate(apiData: ApiEstimate): Estimate { + return { + id: String(apiData.id), + estimateCode: apiData.estimate_code || '', + partnerId: apiData.partner_id ? String(apiData.partner_id) : '', + partnerName: apiData.partner_name || '', + projectName: apiData.project_name || '', + estimatorId: apiData.estimator_id ? String(apiData.estimator_id) : '', + estimatorName: apiData.estimator_name || '', + itemCount: apiData.item_count || 0, + estimateAmount: apiData.estimate_amount || 0, + completedDate: apiData.completed_date || null, + bidDate: apiData.bid_date || null, + status: apiData.status || 'pending', + createdAt: apiData.created_at || '', + updatedAt: apiData.updated_at || '', + createdBy: apiData.created_by || '', + }; +} + +/** + * API 응답 → EstimateDetail 타입 변환 + */ +function transformEstimateDetail(apiData: ApiEstimateDetail): EstimateDetail { + const base = transformEstimate(apiData); + + const siteBriefing: SiteBriefingInfo = apiData.site_briefing + ? { + briefingCode: apiData.site_briefing.briefing_code || '', + partnerName: apiData.site_briefing.partner_name || '', + companyName: apiData.site_briefing.company_name || '', + briefingDate: apiData.site_briefing.briefing_date || '', + attendee: apiData.site_briefing.attendee || '', + } + : { briefingCode: '', partnerName: '', companyName: '', briefingDate: '', attendee: '' }; + + const bidInfo: BidInfo = apiData.bid_info + ? { + projectName: apiData.bid_info.project_name || '', + bidDate: apiData.bid_info.bid_date || '', + siteCount: apiData.bid_info.site_count || 0, + constructionPeriod: apiData.bid_info.construction_period || '', + constructionStartDate: apiData.bid_info.construction_start_date || '', + constructionEndDate: apiData.bid_info.construction_end_date || '', + vatType: apiData.bid_info.vat_type || 'excluded', + workReport: apiData.bid_info.work_report || '', + documents: (apiData.bid_info.documents || []).map((d) => ({ + id: String(d.id), + fileName: d.file_name || '', + fileUrl: d.file_url || '', + fileSize: d.file_size || 0, + })), + } + : { + projectName: '', + bidDate: '', + siteCount: 0, + constructionPeriod: '', + constructionStartDate: '', + constructionEndDate: '', + vatType: 'excluded', + workReport: '', + documents: [], + }; + + const summaryItems: EstimateSummaryItem[] = (apiData.summary_items || []).map((item) => ({ + id: String(item.id), + name: item.name || '', + quantity: item.quantity || 0, + unit: item.unit || '', + materialCost: item.material_cost || 0, + laborCost: item.labor_cost || 0, + totalCost: item.total_cost || 0, + remarks: item.remarks || '', + })); + + const expenseItems: ExpenseItem[] = (apiData.expense_items || []).map((item) => ({ + id: String(item.id), + name: item.name || '', + amount: item.amount || 0, + selected: item.selected || false, + })); + + const priceAdjustments: PriceAdjustmentItem[] = (apiData.price_adjustments || []).map((item) => ({ + id: String(item.id), + category: item.category || '', + unitPrice: item.unit_price || 0, + coating: item.coating || 0, + batting: item.batting || 0, + boxReinforce: item.box_reinforce || 0, + painting: item.painting || 0, + total: item.total || 0, + })); + + const detailItems: EstimateDetailItem[] = (apiData.detail_items || []).map((item) => ({ + id: String(item.id), + no: item.no || 0, + name: item.name || '', + material: item.material || '', + width: item.width || 0, + height: item.height || 0, + quantity: item.quantity || 0, + box: item.box || 0, + assembly: item.assembly || 0, + coating: item.coating || 0, + batting: item.batting || 0, + mounting: item.mounting || 0, + fitting: item.fitting || 0, + controller: item.controller || 0, + widthConstruction: item.width_construction || 0, + heightConstruction: item.height_construction || 0, + materialCost: item.material_cost || 0, + laborCost: item.labor_cost || 0, + quantityPrice: item.quantity_price || 0, + expenseQuantity: item.expense_quantity || 0, + expenseTotal: item.expense_total || 0, + totalCost: item.total_cost || 0, + otherCost: item.other_cost || 0, + marginCost: item.margin_cost || 0, + totalPrice: item.total_price || 0, + unitPrice: item.unit_price || 0, + expense: item.expense || 0, + marginRate: item.margin_rate || 0, + unitQuantity: item.unit_quantity || 0, + expenseResult: item.expense_result || 0, + marginActual: item.margin_actual || 0, + })); + + return { + ...base, + siteBriefing, + bidInfo, + summaryItems, + expenseItems, + priceAdjustments, + detailItems, + }; +} + +/** + * EstimateDetailFormData → API 요청 데이터 변환 + */ +function transformToApiRequest(data: Partial): Record { + const apiData: Record = {}; + + if (data.estimateCode !== undefined) apiData.estimate_code = data.estimateCode; + if (data.estimatorId !== undefined) apiData.estimator_id = data.estimatorId || null; + if (data.estimatorName !== undefined) apiData.estimator_name = data.estimatorName || null; + if (data.estimateAmount !== undefined) apiData.estimate_amount = data.estimateAmount; + if (data.status !== undefined) apiData.status = data.status; + + if (data.siteBriefing !== undefined) { + apiData.site_briefing = { + briefing_code: data.siteBriefing.briefingCode, + partner_name: data.siteBriefing.partnerName, + company_name: data.siteBriefing.companyName, + briefing_date: data.siteBriefing.briefingDate, + attendee: data.siteBriefing.attendee, + }; + } + + if (data.bidInfo !== undefined) { + apiData.bid_info = { + project_name: data.bidInfo.projectName, + bid_date: data.bidInfo.bidDate, + site_count: data.bidInfo.siteCount, + construction_period: data.bidInfo.constructionPeriod, + construction_start_date: data.bidInfo.constructionStartDate, + construction_end_date: data.bidInfo.constructionEndDate, + vat_type: data.bidInfo.vatType, + work_report: data.bidInfo.workReport, + }; + } + + return apiData; +} + +// ======================================== +// API 함수 +// ======================================== + +/** + * 견적 목록 조회 + * GET /api/v1/estimates + */ +export async function getEstimateList(filter?: EstimateFilter): Promise<{ + success: boolean; + data?: EstimateListResponse; + error?: string; +}> { try { - let filtered = [...mockEstimates]; + const queryParams: Record = {}; - // 검색 필터 - if (filter?.search) { - const search = filter.search.toLowerCase(); - filtered = filtered.filter( - (e) => - e.projectName.toLowerCase().includes(search) || - e.estimateCode.toLowerCase().includes(search) || - e.partnerName.toLowerCase().includes(search) - ); - } + // 검색 + if (filter?.search) queryParams.search = filter.search; - // 상태 필터 - if (filter?.status && filter.status !== 'all') { - filtered = filtered.filter((e) => e.status === filter.status); - } + // 필터 + if (filter?.status && filter.status !== 'all') queryParams.status = filter.status; + if (filter?.partnerId) queryParams.partner_id = filter.partnerId; + if (filter?.estimatorId) queryParams.estimator_id = filter.estimatorId; - // 거래처 필터 - if (filter?.partnerId) { - filtered = filtered.filter((e) => e.partnerId === filter.partnerId); - } + // 날짜 범위 + if (filter?.startDate) queryParams.start_date = filter.startDate; + if (filter?.endDate) queryParams.end_date = filter.endDate; - // 견적자 필터 - if (filter?.estimatorId) { - filtered = filtered.filter((e) => e.estimatorId === filter.estimatorId); - } - - // 날짜 필터 - if (filter?.startDate) { - filtered = filtered.filter((e) => e.createdAt >= filter.startDate!); - } - if (filter?.endDate) { - filtered = filtered.filter((e) => e.createdAt <= filter.endDate!); - } + // 페이지네이션 + if (filter?.page) queryParams.page = String(filter.page); + if (filter?.size) queryParams.per_page = String(filter.size); // 정렬 if (filter?.sortBy) { - switch (filter.sortBy) { - case 'latest': - filtered.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()); - break; - case 'oldest': - filtered.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime()); - break; - case 'amountDesc': - filtered.sort((a, b) => b.estimateAmount - a.estimateAmount); - break; - case 'amountAsc': - filtered.sort((a, b) => a.estimateAmount - b.estimateAmount); - break; - case 'bidDateDesc': - filtered.sort((a, b) => { - if (!a.bidDate) return 1; - if (!b.bidDate) return -1; - return new Date(b.bidDate).getTime() - new Date(a.bidDate).getTime(); - }); - break; + const sortMap: Record = { + latest: { field: 'created_at', dir: 'desc' }, + oldest: { field: 'created_at', dir: 'asc' }, + amountDesc: { field: 'estimate_amount', dir: 'desc' }, + amountAsc: { field: 'estimate_amount', dir: 'asc' }, + bidDateDesc: { field: 'bid_date', dir: 'desc' }, + partnerNameAsc: { field: 'partner_name', dir: 'asc' }, + partnerNameDesc: { field: 'partner_name', dir: 'desc' }, + projectNameAsc: { field: 'project_name', dir: 'asc' }, + projectNameDesc: { field: 'project_name', dir: 'desc' }, + }; + const sort = sortMap[filter.sortBy]; + if (sort) { + queryParams.sort_by = sort.field; + queryParams.sort_dir = sort.dir; } } - const page = filter?.page ?? 1; - const size = filter?.size ?? 20; - const start = (page - 1) * size; - const paginatedItems = filtered.slice(start, start + size); + const response = await apiClient.get<{ + data: ApiEstimate[]; + current_page: number; + per_page: number; + total: number; + last_page: number; + }>('/estimates', { params: queryParams }); + + const items = (response.data || []).map(transformEstimate); return { success: true, data: { - items: paginatedItems, - total: filtered.length, - page, - size, - totalPages: Math.ceil(filtered.length / size), + items, + total: response.total || 0, + page: response.current_page || 1, + size: response.per_page || 20, + totalPages: response.last_page || 1, }, }; } catch (error) { - console.error('getEstimateList error:', error); - return { success: false, error: '견적 목록 조회에 실패했습니다.' }; + console.error('견적 목록 조회 오류:', error); + return { success: false, error: '견적 목록을 불러오는데 실패했습니다.' }; } } -// 견적 상세 조회 -export async function getEstimate( - id: string -): Promise<{ success: boolean; data?: Estimate; error?: string }> { +/** + * 견적 단건 조회 + * GET /api/v1/estimates/{id} + */ +export async function getEstimate(id: string): Promise<{ + success: boolean; + data?: Estimate; + error?: string; +}> { try { - const estimate = mockEstimates.find((e) => e.id === id); - - if (!estimate) { - return { success: false, error: '견적을 찾을 수 없습니다.' }; - } - - return { success: true, data: estimate }; + const response = await apiClient.get(`/estimates/${id}`); + return { success: true, data: transformEstimate(response) }; } catch (error) { - console.error('getEstimate error:', error); - return { success: false, error: '견적 조회에 실패했습니다.' }; + console.error('견적 조회 오류:', error); + return { success: false, error: '견적 정보를 찾을 수 없습니다.' }; } } -// 견적 통계 조회 -export async function getEstimateStats(): Promise<{ success: boolean; data?: EstimateStats; error?: string }> { +/** + * 견적 상세 조회 (첨부 정보 포함) + * GET /api/v1/estimates/{id}/detail + */ +export async function getEstimateDetail(id: string): Promise<{ + success: boolean; + data?: EstimateDetail; + error?: string; +}> { try { - const total = mockEstimates.length; - const pending = mockEstimates.filter((e) => e.status === 'pending').length; - const completed = mockEstimates.filter((e) => e.status === 'completed').length; + const response = await apiClient.get(`/estimates/${id}`); + return { success: true, data: transformEstimateDetail(response) }; + } catch (error) { + console.error('견적 상세 조회 오류:', error); + return { success: false, error: '견적 상세 정보를 불러오는데 실패했습니다.' }; + } +} + +/** + * 견적 통계 조회 + * GET /api/v1/estimates/stats + */ +export async function getEstimateStats(): Promise<{ + success: boolean; + data?: EstimateStats; + error?: string; +}> { + try { + const response = await apiClient.get('/estimates/stats'); return { success: true, data: { - total, - pending, - completed, + total: response.total_count || 0, + pending: response.pending_count || 0, + completed: response.completed_count || 0, }, }; } catch (error) { - console.error('getEstimateStats error:', error); - return { success: false, error: '통계 조회에 실패했습니다.' }; + console.error('견적 통계 조회 오류:', error); + return { success: false, error: '통계를 불러오는데 실패했습니다.' }; } } -// 견적 삭제 -export async function deleteEstimate(id: string): Promise<{ success: boolean; error?: string }> { +/** + * 견적 등록 + * POST /api/v1/estimates + */ +export async function createEstimate(data: EstimateDetailFormData): Promise<{ + success: boolean; + data?: Estimate; + error?: string; +}> { try { - console.log('Delete estimate:', id); + const apiData = transformToApiRequest(data); + const response = await apiClient.post('/estimates', apiData); + return { success: true, data: transformEstimate(response) }; + } catch (error) { + console.error('견적 등록 오류:', error); + return { success: false, error: '견적 등록에 실패했습니다.' }; + } +} + +/** + * 견적 수정 + * PUT /api/v1/estimates/{id} + */ +export async function updateEstimate( + id: string, + data: Partial +): Promise<{ + success: boolean; + data?: Estimate; + error?: string; +}> { + try { + const apiData = transformToApiRequest(data); + const response = await apiClient.put(`/estimates/${id}`, apiData); + return { success: true, data: transformEstimate(response) }; + } catch (error) { + console.error('견적 수정 오류:', error); + return { success: false, error: '견적 수정에 실패했습니다.' }; + } +} + +/** + * 견적 삭제 + * DELETE /api/v1/estimates/{id} + */ +export async function deleteEstimate(id: string): Promise<{ + success: boolean; + error?: string; +}> { + try { + await apiClient.delete(`/estimates/${id}`); return { success: true }; } catch (error) { - console.error('deleteEstimate error:', error); + console.error('견적 삭제 오류:', error); return { success: false, error: '견적 삭제에 실패했습니다.' }; } } -// 견적 일괄 삭제 -export async function deleteEstimates(ids: string[]): Promise<{ success: boolean; deletedCount?: number; error?: string }> { +/** + * 견적 일괄 삭제 + * DELETE /api/v1/estimates/bulk + */ +export async function deleteEstimates(ids: string[]): Promise<{ + success: boolean; + deletedCount?: number; + error?: string; +}> { try { - console.log('Delete estimates:', ids); + await apiClient.delete('/estimates/bulk', { + data: { ids: ids.map((id) => Number(id)) }, + }); return { success: true, deletedCount: ids.length }; } catch (error) { - console.error('deleteEstimates error:', error); + console.error('견적 일괄 삭제 오류:', error); return { success: false, error: '일괄 삭제에 실패했습니다.' }; } } \ No newline at end of file diff --git a/src/components/business/construction/pricing-management/actions.ts b/src/components/business/construction/pricing-management/actions.ts index 9b07f1b5..6ab333ae 100644 --- a/src/components/business/construction/pricing-management/actions.ts +++ b/src/components/business/construction/pricing-management/actions.ts @@ -1,388 +1,378 @@ 'use server'; -import type { Pricing, PricingStats } from './types'; +import type { + Pricing, + PricingStats, + PricingListResponse, + PricingFilter, + PricingFormData, +} from './types'; +import { apiClient } from '@/lib/api'; -// ===== 목데이터 ===== -const mockPricingList: Pricing[] = [ - { - id: '1', - pricingNumber: 'PRC-2026-001', - itemType: '박스', - category: '슬라이드 OPEN 사이즈', - itemName: '슬라이드 도어 세트', - spec: '1200x2400', - orderItems: [ - { id: 'oi1', name: '무게', value: '400KG' }, - { id: 'oi2', name: '두께', value: '50mm' }, - ], - unit: 'SET', - division: '일반', - vendor: '(주)슬라이드텍', - purchasePrice: 850000, - marginRate: 15, - sellingPrice: 977500, - status: 'in_use', - createdAt: '2026-01-02', - }, - { - id: '2', - pricingNumber: 'PRC-2026-002', - itemType: '부속', - category: '모터', - itemName: '서보모터 750W', - spec: 'AC220V', - orderItems: [ - { id: 'oi3', name: '무게', value: '12KG' }, - ], - unit: 'EA', - division: '일반', - vendor: '삼성전기', - purchasePrice: 320000, - marginRate: 20, - sellingPrice: 384000, - status: 'in_use', - createdAt: '2026-01-02', - }, - { - id: '3', - pricingNumber: 'PRC-2026-003', - itemType: '소모품', - category: '공정자재', - itemName: '용접봉 E7016', - spec: '4.0mm x 350mm', - orderItems: [ - { id: 'oi4', name: '무게', value: '5KG' }, - ], - unit: 'BOX', - division: '일반', - vendor: '현대용접산업', - purchasePrice: 45000, - marginRate: 25, - sellingPrice: 56250, - status: 'in_use', - createdAt: '2026-01-03', - }, - { - id: '4', - pricingNumber: 'PRC-2026-004', - itemType: '공과', - category: '철물', - itemName: '앵커볼트 세트', - spec: 'M12 x 100', - orderItems: [ - { id: 'oi5', name: '무게', value: '500G' }, - ], - unit: 'SET', - division: '특수', - vendor: '철강볼트', - purchasePrice: 12000, - marginRate: 30, - sellingPrice: 15600, - status: 'in_use', - createdAt: '2026-01-03', - }, - { - id: '5', - pricingNumber: 'PRC-2026-005', - itemType: '박스', - category: '슬라이드 OPEN 사이즈', - itemName: '자동문 프레임', - spec: '900x2100', - orderItems: [ - { id: 'oi6', name: '무게', value: '280KG' }, - { id: 'oi7', name: '두께', value: '40mm' }, - ], - unit: 'SET', - division: '일반', - vendor: '(주)슬라이드텍', - purchasePrice: 650000, - marginRate: 18, - sellingPrice: 767000, - status: 'not_registered', - createdAt: '2026-01-04', - }, - { - id: '6', - pricingNumber: 'PRC-2026-006', - itemType: '부속', - category: '모터', - itemName: '기어드모터 1.5KW', - spec: 'AC380V', - orderItems: [ - { id: 'oi8', name: '무게', value: '25KG' }, - ], - unit: 'EA', - division: '특수', - vendor: '삼성전기', - purchasePrice: 580000, - marginRate: 22, - sellingPrice: 707600, - status: 'in_use', - createdAt: '2026-01-04', - }, - { - id: '7', - pricingNumber: 'PRC-2026-007', - itemType: '소모품', - category: '공정자재', - itemName: '절삭유 WS-300', - spec: '20L', - orderItems: [], - unit: 'CAN', - division: '일반', - vendor: '한국윤활유', - purchasePrice: 85000, - marginRate: 15, - sellingPrice: 97750, - status: 'not_registered', - createdAt: '2026-01-05', - }, - { - id: '8', - pricingNumber: 'PRC-2026-008', - itemType: '공과', - category: '철물', - itemName: '스테인레스 볼트', - spec: 'M10 x 50', - orderItems: [ - { id: 'oi9', name: '무게', value: '200G' }, - ], - unit: 'BOX', - division: '일반', - vendor: '철강볼트', - purchasePrice: 35000, - marginRate: 28, - sellingPrice: 44800, - status: 'in_use', - createdAt: '2026-01-05', - }, -]; +/** + * 주일 기업 - 단가관리 Server Actions + * 표준화된 apiClient 사용 버전 + */ -// ===== 단가 목록 조회 ===== -export async function getPricingList(params?: { - startDate?: string; - endDate?: string; - itemType?: string; - category?: string; - spec?: string; - division?: string; - status?: string; - sort?: string; - search?: string; -}): Promise<{ +// ======================================== +// API 응답 타입 +// ======================================== + +interface ApiPricing { + id: number; + pricing_number: string; + item_type: string | null; + category: string | null; + item_name: string; + spec: string | null; + order_items: ApiOrderItem[] | null; + unit: string | null; + division: string | null; + vendor: string | null; + vendor_id: number | null; + purchase_price: number; + margin_rate: number; + selling_price: number; + status: 'in_use' | 'stopped' | 'not_registered'; + created_at: string; + updated_at: string; +} + +interface ApiOrderItem { + id: number; + name: string; + value: string; +} + +interface ApiPricingStats { + total: number; + in_use: number; + stopped: number; + not_registered: number; +} + +interface ApiVendor { + id: number; + name: string; + business_no: string | null; +} + +// ======================================== +// 타입 변환 함수 +// ======================================== + +/** + * API 응답 → Pricing 타입 변환 + */ +function transformPricing(apiData: ApiPricing): Pricing { + return { + id: String(apiData.id), + pricingNumber: apiData.pricing_number || '', + itemType: apiData.item_type || '', + category: apiData.category || '', + itemName: apiData.item_name || '', + spec: apiData.spec || '', + orderItems: (apiData.order_items || []).map((item) => ({ + id: String(item.id), + name: item.name || '', + value: item.value || '', + })), + unit: apiData.unit || '', + division: apiData.division || '', + vendor: apiData.vendor || '', + purchasePrice: apiData.purchase_price || 0, + marginRate: apiData.margin_rate || 0, + sellingPrice: apiData.selling_price || 0, + status: apiData.status || 'not_registered', + createdAt: apiData.created_at || '', + updatedAt: apiData.updated_at || '', + }; +} + +/** + * PricingFormData → API 요청 데이터 변환 + */ +function transformToApiRequest(data: Partial): Record { + const apiData: Record = {}; + + if (data.itemType !== undefined) apiData.item_type = data.itemType || null; + if (data.category !== undefined) apiData.category = data.category || null; + if (data.itemName !== undefined) apiData.item_name = data.itemName; + if (data.spec !== undefined) apiData.spec = data.spec || null; + if (data.unit !== undefined) apiData.unit = data.unit || null; + if (data.division !== undefined) apiData.division = data.division || null; + if (data.vendor !== undefined) apiData.vendor = data.vendor || null; + if (data.purchasePrice !== undefined) apiData.purchase_price = data.purchasePrice; + if (data.marginRate !== undefined) apiData.margin_rate = data.marginRate; + if (data.sellingPrice !== undefined) apiData.selling_price = data.sellingPrice; + if (data.status !== undefined) apiData.status = data.status; + + // 주문 항목 변환 + if (data.orderItems !== undefined) { + apiData.order_items = data.orderItems.map((item) => ({ + name: item.name, + value: item.value, + })); + } + + return apiData; +} + +// ======================================== +// API 함수 +// ======================================== + +/** + * 단가 목록 조회 + * GET /api/v1/pricing + */ +export async function getPricingList(filter?: PricingFilter): Promise<{ success: boolean; - data?: { items: Pricing[]; total: number }; + data?: PricingListResponse; error?: string; }> { try { - let filtered = [...mockPricingList]; + const queryParams: Record = {}; - // 품목유형 필터 - if (params?.itemType && params.itemType !== 'all') { - const typeMap: Record = { - box: '박스', - parts: '부속', - consumables: '소모품', - utility: '공과', - }; - filtered = filtered.filter(p => p.itemType === typeMap[params.itemType!]); - } + // 검색 + if (filter?.search) queryParams.search = filter.search; - // 카테고리 필터 - if (params?.category && params.category !== 'all') { - const categoryMap: Record = { - slide_open: '슬라이드 OPEN 사이즈', - motor: '모터', - process_material: '공정자재', - hardware: '철물', - }; - filtered = filtered.filter(p => p.category === categoryMap[params.category!]); - } + // 필터 + if (filter?.status && filter.status !== 'all') queryParams.status = filter.status; + if (filter?.itemType && filter.itemType !== 'all') queryParams.item_type = filter.itemType; + if (filter?.category && filter.category !== 'all') queryParams.category = filter.category; + if (filter?.division && filter.division !== 'all') queryParams.division = filter.division; - // 구분 필터 - if (params?.division && params.division !== 'all') { - const divisionMap: Record = { - general: '일반', - special: '특수', - }; - filtered = filtered.filter(p => p.division === divisionMap[params.division!]); - } - - // 검색 필터 - if (params?.search) { - const search = params.search.toLowerCase(); - filtered = filtered.filter(p => - p.pricingNumber.toLowerCase().includes(search) || - p.itemName.toLowerCase().includes(search) || - p.category.toLowerCase().includes(search) || - p.vendor.toLowerCase().includes(search) - ); - } + // 페이지네이션 + if (filter?.page) queryParams.page = String(filter.page); + if (filter?.size) queryParams.per_page = String(filter.size); // 정렬 - if (params?.sort === 'oldest') { - filtered.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime()); - } else if (params?.sort === 'price_high') { - filtered.sort((a, b) => b.sellingPrice - a.sellingPrice); - } else if (params?.sort === 'price_low') { - filtered.sort((a, b) => a.sellingPrice - b.sellingPrice); - } else { - filtered.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()); + if (filter?.sortBy) { + const sortMap: Record = { + latest: { field: 'created_at', dir: 'desc' }, + oldest: { field: 'created_at', dir: 'asc' }, + itemNameAsc: { field: 'item_name', dir: 'asc' }, + itemNameDesc: { field: 'item_name', dir: 'desc' }, + priceAsc: { field: 'selling_price', dir: 'asc' }, + priceDesc: { field: 'selling_price', dir: 'desc' }, + price_high: { field: 'selling_price', dir: 'desc' }, + price_low: { field: 'selling_price', dir: 'asc' }, + }; + const sort = sortMap[filter.sortBy]; + if (sort) { + queryParams.sort_by = sort.field; + queryParams.sort_dir = sort.dir; + } } + const response = await apiClient.get<{ + data: ApiPricing[]; + current_page: number; + per_page: number; + total: number; + last_page: number; + }>('/pricing', { params: queryParams }); + + const items = (response.data || []).map(transformPricing); + return { success: true, data: { - items: filtered, - total: filtered.length, + items, + total: response.total || 0, + page: response.current_page || 1, + size: response.per_page || 20, + totalPages: response.last_page || 1, }, }; } catch (error) { - console.error('[getPricingList] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; + console.error('단가 목록 조회 오류:', error); + return { success: false, error: '단가 목록을 불러오는데 실패했습니다.' }; } } -// ===== 통계 조회 ===== +/** + * 단가 통계 조회 + * GET /api/v1/pricing/stats + */ export async function getPricingStats(): Promise<{ success: boolean; data?: PricingStats; error?: string; }> { try { - const stats: PricingStats = { - total: mockPricingList.length, - inUse: mockPricingList.filter(p => p.status === 'in_use').length, - notRegistered: mockPricingList.filter(p => p.status === 'not_registered').length, + const response = await apiClient.get('/pricing/stats'); + + return { + success: true, + data: { + total: response.total || 0, + inUse: response.in_use || 0, + notRegistered: response.not_registered || 0, + }, }; - - return { success: true, data: stats }; } catch (error) { - console.error('[getPricingStats] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; + console.error('단가 통계 조회 오류:', error); + return { success: false, error: '통계를 불러오는데 실패했습니다.' }; } } -// ===== 단일 삭제 ===== -export async function deletePricing(id: string): Promise<{ - success: boolean; - error?: string; -}> { - try { - // 목데이터에서는 실제 삭제하지 않음 - const index = mockPricingList.findIndex(p => p.id === id); - if (index === -1) { - return { success: false, error: '단가를 찾을 수 없습니다.' }; - } - - return { success: true }; - } catch (error) { - console.error('[deletePricing] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } -} - -// ===== 일괄 삭제 ===== -export async function deletePricings(ids: string[]): Promise<{ - success: boolean; - deletedCount?: number; - error?: string; -}> { - try { - return { success: true, deletedCount: ids.length }; - } catch (error) { - console.error('[deletePricings] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } -} - -// ===== 단가 상세 조회 ===== +/** + * 단가 상세 조회 + * GET /api/v1/pricing/{id} + */ export async function getPricingDetail(id: string): Promise<{ success: boolean; data?: Pricing; error?: string; }> { try { - const pricing = mockPricingList.find(p => p.id === id); - if (!pricing) { - return { success: false, error: '단가를 찾을 수 없습니다.' }; - } - return { success: true, data: pricing }; + const response = await apiClient.get(`/pricing/${id}`); + return { success: true, data: transformPricing(response) }; } catch (error) { - console.error('[getPricingDetail] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; + console.error('단가 상세 조회 오류:', error); + return { success: false, error: '단가 정보를 찾을 수 없습니다.' }; } } -// ===== 단가 생성 ===== -export async function createPricing(data: Omit): Promise<{ +/** + * 단가 등록 + * POST /api/v1/pricing + */ +export async function createPricing(data: PricingFormData): Promise<{ success: boolean; data?: Pricing; error?: string; }> { try { - const newId = String(mockPricingList.length + 1); - const newPricingNumber = `PRC-2026-${String(mockPricingList.length + 1).padStart(3, '0')}`; - - const newPricing: Pricing = { - ...data, - id: newId, - pricingNumber: newPricingNumber, - createdAt: new Date().toISOString().split('T')[0], - }; - - // 목데이터에는 추가하지 않음 (실제 API 연동 시 DB에 저장) - return { success: true, data: newPricing }; + const apiData = transformToApiRequest(data); + const response = await apiClient.post('/pricing', apiData); + return { success: true, data: transformPricing(response) }; } catch (error) { - console.error('[createPricing] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; + console.error('단가 등록 오류:', error); + return { success: false, error: '단가 등록에 실패했습니다.' }; } } -// ===== 단가 수정 ===== -export async function updatePricing(id: string, data: Partial): Promise<{ +/** + * 단가 수정 + * PUT /api/v1/pricing/{id} + */ +export async function updatePricing( + id: string, + data: Partial +): Promise<{ success: boolean; data?: Pricing; error?: string; }> { try { - const index = mockPricingList.findIndex(p => p.id === id); - if (index === -1) { - return { success: false, error: '단가를 찾을 수 없습니다.' }; - } - - const updatedPricing: Pricing = { - ...mockPricingList[index], - ...data, - updatedAt: new Date().toISOString().split('T')[0], - }; - - // 목데이터에는 수정하지 않음 (실제 API 연동 시 DB에 업데이트) - return { success: true, data: updatedPricing }; + const apiData = transformToApiRequest(data); + const response = await apiClient.put(`/pricing/${id}`, apiData); + return { success: true, data: transformPricing(response) }; } catch (error) { - console.error('[updatePricing] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; + console.error('단가 수정 오류:', error); + return { success: false, error: '단가 수정에 실패했습니다.' }; } } -// ===== 거래처 목록 조회 (발주처) ===== +/** + * 단가 삭제 + * DELETE /api/v1/pricing/{id} + */ +export async function deletePricing(id: string): Promise<{ + success: boolean; + error?: string; +}> { + try { + await apiClient.delete(`/pricing/${id}`); + return { success: true }; + } catch (error) { + console.error('단가 삭제 오류:', error); + return { success: false, error: '단가 삭제에 실패했습니다.' }; + } +} + +/** + * 단가 일괄 삭제 + * DELETE /api/v1/pricing/bulk + */ +export async function deletePricings(ids: string[]): Promise<{ + success: boolean; + deletedCount?: number; + error?: string; +}> { + try { + await apiClient.delete('/pricing/bulk', { + data: { ids: ids.map((id) => Number(id)) }, + }); + return { success: true, deletedCount: ids.length }; + } catch (error) { + console.error('단가 일괄 삭제 오류:', error); + return { success: false, error: '일괄 삭제에 실패했습니다.' }; + } +} + +/** + * 거래처(벤더) 목록 조회 + * GET /api/v1/clients (거래처 API 재사용) + */ export async function getVendorList(): Promise<{ success: boolean; data?: { id: string; name: string }[]; error?: string; }> { try { - // 목데이터에서 거래처 추출 - const vendors = [ - { id: '1', name: '(주)슬라이드텍' }, - { id: '2', name: '삼성전기' }, - { id: '3', name: '현대용접산업' }, - { id: '4', name: '철강볼트' }, - { id: '5', name: '한국윤활유' }, - ]; + const response = await apiClient.get<{ + data: ApiVendor[]; + }>('/clients', { params: { per_page: '100' } }); + + const vendors = (response.data || []).map((v) => ({ + id: String(v.id), + name: v.name || '', + })); + return { success: true, data: vendors }; } catch (error) { - console.error('[getVendorList] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; + console.error('거래처 목록 조회 오류:', error); + return { success: false, error: '거래처 목록을 불러오는데 실패했습니다.' }; + } +} + +/** + * 단가 확정 + * POST /api/v1/pricing/{id}/finalize + */ +export async function finalizePricing(id: string): Promise<{ + success: boolean; + data?: Pricing; + error?: string; +}> { + try { + const response = await apiClient.post(`/pricing/${id}/finalize`); + return { success: true, data: transformPricing(response) }; + } catch (error) { + console.error('단가 확정 오류:', error); + return { success: false, error: '단가 확정에 실패했습니다.' }; + } +} + +/** + * 단가 변경이력 조회 + * GET /api/v1/pricing/{id}/revisions + */ +export async function getPricingRevisions(id: string): Promise<{ + success: boolean; + data?: Pricing[]; + error?: string; +}> { + try { + const response = await apiClient.get<{ data: ApiPricing[] }>(`/pricing/${id}/revisions`); + const revisions = (response.data || []).map(transformPricing); + return { success: true, data: revisions }; + } catch (error) { + console.error('단가 변경이력 조회 오류:', error); + return { success: false, error: '변경이력을 불러오는데 실패했습니다.' }; } } \ No newline at end of file diff --git a/src/components/business/construction/pricing-management/types.ts b/src/components/business/construction/pricing-management/types.ts index 6b972189..81c0f601 100644 --- a/src/components/business/construction/pricing-management/types.ts +++ b/src/components/business/construction/pricing-management/types.ts @@ -39,6 +39,44 @@ export interface PricingStats { notRegistered: number; // 미등록 단가 } +// 목록 응답 +export interface PricingListResponse { + items: Pricing[]; + total: number; + page: number; + size: number; + totalPages: number; +} + +// 필터 파라미터 +export interface PricingFilter { + search?: string; + status?: string; + itemType?: string; + category?: string; + division?: string; + spec?: string; + page?: number; + size?: number; + sortBy?: string; +} + +// 폼 데이터 +export interface PricingFormData { + itemType: string; + category: string; + itemName: string; + spec: string; + orderItems: OrderItem[]; + unit: string; + division: string; + vendor: string; + purchasePrice: number; + marginRate: number; + sellingPrice: number; + status: PricingStatus; +} + // ===== 필터 옵션 ===== // 품목유형 옵션 From 626c138fd26434f8c65c181a383b9a1bbab1af6c Mon Sep 17 00:00:00 2001 From: kent Date: Fri, 9 Jan 2026 21:27:08 +0900 Subject: [PATCH 22/45] =?UTF-8?q?fix:=20=EC=88=98=EC=A3=BC=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=EB=AA=A9=EB=A1=9D=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=EC=84=9C=EB=B2=84=20=EC=97=90=EB=9F=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - page.tsx: API 응답 데이터 구조 수정 (ordersResult.data → ordersResult.data.items) - actions.ts: Quote 필드명 수정 (quote_no → quote_number) --- .../[locale]/(protected)/sales/order-management-sales/page.tsx | 2 +- src/components/orders/actions.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/[locale]/(protected)/sales/order-management-sales/page.tsx b/src/app/[locale]/(protected)/sales/order-management-sales/page.tsx index d01275aa..f788b144 100644 --- a/src/app/[locale]/(protected)/sales/order-management-sales/page.tsx +++ b/src/app/[locale]/(protected)/sales/order-management-sales/page.tsx @@ -117,7 +117,7 @@ export default function OrderManagementSalesPage() { ]); if (ordersResult.success && ordersResult.data) { - setOrders(ordersResult.data); + setOrders(ordersResult.data.items); } else { toast.error(ordersResult.error || "수주 목록을 불러오는데 실패했습니다."); } diff --git a/src/components/orders/actions.ts b/src/components/orders/actions.ts index 6a5dd22a..79d3dffc 100644 --- a/src/components/orders/actions.ts +++ b/src/components/orders/actions.ts @@ -381,7 +381,7 @@ function transformApiToFrontend(apiData: ApiOrder): Order { return { id: String(apiData.id), lotNumber: apiData.order_no, - quoteNumber: apiData.quote?.quote_no || '', + quoteNumber: apiData.quote?.quote_number || '', quoteId: apiData.quote_id ?? undefined, orderDate: apiData.received_at || apiData.created_at.split('T')[0], client: apiData.client_name || apiData.client?.name || '', From ae90bd7c52a4cdcaa4cf3dd1ed8bda2e8413d901 Mon Sep 17 00:00:00 2001 From: kent Date: Fri, 9 Jan 2026 21:31:42 +0900 Subject: [PATCH 23/45] =?UTF-8?q?feat(construction):=20=EA=B5=AC=EC=A1=B0?= =?UTF-8?q?=EA=B2=80=ED=86=A0=EA=B4=80=EB=A6=AC=20Frontend=20API=20?= =?UTF-8?q?=EC=97=B0=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Mock 데이터 제거 - apiClient 기반 실제 API 호출로 전환 - 타입 변환 함수 구현 (snake_case ↔ camelCase) API Functions: - getStructureReviewList: 목록 조회 + 검색/필터/정렬/페이지네이션 - getStructureReviewStats: 통계 조회 - getStructureReview: 상세 조회 - createStructureReview: 생성 - updateStructureReview: 수정 - deleteStructureReview: 단일 삭제 - deleteStructureReviews: 일괄 삭제 --- .../construction/structure-review/actions.ts | 422 +++++++++++------- 1 file changed, 252 insertions(+), 170 deletions(-) diff --git a/src/components/business/construction/structure-review/actions.ts b/src/components/business/construction/structure-review/actions.ts index 5717198a..e5f5f952 100644 --- a/src/components/business/construction/structure-review/actions.ts +++ b/src/components/business/construction/structure-review/actions.ts @@ -1,184 +1,256 @@ 'use server'; -import type { StructureReview, StructureReviewStats } from './types'; +import type { StructureReview, StructureReviewStats, StructureReviewStatus } from './types'; +import { apiClient } from '@/lib/api'; -// 목업 데이터 -const MOCK_STRUCTURE_REVIEWS: StructureReview[] = [ - { - id: '1', - reviewNumber: '123123', - partnerId: '1', - partnerName: '회사명', - siteId: '1', - siteName: '현장명', - requestDate: '2025-12-12', - reviewCompany: '회사명', - reviewerName: '홍길동', - reviewDate: '2025-12-15', - completionDate: '2025-12-15', - status: 'pending', - createdAt: '2025-12-01T00:00:00Z', - updatedAt: '2025-12-01T00:00:00Z', - }, - { - id: '2', - reviewNumber: '123123', - partnerId: '1', - partnerName: '회사명', - siteId: '2', - siteName: '현장명', - requestDate: '2025-12-12', - reviewCompany: '회사명', - reviewerName: '홍길동', - reviewDate: '2025-12-15', - completionDate: null, - status: 'pending', - createdAt: '2025-12-02T00:00:00Z', - updatedAt: '2025-12-02T00:00:00Z', - }, - { - id: '3', - reviewNumber: '123123', - partnerId: '2', - partnerName: '회사명', - siteId: '3', - siteName: '현장명', - requestDate: '2025-12-12', - reviewCompany: '회사명', - reviewerName: '홍길동', - reviewDate: null, - completionDate: null, - status: 'pending', - createdAt: '2025-12-03T00:00:00Z', - updatedAt: '2025-12-03T00:00:00Z', - }, - { - id: '4', - reviewNumber: '123123', - partnerId: '2', - partnerName: '회사명', - siteId: '4', - siteName: '현장명', - requestDate: '2025-12-12', - reviewCompany: '회사명', - reviewerName: '홍길동', - reviewDate: '2025-12-15', - completionDate: '2025-12-15', - status: 'completed', - createdAt: '2025-12-04T00:00:00Z', - updatedAt: '2025-12-04T00:00:00Z', - }, - { - id: '5', - reviewNumber: '123123', - partnerId: '3', - partnerName: '회사명', - siteId: '5', - siteName: '현장명', - requestDate: '2025-12-12', - reviewCompany: '회사명', - reviewerName: '홍길동', - reviewDate: '2025-12-15', - completionDate: '2025-12-15', - status: 'completed', - createdAt: '2025-12-05T00:00:00Z', - updatedAt: '2025-12-05T00:00:00Z', - }, -]; +/** + * 구조검토관리 Server Actions + * 표준화된 apiClient 사용 버전 + */ -// 구조검토 목록 조회 -export async function getStructureReviewList(params?: { - size?: number; - startDate?: string; - endDate?: string; -}): Promise<{ - success: boolean; - data?: { items: StructureReview[]; total: number }; - error?: string; -}> { - // TODO: API 연동 - await new Promise((resolve) => setTimeout(resolve, 500)); +// ======================================== +// API 응답 타입 +// ======================================== +interface ApiStructureReview { + id: number; + review_number: string | null; + partner_id: number | null; + partner_name: string | null; + site_id: number | null; + site_name: string | null; + request_date: string | null; + review_company: string | null; + reviewer_name: string | null; + review_date: string | null; + completion_date: string | null; + status: StructureReviewStatus; + file_url: string | null; + created_at: string; + updated_at: string; +} + +interface ApiStructureReviewStats { + total: number; + pending: number; + completed: number; +} + +// ======================================== +// 타입 변환 함수 +// ======================================== + +/** + * API 응답 → StructureReview 타입 변환 + */ +function transformStructureReview(apiData: ApiStructureReview): StructureReview { return { - success: true, - data: { - items: MOCK_STRUCTURE_REVIEWS, - total: MOCK_STRUCTURE_REVIEWS.length, - }, + id: String(apiData.id), + reviewNumber: apiData.review_number || '', + partnerId: apiData.partner_id ? String(apiData.partner_id) : '', + partnerName: apiData.partner_name || '', + siteId: apiData.site_id ? String(apiData.site_id) : '', + siteName: apiData.site_name || '', + requestDate: apiData.request_date || '', + reviewCompany: apiData.review_company || '', + reviewerName: apiData.reviewer_name || '', + reviewDate: apiData.review_date || null, + completionDate: apiData.completion_date || null, + status: apiData.status || 'pending', + fileUrl: apiData.file_url || undefined, + createdAt: apiData.created_at || '', + updatedAt: apiData.updated_at || '', }; } -// 구조검토 통계 조회 +/** + * StructureReview → API 요청 데이터 변환 + */ +function transformToApiData(data: Partial): Record { + return { + review_number: data.reviewNumber || null, + partner_id: data.partnerId ? Number(data.partnerId) : null, + partner_name: data.partnerName || null, + site_id: data.siteId ? Number(data.siteId) : null, + site_name: data.siteName || null, + request_date: data.requestDate || null, + review_company: data.reviewCompany || null, + reviewer_name: data.reviewerName || null, + review_date: data.reviewDate || null, + completion_date: data.completionDate || null, + status: data.status || 'pending', + file_url: data.fileUrl || null, + }; +} + +// ======================================== +// API 함수 +// ======================================== + +interface GetStructureReviewListParams { + size?: number; + page?: number; + startDate?: string; + endDate?: string; + search?: string; + status?: string; + partnerId?: string; + siteId?: string; + sortBy?: string; +} + +/** + * 구조검토 목록 조회 + * GET /api/v1/construction/structure-reviews + */ +export async function getStructureReviewList(params: GetStructureReviewListParams = {}): Promise<{ + success: boolean; + data?: { + items: StructureReview[]; + total: number; + page: number; + size: number; + totalPages: number; + }; + error?: string; +}> { + try { + const queryParams: Record = {}; + + // 검색 + if (params.search) queryParams.search = params.search; + + // 필터 + if (params.status && params.status !== 'all') queryParams.status = params.status; + if (params.partnerId && params.partnerId !== 'all') queryParams.partner_id = params.partnerId; + if (params.siteId && params.siteId !== 'all') queryParams.site_id = params.siteId; + + // 날짜 범위 + if (params.startDate) queryParams.start_date = params.startDate; + if (params.endDate) queryParams.end_date = params.endDate; + + // 페이지네이션 + if (params.page) queryParams.page = String(params.page); + if (params.size) queryParams.per_page = String(params.size); + + // 정렬 + if (params.sortBy) { + const sortMap: Record = { + latest: { field: 'created_at', dir: 'desc' }, + oldest: { field: 'created_at', dir: 'asc' }, + partnerNameAsc: { field: 'partner_name', dir: 'asc' }, + partnerNameDesc: { field: 'partner_name', dir: 'desc' }, + siteNameAsc: { field: 'site_name', dir: 'asc' }, + siteNameDesc: { field: 'site_name', dir: 'desc' }, + }; + const sort = sortMap[params.sortBy]; + if (sort) { + queryParams.sort_by = sort.field; + queryParams.sort_dir = sort.dir; + } + } + + const response = await apiClient.get<{ + data: ApiStructureReview[]; + current_page: number; + per_page: number; + total: number; + last_page: number; + }>('/construction/structure-reviews', { params: queryParams }); + + const items = (response.data || []).map(transformStructureReview); + + return { + success: true, + data: { + items, + total: response.total || 0, + page: response.current_page || 1, + size: response.per_page || 20, + totalPages: response.last_page || 1, + }, + }; + } catch (error) { + console.error('구조검토 목록 조회 오류:', error); + return { success: false, error: '구조검토 목록을 불러오는데 실패했습니다.' }; + } +} + +/** + * 구조검토 통계 조회 + * GET /api/v1/construction/structure-reviews/stats + */ export async function getStructureReviewStats(): Promise<{ success: boolean; data?: StructureReviewStats; error?: string; }> { - // TODO: API 연동 - await new Promise((resolve) => setTimeout(resolve, 300)); + try { + const response = await apiClient.get('/construction/structure-reviews/stats'); - const pending = MOCK_STRUCTURE_REVIEWS.filter((r) => r.status === 'pending').length; - const completed = MOCK_STRUCTURE_REVIEWS.filter((r) => r.status === 'completed').length; - - return { - success: true, - data: { - total: MOCK_STRUCTURE_REVIEWS.length, - pending, - completed, - }, - }; + return { + success: true, + data: { + total: response.total || 0, + pending: response.pending || 0, + completed: response.completed || 0, + }, + }; + } catch (error) { + console.error('구조검토 통계 조회 오류:', error); + return { success: false, error: '구조검토 통계를 불러오는데 실패했습니다.' }; + } } -// 구조검토 상세 조회 +/** + * 구조검토 상세 조회 + * GET /api/v1/construction/structure-reviews/{id} + */ export async function getStructureReview(id: string): Promise<{ success: boolean; data?: StructureReview; error?: string; }> { - // TODO: API 연동 - await new Promise((resolve) => setTimeout(resolve, 300)); + try { + const response = await apiClient.get(`/construction/structure-reviews/${id}`); - const review = MOCK_STRUCTURE_REVIEWS.find((r) => r.id === id); - - if (!review) { + return { + success: true, + data: transformStructureReview(response), + }; + } catch (error) { + console.error('구조검토 상세 조회 오류:', error); return { success: false, error: '구조검토 정보를 찾을 수 없습니다.' }; } - - return { success: true, data: review }; } -// 구조검토 생성 +/** + * 구조검토 생성 + * POST /api/v1/construction/structure-reviews + */ export async function createStructureReview(data: Partial): Promise<{ success: boolean; data?: StructureReview; error?: string; }> { - // TODO: API 연동 - await new Promise((resolve) => setTimeout(resolve, 500)); + try { + const apiData = transformToApiData(data); + const response = await apiClient.post('/construction/structure-reviews', apiData); - return { - success: true, - data: { - id: String(Date.now()), - reviewNumber: data.reviewNumber || '', - partnerId: data.partnerId || '', - partnerName: data.partnerName || '', - siteId: data.siteId || '', - siteName: data.siteName || '', - requestDate: data.requestDate || '', - reviewCompany: data.reviewCompany || '', - reviewerName: data.reviewerName || '', - reviewDate: data.reviewDate || null, - completionDate: data.completionDate || null, - status: data.status || 'pending', - createdAt: new Date().toISOString(), - updatedAt: new Date().toISOString(), - }, - }; + return { + success: true, + data: transformStructureReview(response), + }; + } catch (error) { + console.error('구조검토 생성 오류:', error); + return { success: false, error: '구조검토 등록에 실패했습니다.' }; + } } -// 구조검토 수정 +/** + * 구조검토 수정 + * PUT /api/v1/construction/structure-reviews/{id} + */ export async function updateStructureReview( id: string, data: Partial @@ -187,43 +259,53 @@ export async function updateStructureReview( data?: StructureReview; error?: string; }> { - // TODO: API 연동 - await new Promise((resolve) => setTimeout(resolve, 500)); + try { + const apiData = transformToApiData(data); + const response = await apiClient.put(`/construction/structure-reviews/${id}`, apiData); - const existing = MOCK_STRUCTURE_REVIEWS.find((r) => r.id === id); - if (!existing) { - return { success: false, error: '구조검토 정보를 찾을 수 없습니다.' }; + return { + success: true, + data: transformStructureReview(response), + }; + } catch (error) { + console.error('구조검토 수정 오류:', error); + return { success: false, error: '구조검토 수정에 실패했습니다.' }; } - - return { - success: true, - data: { - ...existing, - ...data, - updatedAt: new Date().toISOString(), - }, - }; } -// 구조검토 삭제 +/** + * 구조검토 삭제 + * DELETE /api/v1/construction/structure-reviews/{id} + */ export async function deleteStructureReview(id: string): Promise<{ success: boolean; error?: string; }> { - // TODO: API 연동 - await new Promise((resolve) => setTimeout(resolve, 500)); - - return { success: true }; + try { + await apiClient.delete(`/construction/structure-reviews/${id}`); + return { success: true }; + } catch (error) { + console.error('구조검토 삭제 오류:', error); + return { success: false, error: '구조검토 삭제에 실패했습니다.' }; + } } -// 구조검토 일괄 삭제 +/** + * 구조검토 일괄 삭제 + * DELETE /api/v1/construction/structure-reviews/bulk + */ export async function deleteStructureReviews(ids: string[]): Promise<{ success: boolean; deletedCount?: number; error?: string; }> { - // TODO: API 연동 - await new Promise((resolve) => setTimeout(resolve, 500)); - - return { success: true, deletedCount: ids.length }; + try { + await apiClient.delete('/construction/structure-reviews/bulk', { + data: { ids: ids.map((id) => Number(id)) }, + }); + return { success: true, deletedCount: ids.length }; + } catch (error) { + console.error('구조검토 일괄 삭제 오류:', error); + return { success: false, error: '구조검토 일괄 삭제에 실패했습니다.' }; + } } \ No newline at end of file From e4b5e6ae30e4fba44ed07083ab3905dd106924ab Mon Sep 17 00:00:00 2001 From: kent Date: Fri, 9 Jan 2026 22:01:47 +0900 Subject: [PATCH 24/45] =?UTF-8?q?feat(construction):=20Phase=203.1=20?= =?UTF-8?q?=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=EA=B4=80=EB=A6=AC=20API=20?= =?UTF-8?q?=EC=97=B0=EB=8F=99=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - apiClient에 patch 메서드 추가 - apiClient.get에 params 옵션 지원 추가 - updateCategory: PUT → PATCH 수정 - reorderCategories: PUT → POST 수정 --- .../category-management/actions.ts | 8 +++---- src/lib/api/client.ts | 21 +++++++++++++++++-- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/components/business/construction/category-management/actions.ts b/src/components/business/construction/category-management/actions.ts index d98aa714..0e63cfab 100644 --- a/src/components/business/construction/category-management/actions.ts +++ b/src/components/business/construction/category-management/actions.ts @@ -94,7 +94,7 @@ export async function createCategory(data: { /** * 카테고리 수정 - * PUT /api/v1/categories/{id} + * PATCH /api/v1/categories/{id} */ export async function updateCategory( id: string, @@ -105,7 +105,7 @@ export async function updateCategory( error?: string; }> { try { - const response = await apiClient.put(`/categories/${id}`, { + const response = await apiClient.patch(`/categories/${id}`, { name: data.name, }); return { success: true, data: transformCategory(response) }; @@ -161,7 +161,7 @@ export async function deleteCategory(id: string): Promise<{ /** * 카테고리 순서 변경 - * PUT /api/v1/categories/reorder + * POST /api/v1/categories/reorder */ export async function reorderCategories( items: { id: string; sort_order: number }[] @@ -170,7 +170,7 @@ export async function reorderCategories( error?: string; }> { try { - await apiClient.put('/categories/reorder', { + await apiClient.post('/categories/reorder', { items: items.map((item) => ({ id: Number(item.id), sort_order: item.sort_order, diff --git a/src/lib/api/client.ts b/src/lib/api/client.ts index 9920adcf..2bbcf814 100644 --- a/src/lib/api/client.ts +++ b/src/lib/api/client.ts @@ -102,9 +102,16 @@ export class ApiClient { /** * GET 요청 + * @param endpoint API 엔드포인트 + * @param options 쿼리 파라미터 등 옵션 */ - async get(endpoint: string): Promise { - return this.request(endpoint, { method: 'GET' }); + async get(endpoint: string, options?: { params?: Record }): Promise { + let url = endpoint; + if (options?.params) { + const searchParams = new URLSearchParams(options.params); + url = `${endpoint}?${searchParams.toString()}`; + } + return this.request(url, { method: 'GET' }); } /** @@ -127,6 +134,16 @@ export class ApiClient { }); } + /** + * PATCH 요청 + */ + async patch(endpoint: string, data?: unknown): Promise { + return this.request(endpoint, { + method: 'PATCH', + body: data ? JSON.stringify(data) : undefined, + }); + } + /** * DELETE 요청 */ From b9af603cb71dc294c1995958e53600b486288394 Mon Sep 17 00:00:00 2001 From: kent Date: Fri, 9 Jan 2026 22:07:30 +0900 Subject: [PATCH 25/45] =?UTF-8?q?feat(api):=20apiClient.delete=EC=97=90=20?= =?UTF-8?q?body=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=A7=80=EC=9B=90=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - DELETE 요청 시 body 데이터 전송 가능하도록 수정 - 일괄 삭제 기능 (bulk delete) 정상 작동 지원 - 영향 범위: 7개 모듈의 일괄 삭제 기능 Phase 3.2 품목관리 API 연동 완료 --- src/lib/api/client.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/lib/api/client.ts b/src/lib/api/client.ts index 2bbcf814..f6b65adc 100644 --- a/src/lib/api/client.ts +++ b/src/lib/api/client.ts @@ -146,9 +146,14 @@ export class ApiClient { /** * DELETE 요청 + * @param endpoint API 엔드포인트 + * @param options body 데이터 (일괄 삭제 등에서 사용) */ - async delete(endpoint: string): Promise { - return this.request(endpoint, { method: 'DELETE' }); + async delete(endpoint: string, options?: { data?: unknown }): Promise { + return this.request(endpoint, { + method: 'DELETE', + body: options?.data ? JSON.stringify(options.data) : undefined, + }); } /** From 9b1a1e3dc73ca5cab2862d3fcdda7fff2e42d790 Mon Sep 17 00:00:00 2001 From: kent Date: Fri, 9 Jan 2026 22:14:38 +0900 Subject: [PATCH 26/45] =?UTF-8?q?feat:=20[=EC=88=98=EC=A3=BC=EA=B4=80?= =?UTF-8?q?=EB=A6=AC]=20=EC=88=98=EC=A3=BC=20=EB=93=B1=EB=A1=9D=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EA=B1=B0=EB=9E=98=EC=B2=98=20API?= =?UTF-8?q?=20=EC=97=B0=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - SAMPLE_CLIENTS 하드코딩 제거 - useClientList 훅으로 실제 API 데이터 조회 - 로딩 상태 처리 ("불러오는 중...") - 견적 선택 시 발주처 필드 비활성화 --- src/components/orders/OrderRegistration.tsx | 30 ++++++++++++--------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/src/components/orders/OrderRegistration.tsx b/src/components/orders/OrderRegistration.tsx index 3585dc6b..deea1be9 100644 --- a/src/components/orders/OrderRegistration.tsx +++ b/src/components/orders/OrderRegistration.tsx @@ -13,6 +13,7 @@ import { useState, useEffect, useCallback } from "react"; import { useDaumPostcode } from "@/hooks/useDaumPostcode"; +import { useClientList } from "@/hooks/useClientList"; import { Input } from "@/components/ui/input"; import { Textarea } from "@/components/ui/textarea"; import { Button } from "@/components/ui/button"; @@ -134,15 +135,6 @@ const SHIPPING_COSTS = [ { value: "negotiable", label: "협의" }, ]; -// 샘플 발주처 데이터 -const SAMPLE_CLIENTS = [ - { id: "C001", name: "태영건설(주)" }, - { id: "C002", name: "현대건설(주)" }, - { id: "C003", name: "GS건설(주)" }, - { id: "C004", name: "대우건설(주)" }, - { id: "C005", name: "포스코건설" }, -]; - interface OrderRegistrationProps { onBack: () => void; onSave: (formData: OrderFormData) => Promise; @@ -185,6 +177,14 @@ export function OrderRegistration({ const [isSaving, setIsSaving] = useState(false); const [fieldErrors, setFieldErrors] = useState({}); + // 거래처 목록 조회 + const { clients, fetchClients, isLoading: isClientsLoading } = useClientList(); + + // 컴포넌트 마운트 시 거래처 목록 불러오기 + useEffect(() => { + fetchClients({ onlyActive: true, size: 100 }); + }, [fetchClients]); + // Daum 우편번호 서비스 const { openPostcode } = useDaumPostcode({ onComplete: (result) => { @@ -231,6 +231,7 @@ export function OrderRegistration({ setForm((prev) => ({ ...prev, selectedQuotation: quotation, + clientId: quotation.clientId || "", // 견적의 발주처 ID 설정 clientName: quotation.client, siteName: quotation.siteName, manager: quotation.manager || "", @@ -238,6 +239,8 @@ export function OrderRegistration({ items, })); + // 발주처 에러 초기화 + clearFieldError("clientName"); toast.success("견적 정보가 불러와졌습니다."); }; @@ -449,7 +452,7 @@ export function OrderRegistration({ { + handleChange('partnerId', val); + // 거래처 변경 시 현장명 초기화 + handleChange('projectName', ''); + setSiteInputValue(''); + // partnerName도 업데이트 + const selectedPartner = partners.find((p) => p.id === val); + if (selectedPartner) { + handleChange('partnerName', selectedPartner.partnerName); + } + }} + disabled={isViewMode || isLoadingPartners} + > + + + + + {partners.map((partner) => ( + + {partner.partnerName} + + ))} + + +
{renderField('현장설명회 일자', 'briefingDate', formData.briefingDate, { type: 'date', required: true, @@ -471,7 +694,112 @@ export default function SiteBriefingForm({ mode, briefingId, initialData }: Site {renderField('현장설명회 장소', 'location', formData.location, { placeholder: '장소명', })} - {renderSelectField('참석자', 'attendee', formData.attendee, MOCK_ATTENDEES)} + {/* 참석자 - Multi-Select Combobox */} +
+ + {isViewMode ? ( +
+ {formData.attendeeItems.length > 0 ? ( + formData.attendeeItems.map((item) => ( + + {item.name} + + )) + ) : ( + 참석자 없음 + )} +
+ ) : ( + + + + + + + { + if (e.key === 'Enter' && attendeeSearchValue.trim()) { + e.preventDefault(); + handleAttendeeAdd(); + } + }} + /> + + + {attendeeSearchValue.trim() ? ( + + ) : ( + '검색 결과가 없습니다.' + )} + + + {employees + .filter((emp) => + emp.name.toLowerCase().includes(attendeeSearchValue.toLowerCase()) + ) + .map((employee) => { + const isSelected = formData.attendeeItems.some( + (item) => item.id === employee.id + ); + return ( + handleAttendeeSelect(employee)} + > + + {employee.name} + + ); + })} + + + + + + )} +
{renderSelectField('상태', 'attendanceStatus', formData.attendanceStatus, ATTENDANCE_STATUS_OPTIONS)} @@ -483,10 +811,87 @@ export default function SiteBriefingForm({ mode, briefingId, initialData }: Site
- {renderField('현장명', 'projectName', formData.projectName, { - required: true, - placeholder: '현장명', - })} + {/* 현장명 - 거래처 연동 Combobox */} +
+ +
+ { + setSiteInputValue(e.target.value); + handleChange('projectName', e.target.value); + setShowSiteDropdown(true); + }} + onFocus={() => formData.partnerId && setShowSiteDropdown(true)} + onBlur={() => setTimeout(() => setShowSiteDropdown(false), 200)} + placeholder={ + !formData.partnerId + ? '거래처를 먼저 선택해주세요' + : isLoadingSites + ? '현장 목록 로딩 중...' + : '현장명 입력 또는 선택' + } + disabled={isViewMode || !formData.partnerId} + className="bg-white pr-10" + /> + {!isViewMode && formData.partnerId && ( + + )} + {/* 현장 드롭다운 */} + {showSiteDropdown && sites.length > 0 && ( +
+ {sites + .filter((site) => + site.siteName.toLowerCase().includes(siteInputValue.toLowerCase()) + ) + .map((site) => ( + + ))} + {sites.filter((site) => + site.siteName.toLowerCase().includes(siteInputValue.toLowerCase()) + ).length === 0 && ( +
+ 일치하는 현장이 없습니다. 신규 등록하려면 + 버튼을 클릭하세요. +
+ )} +
+ )} +
+ {!formData.partnerId && !isViewMode && ( +

거래처를 먼저 선택하면 해당 거래처의 현장 목록이 표시됩니다.

+ )} +
{renderField('입찰일자', 'bidDate', formData.bidDate, { type: 'date', })} @@ -736,6 +1141,53 @@ export default function SiteBriefingForm({ mode, briefingId, initialData }: Site + + {/* 현장 신규 등록 다이얼로그 */} + + + + 현장 신규 등록 + + 선택한 거래처에 새로운 현장을 등록합니다. +
+ 등록된 현장은 현장관리 목록에도 추가됩니다. + + +
+
+ + p.id === formData.partnerId)?.partnerName || ''} + disabled + className="bg-gray-50" + /> +
+
+ + setNewSiteName(e.target.value)} + placeholder="현장명을 입력하세요" + disabled={isCreatingSite} + autoFocus + /> +
+
+ + 취소 + + {isCreatingSite && } + 등록 + + + + ); } \ No newline at end of file diff --git a/src/components/business/construction/site-briefings/SiteBriefingListClient.tsx b/src/components/business/construction/site-briefings/SiteBriefingListClient.tsx index 99efcf9e..76722a68 100644 --- a/src/components/business/construction/site-briefings/SiteBriefingListClient.tsx +++ b/src/components/business/construction/site-briefings/SiteBriefingListClient.tsx @@ -137,12 +137,11 @@ export default function SiteBriefingListClient({ initialData = [] }: SiteBriefin if (listResult.success && listResult.data) { setBriefings(listResult.data.items); - // 목업 통계 계산 (참석 상태 기준) + // 통계 계산 (참석 상태 기준) const items = listResult.data.items; const total = items.length; - // 목업: scheduled 상태는 참석예정, 나머지는 참석완료로 처리 - const scheduled = items.filter((b) => b.status === 'scheduled').length; - const attended = items.filter((b) => b.status !== 'scheduled').length; + const scheduled = items.filter((b) => b.attendanceStatus === 'scheduled').length; + const attended = items.filter((b) => b.attendanceStatus === 'attended').length; setStatsData({ total, scheduled, attended }); } } catch { @@ -162,9 +161,9 @@ export default function SiteBriefingListClient({ initialData = [] }: SiteBriefin // 필터링된 데이터 const filteredBriefings = useMemo(() => { return briefings.filter((briefing) => { - // Stats 탭 필터 - if (activeStatTab === 'scheduled' && briefing.status !== 'scheduled') return false; - if (activeStatTab === 'attended' && briefing.status === 'scheduled') return false; + // Stats 탭 필터 (참석 상태 기준) + if (activeStatTab === 'scheduled' && briefing.attendanceStatus !== 'scheduled') return false; + if (activeStatTab === 'attended' && briefing.attendanceStatus !== 'attended') return false; // 거래처 필터 (다중선택 - 빈 배열 = 전체) if (partnerFilters.length > 0) { @@ -181,8 +180,8 @@ export default function SiteBriefingListClient({ initialData = [] }: SiteBriefin if (!attendeeFilters.includes(attendeeId)) return false; } - // 상태 필터 - if (statusFilter !== 'all' && briefing.status !== statusFilter) return false; + // 상태 필터 (참석 상태 기준) + if (statusFilter !== 'all' && briefing.attendanceStatus !== statusFilter) return false; // 검색 필터 if (searchValue) { @@ -348,8 +347,8 @@ export default function SiteBriefingListClient({ initialData = [] }: SiteBriefin const renderTableRow = useCallback( (briefing: SiteBriefing, index: number, globalIndex: number) => { const isSelected = selectedItems.has(briefing.id); - // 목업 데이터에서 상태 매핑 - const displayStatus = briefing.status === 'scheduled' ? 'scheduled' : 'attended'; + // 참석 상태 표시 + const displayStatus = briefing.attendanceStatus || 'scheduled'; return ( void) => { - const displayStatus = briefing.status === 'scheduled' ? 'scheduled' : 'attended'; + const displayStatus = briefing.attendanceStatus || 'scheduled'; return ( | null; // 백엔드는 attendees (복수형), array 타입 + attendance_status: string | null; + project_name: string | null; + site_count: number | null; + construction_start_date: string | null; + construction_end_date: string | null; + vat_type: string | null; + work_report: string | null; + attendee_count: number | null; + created_at: string; + updated_at: string; + created_by: string | null; +} + +interface ApiSiteBriefingStats { + total: number; + scheduled: number; + ongoing: number; + completed: number; + cancelled: number; +} + +// ======================================== +// 타입 변환 함수 +// ======================================== + +/** + * API 응답 → SiteBriefing 타입 변환 + */ +function transformSiteBriefing(apiData: ApiSiteBriefing): SiteBriefing { + // attendees를 JSON 문자열로 변환 (types.ts의 parseAttendeeItems에서 파싱) + const attendeeJson = apiData.attendees ? JSON.stringify(apiData.attendees) : ''; + + return { + id: String(apiData.id), + briefingCode: apiData.briefing_code || '', + title: apiData.title || apiData.project_name || '', + description: apiData.description || '', + partnerId: apiData.partner_id ? String(apiData.partner_id) : '', + partnerName: apiData.partner_name || '', + briefingDate: apiData.briefing_date || '', + briefingTime: apiData.briefing_time || '', + location: apiData.location || '', + address: apiData.address || '', + status: (apiData.status as SiteBriefing['status']) || 'scheduled', + bidStatus: (apiData.bid_status as SiteBriefing['bidStatus']) || 'pending', + bidDate: apiData.bid_date, + attendee: attendeeJson, // JSON 문자열로 저장 (parseAttendeeItems에서 파싱) attendees: [], - attendeeCount: 5, - createdAt: '2025-01-01', - updatedAt: '2025-01-01', - createdBy: '홍길동', - }, - { - id: '2', - briefingCode: 'SB-002', - title: '서초 아파트 리모델링', - description: '서초구 반포동 아파트 리모델링 현장설명회', - partnerId: '2', - partnerName: '삼성시공', - briefingDate: '2025-05-12', - briefingTime: '10:00', - location: '서초구청 소회의실', - address: '서울특별시 서초구 남부순환로 2584', - status: 'ongoing', - bidStatus: 'bidding', - bidDate: '2025-05-18', - attendees: [], - attendeeCount: 8, - createdAt: '2025-01-02', - updatedAt: '2025-01-02', - createdBy: '김철수', - }, - { - id: '3', - briefingCode: 'SB-003', - title: '여의도 상업시설 신축', - description: '영등포구 여의도동 상업시설 신축 현장설명회', - partnerId: '3', - partnerName: 'LG건설', - briefingDate: '2025-05-13', - briefingTime: '15:00', - location: 'LG트윈타워 회의실', - address: '서울특별시 영등포구 여의대로 128', - status: 'completed', - bidStatus: 'awarded', - bidDate: '2025-05-20', - attendees: [], - attendeeCount: 12, - createdAt: '2025-01-03', - updatedAt: '2025-01-03', - createdBy: '박영수', - }, - { - id: '4', - briefingCode: 'SB-004', - title: '송파 주상복합 공사', - description: '송파구 잠실동 주상복합 건축 현장설명회', - partnerId: '1', - partnerName: '대한건설', - briefingDate: '2025-05-14', - briefingTime: '11:00', - location: '롯데월드타워 회의실', - address: '서울특별시 송파구 올림픽로 300', - status: 'cancelled', - bidStatus: 'failed', - bidDate: null, - attendees: [], - attendeeCount: 0, - createdAt: '2025-01-04', - updatedAt: '2025-01-04', - createdBy: '최민수', - }, - { - id: '5', - briefingCode: 'SB-005', - title: '마포 물류센터 증축', - description: '마포구 상암동 물류센터 증축 현장설명회', - partnerId: '2', - partnerName: '삼성시공', - briefingDate: '2025-05-15', - briefingTime: '09:00', - location: '상암 DMC 회의실', - address: '서울특별시 마포구 상암산로 76', - status: 'postponed', - bidStatus: 'pending', - bidDate: null, - attendees: [], - attendeeCount: 3, - createdAt: '2025-01-05', - updatedAt: '2025-01-05', - createdBy: '이영희', - }, -]; + attendeeCount: apiData.attendee_count || 0, + attendanceStatus: (apiData.attendance_status as SiteBriefing['attendanceStatus']) || 'scheduled', + createdAt: apiData.created_at || '', + updatedAt: apiData.updated_at || '', + createdBy: apiData.created_by || '', + }; +} + +/** + * SiteBriefingFormData → API 요청 데이터 변환 + */ +function transformFormDataToApi(data: SiteBriefingFormData): Record { + // attendeeItems 배열을 백엔드 형식으로 변환 + // - id가 있으면 internal (직원), 없으면 external (외부인/직접입력) + const attendees = data.attendeeItems && data.attendeeItems.length > 0 + ? data.attendeeItems.map(item => ({ + ...item, + type: item.id ? 'internal' : 'external', + })) + : null; + + return { + briefing_code: data.briefingCode, + title: data.projectName, + description: data.workReport, + partner_id: data.partnerId ? Number(data.partnerId) : null, + partner_name: data.partnerName, + briefing_date: data.briefingDate, + briefing_time: data.briefingTime, + briefing_type: data.briefingType, + location: data.location, + attendees: attendees, // 백엔드 필드명: attendees (복수형, array) + attendance_status: data.attendanceStatus, + project_name: data.projectName, + bid_date: data.bidDate, + site_count: data.siteCount, + construction_start_date: data.constructionStartDate, + construction_end_date: data.constructionEndDate, + vat_type: data.vatType, + work_report: data.workReport, + }; +} // 현장설명회 목록 조회 export async function getSiteBriefingList( filter?: SiteBriefingFilter ): Promise<{ success: boolean; data?: SiteBriefingListResponse; error?: string }> { try { - let filtered = [...mockSiteBriefings]; + // API 쿼리 파라미터 구성 (모든 값을 문자열로 변환) + const params: Record = { + per_page: String(filter?.size ?? 20), + page: String(filter?.page ?? 1), + }; - // 검색 필터 if (filter?.search) { - const search = filter.search.toLowerCase(); - filtered = filtered.filter( - (b) => - b.title.toLowerCase().includes(search) || - b.briefingCode.toLowerCase().includes(search) || - b.partnerName.toLowerCase().includes(search) - ); + params.search = filter.search; } - - // 상태 필터 if (filter?.status && filter.status !== 'all') { - filtered = filtered.filter((b) => b.status === filter.status); + params.status = filter.status; } - - // 입찰 상태 필터 if (filter?.bidStatus && filter.bidStatus !== 'all') { - filtered = filtered.filter((b) => b.bidStatus === filter.bidStatus); + params.bid_status = filter.bidStatus; } - - // 거래처 필터 if (filter?.partnerId) { - filtered = filtered.filter((b) => b.partnerId === filter.partnerId); + params.partner_id = filter.partnerId; } - - // 날짜 필터 if (filter?.startDate) { - filtered = filtered.filter((b) => b.briefingDate >= filter.startDate!); + params.start_date = filter.startDate; } if (filter?.endDate) { - filtered = filtered.filter((b) => b.briefingDate <= filter.endDate!); + params.end_date = filter.endDate; } - - // 정렬 if (filter?.sortBy) { - switch (filter.sortBy) { - case 'latest': - filtered.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()); - break; - case 'oldest': - filtered.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime()); - break; - case 'dateAsc': - filtered.sort((a, b) => new Date(a.briefingDate).getTime() - new Date(b.briefingDate).getTime()); - break; - case 'dateDesc': - filtered.sort((a, b) => new Date(b.briefingDate).getTime() - new Date(a.briefingDate).getTime()); - break; + const sortMapping: Record = { + latest: { sort_by: 'created_at', sort_dir: 'desc' }, + oldest: { sort_by: 'created_at', sort_dir: 'asc' }, + dateAsc: { sort_by: 'briefing_date', sort_dir: 'asc' }, + dateDesc: { sort_by: 'briefing_date', sort_dir: 'desc' }, + }; + const sort = sortMapping[filter.sortBy]; + if (sort) { + params.sort_by = sort.sort_by; + params.sort_dir = sort.sort_dir; } } - const page = filter?.page ?? 1; - const size = filter?.size ?? 20; - const start = (page - 1) * size; - const paginatedItems = filtered.slice(start, start + size); + const response = await apiClient.get<{ + success: boolean; + data: { + data: ApiSiteBriefing[]; + current_page: number; + per_page: number; + total: number; + last_page: number; + }; + }>('/site-briefings', { params }); + + const apiData = response.data; + const items = apiData.data.map(transformSiteBriefing); return { success: true, data: { - items: paginatedItems, - total: filtered.length, - page, - size, - totalPages: Math.ceil(filtered.length / size), + items, + total: apiData.total, + page: apiData.current_page, + size: apiData.per_page, + totalPages: apiData.last_page, }, }; } catch (error) { @@ -196,13 +197,12 @@ export async function getSiteBriefing( id: string ): Promise<{ success: boolean; data?: SiteBriefing; error?: string }> { try { - const briefing = mockSiteBriefings.find((b) => b.id === id); + const response = await apiClient.get<{ + success: boolean; + data: ApiSiteBriefing; + }>(`/site-briefings/${id}`); - if (!briefing) { - return { success: false, error: '현장설명회를 찾을 수 없습니다.' }; - } - - return { success: true, data: briefing }; + return { success: true, data: transformSiteBriefing(response.data) }; } catch (error) { console.error('getSiteBriefing error:', error); return { success: false, error: '현장설명회 조회에 실패했습니다.' }; @@ -212,46 +212,86 @@ export async function getSiteBriefing( // 현장설명회 통계 조회 export async function getSiteBriefingStats(): Promise<{ success: boolean; data?: SiteBriefingStats; error?: string }> { try { - const total = mockSiteBriefings.length; - const scheduled = mockSiteBriefings.filter((b) => b.status === 'scheduled').length; - const ongoing = mockSiteBriefings.filter((b) => b.status === 'ongoing').length; - const completed = mockSiteBriefings.filter((b) => b.status === 'completed').length; - const cancelled = mockSiteBriefings.filter((b) => b.status === 'cancelled' || b.status === 'postponed').length; + const response = await apiClient.get<{ + success: boolean; + data: ApiSiteBriefingStats; + }>('/site-briefings/stats'); - return { - success: true, - data: { - total, - scheduled, - ongoing, - completed, - cancelled, - }, - }; + return { success: true, data: response.data }; } catch (error) { console.error('getSiteBriefingStats error:', error); return { success: false, error: '통계 조회에 실패했습니다.' }; } } -// 현장설명회 삭제 +// ======================================== +// API 함수 (CRUD) +// ======================================== + +/** + * 현장설명회 등록 + * POST /api/v1/site-briefings + */ +export async function createSiteBriefing(data: SiteBriefingFormData): Promise<{ + success: boolean; + data?: SiteBriefing; + error?: string; +}> { + try { + const apiData = transformFormDataToApi(data); + const response = await apiClient.post<{ success: boolean; data: ApiSiteBriefing }>('/site-briefings', apiData); + return { success: true, data: transformSiteBriefing(response.data) }; + } catch (error) { + console.error('현장설명회 등록 오류:', error); + return { success: false, error: '현장설명회 등록에 실패했습니다.' }; + } +} + +/** + * 현장설명회 수정 + * PUT /api/v1/site-briefings/{id} + */ +export async function updateSiteBriefing(id: string, data: SiteBriefingFormData): Promise<{ + success: boolean; + data?: SiteBriefing; + error?: string; +}> { + try { + const apiData = transformFormDataToApi(data); + const response = await apiClient.put<{ success: boolean; data: ApiSiteBriefing }>(`/site-briefings/${id}`, apiData); + return { success: true, data: transformSiteBriefing(response.data) }; + } catch (error) { + console.error('현장설명회 수정 오류:', error); + return { success: false, error: '현장설명회 수정에 실패했습니다.' }; + } +} + +/** + * 현장설명회 삭제 + * DELETE /api/v1/site-briefings/{id} + */ export async function deleteSiteBriefing(id: string): Promise<{ success: boolean; error?: string }> { try { - console.log('Delete site briefing:', id); + await apiClient.delete(`/site-briefings/${id}`); return { success: true }; } catch (error) { - console.error('deleteSiteBriefing error:', error); + console.error('현장설명회 삭제 오류:', error); return { success: false, error: '현장설명회 삭제에 실패했습니다.' }; } } -// 현장설명회 일괄 삭제 +/** + * 현장설명회 일괄 삭제 + * DELETE /api/v1/site-briefings/bulk + */ export async function deleteSiteBriefings(ids: string[]): Promise<{ success: boolean; deletedCount?: number; error?: string }> { try { - console.log('Delete site briefings:', ids); + await apiClient.delete('/site-briefings/bulk', { + data: { ids: ids.map((id) => Number(id)) }, + }); return { success: true, deletedCount: ids.length }; } catch (error) { - console.error('deleteSiteBriefings error:', error); + console.error('현장설명회 일괄 삭제 오류:', error); return { success: false, error: '일괄 삭제에 실패했습니다.' }; } } diff --git a/src/components/business/construction/site-briefings/types.ts b/src/components/business/construction/site-briefings/types.ts index af9beebd..ed7dbee3 100644 --- a/src/components/business/construction/site-briefings/types.ts +++ b/src/components/business/construction/site-briefings/types.ts @@ -8,7 +8,7 @@ export type SiteBriefingStatus = 'scheduled' | 'ongoing' | 'completed' | 'cancel // 입찰 상태 export type BidStatus = 'pending' | 'bidding' | 'closed' | 'failed' | 'awarded'; -// 참석자 타입 +// 참석자 타입 (외부 참석자 - 상세 정보) export interface Attendee { id: string; name: string; @@ -18,6 +18,12 @@ export interface Attendee { isAttended: boolean; } +// 참석자 항목 타입 (내부 직원 또는 직접 입력) +export interface AttendeeItem { + id: string; // 직원 ID (직접 입력 시 빈 문자열) + name: string; // 이름 +} + // 현장설명회 타입 export interface SiteBriefing { id: string; @@ -41,8 +47,10 @@ export interface SiteBriefing { bidDate: string | null; // 입찰 날짜 // 참석자 정보 + attendee: string; // 참석자 attendees: Attendee[]; attendeeCount: number; // 참석자 수 + attendanceStatus: AttendanceStatus; // 참석 상태 // 메타 정보 createdAt: string; @@ -173,7 +181,7 @@ export interface SiteBriefingFormData { briefingTime: string; // 현장설명회 시간 briefingType: BriefingType; // 구분 (온라인/오프라인) location: string; // 현장설명회 장소 - attendee: string; // 참석자 + attendeeItems: AttendeeItem[]; // 참석자 목록 (JSON으로 저장) attendanceStatus: AttendanceStatus; // 상태 // 입찰 정보 @@ -219,7 +227,7 @@ export function getEmptySiteBriefingFormData(): SiteBriefingFormData { briefingTime: '', briefingType: 'offline', location: '', - attendee: '', + attendeeItems: [], attendanceStatus: 'scheduled', projectName: '', bidDate: '', @@ -233,6 +241,26 @@ export function getEmptySiteBriefingFormData(): SiteBriefingFormData { }; } +// attendee JSON 문자열을 AttendeeItem[]로 파싱 +export function parseAttendeeItems(attendeeJson: string | null): AttendeeItem[] { + if (!attendeeJson) return []; + try { + const parsed = JSON.parse(attendeeJson); + if (Array.isArray(parsed)) { + return parsed.filter((item): item is AttendeeItem => + typeof item === 'object' && item !== null && typeof item.name === 'string' + ); + } + return []; + } catch { + // JSON 파싱 실패 시 기존 단일 문자열을 AttendeeItem으로 변환 + if (attendeeJson.trim()) { + return [{ id: '', name: attendeeJson.trim() }]; + } + return []; + } +} + // SiteBriefing을 FormData로 변환 export function siteBriefingToFormData(briefing: SiteBriefing): SiteBriefingFormData { return { @@ -243,8 +271,8 @@ export function siteBriefingToFormData(briefing: SiteBriefing): SiteBriefingForm briefingTime: briefing.briefingTime, briefingType: 'offline', // 기본값 location: briefing.location, - attendee: '', // 기본값 - attendanceStatus: 'scheduled', // 기본값 + attendeeItems: parseAttendeeItems(briefing.attendee), + attendanceStatus: briefing.attendanceStatus || 'scheduled', projectName: briefing.title, bidDate: briefing.bidDate || '', siteCount: 0, // 기본값 From 81f7c5aeacfce5ea7c18729aa94212516bbfad63 Mon Sep 17 00:00:00 2001 From: kent Date: Tue, 13 Jan 2026 19:47:39 +0900 Subject: [PATCH 34/45] =?UTF-8?q?feat(WEB):=20=EC=A3=BC=EB=AC=B8/=EC=9E=91?= =?UTF-8?q?=EC=97=85=EC=A7=80=EC=8B=9C=20=EA=B3=B5=EC=A0=95=20=EC=97=B0?= =?UTF-8?q?=EB=8F=99=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - process_id 필드 추가 (공정 연동) - 공정별 다중 작업지시 생성 지원 (processIds) - ApiProductionOrderResponse 타입 수정 (work_orders 배열 지원) - process 정보 포함 응답 처리 --- src/components/orders/OrderRegistration.tsx | 17 ++++---- src/components/orders/actions.ts | 43 +++++++++++++++++---- 2 files changed, 42 insertions(+), 18 deletions(-) diff --git a/src/components/orders/OrderRegistration.tsx b/src/components/orders/OrderRegistration.tsx index deea1be9..c02530d9 100644 --- a/src/components/orders/OrderRegistration.tsx +++ b/src/components/orders/OrderRegistration.tsx @@ -416,7 +416,7 @@ export function OrderRegistration({ {form.selectedQuotation.siteName} / - {formatAmount(form.selectedQuotation.amount)}원 + {formatAmount(form.selectedQuotation.amount)}
@@ -491,6 +491,7 @@ export function OrderRegistration({ setForm((prev) => ({ ...prev, siteName: e.target.value })); clearFieldError("siteName"); }} + disabled={!!form.selectedQuotation} className={cn(fieldErrors.siteName && "border-red-500")} /> {fieldErrors.siteName && ( @@ -757,8 +758,6 @@ export function OrderRegistration({ 순번 품목코드 품명 - 층 - 부호 규격 수량 단위 @@ -770,7 +769,7 @@ export function OrderRegistration({ {form.items.length === 0 ? ( - + 품목이 없습니다. 견적을 선택하거나 품목을 추가해주세요. @@ -784,8 +783,6 @@ export function OrderRegistration({ {item.itemName} - {item.type || "-"} - {item.symbol || "-"} {item.spec} {item.unit} - {formatAmount(item.unitPrice)}원 + {formatAmount(item.unitPrice)} - {formatAmount(item.amount)}원 + {formatAmount(item.amount)}
@@ -860,7 +857,7 @@ export function OrderRegistration({
총금액: - {formatAmount(form.totalAmount)}원 + {formatAmount(form.totalAmount)}
diff --git a/src/components/orders/actions.ts b/src/components/orders/actions.ts index 47751583..8d60ee8b 100644 --- a/src/components/orders/actions.ts +++ b/src/components/orders/actions.ts @@ -120,6 +120,7 @@ interface ApiWorkOrder { work_order_no: string; sales_order_id: number; project_name: string | null; + process_id: number | null; process_type: string; status: string; assignee_id: number | null; @@ -131,10 +132,12 @@ interface ApiWorkOrder { updated_at: string; assignee?: { id: number; name: string } | null; team?: { id: number; name: string } | null; + process?: { id: number; process_name: string } | null; } interface ApiProductionOrderResponse { - work_order: ApiWorkOrder; + work_order?: ApiWorkOrder; + work_orders?: ApiWorkOrder[]; order: ApiOrder; } @@ -292,7 +295,8 @@ export interface CreateFromQuoteData { // 생산지시 생성용 export interface CreateProductionOrderData { - processType?: 'screen' | 'slat' | 'bending'; + processId?: number; + processIds?: number[]; // 공정별 다중 작업지시 생성용 priority?: 'urgent' | 'high' | 'normal' | 'low'; assigneeId?: number; teamId?: number; @@ -306,6 +310,7 @@ export interface WorkOrder { workOrderNo: string; salesOrderId: number; projectName: string | null; + processId?: number; processType: string; status: string; assigneeId?: number; @@ -317,11 +322,13 @@ export interface WorkOrder { isActive: boolean; createdAt: string; updatedAt: string; + process?: { id: number; processName: string }; } // 생산지시 생성 결과 export interface ProductionOrderResult { - workOrder: WorkOrder; + workOrder?: WorkOrder; + workOrders?: WorkOrder[]; order: Order; } @@ -514,6 +521,11 @@ function transformWorkOrderApiToFrontend(apiData: ApiWorkOrder): WorkOrder { isActive: apiData.is_active, createdAt: apiData.created_at, updatedAt: apiData.updated_at, + processId: apiData.process_id ?? undefined, + process: apiData.process ? { + id: apiData.process.id, + processName: apiData.process.process_name, + } : undefined, }; } @@ -956,7 +968,12 @@ export async function createProductionOrder( }> { try { const apiData: Record = {}; - if (data?.processType) apiData.process_type = data.processType; + // 다중 공정 ID (우선) 또는 단일 공정 ID + if (data?.processIds && data.processIds.length > 0) { + apiData.process_ids = data.processIds; + } else if (data?.processId) { + apiData.process_id = data.processId; + } if (data?.priority) apiData.priority = data.priority; if (data?.assigneeId) apiData.assignee_id = data.assigneeId; if (data?.teamId) apiData.team_id = data.teamId; @@ -982,12 +999,22 @@ export async function createProductionOrder( return { success: false, error: result.message || '생산지시 생성에 실패했습니다.' }; } + // 다중 또는 단일 작업지시 응답 처리 + const responseData: ProductionOrderResult = { + order: transformApiToFrontend(result.data.order), + }; + + if (result.data.work_orders && result.data.work_orders.length > 0) { + // 다중 작업지시 응답 + responseData.workOrders = result.data.work_orders.map(transformWorkOrderApiToFrontend); + } else if (result.data.work_order) { + // 단일 작업지시 응답 (하위 호환성) + responseData.workOrder = transformWorkOrderApiToFrontend(result.data.work_order); + } + return { success: true, - data: { - workOrder: transformWorkOrderApiToFrontend(result.data.work_order), - order: transformApiToFrontend(result.data.order), - }, + data: responseData, }; } catch (error) { console.error('[createProductionOrder] Error:', error); From fab7d669d5565cf88132123656d0c472b47289a9 Mon Sep 17 00:00:00 2001 From: kent Date: Tue, 13 Jan 2026 19:47:45 +0900 Subject: [PATCH 35/45] =?UTF-8?q?feat(WEB):=20Server=20Actions=20=EC=A0=84?= =?UTF-8?q?=EC=9A=A9=20API=20=ED=81=B4=EB=9D=BC=EC=9D=B4=EC=96=B8=ED=8A=B8?= =?UTF-8?q?=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ServerApiClient 클래스 추가 - 쿠키에서 access_token 자동 읽기 - X-API-KEY + Bearer 토큰 자동 포함 - 401 발생 시 토큰 자동 갱신 후 재시도 - 인증 실패 시 쿠키 자동 삭제 --- src/lib/api/index.ts | 233 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 226 insertions(+), 7 deletions(-) diff --git a/src/lib/api/index.ts b/src/lib/api/index.ts index c031012b..2944a4fe 100644 --- a/src/lib/api/index.ts +++ b/src/lib/api/index.ts @@ -20,12 +20,231 @@ export { type CommonCode, } from './common-codes'; -// Server-side API 클라이언트 인스턴스 -// 서버 액션에서 사용 -import { ApiClient } from './client'; +// Server-side API 클라이언트 +// 서버 액션에서 쿠키 기반 Bearer 토큰 자동 포함 +import { cookies } from 'next/headers'; +import { redirect } from 'next/navigation'; import { AUTH_CONFIG } from './auth/auth-config'; +import { refreshAccessToken } from './refresh-token'; +import { isNextRedirectError } from '@/lib/utils/redirect-error'; -export const apiClient = new ApiClient({ - mode: 'api-key', - apiKey: process.env.API_KEY, -}); \ No newline at end of file +/** + * Server Actions 전용 API 클라이언트 + * + * 특징: + * - 쿠키에서 access_token 자동 읽기 + * - X-API-KEY + Bearer 토큰 자동 포함 + * - 401 발생 시 토큰 자동 갱신 후 재시도 + */ +class ServerApiClient { + private baseURL: string; + private apiKey: string; + + constructor() { + // API URL에 /api/v1 prefix 자동 추가 + const apiUrl = AUTH_CONFIG.apiUrl.replace(/\/$/, ''); // trailing slash 제거 + this.baseURL = `${apiUrl}/api/v1`; + this.apiKey = process.env.API_KEY || ''; + } + + /** + * 쿠키에서 인증 헤더 생성 (async) + */ + private async getAuthHeaders(token?: string): Promise> { + const cookieStore = await cookies(); + const accessToken = token || cookieStore.get('access_token')?.value; + + return { + 'Accept': 'application/json', + 'Content-Type': 'application/json', + 'X-API-KEY': this.apiKey, + ...(accessToken ? { 'Authorization': `Bearer ${accessToken}` } : {}), + }; + } + + /** + * 토큰 쿠키 삭제 (인증 실패 시) + */ + private async clearTokenCookies() { + const cookieStore = await cookies(); + cookieStore.delete('access_token'); + cookieStore.delete('refresh_token'); + cookieStore.delete('token_refreshed_at'); + cookieStore.delete('is_authenticated'); + console.log('🗑️ [ServerApiClient] 토큰 쿠키 삭제 완료'); + } + + /** + * 새 토큰을 쿠키에 저장 + */ + private async setNewTokenCookies(tokens: { + accessToken?: string; + refreshToken?: string; + expiresIn?: number; + }) { + const cookieStore = await cookies(); + const isProduction = process.env.NODE_ENV === 'production'; + + if (tokens.accessToken) { + cookieStore.set('access_token', tokens.accessToken, { + httpOnly: true, + secure: isProduction, + sameSite: 'lax', + path: '/', + maxAge: tokens.expiresIn || 7200, + }); + + cookieStore.set('token_refreshed_at', Date.now().toString(), { + httpOnly: false, + secure: isProduction, + sameSite: 'lax', + path: '/', + maxAge: 60, + }); + } + + if (tokens.refreshToken) { + cookieStore.set('refresh_token', tokens.refreshToken, { + httpOnly: true, + secure: isProduction, + sameSite: 'lax', + path: '/', + maxAge: 604800, + }); + } + } + + /** + * HTTP 요청 실행 (토큰 자동 갱신 포함) + */ + private async request( + endpoint: string, + options?: RequestInit & { skipAuthRetry?: boolean } + ): Promise { + try { + const cookieStore = await cookies(); + const refreshToken = cookieStore.get('refresh_token')?.value; + const headers = await this.getAuthHeaders(); + + const url = `${this.baseURL}${endpoint}`; + let response = await fetch(url, { + ...options, + headers: { + ...headers, + ...options?.headers, + }, + cache: 'no-store', + }); + + // 401 발생 시 토큰 갱신 후 재시도 + if (response.status === 401 && !options?.skipAuthRetry && refreshToken) { + console.log('🔄 [ServerApiClient] 401 발생, 토큰 갱신 시도...'); + + const refreshResult = await refreshAccessToken(refreshToken, 'ServerApiClient'); + + if (refreshResult.success && refreshResult.accessToken) { + console.log('✅ [ServerApiClient] 토큰 갱신 성공, 재시도...'); + await this.setNewTokenCookies(refreshResult); + + const newHeaders = await this.getAuthHeaders(refreshResult.accessToken); + response = await fetch(url, { + ...options, + headers: { + ...newHeaders, + ...options?.headers, + }, + cache: 'no-store', + }); + + if (response.status === 401) { + console.warn('🔴 [ServerApiClient] 재시도 실패, 로그인 리다이렉트'); + await this.clearTokenCookies(); + redirect('/login'); + } + } else { + console.warn('🔴 [ServerApiClient] 토큰 갱신 실패, 로그인 리다이렉트'); + await this.clearTokenCookies(); + redirect('/login'); + } + } else if (response.status === 401 && !options?.skipAuthRetry) { + console.warn('🔴 [ServerApiClient] 401 (refresh token 없음), 로그인 리다이렉트'); + await this.clearTokenCookies(); + redirect('/login'); + } + + if (!response.ok) { + const errorData = await response.json().catch(() => ({})); + throw { + status: response.status, + message: errorData.message || 'An error occurred', + errors: errorData.errors, + code: errorData.code, + }; + } + + if (response.status === 204) { + return undefined as T; + } + + return await response.json(); + } catch (error) { + if (isNextRedirectError(error)) throw error; + throw error; + } + } + + /** + * GET 요청 + */ + async get(endpoint: string, options?: { params?: Record }): Promise { + let url = endpoint; + if (options?.params) { + const searchParams = new URLSearchParams(options.params); + url = `${endpoint}?${searchParams.toString()}`; + } + return this.request(url, { method: 'GET' }); + } + + /** + * POST 요청 + */ + async post(endpoint: string, data?: unknown): Promise { + return this.request(endpoint, { + method: 'POST', + body: data ? JSON.stringify(data) : undefined, + }); + } + + /** + * PUT 요청 + */ + async put(endpoint: string, data?: unknown): Promise { + return this.request(endpoint, { + method: 'PUT', + body: data ? JSON.stringify(data) : undefined, + }); + } + + /** + * PATCH 요청 + */ + async patch(endpoint: string, data?: unknown): Promise { + return this.request(endpoint, { + method: 'PATCH', + body: data ? JSON.stringify(data) : undefined, + }); + } + + /** + * DELETE 요청 + */ + async delete(endpoint: string, options?: { data?: unknown }): Promise { + return this.request(endpoint, { + method: 'DELETE', + body: options?.data ? JSON.stringify(options.data) : undefined, + }); + } +} + +// 서버 액션용 API 클라이언트 인스턴스 +export const apiClient = new ServerApiClient(); \ No newline at end of file From 8083c0e015bbe67502b707cbbdf6d3f3d7ba012e Mon Sep 17 00:00:00 2001 From: kent Date: Tue, 13 Jan 2026 19:47:51 +0900 Subject: [PATCH 36/45] =?UTF-8?q?fix(WEB):=20=EA=B1=B4=EC=84=A4=20?= =?UTF-8?q?=EA=B2=AC=EC=A0=81=20=EA=B4=80=EB=A6=AC=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 견적 상세/수정 페이지 타입 수정 - actions.ts API 연동 개선 --- .../bidding/estimates/[id]/edit/page.tsx | 212 +++--------------- .../project/bidding/estimates/[id]/page.tsx | 212 +++--------------- .../construction/estimates/actions.ts | 53 +++-- 3 files changed, 93 insertions(+), 384 deletions(-) diff --git a/src/app/[locale]/(protected)/construction/project/bidding/estimates/[id]/edit/page.tsx b/src/app/[locale]/(protected)/construction/project/bidding/estimates/[id]/edit/page.tsx index 311890aa..815b3c85 100644 --- a/src/app/[locale]/(protected)/construction/project/bidding/estimates/[id]/edit/page.tsx +++ b/src/app/[locale]/(protected)/construction/project/bidding/estimates/[id]/edit/page.tsx @@ -3,202 +3,36 @@ import { use, useEffect, useState } from 'react'; import { EstimateDetailForm } from '@/components/business/construction/estimates'; import type { EstimateDetail } from '@/components/business/construction/estimates'; +import { getEstimateDetail } from '@/components/business/construction/estimates/actions'; interface EstimateEditPageProps { params: Promise<{ id: string }>; } -// 목업 데이터 - 추후 API 연동 -function getEstimateDetail(id: string): EstimateDetail { - // TODO: 실제 API 연동 - const mockData: EstimateDetail = { - id, - estimateCode: '123123', - partnerId: '1', - partnerName: '회사명', - projectName: '현장명', - estimatorId: 'hong', - estimatorName: '이름', - itemCount: 21, - estimateAmount: 1420000, - completedDate: null, - bidDate: '2025-12-12', - status: 'pending', - createdAt: '2025-12-01', - updatedAt: '2025-12-01', - createdBy: 'hong', - siteBriefing: { - briefingCode: '123123', - partnerName: '회사명', - companyName: '회사명', - briefingDate: '2025-12-12', - attendee: '이름', - }, - bidInfo: { - projectName: '현장명', - bidDate: '2025-12-12', - siteCount: 21, - constructionPeriod: '2026-01-01 ~ 2026-12-10', - constructionStartDate: '2026-01-01', - constructionEndDate: '2026-12-10', - vatType: 'excluded', - workReport: '업무 보고 내용', - documents: [ - { - id: '1', - fileName: 'abc.zip', - fileUrl: '#', - fileSize: 1024000, - }, - ], - }, - summaryItems: [ - { - id: '1', - name: '서터 심창측공사', - quantity: 1, - unit: '식', - materialCost: 78540000, - laborCost: 15410000, - totalCost: 93950000, - remarks: '', - }, - ], - expenseItems: [ - { - id: '1', - name: 'public_1', - amount: 10000, - }, - ], - priceAdjustments: [ - { - id: '1', - category: '배합비', - unitPrice: 10000, - coating: 10000, - batting: 10000, - boxReinforce: 10500, - painting: 10500, - total: 51000, - }, - { - id: '2', - category: '재단비', - unitPrice: 1375, - coating: 0, - batting: 0, - boxReinforce: 0, - painting: 0, - total: 1375, - }, - { - id: '3', - category: '판매단가', - unitPrice: 0, - coating: 10000, - batting: 10000, - boxReinforce: 10500, - painting: 10500, - total: 41000, - }, - { - id: '4', - category: '조립단가', - unitPrice: 10300, - coating: 10300, - batting: 10300, - boxReinforce: 10500, - painting: 10200, - total: 51600, - }, - ], - detailItems: [ - { - id: '1', - no: 1, - name: 'FS530외/주차', - material: 'screen', - width: 2350, - height: 2500, - quantity: 1, - box: 1, - assembly: 0, - coating: 0, - batting: 0, - mounting: 0, - fitting: 0, - controller: 0, - widthConstruction: 0, - heightConstruction: 0, - materialCost: 1420000, - laborCost: 510000, - quantityPrice: 1930000, - expenseQuantity: 5500, - expenseTotal: 5500, - totalCost: 1930000, - otherCost: 0, - marginCost: 0, - totalPrice: 1930000, - unitPrice: 1420000, - expense: 0, - marginRate: 0, - unitQuantity: 1, - expenseResult: 0, - marginActual: 0, - }, - { - id: '2', - no: 2, - name: 'FS530외/주차', - material: 'screen', - width: 7500, - height: 2500, - quantity: 1, - box: 1, - assembly: 0, - coating: 0, - batting: 0, - mounting: 0, - fitting: 0, - controller: 0, - widthConstruction: 0, - heightConstruction: 0, - materialCost: 4720000, - laborCost: 780000, - quantityPrice: 5500000, - expenseQuantity: 5500, - expenseTotal: 5500, - totalCost: 5500000, - otherCost: 0, - marginCost: 0, - totalPrice: 5500000, - unitPrice: 4720000, - expense: 0, - marginRate: 0, - unitQuantity: 1, - expenseResult: 0, - marginActual: 0, - }, - ], - approval: { - approvers: [], - references: [], - }, - }; - - return mockData; -} - export default function EstimateEditPage({ params }: EstimateEditPageProps) { const { id } = use(params); const [data, setData] = useState(null); const [isLoading, setIsLoading] = useState(true); + const [error, setError] = useState(null); useEffect(() => { - const detail = getEstimateDetail(id); - setData(detail); - setIsLoading(false); + async function fetchData() { + try { + setIsLoading(true); + setError(null); + const result = await getEstimateDetail(id); + if (result.success && result.data) { + setData(result.data); + } else { + setError(result.error || '견적 정보를 불러오는데 실패했습니다.'); + } + } catch (err) { + setError(err instanceof Error ? err.message : '오류가 발생했습니다.'); + } finally { + setIsLoading(false); + } + } + fetchData(); }, [id]); if (isLoading) { @@ -209,6 +43,14 @@ export default function EstimateEditPage({ params }: EstimateEditPageProps) { ); } + if (error) { + return ( +
+
{error}
+
+ ); + } + return ( ; } -// 목업 데이터 - 추후 API 연동 -function getEstimateDetail(id: string): EstimateDetail { - // TODO: 실제 API 연동 - const mockData: EstimateDetail = { - id, - estimateCode: '123123', - partnerId: '1', - partnerName: '회사명', - projectName: '현장명', - estimatorId: 'hong', - estimatorName: '이름', - itemCount: 21, - estimateAmount: 1420000, - completedDate: null, - bidDate: '2025-12-12', - status: 'pending', - createdAt: '2025-12-01', - updatedAt: '2025-12-01', - createdBy: 'hong', - siteBriefing: { - briefingCode: '123123', - partnerName: '회사명', - companyName: '회사명', - briefingDate: '2025-12-12', - attendee: '이름', - }, - bidInfo: { - projectName: '현장명', - bidDate: '2025-12-12', - siteCount: 21, - constructionPeriod: '2026-01-01 ~ 2026-12-10', - constructionStartDate: '2026-01-01', - constructionEndDate: '2026-12-10', - vatType: 'excluded', - workReport: '업무 보고 내용', - documents: [ - { - id: '1', - fileName: 'abc.zip', - fileUrl: '#', - fileSize: 1024000, - }, - ], - }, - summaryItems: [ - { - id: '1', - name: '서터 심창측공사', - quantity: 1, - unit: '식', - materialCost: 78540000, - laborCost: 15410000, - totalCost: 93950000, - remarks: '', - }, - ], - expenseItems: [ - { - id: '1', - name: 'public_1', - amount: 10000, - }, - ], - priceAdjustments: [ - { - id: '1', - category: '배합비', - unitPrice: 10000, - coating: 10000, - batting: 10000, - boxReinforce: 10500, - painting: 10500, - total: 51000, - }, - { - id: '2', - category: '재단비', - unitPrice: 1375, - coating: 0, - batting: 0, - boxReinforce: 0, - painting: 0, - total: 1375, - }, - { - id: '3', - category: '판매단가', - unitPrice: 0, - coating: 10000, - batting: 10000, - boxReinforce: 10500, - painting: 10500, - total: 41000, - }, - { - id: '4', - category: '조립단가', - unitPrice: 10300, - coating: 10300, - batting: 10300, - boxReinforce: 10500, - painting: 10200, - total: 51600, - }, - ], - detailItems: [ - { - id: '1', - no: 1, - name: 'FS530외/주차', - material: 'screen', - width: 2350, - height: 2500, - quantity: 1, - box: 1, - assembly: 0, - coating: 0, - batting: 0, - mounting: 0, - fitting: 0, - controller: 0, - widthConstruction: 0, - heightConstruction: 0, - materialCost: 1420000, - laborCost: 510000, - quantityPrice: 1930000, - expenseQuantity: 5500, - expenseTotal: 5500, - totalCost: 1930000, - otherCost: 0, - marginCost: 0, - totalPrice: 1930000, - unitPrice: 1420000, - expense: 0, - marginRate: 0, - unitQuantity: 1, - expenseResult: 0, - marginActual: 0, - }, - { - id: '2', - no: 2, - name: 'FS530외/주차', - material: 'screen', - width: 7500, - height: 2500, - quantity: 1, - box: 1, - assembly: 0, - coating: 0, - batting: 0, - mounting: 0, - fitting: 0, - controller: 0, - widthConstruction: 0, - heightConstruction: 0, - materialCost: 4720000, - laborCost: 780000, - quantityPrice: 5500000, - expenseQuantity: 5500, - expenseTotal: 5500, - totalCost: 5500000, - otherCost: 0, - marginCost: 0, - totalPrice: 5500000, - unitPrice: 4720000, - expense: 0, - marginRate: 0, - unitQuantity: 1, - expenseResult: 0, - marginActual: 0, - }, - ], - approval: { - approvers: [], - references: [], - }, - }; - - return mockData; -} - export default function EstimateDetailPage({ params }: EstimateDetailPageProps) { const { id } = use(params); const [data, setData] = useState(null); const [isLoading, setIsLoading] = useState(true); + const [error, setError] = useState(null); useEffect(() => { - const detail = getEstimateDetail(id); - setData(detail); - setIsLoading(false); + async function fetchData() { + try { + setIsLoading(true); + setError(null); + const result = await getEstimateDetail(id); + if (result.success && result.data) { + setData(result.data); + } else { + setError(result.error || '견적 정보를 불러오는데 실패했습니다.'); + } + } catch (err) { + setError(err instanceof Error ? err.message : '오류가 발생했습니다.'); + } finally { + setIsLoading(false); + } + } + fetchData(); }, [id]); if (isLoading) { @@ -209,6 +43,14 @@ export default function EstimateDetailPage({ params }: EstimateDetailPageProps) ); } + if (error) { + return ( +
+
{error}
+
+ ); + } + return ( | null; + attendee_count: number; + site_count: number; + construction_start_date: string | null; + construction_end_date: string | null; + vat_type: string; partner?: { id: number; name: string; @@ -162,26 +175,38 @@ function mapQuoteStatusToEstimateStatus( */ function transformQuoteToEstimateDetail(apiData: ApiQuote): EstimateDetail { const base = transformQuoteToEstimate(apiData); + const sb = apiData.site_briefing; - const siteBriefing: SiteBriefingInfo = apiData.site_briefing + // 참석자 정보 변환 + const attendeeNames = sb?.attendees + ? sb.attendees.map((a) => a.name).join(', ') + : ''; + + // 공사기간 문자열 생성 + const constructionPeriod = + sb?.construction_start_date && sb?.construction_end_date + ? `${sb.construction_start_date} ~ ${sb.construction_end_date}` + : ''; + + const siteBriefing: SiteBriefingInfo = sb ? { - briefingCode: apiData.site_briefing.briefing_code || '', - partnerName: apiData.site_briefing.partner?.name || '', - companyName: '', - briefingDate: apiData.site_briefing.briefing_date || '', - attendee: '', + briefingCode: sb.briefing_code || '', + partnerName: sb.partner?.name || '', + companyName: sb.partner?.name || '', + briefingDate: sb.briefing_date || '', + attendee: attendeeNames, } : { briefingCode: '', partnerName: '', companyName: '', briefingDate: '', attendee: '' }; const bidInfo: BidInfo = { - projectName: apiData.site_name || '', - bidDate: apiData.registration_date || '', - siteCount: 0, - constructionPeriod: '', - constructionStartDate: '', - constructionEndDate: '', - vatType: 'excluded', - workReport: '', + projectName: sb?.title || apiData.site_name || '', + bidDate: sb?.bid_date || apiData.registration_date || '', + siteCount: sb?.site_count || 0, + constructionPeriod, + constructionStartDate: sb?.construction_start_date || '', + constructionEndDate: sb?.construction_end_date || '', + vatType: (sb?.vat_type as 'excluded' | 'included') || 'excluded', + workReport: sb?.description || '', documents: [], }; From 777872486a723c271eaeb8b31efbc88999fa12d1 Mon Sep 17 00:00:00 2001 From: kent Date: Tue, 13 Jan 2026 19:47:57 +0900 Subject: [PATCH 37/45] =?UTF-8?q?feat(WEB):=20=EA=B1=B4=EC=84=A4=20?= =?UTF-8?q?=EB=85=B8=EB=AC=B4/=ED=98=91=EB=A0=A5=EC=82=AC/=ED=98=84?= =?UTF-8?q?=EC=9E=A5=EA=B4=80=EB=A6=AC=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 노무관리 actions API 연동 개선 - 협력사 폼 및 actions 개선 - 현장관리 actions 추가 --- .../construction/labor-management/actions.ts | 327 +++++++++--------- .../construction/partners/PartnerForm.tsx | 37 +- .../business/construction/partners/actions.ts | 64 ++-- .../construction/site-management/actions.ts | 36 ++ 4 files changed, 261 insertions(+), 203 deletions(-) diff --git a/src/components/business/construction/labor-management/actions.ts b/src/components/business/construction/labor-management/actions.ts index b665f57a..95e6a6e9 100644 --- a/src/components/business/construction/labor-management/actions.ts +++ b/src/components/business/construction/labor-management/actions.ts @@ -1,89 +1,85 @@ 'use server'; -import type { Labor, LaborListParams, LaborFormData, LaborStats } from './types'; +import type { + Labor, + LaborListParams, + LaborFormData, + LaborStats, +} from './types'; +import { apiClient } from '@/lib/api'; -// 목데이터 - 7건 -const mockLabors: Labor[] = [ - { - id: '1', - laborNumber: '123123', - category: '가로', - minM: 0, - maxM: 6.00, - laborPrice: 400000, - status: '사용', - createdAt: '2026-01-03T10:00:00Z', - updatedAt: '2026-01-03T10:00:00Z', - }, - { - id: '2', - laborNumber: '123123', - category: '세로할증', - minM: 3.50, - maxM: 3.00, - laborPrice: null, - status: '중지', - createdAt: '2026-01-03T09:00:00Z', - updatedAt: '2026-01-03T09:00:00Z', - }, - { - id: '3', - laborNumber: '123123', - category: '가로', - minM: 6.01, - maxM: 7.00, - laborPrice: null, - status: '사용', - createdAt: '2026-01-02T15:00:00Z', - updatedAt: '2026-01-02T15:00:00Z', - }, - { - id: '4', - laborNumber: '123123', - category: '세로할증', - minM: 3.51, - maxM: 4.50, - laborPrice: 50000, - status: '사용', - createdAt: '2026-01-02T14:00:00Z', - updatedAt: '2026-01-02T14:00:00Z', - }, - { - id: '5', - laborNumber: '123123', - category: '가로', - minM: 0, - maxM: 6.00, - laborPrice: null, - status: '사용', - createdAt: '2026-01-01T12:00:00Z', - updatedAt: '2026-01-01T12:00:00Z', - }, - { - id: '6', - laborNumber: '123123', - category: '세로할증', - minM: 3.50, - maxM: 0, - laborPrice: 50000, - status: '사용', - createdAt: '2026-01-01T11:00:00Z', - updatedAt: '2026-01-01T11:00:00Z', - }, - { - id: '7', - laborNumber: '123123', - category: '가로', - minM: 0, - maxM: 0, - laborPrice: null, - status: '중지', - createdAt: '2026-01-01T10:00:00Z', - updatedAt: '2026-01-01T10:00:00Z', - }, -]; +/** + * 시공관리 - 노임관리 Server Actions + * 표준화된 apiClient 사용 버전 + */ -// 노임 목록 조회 +// ======================================== +// API 응답 타입 +// ======================================== + +interface ApiLabor { + id: number; + labor_number: string; + category: '가로' | '세로할증'; + min_m: number; + max_m: number; + labor_price: number | null; + status: '사용' | '중지'; + is_active: boolean; + created_at: string; + updated_at: string; +} + +interface ApiLaborStats { + total: number; + active: number; +} + +// ======================================== +// 타입 변환 함수 +// ======================================== + +/** + * API 응답 → Labor 타입 변환 + */ +function transformLabor(apiData: ApiLabor): Labor { + return { + id: String(apiData.id), + laborNumber: apiData.labor_number || '', + category: apiData.category || '가로', + minM: apiData.min_m || 0, + maxM: apiData.max_m || 0, + laborPrice: apiData.labor_price, + status: apiData.status || '사용', + createdAt: apiData.created_at || '', + updatedAt: apiData.updated_at || '', + }; +} + +/** + * LaborFormData → API 요청 데이터 변환 + */ +function transformToApiRequest(data: Partial): Record { + const apiData: Record = {}; + + if (data.laborNumber !== undefined) apiData.labor_number = data.laborNumber; + if (data.category !== undefined) apiData.category = data.category; + if (data.minM !== undefined) apiData.min_m = data.minM; + if (data.maxM !== undefined) apiData.max_m = data.maxM; + if (data.laborPrice !== undefined) apiData.labor_price = data.laborPrice; + if (data.status !== undefined) apiData.status = data.status; + + return apiData; +} + +// ======================================== +// API 함수 +// ======================================== + +/** + * 노임 목록 조회 + * GET /api/v1/labor + */ export async function getLaborList(params: LaborListParams = {}): Promise<{ success: boolean; data?: Labor[]; @@ -91,125 +87,120 @@ export async function getLaborList(params: LaborListParams = {}): Promise<{ error?: string; }> { try { - let filtered = [...mockLabors]; + const queryParams: Record = {}; - // 검색어 필터 - if (params.search) { - const searchLower = params.search.toLowerCase(); - filtered = filtered.filter( - (labor) => - labor.laborNumber.toLowerCase().includes(searchLower) || - labor.category.toLowerCase().includes(searchLower) - ); - } + // 검색 + if (params.search) queryParams.search = params.search; - // 구분 필터 - if (params.category && params.category !== 'all') { - filtered = filtered.filter((labor) => labor.category === params.category); - } - - // 상태 필터 - if (params.status && params.status !== 'all') { - filtered = filtered.filter((labor) => labor.status === params.status); - } + // 필터 + if (params.category && params.category !== 'all') queryParams.category = params.category; + if (params.status && params.status !== 'all') queryParams.status = params.status; // 날짜 필터 - if (params.startDate) { - filtered = filtered.filter( - (labor) => new Date(labor.createdAt) >= new Date(params.startDate!) - ); - } - if (params.endDate) { - const endDate = new Date(params.endDate); - endDate.setHours(23, 59, 59, 999); - filtered = filtered.filter( - (labor) => new Date(labor.createdAt) <= endDate - ); - } + if (params.startDate) queryParams.start_date = params.startDate; + if (params.endDate) queryParams.end_date = params.endDate; + + // 페이지네이션 + if (params.page) queryParams.page = String(params.page); + if (params.limit) queryParams.per_page = String(params.limit); // 정렬 if (params.sortOrder === '등록순') { - filtered.sort( - (a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime() - ); + queryParams.sort_by = 'created_at'; + queryParams.sort_dir = 'asc'; } else { // 기본: 최신순 - filtered.sort( - (a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime() - ); + queryParams.sort_by = 'created_at'; + queryParams.sort_dir = 'desc'; } - const total = filtered.length; + const response = await apiClient.get<{ + data: ApiLabor[]; + current_page: number; + per_page: number; + total: number; + last_page: number; + }>('/labor', { params: queryParams }); - // 페이지네이션 - if (params.page && params.limit) { - const start = (params.page - 1) * params.limit; - filtered = filtered.slice(start, start + params.limit); - } + const items = (response.data || []).map(transformLabor); - return { success: true, data: filtered, total }; + return { + success: true, + data: items, + total: response.total || 0, + }; } catch (error) { console.error('노임 목록 조회 실패:', error); return { success: false, error: '노임 목록을 불러오는데 실패했습니다.' }; } } -// 노임 통계 조회 +/** + * 노임 통계 조회 + * GET /api/v1/labor/stats + */ export async function getLaborStats(): Promise<{ success: boolean; data?: LaborStats; error?: string; }> { try { - const total = mockLabors.length; - const active = mockLabors.filter((labor) => labor.status === '사용').length; - return { success: true, data: { total, active } }; + const response = await apiClient.get('/labor/stats'); + + return { + success: true, + data: { + total: response.total || 0, + active: response.active || 0, + }, + }; } catch (error) { console.error('노임 통계 조회 실패:', error); return { success: false, error: '노임 통계를 불러오는데 실패했습니다.' }; } } -// 노임 상세 조회 +/** + * 노임 상세 조회 + * GET /api/v1/labor/{id} + */ export async function getLabor(id: string): Promise<{ success: boolean; data?: Labor; error?: string; }> { try { - const labor = mockLabors.find((l) => l.id === id); - if (!labor) { - return { success: false, error: '노임 정보를 찾을 수 없습니다.' }; - } - return { success: true, data: labor }; + const response = await apiClient.get(`/labor/${id}`); + return { success: true, data: transformLabor(response) }; } catch (error) { console.error('노임 상세 조회 실패:', error); - return { success: false, error: '노임 정보를 불러오는데 실패했습니다.' }; + return { success: false, error: '노임 정보를 찾을 수 없습니다.' }; } } -// 노임 등록 +/** + * 노임 등록 + * POST /api/v1/labor + */ export async function createLabor(data: LaborFormData): Promise<{ success: boolean; data?: Labor; error?: string; }> { try { - const newLabor: Labor = { - id: String(Date.now()), - ...data, - createdAt: new Date().toISOString(), - updatedAt: new Date().toISOString(), - }; - mockLabors.unshift(newLabor); - return { success: true, data: newLabor }; + const apiData = transformToApiRequest(data); + const response = await apiClient.post('/labor', apiData); + return { success: true, data: transformLabor(response) }; } catch (error) { console.error('노임 등록 실패:', error); return { success: false, error: '노임 등록에 실패했습니다.' }; } } -// 노임 수정 +/** + * 노임 수정 + * PUT /api/v1/labor/{id} + */ export async function updateLabor( id: string, data: LaborFormData @@ -219,33 +210,25 @@ export async function updateLabor( error?: string; }> { try { - const index = mockLabors.findIndex((l) => l.id === id); - if (index === -1) { - return { success: false, error: '노임 정보를 찾을 수 없습니다.' }; - } - mockLabors[index] = { - ...mockLabors[index], - ...data, - updatedAt: new Date().toISOString(), - }; - return { success: true, data: mockLabors[index] }; + const apiData = transformToApiRequest(data); + const response = await apiClient.put(`/labor/${id}`, apiData); + return { success: true, data: transformLabor(response) }; } catch (error) { console.error('노임 수정 실패:', error); return { success: false, error: '노임 수정에 실패했습니다.' }; } } -// 노임 삭제 +/** + * 노임 삭제 + * DELETE /api/v1/labor/{id} + */ export async function deleteLabor(id: string): Promise<{ success: boolean; error?: string; }> { try { - const index = mockLabors.findIndex((l) => l.id === id); - if (index === -1) { - return { success: false, error: '노임 정보를 찾을 수 없습니다.' }; - } - mockLabors.splice(index, 1); + await apiClient.delete(`/labor/${id}`); return { success: true }; } catch (error) { console.error('노임 삭제 실패:', error); @@ -253,22 +236,20 @@ export async function deleteLabor(id: string): Promise<{ } } -// 노임 일괄 삭제 +/** + * 노임 일괄 삭제 + * DELETE /api/v1/labor/bulk + */ export async function deleteLaborBulk(ids: string[]): Promise<{ success: boolean; deletedCount?: number; error?: string; }> { try { - let deletedCount = 0; - for (const id of ids) { - const index = mockLabors.findIndex((l) => l.id === id); - if (index !== -1) { - mockLabors.splice(index, 1); - deletedCount++; - } - } - return { success: true, deletedCount }; + await apiClient.delete('/labor/bulk', { + data: { ids: ids.map((id) => Number(id)) }, + }); + return { success: true, deletedCount: ids.length }; } catch (error) { console.error('노임 일괄 삭제 실패:', error); return { success: false, error: '노임 일괄 삭제에 실패했습니다.' }; diff --git a/src/components/business/construction/partners/PartnerForm.tsx b/src/components/business/construction/partners/PartnerForm.tsx index 28c8ae4b..957868c4 100644 --- a/src/components/business/construction/partners/PartnerForm.tsx +++ b/src/components/business/construction/partners/PartnerForm.tsx @@ -33,13 +33,13 @@ import { toast } from 'sonner'; import type { Partner, PartnerFormData, PartnerMemo, PartnerDocument } from './types'; import { PARTNER_TYPE_OPTIONS, - CATEGORY_OPTIONS, CREDIT_RATING_OPTIONS, TRANSACTION_GRADE_OPTIONS, PAYMENT_DAY_OPTIONS, getEmptyPartnerFormData, partnerToFormData, } from './types'; +import { createPartner, updatePartner, deletePartner } from './actions'; // 목업 문서 목록 (상세 모드에서 다운로드 버튼 테스트용) const MOCK_DOCUMENTS: PartnerDocument[] = [ @@ -158,8 +158,19 @@ export default function PartnerForm({ mode, partnerId, initialData }: PartnerFor const handleConfirmSave = useCallback(async () => { setIsLoading(true); try { - // TODO: 실제 API 연동 - await new Promise((resolve) => setTimeout(resolve, 1000)); + let result; + if (isNewMode) { + result = await createPartner(formData); + } else if (partnerId) { + result = await updatePartner(partnerId, formData); + } else { + throw new Error('거래처 ID가 없습니다.'); + } + + if (!result.success) { + throw new Error(result.error || '저장에 실패했습니다.'); + } + toast.success(isNewMode ? '거래처가 등록되었습니다.' : '수정이 완료되었습니다.'); setShowSaveDialog(false); router.push('/ko/construction/project/bidding/partners'); @@ -169,7 +180,7 @@ export default function PartnerForm({ mode, partnerId, initialData }: PartnerFor } finally { setIsLoading(false); } - }, [isNewMode, router]); + }, [isNewMode, partnerId, formData, router]); // 삭제 핸들러 const handleDelete = useCallback(() => { @@ -177,10 +188,19 @@ export default function PartnerForm({ mode, partnerId, initialData }: PartnerFor }, []); const handleConfirmDelete = useCallback(async () => { + if (!partnerId) { + toast.error('거래처 ID가 없습니다.'); + return; + } + setIsLoading(true); try { - // TODO: 실제 API 연동 - await new Promise((resolve) => setTimeout(resolve, 1000)); + const result = await deletePartner(partnerId); + + if (!result.success) { + throw new Error(result.error || '삭제에 실패했습니다.'); + } + toast.success('거래처가 삭제되었습니다.'); setShowDeleteDialog(false); router.push('/ko/construction/project/bidding/partners'); @@ -190,7 +210,7 @@ export default function PartnerForm({ mode, partnerId, initialData }: PartnerFor } finally { setIsLoading(false); } - }, [router]); + }, [partnerId, router]); // 메모 추가 핸들러 const handleAddMemo = useCallback(() => { @@ -493,8 +513,7 @@ export default function PartnerForm({ mode, partnerId, initialData }: PartnerFor {renderField('대표자명', 'representative', formData.representative)} {renderSelectField('거래처 유형', 'partnerType', formData.partnerType, PARTNER_TYPE_OPTIONS)} {renderField('업태', 'businessType', formData.businessType)} - {renderSelectField('업종', 'category', formData.category, CATEGORY_OPTIONS)} - {renderField('업종(직접입력)', 'businessCategory', formData.businessCategory)} + {renderField('업종', 'businessCategory', formData.businessCategory)} diff --git a/src/components/business/construction/partners/actions.ts b/src/components/business/construction/partners/actions.ts index 5b78610a..26d47738 100644 --- a/src/components/business/construction/partners/actions.ts +++ b/src/components/business/construction/partners/actions.ts @@ -74,6 +74,18 @@ function transformPartnerType(partnerType: Partner['partnerType']): string { return typeMap[partnerType] || 'SALES'; } +/** + * client_type → 구분 라벨 변환 + */ +function getPartnerTypeLabel(clientType: string | null | undefined): string { + const labelMap: Record = { + SALES: '매출', + PURCHASE: '매입', + BOTH: '복합', + }; + return labelMap[clientType || ''] || '매출'; +} + /** * API 응답 → Partner 타입 변환 */ @@ -109,7 +121,7 @@ function transformPartner(apiData: ApiPartner): Partner { badDebtToggle: apiData.has_bad_debt, memos: [], documents: [], - category: '', + category: getPartnerTypeLabel(apiData.client_type), paymentDay: 0, isBadDebt: apiData.has_bad_debt, isActive: apiData.is_active !== false, @@ -165,15 +177,20 @@ export async function getPartnerList(filter?: PartnerFilter): Promise<{ if (filter?.page) queryParams.page = String(filter.page); if (filter?.size) queryParams.size = String(filter.size); + // API 응답 구조: { success, data: { data: [...], current_page, per_page, total, last_page } } const response = await apiClient.get<{ - data: ApiPartner[]; - current_page: number; - per_page: number; - total: number; - last_page: number; + success: boolean; + data: { + data: ApiPartner[]; + current_page: number; + per_page: number; + total: number; + last_page: number; + }; }>('/clients', { params: queryParams }); - let items = (response.data || []).map(transformPartner); + const paginated = response.data; + let items = (paginated?.data || []).map(transformPartner); // 악성채권 필터 (프론트엔드에서 처리) if (filter?.badDebtFilter && filter.badDebtFilter !== 'all') { @@ -202,10 +219,10 @@ export async function getPartnerList(filter?: PartnerFilter): Promise<{ success: true, data: { items, - total: response.total || 0, - page: response.current_page || 1, - size: response.per_page || 20, - totalPages: response.last_page || 1, + total: paginated?.total || 0, + page: paginated?.current_page || 1, + size: paginated?.per_page || 20, + totalPages: paginated?.last_page || 1, }, }; } catch (error) { @@ -224,8 +241,9 @@ export async function getPartner(id: string): Promise<{ error?: string; }> { try { - const response = await apiClient.get(`/clients/${id}`); - return { success: true, data: transformPartner(response) }; + // API 응답 구조: { success, data: {...single item} } + const response = await apiClient.get<{ success: boolean; data: ApiPartner }>(`/clients/${id}`); + return { success: true, data: transformPartner(response.data) }; } catch (error) { console.error('거래처 조회 오류:', error); return { success: false, error: '거래처를 찾을 수 없습니다.' }; @@ -243,8 +261,9 @@ export async function createPartner(data: PartnerFormData): Promise<{ }> { try { const apiData = transformPartnerToApi(data); - const response = await apiClient.post('/clients', apiData); - return { success: true, data: transformPartner(response) }; + // API 응답 구조: { success, data: {...created item} } + const response = await apiClient.post<{ success: boolean; data: ApiPartner }>('/clients', apiData); + return { success: true, data: transformPartner(response.data) }; } catch (error) { console.error('거래처 등록 오류:', error); return { success: false, error: '거래처 등록에 실패했습니다.' }; @@ -262,8 +281,9 @@ export async function updatePartner(id: string, data: PartnerFormData): Promise< }> { try { const apiData = transformPartnerToApi(data); - const response = await apiClient.put(`/clients/${id}`, apiData); - return { success: true, data: transformPartner(response) }; + // API 응답 구조: { success, data: {...updated item} } + const response = await apiClient.put<{ success: boolean; data: ApiPartner }>(`/clients/${id}`, apiData); + return { success: true, data: transformPartner(response.data) }; } catch (error) { console.error('거래처 수정 오류:', error); return { success: false, error: '거래처 수정에 실패했습니다.' }; @@ -280,15 +300,17 @@ export async function getPartnerStats(): Promise<{ error?: string; }> { try { - const response = await apiClient.get('/clients/stats'); + // API 응답 구조: { success, data: {...stats} } + const response = await apiClient.get<{ success: boolean; data: ApiPartnerStats }>('/clients/stats'); + const stats = response.data; return { success: true, data: { - total: response.total || 0, + total: stats?.total || 0, unregistered: 0, - badDebt: response.badDebt || 0, - normal: response.normal || 0, + badDebt: stats?.badDebt || 0, + normal: stats?.normal || 0, }, }; } catch (error) { diff --git a/src/components/business/construction/site-management/actions.ts b/src/components/business/construction/site-management/actions.ts index 2ccaadca..2dab97ae 100644 --- a/src/components/business/construction/site-management/actions.ts +++ b/src/components/business/construction/site-management/actions.ts @@ -210,4 +210,40 @@ export async function deleteSites(ids: string[]): Promise<{ console.error('현장 일괄 삭제 오류:', error); return { success: false, error: '현장 일괄 삭제에 실패했습니다.' }; } +} + +// ======================================== +// 현장 생성/수정 타입 +// ======================================== + +export interface CreateSiteData { + siteName: string; + partnerId: string; + address?: string; + status?: SiteStatus; +} + +/** + * 현장 등록 + * POST /api/v1/sites + */ +export async function createSite(data: CreateSiteData): Promise<{ + success: boolean; + data?: Site; + error?: string; +}> { + try { + const apiData = { + name: data.siteName, + client_id: data.partnerId ? Number(data.partnerId) : null, + address: data.address || null, + status: data.status || 'unregistered', + }; + + const response = await apiClient.post<{ success: boolean; data: ApiSite }>('/sites', apiData); + return { success: true, data: transformSite(response.data) }; + } catch (error) { + console.error('현장 등록 오류:', error); + return { success: false, error: '현장 등록에 실패했습니다.' }; + } } \ No newline at end of file From 42b0a5778eea796c7097ce8a8c6156075039ad9b Mon Sep 17 00:00:00 2001 From: kent Date: Tue, 13 Jan 2026 19:48:03 +0900 Subject: [PATCH 38/45] =?UTF-8?q?fix(WEB):=20=EC=98=81=EC=97=85=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=B0=8F=20=EA=B2=AC=EC=A0=81=20?= =?UTF-8?q?=ED=83=80=EC=9E=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 생산지시 페이지 에러 처리 개선 - 견적관리 상세 페이지 개선 - quotes types 수정 --- .../[id]/production-order/page.tsx | 49 +++++++++-- .../sales/quote-management/[id]/page.tsx | 84 +++++++++++++++++++ src/components/quotes/types.ts | 4 +- 3 files changed, 128 insertions(+), 9 deletions(-) diff --git a/src/app/[locale]/(protected)/sales/order-management-sales/[id]/production-order/page.tsx b/src/app/[locale]/(protected)/sales/order-management-sales/[id]/production-order/page.tsx index c470f295..aac8ee92 100644 --- a/src/app/[locale]/(protected)/sales/order-management-sales/[id]/production-order/page.tsx +++ b/src/app/[locale]/(protected)/sales/order-management-sales/[id]/production-order/page.tsx @@ -340,8 +340,7 @@ export default function ProductionOrderCreatePage() { // 성공 다이얼로그 상태 const [showSuccessDialog, setShowSuccessDialog] = useState(false); - const [generatedOrderNumber, setGeneratedOrderNumber] = useState(""); - const [generatedWorkOrderId, setGeneratedWorkOrderId] = useState(null); + const [generatedWorkOrders, setGeneratedWorkOrders] = useState>([]); // 수주 데이터 및 공정 목록 로드 const fetchData = useCallback(async () => { @@ -388,16 +387,39 @@ export default function ProductionOrderCreatePage() { setIsSubmitting(true); setError(null); try { + // 공정별 품목 그룹핑 (processIds 추출을 위해) + const groups = groupItemsByProcess( + (order.items || []).map((item) => ({ + itemName: item.itemName, + itemCode: item.itemCode, + quantity: item.quantity, + })), + processes + ); + + // 모든 매칭된 공정 ID 추출 (공정별로 각각 작업지시 생성) + const matchedGroups = groups.filter((g) => g.process.id !== "unmatched"); + const allProcessIds = matchedGroups + .map((g) => parseInt(g.process.id, 10)) + .filter((id) => !isNaN(id)); + const productionData: CreateProductionOrderData = { priority: selectedPriority, memo: memo || undefined, + processIds: allProcessIds.length > 0 ? allProcessIds : undefined, }; const result = await createProductionOrder(orderId, productionData); if (result.success && result.data) { - setGeneratedOrderNumber(result.data.workOrder.workOrderNo); - setGeneratedWorkOrderId(result.data.workOrder.id); + // 다중 작업지시 응답 처리 + const workOrders = result.data.workOrders || (result.data.workOrder ? [result.data.workOrder] : []); + setGeneratedWorkOrders( + workOrders.map((wo: { workOrderNo: string; process?: { processName: string } }) => ({ + workOrderNo: wo.workOrderNo, + processName: wo.process?.processName, + })) + ); setShowSuccessDialog(true); } else { setError(result.error || "생산지시 생성에 실패했습니다."); @@ -911,16 +933,27 @@ export default function ProductionOrderCreatePage() { - 생산지시가 생성되었습니다. + 작업지시가 {generatedWorkOrders.length}건 생성되었습니다.
-

생산지시번호:

-

{generatedOrderNumber}

+

생성된 작업지시:

+
    + {generatedWorkOrders.map((wo, idx) => ( +
  • + {wo.workOrderNo} + {wo.processName && ( + + {wo.processName} + + )} +
    • + ))} +

- 생산관리 > 생산지시 관리에서 작업지시서를 생성하세요. + 생산관리 > 작업지시 관리에서 확인하세요.

diff --git a/src/app/[locale]/(protected)/sales/quote-management/[id]/page.tsx b/src/app/[locale]/(protected)/sales/quote-management/[id]/page.tsx index f13b97c2..c688a319 100644 --- a/src/app/[locale]/(protected)/sales/quote-management/[id]/page.tsx +++ b/src/app/[locale]/(protected)/sales/quote-management/[id]/page.tsx @@ -47,6 +47,9 @@ import { MessageCircle, X, FileCheck, + Package, + ChevronDown, + ChevronUp, } from "lucide-react"; import { ContentLoadingSpinner } from "@/components/ui/loading-spinner"; @@ -69,6 +72,9 @@ export default function QuoteDetailPage() { const [showDetailedBreakdown, setShowDetailedBreakdown] = useState(true); const [showMaterialList, setShowMaterialList] = useState(true); + // BOM 자재 상세 펼침/접힘 상태 + const [isBomExpanded, setIsBomExpanded] = useState(true); + // 견적 데이터 조회 const fetchQuote = useCallback(async () => { setIsLoading(true); @@ -464,6 +470,84 @@ export default function QuoteDetailPage() { + {/* BOM 자재 상세 */} + {quote.bomMaterials && quote.bomMaterials.length > 0 && ( + + +
+ + + BOM 자재 상세 + + {quote.bomMaterials.length}개 품목 + + + +
+ + {isBomExpanded && ( + +
+ + + + + + + + + + + + + + + + {quote.bomMaterials.map((material, index) => ( + + + + + + + + + + + + ))} + + + + + + + +
No품목코드품목명유형규격단위수량단가금액
{index + 1}{material.itemCode}{material.itemName} + + {material.itemType === 'RM' ? '원자재' : + material.itemType === 'SM' ? '부자재' : + material.itemType === 'CS' ? '소모품' : material.itemType} + + {material.specification || '-'}{material.unit}{material.quantity.toLocaleString()}₩{material.unitPrice.toLocaleString()}₩{material.totalPrice.toLocaleString()}
합계 + ₩{quote.bomMaterials.reduce((sum, m) => sum + m.totalPrice, 0).toLocaleString()} +
+
+ + )} + + )} + {/* 견적서 다이얼로그 */} diff --git a/src/components/quotes/types.ts b/src/components/quotes/types.ts index 3de2efeb..c0c11f51 100644 --- a/src/components/quotes/types.ts +++ b/src/components/quotes/types.ts @@ -69,6 +69,7 @@ export interface QuoteItem { id: string; quoteId: string; productId?: string; + itemCode?: string; // 품목코드 (item_code) productName: string; specification?: string; unit?: string; @@ -298,6 +299,7 @@ export function transformItemApiToFrontend(apiData: QuoteItemApiData): QuoteItem id: String(apiData.id), quoteId: String(apiData.quote_id), productId: apiData.item_id ? String(apiData.item_id) : (apiData.product_id ? String(apiData.product_id) : undefined), + itemCode: apiData.item_code || undefined, // 품목코드 productName, specification: apiData.specification || undefined, unit: apiData.unit || undefined, @@ -545,7 +547,7 @@ export function transformQuoteToFormData(quote: Quote): QuoteFormData { ? quote.items.map((item, index) => ({ itemIndex: index, finishedGoodsCode: '', - itemCode: item.productId || item.id || '', + itemCode: item.itemCode || '', // 품목코드 사용 itemName: item.productName, itemType: '', itemCategory: '', From 8dd49e4fa2ff129300f32cad4082060ffd142505 Mon Sep 17 00:00:00 2001 From: kent Date: Tue, 13 Jan 2026 19:48:08 +0900 Subject: [PATCH 39/45] =?UTF-8?q?feat(WEB):=20formatAmount=20=EC=9C=A0?= =?UTF-8?q?=ED=8B=B8=EB=A6=AC=ED=8B=B0=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/formatAmount.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/utils/formatAmount.ts b/src/utils/formatAmount.ts index f4c8ddc1..dcc845a4 100644 --- a/src/utils/formatAmount.ts +++ b/src/utils/formatAmount.ts @@ -6,6 +6,11 @@ */ export function formatAmount(amount: number): string { + // NaN, undefined, null 처리 + if (amount == null || isNaN(amount)) { + return "0원"; + } + if (amount < 10000) { return `${amount.toLocaleString("ko-KR")}원`; } else { @@ -18,6 +23,10 @@ export function formatAmount(amount: number): string { * 금액을 원 단위로 포맷 (항상 "원" 단위) */ export function formatAmountWon(amount: number): string { + // NaN, undefined, null 처리 + if (amount == null || isNaN(amount)) { + return "0원"; + } return `${amount.toLocaleString("ko-KR")}원`; } From 4d7601abaff7050bd31214b6a3f78f4b28f6bc63 Mon Sep 17 00:00:00 2001 From: kent Date: Tue, 13 Jan 2026 19:48:20 +0900 Subject: [PATCH 40/45] =?UTF-8?q?chore(WEB):=20package-lock.json=20?= =?UTF-8?q?=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 3002 +++++++++++++++++++-------------------------- 1 file changed, 1243 insertions(+), 1759 deletions(-) diff --git a/package-lock.json b/package-lock.json index bb423423..965cfeae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -115,9 +115,9 @@ "license": "MIT" }, "node_modules/@emnapi/core": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.7.0.tgz", - "integrity": "sha512-pJdKGq/1iquWYtv1RRSljZklxHCOCAJFJrImO5ZLKPJVJlVUcs8yFwNQlqS0Lo8xT1VAXXTCZocF9n26FWEKsw==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.8.1.tgz", + "integrity": "sha512-AvT9QFpxK0Zd8J0jopedNm+w/2fIzvtPKPjqyw9jwvBaReTTqPBk9Hixaz7KbjimP+QNz605/XnjFcDAL2pqBg==", "dev": true, "license": "MIT", "optional": true, @@ -127,9 +127,9 @@ } }, "node_modules/@emnapi/runtime": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.7.0.tgz", - "integrity": "sha512-oAYoQnCYaQZKVS53Fq23ceWMRxq5EhQsE0x0RdQ55jT7wagMu5k+fS39v1fiSLrtrLQlXwVINenqhLMtTrV/1Q==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.8.1.tgz", + "integrity": "sha512-mehfKSMWjjNol8659Z8KxEMrdSJDDot5SXMq00dM8BN4o+CLNXQ0xH2V7EchNHV4RmbZLmmPdEaXZc5H2FXmDg==", "license": "MIT", "optional": true, "dependencies": { @@ -148,9 +148,9 @@ } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.9.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz", - "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==", + "version": "4.9.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.1.tgz", + "integrity": "sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==", "dev": true, "license": "MIT", "dependencies": { @@ -231,9 +231,9 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz", - "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.3.tgz", + "integrity": "sha512-Kr+LPIUVKz2qkx1HAMH8q1q6azbqBAsXJUxBl/ODDuVPX45Z9DfwB8tPjTi6nNZ8BuM3nbJxC5zCAg5elnBUTQ==", "dev": true, "license": "MIT", "dependencies": { @@ -243,7 +243,7 @@ "globals": "^14.0.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", + "js-yaml": "^4.1.1", "minimatch": "^3.1.2", "strip-json-comments": "^3.1.1" }, @@ -255,9 +255,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.39.1", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.1.tgz", - "integrity": "sha512-S26Stp4zCy88tH94QbBv3XCuzRQiZ9yXofEILmglYTh/Ug/a9/umqvgFtYBAo3Lp0nsI/5/qH1CCrbdK3AP1Tw==", + "version": "9.39.2", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.2.tgz", + "integrity": "sha512-q1mjIoW1VX4IvSocvM/vbTiveKC4k9eLrajNEuSsmjymSDEbpGddtpfOoN7YGAqBK3NG+uqo8ia4PDTt8buCYA==", "dev": true, "license": "MIT", "engines": { @@ -464,9 +464,9 @@ } }, "node_modules/@img/sharp-darwin-arm64": { - "version": "0.34.4", - "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.34.4.tgz", - "integrity": "sha512-sitdlPzDVyvmINUdJle3TNHl+AG9QcwiAMsXmccqsCOMZNIdW2/7S26w0LyU8euiLVzFBL3dXPwVCq/ODnf2vA==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.34.5.tgz", + "integrity": "sha512-imtQ3WMJXbMY4fxb/Ndp6HBTNVtWCUI0WdobyheGf5+ad6xX8VIDO8u2xE4qc/fr08CKG/7dDseFtn6M6g/r3w==", "cpu": [ "arm64" ], @@ -482,13 +482,13 @@ "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-darwin-arm64": "1.2.3" + "@img/sharp-libvips-darwin-arm64": "1.2.4" } }, "node_modules/@img/sharp-darwin-x64": { - "version": "0.34.4", - "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.34.4.tgz", - "integrity": "sha512-rZheupWIoa3+SOdF/IcUe1ah4ZDpKBGWcsPX6MT0lYniH9micvIU7HQkYTfrx5Xi8u+YqwLtxC/3vl8TQN6rMg==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.34.5.tgz", + "integrity": "sha512-YNEFAF/4KQ/PeW0N+r+aVVsoIY0/qxxikF2SWdp+NRkmMB7y9LBZAVqQ4yhGCm/H3H270OSykqmQMKLBhBJDEw==", "cpu": [ "x64" ], @@ -504,13 +504,13 @@ "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-darwin-x64": "1.2.3" + "@img/sharp-libvips-darwin-x64": "1.2.4" } }, "node_modules/@img/sharp-libvips-darwin-arm64": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.2.3.tgz", - "integrity": "sha512-QzWAKo7kpHxbuHqUC28DZ9pIKpSi2ts2OJnoIGI26+HMgq92ZZ4vk8iJd4XsxN+tYfNJxzH6W62X5eTcsBymHw==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.2.4.tgz", + "integrity": "sha512-zqjjo7RatFfFoP0MkQ51jfuFZBnVE2pRiaydKJ1G/rHZvnsrHAOcQALIi9sA5co5xenQdTugCvtb1cuf78Vf4g==", "cpu": [ "arm64" ], @@ -524,9 +524,9 @@ } }, "node_modules/@img/sharp-libvips-darwin-x64": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.2.3.tgz", - "integrity": "sha512-Ju+g2xn1E2AKO6YBhxjj+ACcsPQRHT0bhpglxcEf+3uyPY+/gL8veniKoo96335ZaPo03bdDXMv0t+BBFAbmRA==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.2.4.tgz", + "integrity": "sha512-1IOd5xfVhlGwX+zXv2N93k0yMONvUlANylbJw1eTah8K/Jtpi15KC+WSiaX/nBmbm2HxRM1gZ0nSdjSsrZbGKg==", "cpu": [ "x64" ], @@ -540,9 +540,9 @@ } }, "node_modules/@img/sharp-libvips-linux-arm": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.2.3.tgz", - "integrity": "sha512-x1uE93lyP6wEwGvgAIV0gP6zmaL/a0tGzJs/BIDDG0zeBhMnuUPm7ptxGhUbcGs4okDJrk4nxgrmxpib9g6HpA==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.2.4.tgz", + "integrity": "sha512-bFI7xcKFELdiNCVov8e44Ia4u2byA+l3XtsAj+Q8tfCwO6BQ8iDojYdvoPMqsKDkuoOo+X6HZA0s0q11ANMQ8A==", "cpu": [ "arm" ], @@ -556,9 +556,9 @@ } }, "node_modules/@img/sharp-libvips-linux-arm64": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.2.3.tgz", - "integrity": "sha512-I4RxkXU90cpufazhGPyVujYwfIm9Nk1QDEmiIsaPwdnm013F7RIceaCc87kAH+oUB1ezqEvC6ga4m7MSlqsJvQ==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.2.4.tgz", + "integrity": "sha512-excjX8DfsIcJ10x1Kzr4RcWe1edC9PquDRRPx3YVCvQv+U5p7Yin2s32ftzikXojb1PIFc/9Mt28/y+iRklkrw==", "cpu": [ "arm64" ], @@ -572,9 +572,9 @@ } }, "node_modules/@img/sharp-libvips-linux-ppc64": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.2.3.tgz", - "integrity": "sha512-Y2T7IsQvJLMCBM+pmPbM3bKT/yYJvVtLJGfCs4Sp95SjvnFIjynbjzsa7dY1fRJX45FTSfDksbTp6AGWudiyCg==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.2.4.tgz", + "integrity": "sha512-FMuvGijLDYG6lW+b/UvyilUWu5Ayu+3r2d1S8notiGCIyYU/76eig1UfMmkZ7vwgOrzKzlQbFSuQfgm7GYUPpA==", "cpu": [ "ppc64" ], @@ -587,10 +587,26 @@ "url": "https://opencollective.com/libvips" } }, + "node_modules/@img/sharp-libvips-linux-riscv64": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-riscv64/-/sharp-libvips-linux-riscv64-1.2.4.tgz", + "integrity": "sha512-oVDbcR4zUC0ce82teubSm+x6ETixtKZBh/qbREIOcI3cULzDyb18Sr/Wcyx7NRQeQzOiHTNbZFF1UwPS2scyGA==", + "cpu": [ + "riscv64" + ], + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, "node_modules/@img/sharp-libvips-linux-s390x": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.2.3.tgz", - "integrity": "sha512-RgWrs/gVU7f+K7P+KeHFaBAJlNkD1nIZuVXdQv6S+fNA6syCcoboNjsV2Pou7zNlVdNQoQUpQTk8SWDHUA3y/w==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.2.4.tgz", + "integrity": "sha512-qmp9VrzgPgMoGZyPvrQHqk02uyjA0/QrTO26Tqk6l4ZV0MPWIW6LTkqOIov+J1yEu7MbFQaDpwdwJKhbJvuRxQ==", "cpu": [ "s390x" ], @@ -604,9 +620,9 @@ } }, "node_modules/@img/sharp-libvips-linux-x64": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.2.3.tgz", - "integrity": "sha512-3JU7LmR85K6bBiRzSUc/Ff9JBVIFVvq6bomKE0e63UXGeRw2HPVEjoJke1Yx+iU4rL7/7kUjES4dZ/81Qjhyxg==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.2.4.tgz", + "integrity": "sha512-tJxiiLsmHc9Ax1bz3oaOYBURTXGIRDODBqhveVHonrHJ9/+k89qbLl0bcJns+e4t4rvaNBxaEZsFtSfAdquPrw==", "cpu": [ "x64" ], @@ -620,9 +636,9 @@ } }, "node_modules/@img/sharp-libvips-linuxmusl-arm64": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.2.3.tgz", - "integrity": "sha512-F9q83RZ8yaCwENw1GieztSfj5msz7GGykG/BA+MOUefvER69K/ubgFHNeSyUu64amHIYKGDs4sRCMzXVj8sEyw==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.2.4.tgz", + "integrity": "sha512-FVQHuwx1IIuNow9QAbYUzJ+En8KcVm9Lk5+uGUQJHaZmMECZmOlix9HnH7n1TRkXMS0pGxIJokIVB9SuqZGGXw==", "cpu": [ "arm64" ], @@ -636,9 +652,9 @@ } }, "node_modules/@img/sharp-libvips-linuxmusl-x64": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.2.3.tgz", - "integrity": "sha512-U5PUY5jbc45ANM6tSJpsgqmBF/VsL6LnxJmIf11kB7J5DctHgqm0SkuXzVWtIY90GnJxKnC/JT251TDnk1fu/g==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.2.4.tgz", + "integrity": "sha512-+LpyBk7L44ZIXwz/VYfglaX/okxezESc6UxDSoyo2Ks6Jxc4Y7sGjpgU9s4PMgqgjj1gZCylTieNamqA1MF7Dg==", "cpu": [ "x64" ], @@ -652,9 +668,9 @@ } }, "node_modules/@img/sharp-linux-arm": { - "version": "0.34.4", - "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.34.4.tgz", - "integrity": "sha512-Xyam4mlqM0KkTHYVSuc6wXRmM7LGN0P12li03jAnZ3EJWZqj83+hi8Y9UxZUbxsgsK1qOEwg7O0Bc0LjqQVtxA==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.34.5.tgz", + "integrity": "sha512-9dLqsvwtg1uuXBGZKsxem9595+ujv0sJ6Vi8wcTANSFpwV/GONat5eCkzQo/1O6zRIkh0m/8+5BjrRr7jDUSZw==", "cpu": [ "arm" ], @@ -670,13 +686,13 @@ "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linux-arm": "1.2.3" + "@img/sharp-libvips-linux-arm": "1.2.4" } }, "node_modules/@img/sharp-linux-arm64": { - "version": "0.34.4", - "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.34.4.tgz", - "integrity": "sha512-YXU1F/mN/Wu786tl72CyJjP/Ngl8mGHN1hST4BGl+hiW5jhCnV2uRVTNOcaYPs73NeT/H8Upm3y9582JVuZHrQ==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.34.5.tgz", + "integrity": "sha512-bKQzaJRY/bkPOXyKx5EVup7qkaojECG6NLYswgktOZjaXecSAeCWiZwwiFf3/Y+O1HrauiE3FVsGxFg8c24rZg==", "cpu": [ "arm64" ], @@ -692,13 +708,13 @@ "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linux-arm64": "1.2.3" + "@img/sharp-libvips-linux-arm64": "1.2.4" } }, "node_modules/@img/sharp-linux-ppc64": { - "version": "0.34.4", - "resolved": "https://registry.npmjs.org/@img/sharp-linux-ppc64/-/sharp-linux-ppc64-0.34.4.tgz", - "integrity": "sha512-F4PDtF4Cy8L8hXA2p3TO6s4aDt93v+LKmpcYFLAVdkkD3hSxZzee0rh6/+94FpAynsuMpLX5h+LRsSG3rIciUQ==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-ppc64/-/sharp-linux-ppc64-0.34.5.tgz", + "integrity": "sha512-7zznwNaqW6YtsfrGGDA6BRkISKAAE1Jo0QdpNYXNMHu2+0dTrPflTLNkpc8l7MUP5M16ZJcUvysVWWrMefZquA==", "cpu": [ "ppc64" ], @@ -714,13 +730,35 @@ "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linux-ppc64": "1.2.3" + "@img/sharp-libvips-linux-ppc64": "1.2.4" + } + }, + "node_modules/@img/sharp-linux-riscv64": { + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-riscv64/-/sharp-linux-riscv64-0.34.5.tgz", + "integrity": "sha512-51gJuLPTKa7piYPaVs8GmByo7/U7/7TZOq+cnXJIHZKavIRHAP77e3N2HEl3dgiqdD/w0yUfiJnII77PuDDFdw==", + "cpu": [ + "riscv64" + ], + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linux-riscv64": "1.2.4" } }, "node_modules/@img/sharp-linux-s390x": { - "version": "0.34.4", - "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.34.4.tgz", - "integrity": "sha512-qVrZKE9Bsnzy+myf7lFKvng6bQzhNUAYcVORq2P7bDlvmF6u2sCmK2KyEQEBdYk+u3T01pVsPrkj943T1aJAsw==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.34.5.tgz", + "integrity": "sha512-nQtCk0PdKfho3eC5MrbQoigJ2gd1CgddUMkabUj+rBevs8tZ2cULOx46E7oyX+04WGfABgIwmMC0VqieTiR4jg==", "cpu": [ "s390x" ], @@ -736,13 +774,13 @@ "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linux-s390x": "1.2.3" + "@img/sharp-libvips-linux-s390x": "1.2.4" } }, "node_modules/@img/sharp-linux-x64": { - "version": "0.34.4", - "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.34.4.tgz", - "integrity": "sha512-ZfGtcp2xS51iG79c6Vhw9CWqQC8l2Ot8dygxoDoIQPTat/Ov3qAa8qpxSrtAEAJW+UjTXc4yxCjNfxm4h6Xm2A==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.34.5.tgz", + "integrity": "sha512-MEzd8HPKxVxVenwAa+JRPwEC7QFjoPWuS5NZnBt6B3pu7EG2Ge0id1oLHZpPJdn3OQK+BQDiw9zStiHBTJQQQQ==", "cpu": [ "x64" ], @@ -758,13 +796,13 @@ "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linux-x64": "1.2.3" + "@img/sharp-libvips-linux-x64": "1.2.4" } }, "node_modules/@img/sharp-linuxmusl-arm64": { - "version": "0.34.4", - "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.34.4.tgz", - "integrity": "sha512-8hDVvW9eu4yHWnjaOOR8kHVrew1iIX+MUgwxSuH2XyYeNRtLUe4VNioSqbNkB7ZYQJj9rUTT4PyRscyk2PXFKA==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.34.5.tgz", + "integrity": "sha512-fprJR6GtRsMt6Kyfq44IsChVZeGN97gTD331weR1ex1c1rypDEABN6Tm2xa1wE6lYb5DdEnk03NZPqA7Id21yg==", "cpu": [ "arm64" ], @@ -780,13 +818,13 @@ "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linuxmusl-arm64": "1.2.3" + "@img/sharp-libvips-linuxmusl-arm64": "1.2.4" } }, "node_modules/@img/sharp-linuxmusl-x64": { - "version": "0.34.4", - "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.34.4.tgz", - "integrity": "sha512-lU0aA5L8QTlfKjpDCEFOZsTYGn3AEiO6db8W5aQDxj0nQkVrZWmN3ZP9sYKWJdtq3PWPhUNlqehWyXpYDcI9Sg==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.34.5.tgz", + "integrity": "sha512-Jg8wNT1MUzIvhBFxViqrEhWDGzqymo3sV7z7ZsaWbZNDLXRJZoRGrjulp60YYtV4wfY8VIKcWidjojlLcWrd8Q==", "cpu": [ "x64" ], @@ -802,20 +840,20 @@ "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linuxmusl-x64": "1.2.3" + "@img/sharp-libvips-linuxmusl-x64": "1.2.4" } }, "node_modules/@img/sharp-wasm32": { - "version": "0.34.4", - "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.34.4.tgz", - "integrity": "sha512-33QL6ZO/qpRyG7woB/HUALz28WnTMI2W1jgX3Nu2bypqLIKx/QKMILLJzJjI+SIbvXdG9fUnmrxR7vbi1sTBeA==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.34.5.tgz", + "integrity": "sha512-OdWTEiVkY2PHwqkbBI8frFxQQFekHaSSkUIJkwzclWZe64O1X4UlUjqqqLaPbUpMOQk6FBu/HtlGXNblIs0huw==", "cpu": [ "wasm32" ], "license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT", "optional": true, "dependencies": { - "@emnapi/runtime": "^1.5.0" + "@emnapi/runtime": "^1.7.0" }, "engines": { "node": "^18.17.0 || ^20.3.0 || >=21.0.0" @@ -825,9 +863,9 @@ } }, "node_modules/@img/sharp-win32-arm64": { - "version": "0.34.4", - "resolved": "https://registry.npmjs.org/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.34.4.tgz", - "integrity": "sha512-2Q250do/5WXTwxW3zjsEuMSv5sUU4Tq9VThWKlU2EYLm4MB7ZeMwF+SFJutldYODXF6jzc6YEOC+VfX0SZQPqA==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.34.5.tgz", + "integrity": "sha512-WQ3AgWCWYSb2yt+IG8mnC6Jdk9Whs7O0gxphblsLvdhSpSTtmu69ZG1Gkb6NuvxsNACwiPV6cNSZNzt0KPsw7g==", "cpu": [ "arm64" ], @@ -844,9 +882,9 @@ } }, "node_modules/@img/sharp-win32-ia32": { - "version": "0.34.4", - "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.34.4.tgz", - "integrity": "sha512-3ZeLue5V82dT92CNL6rsal6I2weKw1cYu+rGKm8fOCCtJTR2gYeUfY3FqUnIJsMUPIH68oS5jmZ0NiJ508YpEw==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.34.5.tgz", + "integrity": "sha512-FV9m/7NmeCmSHDD5j4+4pNI8Cp3aW+JvLoXcTUo0IqyjSfAZJ8dIUmijx1qaJsIiU+Hosw6xM5KijAWRJCSgNg==", "cpu": [ "ia32" ], @@ -863,9 +901,9 @@ } }, "node_modules/@img/sharp-win32-x64": { - "version": "0.34.4", - "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.34.4.tgz", - "integrity": "sha512-xIyj4wpYs8J18sVN3mSQjwrw7fKUqRw+Z5rnHNCy5fYTxigBz81u5mOMPmFumwjcn8+ld1ppptMBCLic1nz6ig==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.34.5.tgz", + "integrity": "sha512-+29YMsqY2/9eFEiW93eqWnuLcWcufowXewwSNIT6UwZdUUCrM3oFjMWH/Z6/TMmb4hlFenmfAVbpWeup2jryCw==", "cpu": [ "x64" ], @@ -951,9 +989,9 @@ "license": "MIT" }, "node_modules/@next/eslint-plugin-next": { - "version": "15.5.6", - "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-15.5.6.tgz", - "integrity": "sha512-YxDvsT2fwy1j5gMqk3ppXlsgDopHnkM4BoxSVASbvvgh5zgsK8lvWerDzPip8k3WVzsTZ1O7A7si1KNfN4OZfQ==", + "version": "15.5.9", + "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-15.5.9.tgz", + "integrity": "sha512-kUzXx0iFiXw27cQAViE1yKWnz/nF8JzRmwgMRTMh8qMY90crNsdXJRh2e+R0vBpFR3kk1yvAR7wev7+fCCb79Q==", "dev": true, "license": "MIT", "dependencies": { @@ -1136,6 +1174,313 @@ "node": ">=12.4.0" } }, + "node_modules/@parcel/watcher": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz", + "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "detect-libc": "^1.0.3", + "is-glob": "^4.0.3", + "micromatch": "^4.0.5", + "node-addon-api": "^7.0.0" + }, + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + }, + "optionalDependencies": { + "@parcel/watcher-android-arm64": "2.5.1", + "@parcel/watcher-darwin-arm64": "2.5.1", + "@parcel/watcher-darwin-x64": "2.5.1", + "@parcel/watcher-freebsd-x64": "2.5.1", + "@parcel/watcher-linux-arm-glibc": "2.5.1", + "@parcel/watcher-linux-arm-musl": "2.5.1", + "@parcel/watcher-linux-arm64-glibc": "2.5.1", + "@parcel/watcher-linux-arm64-musl": "2.5.1", + "@parcel/watcher-linux-x64-glibc": "2.5.1", + "@parcel/watcher-linux-x64-musl": "2.5.1", + "@parcel/watcher-win32-arm64": "2.5.1", + "@parcel/watcher-win32-ia32": "2.5.1", + "@parcel/watcher-win32-x64": "2.5.1" + } + }, + "node_modules/@parcel/watcher-android-arm64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz", + "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-darwin-arm64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz", + "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-darwin-x64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz", + "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-freebsd-x64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz", + "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm-glibc": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz", + "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==", + "cpu": [ + "arm" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm-musl": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz", + "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==", + "cpu": [ + "arm" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm64-glibc": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz", + "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm64-musl": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz", + "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-x64-glibc": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz", + "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-x64-musl": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz", + "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-win32-arm64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz", + "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-win32-ia32": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz", + "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==", + "cpu": [ + "ia32" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-win32-x64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz", + "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher/node_modules/detect-libc": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==", + "license": "Apache-2.0", + "bin": { + "detect-libc": "bin/detect-libc.js" + }, + "engines": { + "node": ">=0.10" + } + }, "node_modules/@playwright/test": { "version": "1.57.0", "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.57.0.tgz", @@ -1192,29 +1537,6 @@ } } }, - "node_modules/@radix-ui/react-alert-dialog/node_modules/@radix-ui/react-primitive": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz", - "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-slot": "1.2.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, "node_modules/@radix-ui/react-alert-dialog/node_modules/@radix-ui/react-slot": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", @@ -1256,47 +1578,6 @@ } } }, - "node_modules/@radix-ui/react-arrow/node_modules/@radix-ui/react-primitive": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz", - "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-slot": "1.2.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-arrow/node_modules/@radix-ui/react-slot": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", - "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/@radix-ui/react-checkbox": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.3.3.tgz", @@ -1327,47 +1608,6 @@ } } }, - "node_modules/@radix-ui/react-checkbox/node_modules/@radix-ui/react-primitive": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz", - "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-slot": "1.2.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-checkbox/node_modules/@radix-ui/react-slot": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", - "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/@radix-ui/react-collapsible": { "version": "1.1.12", "resolved": "https://registry.npmjs.org/@radix-ui/react-collapsible/-/react-collapsible-1.1.12.tgz", @@ -1398,47 +1638,6 @@ } } }, - "node_modules/@radix-ui/react-collapsible/node_modules/@radix-ui/react-primitive": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz", - "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-slot": "1.2.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-collapsible/node_modules/@radix-ui/react-slot": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", - "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/@radix-ui/react-collection": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.7.tgz", @@ -1465,29 +1664,6 @@ } } }, - "node_modules/@radix-ui/react-collection/node_modules/@radix-ui/react-primitive": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz", - "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-slot": "1.2.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, "node_modules/@radix-ui/react-collection/node_modules/@radix-ui/react-slot": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", @@ -1572,29 +1748,6 @@ } } }, - "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-primitive": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz", - "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-slot": "1.2.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-slot": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", @@ -1655,47 +1808,6 @@ } } }, - "node_modules/@radix-ui/react-dismissable-layer/node_modules/@radix-ui/react-primitive": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz", - "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-slot": "1.2.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-dismissable-layer/node_modules/@radix-ui/react-slot": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", - "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/@radix-ui/react-dropdown-menu": { "version": "2.1.16", "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.16.tgz", @@ -1725,47 +1837,6 @@ } } }, - "node_modules/@radix-ui/react-dropdown-menu/node_modules/@radix-ui/react-primitive": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz", - "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-slot": "1.2.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-dropdown-menu/node_modules/@radix-ui/react-slot": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", - "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/@radix-ui/react-focus-guards": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.3.tgz", @@ -1806,47 +1877,6 @@ } } }, - "node_modules/@radix-ui/react-focus-scope/node_modules/@radix-ui/react-primitive": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz", - "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-slot": "1.2.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-focus-scope/node_modules/@radix-ui/react-slot": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", - "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/@radix-ui/react-id": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.1.tgz", @@ -1888,6 +1918,29 @@ } } }, + "node_modules/@radix-ui/react-label/node_modules/@radix-ui/react-primitive": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.4.tgz", + "integrity": "sha512-9hQc4+GNVtJAIEPEqlYqW5RiYdrr8ea5XQ0ZOnD6fgru+83kqT15mq2OCcbe8KnjRZl5vF3ks69AKz3kh1jrhg==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-slot": "1.2.4" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, "node_modules/@radix-ui/react-menu": { "version": "2.1.16", "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.16.tgz", @@ -1928,29 +1981,6 @@ } } }, - "node_modules/@radix-ui/react-menu/node_modules/@radix-ui/react-primitive": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz", - "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-slot": "1.2.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, "node_modules/@radix-ui/react-menu/node_modules/@radix-ui/react-slot": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", @@ -1970,24 +2000,24 @@ } }, "node_modules/@radix-ui/react-popover": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.6.tgz", - "integrity": "sha512-NQouW0x4/GnkFJ/pRqsIS3rM/k97VzKnVb2jB7Gq7VEGPy5g7uNV1ykySFt7eWSp3i2uSGFwaJcvIRJBAHmmFg==", + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.15.tgz", + "integrity": "sha512-kr0X2+6Yy/vJzLYJUPCZEc8SfQcf+1COFoAqauJm74umQhta9M7lNJHP7QQS3vkvcGLQUbWpMzwrXYwrYztHKA==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-dismissable-layer": "1.1.5", - "@radix-ui/react-focus-guards": "1.1.1", - "@radix-ui/react-focus-scope": "1.1.2", - "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-popper": "1.2.2", - "@radix-ui/react-portal": "1.1.4", - "@radix-ui/react-presence": "1.1.2", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-slot": "1.1.2", - "@radix-ui/react-use-controllable-state": "1.1.0", + "@radix-ui/primitive": "1.1.3", + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-dismissable-layer": "1.1.11", + "@radix-ui/react-focus-guards": "1.1.3", + "@radix-ui/react-focus-scope": "1.1.7", + "@radix-ui/react-id": "1.1.1", + "@radix-ui/react-popper": "1.2.8", + "@radix-ui/react-portal": "1.1.9", + "@radix-ui/react-presence": "1.1.5", + "@radix-ui/react-primitive": "2.1.3", + "@radix-ui/react-slot": "1.2.3", + "@radix-ui/react-use-controllable-state": "1.2.2", "aria-hidden": "^1.2.4", "react-remove-scroll": "^2.6.3" }, @@ -2006,260 +2036,13 @@ } } }, - "node_modules/@radix-ui/react-popover/node_modules/@radix-ui/primitive": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.1.tgz", - "integrity": "sha512-SJ31y+Q/zAyShtXJc8x83i9TYdbAfHZ++tUZnvjJJqFjzsdUnKsxPL6IEtBlxKkU7yzer//GQtZSV4GbldL3YA==", - "license": "MIT" - }, - "node_modules/@radix-ui/react-popover/node_modules/@radix-ui/react-arrow": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.2.tgz", - "integrity": "sha512-G+KcpzXHq24iH0uGG/pF8LyzpFJYGD4RfLjCIBfGdSLXvjLHST31RUiRVrupIBMvIppMgSzQ6l66iAxl03tdlg==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-primitive": "2.0.2" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-popover/node_modules/@radix-ui/react-compose-refs": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.1.tgz", - "integrity": "sha512-Y9VzoRDSJtgFMUCoiZBDVo084VQ5hfpXxVE+NgkdNsjiDBByiImMZKKhxMwCbdHvhlENG6a833CbFkOQvTricw==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-popover/node_modules/@radix-ui/react-context": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.1.tgz", - "integrity": "sha512-UASk9zi+crv9WteK/NU4PLvOoL3OuE6BWVKNF6hPRBtYBDXQ2u5iu3O59zUlJiTVvkyuycnqrztsHVJwcK9K+Q==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-popover/node_modules/@radix-ui/react-dismissable-layer": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.5.tgz", - "integrity": "sha512-E4TywXY6UsXNRhFrECa5HAvE5/4BFcGyfTyK36gP+pAW1ed7UTK4vKwdr53gAJYwqbfCWC6ATvJa3J3R/9+Qrg==", - "license": "MIT", - "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-callback-ref": "1.1.0", - "@radix-ui/react-use-escape-keydown": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-popover/node_modules/@radix-ui/react-focus-guards": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.1.tgz", - "integrity": "sha512-pSIwfrT1a6sIoDASCSpFwOasEwKTZWDw/iBdtnqKO7v6FeOzYJ7U53cPzYFVR3geGGXgVHaH+CdngrrAzqUGxg==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-popover/node_modules/@radix-ui/react-focus-scope": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.2.tgz", - "integrity": "sha512-zxwE80FCU7lcXUGWkdt6XpTTCKPitG1XKOwViTxHVKIJhZl9MvIl2dVHeZENCWD9+EdWv05wlaEkRXUykU27RA==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-callback-ref": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-popover/node_modules/@radix-ui/react-id": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.0.tgz", - "integrity": "sha512-EJUrI8yYh7WOjNOqpoJaf1jlFIH2LvtgAl+YcFqNCa+4hj64ZXmPkAKOFs/ukjz3byN6bdb/AVUqHkI8/uWWMA==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-use-layout-effect": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-popover/node_modules/@radix-ui/react-popper": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.2.2.tgz", - "integrity": "sha512-Rvqc3nOpwseCyj/rgjlJDYAgyfw7OC1tTkKn2ivhaMGcYt8FSBlahHOZak2i3QwkRXUXgGgzeEe2RuqeEHuHgA==", - "license": "MIT", - "dependencies": { - "@floating-ui/react-dom": "^2.0.0", - "@radix-ui/react-arrow": "1.1.2", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-callback-ref": "1.1.0", - "@radix-ui/react-use-layout-effect": "1.1.0", - "@radix-ui/react-use-rect": "1.1.0", - "@radix-ui/react-use-size": "1.1.0", - "@radix-ui/rect": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-popover/node_modules/@radix-ui/react-portal": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.4.tgz", - "integrity": "sha512-sn2O9k1rPFYVyKd5LAJfo96JlSGVFpa1fS6UuBJfrZadudiw5tAmru+n1x7aMRQ84qDM71Zh1+SzK5QwU0tJfA==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-layout-effect": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-popover/node_modules/@radix-ui/react-presence": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.2.tgz", - "integrity": "sha512-18TFr80t5EVgL9x1SwF/YGtfG+l0BS0PRAlCWBDoBEiDQjeKgnNZRVJp/oVBl24sr3Gbfwc/Qpj4OcWTQMsAEg==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-use-layout-effect": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-popover/node_modules/@radix-ui/react-primitive": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.0.2.tgz", - "integrity": "sha512-Ec/0d38EIuvDF+GZjcMU/Ze6MxntVJYO/fRlCPhCaVUyPY9WTalHJw54tp9sXeJo3tlShWpy41vQRgLRGOuz+w==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-slot": "1.1.2" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, "node_modules/@radix-ui/react-popover/node_modules/@radix-ui/react-slot": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.2.tgz", - "integrity": "sha512-YAKxaiGsSQJ38VzKH86/BPRC4rh+b1Jpa+JneA5LRE7skmLPNAyeG8kPJj/oo4STLvlrs8vkf/iYyc3A5stYCQ==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", + "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==", "license": "MIT", "dependencies": { - "@radix-ui/react-compose-refs": "1.1.1" + "@radix-ui/react-compose-refs": "1.1.2" }, "peerDependencies": { "@types/react": "*", @@ -2271,114 +2054,6 @@ } } }, - "node_modules/@radix-ui/react-popover/node_modules/@radix-ui/react-use-callback-ref": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.0.tgz", - "integrity": "sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-popover/node_modules/@radix-ui/react-use-controllable-state": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.1.0.tgz", - "integrity": "sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-use-callback-ref": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-popover/node_modules/@radix-ui/react-use-escape-keydown": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.0.tgz", - "integrity": "sha512-L7vwWlR1kTTQ3oh7g1O0CBF3YCyyTj8NmhLR+phShpyA50HCfBFKVJTpshm9PzLiKmehsrQzTYTpX9HvmC9rhw==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-use-callback-ref": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-popover/node_modules/@radix-ui/react-use-layout-effect": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.0.tgz", - "integrity": "sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-popover/node_modules/@radix-ui/react-use-rect": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.1.0.tgz", - "integrity": "sha512-0Fmkebhr6PiseyZlYAOtLS+nb7jLmpqTrJyv61Pe68MKYW6OWdRE2kI70TaYY27u7H0lajqM3hSMMLFq18Z7nQ==", - "license": "MIT", - "dependencies": { - "@radix-ui/rect": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-popover/node_modules/@radix-ui/react-use-size": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.1.0.tgz", - "integrity": "sha512-XW3/vWuIXHa+2Uwcc2ABSfcCledmXhhQPlGbfcRXbiUQI5Icjcg19BGCZVKKInYbvUCut/ufbbLLPFC5cbb1hw==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-use-layout-effect": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-popover/node_modules/@radix-ui/rect": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.1.0.tgz", - "integrity": "sha512-A9+lCBZoaMJlVKcRBz2YByCG+Cp2t6nAnMnNba+XiWxnj6r4JUFqfsgwocMBZU9LPtdxC6wB56ySYpc7LQIoJg==", - "license": "MIT" - }, "node_modules/@radix-ui/react-popper": { "version": "1.2.8", "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.2.8.tgz", @@ -2411,47 +2086,6 @@ } } }, - "node_modules/@radix-ui/react-popper/node_modules/@radix-ui/react-primitive": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz", - "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-slot": "1.2.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-popper/node_modules/@radix-ui/react-slot": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", - "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/@radix-ui/react-portal": { "version": "1.1.9", "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.9.tgz", @@ -2476,47 +2110,6 @@ } } }, - "node_modules/@radix-ui/react-portal/node_modules/@radix-ui/react-primitive": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz", - "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-slot": "1.2.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-portal/node_modules/@radix-ui/react-slot": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", - "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/@radix-ui/react-presence": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.5.tgz", @@ -2542,12 +2135,12 @@ } }, "node_modules/@radix-ui/react-primitive": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.4.tgz", - "integrity": "sha512-9hQc4+GNVtJAIEPEqlYqW5RiYdrr8ea5XQ0ZOnD6fgru+83kqT15mq2OCcbe8KnjRZl5vF3ks69AKz3kh1jrhg==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz", + "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==", "license": "MIT", "dependencies": { - "@radix-ui/react-slot": "1.2.4" + "@radix-ui/react-slot": "1.2.3" }, "peerDependencies": { "@types/react": "*", @@ -2564,6 +2157,24 @@ } } }, + "node_modules/@radix-ui/react-primitive/node_modules/@radix-ui/react-slot": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", + "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-compose-refs": "1.1.2" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, "node_modules/@radix-ui/react-progress": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/@radix-ui/react-progress/-/react-progress-1.1.8.tgz", @@ -2603,6 +2214,29 @@ } } }, + "node_modules/@radix-ui/react-progress/node_modules/@radix-ui/react-primitive": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.4.tgz", + "integrity": "sha512-9hQc4+GNVtJAIEPEqlYqW5RiYdrr8ea5XQ0ZOnD6fgru+83kqT15mq2OCcbe8KnjRZl5vF3ks69AKz3kh1jrhg==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-slot": "1.2.4" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, "node_modules/@radix-ui/react-radio-group": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/@radix-ui/react-radio-group/-/react-radio-group-1.3.8.tgz", @@ -2635,47 +2269,6 @@ } } }, - "node_modules/@radix-ui/react-radio-group/node_modules/@radix-ui/react-primitive": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz", - "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-slot": "1.2.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-radio-group/node_modules/@radix-ui/react-slot": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", - "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/@radix-ui/react-roving-focus": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.11.tgz", @@ -2707,47 +2300,6 @@ } } }, - "node_modules/@radix-ui/react-roving-focus/node_modules/@radix-ui/react-primitive": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz", - "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-slot": "1.2.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-roving-focus/node_modules/@radix-ui/react-slot": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", - "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/@radix-ui/react-scroll-area": { "version": "1.2.10", "resolved": "https://registry.npmjs.org/@radix-ui/react-scroll-area/-/react-scroll-area-1.2.10.tgz", @@ -2779,47 +2331,6 @@ } } }, - "node_modules/@radix-ui/react-scroll-area/node_modules/@radix-ui/react-primitive": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz", - "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-slot": "1.2.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-scroll-area/node_modules/@radix-ui/react-slot": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", - "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/@radix-ui/react-select": { "version": "2.2.6", "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.2.6.tgz", @@ -2863,29 +2374,6 @@ } } }, - "node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-primitive": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz", - "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-slot": "1.2.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, "node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-slot": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", @@ -2937,47 +2425,6 @@ } } }, - "node_modules/@radix-ui/react-slider/node_modules/@radix-ui/react-primitive": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz", - "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-slot": "1.2.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-slider/node_modules/@radix-ui/react-slot": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", - "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/@radix-ui/react-slot": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.4.tgz", @@ -3025,47 +2472,6 @@ } } }, - "node_modules/@radix-ui/react-switch/node_modules/@radix-ui/react-primitive": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz", - "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-slot": "1.2.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-switch/node_modules/@radix-ui/react-slot": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", - "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/@radix-ui/react-tabs": { "version": "1.1.13", "resolved": "https://registry.npmjs.org/@radix-ui/react-tabs/-/react-tabs-1.1.13.tgz", @@ -3096,47 +2502,6 @@ } } }, - "node_modules/@radix-ui/react-tabs/node_modules/@radix-ui/react-primitive": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz", - "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-slot": "1.2.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-tabs/node_modules/@radix-ui/react-slot": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", - "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/@radix-ui/react-tooltip": { "version": "1.2.8", "resolved": "https://registry.npmjs.org/@radix-ui/react-tooltip/-/react-tooltip-1.2.8.tgz", @@ -3171,29 +2536,6 @@ } } }, - "node_modules/@radix-ui/react-tooltip/node_modules/@radix-ui/react-primitive": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz", - "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-slot": "1.2.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, "node_modules/@radix-ui/react-tooltip/node_modules/@radix-ui/react-slot": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", @@ -3371,47 +2713,6 @@ } } }, - "node_modules/@radix-ui/react-visually-hidden/node_modules/@radix-ui/react-primitive": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz", - "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-slot": "1.2.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-visually-hidden/node_modules/@radix-ui/react-slot": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", - "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/@radix-ui/rect": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.1.1.tgz", @@ -3419,14 +2720,14 @@ "license": "MIT" }, "node_modules/@reduxjs/toolkit": { - "version": "2.10.1", - "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.10.1.tgz", - "integrity": "sha512-/U17EXQ9Do9Yx4DlNGU6eVNfZvFJfYpUtRRdLf19PbPjdWBxNlxGZXywQZ1p1Nz8nMkWplTI7iD/23m07nolDA==", + "version": "2.11.2", + "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.11.2.tgz", + "integrity": "sha512-Kd6kAHTA6/nUpp8mySPqj3en3dm0tdMIgbttnQ1xFMVpufoj+ADi8pXLBsd4xzTRHQa7t/Jv8W5UnCuW4kuWMQ==", "license": "MIT", "dependencies": { "@standard-schema/spec": "^1.0.0", "@standard-schema/utils": "^0.3.0", - "immer": "^10.2.0", + "immer": "^11.0.0", "redux": "^5.0.1", "redux-thunk": "^3.1.0", "reselect": "^5.1.0" @@ -3444,16 +2745,6 @@ } } }, - "node_modules/@reduxjs/toolkit/node_modules/immer": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/immer/-/immer-10.2.0.tgz", - "integrity": "sha512-d/+XTN3zfODyjr89gM3mPq1WNX2B8pYsu7eORitdwyA2sBubnTl3laYlBk4sXY5FUa5qTZGBDPJICVbvqzjlbw==", - "license": "MIT", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/immer" - } - }, "node_modules/@remirror/core-constants": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@remirror/core-constants/-/core-constants-3.0.0.tgz", @@ -3468,9 +2759,9 @@ "license": "MIT" }, "node_modules/@rushstack/eslint-patch": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.14.1.tgz", - "integrity": "sha512-jGTk8UD/RdjsNZW8qq10r0RBvxL8OWtoT+kImlzPDFilmozzM+9QmIJsmze9UiSBrFU45ZxhTYBypn9q9z/VfQ==", + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.15.0.tgz", + "integrity": "sha512-ojSshQPKwVvSMR8yT2L/QtUkV5SXi/IfDiJ4/8d6UbTPjiHVmxZzUAzGD8Tzks1b9+qQkZa0isUOvYObedITaw==", "dev": true, "license": "MIT" }, @@ -3481,9 +2772,9 @@ "license": "MIT" }, "node_modules/@standard-schema/spec": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.0.0.tgz", - "integrity": "sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz", + "integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==", "license": "MIT" }, "node_modules/@standard-schema/utils": { @@ -3492,6 +2783,172 @@ "integrity": "sha512-e7Mew686owMaPJVNNLs55PUvgz371nKgwsc4vxE49zsODpJEnxgxRo2y/OKrqueavXgZNMDVj3DdHFlaSAeU8g==", "license": "MIT" }, + "node_modules/@swc/core-darwin-arm64": { + "version": "1.15.8", + "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.15.8.tgz", + "integrity": "sha512-M9cK5GwyWWRkRGwwCbREuj6r8jKdES/haCZ3Xckgkl8MUQJZA3XB7IXXK1IXRNeLjg6m7cnoMICpXv1v1hlJOg==", + "cpu": [ + "arm64" + ], + "license": "Apache-2.0 AND MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@swc/core-darwin-x64": { + "version": "1.15.8", + "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.15.8.tgz", + "integrity": "sha512-j47DasuOvXl80sKJHSi2X25l44CMc3VDhlJwA7oewC1nV1VsSzwX+KOwE5tLnfORvVJJyeiXgJORNYg4jeIjYQ==", + "cpu": [ + "x64" + ], + "license": "Apache-2.0 AND MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@swc/core-linux-arm-gnueabihf": { + "version": "1.15.8", + "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.15.8.tgz", + "integrity": "sha512-siAzDENu2rUbwr9+fayWa26r5A9fol1iORG53HWxQL1J8ym4k7xt9eME0dMPXlYZDytK5r9sW8zEA10F2U3Xwg==", + "cpu": [ + "arm" + ], + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@swc/core-linux-arm64-gnu": { + "version": "1.15.8", + "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.15.8.tgz", + "integrity": "sha512-o+1y5u6k2FfPYbTRUPvurwzNt5qd0NTumCTFscCNuBksycloXY16J8L+SMW5QRX59n4Hp9EmFa3vpvNHRVv1+Q==", + "cpu": [ + "arm64" + ], + "license": "Apache-2.0 AND MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@swc/core-linux-arm64-musl": { + "version": "1.15.8", + "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.15.8.tgz", + "integrity": "sha512-koiCqL09EwOP1S2RShCI7NbsQuG6r2brTqUYE7pV7kZm9O17wZ0LSz22m6gVibpwEnw8jI3IE1yYsQTVpluALw==", + "cpu": [ + "arm64" + ], + "license": "Apache-2.0 AND MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@swc/core-linux-x64-gnu": { + "version": "1.15.8", + "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.15.8.tgz", + "integrity": "sha512-4p6lOMU3bC+Vd5ARtKJ/FxpIC5G8v3XLoPEZ5s7mLR8h7411HWC/LmTXDHcrSXRC55zvAVia1eldy6zDLz8iFQ==", + "cpu": [ + "x64" + ], + "license": "Apache-2.0 AND MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@swc/core-linux-x64-musl": { + "version": "1.15.8", + "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.15.8.tgz", + "integrity": "sha512-z3XBnbrZAL+6xDGAhJoN4lOueIxC/8rGrJ9tg+fEaeqLEuAtHSW2QHDHxDwkxZMjuF/pZ6MUTjHjbp8wLbuRLA==", + "cpu": [ + "x64" + ], + "license": "Apache-2.0 AND MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@swc/core-win32-arm64-msvc": { + "version": "1.15.8", + "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.15.8.tgz", + "integrity": "sha512-djQPJ9Rh9vP8GTS/Df3hcc6XP6xnG5c8qsngWId/BLA9oX6C7UzCPAn74BG/wGb9a6j4w3RINuoaieJB3t+7iQ==", + "cpu": [ + "arm64" + ], + "license": "Apache-2.0 AND MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@swc/core-win32-ia32-msvc": { + "version": "1.15.8", + "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.15.8.tgz", + "integrity": "sha512-/wfAgxORg2VBaUoFdytcVBVCgf1isWZIEXB9MZEUty4wwK93M/PxAkjifOho9RN3WrM3inPLabICRCEgdHpKKQ==", + "cpu": [ + "ia32" + ], + "license": "Apache-2.0 AND MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@swc/core-win32-x64-msvc": { + "version": "1.15.8", + "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.15.8.tgz", + "integrity": "sha512-GpMePrh9Sl4d61o4KAHOOv5is5+zt6BEXCOCgs/H0FLGeii7j9bWDE8ExvKFy2GRRZVNR1ugsnzaGWHKM6kuzA==", + "cpu": [ + "x64" + ], + "license": "Apache-2.0 AND MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@swc/counter": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz", + "integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==", + "license": "Apache-2.0" + }, "node_modules/@swc/helpers": { "version": "0.5.15", "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.15.tgz", @@ -3501,10 +2958,19 @@ "tslib": "^2.8.0" } }, + "node_modules/@swc/types": { + "version": "0.1.25", + "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.25.tgz", + "integrity": "sha512-iAoY/qRhNH8a/hBvm3zKj9qQ4oc2+3w1unPJa2XvTK3XjeLXtzcCingVPw/9e5mn1+0yPqxcBGp9Jf0pkfMb1g==", + "license": "Apache-2.0", + "dependencies": { + "@swc/counter": "^0.1.3" + } + }, "node_modules/@tailwindcss/node": { - "version": "4.1.16", - "resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.1.16.tgz", - "integrity": "sha512-BX5iaSsloNuvKNHRN3k2RcCuTEgASTo77mofW0vmeHkfrDWaoFAFvNHpEgtu0eqyypcyiBkDWzSMxJhp3AUVcw==", + "version": "4.1.18", + "resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.1.18.tgz", + "integrity": "sha512-DoR7U1P7iYhw16qJ49fgXUlry1t4CpXeErJHnQ44JgTSKMaZUdf17cfn5mHchfJ4KRBZRFA/Coo+MUF5+gOaCQ==", "dev": true, "license": "MIT", "dependencies": { @@ -3512,39 +2978,39 @@ "enhanced-resolve": "^5.18.3", "jiti": "^2.6.1", "lightningcss": "1.30.2", - "magic-string": "^0.30.19", + "magic-string": "^0.30.21", "source-map-js": "^1.2.1", - "tailwindcss": "4.1.16" + "tailwindcss": "4.1.18" } }, "node_modules/@tailwindcss/oxide": { - "version": "4.1.16", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.1.16.tgz", - "integrity": "sha512-2OSv52FRuhdlgyOQqgtQHuCgXnS8nFSYRp2tJ+4WZXKgTxqPy7SMSls8c3mPT5pkZ17SBToGM5LHEJBO7miEdg==", + "version": "4.1.18", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.1.18.tgz", + "integrity": "sha512-EgCR5tTS5bUSKQgzeMClT6iCY3ToqE1y+ZB0AKldj809QXk1Y+3jB0upOYZrn9aGIzPtUsP7sX4QQ4XtjBB95A==", "dev": true, "license": "MIT", "engines": { "node": ">= 10" }, "optionalDependencies": { - "@tailwindcss/oxide-android-arm64": "4.1.16", - "@tailwindcss/oxide-darwin-arm64": "4.1.16", - "@tailwindcss/oxide-darwin-x64": "4.1.16", - "@tailwindcss/oxide-freebsd-x64": "4.1.16", - "@tailwindcss/oxide-linux-arm-gnueabihf": "4.1.16", - "@tailwindcss/oxide-linux-arm64-gnu": "4.1.16", - "@tailwindcss/oxide-linux-arm64-musl": "4.1.16", - "@tailwindcss/oxide-linux-x64-gnu": "4.1.16", - "@tailwindcss/oxide-linux-x64-musl": "4.1.16", - "@tailwindcss/oxide-wasm32-wasi": "4.1.16", - "@tailwindcss/oxide-win32-arm64-msvc": "4.1.16", - "@tailwindcss/oxide-win32-x64-msvc": "4.1.16" + "@tailwindcss/oxide-android-arm64": "4.1.18", + "@tailwindcss/oxide-darwin-arm64": "4.1.18", + "@tailwindcss/oxide-darwin-x64": "4.1.18", + "@tailwindcss/oxide-freebsd-x64": "4.1.18", + "@tailwindcss/oxide-linux-arm-gnueabihf": "4.1.18", + "@tailwindcss/oxide-linux-arm64-gnu": "4.1.18", + "@tailwindcss/oxide-linux-arm64-musl": "4.1.18", + "@tailwindcss/oxide-linux-x64-gnu": "4.1.18", + "@tailwindcss/oxide-linux-x64-musl": "4.1.18", + "@tailwindcss/oxide-wasm32-wasi": "4.1.18", + "@tailwindcss/oxide-win32-arm64-msvc": "4.1.18", + "@tailwindcss/oxide-win32-x64-msvc": "4.1.18" } }, "node_modules/@tailwindcss/oxide-android-arm64": { - "version": "4.1.16", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.1.16.tgz", - "integrity": "sha512-8+ctzkjHgwDJ5caq9IqRSgsP70xhdhJvm+oueS/yhD5ixLhqTw9fSL1OurzMUhBwE5zK26FXLCz2f/RtkISqHA==", + "version": "4.1.18", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.1.18.tgz", + "integrity": "sha512-dJHz7+Ugr9U/diKJA0W6N/6/cjI+ZTAoxPf9Iz9BFRF2GzEX8IvXxFIi/dZBloVJX/MZGvRuFA9rqwdiIEZQ0Q==", "cpu": [ "arm64" ], @@ -3559,9 +3025,9 @@ } }, "node_modules/@tailwindcss/oxide-darwin-arm64": { - "version": "4.1.16", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.1.16.tgz", - "integrity": "sha512-C3oZy5042v2FOALBZtY0JTDnGNdS6w7DxL/odvSny17ORUnaRKhyTse8xYi3yKGyfnTUOdavRCdmc8QqJYwFKA==", + "version": "4.1.18", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.1.18.tgz", + "integrity": "sha512-Gc2q4Qhs660bhjyBSKgq6BYvwDz4G+BuyJ5H1xfhmDR3D8HnHCmT/BSkvSL0vQLy/nkMLY20PQ2OoYMO15Jd0A==", "cpu": [ "arm64" ], @@ -3576,9 +3042,9 @@ } }, "node_modules/@tailwindcss/oxide-darwin-x64": { - "version": "4.1.16", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.1.16.tgz", - "integrity": "sha512-vjrl/1Ub9+JwU6BP0emgipGjowzYZMjbWCDqwA2Z4vCa+HBSpP4v6U2ddejcHsolsYxwL5r4bPNoamlV0xDdLg==", + "version": "4.1.18", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.1.18.tgz", + "integrity": "sha512-FL5oxr2xQsFrc3X9o1fjHKBYBMD1QZNyc1Xzw/h5Qu4XnEBi3dZn96HcHm41c/euGV+GRiXFfh2hUCyKi/e+yw==", "cpu": [ "x64" ], @@ -3593,9 +3059,9 @@ } }, "node_modules/@tailwindcss/oxide-freebsd-x64": { - "version": "4.1.16", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.1.16.tgz", - "integrity": "sha512-TSMpPYpQLm+aR1wW5rKuUuEruc/oOX3C7H0BTnPDn7W/eMw8W+MRMpiypKMkXZfwH8wqPIRKppuZoedTtNj2tg==", + "version": "4.1.18", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.1.18.tgz", + "integrity": "sha512-Fj+RHgu5bDodmV1dM9yAxlfJwkkWvLiRjbhuO2LEtwtlYlBgiAT4x/j5wQr1tC3SANAgD+0YcmWVrj8R9trVMA==", "cpu": [ "x64" ], @@ -3610,9 +3076,9 @@ } }, "node_modules/@tailwindcss/oxide-linux-arm-gnueabihf": { - "version": "4.1.16", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.1.16.tgz", - "integrity": "sha512-p0GGfRg/w0sdsFKBjMYvvKIiKy/LNWLWgV/plR4lUgrsxFAoQBFrXkZ4C0w8IOXfslB9vHK/JGASWD2IefIpvw==", + "version": "4.1.18", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.1.18.tgz", + "integrity": "sha512-Fp+Wzk/Ws4dZn+LV2Nqx3IilnhH51YZoRaYHQsVq3RQvEl+71VGKFpkfHrLM/Li+kt5c0DJe/bHXK1eHgDmdiA==", "cpu": [ "arm" ], @@ -3627,9 +3093,9 @@ } }, "node_modules/@tailwindcss/oxide-linux-arm64-gnu": { - "version": "4.1.16", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.1.16.tgz", - "integrity": "sha512-DoixyMmTNO19rwRPdqviTrG1rYzpxgyYJl8RgQvdAQUzxC1ToLRqtNJpU/ATURSKgIg6uerPw2feW0aS8SNr/w==", + "version": "4.1.18", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.1.18.tgz", + "integrity": "sha512-S0n3jboLysNbh55Vrt7pk9wgpyTTPD0fdQeh7wQfMqLPM/Hrxi+dVsLsPrycQjGKEQk85Kgbx+6+QnYNiHalnw==", "cpu": [ "arm64" ], @@ -3644,9 +3110,9 @@ } }, "node_modules/@tailwindcss/oxide-linux-arm64-musl": { - "version": "4.1.16", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.1.16.tgz", - "integrity": "sha512-H81UXMa9hJhWhaAUca6bU2wm5RRFpuHImrwXBUvPbYb+3jo32I9VIwpOX6hms0fPmA6f2pGVlybO6qU8pF4fzQ==", + "version": "4.1.18", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.1.18.tgz", + "integrity": "sha512-1px92582HkPQlaaCkdRcio71p8bc8i/ap5807tPRDK/uw953cauQBT8c5tVGkOwrHMfc2Yh6UuxaH4vtTjGvHg==", "cpu": [ "arm64" ], @@ -3661,9 +3127,9 @@ } }, "node_modules/@tailwindcss/oxide-linux-x64-gnu": { - "version": "4.1.16", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.1.16.tgz", - "integrity": "sha512-ZGHQxDtFC2/ruo7t99Qo2TTIvOERULPl5l0K1g0oK6b5PGqjYMga+FcY1wIUnrUxY56h28FxybtDEla+ICOyew==", + "version": "4.1.18", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.1.18.tgz", + "integrity": "sha512-v3gyT0ivkfBLoZGF9LyHmts0Isc8jHZyVcbzio6Wpzifg/+5ZJpDiRiUhDLkcr7f/r38SWNe7ucxmGW3j3Kb/g==", "cpu": [ "x64" ], @@ -3678,9 +3144,9 @@ } }, "node_modules/@tailwindcss/oxide-linux-x64-musl": { - "version": "4.1.16", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.1.16.tgz", - "integrity": "sha512-Oi1tAaa0rcKf1Og9MzKeINZzMLPbhxvm7rno5/zuP1WYmpiG0bEHq4AcRUiG2165/WUzvxkW4XDYCscZWbTLZw==", + "version": "4.1.18", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.1.18.tgz", + "integrity": "sha512-bhJ2y2OQNlcRwwgOAGMY0xTFStt4/wyU6pvI6LSuZpRgKQwxTec0/3Scu91O8ir7qCR3AuepQKLU/kX99FouqQ==", "cpu": [ "x64" ], @@ -3695,9 +3161,9 @@ } }, "node_modules/@tailwindcss/oxide-wasm32-wasi": { - "version": "4.1.16", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-wasm32-wasi/-/oxide-wasm32-wasi-4.1.16.tgz", - "integrity": "sha512-B01u/b8LteGRwucIBmCQ07FVXLzImWESAIMcUU6nvFt/tYsQ6IHz8DmZ5KtvmwxD+iTYBtM1xwoGXswnlu9v0Q==", + "version": "4.1.18", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-wasm32-wasi/-/oxide-wasm32-wasi-4.1.18.tgz", + "integrity": "sha512-LffYTvPjODiP6PT16oNeUQJzNVyJl1cjIebq/rWWBF+3eDst5JGEFSc5cWxyRCJ0Mxl+KyIkqRxk1XPEs9x8TA==", "bundleDependencies": [ "@napi-rs/wasm-runtime", "@emnapi/core", @@ -3713,10 +3179,10 @@ "license": "MIT", "optional": true, "dependencies": { - "@emnapi/core": "^1.5.0", - "@emnapi/runtime": "^1.5.0", + "@emnapi/core": "^1.7.1", + "@emnapi/runtime": "^1.7.1", "@emnapi/wasi-threads": "^1.1.0", - "@napi-rs/wasm-runtime": "^1.0.7", + "@napi-rs/wasm-runtime": "^1.1.0", "@tybys/wasm-util": "^0.10.1", "tslib": "^2.4.0" }, @@ -3725,9 +3191,9 @@ } }, "node_modules/@tailwindcss/oxide-win32-arm64-msvc": { - "version": "4.1.16", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.1.16.tgz", - "integrity": "sha512-zX+Q8sSkGj6HKRTMJXuPvOcP8XfYON24zJBRPlszcH1Np7xuHXhWn8qfFjIujVzvH3BHU+16jBXwgpl20i+v9A==", + "version": "4.1.18", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.1.18.tgz", + "integrity": "sha512-HjSA7mr9HmC8fu6bdsZvZ+dhjyGCLdotjVOgLA2vEqxEBZaQo9YTX4kwgEvPCpRh8o4uWc4J/wEoFzhEmjvPbA==", "cpu": [ "arm64" ], @@ -3742,9 +3208,9 @@ } }, "node_modules/@tailwindcss/oxide-win32-x64-msvc": { - "version": "4.1.16", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.1.16.tgz", - "integrity": "sha512-m5dDFJUEejbFqP+UXVstd4W/wnxA4F61q8SoL+mqTypId2T2ZpuxosNSgowiCnLp2+Z+rivdU0AqpfgiD7yCBg==", + "version": "4.1.18", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.1.18.tgz", + "integrity": "sha512-bJWbyYpUlqamC8dpR7pfjA0I7vdF6t5VpUGMWRkXVE3AXgIZjYUYAK7II1GNaxR8J1SSrSrppRar8G++JekE3Q==", "cpu": [ "x64" ], @@ -3759,62 +3225,62 @@ } }, "node_modules/@tailwindcss/postcss": { - "version": "4.1.16", - "resolved": "https://registry.npmjs.org/@tailwindcss/postcss/-/postcss-4.1.16.tgz", - "integrity": "sha512-Qn3SFGPXYQMKR/UtqS+dqvPrzEeBZHrFA92maT4zijCVggdsXnDBMsPFJo1eArX3J+O+Gi+8pV4PkqjLCNBk3A==", + "version": "4.1.18", + "resolved": "https://registry.npmjs.org/@tailwindcss/postcss/-/postcss-4.1.18.tgz", + "integrity": "sha512-Ce0GFnzAOuPyfV5SxjXGn0CubwGcuDB0zcdaPuCSzAa/2vII24JTkH+I6jcbXLb1ctjZMZZI6OjDaLPJQL1S0g==", "dev": true, "license": "MIT", "dependencies": { "@alloc/quick-lru": "^5.2.0", - "@tailwindcss/node": "4.1.16", - "@tailwindcss/oxide": "4.1.16", + "@tailwindcss/node": "4.1.18", + "@tailwindcss/oxide": "4.1.18", "postcss": "^8.4.41", - "tailwindcss": "4.1.16" + "tailwindcss": "4.1.18" } }, "node_modules/@tiptap/core": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@tiptap/core/-/core-3.13.0.tgz", - "integrity": "sha512-iUelgiTMgPVMpY5ZqASUpk8mC8HuR9FWKaDzK27w9oWip9tuB54Z8mePTxNcQaSPb6ErzEaC8x8egrRt7OsdGQ==", + "version": "3.15.3", + "resolved": "https://registry.npmjs.org/@tiptap/core/-/core-3.15.3.tgz", + "integrity": "sha512-bmXydIHfm2rEtGju39FiQNfzkFx9CDvJe+xem1dgEZ2P6Dj7nQX9LnA1ZscW7TuzbBRkL5p3dwuBIi3f62A66A==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/pm": "^3.13.0" + "@tiptap/pm": "^3.15.3" } }, "node_modules/@tiptap/extension-blockquote": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@tiptap/extension-blockquote/-/extension-blockquote-3.13.0.tgz", - "integrity": "sha512-K1z/PAIIwEmiWbzrP//4cC7iG1TZknDlF1yb42G7qkx2S2X4P0NiqX7sKOej3yqrPjKjGwPujLMSuDnCF87QkQ==", + "version": "3.15.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-blockquote/-/extension-blockquote-3.15.3.tgz", + "integrity": "sha512-13x5UsQXtttFpoS/n1q173OeurNxppsdWgP3JfsshzyxIghhC141uL3H6SGYQLPU31AizgDs2OEzt6cSUevaZg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "^3.13.0" + "@tiptap/core": "^3.15.3" } }, "node_modules/@tiptap/extension-bold": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@tiptap/extension-bold/-/extension-bold-3.13.0.tgz", - "integrity": "sha512-VYiDN9EEwR6ShaDLclG8mphkb/wlIzqfk7hxaKboq1G+NSDj8PcaSI9hldKKtTCLeaSNu6UR5nkdu/YHdzYWTw==", + "version": "3.15.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-bold/-/extension-bold-3.15.3.tgz", + "integrity": "sha512-I8JYbkkUTNUXbHd/wCse2bR0QhQtJD7+0/lgrKOmGfv5ioLxcki079Nzuqqay3PjgYoJLIJQvm3RAGxT+4X91w==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "^3.13.0" + "@tiptap/core": "^3.15.3" } }, "node_modules/@tiptap/extension-bubble-menu": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@tiptap/extension-bubble-menu/-/extension-bubble-menu-3.13.0.tgz", - "integrity": "sha512-qZ3j2DBsqP9DjG2UlExQ+tHMRhAnWlCKNreKddKocb/nAFrPdBCtvkqIEu+68zPlbLD4ukpoyjUklRJg+NipFg==", + "version": "3.15.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-bubble-menu/-/extension-bubble-menu-3.15.3.tgz", + "integrity": "sha512-e88DG1bTy6hKxrt7iPVQhJnH5/EOrnKpIyp09dfRDgWrrW88fE0Qjys7a/eT8W+sXyXM3z10Ye7zpERWsrLZDg==", "license": "MIT", "optional": true, "dependencies": { @@ -3825,80 +3291,80 @@ "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "^3.13.0", - "@tiptap/pm": "^3.13.0" + "@tiptap/core": "^3.15.3", + "@tiptap/pm": "^3.15.3" } }, "node_modules/@tiptap/extension-bullet-list": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@tiptap/extension-bullet-list/-/extension-bullet-list-3.13.0.tgz", - "integrity": "sha512-fFQmmEUoPzRGiQJ/KKutG35ZX21GE+1UCDo8Q6PoWH7Al9lex47nvyeU1BiDYOhcTKgIaJRtEH5lInsOsRJcSA==", + "version": "3.15.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-bullet-list/-/extension-bullet-list-3.15.3.tgz", + "integrity": "sha512-MGwEkNT7ltst6XaWf0ObNgpKQ4PvuuV3igkBrdYnQS+qaAx9IF4isygVPqUc9DvjYC306jpyKsNqNrENIXcosA==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extension-list": "^3.13.0" + "@tiptap/extension-list": "^3.15.3" } }, "node_modules/@tiptap/extension-code": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@tiptap/extension-code/-/extension-code-3.13.0.tgz", - "integrity": "sha512-sF5raBni6iSVpXWvwJCAcOXw5/kZ+djDHx1YSGWhopm4+fsj0xW7GvVO+VTwiFjZGKSw+K5NeAxzcQTJZd3Vhw==", + "version": "3.15.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-code/-/extension-code-3.15.3.tgz", + "integrity": "sha512-x6LFt3Og6MFINYpsMzrJnz7vaT9Yk1t4oXkbJsJRSavdIWBEBcoRudKZ4sSe/AnsYlRJs8FY2uR76mt9e+7xAQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "^3.13.0" + "@tiptap/core": "^3.15.3" } }, "node_modules/@tiptap/extension-code-block": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@tiptap/extension-code-block/-/extension-code-block-3.13.0.tgz", - "integrity": "sha512-kIwfQ4iqootsWg9e74iYJK54/YMIj6ahUxEltjZRML5z/h4gTDcQt2eTpnEC8yjDjHeUVOR94zH9auCySyk9CQ==", + "version": "3.15.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-code-block/-/extension-code-block-3.15.3.tgz", + "integrity": "sha512-q1UB9icNfdJppTqMIUWfoRKkx5SSdWIpwZoL2NeOI5Ah3E20/dQKVttIgLhsE521chyvxCYCRaHD5tMNGKfhyw==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "^3.13.0", - "@tiptap/pm": "^3.13.0" + "@tiptap/core": "^3.15.3", + "@tiptap/pm": "^3.15.3" } }, "node_modules/@tiptap/extension-document": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@tiptap/extension-document/-/extension-document-3.13.0.tgz", - "integrity": "sha512-RjU7hTJwjKXIdY57o/Pc+Yr8swLkrwT7PBQ/m+LCX5oO/V2wYoWCjoBYnK5KSHrWlNy/aLzC33BvLeqZZ9nzlQ==", + "version": "3.15.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-document/-/extension-document-3.15.3.tgz", + "integrity": "sha512-AC72nI2gnogBuETCKbZekn+h6t5FGGcZG2abPGKbz/x9rwpb6qV2hcbAQ30t6M7H6cTOh2/Ut8bEV2MtMB15sw==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "^3.13.0" + "@tiptap/core": "^3.15.3" } }, "node_modules/@tiptap/extension-dropcursor": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@tiptap/extension-dropcursor/-/extension-dropcursor-3.13.0.tgz", - "integrity": "sha512-m7GPT3c/83ni+bbU8c+3dpNa8ug+aQ4phNB1Q52VQG3oTonDJnZS7WCtn3lB/Hi1LqoqMtEHwhepU2eD+JeXqQ==", + "version": "3.15.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-dropcursor/-/extension-dropcursor-3.15.3.tgz", + "integrity": "sha512-jGI5XZpdo8GSYQFj7HY15/oEwC2m2TqZz0/Fln5qIhY32XlZhWrsMuMI6WbUJrTH16es7xO6jmRlDsc6g+vJWg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extensions": "^3.13.0" + "@tiptap/extensions": "^3.15.3" } }, "node_modules/@tiptap/extension-floating-menu": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@tiptap/extension-floating-menu/-/extension-floating-menu-3.13.0.tgz", - "integrity": "sha512-OsezV2cMofZM4c13gvgi93IEYBUzZgnu8BXTYZQiQYekz4bX4uulBmLa1KOA9EN71FzS+SoLkXHU0YzlbLjlxA==", + "version": "3.15.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-floating-menu/-/extension-floating-menu-3.15.3.tgz", + "integrity": "sha512-+3DVBleKKffadEJEdLYxmYAJOjHjLSqtiSFUE3RABT4V2ka1ODy2NIpyKX0o1SvQ5N1jViYT9Q+yUbNa6zCcDw==", "license": "MIT", "optional": true, "funding": { @@ -3907,93 +3373,93 @@ }, "peerDependencies": { "@floating-ui/dom": "^1.0.0", - "@tiptap/core": "^3.13.0", - "@tiptap/pm": "^3.13.0" + "@tiptap/core": "^3.15.3", + "@tiptap/pm": "^3.15.3" } }, "node_modules/@tiptap/extension-gapcursor": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@tiptap/extension-gapcursor/-/extension-gapcursor-3.13.0.tgz", - "integrity": "sha512-KVxjQKkd964nin+1IdM2Dvej/Jy4JTMcMgq5seusUhJ9T9P8F9s2D5Iefwgkps3OCzub/aF+eAsZe+1P5KSIgA==", + "version": "3.15.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-gapcursor/-/extension-gapcursor-3.15.3.tgz", + "integrity": "sha512-Kaw0sNzP0bQI/xEAMSfIpja6xhsu9WqqAK/puzOIS1RKWO47Wps/tzqdSJ9gfslPIb5uY5mKCfy8UR8Xgiia8w==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extensions": "^3.13.0" + "@tiptap/extensions": "^3.15.3" } }, "node_modules/@tiptap/extension-hard-break": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@tiptap/extension-hard-break/-/extension-hard-break-3.13.0.tgz", - "integrity": "sha512-nH1OBaO+/pakhu+P1jF208mPgB70IKlrR/9d46RMYoYbqJTNf4KVLx5lHAOHytIhjcNg+MjyTfJWfkK+dyCCyg==", + "version": "3.15.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-hard-break/-/extension-hard-break-3.15.3.tgz", + "integrity": "sha512-8HjxmeRbBiXW+7JKemAJtZtHlmXQ9iji398CPQ0yYde68WbIvUhHXjmbJE5pxFvvQTJ/zJv1aISeEOZN2bKBaw==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "^3.13.0" + "@tiptap/core": "^3.15.3" } }, "node_modules/@tiptap/extension-heading": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@tiptap/extension-heading/-/extension-heading-3.13.0.tgz", - "integrity": "sha512-8VKWX8waYPtUWN97J89em9fOtxNteh6pvUEd0htcOAtoxjt2uZjbW5N4lKyWhNKifZBrVhH2Cc2NUPuftCVgxw==", + "version": "3.15.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-heading/-/extension-heading-3.15.3.tgz", + "integrity": "sha512-G1GG6iN1YXPS+75arDpo+bYRzhr3dNDw99c7D7na3aDawa9Qp7sZ/bVrzFUUcVEce0cD6h83yY7AooBxEc67hA==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "^3.13.0" + "@tiptap/core": "^3.15.3" } }, "node_modules/@tiptap/extension-horizontal-rule": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-3.13.0.tgz", - "integrity": "sha512-ZUFyORtjj22ib8ykbxRhWFQOTZjNKqOsMQjaAGof30cuD2DN5J5pMz7Haj2fFRtLpugWYH+f0Mi+WumQXC3hCw==", + "version": "3.15.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-3.15.3.tgz", + "integrity": "sha512-FYkN7L6JsfwwNEntmLklCVKvgL0B0N47OXMacRk6kYKQmVQ4Nvc7q/VJLpD9sk4wh4KT1aiCBfhKEBTu5pv1fg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "^3.13.0", - "@tiptap/pm": "^3.13.0" + "@tiptap/core": "^3.15.3", + "@tiptap/pm": "^3.15.3" } }, "node_modules/@tiptap/extension-image": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@tiptap/extension-image/-/extension-image-3.13.0.tgz", - "integrity": "sha512-223uzLUkIa1rkK7aQK3AcIXe6LbCtmnpVb7sY5OEp+LpSaSPyXwyrZ4A0EO1o98qXG68/0B2OqMntFtA9c5Fbw==", + "version": "3.15.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-image/-/extension-image-3.15.3.tgz", + "integrity": "sha512-Tjq9BHlC/0bGR9/uySA0tv6I1Ua1Q5t5P/mdbWyZi4JdUpKHRfgenzfXF5DYnklJ01QJ7uOPSp9sAGgPzBixtQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "^3.13.0" + "@tiptap/core": "^3.15.3" } }, "node_modules/@tiptap/extension-italic": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@tiptap/extension-italic/-/extension-italic-3.13.0.tgz", - "integrity": "sha512-XbVTgmzk1kgUMTirA6AGdLTcKHUvEJoh3R4qMdPtwwygEOe7sBuvKuLtF6AwUtpnOM+Y3tfWUTNEDWv9AcEdww==", + "version": "3.15.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-italic/-/extension-italic-3.15.3.tgz", + "integrity": "sha512-6XeuPjcWy7OBxpkgOV7bD6PATO5jhIxc8SEK4m8xn8nelGTBIbHGqK37evRv+QkC7E0MUryLtzwnmmiaxcKL0Q==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "^3.13.0" + "@tiptap/core": "^3.15.3" } }, "node_modules/@tiptap/extension-link": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@tiptap/extension-link/-/extension-link-3.13.0.tgz", - "integrity": "sha512-LuFPJ5GoL12GHW4A+USsj60O90pLcwUPdvEUSWewl9USyG6gnLnY/j5ZOXPYH7LiwYW8+lhq7ABwrDF2PKyBbA==", + "version": "3.15.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-link/-/extension-link-3.15.3.tgz", + "integrity": "sha512-PdDXyBF9Wco9U1x6e+b7tKBWG+kqBDXDmaYXHkFm/gYuQCQafVJ5mdrDdKgkHDWVnJzMWZXBcZjT9r57qtlLWg==", "license": "MIT", "dependencies": { "linkifyjs": "^4.3.2" @@ -4003,159 +3469,159 @@ "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "^3.13.0", - "@tiptap/pm": "^3.13.0" + "@tiptap/core": "^3.15.3", + "@tiptap/pm": "^3.15.3" } }, "node_modules/@tiptap/extension-list": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@tiptap/extension-list/-/extension-list-3.13.0.tgz", - "integrity": "sha512-MMFH0jQ4LeCPkJJFyZ77kt6eM/vcKujvTbMzW1xSHCIEA6s4lEcx9QdZMPpfmnOvTzeoVKR4nsu2t2qT9ZXzAw==", + "version": "3.15.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-list/-/extension-list-3.15.3.tgz", + "integrity": "sha512-n7y/MF9lAM5qlpuH5IR4/uq+kJPEJpe9NrEiH+NmkO/5KJ6cXzpJ6F4U17sMLf2SNCq+TWN9QK8QzoKxIn50VQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "^3.13.0", - "@tiptap/pm": "^3.13.0" + "@tiptap/core": "^3.15.3", + "@tiptap/pm": "^3.15.3" } }, "node_modules/@tiptap/extension-list-item": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@tiptap/extension-list-item/-/extension-list-item-3.13.0.tgz", - "integrity": "sha512-63NbcS/XeQP2jcdDEnEAE3rjJICDj8y1SN1h/MsJmSt1LusnEo8WQ2ub86QELO6XnD3M04V03cY6Knf6I5mTkw==", + "version": "3.15.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-list-item/-/extension-list-item-3.15.3.tgz", + "integrity": "sha512-CCxL5ek1p0lO5e8aqhnPzIySldXRSigBFk2fP9OLgdl5qKFLs2MGc19jFlx5+/kjXnEsdQTFbGY1Sizzt0TVDw==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extension-list": "^3.13.0" + "@tiptap/extension-list": "^3.15.3" } }, "node_modules/@tiptap/extension-list-keymap": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@tiptap/extension-list-keymap/-/extension-list-keymap-3.13.0.tgz", - "integrity": "sha512-P+HtIa1iwosb1feFc8B/9MN5EAwzS+/dZ0UH0CTF2E4wnp5Z9OMxKl1IYjfiCwHzZrU5Let+S/maOvJR/EmV0g==", + "version": "3.15.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-list-keymap/-/extension-list-keymap-3.15.3.tgz", + "integrity": "sha512-UxqnTEEAKrL+wFQeSyC9z0mgyUUVRS2WTcVFoLZCE6/Xus9F53S4bl7VKFadjmqI4GpDk5Oe2IOUc72o129jWg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extension-list": "^3.13.0" + "@tiptap/extension-list": "^3.15.3" } }, "node_modules/@tiptap/extension-ordered-list": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@tiptap/extension-ordered-list/-/extension-ordered-list-3.13.0.tgz", - "integrity": "sha512-QuDyLzuK/3vCvx9GeKhgvHWrGECBzmJyAx6gli2HY+Iil7XicbfltV4nvhIxgxzpx3LDHLKzJN9pBi+2MzX60g==", + "version": "3.15.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-ordered-list/-/extension-ordered-list-3.15.3.tgz", + "integrity": "sha512-/8uhw528Iy0c9wF6tHCiIn0ToM0Ml6Ll2c/3iPRnKr4IjXwx2Lr994stUFihb+oqGZwV1J8CPcZJ4Ufpdqi4Dw==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extension-list": "^3.13.0" + "@tiptap/extension-list": "^3.15.3" } }, "node_modules/@tiptap/extension-paragraph": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@tiptap/extension-paragraph/-/extension-paragraph-3.13.0.tgz", - "integrity": "sha512-9csQde1i0yeZI5oQQ9e1GYNtGL2JcC2d8Fwtw9FsGC8yz2W0h+Fmk+3bc2kobbtO5LGqupSc1fKM8fAg5rSRDg==", + "version": "3.15.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-paragraph/-/extension-paragraph-3.15.3.tgz", + "integrity": "sha512-lc0Qu/1AgzcEfS67NJMj5tSHHhH6NtA6uUpvppEKGsvJwgE2wKG1onE4isrVXmcGRdxSMiCtyTDemPNMu6/ozQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "^3.13.0" + "@tiptap/core": "^3.15.3" } }, "node_modules/@tiptap/extension-placeholder": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@tiptap/extension-placeholder/-/extension-placeholder-3.13.0.tgz", - "integrity": "sha512-Au4ktRBraQktX9gjSzGWyJV6kPof7+kOhzE8ej+rOMjIrHbx3DCHy1CJWftSO9BbqIyonjsFmm4nE+vjzZ3Z5Q==", + "version": "3.15.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-placeholder/-/extension-placeholder-3.15.3.tgz", + "integrity": "sha512-XcHHnojT186hKIoOgcPBesXk89+caNGVUdMtc171Vcr/5s0dpnr4q5LfE+YRC+S85CpCxCRRnh84Ou+XRtOqrw==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extensions": "^3.13.0" + "@tiptap/extensions": "^3.15.3" } }, "node_modules/@tiptap/extension-strike": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@tiptap/extension-strike/-/extension-strike-3.13.0.tgz", - "integrity": "sha512-VHhWNqTAMOfrC48m2FcPIZB0nhl6XHQviAV16SBc+EFznKNv9tQUsqQrnuQ2y6ZVfqq5UxvZ3hKF/JlN/Ff7xw==", + "version": "3.15.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-strike/-/extension-strike-3.15.3.tgz", + "integrity": "sha512-Y1P3eGNY7RxQs2BcR6NfLo9VfEOplXXHAqkOM88oowWWOE7dMNeFFZM9H8HNxoQgXJ7H0aWW9B7ZTWM9hWli2Q==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "^3.13.0" + "@tiptap/core": "^3.15.3" } }, "node_modules/@tiptap/extension-text": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@tiptap/extension-text/-/extension-text-3.13.0.tgz", - "integrity": "sha512-VcZIna93rixw7hRkHGCxDbL3kvJWi80vIT25a2pXg0WP1e7Pi3nBYvZIL4SQtkbBCji9EHrbZx3p8nNPzfazYw==", + "version": "3.15.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-text/-/extension-text-3.15.3.tgz", + "integrity": "sha512-MhkBz8ZvrqOKtKNp+ZWISKkLUlTrDR7tbKZc2OnNcUTttL9dz0HwT+cg91GGz19fuo7ttDcfsPV6eVmflvGToA==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "^3.13.0" + "@tiptap/core": "^3.15.3" } }, "node_modules/@tiptap/extension-text-align": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@tiptap/extension-text-align/-/extension-text-align-3.13.0.tgz", - "integrity": "sha512-hebIus9tdXWb+AmhO+LTeUxZLdb0tqwdeaL/0wYxJQR5DeCTlJe6huXacMD/BkmnlEpRhxzQH0FrmXAd0d4Wgg==", + "version": "3.15.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-text-align/-/extension-text-align-3.15.3.tgz", + "integrity": "sha512-hkLeEKm44aqimyjv+D8JUxzDG/iNjDrSCGvGrMOPcpaKn4f8C5z1EKnEufT61RitNPBAxQMXUhmGQUNrmlICmQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "^3.13.0" + "@tiptap/core": "^3.15.3" } }, "node_modules/@tiptap/extension-underline": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@tiptap/extension-underline/-/extension-underline-3.13.0.tgz", - "integrity": "sha512-VDQi+UYw0tFnfghpthJTFmtJ3yx90kXeDwFvhmT8G+O+si5VmP05xYDBYBmYCix5jqKigJxEASiBL0gYOgMDEg==", + "version": "3.15.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-underline/-/extension-underline-3.15.3.tgz", + "integrity": "sha512-r/IwcNN0W366jGu4Y0n2MiFq9jGa4aopOwtfWO4d+J0DyeS2m7Go3+KwoUqi0wQTiVU74yfi4DF6eRsMQ9/iHQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "^3.13.0" + "@tiptap/core": "^3.15.3" } }, "node_modules/@tiptap/extensions": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@tiptap/extensions/-/extensions-3.13.0.tgz", - "integrity": "sha512-i7O0ptSibEtTy+2PIPsNKEvhTvMaFJg1W4Oxfnbuxvaigs7cJV9Q0lwDUcc7CPsNw2T1+44wcxg431CzTvdYoA==", + "version": "3.15.3", + "resolved": "https://registry.npmjs.org/@tiptap/extensions/-/extensions-3.15.3.tgz", + "integrity": "sha512-ycx/BgxR4rc9tf3ZyTdI98Z19yKLFfqM3UN+v42ChuIwkzyr9zyp7kG8dB9xN2lNqrD+5y/HyJobz/VJ7T90gA==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "^3.13.0", - "@tiptap/pm": "^3.13.0" + "@tiptap/core": "^3.15.3", + "@tiptap/pm": "^3.15.3" } }, "node_modules/@tiptap/pm": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@tiptap/pm/-/pm-3.13.0.tgz", - "integrity": "sha512-WKR4ucALq+lwx0WJZW17CspeTpXorbIOpvKv5mulZica6QxqfMhn8n1IXCkDws/mCoLRx4Drk5d377tIjFNsvQ==", + "version": "3.15.3", + "resolved": "https://registry.npmjs.org/@tiptap/pm/-/pm-3.15.3.tgz", + "integrity": "sha512-Zm1BaU1TwFi3CQiisxjgnzzIus+q40bBKWLqXf6WEaus8Z6+vo1MT2pU52dBCMIRaW9XNDq3E5cmGtMc1AlveA==", "license": "MIT", "dependencies": { "prosemirror-changeset": "^2.3.0", @@ -4183,9 +3649,9 @@ } }, "node_modules/@tiptap/react": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@tiptap/react/-/react-3.13.0.tgz", - "integrity": "sha512-VqpqNZ9qtPr3pWK4NsZYxXgLSEiAnzl6oS7tEGmkkvJbcGSC+F7R13Xc9twv/zT5QCLxaHdEbmxHbuAIkrMgJQ==", + "version": "3.15.3", + "resolved": "https://registry.npmjs.org/@tiptap/react/-/react-3.15.3.tgz", + "integrity": "sha512-XvouB+Hrqw8yFmZLPEh+HWlMeRSjZfHSfWfWuw5d8LSwnxnPeu3Bg/rjHrRrdwb+7FumtzOnNWMorpb/PSOttQ==", "license": "MIT", "dependencies": { "@types/use-sync-external-store": "^0.0.6", @@ -4197,12 +3663,12 @@ "url": "https://github.com/sponsors/ueberdosis" }, "optionalDependencies": { - "@tiptap/extension-bubble-menu": "^3.13.0", - "@tiptap/extension-floating-menu": "^3.13.0" + "@tiptap/extension-bubble-menu": "^3.15.3", + "@tiptap/extension-floating-menu": "^3.15.3" }, "peerDependencies": { - "@tiptap/core": "^3.13.0", - "@tiptap/pm": "^3.13.0", + "@tiptap/core": "^3.15.3", + "@tiptap/pm": "^3.15.3", "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", "@types/react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0", "react": "^17.0.0 || ^18.0.0 || ^19.0.0", @@ -4210,35 +3676,35 @@ } }, "node_modules/@tiptap/starter-kit": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@tiptap/starter-kit/-/starter-kit-3.13.0.tgz", - "integrity": "sha512-Ojn6sRub04CRuyQ+9wqN62JUOMv+rG1vXhc2s6DCBCpu28lkCMMW+vTe7kXJcEdbot82+5swPbERw9vohswFzg==", + "version": "3.15.3", + "resolved": "https://registry.npmjs.org/@tiptap/starter-kit/-/starter-kit-3.15.3.tgz", + "integrity": "sha512-ia+eQr9Mt1ln2UO+kK4kFTJOrZK4GhvZXFjpCCYuHtco3rhr2fZAIxEEY4cl/vo5VO5WWyPqxhkFeLcoWmNjSw==", "license": "MIT", "dependencies": { - "@tiptap/core": "^3.13.0", - "@tiptap/extension-blockquote": "^3.13.0", - "@tiptap/extension-bold": "^3.13.0", - "@tiptap/extension-bullet-list": "^3.13.0", - "@tiptap/extension-code": "^3.13.0", - "@tiptap/extension-code-block": "^3.13.0", - "@tiptap/extension-document": "^3.13.0", - "@tiptap/extension-dropcursor": "^3.13.0", - "@tiptap/extension-gapcursor": "^3.13.0", - "@tiptap/extension-hard-break": "^3.13.0", - "@tiptap/extension-heading": "^3.13.0", - "@tiptap/extension-horizontal-rule": "^3.13.0", - "@tiptap/extension-italic": "^3.13.0", - "@tiptap/extension-link": "^3.13.0", - "@tiptap/extension-list": "^3.13.0", - "@tiptap/extension-list-item": "^3.13.0", - "@tiptap/extension-list-keymap": "^3.13.0", - "@tiptap/extension-ordered-list": "^3.13.0", - "@tiptap/extension-paragraph": "^3.13.0", - "@tiptap/extension-strike": "^3.13.0", - "@tiptap/extension-text": "^3.13.0", - "@tiptap/extension-underline": "^3.13.0", - "@tiptap/extensions": "^3.13.0", - "@tiptap/pm": "^3.13.0" + "@tiptap/core": "^3.15.3", + "@tiptap/extension-blockquote": "^3.15.3", + "@tiptap/extension-bold": "^3.15.3", + "@tiptap/extension-bullet-list": "^3.15.3", + "@tiptap/extension-code": "^3.15.3", + "@tiptap/extension-code-block": "^3.15.3", + "@tiptap/extension-document": "^3.15.3", + "@tiptap/extension-dropcursor": "^3.15.3", + "@tiptap/extension-gapcursor": "^3.15.3", + "@tiptap/extension-hard-break": "^3.15.3", + "@tiptap/extension-heading": "^3.15.3", + "@tiptap/extension-horizontal-rule": "^3.15.3", + "@tiptap/extension-italic": "^3.15.3", + "@tiptap/extension-link": "^3.15.3", + "@tiptap/extension-list": "^3.15.3", + "@tiptap/extension-list-item": "^3.15.3", + "@tiptap/extension-list-keymap": "^3.15.3", + "@tiptap/extension-ordered-list": "^3.15.3", + "@tiptap/extension-paragraph": "^3.15.3", + "@tiptap/extension-strike": "^3.15.3", + "@tiptap/extension-text": "^3.15.3", + "@tiptap/extension-underline": "^3.15.3", + "@tiptap/extensions": "^3.15.3", + "@tiptap/pm": "^3.15.3" }, "funding": { "type": "github", @@ -4370,9 +3836,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "20.19.24", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.24.tgz", - "integrity": "sha512-FE5u0ezmi6y9OZEzlJfg37mqqf6ZDSF2V/NLjUyGrR9uTZ7Sb9F7bLNZ03S4XVUNRWGA7Ck4c1kK+YnuWjl+DA==", + "version": "20.19.27", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.27.tgz", + "integrity": "sha512-N2clP5pJhB2YnZJ3PIHFk5RkygRX5WO/5f0WC08tp0wd+sv0rsJk3MqWn3CbNmT2J505a5336jaQj4ph1AdMug==", "dev": true, "license": "MIT", "dependencies": { @@ -4380,18 +3846,18 @@ } }, "node_modules/@types/react": { - "version": "19.2.2", - "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.2.tgz", - "integrity": "sha512-6mDvHUFSjyT2B2yeNx2nUgMxh9LtOWvkhIU3uePn2I2oyNymUAX1NIsdgviM4CH+JSrp2D2hsMvJOkxY+0wNRA==", + "version": "19.2.7", + "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.7.tgz", + "integrity": "sha512-MWtvHrGZLFttgeEj28VXHxpmwYbor/ATPYbBfSFZEIRK0ecCFLl2Qo55z52Hss+UV9CRN7trSeq1zbgx7YDWWg==", "license": "MIT", "dependencies": { - "csstype": "^3.0.2" + "csstype": "^3.2.2" } }, "node_modules/@types/react-dom": { - "version": "19.2.2", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.2.2.tgz", - "integrity": "sha512-9KQPoO6mZCi7jcIStSnlOWn2nEF3mNmyr3rIAsGnAbQKYbRLyqmeSc39EVgtxXVia+LMT8j3knZLAZAh+xLmrw==", + "version": "19.2.3", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.2.3.tgz", + "integrity": "sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==", "license": "MIT", "peerDependencies": { "@types/react": "^19.2.0" @@ -4404,21 +3870,20 @@ "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.46.3", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.46.3.tgz", - "integrity": "sha512-sbaQ27XBUopBkRiuY/P9sWGOWUW4rl8fDoHIUmLpZd8uldsTyB4/Zg6bWTegPoTLnKj9Hqgn3QD6cjPNB32Odw==", + "version": "8.52.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.52.0.tgz", + "integrity": "sha512-okqtOgqu2qmZJ5iN4TWlgfF171dZmx2FzdOv2K/ixL2LZWDStL8+JgQerI2sa8eAEfoydG9+0V96m7V+P8yE1Q==", "dev": true, "license": "MIT", "dependencies": { - "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.46.3", - "@typescript-eslint/type-utils": "8.46.3", - "@typescript-eslint/utils": "8.46.3", - "@typescript-eslint/visitor-keys": "8.46.3", - "graphemer": "^1.4.0", - "ignore": "^7.0.0", + "@eslint-community/regexpp": "^4.12.2", + "@typescript-eslint/scope-manager": "8.52.0", + "@typescript-eslint/type-utils": "8.52.0", + "@typescript-eslint/utils": "8.52.0", + "@typescript-eslint/visitor-keys": "8.52.0", + "ignore": "^7.0.5", "natural-compare": "^1.4.0", - "ts-api-utils": "^2.1.0" + "ts-api-utils": "^2.4.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -4428,7 +3893,7 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^8.46.3", + "@typescript-eslint/parser": "^8.52.0", "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <6.0.0" } @@ -4444,17 +3909,17 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.46.3", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.46.3.tgz", - "integrity": "sha512-6m1I5RmHBGTnUGS113G04DMu3CpSdxCAU/UvtjNWL4Nuf3MW9tQhiJqRlHzChIkhy6kZSAQmc+I1bcGjE3yNKg==", + "version": "8.52.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.52.0.tgz", + "integrity": "sha512-iIACsx8pxRnguSYhHiMn2PvhvfpopO9FXHyn1mG5txZIsAaB6F0KwbFnUQN3KCiG3Jcuad/Cao2FAs1Wp7vAyg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.46.3", - "@typescript-eslint/types": "8.46.3", - "@typescript-eslint/typescript-estree": "8.46.3", - "@typescript-eslint/visitor-keys": "8.46.3", - "debug": "^4.3.4" + "@typescript-eslint/scope-manager": "8.52.0", + "@typescript-eslint/types": "8.52.0", + "@typescript-eslint/typescript-estree": "8.52.0", + "@typescript-eslint/visitor-keys": "8.52.0", + "debug": "^4.4.3" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -4469,15 +3934,15 @@ } }, "node_modules/@typescript-eslint/project-service": { - "version": "8.46.3", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.46.3.tgz", - "integrity": "sha512-Fz8yFXsp2wDFeUElO88S9n4w1I4CWDTXDqDr9gYvZgUpwXQqmZBr9+NTTql5R3J7+hrJZPdpiWaB9VNhAKYLuQ==", + "version": "8.52.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.52.0.tgz", + "integrity": "sha512-xD0MfdSdEmeFa3OmVqonHi+Cciab96ls1UhIF/qX/O/gPu5KXD0bY9lu33jj04fjzrXHcuvjBcBC+D3SNSadaw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.46.3", - "@typescript-eslint/types": "^8.46.3", - "debug": "^4.3.4" + "@typescript-eslint/tsconfig-utils": "^8.52.0", + "@typescript-eslint/types": "^8.52.0", + "debug": "^4.4.3" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -4491,14 +3956,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.46.3", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.46.3.tgz", - "integrity": "sha512-FCi7Y1zgrmxp3DfWfr+3m9ansUUFoy8dkEdeQSgA9gbm8DaHYvZCdkFRQrtKiedFf3Ha6VmoqoAaP68+i+22kg==", + "version": "8.52.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.52.0.tgz", + "integrity": "sha512-ixxqmmCcc1Nf8S0mS0TkJ/3LKcC8mruYJPOU6Ia2F/zUUR4pApW7LzrpU3JmtePbRUTes9bEqRc1Gg4iyRnDzA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.46.3", - "@typescript-eslint/visitor-keys": "8.46.3" + "@typescript-eslint/types": "8.52.0", + "@typescript-eslint/visitor-keys": "8.52.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -4509,9 +3974,9 @@ } }, "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.46.3", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.46.3.tgz", - "integrity": "sha512-GLupljMniHNIROP0zE7nCcybptolcH8QZfXOpCfhQDAdwJ/ZTlcaBOYebSOZotpti/3HrHSw7D3PZm75gYFsOA==", + "version": "8.52.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.52.0.tgz", + "integrity": "sha512-jl+8fzr/SdzdxWJznq5nvoI7qn2tNYV/ZBAEcaFMVXf+K6jmXvAFrgo/+5rxgnL152f//pDEAYAhhBAZGrVfwg==", "dev": true, "license": "MIT", "engines": { @@ -4526,17 +3991,17 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.46.3", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.46.3.tgz", - "integrity": "sha512-ZPCADbr+qfz3aiTTYNNkCbUt+cjNwI/5McyANNrFBpVxPt7GqpEYz5ZfdwuFyGUnJ9FdDXbGODUu6iRCI6XRXw==", + "version": "8.52.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.52.0.tgz", + "integrity": "sha512-JD3wKBRWglYRQkAtsyGz1AewDu3mTc7NtRjR/ceTyGoPqmdS5oCdx/oZMWD5Zuqmo6/MpsYs0wp6axNt88/2EQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.46.3", - "@typescript-eslint/typescript-estree": "8.46.3", - "@typescript-eslint/utils": "8.46.3", - "debug": "^4.3.4", - "ts-api-utils": "^2.1.0" + "@typescript-eslint/types": "8.52.0", + "@typescript-eslint/typescript-estree": "8.52.0", + "@typescript-eslint/utils": "8.52.0", + "debug": "^4.4.3", + "ts-api-utils": "^2.4.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -4551,9 +4016,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.46.3", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.46.3.tgz", - "integrity": "sha512-G7Ok9WN/ggW7e/tOf8TQYMaxgID3Iujn231hfi0Pc7ZheztIJVpO44ekY00b7akqc6nZcvregk0Jpah3kep6hA==", + "version": "8.52.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.52.0.tgz", + "integrity": "sha512-LWQV1V4q9V4cT4H5JCIx3481iIFxH1UkVk+ZkGGAV1ZGcjGI9IoFOfg3O6ywz8QqCDEp7Inlg6kovMofsNRaGg==", "dev": true, "license": "MIT", "engines": { @@ -4565,22 +4030,21 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.46.3", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.46.3.tgz", - "integrity": "sha512-f/NvtRjOm80BtNM5OQtlaBdM5BRFUv7gf381j9wygDNL+qOYSNOgtQ/DCndiYi80iIOv76QqaTmp4fa9hwI0OA==", + "version": "8.52.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.52.0.tgz", + "integrity": "sha512-XP3LClsCc0FsTK5/frGjolyADTh3QmsLp6nKd476xNI9CsSsLnmn4f0jrzNoAulmxlmNIpeXuHYeEQv61Q6qeQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/project-service": "8.46.3", - "@typescript-eslint/tsconfig-utils": "8.46.3", - "@typescript-eslint/types": "8.46.3", - "@typescript-eslint/visitor-keys": "8.46.3", - "debug": "^4.3.4", - "fast-glob": "^3.3.2", - "is-glob": "^4.0.3", - "minimatch": "^9.0.4", - "semver": "^7.6.0", - "ts-api-utils": "^2.1.0" + "@typescript-eslint/project-service": "8.52.0", + "@typescript-eslint/tsconfig-utils": "8.52.0", + "@typescript-eslint/types": "8.52.0", + "@typescript-eslint/visitor-keys": "8.52.0", + "debug": "^4.4.3", + "minimatch": "^9.0.5", + "semver": "^7.7.3", + "tinyglobby": "^0.2.15", + "ts-api-utils": "^2.4.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -4603,36 +4067,6 @@ "balanced-match": "^1.0.0" } }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/fast-glob": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", - "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.8" - }, - "engines": { - "node": ">=8.6.0" - } - }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "license": "ISC", - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { "version": "9.0.5", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", @@ -4649,30 +4083,17 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { - "version": "7.7.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz", - "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@typescript-eslint/utils": { - "version": "8.46.3", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.46.3.tgz", - "integrity": "sha512-VXw7qmdkucEx9WkmR3ld/u6VhRyKeiF1uxWwCy/iuNfokjJ7VhsgLSOTjsol8BunSw190zABzpwdNsze2Kpo4g==", + "version": "8.52.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.52.0.tgz", + "integrity": "sha512-wYndVMWkweqHpEpwPhwqE2lnD2DxC6WVLupU/DOt/0/v+/+iQbbzO3jOHjmBMnhu0DgLULvOaU4h4pwHYi2oRQ==", "dev": true, "license": "MIT", "dependencies": { - "@eslint-community/eslint-utils": "^4.7.0", - "@typescript-eslint/scope-manager": "8.46.3", - "@typescript-eslint/types": "8.46.3", - "@typescript-eslint/typescript-estree": "8.46.3" + "@eslint-community/eslint-utils": "^4.9.1", + "@typescript-eslint/scope-manager": "8.52.0", + "@typescript-eslint/types": "8.52.0", + "@typescript-eslint/typescript-estree": "8.52.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -4687,13 +4108,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.46.3", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.46.3.tgz", - "integrity": "sha512-uk574k8IU0rOF/AjniX8qbLSGURJVUCeM5e4MIMKBFFi8weeiLrG1fyQejyLXQpRZbU/1BuQasleV/RfHC3hHg==", + "version": "8.52.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.52.0.tgz", + "integrity": "sha512-ink3/Zofus34nmBsPjow63FP5M7IGff0RKAgqR6+CFpdk22M7aLwC9gOcLGYqr7MczLPzZVERW9hRog3O4n1sQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.46.3", + "@typescript-eslint/types": "8.52.0", "eslint-visitor-keys": "^4.2.1" }, "engines": { @@ -5251,9 +4672,9 @@ } }, "node_modules/axe-core": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.11.0.tgz", - "integrity": "sha512-ilYanEU8vxxBexpJd8cWM4ElSQq4QctCLKih0TSfjIfCQTeyH/6zVrmIJfLPrKTKJRbiG+cfnZbQIjAlJmF1jQ==", + "version": "4.11.1", + "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.11.1.tgz", + "integrity": "sha512-BASOg+YwO2C+346x3LZOeoovTIoTrRqEsqMa6fmfAV0P+U9mFr9NsyOEpiYvFjbc64NMrSswhV50WdXzdb/Z5A==", "dev": true, "license": "MPL-2.0", "engines": { @@ -5292,7 +4713,6 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", - "dev": true, "license": "MIT", "dependencies": { "fill-range": "^7.1.1" @@ -5362,9 +4782,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001753", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001753.tgz", - "integrity": "sha512-Bj5H35MD/ebaOV4iDLqPEtiliTN29qkGtEHCwawWn4cYm+bPJM2NsaP30vtZcnERClMzp52J4+aw2UNbK4o+zw==", + "version": "1.0.30001763", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001763.tgz", + "integrity": "sha512-mh/dGtq56uN98LlNX9qdbKnzINhX0QzhiWBFEkFfsFO4QyCvL8YegrJAazCwXIeqkIob8BlZPGM3xdnY+sgmvQ==", "funding": [ { "type": "opencollective", @@ -5490,9 +4910,9 @@ } }, "node_modules/csstype": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", - "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz", + "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==", "license": "MIT" }, "node_modules/d3-array": { @@ -5818,9 +5238,9 @@ "license": "MIT" }, "node_modules/enhanced-resolve": { - "version": "5.18.3", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz", - "integrity": "sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==", + "version": "5.18.4", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.4.tgz", + "integrity": "sha512-LgQMM4WXU3QI+SYgEc2liRgznaD5ojbmY3sb8LxyguVkIg5FxdpTkvk72te2R38/TGKxH634oLxXRGY6d7AP+Q==", "dev": true, "license": "MIT", "dependencies": { @@ -5844,9 +5264,9 @@ } }, "node_modules/es-abstract": { - "version": "1.24.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.0.tgz", - "integrity": "sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==", + "version": "1.24.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.1.tgz", + "integrity": "sha512-zHXBLhP+QehSSbsS9Pt23Gg964240DPd6QCf8WpkqEXxQ7fhdZzYsocOr5u7apWonsS5EjZDmTF+/slGMyasvw==", "dev": true, "license": "MIT", "dependencies": { @@ -5933,27 +5353,27 @@ } }, "node_modules/es-iterator-helpers": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.1.tgz", - "integrity": "sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.2.tgz", + "integrity": "sha512-BrUQ0cPTB/IwXj23HtwHjS9n7O4h9FX94b4xc5zlTHxeLgTAdzYUDyy6KdExAl9lbN5rtfe44xpjpmj9grxs5w==", "dev": true, "license": "MIT", "dependencies": { "call-bind": "^1.0.8", - "call-bound": "^1.0.3", + "call-bound": "^1.0.4", "define-properties": "^1.2.1", - "es-abstract": "^1.23.6", + "es-abstract": "^1.24.1", "es-errors": "^1.3.0", - "es-set-tostringtag": "^2.0.3", + "es-set-tostringtag": "^2.1.0", "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.6", + "get-intrinsic": "^1.3.0", "globalthis": "^1.0.4", "gopd": "^1.2.0", "has-property-descriptors": "^1.0.2", "has-proto": "^1.2.0", "has-symbols": "^1.1.0", "internal-slot": "^1.1.0", - "iterator.prototype": "^1.1.4", + "iterator.prototype": "^1.1.5", "safe-array-concat": "^1.1.3" }, "engines": { @@ -6021,9 +5441,9 @@ } }, "node_modules/es-toolkit": { - "version": "1.41.0", - "resolved": "https://registry.npmjs.org/es-toolkit/-/es-toolkit-1.41.0.tgz", - "integrity": "sha512-bDd3oRmbVgqZCJS6WmeQieOrzpl3URcWBUVDXxOELlUW2FuW+0glPOz1n0KnRie+PdyvUZcXz2sOn00c6pPRIA==", + "version": "1.43.0", + "resolved": "https://registry.npmjs.org/es-toolkit/-/es-toolkit-1.43.0.tgz", + "integrity": "sha512-SKCT8AsWvYzBBuUqMk4NPwFlSdqLpJwmy6AP322ERn8W2YLIB6JBXnwMI2Qsh2gfphT3q7EKAxKb23cvFHFwKA==", "license": "MIT", "workspaces": [ "docs", @@ -6043,9 +5463,9 @@ } }, "node_modules/eslint": { - "version": "9.39.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.1.tgz", - "integrity": "sha512-BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g==", + "version": "9.39.2", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.2.tgz", + "integrity": "sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==", "dev": true, "license": "MIT", "dependencies": { @@ -6055,7 +5475,7 @@ "@eslint/config-helpers": "^0.4.2", "@eslint/core": "^0.17.0", "@eslint/eslintrc": "^3.3.1", - "@eslint/js": "9.39.1", + "@eslint/js": "9.39.2", "@eslint/plugin-kit": "^0.4.1", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", @@ -6103,13 +5523,13 @@ } }, "node_modules/eslint-config-next": { - "version": "15.5.6", - "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-15.5.6.tgz", - "integrity": "sha512-cGr3VQlPsZBEv8rtYp4BpG1KNXDqGvPo9VC1iaCgIA11OfziC/vczng+TnAS3WpRIR3Q5ye/6yl+CRUuZ1fPGg==", + "version": "15.5.9", + "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-15.5.9.tgz", + "integrity": "sha512-852JYI3NkFNzW8CqsMhI0K2CDRxTObdZ2jQJj5CtpEaOkYHn13107tHpNuD/h0WRpU4FAbCdUaxQsrfBtNK9Kw==", "dev": true, "license": "MIT", "dependencies": { - "@next/eslint-plugin-next": "15.5.6", + "@next/eslint-plugin-next": "15.5.9", "@rushstack/eslint-patch": "^1.10.3", "@typescript-eslint/eslint-plugin": "^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0", "@typescript-eslint/parser": "^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0", @@ -6259,6 +5679,16 @@ "ms": "^2.1.1" } }, + "node_modules/eslint-plugin-import/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/eslint-plugin-jsx-a11y": { "version": "6.10.2", "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.10.2.tgz", @@ -6353,6 +5783,16 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/eslint-plugin-react/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/eslint-scope": { "version": "8.4.0", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz", @@ -6402,9 +5842,9 @@ } }, "node_modules/esquery": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", - "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.7.0.tgz", + "integrity": "sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -6514,9 +5954,9 @@ "license": "MIT" }, "node_modules/fastq": { - "version": "1.19.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz", - "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==", + "version": "1.20.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz", + "integrity": "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==", "dev": true, "license": "ISC", "dependencies": { @@ -6540,7 +5980,6 @@ "version": "7.1.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", - "dev": true, "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" @@ -6811,13 +6250,6 @@ "dev": true, "license": "ISC" }, - "node_modules/graphemer": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "dev": true, - "license": "MIT" - }, "node_modules/has-bigints": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz", @@ -6923,9 +6355,9 @@ } }, "node_modules/immer": { - "version": "11.0.1", - "resolved": "https://registry.npmjs.org/immer/-/immer-11.0.1.tgz", - "integrity": "sha512-naDCyggtcBWANtIrjQEajhhBEuL9b0Zg4zmlWK2CzS6xCWSE39/vvf4LqnMjUAWHBhot4m9MHCM/Z+mfWhUkiA==", + "version": "11.1.3", + "resolved": "https://registry.npmjs.org/immer/-/immer-11.1.3.tgz", + "integrity": "sha512-6jQTc5z0KJFtr1UgFpIL3N9XSC3saRaI9PwWtzM2pSqkNGtiNkYY2OSwkOGDK2XcTRcLb1pi/aNkKZz0nxVH4Q==", "license": "MIT", "funding": { "type": "opencollective", @@ -7076,19 +6508,6 @@ "semver": "^7.7.1" } }, - "node_modules/is-bun-module/node_modules/semver": { - "version": "7.7.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz", - "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/is-callable": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", @@ -7157,7 +6576,6 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -7203,7 +6621,6 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" @@ -7242,7 +6659,6 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, "license": "MIT", "engines": { "node": ">=0.12.0" @@ -7460,9 +6876,9 @@ "license": "MIT" }, "node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz", + "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==", "dev": true, "license": "MIT", "dependencies": { @@ -7493,6 +6909,19 @@ "dev": true, "license": "MIT" }, + "node_modules/json5": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", + "dev": true, + "license": "MIT", + "dependencies": { + "minimist": "^1.2.0" + }, + "bin": { + "json5": "lib/cli.js" + } + }, "node_modules/jsx-ast-utils": { "version": "3.3.5", "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", @@ -7931,7 +7360,6 @@ "version": "4.0.8", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", - "dev": true, "license": "MIT", "dependencies": { "braces": "^3.0.3", @@ -8074,9 +7502,9 @@ } }, "node_modules/next-intl": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/next-intl/-/next-intl-4.4.0.tgz", - "integrity": "sha512-QHqnP9V9Pe7Tn0PdVQ7u1Z8k9yCkW5SJKeRy2g5gxzhSt/C01y3B9qNxuj3Fsmup/yreIHe6osxU6sFa+9WIkQ==", + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/next-intl/-/next-intl-4.7.0.tgz", + "integrity": "sha512-gvROzcNr/HM0jTzQlKWQxUNk8jrZ0bREz+bht3wNbv+uzlZ5Kn3J+m+viosub18QJ72S08UJnVK50PXWcUvwpQ==", "funding": [ { "type": "individual", @@ -8086,8 +7514,12 @@ "license": "MIT", "dependencies": { "@formatjs/intl-localematcher": "^0.5.4", + "@parcel/watcher": "^2.4.1", + "@swc/core": "^1.15.2", "negotiator": "^1.0.0", - "use-intl": "^4.4.0" + "next-intl-swc-plugin-extractor": "^4.7.0", + "po-parser": "^2.1.1", + "use-intl": "^4.7.0" }, "peerDependencies": { "next": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0", @@ -8100,6 +7532,61 @@ } } }, + "node_modules/next-intl-swc-plugin-extractor": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/next-intl-swc-plugin-extractor/-/next-intl-swc-plugin-extractor-4.7.0.tgz", + "integrity": "sha512-iAqflu2FWdQMWhwB0B2z52X7LmEpvnMNJXqVERZQ7bK5p9iqQLu70ur6Ka6NfiXLxfb+AeAkUX5qIciQOg+87A==", + "license": "MIT" + }, + "node_modules/next-intl/node_modules/@swc/core": { + "version": "1.15.8", + "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.15.8.tgz", + "integrity": "sha512-T8keoJjXaSUoVBCIjgL6wAnhADIb09GOELzKg10CjNg+vLX48P93SME6jTfte9MZIm5m+Il57H3rTSk/0kzDUw==", + "hasInstallScript": true, + "license": "Apache-2.0", + "dependencies": { + "@swc/counter": "^0.1.3", + "@swc/types": "^0.1.25" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/swc" + }, + "optionalDependencies": { + "@swc/core-darwin-arm64": "1.15.8", + "@swc/core-darwin-x64": "1.15.8", + "@swc/core-linux-arm-gnueabihf": "1.15.8", + "@swc/core-linux-arm64-gnu": "1.15.8", + "@swc/core-linux-arm64-musl": "1.15.8", + "@swc/core-linux-x64-gnu": "1.15.8", + "@swc/core-linux-x64-musl": "1.15.8", + "@swc/core-win32-arm64-msvc": "1.15.8", + "@swc/core-win32-ia32-msvc": "1.15.8", + "@swc/core-win32-x64-msvc": "1.15.8" + }, + "peerDependencies": { + "@swc/helpers": ">=0.5.17" + }, + "peerDependenciesMeta": { + "@swc/helpers": { + "optional": true + } + } + }, + "node_modules/next-intl/node_modules/@swc/helpers": { + "version": "0.5.18", + "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.18.tgz", + "integrity": "sha512-TXTnIcNJQEKwThMMqBXsZ4VGAza6bvN4pa41Rkqoio6QBKMvo+5lexeTMScGCIxtzgQJzElcvIltani+adC5PQ==", + "license": "Apache-2.0", + "optional": true, + "peer": true, + "dependencies": { + "tslib": "^2.8.0" + } + }, "node_modules/next/node_modules/postcss": { "version": "8.4.31", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", @@ -8128,6 +7615,12 @@ "node": "^10 || ^12 || >=14" } }, + "node_modules/node-addon-api": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz", + "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==", + "license": "MIT" + }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -8375,7 +7868,6 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true, "license": "MIT", "engines": { "node": ">=8.6" @@ -8416,6 +7908,12 @@ "node": ">=18" } }, + "node_modules/po-parser": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/po-parser/-/po-parser-2.1.1.tgz", + "integrity": "sha512-ECF4zHLbUItpUgE3OTtLKlPjeBN+fKEczj2zYjDfCGOzicNs0GK3Vg2IoAYwx7LH/XYw43fZQP6xnZ4TkNxSLQ==", + "license": "MIT" + }, "node_modules/possible-typed-array-names": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz", @@ -8477,6 +7975,13 @@ "react-is": "^16.13.1" } }, + "node_modules/prop-types/node_modules/react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "dev": true, + "license": "MIT" + }, "node_modules/prosemirror-changeset": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/prosemirror-changeset/-/prosemirror-changeset-2.3.1.tgz", @@ -8625,9 +8130,9 @@ } }, "node_modules/prosemirror-tables": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/prosemirror-tables/-/prosemirror-tables-1.8.3.tgz", - "integrity": "sha512-wbqCR/RlRPRe41a4LFtmhKElzBEfBTdtAYWNIGHM6X2e24NN/MTNUKyXjjphfAfdQce37Kh/5yf765mLPYDe7Q==", + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/prosemirror-tables/-/prosemirror-tables-1.8.5.tgz", + "integrity": "sha512-V/0cDCsHKHe/tfWkeCmthNUcEp1IVO3p6vwN8XtwE9PZQLAZJigbw3QoraAdfJPir4NKJtNvOB8oYGKRl+t0Dw==", "license": "MIT", "dependencies": { "prosemirror-keymap": "^1.2.3", @@ -8722,9 +8227,9 @@ } }, "node_modules/react-day-picker": { - "version": "9.11.1", - "resolved": "https://registry.npmjs.org/react-day-picker/-/react-day-picker-9.11.1.tgz", - "integrity": "sha512-l3ub6o8NlchqIjPKrRFUCkTUEq6KwemQlfv3XZzzwpUeGwmDJ+0u0Upmt38hJyd7D/vn2dQoOoLV/qAp0o3uUw==", + "version": "9.13.0", + "resolved": "https://registry.npmjs.org/react-day-picker/-/react-day-picker-9.13.0.tgz", + "integrity": "sha512-euzj5Hlq+lOHqI53NiuNhCP8HWgsPf/bBAVijR50hNaY1XwjKjShAnIe8jm8RD2W9IJUvihDIZ+KrmqfFzNhFQ==", "license": "MIT", "dependencies": { "@date-fns/tz": "^1.4.1", @@ -8755,9 +8260,9 @@ } }, "node_modules/react-hook-form": { - "version": "7.66.0", - "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.66.0.tgz", - "integrity": "sha512-xXBqsWGKrY46ZqaHDo+ZUYiMUgi8suYu5kdrS20EG8KiL7VRQitEbNjm+UcrDYrNi1YLyfpmAeGjCZYXLT9YBw==", + "version": "7.70.0", + "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.70.0.tgz", + "integrity": "sha512-COOMajS4FI3Wuwrs3GPpi/Jeef/5W1DRR84Yl5/ShlT3dKVFUfoGiEZ/QE6Uw8P4T2/CLJdcTVYKvWBMQTEpvw==", "license": "MIT", "engines": { "node": ">=18.0.0" @@ -8771,10 +8276,11 @@ } }, "node_modules/react-is": { - "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", - "license": "MIT" + "version": "19.2.3", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.2.3.tgz", + "integrity": "sha512-qJNJfu81ByyabuG7hPFEbXqNcWSU3+eVus+KJs+0ncpGfMyYdvSmxiJxbWR65lYi1I+/0HBcliO029gc4F+PnA==", + "license": "MIT", + "peer": true }, "node_modules/react-redux": { "version": "9.2.0", @@ -8800,9 +8306,9 @@ } }, "node_modules/react-remove-scroll": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.7.1.tgz", - "integrity": "sha512-HpMh8+oahmIdOuS5aFKKY6Pyog+FNaZV/XyJOq7b4YFwsFHe5yYfdbIalI4k3vU2nSDql7YskmUseHsRrJqIPA==", + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.7.2.tgz", + "integrity": "sha512-Iqb9NjCCTt6Hf+vOdNIZGdTiH1QSqr27H/Ek9sv/a97gfueI/5h1s3yRi1nngzMUaOOToin5dI1dXKdXiF+u0Q==", "license": "MIT", "dependencies": { "react-remove-scroll-bar": "^2.3.7", @@ -8869,9 +8375,9 @@ } }, "node_modules/recharts": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/recharts/-/recharts-3.4.1.tgz", - "integrity": "sha512-35kYg6JoOgwq8sE4rhYkVWwa6aAIgOtT+Ob0gitnShjwUwZmhrmy7Jco/5kJNF4PnLXgt9Hwq+geEMS+WrjU1g==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/recharts/-/recharts-3.6.0.tgz", + "integrity": "sha512-L5bjxvQRAe26RlToBAziKUB7whaGKEwD3znoM6fz3DrTowCIC/FnJYnuq1GEzB8Zv2kdTfaxQfi5GoH0tBinyg==", "license": "MIT", "workspaces": [ "www" @@ -9117,13 +8623,16 @@ "license": "MIT" }, "node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, + "version": "7.7.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz", + "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==", + "devOptional": true, "license": "ISC", "bin": { "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" } }, "node_modules/set-function-length": { @@ -9176,16 +8685,16 @@ } }, "node_modules/sharp": { - "version": "0.34.4", - "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.34.4.tgz", - "integrity": "sha512-FUH39xp3SBPnxWvd5iib1X8XY7J0K0X7d93sie9CJg2PO8/7gmg89Nve6OjItK53/MlAushNNxteBYfM6DEuoA==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.34.5.tgz", + "integrity": "sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg==", "hasInstallScript": true, "license": "Apache-2.0", "optional": true, "dependencies": { "@img/colour": "^1.0.0", - "detect-libc": "^2.1.0", - "semver": "^7.7.2" + "detect-libc": "^2.1.2", + "semver": "^7.7.3" }, "engines": { "node": "^18.17.0 || ^20.3.0 || >=21.0.0" @@ -9194,41 +8703,30 @@ "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-darwin-arm64": "0.34.4", - "@img/sharp-darwin-x64": "0.34.4", - "@img/sharp-libvips-darwin-arm64": "1.2.3", - "@img/sharp-libvips-darwin-x64": "1.2.3", - "@img/sharp-libvips-linux-arm": "1.2.3", - "@img/sharp-libvips-linux-arm64": "1.2.3", - "@img/sharp-libvips-linux-ppc64": "1.2.3", - "@img/sharp-libvips-linux-s390x": "1.2.3", - "@img/sharp-libvips-linux-x64": "1.2.3", - "@img/sharp-libvips-linuxmusl-arm64": "1.2.3", - "@img/sharp-libvips-linuxmusl-x64": "1.2.3", - "@img/sharp-linux-arm": "0.34.4", - "@img/sharp-linux-arm64": "0.34.4", - "@img/sharp-linux-ppc64": "0.34.4", - "@img/sharp-linux-s390x": "0.34.4", - "@img/sharp-linux-x64": "0.34.4", - "@img/sharp-linuxmusl-arm64": "0.34.4", - "@img/sharp-linuxmusl-x64": "0.34.4", - "@img/sharp-wasm32": "0.34.4", - "@img/sharp-win32-arm64": "0.34.4", - "@img/sharp-win32-ia32": "0.34.4", - "@img/sharp-win32-x64": "0.34.4" - } - }, - "node_modules/sharp/node_modules/semver": { - "version": "7.7.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz", - "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==", - "license": "ISC", - "optional": true, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" + "@img/sharp-darwin-arm64": "0.34.5", + "@img/sharp-darwin-x64": "0.34.5", + "@img/sharp-libvips-darwin-arm64": "1.2.4", + "@img/sharp-libvips-darwin-x64": "1.2.4", + "@img/sharp-libvips-linux-arm": "1.2.4", + "@img/sharp-libvips-linux-arm64": "1.2.4", + "@img/sharp-libvips-linux-ppc64": "1.2.4", + "@img/sharp-libvips-linux-riscv64": "1.2.4", + "@img/sharp-libvips-linux-s390x": "1.2.4", + "@img/sharp-libvips-linux-x64": "1.2.4", + "@img/sharp-libvips-linuxmusl-arm64": "1.2.4", + "@img/sharp-libvips-linuxmusl-x64": "1.2.4", + "@img/sharp-linux-arm": "0.34.5", + "@img/sharp-linux-arm64": "0.34.5", + "@img/sharp-linux-ppc64": "0.34.5", + "@img/sharp-linux-riscv64": "0.34.5", + "@img/sharp-linux-s390x": "0.34.5", + "@img/sharp-linux-x64": "0.34.5", + "@img/sharp-linuxmusl-arm64": "0.34.5", + "@img/sharp-linuxmusl-x64": "0.34.5", + "@img/sharp-wasm32": "0.34.5", + "@img/sharp-win32-arm64": "0.34.5", + "@img/sharp-win32-ia32": "0.34.5", + "@img/sharp-win32-x64": "0.34.5" } }, "node_modules/shebang-command": { @@ -9556,9 +9054,9 @@ } }, "node_modules/tailwind-merge": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.3.1.tgz", - "integrity": "sha512-gBXpgUm/3rp1lMZZrM/w7D8GKqshif0zAymAhbCyIt8KMe+0v9DQ7cdYLR4FHH/cKpdTXb+A/tKKU3eolfsI+g==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.4.0.tgz", + "integrity": "sha512-uSaO4gnW+b3Y2aWoWfFpX62vn2sR3skfhbjsEnaBI81WD1wBLlHZe5sWf0AqjksNdYTbGBEd0UasQMT3SNV15g==", "license": "MIT", "funding": { "type": "github", @@ -9566,9 +9064,9 @@ } }, "node_modules/tailwindcss": { - "version": "4.1.16", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.16.tgz", - "integrity": "sha512-pONL5awpaQX4LN5eiv7moSiSPd/DLDzKVRJz8Q9PgzmAdd1R4307GQS2ZpfiN7ZmekdQrfhZZiSE5jkLR4WNaA==", + "version": "4.1.18", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.18.tgz", + "integrity": "sha512-4+Z+0yiYyEtUVCScyfHCxOYP06L5Ne+JiHhY2IjR2KWMIWhJOYZKLSGZaP5HkZ8+bY0cxfzwDE5uOmzFXyIwxw==", "dev": true, "license": "MIT" }, @@ -9644,7 +9142,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, "license": "MIT", "dependencies": { "is-number": "^7.0.0" @@ -9654,9 +9151,9 @@ } }, "node_modules/ts-api-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz", - "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.4.0.tgz", + "integrity": "sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA==", "dev": true, "license": "MIT", "engines": { @@ -9679,19 +9176,6 @@ "strip-bom": "^3.0.0" } }, - "node_modules/tsconfig-paths/node_modules/json5": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", - "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", - "dev": true, - "license": "MIT", - "dependencies": { - "minimist": "^1.2.0" - }, - "bin": { - "json5": "lib/cli.js" - } - }, "node_modules/tslib": { "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", @@ -9902,9 +9386,9 @@ } }, "node_modules/use-intl": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/use-intl/-/use-intl-4.4.0.tgz", - "integrity": "sha512-smFekJWtokDRBLC5/ZumlBREzdXOkw06+56Ifj2uRe9266Mk+yWQm2PcJO+EwlOE5sHIXHixOTzN6V8E0RGUbw==", + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/use-intl/-/use-intl-4.7.0.tgz", + "integrity": "sha512-jyd8nSErVRRsSlUa+SDobKHo9IiWs5fjcPl9VBUnzUyEQpVM5mwJCgw8eUiylhvBpLQzUGox1KN0XlRivSID9A==", "license": "MIT", "dependencies": { "@formatjs/fast-memoize": "^2.2.0", @@ -10116,9 +9600,9 @@ } }, "node_modules/zod": { - "version": "4.1.12", - "resolved": "https://registry.npmjs.org/zod/-/zod-4.1.12.tgz", - "integrity": "sha512-JInaHOamG8pt5+Ey8kGmdcAcg3OL9reK8ltczgHTAwNhMys/6ThXHityHxVV2p3fkw/c+MAvBHFVYHFZDmjMCQ==", + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/zod/-/zod-4.3.5.tgz", + "integrity": "sha512-k7Nwx6vuWx1IJ9Bjuf4Zt1PEllcwe7cls3VNzm4CQ1/hgtFUK2bRNG3rvnpPUhFjmqJKAKtjV576KnUkHocg/g==", "license": "MIT", "funding": { "url": "https://github.com/sponsors/colinhacks" From e5851e91b82e67f8f2df5bbf831448a9cd27af1f Mon Sep 17 00:00:00 2001 From: kent Date: Tue, 13 Jan 2026 20:21:04 +0900 Subject: [PATCH 41/45] =?UTF-8?q?fix(WEB):=20Next.js=20=EB=B9=8C=EB=93=9C?= =?UTF-8?q?=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - xlsx 패키지 설치 (LocationListPanel.tsx에서 사용) - createContract 중복 선언 제거 (actions.ts) --- package-lock.json | 11 ---------- .../business/construction/contract/actions.ts | 22 ------------------- 2 files changed, 33 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8d685752..fb9fcfed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7629,17 +7629,6 @@ } } }, - "node_modules/next-intl/node_modules/@swc/helpers": { - "version": "0.5.18", - "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.18.tgz", - "integrity": "sha512-TXTnIcNJQEKwThMMqBXsZ4VGAza6bvN4pa41Rkqoio6QBKMvo+5lexeTMScGCIxtzgQJzElcvIltani+adC5PQ==", - "license": "Apache-2.0", - "optional": true, - "peer": true, - "dependencies": { - "tslib": "^2.8.0" - } - }, "node_modules/next/node_modules/postcss": { "version": "8.4.31", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", diff --git a/src/components/business/construction/contract/actions.ts b/src/components/business/construction/contract/actions.ts index 16a03c9e..0f3fac34 100644 --- a/src/components/business/construction/contract/actions.ts +++ b/src/components/business/construction/contract/actions.ts @@ -408,25 +408,3 @@ export async function deleteContracts(ids: string[]): Promise<{ return { success: false, error: '일괄 삭제에 실패했습니다.' }; } } - -// 계약 생성 (변경 계약서 생성 포함) -export async function createContract( - _data: ContractFormData -): Promise<{ - success: boolean; - data?: { id: string }; - error?: string; -}> { - try { - await new Promise((resolve) => setTimeout(resolve, 500)); - - // TODO: 실제 API 연동 시 데이터 생성 로직 - // 새 계약 ID 생성 (목업) - const newId = String(MOCK_CONTRACTS.length + 1); - - return { success: true, data: { id: newId } }; - } catch (error) { - console.error('createContract error:', error); - return { success: false, error: '계약 생성에 실패했습니다.' }; - } -} \ No newline at end of file From 60d42b2e2e9b535c188b6741082993e9a2acc3b9 Mon Sep 17 00:00:00 2001 From: kent Date: Tue, 13 Jan 2026 20:31:08 +0900 Subject: [PATCH 42/45] =?UTF-8?q?fix(WEB):=20=EA=B2=B0=EC=9E=AC=20?= =?UTF-8?q?=EC=95=8C=EB=A6=BC=20=EC=B1=84=EB=84=90=20ID=EB=A5=BC=20push=5F?= =?UTF-8?q?payment=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - channel_id: 'approval' → 'push_payment' - 앱에서 정의된 결재 알림 채널 사용 --- src/lib/actions/fcm.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/actions/fcm.ts b/src/lib/actions/fcm.ts index f1d5bb39..b81ec33c 100644 --- a/src/lib/actions/fcm.ts +++ b/src/lib/actions/fcm.ts @@ -112,7 +112,7 @@ export async function sendApprovalNotification( title: '결재 알림', body: '결재 문서가 완료되었습니다.', type: 'approval', - channel_id: 'approval', + channel_id: 'push_payment', ...customParams, }); } From b30a51e84afe71cb07e3c352db22c4fee9bf7eec Mon Sep 17 00:00:00 2001 From: kent Date: Tue, 13 Jan 2026 20:42:43 +0900 Subject: [PATCH 43/45] =?UTF-8?q?feat(SAM/WEB):=20=EA=B1=B0=EB=9E=98?= =?UTF-8?q?=EC=B2=98=EA=B4=80=EB=A6=AC=20=ED=8E=98=EC=9D=B4=EC=A7=80?= =?UTF-8?q?=EC=97=90=20=EC=8B=A0=EA=B7=9C=EC=97=85=EC=B2=B4=20FCM=20?= =?UTF-8?q?=EC=95=8C=EB=A6=BC=20=EB=B2=84=ED=8A=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - fcm.ts에 sendNewClientNotification 프리셋 함수 추가 - channel_id: push_urgent (신규업체 알림용) - type: new_client - 거래처관리 페이지에 "신규업체" 알림 버튼 추가 - Bell 아이콘과 함께 헤더 액션에 배치 - useTransition으로 로딩 상태 관리 --- .../client-management-sales-admin/page.tsx | 37 ++++++++++++++++--- src/lib/actions/fcm.ts | 15 ++++++++ 2 files changed, 47 insertions(+), 5 deletions(-) diff --git a/src/app/[locale]/(protected)/sales/client-management-sales-admin/page.tsx b/src/app/[locale]/(protected)/sales/client-management-sales-admin/page.tsx index 37f04272..ece2b188 100644 --- a/src/app/[locale]/(protected)/sales/client-management-sales-admin/page.tsx +++ b/src/app/[locale]/(protected)/sales/client-management-sales-admin/page.tsx @@ -15,7 +15,7 @@ * - 페이지 기반 CRUD (등록/수정/상세 → 별도 페이지로 이동) */ -import { useState, useRef, useEffect, useCallback } from "react"; +import { useState, useRef, useEffect, useCallback, useTransition } from "react"; import { useRouter } from "next/navigation"; import { useClientList, Client } from "@/hooks/useClientList"; import { @@ -28,6 +28,7 @@ import { XCircle, Eye, Loader2, + Bell, } from "lucide-react"; import { Button } from "@/components/ui/button"; import { Badge } from "@/components/ui/badge"; @@ -53,9 +54,12 @@ import { AlertDialogHeader, AlertDialogTitle, } from "@/components/ui/alert-dialog"; +import { sendNewClientNotification } from "@/lib/actions/fcm"; +import { isNextRedirectError } from "@/lib/utils/redirect-error"; export default function CustomerAccountManagementPage() { const router = useRouter(); + const [isPending, startTransition] = useTransition(); // API 훅 사용 const { @@ -336,6 +340,23 @@ export default function CustomerAccountManagementPage() { } }; + // FCM 알림 발송 핸들러 + const handleSendNotification = useCallback(async () => { + startTransition(async () => { + try { + const result = await sendNewClientNotification(); + if (result.success) { + toast.success(`신규업체 알림을 발송했습니다. (${result.sentCount || 0}건)`); + } else { + toast.error(result.error || "알림 발송에 실패했습니다."); + } + } catch (error) { + if (isNextRedirectError(error)) throw error; + toast.error("알림 발송 중 오류가 발생했습니다."); + } + }); + }, []); + // 상태 뱃지 const getStatusBadge = (status: "활성" | "비활성") => { if (status === "활성") { @@ -578,10 +599,16 @@ export default function CustomerAccountManagementPage() { description="거래처 정보 및 계정을 관리합니다" icon={Building2} headerActions={ - +
+ + +
} stats={stats} searchValue={searchTerm} diff --git a/src/lib/actions/fcm.ts b/src/lib/actions/fcm.ts index b81ec33c..3f41ceea 100644 --- a/src/lib/actions/fcm.ts +++ b/src/lib/actions/fcm.ts @@ -145,4 +145,19 @@ export async function sendNoticeNotification( channel_id: 'notice', ...customParams, }); +} + +/** + * 신규업체 알림 발송 (프리셋) + */ +export async function sendNewClientNotification( + customParams?: Partial +): Promise { + return sendFcmNotification({ + title: '신규업체 알림', + body: '새로운 업체가 등록되었습니다.', + type: 'new_client', + channel_id: 'push_urgent', + ...customParams, + }); } \ No newline at end of file From 2f1946a834b89a40c6ba834c655aae049a68a249 Mon Sep 17 00:00:00 2001 From: kent Date: Tue, 13 Jan 2026 20:50:52 +0900 Subject: [PATCH 44/45] =?UTF-8?q?feat(SAM/WEB):=20=EC=88=98=EC=A3=BC?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=20=ED=8E=98=EC=9D=B4=EC=A7=80=EC=97=90=20?= =?UTF-8?q?=EC=88=98=EC=A3=BC=EC=99=84=EB=A3=8C=20FCM=20=EC=95=8C=EB=A6=BC?= =?UTF-8?q?=20=EB=B2=84=ED=8A=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - fcm.ts에 sendSalesOrderNotification 프리셋 함수 추가 - channel_id: push_sales_order, type: sales_order - order-management-sales 페이지에 수주완료 버튼 추가 --- .../sales/order-management-sales/page.tsx | 37 ++++++++++++++++--- src/lib/actions/fcm.ts | 15 ++++++++ 2 files changed, 47 insertions(+), 5 deletions(-) diff --git a/src/app/[locale]/(protected)/sales/order-management-sales/page.tsx b/src/app/[locale]/(protected)/sales/order-management-sales/page.tsx index f788b144..7de2188a 100644 --- a/src/app/[locale]/(protected)/sales/order-management-sales/page.tsx +++ b/src/app/[locale]/(protected)/sales/order-management-sales/page.tsx @@ -10,7 +10,7 @@ * - API 연동 완료 (2025-01-08) */ -import { useState, useRef, useEffect, useCallback } from "react"; +import { useState, useRef, useEffect, useCallback, useTransition } from "react"; import { useRouter } from "next/navigation"; import { FileText, @@ -22,6 +22,7 @@ import { Truck, Eye, Loader2, + Bell, } from "lucide-react"; import { Button } from "@/components/ui/button"; import { Badge } from "@/components/ui/badge"; @@ -58,6 +59,8 @@ import { type OrderStatus, type OrderStats, } from "@/components/orders/actions"; +import { sendSalesOrderNotification } from "@/lib/actions/fcm"; +import { isNextRedirectError } from "@/lib/utils/redirect-error"; // 상태 뱃지 헬퍼 함수 @@ -83,6 +86,7 @@ function getOrderStatusBadge(status: OrderStatus) { export default function OrderManagementSalesPage() { const router = useRouter(); + const [isPending, startTransition] = useTransition(); const [searchTerm, setSearchTerm] = useState(""); const [filterType, setFilterType] = useState("all"); const [selectedItems, setSelectedItems] = useState>(new Set()); @@ -390,6 +394,23 @@ export default function OrderManagementSalesPage() { } }; + // FCM 알림 발송 핸들러 + const handleSendNotification = useCallback(async () => { + startTransition(async () => { + try { + const result = await sendSalesOrderNotification(); + if (result.success) { + toast.success(`수주완료 알림을 발송했습니다. (${result.sentCount || 0}건)`); + } else { + toast.error(result.error || "알림 발송에 실패했습니다."); + } + } catch (error) { + if (isNextRedirectError(error)) throw error; + toast.error("알림 발송 중 오류가 발생했습니다."); + } + }); + }, []); + // 탭 구성 const tabs: TabOption[] = [ { @@ -620,10 +641,16 @@ export default function OrderManagementSalesPage() { description="수주 관리 및 생산지시 연동" icon={FileText} headerActions={ - +
+ + +
} stats={stats} searchValue={searchTerm} diff --git a/src/lib/actions/fcm.ts b/src/lib/actions/fcm.ts index 3f41ceea..352c178f 100644 --- a/src/lib/actions/fcm.ts +++ b/src/lib/actions/fcm.ts @@ -160,4 +160,19 @@ export async function sendNewClientNotification( channel_id: 'push_urgent', ...customParams, }); +} + +/** + * 수주 알림 발송 (프리셋) + */ +export async function sendSalesOrderNotification( + customParams?: Partial +): Promise { + return sendFcmNotification({ + title: '수주 알림', + body: '수주가 완료되었습니다.', + type: 'sales_order', + channel_id: 'push_sales_order', + ...customParams, + }); } \ No newline at end of file From 8f02f6839078472b111f46c6b174a251734a0b25 Mon Sep 17 00:00:00 2001 From: kent Date: Wed, 14 Jan 2026 12:35:11 +0900 Subject: [PATCH 45/45] =?UTF-8?q?feat:=20=EA=B1=B4=EC=84=A4=20=EA=B2=AC?= =?UTF-8?q?=EC=A0=81=20=EC=83=81=EC=84=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?API=20=EC=97=B0=EB=8F=99=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 견적요약, 공과상세, 품목 단가조정 데이터 API 연동 - options JSON 필드에서 데이터 읽기/쓰기 처리 - view/edit 페이지에서 목업 데이터 제거 --- .../bidding/estimates/[id]/edit/page.tsx | 184 ------------------ .../project/bidding/estimates/[id]/page.tsx | 184 ------------------ .../construction/estimates/actions.ts | 110 ++++++++++- 3 files changed, 107 insertions(+), 371 deletions(-) diff --git a/src/app/[locale]/(protected)/construction/project/bidding/estimates/[id]/edit/page.tsx b/src/app/[locale]/(protected)/construction/project/bidding/estimates/[id]/edit/page.tsx index ec5a3f80..815b3c85 100644 --- a/src/app/[locale]/(protected)/construction/project/bidding/estimates/[id]/edit/page.tsx +++ b/src/app/[locale]/(protected)/construction/project/bidding/estimates/[id]/edit/page.tsx @@ -9,190 +9,6 @@ interface EstimateEditPageProps { params: Promise<{ id: string }>; } -// 목업 데이터 - 추후 API 연동 -function getEstimateDetail(id: string): EstimateDetail { - // TODO: 실제 API 연동 - const mockData: EstimateDetail = { - id, - estimateCode: '123123', - partnerId: '1', - partnerName: '회사명', - projectName: '현장명', - estimatorId: 'hong', - estimatorName: '이름', - estimateCompanyManager: '홍길동', - estimateCompanyManagerContact: '01012341234', - itemCount: 21, - estimateAmount: 1420000, - completedDate: null, - bidDate: '2025-12-12', - status: 'pending', - createdAt: '2025-12-01', - updatedAt: '2025-12-01', - createdBy: 'hong', - siteBriefing: { - briefingCode: '123123', - partnerName: '회사명', - companyName: '회사명', - briefingDate: '2025-12-12', - attendee: '이름', - }, - bidInfo: { - projectName: '현장명', - bidDate: '2025-12-12', - siteCount: 21, - constructionPeriod: '2026-01-01 ~ 2026-12-10', - constructionStartDate: '2026-01-01', - constructionEndDate: '2026-12-10', - vatType: 'excluded', - workReport: '업무 보고 내용', - documents: [ - { - id: '1', - fileName: 'abc.zip', - fileUrl: '#', - fileSize: 1024000, - }, - ], - }, - summaryItems: [ - { - id: '1', - name: '서터 심창측공사', - quantity: 1, - unit: '식', - materialCost: 78540000, - laborCost: 15410000, - totalCost: 93950000, - remarks: '', - }, - ], - expenseItems: [ - { - id: '1', - name: 'public_1', - amount: 10000, - }, - ], - priceAdjustments: [ - { - id: '1', - category: '배합비', - unitPrice: 10000, - coating: 10000, - batting: 10000, - boxReinforce: 10500, - painting: 10500, - total: 51000, - }, - { - id: '2', - category: '재단비', - unitPrice: 1375, - coating: 0, - batting: 0, - boxReinforce: 0, - painting: 0, - total: 1375, - }, - { - id: '3', - category: '판매단가', - unitPrice: 0, - coating: 10000, - batting: 10000, - boxReinforce: 10500, - painting: 10500, - total: 41000, - }, - { - id: '4', - category: '조립단가', - unitPrice: 10300, - coating: 10300, - batting: 10300, - boxReinforce: 10500, - painting: 10200, - total: 51600, - }, - ], - detailItems: [ - { - id: '1', - no: 1, - name: 'FS530외/주차', - material: 'screen', - width: 2350, - height: 2500, - quantity: 1, - box: 1, - assembly: 0, - coating: 0, - batting: 0, - mounting: 0, - fitting: 0, - controller: 0, - widthConstruction: 0, - heightConstruction: 0, - materialCost: 1420000, - laborCost: 510000, - quantityPrice: 1930000, - expenseQuantity: 5500, - expenseTotal: 5500, - totalCost: 1930000, - otherCost: 0, - marginCost: 0, - totalPrice: 1930000, - unitPrice: 1420000, - expense: 0, - marginRate: 0, - unitQuantity: 1, - expenseResult: 0, - marginActual: 0, - }, - { - id: '2', - no: 2, - name: 'FS530외/주차', - material: 'screen', - width: 7500, - height: 2500, - quantity: 1, - box: 1, - assembly: 0, - coating: 0, - batting: 0, - mounting: 0, - fitting: 0, - controller: 0, - widthConstruction: 0, - heightConstruction: 0, - materialCost: 4720000, - laborCost: 780000, - quantityPrice: 5500000, - expenseQuantity: 5500, - expenseTotal: 5500, - totalCost: 5500000, - otherCost: 0, - marginCost: 0, - totalPrice: 5500000, - unitPrice: 4720000, - expense: 0, - marginRate: 0, - unitQuantity: 1, - expenseResult: 0, - marginActual: 0, - }, - ], - approval: { - approvers: [], - references: [], - }, - }; - - return mockData; -} - export default function EstimateEditPage({ params }: EstimateEditPageProps) { const { id } = use(params); const [data, setData] = useState(null); diff --git a/src/app/[locale]/(protected)/construction/project/bidding/estimates/[id]/page.tsx b/src/app/[locale]/(protected)/construction/project/bidding/estimates/[id]/page.tsx index 5e392531..4778e319 100644 --- a/src/app/[locale]/(protected)/construction/project/bidding/estimates/[id]/page.tsx +++ b/src/app/[locale]/(protected)/construction/project/bidding/estimates/[id]/page.tsx @@ -9,190 +9,6 @@ interface EstimateDetailPageProps { params: Promise<{ id: string }>; } -// 목업 데이터 - 추후 API 연동 -function getEstimateDetail(id: string): EstimateDetail { - // TODO: 실제 API 연동 - const mockData: EstimateDetail = { - id, - estimateCode: '123123', - partnerId: '1', - partnerName: '회사명', - projectName: '현장명', - estimatorId: 'hong', - estimatorName: '이름', - estimateCompanyManager: '홍길동', - estimateCompanyManagerContact: '01012341234', - itemCount: 21, - estimateAmount: 1420000, - completedDate: null, - bidDate: '2025-12-12', - status: 'pending', - createdAt: '2025-12-01', - updatedAt: '2025-12-01', - createdBy: 'hong', - siteBriefing: { - briefingCode: '123123', - partnerName: '회사명', - companyName: '회사명', - briefingDate: '2025-12-12', - attendee: '이름', - }, - bidInfo: { - projectName: '현장명', - bidDate: '2025-12-12', - siteCount: 21, - constructionPeriod: '2026-01-01 ~ 2026-12-10', - constructionStartDate: '2026-01-01', - constructionEndDate: '2026-12-10', - vatType: 'excluded', - workReport: '업무 보고 내용', - documents: [ - { - id: '1', - fileName: 'abc.zip', - fileUrl: '#', - fileSize: 1024000, - }, - ], - }, - summaryItems: [ - { - id: '1', - name: '서터 심창측공사', - quantity: 1, - unit: '식', - materialCost: 78540000, - laborCost: 15410000, - totalCost: 93950000, - remarks: '', - }, - ], - expenseItems: [ - { - id: '1', - name: 'public_1', - amount: 10000, - }, - ], - priceAdjustments: [ - { - id: '1', - category: '배합비', - unitPrice: 10000, - coating: 10000, - batting: 10000, - boxReinforce: 10500, - painting: 10500, - total: 51000, - }, - { - id: '2', - category: '재단비', - unitPrice: 1375, - coating: 0, - batting: 0, - boxReinforce: 0, - painting: 0, - total: 1375, - }, - { - id: '3', - category: '판매단가', - unitPrice: 0, - coating: 10000, - batting: 10000, - boxReinforce: 10500, - painting: 10500, - total: 41000, - }, - { - id: '4', - category: '조립단가', - unitPrice: 10300, - coating: 10300, - batting: 10300, - boxReinforce: 10500, - painting: 10200, - total: 51600, - }, - ], - detailItems: [ - { - id: '1', - no: 1, - name: 'FS530외/주차', - material: 'screen', - width: 2350, - height: 2500, - quantity: 1, - box: 1, - assembly: 0, - coating: 0, - batting: 0, - mounting: 0, - fitting: 0, - controller: 0, - widthConstruction: 0, - heightConstruction: 0, - materialCost: 1420000, - laborCost: 510000, - quantityPrice: 1930000, - expenseQuantity: 5500, - expenseTotal: 5500, - totalCost: 1930000, - otherCost: 0, - marginCost: 0, - totalPrice: 1930000, - unitPrice: 1420000, - expense: 0, - marginRate: 0, - unitQuantity: 1, - expenseResult: 0, - marginActual: 0, - }, - { - id: '2', - no: 2, - name: 'FS530외/주차', - material: 'screen', - width: 7500, - height: 2500, - quantity: 1, - box: 1, - assembly: 0, - coating: 0, - batting: 0, - mounting: 0, - fitting: 0, - controller: 0, - widthConstruction: 0, - heightConstruction: 0, - materialCost: 4720000, - laborCost: 780000, - quantityPrice: 5500000, - expenseQuantity: 5500, - expenseTotal: 5500, - totalCost: 5500000, - otherCost: 0, - marginCost: 0, - totalPrice: 5500000, - unitPrice: 4720000, - expense: 0, - marginRate: 0, - unitQuantity: 1, - expenseResult: 0, - marginActual: 0, - }, - ], - approval: { - approvers: [], - references: [], - }, - }; - - return mockData; -} - export default function EstimateDetailPage({ params }: EstimateDetailPageProps) { const { id } = use(params); const [data, setData] = useState(null); diff --git a/src/components/business/construction/estimates/actions.ts b/src/components/business/construction/estimates/actions.ts index 052c4996..57d0c525 100644 --- a/src/components/business/construction/estimates/actions.ts +++ b/src/components/business/construction/estimates/actions.ts @@ -48,6 +48,42 @@ interface ApiQuote { // 연관 데이터 items?: ApiQuoteItem[]; site_briefing?: ApiSiteBriefing; + // 옵션 데이터 (JSON) + options?: ApiQuoteOptions; +} + +interface ApiQuoteOptions { + summary_items?: ApiSummaryItem[]; + expense_items?: ApiExpenseItem[]; + price_adjustments?: ApiPriceAdjustment[]; +} + +interface ApiSummaryItem { + id: string; + name: string; + quantity: number; + unit: string; + material_cost: number; + labor_cost: number; + total_cost: number; + remarks?: string; +} + +interface ApiExpenseItem { + id: string; + name: string; + amount: number; +} + +interface ApiPriceAdjustment { + id: string; + category: string; + unit_price: number; + coating: number; + batting: number; + box_reinforce: number; + painting: number; + total: number; } interface ApiQuoteItem { @@ -210,9 +246,36 @@ function transformQuoteToEstimateDetail(apiData: ApiQuote): EstimateDetail { documents: [], }; - const summaryItems: EstimateSummaryItem[] = []; - const expenseItems: ExpenseItem[] = []; - const priceAdjustments: PriceAdjustmentItem[] = []; + // options에서 데이터 변환 + const opts = apiData.options; + + const summaryItems: EstimateSummaryItem[] = (opts?.summary_items || []).map((item) => ({ + id: item.id, + name: item.name, + quantity: item.quantity, + unit: item.unit, + materialCost: item.material_cost, + laborCost: item.labor_cost, + totalCost: item.total_cost, + remarks: item.remarks || '', + })); + + const expenseItems: ExpenseItem[] = (opts?.expense_items || []).map((item) => ({ + id: item.id, + name: item.name, + amount: item.amount, + })); + + const priceAdjustments: PriceAdjustmentItem[] = (opts?.price_adjustments || []).map((item) => ({ + id: item.id, + category: item.category, + unitPrice: item.unit_price, + coating: item.coating, + batting: item.batting, + boxReinforce: item.box_reinforce, + painting: item.painting, + total: item.total, + })); const detailItems: EstimateDetailItem[] = (apiData.items || []).map((item, index) => ({ id: String(item.id), @@ -286,6 +349,47 @@ function transformToApiRequest(data: Partial): Record = {}; + + if (data.summaryItems !== undefined) { + options.summary_items = data.summaryItems.map((item) => ({ + id: item.id, + name: item.name, + quantity: item.quantity, + unit: item.unit, + material_cost: item.materialCost, + labor_cost: item.laborCost, + total_cost: item.totalCost, + remarks: item.remarks, + })); + } + + if (data.expenseItems !== undefined) { + options.expense_items = data.expenseItems.map((item) => ({ + id: item.id, + name: item.name, + amount: item.amount, + })); + } + + if (data.priceAdjustments !== undefined) { + options.price_adjustments = data.priceAdjustments.map((item) => ({ + id: item.id, + category: item.category, + unit_price: item.unitPrice, + coating: item.coating, + batting: item.batting, + box_reinforce: item.boxReinforce, + painting: item.painting, + total: item.total, + })); + } + + if (Object.keys(options).length > 0) { + apiData.options = options; + } + return apiData; }