The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
fix: align grace-period banner copy on org usage page (#45652)
Sean Oliverb14ecb5b1ef9
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/Restriction.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/Restriction.tsxindex bea16a8cbd6..fbc8331f34e 100644--- a/apps/studio/components/interfaces/Organization/BillingSettings/Restriction.tsx+++ b/apps/studio/components/interfaces/Organization/BillingSettings/Restriction.tsx@@ -107,7 +107,7 @@ export const Restriction = () => {<AlertTitle_Shadcn_>Your grace period has started.</AlertTitle_Shadcn_><AlertDescription_Shadcn_><p className="leading-tight">- Your organization is over its quota+ Your organization went over its quota in the previous billing cycle{violationLabels && ` ${violationLabels}`}. You can continue with your projects untilyour grace period ends on{' '}<span className="text-foreground">diff --git a/apps/studio/components/interfaces/Organization/Usage/TotalUsage.tsx b/apps/studio/components/interfaces/Organization/Usage/TotalUsage.tsxindex f3f3f826af9..ee56a606675 100644--- a/apps/studio/components/interfaces/Organization/Usage/TotalUsage.tsx+++ b/apps/studio/components/interfaces/Organization/Usage/TotalUsage.tsx@@ -16,6 +16,7 @@ import {import type { OrgSubscription } from '@/data/subscriptions/types'import { useOrgUsageQuery } from '@/data/usage/org-usage-query'import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'+import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { DOCS_URL } from '@/lib/constants'export interface ComputeProps {@@ -50,6 +51,8 @@ export const TotalUsage = ({const isMobile = useBreakpoint('md')const isUsageBillingEnabled = subscription?.usage_billing_enabledconst { billingAll } = useIsFeatureEnabled(['billing:all'])+ const { data: org } = useSelectedOrganizationQuery()+ const hasActiveRestriction = Boolean(org?.restriction_status)const {data: usage,@@ -154,7 +157,7 @@ export const TotalUsage = ({{isSuccessUsage && subscription && (<div>- {showRelationToSubscription && !isOnHigherPlan && (+ {showRelationToSubscription && !isOnHigherPlan && !hasActiveRestriction && (<p className="text-sm">{!hasExceededAnyLimits ? (<span>diff --git a/apps/studio/components/interfaces/Organization/restriction.constants.tsx b/apps/studio/components/interfaces/Organization/restriction.constants.tsxindex a6b86cbaaf5..3e917be7874 100644--- a/apps/studio/components/interfaces/Organization/restriction.constants.tsx+++ b/apps/studio/components/interfaces/Organization/restriction.constants.tsx@@ -1,16 +1,22 @@+import dayjs from 'dayjs'import { type ReactNode } from 'react'+import { TimestampInfo } from 'ui-patterns'import { InlineLink } from '@/components/ui/InlineLink'export const RESTRICTION_MESSAGES = {GRACE_PERIOD: {- title: 'Organization plan has exceeded its quota',- description: (date: string, slug: string): ReactNode => (- <>- You have been given a grace period until {date}.{' '}- <InlineLink href={`/org/${slug}/usage`}>Review usage</InlineLink>- </>- ),+ title: 'Organization exceeded its quota in the previous billing cycle',+ description: (date: string, slug: string): ReactNode => {+ const label = dayjs(date).format('DD MMM, YYYY')+ return (+ <>+ You have a grace period until{' '}+ <TimestampInfo className="text-sm" utcTimestamp={date} label={label} /> to bring usage+ back under quota. <InlineLink href={`/org/${slug}/usage`}>Review usage</InlineLink>+ </>+ )+ },},GRACE_PERIOD_OVER: {title: 'Grace period is over',diff --git a/apps/studio/hooks/misc/useOrganizationRestrictions.ts b/apps/studio/hooks/misc/useOrganizationRestrictions.tsindex af1d892af20..f18c02ab265 100644--- a/apps/studio/hooks/misc/useOrganizationRestrictions.ts+++ b/apps/studio/hooks/misc/useOrganizationRestrictions.ts@@ -1,4 +1,3 @@-import dayjs from 'dayjs'import type { ReactNode } from 'react'import { useIsFeatureEnabled } from './useIsFeatureEnabled'@@ -69,7 +68,7 @@ export function useOrganizationRestrictions() {variant: 'warning',title: RESTRICTION_MESSAGES.GRACE_PERIOD.title,description: RESTRICTION_MESSAGES.GRACE_PERIOD.description(- dayjs(org?.restriction_data?.['grace_period_end']).format('DD MMM, YYYY'),+ org?.restriction_data?.['grace_period_end'] ?? '',org.slug),})