From 694cd4893e2fdd8ab4332437ccc2c0f6b620e27a Mon Sep 17 00:00:00 2001
From: bicochan <chanii8@naver.com>
Date: Thu, 10 Apr 2025 18:18:35 +0900
Subject: [PATCH] =?UTF-8?q?chore:=20getCurrentMenu=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/cs/src/entities/menu/lib/utils.ts          | 6 +++++-
 apps/cs/src/pages/banner/ui/banner-form.tsx     | 4 ++--
 apps/cs/src/pages/image/ui/image-form.tsx       | 4 ++--
 apps/cs/src/pages/menu/ui/base-menu-form.tsx    | 4 ++--
 apps/cs/src/pages/menu/ui/type-menu-form.tsx    | 4 ++--
 apps/cs/src/pages/site/ui/site-form.tsx         | 4 ++--
 apps/cs/src/pages/template/ui/template-form.tsx | 4 ++--
 7 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/apps/cs/src/entities/menu/lib/utils.ts b/apps/cs/src/entities/menu/lib/utils.ts
index d526b34b4..1cf4514d9 100644
--- a/apps/cs/src/entities/menu/lib/utils.ts
+++ b/apps/cs/src/entities/menu/lib/utils.ts
@@ -5,7 +5,11 @@ export const getCurrentMenu = (
   pathname: string,
 ): MenuItem | null => {
   for (const menu of menus) {
-    if (menu.urlPath === pathname) return menu;
+    if (
+      menu.urlPath !== "" &&
+      (menu.urlPath === pathname || pathname.startsWith(menu.urlPath))
+    )
+      return menu;
 
     if (menu.children) {
       const children = getCurrentMenu(menu.children, pathname);
diff --git a/apps/cs/src/pages/banner/ui/banner-form.tsx b/apps/cs/src/pages/banner/ui/banner-form.tsx
index a39be8c1a..b0a31d775 100644
--- a/apps/cs/src/pages/banner/ui/banner-form.tsx
+++ b/apps/cs/src/pages/banner/ui/banner-form.tsx
@@ -77,8 +77,8 @@ function BannerForm({ form, bnrSn, ...props }: BannerFormProps) {
       <div className="card">
         <Table variant="secondary">
           <colgroup>
-            <col width="20%" />
-            <col width="80%" />
+            <col width="15%" />
+            <col width="85%" />
           </colgroup>
           <TableBody>
             <TableRow>
diff --git a/apps/cs/src/pages/image/ui/image-form.tsx b/apps/cs/src/pages/image/ui/image-form.tsx
index 9a5857b31..b5c3de013 100644
--- a/apps/cs/src/pages/image/ui/image-form.tsx
+++ b/apps/cs/src/pages/image/ui/image-form.tsx
@@ -83,8 +83,8 @@ function ImageForm({ form, imgSn, ...props }: ImageFormProps) {
       <div className="card">
         <Table variant="secondary">
           <colgroup>
-            <col width="20%" />
-            <col width="80%" />
+            <col width="15%" />
+            <col width="85%" />
           </colgroup>
           <TableBody>
             <TableRow>
diff --git a/apps/cs/src/pages/menu/ui/base-menu-form.tsx b/apps/cs/src/pages/menu/ui/base-menu-form.tsx
index 1af5bca3a..26ead2bb1 100644
--- a/apps/cs/src/pages/menu/ui/base-menu-form.tsx
+++ b/apps/cs/src/pages/menu/ui/base-menu-form.tsx
@@ -22,8 +22,8 @@ function BaseMenuForm({ form, menuCd }: BaseMenuFormProps) {
   return (
     <Table variant="secondary">
       <colgroup>
-        <col width="20%" />
-        <col width="80%" />
+        <col width="15%" />
+        <col width="85%" />
       </colgroup>
       <TableBody>
         {menuCd && (
diff --git a/apps/cs/src/pages/menu/ui/type-menu-form.tsx b/apps/cs/src/pages/menu/ui/type-menu-form.tsx
index b2e6d98e2..210c36f17 100644
--- a/apps/cs/src/pages/menu/ui/type-menu-form.tsx
+++ b/apps/cs/src/pages/menu/ui/type-menu-form.tsx
@@ -55,8 +55,8 @@ function TypeMenuForm({ form, menuType }: TypeMenuFormProps) {
   return (
     <Table variant="secondary" className="-mt-[0.1rem]">
       <colgroup>
-        <col width="20%" />
-        <col width="80%" />
+        <col width="15%" />
+        <col width="85%" />
       </colgroup>
       <TableBody>
         {menuType === "CONTENTS" && (
diff --git a/apps/cs/src/pages/site/ui/site-form.tsx b/apps/cs/src/pages/site/ui/site-form.tsx
index 0f9a30b55..f624a81b7 100644
--- a/apps/cs/src/pages/site/ui/site-form.tsx
+++ b/apps/cs/src/pages/site/ui/site-form.tsx
@@ -44,8 +44,8 @@ function SiteForm({ form, siteId, ...props }: SiteFormProps) {
       <div className="card">
         <Table variant="secondary">
           <colgroup>
-            <col width="20%" />
-            <col width="80%" />
+            <col width="15%" />
+            <col width="85%" />
           </colgroup>
           <TableBody>
             <TableRow>
diff --git a/apps/cs/src/pages/template/ui/template-form.tsx b/apps/cs/src/pages/template/ui/template-form.tsx
index 7d443e420..8716afe00 100644
--- a/apps/cs/src/pages/template/ui/template-form.tsx
+++ b/apps/cs/src/pages/template/ui/template-form.tsx
@@ -34,8 +34,8 @@ function TemplateForm({ form, tmpltSn, ...props }: TemplateFormProps) {
       <div className="card">
         <Table variant="secondary">
           <colgroup>
-            <col width="10%" />
-            <col width="90%" />
+            <col width="15%" />
+            <col width="85%" />
           </colgroup>
           <TableBody>
             <TableRow>