(ActiveTab.general);
+ const handleTabChange = (tab: ActiveTab) => {
+ setActiveTab(tab);
+ };
+ return (
+
+
+
+
+ Workspace Settings
+
+
+
+
+ {activeTab === ActiveTab.general && }
+
+
+
+ );
+};
+
+const GeneralPage = () => {
+ return (
+
+ Workspace Avatar
+
+ W
+ upload
+
+
+ Workspace Name
+
+
+
+ Workspace Owner
+
+
+
+
+
+
+
+ );
+};
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 b94815f666..30b7c8d162 100644
--- a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx
+++ b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx
@@ -27,7 +27,7 @@ const workspaces = [
];
export const SelectorPopperContent = () => {
- const { user, workspaces } = useAppState();
+ const { user, workspacesMeta } = useAppState();
return !user ? (
@@ -43,7 +43,7 @@ export const SelectorPopperContent = () => {
Workspace
- {workspaces.map(workspace => {
+ {workspacesMeta.map(workspace => {
return (
{
const handlerInputChange = (workspaceName: string) => {
setWorkspaceId(workspaceName);
};
- console.log('workspaceName', workspaceName);
return (
diff --git a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx
index 94e4514fce..d06ed53f75 100644
--- a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx
+++ b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx
@@ -8,7 +8,7 @@ export const WorkspaceSelector = () => {
content={}
zIndex={1000}
placement="bottom-start"
- trigger="hover"
+ trigger="click"
>
diff --git a/packages/app/src/components/workspace-slider-bar/style.ts b/packages/app/src/components/workspace-slider-bar/style.ts
index e32c01e86d..3f8fa216ac 100644
--- a/packages/app/src/components/workspace-slider-bar/style.ts
+++ b/packages/app/src/components/workspace-slider-bar/style.ts
@@ -57,7 +57,10 @@ export const StyledListItem = styled.button<{
borderRadius: '5px',
...displayFlex('flex-start', 'center'),
...(disabled
- ? { cursor: 'not-allowed', color: theme.colors.borderColor }
+ ? {
+ cursor: 'not-allowed',
+ color: theme.colors.borderColor,
+ }
: {}),
'>svg': {
diff --git a/packages/app/src/providers/app-state-provider.tsx b/packages/app/src/providers/app-state-provider.tsx
index 28967ee5cc..8627d9d41b 100644
--- a/packages/app/src/providers/app-state-provider.tsx
+++ b/packages/app/src/providers/app-state-provider.tsx
@@ -9,7 +9,7 @@ import type { Workspace } from '@pathfinder/data-services';
interface AppStateValue {
user: AccessTokenMessage | null;
- workspaces: Workspace[];
+ workspacesMeta: Workspace[];
}
interface AppStateContext extends AppStateValue {
@@ -18,14 +18,14 @@ interface AppStateContext extends AppStateValue {
const AppState = createContext({
user: null,
- workspaces: [],
+ workspacesMeta: [],
setState: () => {},
});
export const AppStateProvider = ({ children }: { children?: ReactNode }) => {
const [state, setState] = useState({
user: null,
- workspaces: [],
+ workspacesMeta: [],
});
useEffect(() => {
diff --git a/packages/app/src/ui/button/styles.ts b/packages/app/src/ui/button/styles.ts
index efa6d2edda..106826804b 100644
--- a/packages/app/src/ui/button/styles.ts
+++ b/packages/app/src/ui/button/styles.ts
@@ -44,7 +44,7 @@ export const StyledIconButton = styled('button', {
color: theme.colors.iconColor,
...displayInlineFlex('center', 'center'),
position: 'relative',
- ...(disabled ? { cursor: 'not-allowed' } : {}),
+ ...(disabled ? { cursor: 'not-allowed', pointerEvents: 'none' } : {}),
transition: 'background .15s',
// TODO: we need to add @emotion/babel-plugin
@@ -123,7 +123,7 @@ export const StyledTextButton = styled('button', {
paddingRight: padding,
...displayInlineFlex('flex-start', 'center'),
position: 'relative',
- ...(disabled ? { cursor: 'not-allowed' } : {}),
+ ...(disabled ? { cursor: 'not-allowed', pointerEvents: 'none' } : {}),
transition: 'background .15s',
// TODO: Implement circle shape
borderRadius: shape === 'default' ? borderRadius : height / 2,
@@ -180,7 +180,11 @@ export const StyledButton = styled('button', {
position: 'relative',
// TODO: disabled color is not decided
...(disabled
- ? { cursor: 'not-allowed', color: theme.colors.borderColor }
+ ? {
+ cursor: 'not-allowed',
+ pointerEvents: 'none',
+ color: theme.colors.borderColor,
+ }
: {}),
transition: 'background .15s',
// TODO: Implement circle shape