Skip to content

Commit

Permalink
feat(web-ui): use drawer to show organization list menu on mobile (#922)
Browse files Browse the repository at this point in the history
* fix(web-ui): small styling fixes for guard pages

* feat(web-ui): use drawer to show organization list on mobile

---------

Co-authored-by: Johan Book <{ID}+{username}@users.noreply.github.com>
  • Loading branch information
johanbook and Johan Book committed Jul 22, 2024
1 parent 2f18586 commit 8230773
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
import { ReactElement } from "react";
import { ReactElement, useState } from "react";

import { ErrorOutline } from "@mui/icons-material";
import {
Avatar,
Box,
ButtonBase,
CircularProgress,
Divider,
Drawer,
MenuItem,
Skeleton,
Typography,
} from "@mui/material";

import { OrganizationDetails, SwitchOrganizationCommand } from "src/api";
Expand All @@ -21,6 +25,7 @@ import {
useQueryClient,
} from "src/core/query";
import { useSnackbar } from "src/core/snackbar";
import { useIsMobile } from "src/hooks/useIsMobile";

interface MenuContentProps {
currentOrganizationId: number;
Expand Down Expand Up @@ -64,22 +69,42 @@ function MenuContent({ currentOrganizationId }: MenuContentProps) {
);
}

const filteredOrganizations = query.data.filter(
(organization) => organization.id !== currentOrganizationId
);

return (
<>
{query.data.map((organization) => (
{filteredOrganizations.map((organization) => (
<MenuItem
sx={{ maxWidth: "65vw" }}
key={organization.id}
onClick={() => handleClick(organization)}
selected={organization.id === currentOrganizationId}
>
{organization.name}
<Avatar sx={{ height: 30, width: 30, mr: 2 }}>
{organization.name[0]}
</Avatar>
<Typography
sx={{
overflow: "hidden",
textOverflow: "ellipsis",
whiteSpace: "nowrap",
}}
>
{organization.name}
</Typography>
</MenuItem>
))}
</>
);
}

export function CurrentOrganizationAvatar(): ReactElement {
const isMobile = useIsMobile();

const [drawerIsOpen, setIsDrawerOpen] = useState(false);

const query = useQuery({
queryKey: [CacheKeysConstants.CurrentOrganization],
queryFn: () => organizationsApi.getCurrentOrganization(),
Expand All @@ -93,6 +118,46 @@ export function CurrentOrganizationAvatar(): ReactElement {
return <ErrorOutline color="error" sx={{ height: 30, width: 30 }} />;
}

if (isMobile) {
return (
<>
<ButtonBase onClick={() => setIsDrawerOpen(true)}>
<Avatar sx={{ height: 30, width: 30 }}>{query.data.name[0]}</Avatar>
</ButtonBase>

<Drawer
onClose={() => setIsDrawerOpen(false)}
open={drawerIsOpen}
sx={{ zIndex: (theme) => theme.zIndex.drawer + 2 }}
>
<Box
sx={{
display: "flex",
alignItems: "center",
p: 2,
gap: 2,
width: "65vw",
}}
>
<Avatar sx={{ height: 30, width: 30 }}>{query.data.name[0]}</Avatar>
<Typography
sx={{
overflow: "hidden",
textOverflow: "ellipsis",
whiteSpace: "nowrap",
}}
variant="h6"
>
{query.data.name}
</Typography>
</Box>
<Divider sx={{ mb: 1 }} />
<MenuContent currentOrganizationId={query.data.id} />
</Drawer>
</>
);
}

return (
<Menu
anchorOrigin={{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ export interface AuthenticationGuardNavProps {
export function AuthenticationGuardNav({
children,
}: AuthenticationGuardNavProps): React.ReactElement {
return <Box sx={{ height: "100vh" }}>{children}</Box>;
return <Box sx={{ height: "100vh", px: 3 }}>{children}</Box>;
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ interface ProfileGuardNavProps {
export function ProfileGuardNav({
children,
}: ProfileGuardNavProps): React.ReactElement {
return <Box sx={{ height: "100vh" }}>{children}</Box>;
return <Box sx={{ height: "100vh", px: 3 }}>{children}</Box>;
}

0 comments on commit 8230773

Please sign in to comment.