From bcfe9ebbeb8dc7d66891917da65618ca8a4aef41 Mon Sep 17 00:00:00 2001
From: yewonJin <jyw966@naver.com>
Date: Wed, 4 Dec 2024 19:37:40 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=ED=98=84=EC=9E=AC=20=EC=9B=8C=ED=81=AC?=
 =?UTF-8?q?=EC=8A=A4=ED=8E=98=EC=9D=B4=EC=8A=A4=20=EC=9D=B4=EB=A6=84=20?=
 =?UTF-8?q?=ED=91=9C=EC=8B=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pageSidebar/ui/WorkspaceNav/index.tsx     |  9 ++++++---
 apps/frontend/src/features/workspace/index.ts |  2 +-
 .../src/widgets/TopNavView/ui/index.tsx       | 19 +++++++++----------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/apps/frontend/src/features/pageSidebar/ui/WorkspaceNav/index.tsx b/apps/frontend/src/features/pageSidebar/ui/WorkspaceNav/index.tsx
index f4c8c3d7..580d14f7 100644
--- a/apps/frontend/src/features/pageSidebar/ui/WorkspaceNav/index.tsx
+++ b/apps/frontend/src/features/pageSidebar/ui/WorkspaceNav/index.tsx
@@ -1,8 +1,11 @@
-// TODO: 워크스페이스 이름 받아야함
-export function WorkspaceNav() {
+interface WorkspaceNavProps {
+  title: string;
+}
+
+export function WorkspaceNav({ title }: WorkspaceNavProps) {
   return (
     <div className="flex flex-row items-center justify-center gap-2">
-      <h1 className="text-md font-semibold">{"환영합니다 👋🏻"}</h1>
+      <h1 className="text-md font-semibold">{title}</h1>
     </div>
   );
 }
diff --git a/apps/frontend/src/features/workspace/index.ts b/apps/frontend/src/features/workspace/index.ts
index 88c5464b..02a0ed79 100644
--- a/apps/frontend/src/features/workspace/index.ts
+++ b/apps/frontend/src/features/workspace/index.ts
@@ -1,4 +1,4 @@
-export { useUserWorkspace } from "./model/workspaceQuries";
+export { useUserWorkspace, useCurrentWorkspace } from "./model/workspaceQuries";
 export { useProtectedWorkspace } from "./model/useProtectedWorkspace";
 export { useValidateWorkspaceInviteLink } from "./model/workspaceMutations";
 
diff --git a/apps/frontend/src/widgets/TopNavView/ui/index.tsx b/apps/frontend/src/widgets/TopNavView/ui/index.tsx
index 6f58f70a..10007d7f 100644
--- a/apps/frontend/src/widgets/TopNavView/ui/index.tsx
+++ b/apps/frontend/src/widgets/TopNavView/ui/index.tsx
@@ -1,6 +1,7 @@
 import { Menu, X } from "lucide-react";
 
 import { WorkspaceNav } from "@/features/pageSidebar";
+import { useCurrentWorkspace } from "@/features/workspace";
 import { UserInfoView } from "@/widgets/UserInfoView";
 import { Divider } from "@/shared/ui";
 
@@ -9,24 +10,22 @@ interface TopNavProps {
   isExpanded: boolean;
 }
 export function TopNavView({ onExpand, isExpanded }: TopNavProps) {
-  /*   const workspace = useWorkspace();
-  const { data } = useUserWorkspace(); */
+  const { data } = useCurrentWorkspace();
 
-  /* const getWorkspaceTitle = () => {
-    if (!workspace) return "공용 워크스페이스";
+  const getWorkspaceTitle = () => {
+    if (!data) return "로딩 중";
 
-    return (
-      data?.workspaces.find((w) => w.workspaceId === workspace)?.title ??
-      "로딩 중..."
-    );
-  }; */
+    if (data.workspace.workspaceId === "main") return "공용 워크스페이스";
+
+    return data.workspace.title;
+  };
 
   return (
     <div className="flex w-full flex-row items-center justify-between">
       <div className="flex flex-row items-center gap-2">
         <UserInfoView />
         <Divider direction="vertical" className="h-3" />
-        <WorkspaceNav />
+        <WorkspaceNav title={getWorkspaceTitle()} />
       </div>
       <div className="flex h-7 w-7 items-center justify-center">
         <button onClick={onExpand}>