mirror of
https://github.com/supabase/supabase.git
synced 2026-10-05 17:35:10 +03:00
## What kind of change does this PR introduce? Bug fix and design-system update. Resolves DEPR-316. Follow-up rename (`text-brand` → `text-primary`) is in a dedicated PR (https://github.com/supabase/supabase/pull/50564) stacked on this one. ## What is the current behavior? `text-brand` resolves to the canonical bright brand green in places that need readable text, which fails WCAG AA on light surfaces. A separate `text-brand-display` token adds another green for large type. ## What is the new behavior? - `text-brand` maps to accessible `--primary` (light mode darkened to meet ~4.5:1 AA) - `--hue` / `--primary-hue` aligned to 157.5 - `text-brand-display` removed; former display callsites use `text-brand` - Bright fills/borders stay on `brand-default` - Design-system colour and typography docs updated | Before | After | | --- | --- | | <img width="514" height="112" alt="CleanShot 2026-09-02 at 11 13 09@2x" src="https://github.com/user-attachments/assets/4e0138a9-a32d-4e4c-a426-90736706e1e7" /> | <img width="512" height="138" alt="CleanShot 2026-09-21 at 11 42 05@2x" src="https://github.com/user-attachments/assets/164cc5b1-a0c5-4e93-95f1-80016641a114" /> | | <img width="864" height="266" alt="CleanShot 2026-09-02 at 11 13 53@2x" src="https://github.com/user-attachments/assets/3c1ca53f-bf9e-431e-bc15-816b4a275b8e" /> | <img width="882" height="248" alt="CleanShot 2026-09-21 at 11 41 37@2x" src="https://github.com/user-attachments/assets/24828e7b-ed6b-44cb-b9dc-becc3398bdfc" /> | | <img width="782" height="692" alt="CleanShot 2026-09-02 at 11 16 30@2x" src="https://github.com/user-attachments/assets/fc871977-77bc-47fb-9e0e-9284e0ecd5cc" /> | <img width="730" height="690" alt="CleanShot 2026-09-21 at 11 42 52@2x" src="https://github.com/user-attachments/assets/bf479515-d5f9-471e-b82d-f097c0f4b56c" /> | | <img width="480" height="306" alt="CleanShot 2026-09-02 at 11 18 53@2x" src="https://github.com/user-attachments/assets/03f341f4-f02e-44f8-a2b2-8c31670d0427" /> | <img width="470" height="300" alt="CleanShot 2026-09-21 at 11 43 19@2x" src="https://github.com/user-attachments/assets/9df18217-d5e6-48b8-ba0b-579d2664b94b" /> | | <img width="960" height="300" alt="CleanShot 2026-09-02 at 11 32 04@2x" src="https://github.com/user-attachments/assets/6b1d9373-7a71-4247-81ff-26441604b09d" /> | <img width="980" height="306" alt="CleanShot 2026-09-21 at 11 44 13@2x" src="https://github.com/user-attachments/assets/41ad4784-02ec-4b29-b860-32af9fa79aa8" /> | | <img width="924" height="214" alt="CleanShot 2026-09-02 at 11 34 44@2x" src="https://github.com/user-attachments/assets/1de661fe-c7b6-499b-a94f-e4737436ec79" /> | <img width="752" height="162" alt="CleanShot 2026-09-21 at 11 44 56@2x" src="https://github.com/user-attachments/assets/1811890f-0660-4445-84e9-447720954fa1" /> | ## To test Test each callsite **in light mode** (dark mode is largely unchanged). ### WWW - [Homepage](https://zone-www-dot-com-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/): “Scale to millions” uses readable brand text (display token is gone) - [Careers](https://zone-www-dot-com-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/careers): small “Careers” eyebrow readable; green dividers stay bright `brand-default` - [Contact](https://zone-www-dot-com-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/contact-us): email / policy links use readable brand text - [Regions](https://zone-www-dot-com-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/regions): “Ask about early access to BYOC” readable ### Docs - [Docs homepage](https://docs-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/docs): “DOCS” wordmark and resource links readable - [Database overview](https://docs-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/docs/guides/database/overview): nav / footer brand links readable - [JavaScript reference](https://docs-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/docs/reference/javascript/introduction): active sidebar treatment readable ### Design system - [Typography](https://design-system-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/docs/typography): documents `text-brand` only (no display) - [Colour usage](https://design-system-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/docs/color-usage): `text-brand` vs `bg-brand-default` - [Design-system homepage](https://design-system-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/): brand text examples across themes ### Studio - [Auth providers](https://studio-staging-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/dashboard/project/_/auth/providers): enabled provider badge text readable; status dot stays bright - [Database policies](https://studio-staging-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/dashboard/project/_/database/policies?new=true): template hover text more legible - [Database connections](https://studio-staging-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/dashboard/project/_/observability/connections): “Live” status readable; animated dot stays bright green --------- Co-authored-by: Joshen Lim <joshenlimek@gmail.com>
209 lines
7.5 KiB
TypeScript
209 lines
7.5 KiB
TypeScript
import Link from 'next/link'
|
|
import { useState } from 'react'
|
|
import { Button, cn, HoverCard, HoverCardContent, HoverCardTrigger, Separator } from 'ui'
|
|
import { ComputeBadge } from 'ui-patterns/ComputeBadge'
|
|
import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'
|
|
|
|
import { getAvailableComputeOptions } from '@/components/interfaces/DiskManagement/DiskManagement.utils'
|
|
import { getInfrastructurePath } from '@/components/interfaces/Settings/Infrastructure/Infrastructure.utils'
|
|
import { ProjectDetail } from '@/data/projects/project-detail-query'
|
|
import { useOrgSubscriptionQuery } from '@/data/subscriptions/org-subscription-query'
|
|
import { useProjectAddonsQuery } from '@/data/subscriptions/project-addons-query'
|
|
import { ResourceWarning } from '@/data/usage/resource-warnings-query'
|
|
import { getComputeCpuLabel } from '@/lib/compute-labels'
|
|
import { useTrack } from '@/lib/telemetry/track'
|
|
|
|
export const ChevronsUpAnimated = () => (
|
|
<svg
|
|
width={10}
|
|
height={10}
|
|
viewBox="0 0 24 24"
|
|
fill="none"
|
|
stroke="currentColor"
|
|
strokeWidth="2.5"
|
|
strokeLinecap="round"
|
|
strokeLinejoin="round"
|
|
>
|
|
<polyline
|
|
points="17 18 12 13 7 18"
|
|
className="animate-chevron-up"
|
|
style={{ animationDelay: '0s' }}
|
|
/>
|
|
<polyline
|
|
points="17 11 12 6 7 11"
|
|
className="animate-chevron-up"
|
|
style={{ animationDelay: '0.3s' }}
|
|
/>
|
|
</svg>
|
|
)
|
|
|
|
const Row = ({ label, stat }: { label: string; stat: React.ReactNode | string }) => {
|
|
return (
|
|
<div className="flex flex-row gap-2">
|
|
<span className="text-sm text-foreground-light w-16">{label}</span>
|
|
<span className="text-sm">{stat}</span>
|
|
</div>
|
|
)
|
|
}
|
|
|
|
interface ComputeBadgeWrapperProps {
|
|
slug?: string
|
|
projectRef?: string
|
|
cloudProvider?: string
|
|
computeSize?: ProjectDetail['infra_compute_size']
|
|
resourceWarnings?: ResourceWarning
|
|
badgeClassName?: string
|
|
}
|
|
|
|
export const ComputeBadgeWrapper = ({
|
|
slug,
|
|
projectRef,
|
|
cloudProvider,
|
|
computeSize,
|
|
resourceWarnings,
|
|
badgeClassName,
|
|
}: ComputeBadgeWrapperProps) => {
|
|
// handles the state of the hover card
|
|
// once open it will fetch the addons
|
|
const [open, setOpenState] = useState(false)
|
|
|
|
// fetches addons
|
|
const { data: addons, isPending: isLoadingAddons } = useProjectAddonsQuery(
|
|
{ projectRef },
|
|
{ enabled: open }
|
|
)
|
|
|
|
// Derive cores/memory from the same source as the badge (infra_compute_size) by looking up
|
|
// the matching variant in available_addons. Sourcing from selected_addons can drift out of
|
|
// sync with infra_compute_size and produce a card that contradicts its own badge.
|
|
const computeOptions = getAvailableComputeOptions(addons?.available_addons ?? [], cloudProvider)
|
|
const meta = computeOptions.find((variant) => variant.identifier === `ci_${computeSize}`)?.meta
|
|
|
|
const highestComputeAvailable = computeOptions[computeOptions.length - 1]?.identifier
|
|
const isHighestCompute = computeSize === highestComputeAvailable?.replace('ci_', '')
|
|
|
|
const { data, isPending: isLoadingSubscriptions } = useOrgSubscriptionQuery(
|
|
{ orgSlug: slug },
|
|
{ enabled: open }
|
|
)
|
|
|
|
const isEligibleForFreeUpgrade = data?.plan.id !== 'free' && computeSize === 'nano'
|
|
const isComputeNearExhaustion =
|
|
!!resourceWarnings?.cpu_exhaustion ||
|
|
!!resourceWarnings?.memory_and_swap_exhaustion ||
|
|
!!resourceWarnings?.disk_space_exhaustion ||
|
|
!!resourceWarnings?.disk_io_exhaustion
|
|
const showUpgradeGlow = isEligibleForFreeUpgrade && isComputeNearExhaustion
|
|
|
|
const track = useTrack()
|
|
|
|
const isLoading = isLoadingAddons || isLoadingSubscriptions
|
|
|
|
if (!computeSize) return null
|
|
|
|
return (
|
|
<HoverCard onOpenChange={() => setOpenState(!open)} openDelay={280}>
|
|
<HoverCardTrigger asChild className="group" onClick={(e) => e.stopPropagation()}>
|
|
<div className={cn('flex items-center', showUpgradeGlow && 'animate-badge-pulse')}>
|
|
<div
|
|
className={cn(
|
|
'flex',
|
|
showUpgradeGlow && 'relative inline-flex overflow-hidden rounded-sm'
|
|
)}
|
|
>
|
|
<ComputeBadge
|
|
infraComputeSize={computeSize}
|
|
icon={showUpgradeGlow && <ChevronsUpAnimated />}
|
|
className={cn(
|
|
showUpgradeGlow && 'text-brand-600 border-brand-500 bg-brand-default/10 gap-1',
|
|
badgeClassName
|
|
)}
|
|
/>
|
|
{showUpgradeGlow && (
|
|
<span className="animate-badge-shimmer pointer-events-none absolute inset-0 bg-linear-to-br from-transparent via-brand-default/20 to-transparent blur-md" />
|
|
)}
|
|
</div>
|
|
</div>
|
|
</HoverCardTrigger>
|
|
<HoverCardContent
|
|
side="bottom"
|
|
align="start"
|
|
className="p-0 overflow-hidden w-96"
|
|
onClick={(e) => e.stopPropagation()}
|
|
>
|
|
<div className="p-2 px-5 text-xs text-foreground-lighter">Compute size</div>
|
|
<Separator />
|
|
<div className="p-3 px-5 flex flex-row gap-4">
|
|
<div>
|
|
<ComputeBadge infraComputeSize={computeSize} />
|
|
</div>
|
|
<div className="flex flex-col gap-4">
|
|
{isLoading ? (
|
|
<>
|
|
<div className="flex flex-col gap-1">
|
|
<ShimmeringLoader className="h-[20px] py-0 w-32" />
|
|
<ShimmeringLoader className="h-[20px] py-0 w-32" />
|
|
</div>
|
|
</>
|
|
) : (
|
|
<>
|
|
<div className="flex flex-col gap-1">
|
|
{computeSize === 'nano' ? (
|
|
<>
|
|
<Row label="CPU" stat="Shared compute" />
|
|
<Row label="Memory" stat="Up to 0.5 GB" />
|
|
</>
|
|
) : meta !== undefined ? (
|
|
<>
|
|
<Row
|
|
label="CPU"
|
|
stat={getComputeCpuLabel(computeSize ?? '', meta.cpu_cores)}
|
|
/>
|
|
<Row label="Memory" stat={`${meta.memory_gb ?? '-'} GB`} />
|
|
</>
|
|
) : null}
|
|
</div>
|
|
</>
|
|
)}
|
|
</div>
|
|
</div>
|
|
{(!isHighestCompute || isEligibleForFreeUpgrade) && (
|
|
<>
|
|
<Separator />
|
|
<div className="p-3 px-5 text-sm flex flex-col gap-2 bg-studio">
|
|
<div className="flex flex-col gap-0">
|
|
<p className="text-foreground">
|
|
{isEligibleForFreeUpgrade
|
|
? 'Free upgrade to Micro available'
|
|
: 'Unlock more compute'}
|
|
</p>
|
|
<p className="text-foreground-light">
|
|
{isEligibleForFreeUpgrade
|
|
? 'Paid plans include a free upgrade to Micro compute.'
|
|
: 'Scale your project up to 64 vCPUs and 256 GB RAM.'}
|
|
</p>
|
|
</div>
|
|
<div>
|
|
<Button
|
|
asChild
|
|
onClick={() => {
|
|
track('compute_badge_upgrade_clicked', {
|
|
computeSize: computeSize ?? 'unknown',
|
|
planId: data?.plan.id ?? 'unknown',
|
|
upgradeType: isEligibleForFreeUpgrade
|
|
? 'free_micro_upgrade'
|
|
: 'compute_upgrade',
|
|
})
|
|
}}
|
|
>
|
|
<Link href={getInfrastructurePath(projectRef)}>Upgrade compute</Link>
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
</>
|
|
)}
|
|
</HoverCardContent>
|
|
</HoverCard>
|
|
)
|
|
}
|