Skip to content

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

fix: Dont fetch databases and migrations for coming up projects (#44383)

Kamil Ogórekd80d064ef993
diff --git a/apps/studio/components/interfaces/ProjectHome/ActivityStats.tsx b/apps/studio/components/interfaces/ProjectHome/ActivityStats.tsx
index 4970b6440de..59fb7186fbc 100644
--- a/apps/studio/components/interfaces/ProjectHome/ActivityStats.tsx
+++ b/apps/studio/components/interfaces/ProjectHome/ActivityStats.tsx
@@ -39,6 +39,7 @@ export const ActivityStats = () => {
const { data: migrationsData = EMPTY_ARR, isPending: isLoadingMigrations } = useMigrationsQuery({
projectRef: project?.ref,
+ projectStatus: project?.status,
connectionString: project?.connectionString,
})
const latestMigration = useMemo<DatabaseMigration | undefined>(
@@ -50,6 +51,7 @@ export const ActivityStats = () => {
const { data: backupsData, isPending: isLoadingBackups } = useBackupsQuery({
projectRef: project?.ref,
+ projectStatus: project?.status,
})
const latestBackup = useMemo(() => {
const list = backupsData?.backups ?? []
diff --git a/apps/studio/data/database/backups-query.ts b/apps/studio/data/database/backups-query.ts
index f9fd0abf8ca..1f9ba0274ea 100644
--- a/apps/studio/data/database/backups-query.ts
+++ b/apps/studio/data/database/backups-query.ts
@@ -5,9 +5,11 @@ import { useIsOrioleDbInAws } from 'hooks/misc/useSelectedProject'
import type { ResponseError, UseCustomQueryOptions } from 'types'
import { databaseKeys } from './keys'
+import { PROJECT_STATUS } from '@/lib/constants'
export type BackupsVariables = {
projectRef?: string
+ projectStatus?: string
}
export type DatabaseBackup = components['schemas']['BackupsResponse']['backups'][number]
@@ -28,7 +30,7 @@ export type BackupsData = Awaited<ReturnType<typeof getBackups>>
export type BackupsError = ResponseError
export const useBackupsQuery = <TData = BackupsData>(
- { projectRef }: BackupsVariables,
+ { projectRef, projectStatus }: BackupsVariables,
{ enabled = true, ...options }: UseCustomQueryOptions<BackupsData, BackupsError, TData> = {}
) => {
// [Joshen] Check for specifically false to account for project not loaded yet
@@ -37,7 +39,11 @@ export const useBackupsQuery = <TData = BackupsData>(
return useQuery<BackupsData, BackupsError, TData>({
queryKey: databaseKeys.backups(projectRef),
queryFn: ({ signal }) => getBackups({ projectRef }, signal),
- enabled: enabled && !isOrioleDbInAws && typeof projectRef !== 'undefined',
+ enabled:
+ enabled &&
+ !isOrioleDbInAws &&
+ typeof projectRef !== 'undefined' &&
+ projectStatus !== PROJECT_STATUS.COMING_UP,
...options,
})
}
diff --git a/apps/studio/data/database/migrations-query.ts b/apps/studio/data/database/migrations-query.ts
index ae1b7209930..b661c0e3ef4 100644
--- a/apps/studio/data/database/migrations-query.ts
+++ b/apps/studio/data/database/migrations-query.ts
@@ -4,6 +4,7 @@ import { UseCustomQueryOptions } from 'types'
import { executeSql, ExecuteSqlError } from '../sql/execute-sql-query'
import { databaseKeys } from './keys'
+import { PROJECT_STATUS } from '@/lib/constants'
export type DatabaseMigration = {
version: string
@@ -13,6 +14,7 @@ export type DatabaseMigration = {
export type MigrationsVariables = {
projectRef?: string
+ projectStatus?: string
connectionString?: string | null
}
@@ -46,12 +48,13 @@ export type MigrationsData = Awaited<ReturnType<typeof getMigrations>>
export type MigrationsError = ExecuteSqlError
export const useMigrationsQuery = <TData = MigrationsData>(
- { projectRef, connectionString }: MigrationsVariables,
+ { projectRef, projectStatus, connectionString }: MigrationsVariables,
{ enabled = true, ...options }: UseCustomQueryOptions<MigrationsData, MigrationsError, TData> = {}
) =>
useQuery<MigrationsData, MigrationsError, TData>({
queryKey: databaseKeys.migrations(projectRef),
queryFn: ({ signal }) => getMigrations({ projectRef, connectionString }, signal),
- enabled: enabled && typeof projectRef !== 'undefined',
+ enabled:
+ enabled && typeof projectRef !== 'undefined' && projectStatus !== PROJECT_STATUS.COMING_UP,
...options,
})