Skip to content

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

Chore/fix redeem code UI (#42615)

Joshen Lim5b8ca1bb6608
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/CreditCodeRedemption.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/CreditCodeRedemption.tsx
index 968e63bf7cc..37105629fa1 100644
--- a/apps/studio/components/interfaces/Organization/BillingSettings/CreditCodeRedemption.tsx
+++ b/apps/studio/components/interfaces/Organization/BillingSettings/CreditCodeRedemption.tsx
@@ -38,7 +38,7 @@ import { useLatest } from '@/hooks/misc/useLatest'
const FORM_ID = 'credit-code-redemption'
const FormSchema = z.object({
- code: z.coerce.string(),
+ code: z.string().min(1, 'Code is required'),
})
type CreditCodeRedemptionForm = z.infer<typeof FormSchema>
@@ -78,6 +78,7 @@ export const CreditCodeRedemption = ({
resolver: zodResolver(FormSchema),
defaultValues: { code: '' },
})
+ const { isValid } = form.formState
const {
mutate: redeemCode,
@@ -224,19 +225,24 @@ export const CreditCodeRedemption = ({
</div>
)}
- <div className="mt-4 flex flex-col gap-y-4">
- <Separator />
- <div className="flex justify-center items-center gap-x-2">
- {org?.plan.id === 'free' && (
- <UpgradePlanButton plan="Pro" source="code-redeem" slug={org.slug}>
- Upgrade organization
- </UpgradePlanButton>
- )}
- <Button asChild type="default">
- <Link href={`/org/${org?.slug}`}>Go to organization</Link>
- </Button>
+ {(!router.pathname.includes('/org/') || org?.plan.id === 'free') && (
+ <div className="mt-4 flex flex-col gap-y-4">
+ <Separator />
+ <div className="flex justify-center items-center gap-x-2">
+ {org?.plan.id === 'free' && (
+ <UpgradePlanButton plan="Pro" source="code-redeem" slug={org.slug}>
+ Upgrade organization
+ </UpgradePlanButton>
+ )}
+
+ {!router.pathname.includes('/org/') && (
+ <Button asChild type="default">
+ <Link href={`/org/${org?.slug}`}>Go to organization</Link>
+ </Button>
+ )}
+ </div>
</div>
- </div>
+ )}
</div>
) : (
<>
@@ -265,7 +271,12 @@ export const CreditCodeRedemption = ({
control={form.control}
name="code"
render={({ field }) => (
- <FormItemLayout label="Code" className="gap-1" layout="horizontal">
+ <FormItemLayout
+ hideMessage
+ label="Code"
+ className="gap-1"
+ layout="horizontal"
+ >
<Input_Shadcn_
{...field}
className="uppercase w-56 ml-auto"
@@ -312,7 +323,7 @@ export const CreditCodeRedemption = ({
type="primary"
className="pointer-events-auto"
loading={redeemingCode}
- disabled={codeRedemptionDisabled}
+ disabled={codeRedemptionDisabled || !isValid}
htmlType="submit"
tooltip={{
content: {
diff --git a/apps/studio/components/interfaces/Organization/OrganizationCard.tsx b/apps/studio/components/interfaces/Organization/OrganizationCard.tsx
index 3e081c81ac3..14aff74cbf5 100644
--- a/apps/studio/components/interfaces/Organization/OrganizationCard.tsx
+++ b/apps/studio/components/interfaces/Organization/OrganizationCard.tsx
@@ -29,7 +29,7 @@ export const OrganizationCard = ({
<ActionCard
bgColor="bg border"
className={cn(
- 'flex items-center min-h-[70px] [&>div]:w-full [&>div]:items-center',
+ 'flex items-center min-h-[70px] [&>div]:w-full [&>div]:items-center max-h-min',
className
)}
icon={<Boxes size={18} strokeWidth={1} className="text-foreground" />}
diff --git a/apps/studio/pages/redeem.tsx b/apps/studio/pages/redeem.tsx
index 39156310bdf..b0bffb90ba8 100644
--- a/apps/studio/pages/redeem.tsx
+++ b/apps/studio/pages/redeem.tsx
@@ -1,6 +1,6 @@
-import { useFlag } from 'common'
+import { FeatureFlagContext, useFlag } from 'common'
import Link from 'next/link'
-import { useState } from 'react'
+import { useContext, useState } from 'react'
import { Button } from 'ui'
import { Admonition, ShimmeringLoader } from 'ui-patterns'
@@ -15,10 +15,14 @@ import {
} from '@/components/layouts/Scaffold'
import AlertError from '@/components/ui/AlertError'
import { useOrganizationsQuery } from '@/data/organizations/organizations-query'
+import { useProfile } from '@/lib/profile'
import type { NextPageWithLayout } from '@/types'
const RedeemCreditsContent = () => {
const redeemCodeEnabled = useFlag('redeemCodeEnabled')
+ const { isLoading: isLoadingProfile } = useProfile()
+ const { hasLoaded } = useContext(FeatureFlagContext)
+
const [selectedOrg, setSelectedOrg] = useState<string | null>(null)
const {
@@ -28,18 +32,6 @@ const RedeemCreditsContent = () => {
isError: isErrorOrganizations,
} = useOrganizationsQuery()
- if (isLoadingOrganizations) {
- return (
- <div className="grid md:grid-cols-2 pt-10 gap-8">
- <ShimmeringLoader className="w-full" />
- <div className="space-y-4">
- <ShimmeringLoader className="w-full h-14" />
- <ShimmeringLoader className="w-full h-14" />
- </div>
- </div>
- )
- }
-
if (isErrorOrganizations) {
return (
<AlertError
@@ -74,7 +66,13 @@ const RedeemCreditsContent = () => {
</div>
<div className="flex flex-col gap-y-2">
- {redeemCodeEnabled ? (
+ {/* [Joshen] Checking for profile as well as organizations query internally waits for profile to be loaded */}
+ {isLoadingProfile || isLoadingOrganizations || !hasLoaded ? (
+ <>
+ <ShimmeringLoader className="w-full h-[70px]" />
+ <ShimmeringLoader className="w-full h-[70px]" />
+ </>
+ ) : redeemCodeEnabled ? (
organizations?.map((org) => (
<OrganizationCard
key={org.id}