The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
Revert "feat: show "Allow support access to your project" toggle for … (#42324)
Charis72adfbdc0b63
diff --git a/apps/studio/components/interfaces/Support/CategoryAndSeverityInfo.tsx b/apps/studio/components/interfaces/Support/CategoryAndSeverityInfo.tsxindex 58720a1cd27..1d6bf95ae82 100644--- a/apps/studio/components/interfaces/Support/CategoryAndSeverityInfo.tsx+++ b/apps/studio/components/interfaces/Support/CategoryAndSeverityInfo.tsx@@ -1,21 +1,21 @@+import type { UseFormReturn } from 'react-hook-form'// End of third-party imports+import { SupportCategories } from '@supabase/shared-types/out/constants'import { InlineLink } from 'components/ui/InlineLink'-import type { UseFormReturn } from 'react-hook-form'import {+ cn,FormControl_Shadcn_,FormField_Shadcn_,+ Select_Shadcn_,SelectContent_Shadcn_,SelectGroup_Shadcn_,SelectItem_Shadcn_,SelectTrigger_Shadcn_,SelectValue_Shadcn_,- Select_Shadcn_,- cn,} from 'ui'import { Admonition } from 'ui-patterns/admonition'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'-import {CATEGORY_OPTIONS,type ExtendedSupportCategories,@@ -91,7 +91,7 @@ function CategorySelector({ form }: CategorySelectorProps) {</SelectTrigger_Shadcn_><SelectContent_Shadcn_><SelectGroup_Shadcn_>- {CATEGORY_OPTIONS.map((option) => (+ {CATEGORY_OPTIONS.filter((option) => !option.hidden).map((option) => (<SelectItem_Shadcn_ key={option.value} value={option.value}>{option.label}<span className="block text-xs text-foreground-lighter">diff --git a/apps/studio/components/interfaces/Support/LinkSupportTicketForm.tsx b/apps/studio/components/interfaces/Support/LinkSupportTicketForm.tsxindex 68f35b26718..aeb32893467 100644--- a/apps/studio/components/interfaces/Support/LinkSupportTicketForm.tsx+++ b/apps/studio/components/interfaces/Support/LinkSupportTicketForm.tsx@@ -1,21 +1,21 @@import { zodResolver } from '@hookform/resolvers/zod'-import { useLinkSupportTicketMutation } from 'data/feedback/link-support-ticket-mutation'-import { useOrganizationsQuery } from 'data/organizations/organizations-query'import { Link2 } from 'lucide-react'import { useEffect } from 'react'import type { SubmitHandler } from 'react-hook-form'import { useForm } from 'react-hook-form'import { toast } from 'sonner'++import { useLinkSupportTicketMutation } from 'data/feedback/link-support-ticket-mutation'+import { useOrganizationsQuery } from 'data/organizations/organizations-query'import {Button,DialogSectionSeparator,+ Form_Shadcn_,FormControl_Shadcn_,FormField_Shadcn_,- Form_Shadcn_,Input_Shadcn_,} from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'-import { CategoryAndSeverityInfo } from './CategoryAndSeverityInfo'import {LinkSupportTicketFormSchema,@@ -23,8 +23,8 @@ import {} from './LinkSupportTicketForm.schema'import { OrganizationSelector } from './OrganizationSelector'import { ProjectAndPlanInfo } from './ProjectAndPlanInfo'-import { DISABLE_SUPPORT_ACCESS_CATEGORIES, SupportAccessToggle } from './SupportAccessToggle'-import { NO_ORG_MARKER, NO_PROJECT_MARKER, getOrgSubscriptionPlan } from './SupportForm.utils'+import { SUPPORT_ACCESS_CATEGORIES, SupportAccessToggle } from './SupportAccessToggle'+import { getOrgSubscriptionPlan, NO_ORG_MARKER, NO_PROJECT_MARKER } from './SupportForm.utils'interface LinkSupportTicketFormProps {conversationId: string@@ -88,10 +88,9 @@ export const LinkSupportTicketForm = ({? values.projectRef: undefined,category: values.category,- allow_support_access:- values.category && !DISABLE_SUPPORT_ACCESS_CATEGORIES.includes(values.category)- ? values.allowSupportAccess- : false,+ allow_support_access: SUPPORT_ACCESS_CATEGORIES.includes(values.category)+ ? values.allowSupportAccess+ : false,})}@@ -154,7 +153,7 @@ export const LinkSupportTicketForm = ({<DialogSectionSeparator />- {!!category && !DISABLE_SUPPORT_ACCESS_CATEGORIES.includes(category) && (+ {SUPPORT_ACCESS_CATEGORIES.includes(category) && (<><div className="py-4"><SupportAccessToggle form={form as any} />diff --git a/apps/studio/components/interfaces/Support/Support.constants.ts b/apps/studio/components/interfaces/Support/Support.constants.tsindex 8e02f560bfd..f7ddf76f920 100644--- a/apps/studio/components/interfaces/Support/Support.constants.ts+++ b/apps/studio/components/interfaces/Support/Support.constants.ts@@ -10,6 +10,7 @@ export const CATEGORY_OPTIONS: {label: stringdescription: stringquery?: string+ hidden?: boolean}[] = [{value: SupportCategories.PROBLEM,@@ -77,6 +78,13 @@ export const CATEGORY_OPTIONS: {query: undefined,},]),+ {+ value: 'Others' as const,+ label: 'Others',+ description: 'Issues that are not related to any of the other categories',+ query: undefined,+ hidden: true,+ },]export const SEVERITY_OPTIONS = [diff --git a/apps/studio/components/interfaces/Support/SupportAccessToggle.tsx b/apps/studio/components/interfaces/Support/SupportAccessToggle.tsxindex 0c24ef7d63a..a5b49bc2e01 100644--- a/apps/studio/components/interfaces/Support/SupportAccessToggle.tsx+++ b/apps/studio/components/interfaces/Support/SupportAccessToggle.tsx@@ -1,26 +1,26 @@-// End of third-party imports--import { SupportCategories } from '@supabase/shared-types/out/constants'import { ChevronRight } from 'lucide-react'import Link from 'next/link'import type { UseFormReturn } from 'react-hook-form'+// End of third-party imports++import { SupportCategories } from '@supabase/shared-types/out/constants'import {Badge,+ Collapsible_Shadcn_,CollapsibleContent_Shadcn_,CollapsibleTrigger_Shadcn_,- Collapsible_Shadcn_,FormField_Shadcn_,Switch,} from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'-import type { ExtendedSupportCategories } from './Support.constants'import type { SupportFormValues } from './SupportForm.schema'-export const DISABLE_SUPPORT_ACCESS_CATEGORIES: ExtendedSupportCategories[] = [- SupportCategories.ACCOUNT_DELETION,- SupportCategories.SALES_ENQUIRY,- SupportCategories.REFUND,+export const SUPPORT_ACCESS_CATEGORIES: ExtendedSupportCategories[] = [+ SupportCategories.DATABASE_UNRESPONSIVE,+ SupportCategories.PERFORMANCE_ISSUES,+ SupportCategories.PROBLEM,+ SupportCategories.DASHBOARD_BUG,]interface SupportAccessToggleProps {diff --git a/apps/studio/components/interfaces/Support/SupportFormV2.tsx b/apps/studio/components/interfaces/Support/SupportFormV2.tsxindex 26bbf789add..38e928934a7 100644--- a/apps/studio/components/interfaces/Support/SupportFormV2.tsx+++ b/apps/studio/components/interfaces/Support/SupportFormV2.tsx@@ -1,4 +1,7 @@+import { useEffect, type Dispatch, type MouseEventHandler } from 'react'+import type { SubmitHandler, UseFormReturn } from 'react-hook-form'// End of third-party imports+import { SupportCategories } from '@supabase/shared-types/out/constants'import { useConstant, useFlag } from 'common'import { CLIENT_LIBRARIES } from 'common/constants'@@ -10,10 +13,7 @@ import { useGenerateAttachmentURLsMutation } from 'data/support/generate-attachmimport { useDeploymentCommitQuery } from 'data/utils/deployment-commit-query'import { detectBrowser } from 'lib/helpers'import { useProfile } from 'lib/profile'-import { type Dispatch, type MouseEventHandler } from 'react'-import type { SubmitHandler, UseFormReturn } from 'react-hook-form'import { DialogSectionSeparator, Form_Shadcn_ } from 'ui'-import {AffectedServicesSelector,CATEGORIES_WITHOUT_AFFECTED_SERVICES,@@ -27,15 +27,15 @@ import { OrganizationSelector } from './OrganizationSelector'import { ProjectAndPlanInfo } from './ProjectAndPlanInfo'import { SubjectAndSuggestionsInfo } from './SubjectAndSuggestionsInfo'import { SubmitButton } from './SubmitButton'-import { DISABLE_SUPPORT_ACCESS_CATEGORIES, SupportAccessToggle } from './SupportAccessToggle'+import { SUPPORT_ACCESS_CATEGORIES, SupportAccessToggle } from './SupportAccessToggle'import type { SupportFormValues } from './SupportForm.schema'import type { SupportFormActions, SupportFormState } from './SupportForm.state'import {- NO_ORG_MARKER,- NO_PROJECT_MARKER,formatMessage,formatStudioVersion,getOrgSubscriptionPlan,+ NO_ORG_MARKER,+ NO_PROJECT_MARKER,} from './SupportForm.utils'import {DASHBOARD_LOG_CATEGORIES,@@ -128,12 +128,12 @@ export const SupportFormV2 = ({ form, initialError, state, dispatch }: SupportFoconst payload = {...values,+ category,organizationSlug: values.organizationSlug ?? NO_ORG_MARKER,projectRef: values.projectRef ?? NO_PROJECT_MARKER,- allowSupportAccess:- values.category && !DISABLE_SUPPORT_ACCESS_CATEGORIES.includes(values.category)- ? values.allowSupportAccess- : false,+ allowSupportAccess: SUPPORT_ACCESS_CATEGORIES.includes(values.category)+ ? values.allowSupportAccess+ : false,library:values.category === SupportCategories.PROBLEM && selectedLibrary !== undefined? selectedLibrary.key@@ -179,6 +179,15 @@ export const SupportFormV2 = ({ form, initialError, state, dispatch }: SupportFohandleFormSubmit(event)}+ useEffect(() => {+ if (simplifiedSupportForm) {+ form.setValue('category', 'Others')+ } else {+ form.setValue('category', '' as any)+ }+ // eslint-disable-next-line react-hooks/exhaustive-deps+ }, [simplifiedSupportForm])+return (<Form_Shadcn_ {...form}><form id="support-form" className="flex flex-col gap-y-6">@@ -193,12 +202,14 @@ export const SupportFormV2 = ({ form, initialError, state, dispatch }: SupportFosubscriptionPlanId={subscriptionPlanId}category={category}/>- <CategoryAndSeverityInfo- form={form}- category={category}- severity={severity}- projectRef={projectRef}- />+ {!simplifiedSupportForm && (+ <CategoryAndSeverityInfo+ form={form}+ category={category}+ severity={severity}+ projectRef={projectRef}+ />+ )}</div><DialogSectionSeparator />@@ -224,7 +235,7 @@ export const SupportFormV2 = ({ form, initialError, state, dispatch }: SupportFo</>)}- {!!category && !DISABLE_SUPPORT_ACCESS_CATEGORIES.includes(category) && (+ {SUPPORT_ACCESS_CATEGORIES.includes(category) && (<><SupportAccessToggle form={form} /><DialogSectionSeparator />diff --git a/apps/studio/components/interfaces/Support/__tests__/SupportFormPage.test.tsx b/apps/studio/components/interfaces/Support/__tests__/SupportFormPage.test.tsxindex 9313f6d4d9c..4c85b45f3ca 100644--- a/apps/studio/components/interfaces/Support/__tests__/SupportFormPage.test.tsx+++ b/apps/studio/components/interfaces/Support/__tests__/SupportFormPage.test.tsx@@ -891,6 +891,10 @@ describe('SupportFormPage', () => {await userEvent.clear(messageField)await userEvent.type(messageField, 'MFA challenge fails with an unknown error code')+ expect(+ screen.queryByRole('switch', { name: /allow support access to your project/i })+ ).toBeNull()+await userEvent.click(getSubmitButton(screen))await waitFor(() => {@@ -906,7 +910,7 @@ describe('SupportFormPage', () => {organizationSlug: 'org-2',library: '',affectedServices: '',- allowSupportAccess: true,+ allowSupportAccess: false,verified: true,tags: ['dashboard-support-form'],siteUrl: 'https://project-2.supabase.dev',