From 091183785c909933d6508efa25a8003421b244a8 Mon Sep 17 00:00:00 2001
From: MingLiang Wang <mingliangwang0o0@gmail.com>
Date: Mon, 26 Dec 2022 18:03:44 +0800
Subject: [PATCH] feat: remove private workspace from list

---
 .../SelectorPopperContent.tsx                 | 28 +++++++++----------
 .../WorkspaceItem/PrivateWorkspaceItem.tsx    | 17 +++++++++--
 .../WorkspaceItem/WorkspaceItem.tsx           |  6 ++--
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx
index e5f89a3eab..61d5b65158 100644
--- a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx
+++ b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx
@@ -98,32 +98,32 @@ export const SelectorPopperContent = ({
     </SelectorPopperContainer>
   ) : (
     <SelectorPopperContainer placement="bottom-start">
-      <PrivateWorkspaceItem />
+      <PrivateWorkspaceItem
+        privateWorkspaceId={
+          workspacesMeta.find(
+            workspace => workspace.type === WorkspaceType.Private
+          )?.id
+        }
+      />
       <StyledDivider />
       <WorkspaceGroupTitle>Workspace</WorkspaceGroupTitle>
       <WorkspaceWrapper>
         {workspacesMeta.map(workspace => {
-          return (
+          return workspace.type !== WorkspaceType.Private ? (
             <WorkspaceItem
               type={workspace.type}
               key={workspace.id}
               id={workspace.id}
               icon={
-                workspace.type === WorkspaceType.Private
-                  ? user.avatar_url
-                  : (workspaces[workspace.id]?.meta.avatar &&
-                      `/api/blob/${workspaces[workspace.id]?.meta.avatar}`) ||
-                    `loading...`
-              }
-              onClick={handleClickSettingWorkspace}
-              name={
-                workspace.type === WorkspaceType.Private
-                  ? user.name
-                  : workspaces[workspace.id]?.meta.name || `loading...`
+                (workspaces[workspace.id]?.meta.avatar &&
+                  `/api/blob/${workspaces[workspace.id]?.meta.avatar}`) ||
+                `loading...`
               }
+              onClickSetting={handleClickSettingWorkspace}
+              name={workspaces[workspace.id]?.meta.name || `loading...`}
               memberCount={workSpaceDetails[workspace.id]?.memberCount || 1}
             />
-          );
+          ) : null;
         })}
       </WorkspaceWrapper>
       <CreateWorkspaceItem />
diff --git a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/PrivateWorkspaceItem.tsx b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/PrivateWorkspaceItem.tsx
index a816c3791a..1301200f79 100644
--- a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/PrivateWorkspaceItem.tsx
+++ b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/PrivateWorkspaceItem.tsx
@@ -5,13 +5,26 @@ import {
   PrivateWorkspaceWrapper,
   WorkspaceItemContent,
 } from './styles';
+import { useRouter } from 'next/router';
 
-export const PrivateWorkspaceItem = () => {
+type PrivateWorkspaceItemProps = {
+  privateWorkspaceId?: string;
+};
+
+export const PrivateWorkspaceItem = ({
+  privateWorkspaceId,
+}: PrivateWorkspaceItemProps) => {
   const { user } = useAppState();
+  const router = useRouter();
+  const handleClick = () => {
+    if (privateWorkspaceId) {
+      router.push(`/workspace/${privateWorkspaceId}`);
+    }
+  };
   if (user) {
     const Username = user.name;
     return (
-      <PrivateWorkspaceWrapper>
+      <PrivateWorkspaceWrapper onClick={handleClick}>
         <WorkspaceItemAvatar alt={Username} src={user.avatar_url}>
           {Username}
         </WorkspaceItemAvatar>
diff --git a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/WorkspaceItem/WorkspaceItem.tsx b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/WorkspaceItem/WorkspaceItem.tsx
index 965649ba46..b832ec40d4 100644
--- a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/WorkspaceItem/WorkspaceItem.tsx
+++ b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/WorkspaceItem/WorkspaceItem.tsx
@@ -16,7 +16,7 @@ interface WorkspaceItemProps {
   icon: string;
   type: WorkspaceType;
   memberCount: number;
-  onClick?: (workspaceId: string) => void;
+  onClickSetting?: (workspaceId: string) => void;
 }
 
 export const WorkspaceItem = ({
@@ -24,7 +24,7 @@ export const WorkspaceItem = ({
   name,
   icon,
   type,
-  onClick,
+  onClickSetting,
   memberCount,
 }: WorkspaceItemProps) => {
   const router = useRouter();
@@ -32,7 +32,7 @@ export const WorkspaceItem = ({
   const { currentWorkspaceId } = useAppState();
 
   const handleClickSetting = async () => {
-    onClick && onClick(id);
+    onClickSetting && onClickSetting(id);
   };
 
   return (