mirror of
https://github.com/supabase/supabase.git
synced 2026-06-16 02:26:42 +08:00
## Summary Resolves [GROWTH-865](https://linear.app/supabase/issue/GROWTH-865) on the Studio side. Companion backend PR: [supabase/platform#33086](https://github.com/supabase/platform/pull/33086). Resource-exhaustion advisories (CPU, Disk IO, Memory) currently give users a list of identical-looking messages with no project context. This PR makes the affected project visible in the advisor panel and hardens the "Check consumption" deep-link. ### Changes **Advisor list view** — `AdvisorPanel.utils.ts`, `AdvisorPanel.types.ts`, `AdvisorPanel.tsx`, `AdvisorPanelBody.tsx` - `AdvisorNotificationItem` now carries `project_ref`. - `getAdvisorItemSecondaryText` accepts an optional `projectNameByRef` map and returns the resolved project name (falling back to the ref if the lookup hasn't loaded). Falls through to the existing date string for notifications without a project. - `AdvisorPanel.tsx` builds the map from `useProjectsInfiniteQuery` and threads it through `AdvisorPanelBody`. **NotificationDetail** — `NotificationDetail.tsx` - `[ref]` / `[slug]` substitution in action URLs falls back to `data.project_ref` / `data.org_slug` before the `_` literal. This fixes the universal-link bug Tim reported where "Check consumption" sometimes resolved to `/project/_/...` while `useProjectDetailQuery` was still loading. The companion backend PR updates the notification copy so the title/message also name the project. Both PRs degrade gracefully if landed independently. ## Test plan - [x] `pnpm test:studio -- AdvisorPanel.utils.test.ts` — 6/6 pass (4 new tests cover the notification branch of `getAdvisorItemSecondaryText`) - [x] `pnpm typecheck` passes for apps/studio - [x] `pnpm exec eslint components/ui/AdvisorPanel/` passes - [ ] Local Studio smoke test: open Advisor → Messages, confirm project name shows under each notification and "Check consumption" deep-links to the correct project even if the project detail query is slow <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * Advisor Panel notifications now display resolved project names when available for clearer context. * **Bug Fixes** * Notification action URLs now prefer stored project and organization refs/slugs with improved fallbacks, making action links more reliable. <!-- review_stack_entry_start --> [](https://app.coderabbit.ai/change-stack/supabase/supabase/pull/46203?utm_source=github_walkthrough&utm_medium=github&utm_campaign=change_stack) <!-- review_stack_entry_end --> <!-- end of auto-generated comment: release notes by coderabbit.ai -->
115 lines
3.9 KiB
TypeScript
115 lines
3.9 KiB
TypeScript
import { Archive, ArchiveRestoreIcon, ExternalLink } from 'lucide-react'
|
|
import Link from 'next/link'
|
|
import { Button } from 'ui'
|
|
|
|
import { Markdown } from '@/components/interfaces/Markdown'
|
|
import { Notification, NotificationData } from '@/data/notifications/notifications-v2-query'
|
|
import { useOrganizationsQuery } from '@/data/organizations/organizations-query'
|
|
import { useProjectDetailQuery } from '@/data/projects/project-detail-query'
|
|
|
|
interface NotificationDetailProps {
|
|
notification: Notification
|
|
onUpdateStatus: (id: string, status: 'archived' | 'seen') => void
|
|
}
|
|
|
|
export const NotificationDetail = ({ notification, onUpdateStatus }: NotificationDetailProps) => {
|
|
const data = notification.data as NotificationData
|
|
|
|
const { data: project } = useProjectDetailQuery({ ref: data.project_ref })
|
|
const { data: organizations } = useOrganizationsQuery()
|
|
|
|
const organization =
|
|
data.org_slug !== undefined
|
|
? organizations?.find((org) => org.slug === data.org_slug)
|
|
: project !== undefined
|
|
? organizations?.find((org) => org.id === project.organization_id)
|
|
: undefined
|
|
|
|
const onButtonAction = (type?: string) => {
|
|
// [Joshen] Implement accordingly - BE team will need to give us a heads up on this
|
|
console.log('Action', type)
|
|
}
|
|
|
|
return (
|
|
<div>
|
|
{(project !== undefined || organization !== undefined) && (
|
|
<>
|
|
<h3 className="text-sm mb-2">Context</h3>
|
|
<div className="flex items-center gap-2 flex-wrap mb-6">
|
|
{organization !== undefined && (
|
|
<Link
|
|
title={organization.name}
|
|
href={`/org/${organization.slug}/general`}
|
|
className="text-link"
|
|
>
|
|
{organization.name}
|
|
</Link>
|
|
)}
|
|
{project !== undefined && (
|
|
<Link title={project.name} href={`/project/${project.ref}`} className="text-link">
|
|
{project.name}
|
|
</Link>
|
|
)}
|
|
</div>
|
|
</>
|
|
)}
|
|
|
|
{data.message !== undefined && (
|
|
<>
|
|
<h3 className="text-sm mb-2">Message</h3>
|
|
<Markdown
|
|
className="leading-6 text-sm text-foreground-light mb-6"
|
|
content={data.message}
|
|
/>
|
|
</>
|
|
)}
|
|
|
|
<h3 className="text-sm mb-2">Actions</h3>
|
|
<div className="flex items-center gap-2">
|
|
{(data.actions ?? []).map((action, idx) => {
|
|
const key = `${notification.id}-action-${idx}`
|
|
if (action.url !== undefined) {
|
|
const url = action.url.includes('[ref]')
|
|
? action.url.replace('[ref]', project?.ref ?? data.project_ref ?? '_')
|
|
: action.url.includes('[slug]')
|
|
? action.url.replace('[slug]', organization?.slug ?? data.org_slug ?? '_')
|
|
: action.url
|
|
return (
|
|
<Button key={key} type="default" icon={<ExternalLink strokeWidth={1.5} />} asChild>
|
|
<Link href={url} target="_blank" rel="noreferrer">
|
|
{action.label}
|
|
</Link>
|
|
</Button>
|
|
)
|
|
} else if (action.action_type !== undefined) {
|
|
return (
|
|
<Button key={key} type="default" onClick={() => onButtonAction(action.action_type)}>
|
|
{action.label}
|
|
</Button>
|
|
)
|
|
} else {
|
|
return null
|
|
}
|
|
})}
|
|
{notification.status === 'archived' ? (
|
|
<Button
|
|
type="default"
|
|
icon={<ArchiveRestoreIcon size={14} strokeWidth={1.5} />}
|
|
onClick={() => onUpdateStatus(notification.id, 'seen')}
|
|
>
|
|
Unarchive
|
|
</Button>
|
|
) : (
|
|
<Button
|
|
type="default"
|
|
icon={<Archive size={14} strokeWidth={1.5} />}
|
|
onClick={() => onUpdateStatus(notification.id, 'archived')}
|
|
>
|
|
Archive
|
|
</Button>
|
|
)}
|
|
</div>
|
|
</div>
|
|
)
|
|
}
|