diff options
Diffstat (limited to 'lib')
25 files changed, 1709 insertions, 170 deletions
diff --git a/lib/cover/repository.ts b/lib/cover/repository.ts new file mode 100644 index 00000000..62b70778 --- /dev/null +++ b/lib/cover/repository.ts @@ -0,0 +1,44 @@ +import db from "@/db/db"; +import { projects } from "@/db/schema"; +import { + eq, + inArray, + not, + asc, + desc, + and, + ilike, + gte, + lte, + count, + gt, +} from "drizzle-orm"; +import { PgTransaction } from "drizzle-orm/pg-core"; + +export async function selectProjectLists( + tx: PgTransaction<any, any, any>, + params: { + where?: any; // drizzle-orm의 조건식 (and, eq...) 등 + orderBy?: (ReturnType<typeof asc> | ReturnType<typeof desc>)[]; + offset?: number; + limit?: number; + } + ) { + const { where, orderBy, offset = 0, limit = 10 } = params; + + return tx + .select() + .from(projects) + .where(where) + .orderBy(...(orderBy ?? [])) + .offset(offset) + .limit(limit); + } +/** 총 개수 count */ +export async function countProjectLists( + tx: PgTransaction<any, any, any>, + where?: any +) { + const res = await tx.select({ count: count() }).from(projects).where(where); + return res[0]?.count ?? 0; +} diff --git a/lib/cover/service.ts b/lib/cover/service.ts new file mode 100644 index 00000000..91ea3458 --- /dev/null +++ b/lib/cover/service.ts @@ -0,0 +1,123 @@ +"use server"; + +import { revalidateTag, unstable_noStore } from "next/cache"; +import db from "@/db/db"; +import { unstable_cache } from "@/lib/unstable-cache"; +import { filterColumns } from "@/lib/filter-columns"; +import { tagTypeClassFormMappings } from "@/db/schema/vendorData"; +import { asc, desc, ilike, inArray, and, gte, lte, not, or, eq } from "drizzle-orm"; +import { countProjectLists, selectProjectLists } from "./repository"; +import { projects, projectCoverTemplates, generatedCoverPages } from "@/db/schema"; +import { GetProjectListsSchema } from "./validation"; + +export async function getProjectListsForCover(input: GetProjectListsSchema) { + try { + const offset = (input.page - 1) * input.perPage; + const advancedTable = true; + + const advancedWhere = filterColumns({ + table: projects, + filters: input.filters, + joinOperator: input.joinOperator, + }); + + let globalWhere + if (input.search) { + const s = `%${input.search}%` + globalWhere = or( + ilike(projects.name, s), + ilike(projects.code, s), + ilike(projects.type, s), + ) + } + + const finalWhere = and( + eq(projects.type, "plant"), + advancedWhere, + globalWhere + ) + + const where = finalWhere + + const orderBy = + input.sort.length > 0 + ? input.sort.map((item) => + item.desc ? desc(projects[item.id]) : asc(projects[item.id]) + ) + : [asc(projects.createdAt)]; + + // 트랜잭션 내부에서 Repository 호출 + const { data, total } = await db.transaction(async (tx) => { + const projectData = await selectProjectLists(tx, { + where, + orderBy, + offset, + limit: input.perPage, + }); + + // 프로젝트 ID 목록 추출 + const projectIds = projectData.map(p => p.id); + + // 활성 템플릿 정보 조회 + const templates = projectIds.length > 0 + ? await tx + .select() + .from(projectCoverTemplates) + .where( + and( + inArray(projectCoverTemplates.projectId, projectIds), + eq(projectCoverTemplates.isActive, true) + ) + ) + : []; + + // 템플릿 맵 생성 + const templateMap = new Map( + templates.map(t => [t.projectId, t]) + ); + + // 생성된 커버 페이지 조회 (각 템플릿의 최신 것만) + const templateIds = templates.map(t => t.id); + const generatedCovers = templateIds.length > 0 + ? await tx + .select() + .from(generatedCoverPages) + .where(inArray(generatedCoverPages.templateId, templateIds)) + .orderBy(desc(generatedCoverPages.generatedAt)) + : []; + + // 각 템플릿별 최신 생성 커버 맵 생성 + const latestCoverMap = new Map(); + for (const cover of generatedCovers) { + if (!latestCoverMap.has(cover.templateId)) { + latestCoverMap.set(cover.templateId, cover); + } + } + + // 프로젝트에 템플릿 및 생성된 커버 정보 병합 + const data = projectData.map(project => { + const template = templateMap.get(project.id); + const latestCover = template ? latestCoverMap.get(template.id) : null; + + return { + ...project, + coverTemplatePath: template?.filePath || null, + templateVariables: template?.variables || null, + template: template || null, + generatedCover: latestCover || null, + generatedCoverPath: latestCover?.filePath || null, + }; + }); + + const total = await countProjectLists(tx, where); + return { data, total }; + }); + + const pageCount = Math.ceil(total / input.perPage); + + return { data, pageCount }; + } catch (err) { + console.error("❌ getProjectListsForCover 오류:", err); + return { data: [], pageCount: 0 }; + } +}
\ No newline at end of file diff --git a/lib/cover/table/cover-template-dialog.tsx b/lib/cover/table/cover-template-dialog.tsx new file mode 100644 index 00000000..f5ac3fae --- /dev/null +++ b/lib/cover/table/cover-template-dialog.tsx @@ -0,0 +1,455 @@ +"use client" + +import * as React from "react" +import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog" +import { Button } from "@/components/ui/button" +import { Input } from "@/components/ui/input" +import { Label } from "@/components/ui/label" +import { Upload, Save, Download, Copy, Check, Loader2 } from "lucide-react" +import { WebViewerInstance } from "@pdftron/webviewer" +import { Project } from "@/db/schema" +import { toast } from "sonner" +import { quickDownload } from "@/lib/file-download" +import { BasicContractTemplateViewer } from "@/lib/basic-contract/template/basic-contract-template-viewer" +import { useRouter, usePathname } from "next/navigation" + +interface CoverTemplateDialogProps { + open: boolean + onOpenChange: (open: boolean) => void + project: Project | null +} + +export function CoverTemplateDialog({ open, onOpenChange, project }: CoverTemplateDialogProps) { + const [instance, setInstance] = React.useState<WebViewerInstance | null>(null) + const [filePath, setFilePath] = React.useState<string>("") + const [uploadedFile, setUploadedFile] = React.useState<File | null>(null) + const [isSaving, setIsSaving] = React.useState(false) + const [isUploading, setIsUploading] = React.useState(false) + const [copiedVar, setCopiedVar] = React.useState<string | null>(null) + const router = useRouter() + + // 필수 템플릿 변수 + const templateVariables = [ + { key: "docNumber", value: "docNumber", label: "문서 번호" }, + { key: "projectNumber", value: "projectNumber", label: "프로젝트 번호" }, + { key: "projectName", value: "projectName", label: "프로젝트명" } + ] + + // instance 상태 모니터링 + React.useEffect(() => { + console.log("🔍 Instance 상태:", instance ? "있음" : "없음"); + }, [instance]); + + // 다이얼로그가 열릴 때마다 상태 초기화 및 템플릿 로드 + React.useEffect(() => { + if (open) { + // instance는 초기화하지 않음 - 뷰어가 알아서 설정함 + setUploadedFile(null) + setIsSaving(false) + setIsUploading(false) + setCopiedVar(null) + + // 프로젝트에 저장된 템플릿이 있으면 로드 + if (project?.coverTemplatePath) { + setFilePath(project.coverTemplatePath) + } else { + setFilePath("") + } + } else { + // 다이얼로그가 닫힐 때만 완전히 초기화 + setFilePath("") + setInstance(null) + setUploadedFile(null) + } + }, [open, project]) + + // 파일 업로드 핸들러 + const handleFileUpload = async (e: React.ChangeEvent<HTMLInputElement>) => { + const file = e.target.files?.[0] + if (!file) return + + if (!file.name.endsWith('.docx')) { + toast.error("DOCX 파일만 업로드 가능합니다") + return + } + + setIsUploading(true) + setUploadedFile(file) + + const formData = new FormData() + formData.append("file", file) + formData.append("projectId", String(project?.id)) + + try { + const response = await fetch("/api/projects/cover-template/upload", { + method: "POST", + body: formData, + }) + + if (!response.ok) { + const error = await response.json() + throw new Error(error.message || "업로드 실패") + } + + const data = await response.json() + setFilePath(data.filePath) + router.refresh() + toast.success("템플릿 파일이 업로드되었습니다") + } catch (error) { + console.error("파일 업로드 오류:", error) + toast.error(error instanceof Error ? error.message : "파일 업로드 중 오류가 발생했습니다") + } finally { + setIsUploading(false) + } + } + + // 복사 함수 - 더 강력한 버전 + const copyToClipboard = async (text: string, key: string) => { + let copySuccess = false; + + // 방법 1: 최신 Clipboard API (가장 확실함) + try { + await navigator.clipboard.writeText(text); + copySuccess = true; + setCopiedVar(key); + setTimeout(() => setCopiedVar(null), 2000); + toast.success(`복사됨: ${text}`, { + description: "문서에 붙여넣으세요 (Ctrl+V)" + }); + return; + } catch (err) { + console.error("Clipboard API 실패:", err); + } + + // 방법 2: 이벤트 기반 복사 (사용자 상호작용 컨텍스트 유지) + try { + const listener = (e: ClipboardEvent) => { + e.clipboardData?.setData('text/plain', text); + e.preventDefault(); + copySuccess = true; + }; + + document.addEventListener('copy', listener); + const result = document.execCommand('copy'); + document.removeEventListener('copy', listener); + + if (result && copySuccess) { + setCopiedVar(key); + setTimeout(() => setCopiedVar(null), 2000); + toast.success(`복사됨: ${text}`, { + description: "문서에 붙여넣으세요 (Ctrl+V)" + }); + return; + } + } catch (err) { + console.error("이벤트 기반 복사 실패:", err); + } + + // 방법 3: textarea 방식 (강화 버전) + try { + const textArea = document.createElement("textarea"); + textArea.value = text; + + // 스타일 설정으로 화면에 보이지 않게 + textArea.style.position = "fixed"; + textArea.style.top = "0"; + textArea.style.left = "0"; + textArea.style.width = "2em"; + textArea.style.height = "2em"; + textArea.style.padding = "0"; + textArea.style.border = "none"; + textArea.style.outline = "none"; + textArea.style.boxShadow = "none"; + textArea.style.background = "transparent"; + textArea.style.opacity = "0"; + + document.body.appendChild(textArea); + + // iOS 대응 + if (navigator.userAgent.match(/ipad|ipod|iphone/i)) { + textArea.contentEditable = "true"; + textArea.readOnly = false; + const range = document.createRange(); + range.selectNodeContents(textArea); + const selection = window.getSelection(); + selection?.removeAllRanges(); + selection?.addRange(range); + textArea.setSelectionRange(0, 999999); + } else { + textArea.select(); + textArea.setSelectionRange(0, 99999); + } + + const successful = document.execCommand('copy'); + document.body.removeChild(textArea); + + if (successful) { + setCopiedVar(key); + setTimeout(() => setCopiedVar(null), 2000); + toast.success(`복사됨: ${text}`, { + description: "문서에 붙여넣으세요 (Ctrl+V)" + }); + copySuccess = true; + return; + } + } catch (err) { + console.error("textarea 복사 실패:", err); + } + + // 모든 방법 실패 + if (!copySuccess) { + toast.error("자동 복사 실패", { + description: `수동으로 복사하세요: ${text}`, + duration: 5000, + }); + } + }; + + // 템플릿 저장 + const handleSaveTemplate = async () => { + console.log("💾 저장 시도 - instance:", instance); + console.log("💾 저장 시도 - project:", project); + + if (!instance) { + toast.error("뷰어가 아직 준비되지 않았습니다", { + description: "문서가 완전히 로드될 때까지 기다려주세요" + }) + return + } + + if (!project) { + toast.error("프로젝트 정보가 없습니다") + return + } + + setIsSaving(true) + + try { + const { documentViewer } = instance.Core + const doc = documentViewer.getDocument() + + if (!doc) { + throw new Error("문서가 로드되지 않았습니다") + } + + console.log("📄 문서 export 시작..."); + + // DOCX로 export + const data = await doc.getFileData({ + downloadType: 'office', + includeAnnotations: true + }) + + console.log("✅ 문서 export 완료, 크기:", data.byteLength); + + const blob = new Blob([data], { + type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' + }) + + // FormData 생성 + const formData = new FormData() + formData.append("file", blob, `${project.code}_cover_template.docx`) + formData.append("projectId", String(project.id)) + formData.append("templateName", `${project.name} 커버 템플릿`) + + console.log("📤 서버 전송 시작..."); + + const response = await fetch("/api/projects/cover-template/save", { + method: "POST", + body: formData, + }) + + if (!response.ok) { + const error = await response.json() + throw new Error(error.message || "저장 실패") + } + + const result = await response.json() + + console.log("✅ 서버 저장 완료:", result); + router.refresh() + toast.success("커버 페이지가 생성되었습니다") + + // 저장된 파일 경로 업데이트 + if (result.filePath) { + setFilePath(result.filePath) + } + + onOpenChange(false) + } catch (error) { + console.error("❌ 템플릿 저장 오류:", error) + toast.error(error instanceof Error ? error.message : "템플릿 저장 중 오류가 발생했습니다") + } finally { + setIsSaving(false) + } + } + + const handleDownloadTemplate = () => { + if (!filePath || !project) return + quickDownload(filePath, `${project.code}_cover_template.docx`) + } + + return ( + <Dialog open={open} onOpenChange={onOpenChange}> + <DialogContent className="max-w-7xl w-[90vw] h-[85vh] p-0 gap-0 flex flex-col"> + <DialogHeader className="px-6 py-3 border-b"> + <DialogTitle className="text-base"> + 커버 페이지 템플릿 관리 - {project?.name} ({project?.code}) + </DialogTitle> + </DialogHeader> + + <div className="flex flex-1 min-h-0 overflow-hidden"> + <div className="w-80 h-full border-r p-4 overflow-y-auto flex flex-col gap-4"> + <div className="space-y-2"> + <Label>템플릿 파일 업로드</Label> + <div className="flex gap-2"> + <Input + type="file" + accept=".docx" + onChange={handleFileUpload} + disabled={isUploading} + className="flex-1" + /> + {filePath && ( + <Button + size="icon" + variant="outline" + onClick={handleDownloadTemplate} + title="현재 템플릿 다운로드" + > + <Download className="h-4 w-4" /> + </Button> + )} + </div> + {isUploading && ( + <p className="text-xs text-muted-foreground">업로드 중...</p> + )} + </div> + + <div className="space-y-2"> + <Label>필수 템플릿 변수</Label> + <div className="text-xs text-muted-foreground mb-2"> + 복사 버튼을 클릭하여 변수를 복사한 후 문서에 붙여넣으세요 + </div> + + <div className="space-y-2"> + {templateVariables.map(({ key, value, label }) => ( + <div key={key} className="flex gap-2 items-center"> + <div className="flex-1"> + <div className="text-xs text-muted-foreground mb-1">{label}</div> + <div className="flex gap-2"> + <Input + value={`{{${value}}}`} + readOnly + className="flex-1 text-xs font-mono bg-muted/50" + /> + <Button + type="button" + size="sm" + variant="outline" + onClick={() => copyToClipboard(`{{${value}}}`, key)} + title="클립보드에 복사" + > + {copiedVar === key ? ( + <Check className="h-3 w-3 text-green-600" /> + ) : ( + <Copy className="h-3 w-3" /> + )} + </Button> + </div> + </div> + </div> + ))} + </div> + + <div className="text-xs text-muted-foreground p-3 bg-muted/50 rounded-md mt-3"> + <div className="font-semibold mb-1">💡 사용 방법</div> + 1. 복사 버튼을 클릭하여 변수를 복사<br /> + 2. 문서에서 원하는 위치에 Ctrl+V로 붙여넣기<br /> + 3. 문서 생성 시 변수는 실제 값으로 자동 치환됩니다<br /> + <br /> + <div className="font-semibold">📌 커스텀 변수</div> + 필요한 경우 {`{{customField}}`} 형식으로 직접 입력 가능 + </div> + </div> + + <div className="mt-auto pt-4 space-y-2"> + {/* 상태 표시 */} + <div className="text-xs text-muted-foreground space-y-1 p-2 bg-muted/30 rounded"> + <div className="flex items-center gap-2"> + <div className={`w-2 h-2 rounded-full ${filePath ? 'bg-green-500' : 'bg-gray-300'}`} /> + 파일: {filePath ? '준비됨' : '없음'} + </div> + {filePath && + <div className="flex items-center gap-2"> + <div className={`w-2 h-2 rounded-full ${instance ? 'bg-green-500' : 'bg-yellow-500'}`} /> + 뷰어: {instance ? '준비됨' : '로딩 중...'} + </div> + } + </div> + + <Button + className="w-full" + onClick={handleSaveTemplate} + disabled={!filePath || isSaving || !instance} + > + {(() => { + if (isSaving) { + return ( + <> + <Loader2 className="mr-2 h-4 w-4 animate-spin" /> + 저장 중... + </> + ); + } + + if (!filePath) { + return ( + <> + <Upload className="mr-2 h-4 w-4" /> + 파일을 먼저 업로드하세요 + </> + ); + } + + if (!instance) { + return ( + <> + <Loader2 className="mr-2 h-4 w-4 animate-spin" /> + 뷰어 로딩 중... + </> + ); + } + + return ( + <> + <Save className="mr-2 h-4 w-4" /> + 커버 페이지 생성 + </> + ); + })()} + </Button> + </div> + </div> + + <div className="flex-1 relative overflow-hidden"> + {filePath ? ( + <div className="absolute inset-0"> + <BasicContractTemplateViewer + key={filePath} + filePath={filePath} + instance={instance} + setInstance={setInstance} + /> + </div> + ) : ( + <div className="flex items-center justify-center h-full text-muted-foreground"> + DOCX 파일을 업로드하세요 + </div> + )} + </div> + </div> + </DialogContent> + </Dialog> + ) +}
\ No newline at end of file diff --git a/lib/cover/table/projects-table-columns.tsx b/lib/cover/table/projects-table-columns.tsx new file mode 100644 index 00000000..9ed36436 --- /dev/null +++ b/lib/cover/table/projects-table-columns.tsx @@ -0,0 +1,187 @@ +"use client" + +import * as React from "react" +import { type DataTableRowAction } from "@/types/table" +import { type ColumnDef } from "@tanstack/react-table" +import { Download, Eye, FileText, FilePlus } from "lucide-react" +import { Checkbox } from "@/components/ui/checkbox"; + +import { formatDate } from "@/lib/utils" +import { Button } from "@/components/ui/button" +import { quickDownload } from "@/lib/file-download" + +import { DataTableColumnHeaderSimple } from "@/components/data-table/data-table-column-simple-header" +import { Project } from "@/db/schema" + +interface GetColumnsProps { + setRowAction: React.Dispatch<React.SetStateAction<DataTableRowAction<Project> | null>> + onDetailClick: (project: Project) => void + onTemplateManage: (project: Project) => void +} + +export function getColumns({ setRowAction, onDetailClick, onTemplateManage }: GetColumnsProps): ColumnDef<Project>[] { + return [ + // Checkbox + { + id: "select", + header: ({ table }) => ( + <Checkbox + checked={table.getIsAllPageRowsSelected() || (table.getIsSomePageRowsSelected() && "indeterminate")} + onCheckedChange={(v) => table.toggleAllPageRowsSelected(!!v)} + aria-label="select all" + className="translate-y-0.5" + /> + ), + cell: ({ row }) => ( + <Checkbox + checked={row.getIsSelected()} + onCheckedChange={(v) => row.toggleSelected(!!v)} + aria-label="select row" + className="translate-y-0.5" + /> + ), + size: 40, + enableSorting: false, + enableHiding: false, + }, + { + accessorKey: "code", + enableResizing: true, + header: ({ column }) => ( + <DataTableColumnHeaderSimple column={column} title="프로젝트 코드" /> + ), + meta: { + excelHeader: "Project Code", + }, + }, + { + accessorKey: "name", + enableResizing: true, + header: ({ column }) => ( + <DataTableColumnHeaderSimple column={column} title="프로젝트명" /> + ), + meta: { + excelHeader: "Project Name", + }, + }, + { + id: "coverTemplate", + enableResizing: true, + header: "커버 템플릿", + cell: ({ row }) => { + const project = row.original + const hasTemplate = !!project.coverTemplatePath + + return ( + <div className="flex items-center gap-2"> + {hasTemplate ? ( + <> + <Button + variant="ghost" + size="sm" + onClick={() => quickDownload(project.coverTemplatePath!, `${project.code}_template.docx`)} + title="템플릿 다운로드" + > + <FileText className="h-4 w-4 text-blue-600" /> + </Button> + <Button + variant="ghost" + size="sm" + onClick={() => onTemplateManage(project)} + title="템플릿 관리" + > + <Eye className="h-4 w-4" /> + </Button> + </> + ) : ( + <Button + variant="outline" + size="sm" + onClick={() => onTemplateManage(project)} + > + <FilePlus className="h-4 w-4 mr-1" /> + 생성 + </Button> + )} + </div> + ) + }, + }, + { + id: "generatedCover", + enableResizing: true, + header: "생성된 커버", + cell: ({ row }) => { + const project = row.original + const hasGenerated = !!project.generatedCoverPath + const generatedAt = project.generatedCover?.generatedAt + + return ( + <div className="flex flex-col gap-1"> + {hasGenerated ? ( + <> + <Button + variant="ghost" + size="sm" + onClick={() => quickDownload( + project.generatedCoverPath!, + project.generatedCover?.fileName || `${project.code}_cover.docx` + )} + className="justify-start" + > + <Download className="h-4 w-4 mr-2 text-green-600" /> + <span className="text-xs">다운로드</span> + </Button> + {generatedAt && ( + <span className="text-xs text-muted-foreground pl-2"> + {formatDate(new Date(generatedAt), "KR")} + </span> + )} + </> + ) : ( + <span className="text-xs text-muted-foreground px-2">-</span> + )} + </div> + ) + }, + }, + { + accessorKey: "OWN_NM", + enableResizing: true, + header: ({ column }) => ( + <DataTableColumnHeaderSimple column={column} title="선주명" /> + ), + meta: { + excelHeader: "Owner Name", + }, + }, + { + accessorKey: "createdAt", + enableResizing: true, + header: ({ column }) => ( + <DataTableColumnHeaderSimple column={column} title="생성일" /> + ), + meta: { + excelHeader: "Created At", + }, + cell: ({ cell }) => { + const dateVal = cell.getValue() as Date + return formatDate(dateVal, "KR") + }, + }, + { + accessorKey: "updatedAt", + enableResizing: true, + header: ({ column }) => ( + <DataTableColumnHeaderSimple column={column} title="수정일" /> + ), + meta: { + excelHeader: "Updated At", + }, + cell: ({ cell }) => { + const dateVal = cell.getValue() as Date + return formatDate(dateVal, "KR") + }, + }, + ] +}
\ No newline at end of file diff --git a/lib/cover/table/projects-table-toolbar-actions.tsx b/lib/cover/table/projects-table-toolbar-actions.tsx new file mode 100644 index 00000000..5d2d1fc6 --- /dev/null +++ b/lib/cover/table/projects-table-toolbar-actions.tsx @@ -0,0 +1,50 @@ +"use client" + +import * as React from "react" +import { type Table } from "@tanstack/react-table" +import { Download, RefreshCcw, FileText } from "lucide-react" +import { toast } from "sonner" + +import { exportTableToExcel } from "@/lib/export" +import { Button } from "@/components/ui/button" +import { Project } from "@/db/schema" +import { CoverTemplateDialog } from "./cover-template-dialog" + +interface ItemsTableToolbarActionsProps { + table: Table<Project> +} + +export function ProjectTableToolbarActions({ table }: ItemsTableToolbarActionsProps) { + const [templateDialogOpen, setTemplateDialogOpen] = React.useState(false) + const [selectedProject, setSelectedProject] = React.useState<Project | null>(null) + + const handleTemplateClick = () => { + const selectedRows = table.getFilteredSelectedRowModel().rows + if (selectedRows.length !== 1) { + toast.error("프로젝트를 하나만 선택해주세요") + return + } + setSelectedProject(selectedRows[0].original) + setTemplateDialogOpen(true) + } + + return ( + <div className="flex items-center gap-2"> + <Button + variant="outline" + size="sm" + onClick={handleTemplateClick} + disabled={table.getFilteredSelectedRowModel().rows.length !== 1} + > + <FileText className="mr-2 h-4 w-4" /> + 커버 페이지 템플릿 + </Button> + + <CoverTemplateDialog + open={templateDialogOpen} + onOpenChange={setTemplateDialogOpen} + project={selectedProject} + /> + </div> + ) +}
\ No newline at end of file diff --git a/lib/cover/table/projects-table.tsx b/lib/cover/table/projects-table.tsx new file mode 100644 index 00000000..944013ef --- /dev/null +++ b/lib/cover/table/projects-table.tsx @@ -0,0 +1,114 @@ +"use client" + +import * as React from "react" +import type { + DataTableAdvancedFilterField, + DataTableFilterField, + DataTableRowAction, +} from "@/types/table" + +import { useDataTable } from "@/hooks/use-data-table" +import { DataTable } from "@/components/data-table/data-table" +import { DataTableAdvancedToolbar } from "@/components/data-table/data-table-advanced-toolbar" + +import { getColumns } from "./projects-table-columns" +import { getProjectListsForCover } from "../service" +import { Project } from "@/db/schema" +import { ProjectTableToolbarActions } from "./projects-table-toolbar-actions" +import { CoverTemplateDialog } from "./cover-template-dialog" + +interface ItemsTableProps { +promises: Promise< +[ + Awaited<ReturnType<typeof getProjectListsForCover>>, +] +> +} + +export function ProjectsTableForCover({ promises }: ItemsTableProps) { + const [{ data, pageCount }] = React.use(promises) + + console.log(data, 'data') + + const [rowAction, setRowAction] = + React.useState<DataTableRowAction<Project> | null>(null) + + // 템플릿 다이얼로그 상태 + const [templateDialogOpen, setTemplateDialogOpen] = React.useState(false) + const [selectedProject, setSelectedProject] = React.useState<Project | null>(null) + + const handleTemplateManage = React.useCallback((project: Project) => { + setSelectedProject(project) + setTemplateDialogOpen(true) + }, []) + + const columns = React.useMemo( + () => getColumns({ + setRowAction, + onDetailClick: () => {}, + onTemplateManage: handleTemplateManage + }), + [setRowAction, handleTemplateManage] + ) + + const filterFields: DataTableFilterField<Project>[] = [] + + const advancedFilterFields: DataTableAdvancedFilterField<Project>[] = [ + { + id: "code", + label: "Project Code", + type: "text", + }, + { + id: "name", + label: "Project Name", + type: "text", + }, + { + id: "createdAt", + label: "Created At", + type: "date", + }, + { + id: "updatedAt", + label: "Updated At", + type: "date", + }, + ] + + const { table } = useDataTable({ + data, + columns, + pageCount, + filterFields, + enablePinning: true, + enableAdvancedFilter: true, + initialState: { + sorting: [{ id: "createdAt", desc: true }], + columnPinning: { right: ["actions"] }, + }, + getRowId: (originalRow) => String(originalRow.id), + shallow: false, + clearOnDefault: true, + }) + + return ( + <> + <DataTable table={table}> + <DataTableAdvancedToolbar + table={table} + filterFields={advancedFilterFields} + shallow={false} + > + <ProjectTableToolbarActions table={table} /> + </DataTableAdvancedToolbar> + </DataTable> + + <CoverTemplateDialog + open={templateDialogOpen} + onOpenChange={setTemplateDialogOpen} + project={selectedProject} + /> + </> + ) +}
\ No newline at end of file diff --git a/lib/cover/validation.ts b/lib/cover/validation.ts new file mode 100644 index 00000000..ed1cc9a1 --- /dev/null +++ b/lib/cover/validation.ts @@ -0,0 +1,36 @@ +import { + createSearchParamsCache, + parseAsArrayOf, + parseAsInteger, + parseAsString, + parseAsStringEnum, +} from "nuqs/server" +import * as z from "zod" + +import { getFiltersStateParser, getSortingStateParser } from "@/lib/parsers" +import { Project } from "@/db/schema"; + +export const searchParamsProjectsCache = createSearchParamsCache({ + flags: parseAsArrayOf(z.enum(["advancedTable", "floatingBar"])).withDefault( + [] + ), + page: parseAsInteger.withDefault(1), + perPage: parseAsInteger.withDefault(10), + sort: getSortingStateParser<Project>().withDefault([ + { id: "createdAt", desc: true }, + ]), + + code: parseAsString.withDefault(""), + name: parseAsString.withDefault(""), + type: parseAsString.withDefault(""), + + // advanced filter + filters: getFiltersStateParser().withDefault([]), + joinOperator: parseAsStringEnum(["and", "or"]).withDefault("and"), + search: parseAsString.withDefault(""), + +}) + + + +export type GetProjectListsSchema = Awaited<ReturnType<typeof searchParamsProjectsCache.parse>> diff --git a/lib/owner-companies/owner-company-form.tsx b/lib/owner-companies/owner-company-form.tsx new file mode 100644 index 00000000..a385eccc --- /dev/null +++ b/lib/owner-companies/owner-company-form.tsx @@ -0,0 +1,99 @@ +// app/(admin)/owner-companies/_components/owner-company-form.tsx +"use client"; + +import { zodResolver } from "@hookform/resolvers/zod"; +import { useForm } from "react-hook-form"; +import * as z from "zod"; +import { Button } from "@/components/ui/button"; +import { + Form, + FormControl, + FormField, + FormItem, + FormLabel, + FormMessage, +} from "@/components/ui/form"; +import { Input } from "@/components/ui/input"; +import { useRouter } from "next/navigation"; +import { toast } from "sonner"; +import { createOwnerCompany, updateOwnerCompany } from "./service"; + +const formSchema = z.object({ + name: z.string().min(1, "회사명을 입력해주세요"), +}); + +type FormValues = z.infer<typeof formSchema>; + +interface OwnerCompanyFormProps { + initialData?: { + id: number; + name: string; + }; +} + +export function OwnerCompanyForm({ initialData }: OwnerCompanyFormProps) { + const router = useRouter(); + const isEdit = !!initialData; + + const form = useForm<FormValues>({ + resolver: zodResolver(formSchema), + defaultValues: { + name: initialData?.name || "", + }, + }); + + async function onSubmit(values: FormValues) { + try { + const result = isEdit + ? await updateOwnerCompany(initialData.id, values) + : await createOwnerCompany(values); + + if (result.success) { + toast.success( + isEdit ? "회사 정보가 수정되었습니다" : "회사가 등록되었습니다" + ); + router.push("/evcp/data-room/owner-companies"); + router.refresh(); + } + } catch (error) { + toast.error("오류가 발생했습니다"); + } + } + + return ( + <Form {...form}> + <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-6"> + <FormField + control={form.control} + name="name" + render={({ field }) => ( + <FormItem> + <FormLabel>회사명 *</FormLabel> + <FormControl> + <Input placeholder="삼성전자" {...field} /> + </FormControl> + <FormMessage /> + </FormItem> + )} + /> + + <div className="flex gap-2"> + <Button + type="button" + variant="outline" + onClick={() => router.back()} + > + 취소 + </Button> + <Button type="submit" disabled={form.formState.isSubmitting}> + {form.formState.isSubmitting + ? "처리 중..." + : isEdit + ? "수정" + : "등록"} + </Button> + </div> + </form> + </Form> + ); +}
\ No newline at end of file diff --git a/lib/owner-companies/owner-company-list.tsx b/lib/owner-companies/owner-company-list.tsx new file mode 100644 index 00000000..b78b193b --- /dev/null +++ b/lib/owner-companies/owner-company-list.tsx @@ -0,0 +1,85 @@ +// app/(admin)/owner-companies/_components/owner-company-list.tsx +"use client"; + +import { Button } from "@/components/ui/button"; +import { + Table, + TableBody, + TableCell, + TableHead, + TableHeader, + TableRow, +} from "@/components/ui/table"; +import Link from "next/link"; +import { Building2, Users } from "lucide-react"; + +interface OwnerCompany { + id: number; + name: string; + createdAt: Date; +} + +interface OwnerCompanyListProps { + companies: OwnerCompany[]; +} + +export function OwnerCompanyList({ companies }: OwnerCompanyListProps) { + if (companies.length === 0) { + return ( + <div className="text-center py-12"> + <Building2 className="mx-auto h-12 w-12 text-muted-foreground" /> + <h3 className="mt-4 text-lg font-semibold">등록된 회사가 없습니다</h3> + <p className="mt-2 text-sm text-muted-foreground"> + 첫 번째 발주처 회사를 등록해보세요. + </p> + <Button asChild className="mt-4"> + <Link href="/evcp/data-room/owner-companies/new">회사 등록</Link> + </Button> + </div> + ); + } + + return ( + <Table> + <TableHeader> + <TableRow> + <TableHead>회사명</TableHead> + <TableHead>등록일</TableHead> + <TableHead className="text-right">작업</TableHead> + </TableRow> + </TableHeader> + <TableBody> + {companies.map((company) => ( + <TableRow key={company.id}> + <TableCell className="font-medium"> + <div className="flex items-center gap-2"> + <Building2 className="h-4 w-4 text-muted-foreground" /> + {company.name} + </div> + </TableCell> + <TableCell> + {new Date(company.createdAt).toLocaleDateString("ko-KR", { + year: "numeric", + month: "long", + day: "numeric", + })} + </TableCell> + <TableCell className="text-right"> + <div className="flex gap-2 justify-end"> + <Button variant="outline" size="sm" asChild> + <Link href={`/owner-companies/${company.id}`}>수정</Link> + </Button> + <Button variant="outline" size="sm" asChild> + <Link href={`/evcp/data-room/owner-companies/${company.id}/users`}> + <Users className="h-4 w-4 mr-1" /> + 사용자 관리 + </Link> + </Button> + </div> + </TableCell> + </TableRow> + ))} + </TableBody> + </Table> + ); +}
\ No newline at end of file diff --git a/lib/owner-companies/owner-company-user-form.tsx b/lib/owner-companies/owner-company-user-form.tsx new file mode 100644 index 00000000..52253607 --- /dev/null +++ b/lib/owner-companies/owner-company-user-form.tsx @@ -0,0 +1,125 @@ +// app/(admin)/owner-companies/_components/owner-company-user-form.tsx +"use client"; + +import { zodResolver } from "@hookform/resolvers/zod"; +import { useForm } from "react-hook-form"; +import * as z from "zod"; +import { Button } from "@/components/ui/button"; +import { + Form, + FormControl, + FormField, + FormItem, + FormLabel, + FormMessage, +} from "@/components/ui/form"; +import { Input } from "@/components/ui/input"; +import { useRouter } from "next/navigation"; +import { toast } from "sonner"; +import { createOwnerCompanyUser } from "./service"; + +const formSchema = z.object({ + name: z.string().min(1, "이름을 입력해주세요"), + email: z.string().email("올바른 이메일을 입력해주세요"), + phone: z.string().optional(), +}); + +type FormValues = z.infer<typeof formSchema>; + +interface OwnerCompanyUserFormProps { + companyId: number; +} + +export function OwnerCompanyUserForm({ companyId }: OwnerCompanyUserFormProps) { + const router = useRouter(); + + const form = useForm<FormValues>({ + resolver: zodResolver(formSchema), + defaultValues: { + name: "", + email: "", + phone: "", + }, + }); + + async function onSubmit(values: FormValues) { + try { + const result = await createOwnerCompanyUser(companyId, values); + + if (result.success) { + toast.success("사용자가 등록되었습니다"); + router.push(`/evcp/data-room/owner-companies/${companyId}/users`); + router.refresh(); + } else { + toast.error(result.error || "오류가 발생했습니다"); + } + } catch (error) { + toast.error("오류가 발생했습니다"); + } + } + + return ( + <Form {...form}> + <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-6"> + <FormField + control={form.control} + name="name" + render={({ field }) => ( + <FormItem> + <FormLabel>이름 *</FormLabel> + <FormControl> + <Input placeholder="홍길동" {...field} /> + </FormControl> + <FormMessage /> + </FormItem> + )} + /> + + <FormField + control={form.control} + name="email" + render={({ field }) => ( + <FormItem> + <FormLabel>이메일 *</FormLabel> + <FormControl> + <Input + type="email" + placeholder="user@company.com" + {...field} + /> + </FormControl> + <FormMessage /> + </FormItem> + )} + /> + + <FormField + control={form.control} + name="phone" + render={({ field }) => ( + <FormItem> + <FormLabel>전화번호</FormLabel> + <FormControl> + <Input placeholder="+82-10-1234-5678" {...field} /> + </FormControl> + <FormMessage /> + </FormItem> + )} + /> + + <div className="flex gap-2"> + <Button + type="button" + variant="outline" + onClick={() => router.back()} + > + 취소 + </Button> + <Button type="submit" disabled={form.formState.isSubmitting}> + {form.formState.isSubmitting ? "처리 중..." : "등록"} + </Button> + </div> + </form> + </Form> + ); +}
\ No newline at end of file diff --git a/lib/owner-companies/owner-company-user-list.tsx b/lib/owner-companies/owner-company-user-list.tsx new file mode 100644 index 00000000..1f0963fe --- /dev/null +++ b/lib/owner-companies/owner-company-user-list.tsx @@ -0,0 +1,93 @@ +// app/(admin)/owner-companies/_components/owner-company-user-list.tsx +"use client"; + +import { Button } from "@/components/ui/button"; +import { + Table, + TableBody, + TableCell, + TableHead, + TableHeader, + TableRow, +} from "@/components/ui/table"; +import { Badge } from "@/components/ui/badge"; +import { UserPlus } from "lucide-react"; +import Link from "next/link"; + +interface User { + id: number; + name: string; + email: string; + phone: string | null; + isActive: boolean; + createdAt: Date; + employeeNumber: string | null; +} + +interface OwnerCompanyUserListProps { + users: User[]; + companyId: number; +} + +export function OwnerCompanyUserList({ + users, + companyId, +}: OwnerCompanyUserListProps) { + if (users.length === 0) { + return ( + <div className="text-center py-12 border rounded-lg"> + <UserPlus className="mx-auto h-12 w-12 text-muted-foreground" /> + <h3 className="mt-4 text-lg font-semibold">등록된 사용자가 없습니다</h3> + <p className="mt-2 text-sm text-muted-foreground"> + 첫 번째 사용자를 추가해보세요. + </p> + <Button asChild className="mt-4"> + <Link href={`/evcp/data-room/owner-companies/${companyId}/users/new`}> + 사용자 추가 + </Link> + </Button> + </div> + ); + } + + return ( + <Table> + <TableHeader> + <TableRow> + <TableHead>이름</TableHead> + <TableHead>이메일</TableHead> + <TableHead>전화번호</TableHead> + <TableHead>사번</TableHead> + <TableHead>상태</TableHead> + <TableHead>등록일</TableHead> + </TableRow> + </TableHeader> + <TableBody> + {users.map((user) => ( + <TableRow key={user.id}> + <TableCell className="font-medium">{user.name}</TableCell> + <TableCell>{user.email}</TableCell> + <TableCell>{user.phone || "-"}</TableCell> + <TableCell>{user.employeeNumber || "-"}</TableCell> + <TableCell> + {user.isActive ? ( + <Badge variant="default" className="bg-green-500"> + 활성 + </Badge> + ) : ( + <Badge variant="destructive">비활성</Badge> + )} + </TableCell> + <TableCell> + {new Date(user.createdAt).toLocaleDateString("ko-KR", { + year: "numeric", + month: "2-digit", + day: "2-digit", + })} + </TableCell> + </TableRow> + ))} + </TableBody> + </Table> + ); +}
\ No newline at end of file diff --git a/lib/owner-companies/service.ts b/lib/owner-companies/service.ts new file mode 100644 index 00000000..3692abd4 --- /dev/null +++ b/lib/owner-companies/service.ts @@ -0,0 +1,77 @@ +// lib/owner-companies/service.ts +"use server"; + +import db from "@/db/db"; +import { ownerCompanies, users } from "@/db/schema"; +import { revalidatePath } from "next/cache"; +import { eq } from "drizzle-orm"; + +export async function createOwnerCompany(data: { name: string }) { + const [company] = await db + .insert(ownerCompanies) + .values({ + name: data.name, + }) + .returning(); + + revalidatePath("/owner-companies"); + return { success: true, data: company }; +} + +export async function updateOwnerCompany( + id: number, + data: { name: string } +) { + const [company] = await db + .update(ownerCompanies) + .set({ + name: data.name, + }) + .where(eq(ownerCompanies.id, id)) + .returning(); + + revalidatePath("/owner-companies"); + revalidatePath(`/owner-companies/${id}`); + return { success: true, data: company }; +} + +export async function createOwnerCompanyUser( + companyId: number, + data: { + name: string; + email: string; + phone?: string; + employeeNumber?: string; + } +) { + // 이메일 중복 체크 + const existing = await db + .select() + .from(users) + .where(eq(users.email, data.email)) + .limit(1); + + if (existing.length > 0) { + return { success: false, error: "이미 사용 중인 이메일입니다." }; + } + + const [user] = await db + .insert(users) + .values({ + ...data, + ownerCompanyId: companyId, + domain: "owner", // 발주처 도메인 + isActive: true, + }) + .returning(); + + revalidatePath(`/owner-companies/${companyId}/users`); + return { success: true, data: user }; +} + +export async function getOwnerCompanyUsers(companyId: number) { + return await db + .select() + .from(users) + .where(eq(users.ownerCompanyId, companyId)); +}
\ No newline at end of file diff --git a/lib/pcr/table/detail-table/pcr-detail-toolbar-action.tsx b/lib/pcr/table/detail-table/pcr-detail-toolbar-action.tsx index 92829055..8e012e57 100644 --- a/lib/pcr/table/detail-table/pcr-detail-toolbar-action.tsx +++ b/lib/pcr/table/detail-table/pcr-detail-toolbar-action.tsx @@ -52,7 +52,7 @@ export function PcrDetailToolbarAction({ </Button>
{/* PCR_PR 생성 버튼 - Partners 페이지에서는 표시하지 않음 */}
- {!isPartnersPage && (
+ {/* {!isPartnersPage && (
<>
<Button
variant="default"
@@ -65,7 +65,6 @@ export function PcrDetailToolbarAction({ PCR_PR 생성
</Button>
- {/* PCR_PR 생성 다이얼로그 */}
<CreatePcrPrDialog
open={createDialogOpen}
onOpenChange={setCreateDialogOpen}
@@ -73,7 +72,7 @@ export function PcrDetailToolbarAction({ onSuccess={handleCreateSuccess}
/>
</>
- )}
+ )} */}
</div>
)
}
diff --git a/lib/pcr/table/pcr-table-toolbar-actions.tsx b/lib/pcr/table/pcr-table-toolbar-actions.tsx index 08a0ad72..2102d1d3 100644 --- a/lib/pcr/table/pcr-table-toolbar-actions.tsx +++ b/lib/pcr/table/pcr-table-toolbar-actions.tsx @@ -93,13 +93,13 @@ export function PcrTableToolbarActions<TData>({ )}
{/* PCR 생성 다이얼로그 - Partners 페이지에서는 표시하지 않음 */}
- {!isPartnersPage && (
+ {/* {!isPartnersPage && (
<CreatePcrDialog
isEvcpPage={isEvcpPage}
currentVendorId={currentVendorId}
onSuccess={onRefresh}
/>
- )}
+ )} */}
{/* 승인 다이얼로그 */}
<ApproveRejectPcrDialog
diff --git a/lib/po/service.ts b/lib/po/service.ts index 99033854..31cbda5e 100644 --- a/lib/po/service.ts +++ b/lib/po/service.ts @@ -71,7 +71,7 @@ export async function getPOs(input: GetPOSchema) { const s = `%${input.search}%`; globalWhere = or( ilike(contractsDetailView.contractNo, s), - ilike(contractsDetailView.contractName, s) + ilike(contractsDetailView.contractName, s), ); console.log("Global where clause built successfully"); } catch (searchErr) { diff --git a/lib/procurement-items/service.ts b/lib/procurement-items/service.ts index ee6df959..b62eb8df 100644 --- a/lib/procurement-items/service.ts +++ b/lib/procurement-items/service.ts @@ -31,7 +31,7 @@ import { * Next.js의 unstable_cache를 사용해 일정 시간 캐시.
*/
export async function getProcurementItems(input: GetProcurementItemsSchema) {
- const safePerPage = Math.min(input.perPage, 100)
+ const safePerPage = Math.min(input.perPage, 1000)
return unstable_cache(
async () => {
@@ -328,15 +328,23 @@ export async function importProcurementItemsFromExcel(excelData: any[]): Promise for (const itemData of batch) {
try {
// 데이터 검증
- const validatedData = createProcurementItemSchema.parse(itemData)
+ const cleanedData = {
+ itemCode: itemData.itemCode?.toString().trim() || "",
+ itemName: itemData.itemName?.toString().trim() || "",
+ material: itemData.material?.toString().trim() || "",
+ specification: itemData.specification?.toString().trim() || "",
+ unit: itemData.unit?.toString().trim() || "",
+ isActive: itemData.isActive?.toString().trim() || 'Y',
+ }
+ const validatedData = createProcurementItemSchema.parse(cleanedData)
// 품목 생성 또는 업데이트
const result = await createProcurementItem({
itemCode: validatedData.itemCode,
itemName: validatedData.itemName,
- material: validatedData.material || null,
- specification: validatedData.specification || null,
- unit: validatedData.unit || null,
+ material: validatedData.material || "",
+ specification: validatedData.specification || "",
+ unit: validatedData.unit || "",
isActive: validatedData.isActive || 'Y',
})
diff --git a/lib/procurement-items/validations.ts b/lib/procurement-items/validations.ts index 0a2b2105..1d753e9d 100644 --- a/lib/procurement-items/validations.ts +++ b/lib/procurement-items/validations.ts @@ -37,9 +37,9 @@ export type GetProcurementItemsSchema = Awaited<ReturnType<typeof searchParamsCa export const createProcurementItemSchema = z.object({
itemCode: z.string(),
itemName: z.string().min(1, "품목명은 필수입니다"),
- material: z.string().max(100).optional(),
- specification: z.string().max(255).optional(),
- unit: z.string().max(50).optional(),
+ material: z.string().max(100).optional().or(z.literal("")),
+ specification: z.string().max(255).optional().or(z.literal("")),
+ unit: z.string().max(50).optional().or(z.literal("")),
isActive: z.string().max(1).default('Y').optional(),
})
diff --git a/lib/rfq-last/service.ts b/lib/rfq-last/service.ts index d4efb81d..8475aac0 100644 --- a/lib/rfq-last/service.ts +++ b/lib/rfq-last/service.ts @@ -100,6 +100,7 @@ export async function getRfqs(input: GetRfqsSchema) { ilike(rfqsLastView.packageNo, s), ilike(rfqsLastView.packageName, s), ilike(rfqsLastView.picName, s), + ilike(rfqsLastView.picCode, s), ilike(rfqsLastView.engPicName, s), ilike(rfqsLastView.projectCode, s), ilike(rfqsLastView.projectName, s), diff --git a/lib/rfq-last/table/rfq-assign-pic-dialog.tsx b/lib/rfq-last/table/rfq-assign-pic-dialog.tsx index 9ca34ccd..70d2ed7e 100644 --- a/lib/rfq-last/table/rfq-assign-pic-dialog.tsx +++ b/lib/rfq-last/table/rfq-assign-pic-dialog.tsx @@ -39,15 +39,6 @@ export function RfqAssignPicDialog({ const [selectedCode, setSelectedCode] = React.useState<PurchaseGroupCodeWithUser | undefined>(undefined); const [selectorOpen, setSelectorOpen] = React.useState(false); - // ITB만 필터링 (rfqCode가 "I"로 시작하는 것) - const itbCodes = React.useMemo(() => { - return selectedRfqCodes.filter(code => code.startsWith("I")); - }, [selectedRfqCodes]); - - const itbIds = React.useMemo(() => { - return selectedRfqIds.filter((id, index) => selectedRfqCodes[index]?.startsWith("I")); - }, [selectedRfqIds, selectedRfqCodes]); - // 다이얼로그 열릴 때 초기화 React.useEffect(() => { if (open) { @@ -81,15 +72,15 @@ export function RfqAssignPicDialog({ return; } - if (itbIds.length === 0) { - toast.error("선택한 항목 중 ITB가 없습니다"); + if (selectedRfqIds.length === 0) { + toast.error("담당자 지정이 가능한 ITB가 없습니다"); return; } setIsAssigning(true); try { const result = await assignPicToRfqs({ - rfqIds: itbIds, + rfqIds: selectedRfqIds, picUserId: selectedCode.user.id, }); @@ -127,32 +118,27 @@ export function RfqAssignPicDialog({ <label className="text-sm font-medium">선택된 ITB</label> <div className="p-3 bg-muted rounded-md"> <div className="flex items-center gap-2 mb-2"> - <Badge variant="secondary">{itbCodes.length}건</Badge> - {itbCodes.length !== selectedRfqCodes.length && ( - <span className="text-xs text-muted-foreground"> - (전체 {selectedRfqCodes.length}건 중) - </span> - )} + <Badge variant="secondary">{selectedRfqCodes.length}건</Badge> </div> <div className="max-h-[100px] overflow-y-auto"> <div className="flex flex-wrap gap-1"> - {itbCodes.slice(0, 10).map((code, index) => ( + {selectedRfqCodes.slice(0, 10).map((code, index) => ( <Badge key={index} variant="outline" className="text-xs"> {code} </Badge> ))} - {itbCodes.length > 10 && ( + {selectedRfqCodes.length > 10 && ( <Badge variant="outline" className="text-xs"> - +{itbCodes.length - 10}개 + +{selectedRfqCodes.length - 10}개 </Badge> )} </div> </div> </div> - {itbCodes.length === 0 && ( + {selectedRfqCodes.length === 0 && ( <Alert className="border-orange-200 bg-orange-50"> <AlertDescription className="text-orange-800"> - 선택한 항목 중 ITB (I로 시작하는 코드)가 없습니다. + 담당자 지정이 가능한 ITB가 없습니다. (상태가 "RFQ 생성" 또는 "구매담당지정"인 ITB만 가능) </AlertDescription> </Alert> )} @@ -165,7 +151,7 @@ export function RfqAssignPicDialog({ type="button" variant="outline" className="w-full justify-start h-auto min-h-[40px]" - disabled={itbCodes.length === 0} + disabled={selectedRfqCodes.length === 0} onClick={() => setSelectorOpen(true)} > {selectedCode ? ( @@ -227,7 +213,7 @@ export function RfqAssignPicDialog({ <Button type="submit" onClick={handleAssign} - disabled={!selectedCode || !selectedCode.user || itbCodes.length === 0 || isAssigning} + disabled={!selectedCode || !selectedCode.user || selectedRfqCodes.length === 0 || isAssigning} > {isAssigning ? ( <> diff --git a/lib/rfq-last/table/rfq-table-toolbar-actions.tsx b/lib/rfq-last/table/rfq-table-toolbar-actions.tsx index 7d48f5a4..00c41402 100644 --- a/lib/rfq-last/table/rfq-table-toolbar-actions.tsx +++ b/lib/rfq-last/table/rfq-table-toolbar-actions.tsx @@ -36,17 +36,27 @@ export function RfqTableToolbarActions<TData>({ // 선택된 RFQ의 ID와 코드 추출 const selectedRfqData = React.useMemo(() => { const rows = selectedRows.map(row => row.original as RfqsLastView); + const assignableRows = rows.filter(row => + row.rfqCode?.startsWith("I") && + (row.status === "RFQ 생성" || row.status === "구매담당지정") + ); + return { ids: rows.map(row => row.id), codes: rows.map(row => row.rfqCode || ""), + statuses: rows.map(row => row.status || ""), // "I"로 시작하는 ITB만 필터링 itbCount: rows.filter(row => row.rfqCode?.startsWith("I")).length, - totalCount: rows.length + totalCount: rows.length, + // 담당자 지정 가능한 ITB (상태가 "RFQ 생성" 또는 "구매담당지정"인 ITB) + assignableItbCount: assignableRows.length, + assignableIds: assignableRows.map(row => row.id), + assignableCodes: assignableRows.map(row => row.rfqCode || "") }; }, [selectedRows]); - // 담당자 지정 가능 여부 체크 ("I"로 시작하는 항목이 있는지) - const canAssignPic = selectedRfqData.itbCount > 0; + // 담당자 지정 가능 여부 체크 (상태가 "RFQ 생성" 또는 "구매담당지정"인 ITB가 있는지) + const canAssignPic = selectedRfqData.assignableItbCount > 0; const handleAssignSuccess = () => { // 테이블 선택 초기화 @@ -76,15 +86,15 @@ export function RfqTableToolbarActions<TData>({ <Users className="h-4 w-4" /> 담당자 지정 <Badge variant="secondary" className="ml-1"> - {selectedRfqData.itbCount}건 + {selectedRfqData.assignableItbCount}건 </Badge> </Button> </TooltipTrigger> <TooltipContent> <p>선택한 ITB에 구매 담당자를 지정합니다</p> - {selectedRfqData.itbCount !== selectedRfqData.totalCount && ( + {selectedRfqData.assignableItbCount !== selectedRfqData.itbCount && ( <p className="text-xs text-muted-foreground mt-1"> - 전체 {selectedRfqData.totalCount}건 중 ITB {selectedRfqData.itbCount}건만 지정됩니다 + 전체 ITB {selectedRfqData.itbCount}건 중 {selectedRfqData.assignableItbCount}건만 지정 가능합니다 </p> )} </TooltipContent> @@ -103,7 +113,7 @@ export function RfqTableToolbarActions<TData>({ </Badge> {selectedRfqData.totalCount !== selectedRfqData.itbCount && ( <Badge variant="outline" className="text-xs"> - ITB {selectedRfqData.itbCount}건 + ITB {selectedRfqData.itbCount}건 (지정가능 {selectedRfqData.assignableItbCount}건) </Badge> )} </div> @@ -139,8 +149,8 @@ export function RfqTableToolbarActions<TData>({ <RfqAssignPicDialog open={showAssignDialog} onOpenChange={setShowAssignDialog} - selectedRfqIds={selectedRfqData.ids} - selectedRfqCodes={selectedRfqData.codes} + selectedRfqIds={selectedRfqData.assignableIds} + selectedRfqCodes={selectedRfqData.assignableCodes} onSuccess={handleAssignSuccess} /> </> diff --git a/lib/rfq-last/vendor/rfq-vendor-table.tsx b/lib/rfq-last/vendor/rfq-vendor-table.tsx index dc5564e2..428160d5 100644 --- a/lib/rfq-last/vendor/rfq-vendor-table.tsx +++ b/lib/rfq-last/vendor/rfq-vendor-table.tsx @@ -753,8 +753,10 @@ export function RfqVendorTable({ filterFn: createFilterFn("text"), cell: ({ row }) => { - const status = row.original.tbeStatus; + const status = row.original.tbeStatus?.trim(); + const rfqCode = row.original.rfqCode?.trim(); + // 생성중/준비중은 대기 표시(비클릭) if (!status || status === "준비중") { return ( <Badge variant="outline" className="text-gray-500"> @@ -772,8 +774,28 @@ export function RfqVendorTable({ "취소": { variant: "destructive", icon: <XCircle className="h-3 w-3 mr-1" /> }, }[status] || { variant: "outline", icon: null, color: "text-gray-600" }; + const isClickable = !!rfqCode; + return ( - <Badge variant={statusConfig.variant as any} className={statusConfig.color}> + <Badge + role={isClickable ? "button" : undefined} + tabIndex={isClickable ? 0 : -1} + variant={statusConfig.variant as any} + className={cn(statusConfig.color, isClickable && "cursor-pointer hover:underline")} + onClick={(e) => { + if (!isClickable) return; + e.stopPropagation(); + e.preventDefault(); + router.push(`/evcp/tbe-last?search=${encodeURIComponent(rfqCode!)}`); + // window.open( + // `/evcp/tbe-last?search=${encodeURIComponent(rfqCode!)}`, + // "_blank", + // "noopener,noreferrer" + // ); + // 새 창으로 이동 + }} + title={isClickable ? `TBE로 이동: ${rfqCode}` : undefined} + > {statusConfig.icon} {status} </Badge> @@ -802,19 +824,19 @@ export function RfqVendorTable({ "Acceptable": { variant: "success", icon: <CheckCircle className="h-3 w-3" />, - text: "적합", + text: "Acceptable", color: "bg-green-50 text-green-700 border-green-200" }, "Acceptable with Comment": { variant: "warning", icon: <AlertCircle className="h-3 w-3" />, - text: "조건부 적합", + text: "Acceptable with Comment", color: "bg-yellow-50 text-yellow-700 border-yellow-200" }, "Not Acceptable": { variant: "destructive", icon: <XCircle className="h-3 w-3" />, - text: "부적합", + text: "Not Acceptable", color: "bg-red-50 text-red-700 border-red-200" }, }[result]; diff --git a/lib/techsales-rfq/service.ts b/lib/techsales-rfq/service.ts index deb2981a..b4fb28df 100644 --- a/lib/techsales-rfq/service.ts +++ b/lib/techsales-rfq/service.ts @@ -744,9 +744,7 @@ export async function sendTechSalesRfqToVendors(input: { // 이메일 전송
await sendEmail({
to: vendorEmailsString,
- subject: isResend
- ? `[기술영업 RFQ 재전송] ${rfq.rfqCode} - ${rfqItems.length > 0 ? rfqItems.map(item => item.itemList).join(', ') : '견적 요청'} ${emailContext.versionInfo}`
- : `[기술영업 RFQ] ${rfq.rfqCode} - ${rfqItems.length > 0 ? rfqItems.map(item => item.itemList).join(', ') : '견적 요청'}`,
+ subject: '견적 요청',
template: 'tech-sales-rfq-invite-ko', // 기술영업용 템플릿
context: emailContext,
cc: sender.email, // 발신자를 CC에 추가
diff --git a/lib/vendor-document-list/plant/upload/columns.tsx b/lib/vendor-document-list/plant/upload/columns.tsx index 01fc61df..9c2fe228 100644 --- a/lib/vendor-document-list/plant/upload/columns.tsx +++ b/lib/vendor-document-list/plant/upload/columns.tsx @@ -17,16 +17,16 @@ import { DropdownMenuSeparator, DropdownMenuTrigger, } from "@/components/ui/dropdown-menu" -import { - Ellipsis, - Upload, - Eye, - RefreshCw, - CheckCircle2, - XCircle, +import { + Ellipsis, + Upload, + Eye, + RefreshCw, + CheckCircle2, + XCircle, AlertCircle, Clock, - Download + Download } from "lucide-react" interface GetColumnsProps { @@ -109,7 +109,7 @@ export function getColumns({ const stageName = row.getValue("stageName") as string const stageStatus = row.original.stageStatus const stageOrder = row.original.stageOrder - + return ( <div className="space-y-1"> <div className="flex items-center gap-2"> @@ -119,12 +119,12 @@ export function getColumns({ <span className="text-sm">{stageName}</span> </div> {stageStatus && ( - <Badge + <Badge variant={ stageStatus === "COMPLETED" ? "success" : - stageStatus === "IN_PROGRESS" ? "default" : - stageStatus === "REJECTED" ? "destructive" : - "secondary" + stageStatus === "IN_PROGRESS" ? "default" : + stageStatus === "REJECTED" ? "destructive" : + "secondary" } className="text-xs" > @@ -145,9 +145,9 @@ export function getColumns({ const planDate = row.getValue("stagePlanDate") as Date | null const isOverdue = row.original.isOverdue const daysUntilDue = row.original.daysUntilDue - + if (!planDate) return <span className="text-muted-foreground">-</span> - + return ( <div className="space-y-1"> <div className={isOverdue ? "text-destructive font-medium" : ""}> @@ -187,7 +187,7 @@ export function getColumns({ const reviewStatus = row.original.latestReviewStatus const revisionNumber = row.original.latestRevisionNumber const revisionCode = row.original.latestRevisionCode - + if (!status) { return ( <Badge variant="outline" className="gap-1"> @@ -196,20 +196,20 @@ export function getColumns({ </Badge> ) } - + return ( <div className="space-y-1"> - <Badge + <Badge variant={ reviewStatus === "APPROVED" ? "success" : - reviewStatus === "REJECTED" ? "destructive" : - status === "SUBMITTED" ? "default" : - "secondary" + reviewStatus === "REJECTED" ? "destructive" : + status === "SUBMITTED" ? "default" : + "secondary" } > {reviewStatus || status} </Badge> - {revisionCode !== null &&( + {revisionCode !== null && ( <div className="text-xs text-muted-foreground"> {revisionCode} </div> @@ -229,7 +229,7 @@ export function getColumns({ const syncStatus = row.getValue("latestSyncStatus") as string | null const syncProgress = row.original.syncProgress const requiresSync = row.original.requiresSync - + if (!syncStatus || syncStatus === "pending") { if (requiresSync) { return ( @@ -241,15 +241,15 @@ export function getColumns({ } return <span className="text-muted-foreground">-</span> } - + return ( <div className="space-y-2"> - <Badge + <Badge variant={ syncStatus === "synced" ? "success" : - syncStatus === "failed" ? "destructive" : - syncStatus === "syncing" ? "default" : - "secondary" + syncStatus === "failed" ? "destructive" : + syncStatus === "syncing" ? "default" : + "secondary" } className="gap-1" > @@ -274,9 +274,9 @@ export function getColumns({ cell: ({ row }) => { const totalFiles = row.getValue("totalFiles") as number const syncedFiles = row.original.syncedFilesCount - + if (!totalFiles) return <span className="text-muted-foreground">0</span> - + return ( <div className="text-sm"> {syncedFiles !== null && syncedFiles !== undefined ? ( @@ -297,7 +297,7 @@ export function getColumns({ // cell: ({ row }) => { // const vendorName = row.getValue("vendorName") as string // const vendorCode = row.original.vendorCode - + // return ( // <div className="space-y-1"> // <div className="text-sm">{vendorName}</div> @@ -309,82 +309,88 @@ export function getColumns({ // }, // size: 150, // }, - { - id: "actions", - enableHiding: false, - cell: function Cell({ row }) { - const requiresSubmission = row.original.requiresSubmission - const requiresSync = row.original.requiresSync - const latestSubmissionId = row.original.latestSubmissionId - - return ( - <DropdownMenu> - <DropdownMenuTrigger asChild> - <Button - aria-label="Open menu" - variant="ghost" - className="flex size-7 p-0" +// columns.tsx +{ + id: "actions", + enableHiding: false, + cell: function Cell({ row }) { + const requiresSubmission = row.original.requiresSubmission + const requiresSync = row.original.requiresSync + const latestSubmissionId = row.original.latestSubmissionId + const projectCode = row.original.projectCode // 프로젝트 코드 가져오기 + + return ( + <DropdownMenu> + <DropdownMenuTrigger asChild> + <Button + aria-label="Open menu" + variant="ghost" + className="flex size-7 p-0" + > + <Ellipsis className="size-4" /> + </Button> + </DropdownMenuTrigger> + <DropdownMenuContent align="end" className="w-48"> + {requiresSubmission && ( + <DropdownMenuItem + onSelect={() => setRowAction({ row, type: "upload" })} + className="gap-2" + > + <Upload className="h-4 w-4" /> + Upload Documents + </DropdownMenuItem> + )} + + {latestSubmissionId && ( + <> + <DropdownMenuItem + onSelect={() => setRowAction({ row, type: "view" })} + className="gap-2" > - <Ellipsis className="size-4" /> - </Button> - </DropdownMenuTrigger> - <DropdownMenuContent align="end" className="w-48"> - {requiresSubmission && ( + <Eye className="h-4 w-4" /> + View Submission + </DropdownMenuItem> + + {requiresSync && ( <DropdownMenuItem - onSelect={() => setRowAction({ row, type: "upload" })} + onSelect={() => setRowAction({ row, type: "sync" })} className="gap-2" > - <Upload className="h-4 w-4" /> - Upload Documents + <RefreshCw className="h-4 w-4" /> + Retry Sync </DropdownMenuItem> )} - - {latestSubmissionId && ( - <> - <DropdownMenuItem - onSelect={() => setRowAction({ row, type: "view" })} - className="gap-2" - > - <Eye className="h-4 w-4" /> - View Submission - </DropdownMenuItem> - - {requiresSync && ( - <DropdownMenuItem - onSelect={() => setRowAction({ row, type: "sync" })} - className="gap-2" - > - <RefreshCw className="h-4 w-4" /> - Retry Sync - </DropdownMenuItem> - )} - </> - )} - - - {/* ✅ 커버 페이지 다운로드 */} - <DropdownMenuItem - onSelect={() => setRowAction({ row, type: "downloadCover" })} - className="gap-2" - > - <Download className="h-4 w-4" /> - Download Cover Page - </DropdownMenuItem> + </> + )} + {/* ✅ 커버 페이지 다운로드 - projectCode가 있을 때만 표시 */} + {projectCode && ( + <> <DropdownMenuSeparator /> - <DropdownMenuItem - onSelect={() => setRowAction({ row, type: "history" })} + onSelect={() => setRowAction({ row, type: "downloadCover" })} className="gap-2" > - <Clock className="h-4 w-4" /> - View History + <Download className="h-4 w-4" /> + Download Cover Page </DropdownMenuItem> - </DropdownMenuContent> - </DropdownMenu> - ) - }, - size: 40, - } + </> + )} + + <DropdownMenuSeparator /> + + <DropdownMenuItem + onSelect={() => setRowAction({ row, type: "history" })} + className="gap-2" + > + <Clock className="h-4 w-4" /> + View History + </DropdownMenuItem> + </DropdownMenuContent> + </DropdownMenu> + ) + }, + size: 40, +} ] }
\ No newline at end of file diff --git a/lib/vendor-document-list/plant/upload/table.tsx b/lib/vendor-document-list/plant/upload/table.tsx index 84b04092..2247fc57 100644 --- a/lib/vendor-document-list/plant/upload/table.tsx +++ b/lib/vendor-document-list/plant/upload/table.tsx @@ -21,6 +21,7 @@ import { SingleUploadDialog } from "./components/single-upload-dialog" import { HistoryDialog } from "./components/history-dialog" import { ViewSubmissionDialog } from "./components/view-submission-dialog" import { toast } from "sonner" +import { quickDownload } from "@/lib/file-download" interface StageSubmissionsTableProps { promises: Promise<[ @@ -167,23 +168,43 @@ export function StageSubmissionsTable({ promises, selectedProjectId }: StageSubm const { type, row } = rowAction; if (type === "downloadCover") { - // 2) 서버에서 생성 후 다운로드 (예: API 호출) + const projectCode = row.original.projectCode; + const project = projects.find(p => p.code === projectCode); + + if (!project) { + toast.error("프로젝트 정보를 찾을 수 없습니다."); + setRowAction(null); + return; + } + (async () => { try { - const res = await fetch(`/api/stages/${row.original.stageId}/cover`, { method: "POST" }); - if (!res.ok) throw new Error("failed"); - const { fileUrl } = await res.json(); // 서버 응답: { fileUrl: string } - window.open(fileUrl, "_blank", "noopener,noreferrer"); + const res = await fetch(`/api/projects/${project.id}/cover`, { + method: "GET" + }); + + if (!res.ok) { + const error = await res.json(); + throw new Error(error.message || "커버 페이지를 가져올 수 없습니다"); + } + + const { fileUrl, fileName } = await res.json(); + + // quickDownload 사용 + quickDownload(fileUrl, fileName || `${projectCode}_cover.docx`); + + toast.success("커버 페이지 다운로드를 시작했습니다."); + } catch (e) { - toast.error("커버 페이지 생성에 실패했습니다."); + toast.error(e instanceof Error ? e.message : "커버 페이지 다운로드에 실패했습니다."); console.error(e); } finally { setRowAction(null); } })(); } - }, [rowAction, setRowAction]); - + }, [rowAction, setRowAction, projects]); + return ( <> <DataTable table={table}> diff --git a/lib/vendor-document-list/ship-all/enhanced-documents-table.tsx b/lib/vendor-document-list/ship-all/enhanced-documents-table.tsx index 255aa56c..b8b7542a 100644 --- a/lib/vendor-document-list/ship-all/enhanced-documents-table.tsx +++ b/lib/vendor-document-list/ship-all/enhanced-documents-table.tsx @@ -167,16 +167,16 @@ export function SimplifiedDocumentsTable({ label: "Second Actual Date", type: "date", }, - { - id: "issuedDate", - label: "Issue Date", - type: "date", - }, - { - id: "createdAt", - label: "Created Date", - type: "date", - }, + // { + // id: "issuedDate", + // label: "Issue Date", + // type: "date", + // }, + // { + // id: "createdAt", + // label: "Created Date", + // type: "date", + // }, { id: "updatedAt", label: "Updated Date", |