Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

Fix observability custom reports menu item (#47759)

Joshen Lim073cada53a61
diff --git a/apps/studio/components/layouts/ObservabilityLayout/ObservabilityLayout.tsx b/apps/studio/components/layouts/ObservabilityLayout/ObservabilityLayout.tsx
index 7e42e1fc2ce..82c40cc0e91 100644
--- a/apps/studio/components/layouts/ObservabilityLayout/ObservabilityLayout.tsx
+++ b/apps/studio/components/layouts/ObservabilityLayout/ObservabilityLayout.tsx
@@ -3,7 +3,7 @@ import { usePathname } from 'next/navigation'
import { PropsWithChildren, useEffect, useRef } from 'react'
import { ProjectLayout } from '../ProjectLayout'
-import ObservabilityMenu from './ObservabilityMenu'
+import { ObservabilityMenu } from './ObservabilityMenu'
import { useIndexAdvisorStatus } from '@/components/interfaces/QueryPerformance/hooks/useIsIndexAdvisorStatus'
import { BannerIndexAdvisor } from '@/components/ui/BannerStack/Banners/BannerIndexAdvisor'
import { BannerMetricsAPI } from '@/components/ui/BannerStack/Banners/BannerMetricsAPI'
diff --git a/apps/studio/components/layouts/ObservabilityLayout/ObservabilityMenu.tsx b/apps/studio/components/layouts/ObservabilityLayout/ObservabilityMenu.tsx
index 052ffd9a585..9944f8d6590 100644
--- a/apps/studio/components/layouts/ObservabilityLayout/ObservabilityMenu.tsx
+++ b/apps/studio/components/layouts/ObservabilityLayout/ObservabilityMenu.tsx
@@ -28,7 +28,7 @@ import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
import { useShortcut } from '@/state/shortcuts/useShortcut'
import type { Dashboards } from '@/types'
-const ObservabilityMenu = () => {
+export const ObservabilityMenu = () => {
const router = useRouter()
const { profile } = useProfile()
const { ref, id } = useParams()
@@ -292,5 +292,3 @@ const ObservabilityMenu = () => {
</div>
)
}
-
-export default ObservabilityMenu
diff --git a/apps/studio/components/layouts/ObservabilityLayout/ObservabilityMenuItem.tsx b/apps/studio/components/layouts/ObservabilityLayout/ObservabilityMenuItem.tsx
index 24b5db8e9dd..488db9f776d 100644
--- a/apps/studio/components/layouts/ObservabilityLayout/ObservabilityMenuItem.tsx
+++ b/apps/studio/components/layouts/ObservabilityLayout/ObservabilityMenuItem.tsx
@@ -55,16 +55,17 @@ export const ObservabilityMenuItem = ({
)
const menuItem = (
- <Menu.Item active={item.key === pageKey}>
+ <Menu.Item active={item.key === pageKey} className="pr-2.5">
<div className="flex w-full items-center justify-between gap-1">
- <span className="truncate">{item.name}</span>
+ <p className="truncate w-full">{item.name}</p>
{canUpdateCustomReport && (
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button
+ aria-label="More actions"
variant="text"
- className="px-1 opacity-50 hover:opacity-100"
+ className="px-0.5 h-[20px] opacity-50 hover:opacity-100"
icon={<MoreVertical size={12} strokeWidth={2} />}
onClick={(e) => {
e.preventDefault()
@@ -72,7 +73,7 @@ export const ObservabilityMenuItem = ({
}}
/>
</DropdownMenuTrigger>
- <DropdownMenuContent align="start" className="w-32 *:gap-x-2">
+ <DropdownMenuContent align="start" className="w-44 *:gap-x-2">
<DropdownMenuItem
onClick={(e) => {
e.preventDefault()
diff --git a/apps/studio/components/layouts/ProjectLayout/LayoutHeader/MobileMenuContent/mobileProductMenuRegistry.tsx b/apps/studio/components/layouts/ProjectLayout/LayoutHeader/MobileMenuContent/mobileProductMenuRegistry.tsx
index ea0c66d2a36..df8fbf9ebd5 100644
--- a/apps/studio/components/layouts/ProjectLayout/LayoutHeader/MobileMenuContent/mobileProductMenuRegistry.tsx
+++ b/apps/studio/components/layouts/ProjectLayout/LayoutHeader/MobileMenuContent/mobileProductMenuRegistry.tsx
@@ -49,7 +49,7 @@ export const MOBILE_PRODUCT_MENU_REGISTRY: Record<string, ComponentType | null>
),
observability: React.lazy(() =>
import('@/components/layouts/ObservabilityLayout/ObservabilityMenu').then((m) => ({
- default: m.default,
+ default: m.ObservabilityMenu,
}))
),
logs: React.lazy(() =>
diff --git a/packages/ui/src/components/Menu/Menu.tsx b/packages/ui/src/components/Menu/Menu.tsx
index 87d67edf655..9a6066f3941 100644
--- a/packages/ui/src/components/Menu/Menu.tsx
+++ b/packages/ui/src/components/Menu/Menu.tsx
@@ -40,6 +40,7 @@ interface ItemProps {
doNotCloseOverlay?: boolean
showActiveBar?: boolean
style?: React.CSSProperties
+ className?: string
}
export const menuItemVariants = cva(
@@ -91,13 +92,13 @@ export const menuItemVariants = cva(
}
)
-export function Item({ children, icon, active, onClick, style }: ItemProps) {
+export function Item({ children, icon, active, onClick, style, className }: ItemProps) {
const { type } = useMenuContext()
return (
<li
role="menuitem"
- className={cn('outline-hidden', menuItemVariants({ type, active }))}
+ className={cn('outline-hidden', menuItemVariants({ type, active }), className)}
style={style}
onClick={onClick}
aria-current={active ? 'page' : undefined}
@@ -112,14 +113,14 @@ export function Item({ children, icon, active, onClick, style }: ItemProps) {
{icon}
</div>
)}
- <span
- className={cn('transition truncate text-sm', {
+ <div
+ className={cn('transition truncate text-sm w-full', {
'text-foreground-light group-hover:text-foreground': !active,
'text-foreground font-semibold': active,
})}
>
{children}
- </span>
+ </div>
</li>
)
}