Skip to content

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

fix: pass projectRef/orgSlug to support link in table grid error (#50724)

Monica Khoury4b365eb4ee07
diff --git a/apps/studio/components/grid/components/grid/GridError.tsx b/apps/studio/components/grid/components/grid/GridError.tsx
index 44612826a8f..f9bcd007a68 100644
--- a/apps/studio/components/grid/components/grid/GridError.tsx
+++ b/apps/studio/components/grid/components/grid/GridError.tsx
@@ -14,6 +14,7 @@ import { InlineLink } from '@/components/ui/InlineLink'
import { ENTITY_TYPE } from '@/data/entity-types/entity-type-constants'
import { COST_THRESHOLD_ERROR } from '@/data/sql/execute-sql-mutation'
import { tableRowKeys } from '@/data/table-rows/keys'
+import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { useTableEditorStateSnapshot } from '@/state/table-editor'
import { useTableEditorTableStateSnapshot } from '@/state/table-editor-table'
@@ -196,10 +197,14 @@ const IcebergUnauthorizedError = ({ error }: { error: ResponseError }) => {
const GeneralError = ({ error }: { error: ResponseError }) => {
const { filters } = useTableFilter()
+ const { data: project } = useSelectedProjectQuery()
+ const { data: org } = useSelectedOrganizationQuery()
return (
<AlertError
error={error}
+ projectRef={project?.ref}
+ orgSlug={org?.slug}
className="pointer-events-auto"
subject="Failed to retrieve rows from table"
>
diff --git a/apps/studio/components/interfaces/Support/SupportForm.utils.test.ts b/apps/studio/components/interfaces/Support/SupportForm.utils.test.ts
index 4c2a584d430..c2d71ab5fb0 100644
--- a/apps/studio/components/interfaces/Support/SupportForm.utils.test.ts
+++ b/apps/studio/components/interfaces/Support/SupportForm.utils.test.ts
@@ -1,6 +1,11 @@
-import { describe, expect, it } from 'vitest'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { createSupportFormUrl } from './SupportForm.utils'
+import { createSupportFormUrl, selectInitialOrgAndProject } from './SupportForm.utils'
+import { createMockOrganization } from '@/tests/helpers'
+
+vi.mock('@/data/projects/project-detail-query', () => ({
+ getProjectDetail: vi.fn(),
+}))
describe('createSupportFormUrl', () => {
it('returns base URL with no params', () => {
@@ -22,3 +27,109 @@ describe('createSupportFormUrl', () => {
expect(url).toContain('subject=help')
})
})
+
+describe('selectInitialOrgAndProject', () => {
+ const orgA = createMockOrganization({ id: 1, slug: 'org-a' })
+ const orgB = createMockOrganization({ id: 2, slug: 'org-b' })
+ const orgs = [orgA, orgB]
+
+ let mockGetProjectDetail: ReturnType<typeof vi.fn>
+
+ beforeEach(async () => {
+ const projectDetailQuery = await import('@/data/projects/project-detail-query')
+ mockGetProjectDetail = vi.mocked(projectDetailQuery.getProjectDetail)
+ mockGetProjectDetail.mockReset()
+ })
+
+ it('resolves the org from the project when the Management API lookup succeeds', async () => {
+ mockGetProjectDetail.mockResolvedValue({ organization_id: 2 })
+
+ const result = await selectInitialOrgAndProject({
+ projectRef: 'project-a',
+ orgSlug: null,
+ orgs,
+ })
+
+ expect(result).toEqual({ projectRef: 'project-a', orgSlug: 'org-b' })
+ })
+
+ it('prefers the org resolved from the project over a mismatched provided orgSlug', async () => {
+ mockGetProjectDetail.mockResolvedValue({ organization_id: 2 })
+
+ const result = await selectInitialOrgAndProject({
+ projectRef: 'project-a',
+ orgSlug: 'org-a',
+ orgs,
+ })
+
+ expect(result).toEqual({ projectRef: 'project-a', orgSlug: 'org-b' })
+ })
+
+ it('keeps projectRef and falls back to the provided orgSlug when the Management API lookup throws', async () => {
+ mockGetProjectDetail.mockRejectedValue(new Error('Management API is down'))
+
+ const result = await selectInitialOrgAndProject({
+ projectRef: 'project-a',
+ orgSlug: 'org-b',
+ orgs,
+ })
+
+ expect(result).toEqual({ projectRef: 'project-a', orgSlug: 'org-b' })
+ })
+
+ it('keeps projectRef and falls back to the provided orgSlug when the resolved org is not in the orgs list', async () => {
+ mockGetProjectDetail.mockResolvedValue({ organization_id: 999 })
+
+ const result = await selectInitialOrgAndProject({
+ projectRef: 'project-a',
+ orgSlug: 'org-b',
+ orgs,
+ })
+
+ expect(result).toEqual({ projectRef: 'project-a', orgSlug: 'org-b' })
+ })
+
+ it('defaults to the first org and drops projectRef when neither the project nor orgSlug resolve', async () => {
+ mockGetProjectDetail.mockRejectedValue(new Error('Management API is down'))
+
+ const result = await selectInitialOrgAndProject({
+ projectRef: 'project-a',
+ orgSlug: 'unknown-org',
+ orgs,
+ })
+
+ expect(result).toEqual({ projectRef: null, orgSlug: 'org-a' })
+ expect(mockGetProjectDetail).toHaveBeenCalledWith({ ref: 'project-a' })
+ })
+
+ it('resolves via orgSlug without calling the Management API when no projectRef is provided', async () => {
+ const result = await selectInitialOrgAndProject({
+ projectRef: null,
+ orgSlug: 'org-b',
+ orgs,
+ })
+
+ expect(result).toEqual({ projectRef: null, orgSlug: 'org-b' })
+ expect(mockGetProjectDetail).not.toHaveBeenCalled()
+ })
+
+ it('defaults to the first org when neither projectRef nor orgSlug are provided', async () => {
+ const result = await selectInitialOrgAndProject({
+ projectRef: null,
+ orgSlug: null,
+ orgs,
+ })
+
+ expect(result).toEqual({ projectRef: null, orgSlug: 'org-a' })
+ })
+
+ it('returns nulls when there are no orgs to fall back to', async () => {
+ const result = await selectInitialOrgAndProject({
+ projectRef: null,
+ orgSlug: null,
+ orgs: [],
+ })
+
+ expect(result).toEqual({ projectRef: null, orgSlug: null })
+ })
+})
diff --git a/apps/studio/components/interfaces/Support/SupportForm.utils.tsx b/apps/studio/components/interfaces/Support/SupportForm.utils.tsx
index 6a7ecbb705d..cd9ee44b348 100644
--- a/apps/studio/components/interfaces/Support/SupportForm.utils.tsx
+++ b/apps/studio/components/interfaces/Support/SupportForm.utils.tsx
@@ -195,25 +195,27 @@ export async function selectInitialOrgAndProject({
if (projectRef) {
try {
const projectDetails = await getProjectDetail({ ref: projectRef })
- if (projectDetails?.organization_id) {
- const org = orgs.find((o) => o.id === projectDetails.organization_id)
- if (org?.slug) {
- return {
- projectRef,
- orgSlug: org.slug,
- }
+ const projectOrg = orgs.find((o) => o.id === projectDetails?.organization_id)
+ if (projectOrg?.slug) {
+ return {
+ projectRef,
+ orgSlug: projectOrg.slug,
}
}
} catch {
- // Can safely ignore, consider provided project ref invalid
+ // Can safely ignore, fall through to the orgSlug fallback below
}
}
+ // Reached when there's no projectRef, or the project lookup above failed to
+ // resolve a known org (e.g. the Management API request errored). Returning
+ // `projectRef` here (rather than hardcoding `null`) preserves it when we
+ // still have one, instead of silently discarding it.
if (orgSlug) {
const org = orgs.find((o) => o.slug === orgSlug)
if (org?.slug) {
return {
- projectRef: null,
+ projectRef,
orgSlug: org.slug,
}
}
diff --git a/apps/studio/components/ui/AlertError.tsx b/apps/studio/components/ui/AlertError.tsx
index a20a4ab1c99..93ea7429567 100644
--- a/apps/studio/components/ui/AlertError.tsx
+++ b/apps/studio/components/ui/AlertError.tsx
@@ -9,6 +9,7 @@ import { useTrack } from '@/lib/telemetry/track'
export interface AlertErrorProps {
projectRef?: string
+ orgSlug?: string
subject?: string
description?: string
error?: { message: string } | null
@@ -23,10 +24,12 @@ export interface AlertErrorProps {
export const ContactSupportButton = ({
projectRef,
+ orgSlug,
subject,
error,
}: {
projectRef?: string
+ orgSlug?: string
subject?: string
error?: { message: string } | null
}) => {
@@ -36,6 +39,7 @@ export const ContactSupportButton = ({
queryParams={{
category: SupportCategories.DASHBOARD_BUG,
projectRef,
+ orgSlug,
subject,
error: error?.message,
}}
@@ -49,6 +53,7 @@ export const ContactSupportButton = ({
// [Joshen] To standardize the language for all error UIs
export const AlertError = ({
projectRef,
+ orgSlug,
subject,
description = 'Try refreshing your browser, but if the issue persists for more than a few minutes, please reach out to us via support.',
error,
@@ -98,16 +103,19 @@ export const AlertError = ({
</>
}
actions={
- hideContactSupport ? (
- (additionalActions ?? null)
- ) : additionalActions ? (
+ additionalActions || !hideContactSupport ? (
<>
{additionalActions}
- <ContactSupportButton projectRef={projectRef} subject={subject} error={error} />
+ {!hideContactSupport && (
+ <ContactSupportButton
+ projectRef={projectRef}
+ orgSlug={orgSlug}
+ subject={subject}
+ error={error}
+ />
+ )}
</>
- ) : (
- <ContactSupportButton projectRef={projectRef} subject={subject} error={error} />
- )
+ ) : null
}
className={className}
/>