Skip to content

The complete open source platform to run your entire marketplace. Storefront, vendor panel, admin console, and integrations in one enterprise-grade platform you own.

fix(dashboard): match main sidebar nav groups to the settings sidebar (#1629)

Viktor Holik4cc08a74ee67
diff --git a/packages/admin/src/components/layout/main-layout/main-layout.tsx b/packages/admin/src/components/layout/main-layout/main-layout.tsx
index a089de454..60c903ae4 100644
--- a/packages/admin/src/components/layout/main-layout/main-layout.tsx
+++ b/packages/admin/src/components/layout/main-layout/main-layout.tsx
@@ -6,15 +6,24 @@ import {
CurrencyDollar,
EllipsisHorizontal,
MagnifyingGlass,
+ MinusMini,
OpenRectArrowOut,
ReceiptPercent,
ShoppingCart,
Tag,
Users,
} from "@medusajs/icons";
-import { Avatar, Divider, DropdownMenu, Text, clx } from "@medusajs/ui";
-
-import { useMemo } from "react";
+import {
+ Avatar,
+ Divider,
+ DropdownMenu,
+ IconButton,
+ Text,
+ clx,
+} from "@medusajs/ui";
+
+import { Fragment, useMemo } from "react";
+import { Collapsible as RadixCollapsible } from "radix-ui";
import { useTranslation } from "react-i18next";
import { Link, useLocation, useNavigate } from "react-router-dom";
@@ -190,10 +199,15 @@ const MainSidebar = () => {
{ungrouped.map((route) => (
<NavItem key={route.to} {...route} />
))}
- {groups.map((group) => (
- <SidebarGroup key={group.id} group={group} />
- ))}
</nav>
+ {groups.map((group) => (
+ <Fragment key={group.id}>
+ <div className="px-3">
+ <Divider variant="dashed" />
+ </div>
+ <SidebarGroup group={group} />
+ </Fragment>
+ ))}
</div>
<UtilitySection />
</div>
@@ -212,26 +226,43 @@ const SidebarGroup = ({ group }: { group: NavItemGroup<SidebarRoute> }) => {
const { t } = useTranslation(group.translationNs);
return (
- <div
- className="flex flex-col gap-y-1 pt-2"
+ <RadixCollapsible.Root
+ defaultOpen
+ className="py-3"
data-testid={`sidebar-group-${group.id}`}
>
<div className="px-3">
<div
className={clx(
- "flex h-7 items-center overflow-hidden whitespace-nowrap px-2 text-ui-fg-muted",
+ "flex h-7 items-center justify-between overflow-hidden whitespace-nowrap px-2 text-ui-fg-muted",
SIDEBAR_RAIL_FADE,
)}
>
<Text size="small" leading="compact">
{group.translationNs ? t(group.label) : group.label}
</Text>
+ <RadixCollapsible.Trigger asChild>
+ <IconButton
+ size="2xsmall"
+ variant="transparent"
+ className="static"
+ data-testid={`sidebar-group-${group.id}-toggle`}
+ >
+ <MinusMini className="text-ui-fg-muted" />
+ </IconButton>
+ </RadixCollapsible.Trigger>
</div>
</div>
- {group.items.map((route) => (
- <NavItem key={route.to} {...route} />
- ))}
- </div>
+ <RadixCollapsible.Content>
+ <div className="pt-0.5">
+ <nav className="flex flex-col gap-y-1">
+ {group.items.map((route) => (
+ <NavItem key={route.to} {...route} />
+ ))}
+ </nav>
+ </div>
+ </RadixCollapsible.Content>
+ </RadixCollapsible.Root>
);
};
diff --git a/packages/vendor/src/components/layout/main-layout/main-layout.tsx b/packages/vendor/src/components/layout/main-layout/main-layout.tsx
index c122d08ad..022afe384 100644
--- a/packages/vendor/src/components/layout/main-layout/main-layout.tsx
+++ b/packages/vendor/src/components/layout/main-layout/main-layout.tsx
@@ -5,6 +5,7 @@ import {
CreditCardRefresh,
EllipsisHorizontal,
MagnifyingGlass,
+ MinusMini,
Plus,
ReceiptPercent,
ShoppingCart,
@@ -12,8 +13,16 @@ import {
Tag,
Users,
} from "@medusajs/icons";
-import { Avatar, Divider, DropdownMenu, Text, clx } from "@medusajs/ui";
-import { useMemo } from "react";
+import {
+ Avatar,
+ Divider,
+ DropdownMenu,
+ IconButton,
+ Text,
+ clx,
+} from "@medusajs/ui";
+import { Fragment, useMemo } from "react";
+import { Collapsible as RadixCollapsible } from "radix-ui";
import { useTranslation } from "react-i18next";
import { Skeleton } from "../../common/skeleton";
@@ -182,10 +191,15 @@ const MainSidebar = () => {
{ungrouped.map((route) => (
<NavItem key={route.to} {...route} />
))}
- {groups.map((group) => (
- <SidebarGroup key={group.id} group={group} />
- ))}
</nav>
+ {groups.map((group) => (
+ <Fragment key={group.id}>
+ <div className="px-3">
+ <Divider variant="dashed" />
+ </div>
+ <SidebarGroup group={group} />
+ </Fragment>
+ ))}
</div>
<UtilitySection />
</div>
@@ -202,26 +216,43 @@ const SidebarGroup = ({ group }: { group: NavItemGroup<SidebarRoute> }) => {
const { t } = useTranslation(group.translationNs);
return (
- <div
- className="flex flex-col gap-y-1 pt-2"
+ <RadixCollapsible.Root
+ defaultOpen
+ className="py-3"
data-testid={`sidebar-group-${group.id}`}
>
<div className="px-3">
<div
className={clx(
- "flex h-7 items-center overflow-hidden whitespace-nowrap px-2 text-ui-fg-muted",
+ "flex h-7 items-center justify-between overflow-hidden whitespace-nowrap px-2 text-ui-fg-muted",
SIDEBAR_RAIL_FADE,
)}
>
<Text size="small" leading="compact">
{group.translationNs ? t(group.label) : group.label}
</Text>
+ <RadixCollapsible.Trigger asChild>
+ <IconButton
+ size="2xsmall"
+ variant="transparent"
+ className="static"
+ data-testid={`sidebar-group-${group.id}-toggle`}
+ >
+ <MinusMini className="text-ui-fg-muted" />
+ </IconButton>
+ </RadixCollapsible.Trigger>
</div>
</div>
- {group.items.map((route) => (
- <NavItem key={route.to} {...route} />
- ))}
- </div>
+ <RadixCollapsible.Content>
+ <div className="pt-0.5">
+ <nav className="flex flex-col gap-y-1">
+ {group.items.map((route) => (
+ <NavItem key={route.to} {...route} />
+ ))}
+ </nav>
+ </div>
+ </RadixCollapsible.Content>
+ </RadixCollapsible.Root>
);
};