From 5154a40539469c51caf9d01a1e79e9e02dd64244 Mon Sep 17 00:00:00 2001 From: Raman Yasel Date: Wed, 29 Jan 2025 13:11:38 +0300 Subject: [PATCH 1/4] chore: update sidebar styles --- .../view-preview/root-view-wrapper-store.tsx | 2 +- packages/ui/locales/en/component.json | 2 +- .../components/manage-navigation/index.tsx | 2 +- .../src/components/navbar-skeleton/group.tsx | 2 +- .../components/navbar/navbar-item/index.tsx | 32 +++++++++++-------- packages/ui/src/components/navbar/navbar.tsx | 14 ++++---- .../ui/src/views/layouts/SandboxLayout.tsx | 2 +- 7 files changed, 30 insertions(+), 26 deletions(-) diff --git a/apps/design-system/src/pages/view-preview/root-view-wrapper-store.tsx b/apps/design-system/src/pages/view-preview/root-view-wrapper-store.tsx index c9418496ab..6b55f21a57 100644 --- a/apps/design-system/src/pages/view-preview/root-view-wrapper-store.tsx +++ b/apps/design-system/src/pages/view-preview/root-view-wrapper-store.tsx @@ -271,7 +271,7 @@ export const useRootViewWrapperStore = () => { }, { groupId: 8, - title: 'Acces Control', + title: 'Access Control', type: MenuGroupTypes.SETTINGS, items: [ { diff --git a/packages/ui/locales/en/component.json b/packages/ui/locales/en/component.json index 7886bdd760..1939a03860 100644 --- a/packages/ui/locales/en/component.json +++ b/packages/ui/locales/en/component.json @@ -91,7 +91,7 @@ "overrides": "Overrides", "certificates": "Certificates", "webhooks": "Webhooks", - "access-control": "Acces Control", + "access-control": "Access Control", "users": "Users", "user-groups": "User Groups", "service-accounts": "Service Accounts", diff --git a/packages/ui/src/components/manage-navigation/index.tsx b/packages/ui/src/components/manage-navigation/index.tsx index 34fc155e8e..1b0679d350 100644 --- a/packages/ui/src/components/manage-navigation/index.tsx +++ b/packages/ui/src/components/manage-navigation/index.tsx @@ -142,7 +142,7 @@ export const ManageNavigation = ({ key={item.id} className="flex w-full grow cursor-not-allowed items-center gap-x-2.5 rounded p-1 px-3 opacity-55" > - + {item.title} ) diff --git a/packages/ui/src/components/navbar-skeleton/group.tsx b/packages/ui/src/components/navbar-skeleton/group.tsx index 6b87e3d6c8..b3f4840a93 100644 --- a/packages/ui/src/components/navbar-skeleton/group.tsx +++ b/packages/ui/src/components/navbar-skeleton/group.tsx @@ -16,7 +16,7 @@ export function Group({ children, title, topBorder, isSubMenu = false, titleClas className={cn( 'flex w-full flex-col px-5', { 'border-borders-5 border-t pt-2.5': topBorder }, - isSubMenu ? 'pb-2.5' : 'gap-1.5 pb-3', + isSubMenu ? 'pb-2.5 gap-y-0.5' : 'gap-1.5 pb-3', className )} > diff --git a/packages/ui/src/components/navbar/navbar-item/index.tsx b/packages/ui/src/components/navbar/navbar-item/index.tsx index 35ab8fcae7..6ebe8d35eb 100644 --- a/packages/ui/src/components/navbar/navbar-item/index.tsx +++ b/packages/ui/src/components/navbar/navbar-item/index.tsx @@ -9,6 +9,7 @@ import { NavbarItemType } from '../types' interface NavbarItemProps { item: NavbarItemType isRecent?: boolean + isStaticPinned?: boolean handleChangePinnedMenuItem: (item: NavbarItemType, pin: boolean) => void handleRemoveRecentMenuItem: (item: NavbarItemType) => void handleCustomNav: () => void @@ -18,6 +19,7 @@ interface NavbarItemProps { export const NavbarItem = ({ item, isRecent = false, + isStaticPinned = false, handleChangePinnedMenuItem, handleRemoveRecentMenuItem, handleCustomNav, @@ -75,20 +77,22 @@ export const NavbarItem = ({ /> )} - - - - - - {dropdownItems} - - + {!isStaticPinned && ( + + + + + + {dropdownItems} + + + )} ) } diff --git a/packages/ui/src/components/navbar/navbar.tsx b/packages/ui/src/components/navbar/navbar.tsx index 630d7587b6..188ea46a48 100644 --- a/packages/ui/src/components/navbar/navbar.tsx +++ b/packages/ui/src/components/navbar/navbar.tsx @@ -79,6 +79,7 @@ export const Navbar = ({ handleChangePinnedMenuItem={handleChangePinnedMenuItem} handleRemoveRecentMenuItem={handleRemoveRecentMenuItem} handleCustomNav={handleCustomNav} + isStaticPinned t={t} /> ))} @@ -104,6 +105,12 @@ export const Navbar = ({ )} + {!!currentUser?.admin && ( + + } /> + + )} +