The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
chore: restore to new project entitlement (#43313)
Ignacio Dobronich7e3986df8d6a
diff --git a/apps/studio/components/interfaces/Database/Backups/RestoreToNewProject/BackupsList.tsx b/apps/studio/components/interfaces/Database/Backups/RestoreToNewProject/BackupsList.tsxindex 07265a6e2b5..b99a4c2e367 100644--- a/apps/studio/components/interfaces/Database/Backups/RestoreToNewProject/BackupsList.tsx+++ b/apps/studio/components/interfaces/Database/Backups/RestoreToNewProject/BackupsList.tsx@@ -1,6 +1,5 @@import Panel from 'components/ui/Panel'import { useCloneBackupsQuery } from 'data/projects/clone-query'-import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'import { Badge, Button } from 'ui'import { TimestampInfo } from 'ui-patterns'@@ -9,17 +8,14 @@ import { BackupsEmpty } from '../BackupsEmpty'interface BackupsListProps {onSelectRestore: (id: number) => voiddisabled?: boolean+ hasAccess?: boolean}-export const BackupsList = ({ onSelectRestore, disabled }: BackupsListProps) => {+export const BackupsList = ({ onSelectRestore, disabled, hasAccess }: BackupsListProps) => {const { data: project } = useSelectedProjectQuery()- const { data: organization } = useSelectedOrganizationQuery()-- const isFreePlan = organization?.plan?.id === 'free'-const { data: cloneBackups } = useCloneBackupsQuery({ projectRef: project?.ref },- { enabled: !isFreePlan }+ { enabled: hasAccess })return (diff --git a/apps/studio/components/interfaces/Database/Backups/RestoreToNewProject/CreateNewProjectDialog.tsx b/apps/studio/components/interfaces/Database/Backups/RestoreToNewProject/CreateNewProjectDialog.tsxindex a57a29ef738..b93a387c382 100644--- a/apps/studio/components/interfaces/Database/Backups/RestoreToNewProject/CreateNewProjectDialog.tsx+++ b/apps/studio/components/interfaces/Database/Backups/RestoreToNewProject/CreateNewProjectDialog.tsx@@ -7,7 +7,6 @@ import { z } from 'zod'import { PasswordStrengthBar } from 'components/ui/PasswordStrengthBar'import { useProjectCloneMutation } from 'data/projects/clone-mutation'import { useCloneBackupsQuery } from 'data/projects/clone-query'-import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'import { passwordStrength, PasswordStrengthScore } from 'lib/password-strength'import { generateStrongPassword } from 'lib/project'@@ -37,6 +36,7 @@ interface CreateNewProjectDialogProps {onOpenChange: (value: boolean) => voidonCloneSuccess: () => voidadditionalMonthlySpend: NewProjectPrice+ hasAccess?: boolean}export const CreateNewProjectDialog = ({@@ -46,10 +46,9 @@ export const CreateNewProjectDialog = ({onOpenChange,onCloneSuccess,additionalMonthlySpend,+ hasAccess,}: CreateNewProjectDialogProps) => {const { data: project } = useSelectedProjectQuery()- const { data: organization } = useSelectedOrganizationQuery()-const [passwordStrengthScore, setPasswordStrengthScore] = useState(0)const [passwordStrengthMessage, setPasswordStrengthMessage] = useState('')@@ -66,11 +65,9 @@ export const CreateNewProjectDialog = ({},})- const isFreePlan = organization?.plan?.id === 'free'-const { data: cloneBackups } = useCloneBackupsQuery({ projectRef: project?.ref },- { enabled: !isFreePlan }+ { enabled: hasAccess })const hasPITREnabled = cloneBackups?.pitr_enableddiff --git a/apps/studio/components/interfaces/Database/RestoreToNewProject/RestoreToNewProject.tsx b/apps/studio/components/interfaces/Database/RestoreToNewProject/RestoreToNewProject.tsxindex 8cf054582da..b73c6628a59 100644--- a/apps/studio/components/interfaces/Database/RestoreToNewProject/RestoreToNewProject.tsx+++ b/apps/studio/components/interfaces/Database/RestoreToNewProject/RestoreToNewProject.tsx@@ -18,6 +18,7 @@ import { UpgradeToPro } from 'components/ui/UpgradeToPro'import { useDiskAttributesQuery } from 'data/config/disk-attributes-query'import { useCloneBackupsQuery } from 'data/projects/clone-query'import { useCloneStatusQuery } from 'data/projects/clone-status-query'+import { useCheckEntitlements } from 'hooks/misc/useCheckEntitlements'import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'import {@@ -35,7 +36,8 @@ import { PreviousRestoreItem } from './PreviousRestoreItem'export const RestoreToNewProject = () => {const { data: project } = useSelectedProjectQuery()const { data: organization } = useSelectedOrganizationQuery()- const isFreePlan = organization?.plan?.id === 'free'+ const { hasAccess: hasAccessToRestoreToNewProject, isLoading: isLoadingEntitlement } =+ useCheckEntitlements('backup.restore_to_new_project')const isOrioleDb = useIsOrioleDb()const isAwsK8s = useIsAwsK8sCloudProvider()@@ -50,7 +52,10 @@ export const RestoreToNewProject = () => {error,isPending: cloneBackupsLoading,isError,- } = useCloneBackupsQuery({ projectRef: project?.ref }, { enabled: !isFreePlan })+ } = useCloneBackupsQuery(+ { projectRef: project?.ref },+ { enabled: hasAccessToRestoreToNewProject }+ )const isActiveHealthy = project?.status === PROJECT_STATUS.ACTIVE_HEALTHY@@ -102,7 +107,11 @@ export const RestoreToNewProject = () => {const isRestoring = previousClones?.some((c) => c.status === 'IN_PROGRESS')const restoringClone = previousClones?.find((c) => c.status === 'IN_PROGRESS')- if (isFreePlan) {+ if (isLoadingEntitlement) {+ return <GenericSkeletonLoader />+ }++ if (!hasAccessToRestoreToNewProject) {return (<UpgradeToProbuttonText="Upgrade"@@ -256,6 +265,7 @@ export const RestoreToNewProject = () => {selectedBackupId={selectedBackupId}recoveryTimeTarget={recoveryTimeTarget}additionalMonthlySpend={additionalMonthlySpend}+ hasAccess={hasAccessToRestoreToNewProject}onOpenChange={setShowNewProjectDialog}onCloneSuccess={() => {refetchCloneStatus()@@ -307,6 +317,7 @@ export const RestoreToNewProject = () => {) : (<BackupsListdisabled={isRestoring}+ hasAccess={hasAccessToRestoreToNewProject}onSelectRestore={(id) => {setSelectedBackupId(id)setShowConfirmationDialog(true)