improvement(settings): remove personal connected accounts page

Author: TheodoreSpeaks

apps/sim/app/account/settings/[section]/page.test.tsx

@@ -52,7 +52,10 @@ describe('account settings legacy links', () => {
     )
   })
 
-  it('still rejects unknown sections', async () => {
-    await expect(AccountSettingsSectionPage(pageProps('unknown'))).rejects.toThrow('NEXT_NOT_FOUND')
-  })
+  it.each(['unknown', 'connected-accounts'])(
+    'rejects unavailable sections: %s',
+    async (section) => {
+      await expect(AccountSettingsSectionPage(pageProps(section))).rejects.toThrow('NEXT_NOT_FOUND')
+    }
+  )
 })

apps/sim/app/credential-groups/enroll/[token]/page.test.tsx

@@ -148,17 +148,17 @@ describe('focused Search enrollment', () => {
     expect(mocks.read).toHaveBeenCalledWith({ principal, input: {} })
   })
 
-  it('keeps account-settings reconnect focused and returns to account settings', async () => {
+  it('keeps existing account reconnect links focused and returns to Sim', async () => {
     await render({ returnTo: 'accounts', optionId: 'site-two' })
     expect(oauthLinks().map((link) => link.getAttribute('href'))).toEqual([
       '/api/credential-groups/enroll/invitation/oauth/site-two?returnTo=accounts',
     ])
     expect(document.querySelector('form')).toBeNull()
     expect(
       Array.from(document.querySelectorAll('a'))
-        .find((link) => link.textContent === 'Your connected accounts')
+        .find((link) => link.textContent === 'Open Sim')
         ?.getAttribute('href')
-    ).toBe('/account/settings/connected-accounts')
+    ).toBe('/home')
   })
 
   it('lets an account owner deliberately reconnect an active grant before reporting completion', async () => {
@@ -189,12 +189,12 @@ describe('focused Search enrollment', () => {
       })
       mocks.read.mockResolvedValue({ enrollment, canSearch })
       await render({ returnTo: 'search', optionId: 'site-two' })
-      const label = canSearch ? 'Return to Search' : 'Your connected accounts'
+      const label = canSearch ? 'Return to Search' : 'Open Sim'
       expect(
         Array.from(document.querySelectorAll('a'))
           .find((link) => link.textContent === label)
           ?.getAttribute('href')
-      ).toBe(canSearch ? '/o/canonical-org/search' : '/account/settings/connected-accounts')
+      ).toBe(canSearch ? '/o/canonical-org/search' : '/home')
     }
   )
 

apps/sim/app/credential-groups/enroll/[token]/page.tsx

@@ -3,7 +3,6 @@ import { Chip, ChipLink } from '@sim/emcn'
 import type { Metadata } from 'next'
 import { headers } from 'next/headers'
 import { redirect } from 'next/navigation'
-import { getAccountSettingsHref } from '@/components/settings/navigation'
 import { getSession } from '@/lib/auth'
 import { asOrchestrationError } from '@/lib/core/orchestration/types'
 import type { ResourceOwner } from '@/lib/core/resource-scope'
@@ -184,10 +183,8 @@ export default async function CredentialGroupEnrollmentPage({
   const canReturnToSearch =
     returnToSearch &&
     ('canSearch' in enrollmentResult ? enrollmentResult.canSearch : !principal.organizationId)
-  const returnHref = canReturnToSearch
-    ? searchReturnPath(principal)
-    : getAccountSettingsHref('connected-accounts')
-  const returnLabel = canReturnToSearch ? 'Return to Search' : 'Your connected accounts'
+  const returnHref = canReturnToSearch ? searchReturnPath(principal) : APP_ENTRY_PATH
+  const returnLabel = canReturnToSearch ? 'Return to Search' : 'Open Sim'
   if (!enrollment)
     return <UnavailableSearchConnection returnHref={returnHref} returnLabel={returnLabel} />
 

apps/sim/app/o/[organizationId]/integrations/integrations.test.tsx

@@ -166,7 +166,7 @@ describe('organization integrations role and source paths', () => {
     expect(mocks.connect).toHaveBeenCalledExactlyOnceWith('search-index', 'member-source')
   })
 
-  it('keeps Slack return actions alongside the standard account and source actions', async () => {
+  it('keeps Slack return actions alongside source management', async () => {
     mocks.context.mockReturnValue({
       organization: { id: scope.organizationId },
       viewer: { isAdmin: true },
@@ -177,7 +177,7 @@ describe('organization integrations role and source paths', () => {
         <OrganizationIntegrations slackOnboarding={{ token: 'slack-return', userId: 'member' }} />
       )
     )
-    expect(document.body.textContent).toContain('Your accounts')
+    expect(document.body.textContent).not.toContain('Your accounts')
     expect(document.body.textContent).toContain('Manage sources')
     expect(buttons('slack-return')).toHaveLength(1)
   })
@@ -353,7 +353,7 @@ describe('organization integrations role and source paths', () => {
     expect(
       document.querySelector('a[href="/o/organization-a/settings/integrations"]')
     ).toHaveTextContent('Manage sources')
-    expect(document.querySelector('a[href="/account/settings/connected-accounts"]')).not.toBeNull()
+    expect(document.querySelector('a[href="/account/settings/connected-accounts"]')).toBeNull()
     expect(buttons('Add source')).toHaveLength(0)
     expect(buttons('Manage')).toHaveLength(0)
     expect(document.querySelector('[aria-label$="source actions"]')).toBeNull()

apps/sim/app/o/[organizationId]/integrations/integrations.tsx

@@ -2,7 +2,6 @@
 
 import { useMemo } from 'react'
 import { Chip, ChipLink } from '@sim/emcn'
-import { getAccountSettingsHref } from '@/components/settings/navigation'
 import type { ResourceScope } from '@/lib/core/resource-scope'
 import { organizationRoutes } from '@/lib/navigation/paths'
 import {
@@ -129,15 +128,16 @@ export function OrganizationIntegrations({ slackOnboarding }: OrganizationIntegr
       description='Connect your tools for Sim Search'
       tabs={TABS}
       action={
-        <div className='flex flex-wrap items-center gap-2'>
-          <ChipLink href={getAccountSettingsHref('connected-accounts')}>Your accounts</ChipLink>
-          {viewer.isAdmin && (
-            <ChipLink href={routes.settingsSection('integrations')}>Manage sources</ChipLink>
-          )}
-          {slackOnboarding && (
-            <SlackSearchActions organizationId={organization.id} {...slackOnboarding} />
-          )}
-        </div>
+        (viewer.isAdmin || slackOnboarding) && (
+          <div className='flex flex-wrap items-center gap-2 empty:hidden'>
+            {viewer.isAdmin && (
+              <ChipLink href={routes.settingsSection('integrations')}>Manage sources</ChipLink>
+            )}
+            {slackOnboarding && (
+              <SlackSearchActions organizationId={organization.id} {...slackOnboarding} />
+            )}
+          </div>
+        )
       }
     >
       <div className={RESOURCE_LIST_STACK}>

apps/sim/components/settings/account-settings-renderer.tsx

@@ -6,7 +6,6 @@ import { usePostHog } from 'posthog-js/react'
 import type { AccountSettingsSection } from '@/components/settings/navigation'
 import { captureEvent } from '@/lib/posthog/client'
 import { General } from '@/app/workspace/[workspaceId]/settings/components/general/general'
-import { PersonalOrganizationAccounts } from '@/ee/credential-groups/components/personal-organization-accounts'
 
 const Billing = dynamic(() =>
   import('@/app/workspace/[workspaceId]/settings/components/billing/billing').then(
@@ -40,7 +39,6 @@ export function AccountSettingsRenderer({ section }: AccountSettingsRendererProp
     captureEvent(posthog, 'settings_tab_viewed', { plane: 'account', section })
   }, [posthog, section])
 
-  if (section === 'connected-accounts') return <PersonalOrganizationAccounts />
   if (section === 'general') return <General />
   if (section === 'billing') return <Billing scope='account' />
   if (section === 'api-keys') return <ApiKeys scope='personal' />

apps/sim/components/settings/navigation.test.ts

@@ -128,7 +128,6 @@ describe('settings navigation boundaries', () => {
       'general',
       'billing',
       'api-keys',
-      'connected-accounts',
       'admin',
       'mothership',
     ])

apps/sim/components/settings/navigation.ts

@@ -35,13 +35,7 @@ import { organizationRoutes } from '@/lib/navigation/paths'
 
 export type SettingsPlane = 'account' | 'selfhost' | 'workspace'
 
-export type AccountSettingsSection =
-  | 'connected-accounts'
-  | 'general'
-  | 'billing'
-  | 'api-keys'
-  | 'admin'
-  | 'mothership'
+export type AccountSettingsSection = 'general' | 'billing' | 'api-keys' | 'admin' | 'mothership'
 
 /**
  * Settings a self-hoster needs from the managed service: their profile, what
@@ -539,14 +533,6 @@ export const SETTINGS_SECTION_REGISTRY: readonly SettingsSectionRegistryEntry[]
       order: 1,
       organizationSection: 'connected-accounts',
     },
-    planes: {
-      account: {
-        id: 'connected-accounts',
-        group: 'account',
-        order: 3,
-        description: 'Manage accounts you have contributed to organizations.',
-      },
-    },
   },
   {
     label: 'Custom tools',

apps/sim/ee/credential-groups/components/organization-account-people.test.tsx

@@ -2,56 +2,31 @@
 import { act } from 'react'
 import { NuqsTestingAdapter } from 'nuqs/adapters/testing'
 import { createRoot, type Root } from 'react-dom/client'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 
 const mocks = vi.hoisted(() => ({
   people: vi.fn(),
   resend: vi.fn(),
   revoke: vi.fn(),
-  disconnect: vi.fn(),
   reset: vi.fn(),
   resendState: { isPending: false, error: null as Error | null },
   revokeState: { isPending: false, error: null as Error | null },
 }))
 vi.mock('@/hooks/queries/organization-accounts', () => ({
   useOrganizationAccountPeople: mocks.people,
-  usePersonalOrganizationAccounts: () => ({
-    data: {
-      pages: [
-        {
-          accounts: [
-            {
-              credentialId: 'credential-1',
-              displayName: 'Personal Gmail',
-              organizationName: 'Example organization',
-              providerId: 'gmail',
-              status: 'active',
-              canReconnect: true,
-            },
-          ],
-        },
-      ],
-    },
-  }),
   useResendOrganizationAccountInvitation: () => ({ ...mocks.resendState, mutate: mocks.resend }),
   useRevokeOrganizationAccountEnrollment: () => ({
     ...mocks.revokeState,
     mutate: mocks.revoke,
     reset: mocks.reset,
   }),
-  useReconnectPersonalOrganizationAccount: () => ({}),
-  useDisconnectPersonalOrganizationAccount: () => ({
-    mutate: mocks.disconnect,
-    reset: mocks.reset,
-  }),
 }))
 vi.mock('@/ee/credential-groups/components/organization-account-invite-modal', () => ({
   OrganizationAccountInviteModal: () => null,
 }))
 
 import { SettingsHeaderProvider, SettingsHeaderShell } from '@/components/settings/settings-header'
 import { OrganizationAccountPeople } from '@/ee/credential-groups/components/organization-account-people'
-import { PersonalOrganizationAccounts } from '@/ee/credential-groups/components/personal-organization-accounts'
 
 let root: Root
 let container: HTMLDivElement
@@ -111,11 +86,6 @@ async function selectPersonAction(label: string) {
   return action
 }
 
-async function openConfirmation(label: string) {
-  if (label === 'Revoke') await selectPersonAction(label)
-  else await act(async () => button(container, label).click())
-}
-
 async function renderPeople(searchConnection?: { optionId: string; providerName: string }) {
   await act(async () =>
     root.render(
@@ -156,58 +126,28 @@ it('keeps the compact People rows and resends from the actions menu', async () =
   )
 })
 
-const cases = [
-  {
-    label: 'Revoke',
-    component: <OrganizationAccountPeople organizationId='organization-1' />,
-    mutation: mocks.revoke,
-    target: 'person@example.com',
-    input: { organizationId: 'organization-1', enrollmentId: 'enrollment-1' },
-  },
-  {
-    label: 'Disconnect',
-    component: <PersonalOrganizationAccounts />,
-    mutation: mocks.disconnect,
-    target: 'Personal Gmail',
-    input: 'credential-1',
-  },
-] as const
-
-describe.each(cases)(
-  '$label organization account access',
-  ({ label, component, mutation, target, input }) => {
-    it('requires confirmation, allows cancellation, and never submits from an unfocused Enter', async () => {
-      await act(async () =>
-        root.render(
-          <NuqsTestingAdapter hasMemory>
-            <SettingsHeaderProvider>
-              <SettingsHeaderShell>{component}</SettingsHeaderShell>
-            </SettingsHeaderProvider>
-          </NuqsTestingAdapter>
-        )
-      )
-      await openConfirmation(label)
-      let dialog = document.querySelector('[role="dialog"]')
-      expect(dialog?.textContent).toContain(target)
-      expect(mutation).not.toHaveBeenCalled()
-      await act(async () =>
-        dialog?.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter', bubbles: true }))
-      )
-      expect(mutation).not.toHaveBeenCalled()
-      if (!dialog) throw new Error('Missing confirmation dialog')
-      await act(async () => button(dialog, 'Cancel').click())
-      expect(mutation).not.toHaveBeenCalled()
-      await openConfirmation(label)
-      dialog = document.querySelector('[role="dialog"]')
-      if (!dialog) throw new Error('Missing confirmation dialog')
-      await act(async () => button(dialog, label).click())
-      expect(mutation).toHaveBeenCalledExactlyOnceWith(
-        input,
-        expect.objectContaining({ onSuccess: expect.any(Function) })
-      )
-    })
-  }
-)
+it('requires revoke confirmation, allows cancellation, and never submits from an unfocused Enter', async () => {
+  await renderPeople()
+  await selectPersonAction('Revoke')
+  let dialog = document.querySelector('[role="dialog"]')
+  expect(dialog?.textContent).toContain('person@example.com')
+  expect(mocks.revoke).not.toHaveBeenCalled()
+  await act(async () =>
+    dialog?.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter', bubbles: true }))
+  )
+  expect(mocks.revoke).not.toHaveBeenCalled()
+  if (!dialog) throw new Error('Missing confirmation dialog')
+  await act(async () => button(dialog, 'Cancel').click())
+  expect(mocks.revoke).not.toHaveBeenCalled()
+  await selectPersonAction('Revoke')
+  dialog = document.querySelector('[role="dialog"]')
+  if (!dialog) throw new Error('Missing confirmation dialog')
+  await act(async () => button(dialog, 'Revoke').click())
+  expect(mocks.revoke).toHaveBeenCalledExactlyOnceWith(
+    { organizationId: 'organization-1', enrollmentId: 'enrollment-1' },
+    expect.objectContaining({ onSuccess: expect.any(Function) })
+  )
+})
 
 it('restores the existing People URL search and requests server-filtered results', async () => {
   mocks.people.mockReturnValue({ data: { pages: [{ enrollments: [] }] }, hasNextPage: false })