(최겸) 구매 인포메이션, 공지사항 수정

2 files changed, 49 insertions, 16 deletions

diff --git a/components/information/information-button.tsx b/components/information/information-button.tsx
index 2cff96d0..e9163093 100644
--- a/components/information/information-button.tsx
+++ b/components/information/information-button.tsx
@@ -18,6 +18,11 @@ import { UpdateInformationDialog } from "@/lib/information/table/update-informat
 import { NoticeViewDialog } from "@/components/notice/notice-view-dialog"

 // import { PDFTronViewerDialog } from "@/components/document-viewer/pdftron-viewer-dialog" // 주석 처리 - 브라우저 내장 뷰어 사용

 import type { PageInformation, InformationAttachment } from "@/db/schema/information"

+

+type PageInformationWithUpdatedBy = PageInformation & {

+  updatedByName?: string | null

+  updatedByEmail?: string | null

+}

 import type { Notice } from "@/db/schema/notice"

 import { useSession } from "next-auth/react"

 import { formatDate } from "@/lib/utils"

@@ -44,7 +49,7 @@ export function InformationButton({
 }: InformationButtonProps) {

   const { data: session } = useSession()

   const [isOpen, setIsOpen] = useState(false)

-  const [information, setInformation] = useState<(PageInformation & { attachments: InformationAttachment[] }) | null>(null)

+  const [information, setInformation] = useState<PageInformationWithUpdatedBy & { attachments: InformationAttachment[] } | null>(null)

   const [notices, setNotices] = useState<NoticeWithAuthor[]>([])

   const [hasEditPermission, setHasEditPermission] = useState(false)

   const [isEditDialogOpen, setIsEditDialogOpen] = useState(false)

@@ -211,10 +216,10 @@ export function InformationButton({
             variant={variant} 

             size={size} 

             className={className}

-            title="인포메이션"

+            title="안내사항"

           >

             <Info className="h-4 w-4" />

-            {size !== "icon" && <span className="ml-1">정보</span>}

+            {size !== "icon" && <span className="ml-1">안내사항</span>}

           </Button>

         </DialogTrigger>

         <DialogContent className="max-w-4xl max-h-[80vh] overflow-y-auto">

@@ -277,7 +282,7 @@ export function InformationButton({
                   )}

                 </div>

 

-                {/* 인포메이션 컨텐츠 */}

+                {/* 안내사항 컨텐츠 */}

                 <div className="space-y-3">

                   <div className="flex items-center justify-between">

                     <h4 className="font-semibold">안내사항</h4>

@@ -295,8 +300,20 @@ export function InformationButton({
                   </div>

                   <div className="bg-muted/50 border rounded-lg p-4">

                     {information?.informationContent ? (

-                      <div className="text-sm text-muted-foreground whitespace-pre-wrap max-h-40 overflow-y-auto">

-                        {information.informationContent}

+                      <div className="space-y-3">

+                        <div className="text-sm text-muted-foreground whitespace-pre-wrap max-h-40 overflow-y-auto">

+                          {information.informationContent}

+                        </div>

+                        <div className="flex items-center justify-between text-xs text-muted-foreground border-t pt-2">

+                          <div className="flex items-center gap-4">

+                            <span>

+                              <strong>수정자:</strong> {information.updatedByName || '시스템'}

+                            </span>

+                            <span>

+                              <strong>수정일:</strong> {formatDate(information.updatedAt, "KR")}

+                            </span>

+                          </div>

+                        </div>

                       </div>

                     ) : (

                       <div className="text-center text-muted-foreground">

diff --git a/components/information/information-client.tsx b/components/information/information-client.tsx
index 48bb683d..53350d13 100644
--- a/components/information/information-client.tsx
+++ b/components/information/information-client.tsx
@@ -28,13 +28,18 @@ import { toast } from "sonner"
 import { formatDate } from "@/lib/utils"

 import { getInformationLists, syncInformationFromMenuAssignments, getInformationDetail } from "@/lib/information/service"

 import type { PageInformation } from "@/db/schema/information"

+

+type PageInformationWithUpdatedBy = PageInformation & {

+  updatedByName?: string | null

+  updatedByEmail?: string | null

+}

 import { UpdateInformationDialog } from "@/lib/information/table/update-information-dialog"

 

 interface InformationClientProps {

   initialData?: PageInformation[]

 }

 

-type SortField = "pageName" | "pagePath" | "createdAt"

+type SortField = "pageName" | "pagePath" | "updatedAt"

 type SortDirection = "asc" | "desc"

 

 export function InformationClient({ initialData = [] }: InformationClientProps) {

@@ -58,12 +63,12 @@ export function InformationClient({ initialData = [] }: InformationClientProps)
     }

   }

   

-  const [informations, setInformations] = useState<PageInformation[]>(initialData)

+  const [informations, setInformations] = useState<PageInformationWithUpdatedBy[]>(initialData)

   const [loading, setLoading] = useState(false)

   const [searchQuery, setSearchQuery] = useState("")

   const [sortField, setSortField] = useState<SortField>("createdAt")

   const [sortDirection, setSortDirection] = useState<SortDirection>("desc")

-  const [editingInformation, setEditingInformation] = useState<PageInformation | null>(null)

+  const [editingInformation, setEditingInformation] = useState<PageInformationWithUpdatedBy | null>(null)

   const [isEditDialogOpen, setIsEditDialogOpen] = useState(false)

   const [isSyncing, setIsSyncing] = useState(false)

   const [, startTransition] = useTransition()

@@ -327,13 +332,14 @@ export function InformationClient({ initialData = [] }: InformationClientProps)
               </TableHead>

               <TableHead>정보 내용</TableHead>

               <TableHead>상태</TableHead>

+              <TableHead>수정자</TableHead>

               <TableHead>

                 <button

                   className="flex items-center gap-1 hover:text-foreground"

-                  onClick={() => handleSort("createdAt")}

+                  onClick={() => handleSort("updatedAt")}

                 >

-                  생성일

-                  {sortField === "createdAt" && (

+                  수정일

+                  {sortField === "updatedAt" && (

                     sortDirection === "asc" ? (

                       <ChevronUp className="h-4 w-4" />

                     ) : (

@@ -342,20 +348,21 @@ export function InformationClient({ initialData = [] }: InformationClientProps)
                   )}

                 </button>

               </TableHead>

+              <TableHead>수정일</TableHead>

               <TableHead className="text-right">작업</TableHead>

             </TableRow>

           </TableHeader>

           <TableBody>

             {loading ? (

               <TableRow>

-                <TableCell colSpan={7} className="text-center py-8">

+                <TableCell colSpan={8} className="text-center py-8">

                   로딩 중...

                 </TableCell>

               </TableRow>

             ) : filteredAndSortedInformations.length === 0 ? (

               <TableRow>

-                <TableCell colSpan={7} className="text-center py-8 text-muted-foreground">

-                  정보가 없습니다.

+                <TableCell colSpan={8} className="text-center py-8 text-muted-foreground">

+                  안내사항이 없습니다.

                 </TableCell>

               </TableRow>

             ) : (

@@ -388,7 +395,16 @@ export function InformationClient({ initialData = [] }: InformationClientProps)
                     </Badge>

                   </TableCell>

                   <TableCell>

-                    {formatDate(information.createdAt, "KR")}

+                    {information.updatedByName || '시스템'}

+                  </TableCell>

+                  <TableCell>

+                    {formatDate(information.updatedAt, "KR")}

+                  </TableCell>

+                  <TableCell>

+                    {information.updatedAt && information.updatedAt !== information.createdAt

+                      ? formatDate(information.updatedAt, "KR")

+                      : '-'

+                    }

                   </TableCell>

                   <TableCell className="text-right">

                     <Button