Open-source agentic AI Search Execution Platform. Track AI visibility, find opportunities, and let agents turn signals into prioritized actions and drafted fixes across ChatGPT, Claude, Gemini, Google AI Overviews, Google AI Mode, Perplexity, Grok, and Microsoft Copilot.
TypeScript aeoai-agentai-searchanswer-engine-optimizationbrand-monitoringchatgptclaudecopilotdockergeminigeogoogle-ai-overviewsgrokmcpnextjsopen-sourceperplexityseosupabasetypescript
fix(brands): show the brand limit the server enforces, and say so on submit (#898)
Gökhan Geyikd42f9e8aeb87
diff --git a/web/src/app/[locale]/(dashboard)/dashboard/brands/new/page.tsx b/web/src/app/[locale]/(dashboard)/dashboard/brands/new/page.tsxindex 43c9643b2..c5f7a61a4 100644--- a/web/src/app/[locale]/(dashboard)/dashboard/brands/new/page.tsx+++ b/web/src/app/[locale]/(dashboard)/dashboard/brands/new/page.tsx@@ -423,7 +423,7 @@ export default function NewBrandPage() {if (!profile?.organization_id) throw new Error('No organization found');- const brand = await createBrand({+ const result = await createBrand({organizationId: profile.organization_id,name: brandName.trim(),description: description.trim() || undefined,@@ -432,6 +432,11 @@ export default function NewBrandPage() {language,domains: domain ? [{ domain, isPrimary: true }] : [],});+ if ('error' in result) {+ toast.error(result.error);+ return;+ }+ const { brand } = result;setCreatedBrand(brand);addBrand(brand);diff --git a/web/src/app/[locale]/(dashboard)/dashboard/brands/page.tsx b/web/src/app/[locale]/(dashboard)/dashboard/brands/page.tsxindex 5a63f88ad..96f97b421 100644--- a/web/src/app/[locale]/(dashboard)/dashboard/brands/page.tsx+++ b/web/src/app/[locale]/(dashboard)/dashboard/brands/page.tsx@@ -3,6 +3,7 @@ import { Link } from '@/i18n/navigation';import { createClient } from '@/lib/supabase/server';import { getBrands } from '@/lib/actions/brand';import { getPlan, isCloud as checkIsCloud } from '@/config/plans';+import { getOrgPlan } from '@/lib/guards/plan-guard';import { BrandsClient } from './_brands-client';import { Button } from '@/components/ui/button';import { buttonVariants } from '@/components/ui/button-variants';@@ -60,19 +61,14 @@ export default async function BrandsPage() {const orgId = profile?.organization_id;- const [brands, orgData] = await Promise.all([+ // getOrgPlan, not getPlan(org.plan): the limit shown here must be the one+ // createBrand enforces, Enterprise plan_overrides included. Reading the bare+ // plan offered "Add brand" to an override-capped org and failed on submit.+ const [brands, plan] = await Promise.all([orgId ? getBrands(orgId) : [],- orgId- ? supabase- .from('organizations')- .select('plan')- .eq('id', orgId)- .single()- .then((r) => r.data)- : null,+ orgId ? getOrgPlan(orgId) : getPlan(null),]);- const plan = getPlan(orgData?.plan as string | null);const maxBrands = plan.limits.maxBrands;const canAddBrand = maxBrands === -1 || brands.length < maxBrands;const needsUpgrade = !canAddBrand && checkIsCloud();diff --git a/web/src/app/[locale]/(onboarding)/dashboard/onboarding/page.tsx b/web/src/app/[locale]/(onboarding)/dashboard/onboarding/page.tsxindex cbfc93432..f523b53f1 100644--- a/web/src/app/[locale]/(onboarding)/dashboard/onboarding/page.tsx+++ b/web/src/app/[locale]/(onboarding)/dashboard/onboarding/page.tsx@@ -591,7 +591,7 @@ export default function OnboardingPage() {// Create brand if not already createdif (!createdBrand) {// logo_url starts null — BrandAvatar derives the favicon at render time.- const brand = await createBrand({+ const result = await createBrand({organizationId: orgId,name: brandName.trim(),description: description.trim() || undefined,@@ -600,6 +600,11 @@ export default function OnboardingPage() {language,domains: domain ? [{ domain, isPrimary: true }] : [],});+ if ('error' in result) {+ toast.error(result.error);+ return;+ }+ const { brand } = result;setCreatedBrand(brand);addBrand(brand);diff --git a/web/src/lib/actions/brand.test.ts b/web/src/lib/actions/brand.test.tsnew file mode 100644index 000000000..b7649f03d--- /dev/null+++ b/web/src/lib/actions/brand.test.ts@@ -0,0 +1,74 @@+import { beforeEach, describe, expect, it, vi } from 'vitest';+import { PLANS, type Plan } from '@/config/plans';++/**+ * createBrand reports the brand limit as a value, not a throw: production+ * masks errors thrown from a server action, so a thrown limit error reached+ * the user as the generic Server Components digest message.+ */++let brandCount = 0;+let inserted: unknown[] = [];+let plan: Plan;++vi.mock('next/cache', () => ({ revalidatePath: vi.fn() }));++vi.mock('@/lib/guards/plan-guard', () => ({+ getOrgPlan: vi.fn(async () => plan),+}));++vi.mock('@/lib/supabase/server', () => ({+ createClient: vi.fn(async () => ({+ from: (table: string) => ({+ select: () => ({ eq: async () => ({ count: brandCount, error: null }) }),+ insert: (row: unknown) => {+ inserted.push({ table, row });+ return {+ select: () => ({+ single: async () => ({+ data: { id: 'b1', organization_id: 'org-1', name: 'Acme', slug: 'acme' },+ error: null,+ }),+ }),+ };+ },+ }),+ })),+}));++const { createBrand } = await import('./brand');++const input = { organizationId: 'org-1', name: 'Acme', domains: [] };+const capped = (maxBrands: number): Plan => ({+ ...PLANS.enterprise,+ limits: { ...PLANS.enterprise.limits, maxBrands },+});++describe('createBrand plan limit', () => {+ beforeEach(() => {+ inserted = [];+ });++ it('returns a readable plan_limit result and inserts nothing at the limit', async () => {+ brandCount = 5;+ plan = capped(5);++ const result = await createBrand(input);++ expect(result).toEqual({+ code: 'plan_limit',+ error: 'Your plan includes 5 brands. Upgrade your plan to add more.',+ });+ expect(inserted).toEqual([]);+ });++ it('creates the brand below the limit', async () => {+ brandCount = 4;+ plan = capped(5);++ const result = await createBrand(input);++ expect('brand' in result && result.brand.id).toBe('b1');+ expect(inserted).toHaveLength(1);+ });+});diff --git a/web/src/lib/actions/brand.ts b/web/src/lib/actions/brand.tsindex 3f3e56102..3e45da2a3 100644--- a/web/src/lib/actions/brand.ts+++ b/web/src/lib/actions/brand.ts@@ -2,7 +2,8 @@import { createClient } from '@/lib/supabase/server';import { revalidatePath } from 'next/cache';-import { enforceLimit } from '@/lib/guards/plan-guard';+import { getOrgPlan } from '@/lib/guards/plan-guard';+import { isWithinLimit } from '@/config/plans';import { slugify } from '@/lib/slug';import type { Brand, BrandDomain } from '@/types';@@ -82,7 +83,14 @@ interface CreateBrandInput {domains: { domain: string; country?: string; isPrimary: boolean }[];}-export async function createBrand(input: CreateBrandInput): Promise<Brand> {+export type CreateBrandResult = { brand: Brand } | { error: string; code: 'plan_limit' };++/**+ * The plan limit comes back as a VALUE: production masks every error thrown+ * from a server action, so a thrown PlanLimitError reached users as the+ * meaningless digest message (same as #427 for prompts).+ */+export async function createBrand(input: CreateBrandInput): Promise<CreateBrandResult> {const supabase = await createClient();const { count } = await supabase@@ -90,7 +98,14 @@ export async function createBrand(input: CreateBrandInput): Promise<Brand> {.select('id', { count: 'exact', head: true }).eq('organization_id', input.organizationId);- await enforceLimit(input.organizationId, 'maxBrands', count ?? 0);+ const plan = await getOrgPlan(input.organizationId);+ if (!isWithinLimit(plan, 'maxBrands', count ?? 0)) {+ const max = plan.limits.maxBrands;+ return {+ code: 'plan_limit',+ error: `Your plan includes ${max} brand${max === 1 ? '' : 's'}. Upgrade your plan to add more.`,+ };+ }const slug = slugify(input.name) || `brand-${Date.now()}`;@@ -134,7 +149,7 @@ export async function createBrand(input: CreateBrandInput): Promise<Brand> {}revalidatePath('/dashboard/brands');- return mapBrandRow(brand as Record<string, unknown>, insertedDomains);+ return { brand: mapBrandRow(brand as Record<string, unknown>, insertedDomains) };}interface UpdateBrandInput {