From 50e4da10d13c48d59f28e62f042bd75607a007e4 Mon Sep 17 00:00:00 2001 From: MingLiang Wang Date: Tue, 20 Dec 2022 19:37:52 +0800 Subject: [PATCH] feat: add workspace to setting --- .../workspace-setting/workspace-setting.tsx | 14 ++++++++++---- .../WorkspaceSelector/SelectorPopperContent.tsx | 8 ++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/packages/app/src/components/workspace-setting/workspace-setting.tsx b/packages/app/src/components/workspace-setting/workspace-setting.tsx index c315972d0d..d660704931 100644 --- a/packages/app/src/components/workspace-setting/workspace-setting.tsx +++ b/packages/app/src/components/workspace-setting/workspace-setting.tsx @@ -38,6 +38,7 @@ import { import { useEffect, useState } from 'react'; import { Button } from '@/ui/button'; import Input from '@/ui/input'; +import { Workspace, WorkspaceType } from '@pathfinder/data-services'; enum ActiveTab { 'general' = 'general', @@ -53,6 +54,7 @@ type SettingTabProps = { type WorkspaceSettingProps = { isShow: boolean; onClose?: () => void; + workspace?: Workspace; }; const WorkspaceSettingTab = ({ activeTab, onTabChange }: SettingTabProps) => { @@ -98,6 +100,7 @@ const WorkspaceSettingTab = ({ activeTab, onTabChange }: SettingTabProps) => { export const WorkspaceSetting = ({ isShow, onClose, + workspace, }: WorkspaceSettingProps) => { const [activeTab, setActiveTab] = useState(ActiveTab.general); const handleTabChange = (tab: ActiveTab) => { @@ -106,6 +109,7 @@ export const WorkspaceSetting = ({ const handleClickClose = () => { onClose && onClose(); }; + const isPrivate = workspace?.type === WorkspaceType.Private; useEffect(() => { // reset tab when modal is closed if (!isShow) { @@ -126,7 +130,9 @@ export const WorkspaceSetting = ({ /> - {activeTab === ActiveTab.general && } + {activeTab === ActiveTab.general && ( + + )} {activeTab === ActiveTab.members && } {activeTab === ActiveTab.publish && } @@ -135,14 +141,14 @@ export const WorkspaceSetting = ({ ); }; -const GeneralPage = () => { +const GeneralPage = ({ workspace }: { workspace?: Workspace }) => { return (
Workspace Avatar W - upload - + {/* upload + */} Workspace Name 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 e22c48a520..7c6b487d27 100644 --- a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx +++ b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx @@ -12,6 +12,7 @@ import { } from './WorkspaceItem'; import { WorkspaceSetting } from '@/components/workspace-setting'; import { useState } from 'react'; +import { WorkspaceType } from '@pathfinder/data-services'; export const SelectorPopperContent = () => { const { user, workspacesMeta } = useAppState(); @@ -56,6 +57,13 @@ export const SelectorPopperContent = () => { workspace.id === settingWorkspaceId + ) + : undefined + } />