From 6b2d7892844cfc53decfa2815dca14b643eb24d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kevin=20Gr=C3=BCneberg?= Date: Tue, 9 Dec 2025 12:57:04 +0800 Subject: [PATCH] chore: use simplified support form for platform orgs (#41177) * chore: use simplified support form for platform orgs * Nit * Nit --------- Co-authored-by: Joshen Lim --- .../components/interfaces/Support/SupportFormV2.tsx | 11 +++++++++-- apps/studio/data/organizations/organization-query.ts | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/apps/studio/components/interfaces/Support/SupportFormV2.tsx b/apps/studio/components/interfaces/Support/SupportFormV2.tsx index 0ec5a4efe95..91959f7be6e 100644 --- a/apps/studio/components/interfaces/Support/SupportFormV2.tsx +++ b/apps/studio/components/interfaces/Support/SupportFormV2.tsx @@ -7,6 +7,7 @@ import { useConstant, useFlag } from 'common' import { CLIENT_LIBRARIES } from 'common/constants' import { getProjectAuthConfig } from 'data/auth/auth-config-query' import { useSendSupportTicketMutation } from 'data/feedback/support-ticket-send' +import { type OrganizationPlanID } from 'data/organizations/organization-query' import { useOrganizationsQuery } from 'data/organizations/organizations-query' import { useGenerateAttachmentURLsMutation } from 'data/support/generate-attachment-urls-mutation' import { useDeploymentCommitQuery } from 'data/utils/deployment-commit-query' @@ -41,12 +42,18 @@ import { uploadDashboardLog, } from './dashboard-logs' -const useIsSimplifiedForm = (slug: string) => { +const useIsSimplifiedForm = (slug: string, subscriptionPlanId?: OrganizationPlanID) => { const simplifiedSupportForm = useFlag('simplifiedSupportForm') + + if (subscriptionPlanId === 'platform') { + return true + } + if (typeof simplifiedSupportForm === 'string') { const slugs = (simplifiedSupportForm as string).split(',').map((x) => x.trim()) return slugs.includes(slug) } + return false } @@ -62,13 +69,13 @@ export const SupportFormV2 = ({ form, initialError, state, dispatch }: SupportFo const respondToEmail = profile?.primary_email ?? 'your email' const { organizationSlug, projectRef, category, severity, subject, library } = form.watch() - const simplifiedSupportForm = useIsSimplifiedForm(organizationSlug) const selectedOrgSlug = organizationSlug === NO_ORG_MARKER ? null : organizationSlug const selectedProjectRef = projectRef === NO_PROJECT_MARKER ? null : projectRef const { data: organizations } = useOrganizationsQuery() const subscriptionPlanId = getOrgSubscriptionPlan(organizations, selectedOrgSlug) + const simplifiedSupportForm = useIsSimplifiedForm(organizationSlug, subscriptionPlanId) const attachmentUpload = useAttachmentUpload() const { mutateAsync: uploadDashboardLogFn } = useGenerateAttachmentURLsMutation() diff --git a/apps/studio/data/organizations/organization-query.ts b/apps/studio/data/organizations/organization-query.ts index f761e6b2a1e..0a8e75fcda1 100644 --- a/apps/studio/data/organizations/organization-query.ts +++ b/apps/studio/data/organizations/organization-query.ts @@ -7,6 +7,7 @@ import { organizationKeys } from './keys' export type OrganizationVariables = { slug?: string } export type OrganizationDetail = components['schemas']['OrganizationSlugResponse'] +export type OrganizationPlanID = OrganizationDetail['plan']['id'] function castOrganizationSlugResponseToOrganization( org: components['schemas']['OrganizationSlugResponse']