From 6bb284f8e543bcc78e43f5777ceebbeb7d1f66b4 Mon Sep 17 00:00:00 2001 From: Waleed Latif Date: Mon, 23 Mar 2026 08:49:36 -0700 Subject: [PATCH 1/4] feat(sidebar): add right-click context menu to settings nav item --- .../w/components/sidebar/sidebar.tsx | 47 ++++++++++++------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx index 2fe2a5e27b3..c7861dae902 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx @@ -199,27 +199,40 @@ const SidebarNavItem = memo(function SidebarNavItem({ 'group flex h-[30px] items-center gap-[8px] rounded-[8px] mx-[2px] px-[8px] text-[14px] hover:bg-[var(--surface-active)]' const activeClasses = active ? 'bg-[var(--surface-active)]' : '' - const element = item.onClick ? ( - - ) : ( + + ) + + const element = item.href ? ( { + e.preventDefault() + item.onClick!() + } + : undefined + } onContextMenu={onContextMenu ? (e) => onContextMenu(e, item.href!) : undefined} > - - {item.label} + {content} - ) + ) : item.onClick ? ( + + ) : null return ( @@ -263,7 +276,7 @@ export const Sidebar = memo(function Sidebar() { const { data: sessionData, isPending: sessionLoading } = useSession() const { canEdit } = useUserPermissionsContext() const { config: permissionConfig, filterBlocks } = usePermissionConfig() - const { navigateToSettings } = useSettingsNavigation() + const { navigateToSettings, getSettingsHref } = useSettingsNavigation() const initializeSearchData = useSearchModalStore((state) => state.initializeData) useEffect(() => { @@ -592,6 +605,7 @@ export const Sidebar = memo(function Sidebar() { id: 'settings', label: 'Settings', icon: Settings, + href: getSettingsHref(), onClick: () => { if (!isCollapsed) { setSidebarWidth(SIDEBAR_WIDTH.MIN) @@ -600,7 +614,7 @@ export const Sidebar = memo(function Sidebar() { }, }, ], - [workspaceId, navigateToSettings, isCollapsed, setSidebarWidth] + [workspaceId, navigateToSettings, getSettingsHref, isCollapsed, setSidebarWidth] ) const { data: fetchedTasks = [], isLoading: tasksLoading } = useTasks(workspaceId) @@ -1379,8 +1393,9 @@ export const Sidebar = memo(function Sidebar() { ))} From f823fbb6bca5252326669ae1e04338f1d16436b1 Mon Sep 17 00:00:00 2001 From: Waleed Latif Date: Mon, 23 Mar 2026 08:53:16 -0700 Subject: [PATCH 2/4] fix(sidebar): revert settings active highlight --- .../workspace/[workspaceId]/w/components/sidebar/sidebar.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx index c7861dae902..8e97c82ff85 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx @@ -1393,7 +1393,7 @@ export const Sidebar = memo(function Sidebar() { From 642b54f1999c851a2e0a002dce7778b7b87c571d Mon Sep 17 00:00:00 2001 From: Waleed Latif Date: Mon, 23 Mar 2026 08:55:50 -0700 Subject: [PATCH 3/4] fix(sidebar): allow modifier-key clicks to open in new tab, make InfisicalIcon black --- .../workspace/[workspaceId]/w/components/sidebar/sidebar.tsx | 1 + apps/sim/components/icons.tsx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx index 8e97c82ff85..8e4a7a2c654 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx @@ -214,6 +214,7 @@ const SidebarNavItem = memo(function SidebarNavItem({ onClick={ item.onClick ? (e) => { + if (e.ctrlKey || e.metaKey || e.shiftKey) return e.preventDefault() item.onClick!() } diff --git a/apps/sim/components/icons.tsx b/apps/sim/components/icons.tsx index 19f650044c3..ca2a9b16353 100644 --- a/apps/sim/components/icons.tsx +++ b/apps/sim/components/icons.tsx @@ -4143,7 +4143,7 @@ export function InfisicalIcon(props: SVGProps) { ) From 92bf62a0ad797f306725751107415dbf60b863d5 Mon Sep 17 00:00:00 2001 From: Waleed Latif Date: Mon, 23 Mar 2026 08:57:02 -0700 Subject: [PATCH 4/4] update icons --- apps/docs/components/icons.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/docs/components/icons.tsx b/apps/docs/components/icons.tsx index 19f650044c3..ca2a9b16353 100644 --- a/apps/docs/components/icons.tsx +++ b/apps/docs/components/icons.tsx @@ -4143,7 +4143,7 @@ export function InfisicalIcon(props: SVGProps) { )