Skip to content

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

fix(studio): batch of production Sentry crash fixes (array/null guards) (#47460)

Ali Waseem3fcf980b0a71
diff --git a/apps/studio/components/interfaces/Integrations/Landing/useInstalledIntegrations.tsx b/apps/studio/components/interfaces/Integrations/Landing/useInstalledIntegrations.tsx
index e17ce5e617c..32359359859 100644
--- a/apps/studio/components/interfaces/Integrations/Landing/useInstalledIntegrations.tsx
+++ b/apps/studio/components/interfaces/Integrations/Landing/useInstalledIntegrations.tsx
@@ -69,7 +69,7 @@ export const useInstalledIntegrations = () => {
connectionString: project?.connectionString,
})
- const isHooksEnabled = schemas?.some((schema) => schema.name === 'supabase_functions')
+ const isHooksEnabled = schemas.some((schema) => schema.name === 'supabase_functions')
const installedIntegrations = useMemo(() => {
return allIntegrations
diff --git a/apps/studio/components/interfaces/SQLEditor/UtilityPanel/UtilityPanel.tsx b/apps/studio/components/interfaces/SQLEditor/UtilityPanel/UtilityPanel.tsx
index 98af2875443..66b536def8e 100644
--- a/apps/studio/components/interfaces/SQLEditor/UtilityPanel/UtilityPanel.tsx
+++ b/apps/studio/components/interfaces/SQLEditor/UtilityPanel/UtilityPanel.tsx
@@ -153,7 +153,7 @@ export const UtilityPanel = ({
<DownloadResultsButton
variant="text"
results={result.rows as any[]}
- fileName={`Supabase Snippet ${snippet.name}`}
+ fileName={`Supabase Snippet ${snippet?.name ?? 'Results'}`}
onDownloadAsCSV={() => track('sql_editor_result_download_csv_clicked')}
onCopyAsMarkdown={() => track('sql_editor_result_copy_markdown_clicked')}
onCopyAsJSON={() => track('sql_editor_result_copy_json_clicked')}
diff --git a/apps/studio/components/layouts/ProjectLayout/index.tsx b/apps/studio/components/layouts/ProjectLayout/index.tsx
index 55bc499d8d6..c083583c8fb 100644
--- a/apps/studio/components/layouts/ProjectLayout/index.tsx
+++ b/apps/studio/components/layouts/ProjectLayout/index.tsx
@@ -142,7 +142,7 @@ export const ProjectLayout = forwardRef<HTMLDivElement, PropsWithChildren<Projec
const { data: resourceWarnings } = useResourceWarningsQuery({
slug: selectedOrganization?.slug,
})
- const projectResourceWarnings = resourceWarnings?.find(
+ const projectResourceWarnings = (Array.isArray(resourceWarnings) ? resourceWarnings : []).find(
(w) => w.project === selectedProject?.ref
)
const isComputeNearExhaustion =
diff --git a/apps/studio/components/ui/CountdownTimer/CountdownTimerRadial.tsx b/apps/studio/components/ui/CountdownTimer/CountdownTimerRadial.tsx
index 487d36c618e..dc91a0ebc9a 100644
--- a/apps/studio/components/ui/CountdownTimer/CountdownTimerRadial.tsx
+++ b/apps/studio/components/ui/CountdownTimer/CountdownTimerRadial.tsx
@@ -35,7 +35,7 @@ const CountdownTimerRadial = ({ progress }: CountdownTimerRadialProps) => {
className="first:fill-foreground-muted/50 last:fill-background-200"
polarRadius={[16, 11]}
/>
- <RadialBar dataKey="timeRemaining" cornerRadius={2} />
+ <RadialBar dataKey="timeRemaining" cornerRadius={2} isAnimationActive={false} />
</RadialBarChart>
</ChartContainer>
@@ -48,7 +48,7 @@ const CountdownTimerRadial = ({ progress }: CountdownTimerRadialProps) => {
innerRadius={14}
outerRadius={5}
>
- <RadialBar dataKey="hand" cornerRadius={2} isAnimationActive={true} />
+ <RadialBar dataKey="hand" cornerRadius={2} isAnimationActive={false} />
</RadialBarChart>
</ChartContainer>
</div>
diff --git a/apps/studio/data/database-extensions/database-extensions-query.ts b/apps/studio/data/database-extensions/database-extensions-query.ts
index 5e293a0dcfe..4de92df2958 100644
--- a/apps/studio/data/database-extensions/database-extensions-query.ts
+++ b/apps/studio/data/database-extensions/database-extensions-query.ts
@@ -6,6 +6,7 @@ import { databaseExtensionsKeys } from './keys'
import { executeSql } from '@/data/sql/execute-sql-mutation'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { PROJECT_STATUS } from '@/lib/constants'
+import { EMPTY_ARR } from '@/lib/void'
import type { ResponseError, UseCustomQueryOptions } from '@/types'
export type DatabaseExtension = components['schemas']['PostgresExtension'] & {
@@ -26,7 +27,7 @@ export async function getDatabaseExtensions(
{ projectRef, connectionString, sql, queryKey: ['database-extensions'] },
signal
)
- return result as DatabaseExtension[]
+ return (Array.isArray(result) ? result : EMPTY_ARR) as DatabaseExtension[]
}
export type DatabaseExtensionsData = Awaited<ReturnType<typeof getDatabaseExtensions>>
diff --git a/apps/studio/data/database/schemas-query.ts b/apps/studio/data/database/schemas-query.ts
index 9cdced293f7..fe2a816fdcf 100644
--- a/apps/studio/data/database/schemas-query.ts
+++ b/apps/studio/data/database/schemas-query.ts
@@ -4,6 +4,7 @@ import { z } from 'zod'
import { databaseKeys } from './keys'
import { executeSql } from '@/data/sql/execute-sql-mutation'
+import { EMPTY_ARR } from '@/lib/void'
import { ResponseError, UseCustomQueryOptions } from '@/types'
export type SchemasVariables = {
@@ -32,7 +33,7 @@ export async function getSchemas(
signal
)
- return result
+ return Array.isArray(result) ? result : EMPTY_ARR
}
export const useSchemasQuery = <TData = SchemasData>(
diff --git a/apps/studio/data/entitlements/entitlements-query.ts b/apps/studio/data/entitlements/entitlements-query.ts
index 832ad627abe..697fdcdbb46 100644
--- a/apps/studio/data/entitlements/entitlements-query.ts
+++ b/apps/studio/data/entitlements/entitlements-query.ts
@@ -3,6 +3,7 @@ import type { components } from 'api-types'
import { get, handleError } from '@/data/fetchers'
import { organizationKeys } from '@/data/organizations/keys'
+import { EMPTY_ARR } from '@/lib/void'
import { UseCustomQueryOptions } from '@/types'
import { ResponseError } from '@/types/base'
@@ -32,7 +33,10 @@ export async function getEntitlements(
})
if (error) handleError(error)
- return data
+ return {
+ ...data,
+ entitlements: Array.isArray(data?.entitlements) ? data.entitlements : EMPTY_ARR,
+ }
}
export type EntitlementsData = Awaited<ReturnType<typeof getEntitlements>>
diff --git a/apps/studio/data/fdw/fdws-query.ts b/apps/studio/data/fdw/fdws-query.ts
index 66005773fb8..b081cbfd78b 100644
--- a/apps/studio/data/fdw/fdws-query.ts
+++ b/apps/studio/data/fdw/fdws-query.ts
@@ -3,6 +3,7 @@ import { useQuery } from '@tanstack/react-query'
import { fdwKeys } from './keys'
import { executeSql } from '@/data/sql/execute-sql-mutation'
+import { EMPTY_ARR } from '@/lib/void'
import { ResponseError, UseCustomQueryOptions } from '@/types'
export type FDWColumn = {
@@ -43,7 +44,7 @@ export async function getFDWs(
signal
)
- return result as FDW[]
+ return (Array.isArray(result) ? result : EMPTY_ARR) as FDW[]
}
export type FDWsData = Awaited<ReturnType<typeof getFDWs>>
diff --git a/apps/studio/data/lint/lint-query.ts b/apps/studio/data/lint/lint-query.ts
index 06280a23079..44c7db0c0f6 100644
--- a/apps/studio/data/lint/lint-query.ts
+++ b/apps/studio/data/lint/lint-query.ts
@@ -5,6 +5,7 @@ import { lintKeys } from './keys'
import { get, handleError } from '@/data/fetchers'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { PROJECT_STATUS } from '@/lib/constants'
+import { EMPTY_ARR } from '@/lib/void'
import type { ResponseError, UseCustomQueryOptions } from '@/types'
type ProjectLintsVariables = {
@@ -24,7 +25,7 @@ export async function getProjectLints({ projectRef }: ProjectLintsVariables, sig
if (error) handleError(error)
- return data
+ return Array.isArray(data) ? data : EMPTY_ARR
}
export type ProjectLintsData = Awaited<ReturnType<typeof getProjectLints>>
diff --git a/apps/studio/data/projects/projects-infinite-query.ts b/apps/studio/data/projects/projects-infinite-query.ts
index fe114fa911e..0e3b4dfcaf5 100644
--- a/apps/studio/data/projects/projects-infinite-query.ts
+++ b/apps/studio/data/projects/projects-infinite-query.ts
@@ -70,9 +70,9 @@ export const useProjectsInfiniteQuery = <TData = ProjectsInfiniteData>(
const page = pages.length
const currentTotalCount = page * limit
// @ts-ignore [Joshen] API type issue for Version 2 endpoints
- const totalCount = lastPage.pagination.count
+ const totalCount = lastPage?.pagination?.count
- if (currentTotalCount >= totalCount) return undefined
+ if (totalCount === undefined || currentTotalCount >= totalCount) return undefined
return page
},
...options,
diff --git a/apps/studio/data/subscriptions/project-addons-query.ts b/apps/studio/data/subscriptions/project-addons-query.ts
index 5f98d4c310e..28a7b7cd25c 100644
--- a/apps/studio/data/subscriptions/project-addons-query.ts
+++ b/apps/studio/data/subscriptions/project-addons-query.ts
@@ -3,6 +3,7 @@ import { useQuery } from '@tanstack/react-query'
import { subscriptionKeys } from './keys'
import { get, handleError } from '@/data/fetchers'
import { IS_PLATFORM } from '@/lib/constants'
+import { EMPTY_ARR } from '@/lib/void'
import type { ResponseError, UseCustomQueryOptions } from '@/types'
export type ProjectAddonsVariables = {
@@ -24,7 +25,11 @@ export async function getProjectAddons(
})
if (error) handleError(error)
- return data
+ return {
+ ...data,
+ selected_addons: Array.isArray(data?.selected_addons) ? data.selected_addons : EMPTY_ARR,
+ available_addons: Array.isArray(data?.available_addons) ? data.available_addons : EMPTY_ARR,
+ }
}
export type ProjectAddonsData = Awaited<ReturnType<typeof getProjectAddons>>
diff --git a/apps/studio/data/usage/resource-warnings-query.ts b/apps/studio/data/usage/resource-warnings-query.ts
index df7385ea546..73ef9ca1565 100644
--- a/apps/studio/data/usage/resource-warnings-query.ts
+++ b/apps/studio/data/usage/resource-warnings-query.ts
@@ -4,6 +4,7 @@ import { IS_PLATFORM } from 'common'
import { usageKeys } from './keys'
import type { components } from '@/data/api'
import { get, handleError } from '@/data/fetchers'
+import { EMPTY_ARR } from '@/lib/void'
import type { ResponseError, UseCustomQueryOptions } from '@/types'
export type ResourceWarningsVariables = {
@@ -26,7 +27,7 @@ export async function getResourceWarnings(
})
if (error) handleError(error)
- return data
+ return Array.isArray(data) ? data : EMPTY_ARR
}
export type ResourceWarning = components['schemas']['ProjectResourceWarningsResponse']
diff --git a/apps/studio/hooks/misc/useCheckEntitlements.ts b/apps/studio/hooks/misc/useCheckEntitlements.ts
index 9d4765c7dbf..5e749b3c7cd 100644
--- a/apps/studio/hooks/misc/useCheckEntitlements.ts
+++ b/apps/studio/hooks/misc/useCheckEntitlements.ts
@@ -69,7 +69,7 @@ export function useHasEntitlementAccess(organizationSlug?: string) {
return useCallback(
(key: string) =>
IS_PLATFORM
- ? (entitlementsData?.entitlements.find((e) => e.feature.key === key)?.hasAccess ?? false)
+ ? (entitlementsData?.entitlements?.find((e) => e.feature.key === key)?.hasAccess ?? false)
: true,
[entitlementsData]
)
@@ -107,7 +107,7 @@ export function useCheckEntitlements(
// If no organization slug, no access
if (!finalOrgSlug) return { entitlement: null }
- const entitlement = entitlementsData?.entitlements.find(
+ const entitlement = entitlementsData?.entitlements?.find(
(entitlement) => entitlement.feature.key === featureKey
)