mirror of
https://github.com/supabase/supabase.git
synced 2026-10-07 10:25:06 +03:00
## What kind of change does this PR introduce? Bug fix + small shared component ## What is the current behavior? After the recent colour system changes, several UI elements lost contrast in light mode: - `InfoIcon` with a background appeared as a flat grey circle (glyph fill matched the background) - Several buttons forced `text-white`, which no longer contrasts correctly against the updated brand fills - Selected / completed check badges were inconsistent between call sites ## What is the new behavior? - `InfoIcon` uses `text-background` for the glyph fill so the "i" is visible against the grey circle - www primary buttons drop hardcoded `text-white` and use standard `Button` colours - New shared `SuccessCheck` in `ui` for selected state and completion progress (green circle; white check in light mode, black check in dark mode) - Documented in the design system with selected + progress examples Note on `InfoIcon`: [#47933](https://github.com/supabase/supabase/pull/47933) landed a related fix using `text-background-200` (`--card`). This PR keeps `text-background` instead, to match `CheckIcon` / `EyeOffIcon` in the same file and avoid the legacy alias. | Before | After | | --- | --- | | <img width="688" height="268" alt="CleanShot 2026-07-10 at 11 30 25@2x" src="https://github.com/user-attachments/assets/c0276b0c-1023-46c8-805c-35a22def1353" /> | <img width="664" height="278" alt="CleanShot 2026-07-10 at 11 29 43@2x" src="https://github.com/user-attachments/assets/3508cf37-1b48-4fb7-a939-83522feb44f1" /> | | <img width="468" height="550" alt="CleanShot 2026-07-10 at 11 31 04@2x" src="https://github.com/user-attachments/assets/acd42273-15ce-4fb2-9d0c-5a43ac23073c" /> | <img width="460" height="540" alt="CleanShot 2026-07-10 at 11 32 50@2x" src="https://github.com/user-attachments/assets/f66fb4bc-81f7-4df1-95f5-63980c4e8537" /> | ## To test Use the staging preview link from this PR and check the following in **light mode** (and spot-check dark mode): **www** - Visit `/404` — "Head back" button should have readable text (not white-on-green) - Visit `/company` — "Join the team" button in the Team section - Visit a product page with a hero CTA (e.g. `/database`, `/realtime`) — primary "Start for free" button **studio** - Database → Replication → deploy a read replica — footer `InfoIcon` next to the pricing line should show a visible "i" inside the grey circle - `/redeem` — select an org; green `SuccessCheck` should match light/dark contrast (white check / black check) - Settings → API → service role key row — red "secret" tag text should be readable **design system** - `/docs/components/success-check` — demo, selected-state, and progress examples
248 lines
11 KiB
TypeScript
248 lines
11 KiB
TypeScript
import { SupportCategories } from '@supabase/shared-types/out/constants'
|
|
import { DatabaseUpgradeProgress, DatabaseUpgradeStatus } from '@supabase/shared-types/out/events'
|
|
import { useParams } from 'common'
|
|
import dayjs from 'dayjs'
|
|
import {
|
|
AlertCircle,
|
|
CheckCircle,
|
|
Circle,
|
|
Loader,
|
|
Maximize2,
|
|
Minimize2,
|
|
Settings,
|
|
} from 'lucide-react'
|
|
import { useSearchParams } from 'next/navigation'
|
|
import { useState } from 'react'
|
|
import { Button, SuccessCheck, Tooltip, TooltipContent, TooltipTrigger } from 'ui'
|
|
|
|
import { DATABASE_UPGRADE_MESSAGES } from './UpgradingState.constants'
|
|
import { SupportLink } from '@/components/interfaces/Support/SupportLink'
|
|
import { useProjectUpgradingStatusQuery } from '@/data/config/project-upgrade-status-query'
|
|
import { useInvalidateProjectDetailsQuery } from '@/data/projects/project-detail-query'
|
|
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
|
|
import { IS_PLATFORM } from '@/lib/constants'
|
|
|
|
export const UpgradingState = () => {
|
|
const { ref } = useParams()
|
|
const queryParams = useSearchParams()
|
|
const { data: project } = useSelectedProjectQuery()
|
|
const [loading, setLoading] = useState(false)
|
|
const [isExpanded, setIsExpanded] = useState(false)
|
|
|
|
const { invalidateProjectDetailsQuery } = useInvalidateProjectDetailsQuery()
|
|
|
|
const { data } = useProjectUpgradingStatusQuery(
|
|
{
|
|
projectRef: ref,
|
|
projectStatus: project?.status,
|
|
trackingId: queryParams?.get('trackingId'),
|
|
},
|
|
{
|
|
enabled: IS_PLATFORM,
|
|
}
|
|
)
|
|
|
|
const { initiated_at, status, progress, target_version, error } =
|
|
data?.databaseUpgradeStatus ?? {}
|
|
const progressStage = Number((progress || '').split('_')[0])
|
|
|
|
const isFailed = status === DatabaseUpgradeStatus.Failed
|
|
const isCompleted = status === DatabaseUpgradeStatus.Upgraded
|
|
|
|
const isPerformingFullPhysicalBackup =
|
|
status === DatabaseUpgradeStatus.Upgrading &&
|
|
progress === DatabaseUpgradeProgress.CompletedUpgrade
|
|
|
|
const initiatedAtUTC = dayjs.utc(initiated_at ?? 0).format('DD MMM YYYY HH:mm:ss')
|
|
const initiatedAt = dayjs
|
|
.utc(initiated_at ?? 0)
|
|
.local()
|
|
.format('DD MMM YYYY HH:mm:ss (ZZ)')
|
|
|
|
const refetchProjectDetails = async () => {
|
|
setLoading(true)
|
|
|
|
if (ref) await invalidateProjectDetailsQuery(ref)
|
|
}
|
|
|
|
const subject = 'Upgrade failed for project'
|
|
const message = `Upgrade information:\n• Initiated at: ${initiated_at}\n• Target Version: ${target_version}\n• Error: ${error}`
|
|
|
|
return (
|
|
<div className="w-full mx-auto my-16 space-y-16 max-w-7xl">
|
|
<div className="mx-6 space-y-16">
|
|
<div className="flex flex-col space-y-4 lg:flex-row lg:items-center lg:space-y-0 lg:space-x-6">
|
|
<h1 className="text-3xl">{project?.name}</h1>
|
|
</div>
|
|
<div className="w-full mx-auto mt-8 mb-16 max-w-7xl">
|
|
<div className="flex h-[500px] items-center justify-center rounded-sm border border-muted bg-surface-100 p-8">
|
|
{isCompleted ? (
|
|
<div className="grid gap-4">
|
|
<div className="relative mx-auto max-w-[300px]">
|
|
<CheckCircle className="text-brand" size={40} strokeWidth={1.5} />
|
|
</div>
|
|
<div className="space-y-2">
|
|
<p className="text-center">Upgrade completed!</p>
|
|
<p className="mt-4 text-center text-sm text-foreground-light w-[300px] mx-auto">
|
|
Your project has been successfully upgraded to Postgres {target_version} and is
|
|
now back online.
|
|
</p>
|
|
</div>
|
|
<div className="mx-auto">
|
|
<Button loading={loading} disabled={loading} onClick={refetchProjectDetails}>
|
|
Return to project
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
) : isFailed ? (
|
|
<div className="grid gap-4">
|
|
<div className="relative mx-auto max-w-[300px]">
|
|
<AlertCircle className="text-amber-900" size={40} strokeWidth={1.5} />
|
|
</div>
|
|
<div className="space-y-2">
|
|
<p className="text-center">We ran into an issue while upgrading your project</p>
|
|
<p className="mt-4 text-center text-sm text-foreground-light w-full md:w-[450px] mx-auto">
|
|
Your project is back online and its data is not affected. Please reach out to us
|
|
via our support form for assistance with the upgrade.
|
|
</p>
|
|
</div>
|
|
<div className="flex items-center mx-auto space-x-2">
|
|
<Button asChild variant="default">
|
|
<SupportLink
|
|
queryParams={{
|
|
category: SupportCategories.DATABASE_UNRESPONSIVE,
|
|
projectRef: ref,
|
|
subject,
|
|
message,
|
|
}}
|
|
>
|
|
Contact support
|
|
</SupportLink>
|
|
</Button>
|
|
<Button loading={loading} disabled={loading} onClick={refetchProjectDetails}>
|
|
Return to project
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
) : (
|
|
<div className="grid w-[480px] gap-4">
|
|
<div className="relative mx-auto max-w-[300px]">
|
|
<div className="absolute flex items-center justify-center w-full h-full">
|
|
<Settings className="animate-spin" size={20} strokeWidth={2} />
|
|
</div>
|
|
<Circle className="text-foreground-lighter" size={50} strokeWidth={1.5} />
|
|
</div>
|
|
<div className="space-y-2">
|
|
{isPerformingFullPhysicalBackup ? (
|
|
<div>
|
|
<p className="text-center">Performing a full backup</p>
|
|
<p className="text-sm text-center text-foreground-light">
|
|
Upgrade is now complete, and your project is online. A full backup is now
|
|
being performed to ensure that there is a proper base backup available
|
|
post-upgrade. This can take from a few minutes up to several hours depending
|
|
on the size of your database.
|
|
</p>
|
|
</div>
|
|
) : (
|
|
<div>
|
|
<p className="text-center">Upgrading in progress</p>
|
|
<p className="text-sm text-center text-foreground-light">
|
|
Upgrades can take from a few minutes up to several hours depending on the
|
|
size of your database. Your project will be offline while it is being
|
|
upgraded.
|
|
</p>
|
|
</div>
|
|
)}
|
|
|
|
<div
|
|
className="mt-4! mb-2! py-3 px-4 transition-all overflow-hidden border rounded-sm relative"
|
|
style={{ maxHeight: isExpanded ? '500px' : '110px' }}
|
|
>
|
|
{isExpanded ? (
|
|
<Minimize2
|
|
size={14}
|
|
strokeWidth={2}
|
|
className="absolute z-10 cursor-pointer top-3 right-3"
|
|
onClick={() => setIsExpanded(false)}
|
|
/>
|
|
) : (
|
|
<Maximize2
|
|
size={14}
|
|
strokeWidth={2}
|
|
className="absolute z-10 cursor-pointer top-3 right-3"
|
|
onClick={() => setIsExpanded(true)}
|
|
/>
|
|
)}
|
|
<div
|
|
className="space-y-2 transition-all"
|
|
style={{
|
|
translate: isExpanded
|
|
? '0px 0px'
|
|
: `0px ${
|
|
(progressStage - 2 <= 0
|
|
? 0
|
|
: progressStage > 6
|
|
? 5
|
|
: progressStage - 2) * -28
|
|
}px`,
|
|
}}
|
|
>
|
|
{DATABASE_UPGRADE_MESSAGES.map((message, idx: number) => {
|
|
const isCurrent = message.key === progress
|
|
const isCompleted = progressStage > idx
|
|
return (
|
|
<div key={message.key} className="flex items-center space-x-4">
|
|
{isCurrent ? (
|
|
<div className="flex items-center justify-center w-5 h-5 rounded-full">
|
|
<Loader
|
|
size={20}
|
|
className="animate-spin text-foreground-light"
|
|
strokeWidth={2}
|
|
/>
|
|
</div>
|
|
) : isCompleted ? (
|
|
<SuccessCheck />
|
|
) : (
|
|
<div className="flex items-center justify-center w-5 h-5 border rounded-full bg-overlay-hover" />
|
|
)}
|
|
<p
|
|
className={`text-sm ${
|
|
isCurrent
|
|
? 'text-foreground'
|
|
: isCompleted
|
|
? 'text-foreground-light'
|
|
: 'text-foreground-lighter'
|
|
} hover:text-foreground transition`}
|
|
>
|
|
{isCurrent
|
|
? message.progress
|
|
: isCompleted
|
|
? message.completed
|
|
: message.initial}
|
|
</p>
|
|
</div>
|
|
)
|
|
})}
|
|
</div>
|
|
</div>
|
|
|
|
{initiated_at !== undefined && (
|
|
<Tooltip>
|
|
<TooltipTrigger>
|
|
<p className="text-sm text-center text-foreground-light">
|
|
Started on: {initiatedAtUTC} (UTC)
|
|
</p>
|
|
</TooltipTrigger>
|
|
<TooltipContent side="bottom">{initiatedAt}</TooltipContent>
|
|
</Tooltip>
|
|
)}
|
|
</div>
|
|
</div>
|
|
)}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
)
|
|
}
|