fix(settings): keep organization settings inline without Sim Search

Author: TheodoreSpeaks

apps/sim/app/o/[organizationId]/home/page.test.tsx

@@ -101,9 +101,11 @@ describe('organization Search page gates', () => {
     expect(mocks.context).not.toHaveBeenCalled()
   })
 
-  it('lands the organization entry on Members settings when Search is disabled', async () => {
+  it('returns the organization entry to workspace settings when Search is disabled', async () => {
     mocks.context.mockResolvedValue({ searchAccess: { memberScoped: false } })
-    await expect(OrganizationPage({ params })).rejects.toThrow('redirect:/o/org-1/settings/members')
+    await expect(OrganizationPage({ params })).rejects.toThrow(
+      'redirect:/workspace?redirect=settings'
+    )
     expect(mocks.context).toHaveBeenCalledWith('org-1', 'viewer')
   })
 

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

@@ -123,8 +123,7 @@ describe('OrganizationLayout', () => {
       {},
       'org-1',
       { kind: 'session', userId: 'viewer-1', sessionId: 'session-1' },
-      'active-org',
-      true
+      'active-org'
     )
     expect(html).toContain('Organization child')
     expect(mockUseMothershipChatEvents).toHaveBeenCalledWith(
@@ -159,15 +158,14 @@ describe('OrganizationLayout', () => {
       {},
       'org-1',
       { kind: 'session', userId: 'viewer-1', sessionId: 'session-1' },
-      null,
-      true
+      null
     )
     expect(html).toContain('Impersonating QA Member (member@example.com)')
     expect(html).toContain('Stop impersonating')
     expect(html.indexOf('Stop impersonating')).toBeLessThan(html.indexOf('Organization child'))
   })
 
-  it('uses the impersonated member to open settings when Search is disabled', async () => {
+  it('does not use the impersonating admin to enter an organization outside the rollout', async () => {
     mockGetSession.mockResolvedValue({
       user: { id: 'customer-member' },
       session: { id: 'session-1', impersonatedBy: 'platform-admin' },
@@ -177,24 +175,18 @@ describe('OrganizationLayout', () => {
       searchAccess: { memberScoped: false, sourceMirrored: false },
     })
 
-    const html = renderToStaticMarkup(
-      await OrganizationLayout({
+    await expect(
+      OrganizationLayout({
         children: <div>Organization child</div>,
         params: Promise.resolve({ organizationId: 'customer-org' }),
       })
-    )
+    ).rejects.toThrow('redirect:/workspace?redirect=settings')
     expect(mockGetOrganizationSurfaceContext).toHaveBeenCalledWith(
       'customer-org',
       'customer-member'
     )
-    expect(html).toContain('Organization child')
-    expect(mockPrefetchOrganizationSidebar).toHaveBeenCalledWith(
-      {},
-      'customer-org',
-      { kind: 'session', userId: 'customer-member', sessionId: 'session-1' },
-      null,
-      false
-    )
+    expect(mockWorkspaceChrome).not.toHaveBeenCalled()
+    expect(mockPrefetchOrganizationSidebar).not.toHaveBeenCalled()
   })
 
   it('renders an explicit denial for a non-member without the surface', async () => {
@@ -213,32 +205,22 @@ describe('OrganizationLayout', () => {
   })
 
   it.each(['owner', 'admin', 'member'])(
-    'renders organization settings for a %s when Search is disabled',
+    'returns %s viewers outside the rollout to workspace settings before rendering org chrome',
     async (role) => {
       mockGetOrganizationSurfaceContext.mockResolvedValue({
         ...SURFACE_CONTEXT,
         viewer: { role, isAdmin: role !== 'member' },
         searchAccess: { memberScoped: false, sourceMirrored: true },
       })
 
-      const html = renderToStaticMarkup(
-        await OrganizationLayout({
+      await expect(
+        OrganizationLayout({
           children: <div>Organization settings</div>,
           params: Promise.resolve({ organizationId: 'org-1' }),
         })
-      )
-      expect(html).toContain('Organization settings')
-      expect(mockPrefetchOrganizationSidebar).toHaveBeenCalledWith(
-        {},
-        'org-1',
-        { kind: 'session', userId: 'viewer-1', sessionId: 'session-1' },
-        'active-org',
-        false
-      )
-      expect(mockUseMothershipChatEvents).toHaveBeenCalledWith(
-        undefined,
-        SURFACE_CONTEXT.deployment.chatEnabled
-      )
+      ).rejects.toThrow('redirect:/workspace?redirect=settings')
+      expect(mockWorkspaceChrome).not.toHaveBeenCalled()
+      expect(mockPrefetchOrganizationSidebar).not.toHaveBeenCalled()
     }
   )
 

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

@@ -3,7 +3,7 @@ import { cookies } from 'next/headers'
 import { redirect } from 'next/navigation'
 import { getSession } from '@/lib/auth'
 import { getActiveOrganizationId } from '@/lib/auth/session-response'
-import { organizationRoutes } from '@/lib/navigation/paths'
+import { organizationRoutes, WORKSPACE_SETTINGS_PATH } from '@/lib/navigation/paths'
 import { getOrganizationSurfaceContext } from '@/lib/organizations/surface'
 import { getQueryClient } from '@/app/_shell/providers/get-query-client'
 import { buildAuthCrossLink } from '@/app/(auth)/auth-redirect'
@@ -18,8 +18,9 @@ import { GlobalCommandsProvider } from '@/app/workspace/[workspaceId]/providers/
 
 /**
  * The organization surface: the viewer's own view of one organization, outside
- * any workspace. Requires membership; Search availability is checked by the
- * individual pages and controls that use it.
+ * any workspace. Requires membership and the organization's Search rollout.
+ * Non-members get an explicit denial; members outside the rollout retain
+ * workspace settings, including when following a saved organization link.
  */
 export default async function OrganizationLayout({
   children,
@@ -47,12 +48,13 @@ export default async function OrganizationLayout({
   if (!context) {
     return <OrganizationAccessDenied />
   }
+  if (!context.searchAccess.memberScoped) redirect(WORKSPACE_SETTINGS_PATH)
+
   await prefetchOrganizationSidebar(
     queryClient,
     organizationId,
     { kind: 'session', userId: session.user.id, sessionId: session.session.id },
-    getActiveOrganizationId(session),
-    context.searchAccess.memberScoped
+    getActiveOrganizationId(session)
   )
 
   const initialSidebarCollapsed = cookieStore.get('sidebar_collapsed')?.value === '1'

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

@@ -1,6 +1,6 @@
 import { notFound, redirect } from 'next/navigation'
 import { getSession } from '@/lib/auth'
-import { organizationRoutes } from '@/lib/navigation/paths'
+import { organizationRoutes, WORKSPACE_SETTINGS_PATH } from '@/lib/navigation/paths'
 import { getOrganizationSurfaceContext } from '@/lib/organizations/surface'
 import { buildAuthCrossLink } from '@/app/(auth)/auth-redirect'
 
@@ -17,5 +17,5 @@ export default async function OrganizationPage({
   }
   const context = await getOrganizationSurfaceContext(organizationId, session.user.id)
   if (!context) notFound()
-  redirect(context.searchAccess.memberScoped ? routes.home : routes.settingsSection('members'))
+  redirect(context.searchAccess.memberScoped ? routes.home : WORKSPACE_SETTINGS_PATH)
 }

apps/sim/app/o/[organizationId]/prefetch.test.ts

@@ -61,8 +61,8 @@ function makeClient() {
   return new QueryClient({ defaultOptions: { queries: { retry: false } } })
 }
 
-function prefetch(client: QueryClient, searchAvailable = true) {
-  return prefetchOrganizationSidebar(client, 'route-org', PRINCIPAL, 'active-org', searchAvailable)
+function prefetch(client: QueryClient) {
+  return prefetchOrganizationSidebar(client, 'route-org', PRINCIPAL, 'active-org')
 }
 
 describe('organization sidebar hydration', () => {
@@ -132,16 +132,6 @@ describe('organization sidebar hydration', () => {
     expect(dehydrate(client).queries).toHaveLength(3)
   })
 
-  it('hydrates workspace and profile data without loading Search chats when Search is disabled', async () => {
-    const client = makeClient()
-    await prefetch(client, false)
-
-    expect(mockListOrganizationChats).not.toHaveBeenCalled()
-    expect(client.getQueryState(CHAT_KEY)).toBeUndefined()
-    expect(client.getQueryData(workspaceKeys.list('active'))).toMatchObject(WORKSPACES)
-    expect(client.getQueryData(userProfileKeys.profile())).toMatchObject({ name: 'Ada' })
-  })
-
   it('caches an empty chat list but leaves empty workspaces for the client creation path', async () => {
     mockListOrganizationChats.mockResolvedValue([])
     mockListWorkspacesForViewer.mockResolvedValue({ ...WORKSPACES, workspaces: [] })

apps/sim/app/o/[organizationId]/prefetch.ts

@@ -18,22 +18,20 @@ export async function prefetchOrganizationSidebar(
   queryClient: QueryClient,
   organizationId: string,
   principal: SessionPrincipal,
-  activeOrganizationId: string | null,
-  searchAvailable: boolean
+  activeOrganizationId: string | null
 ): Promise<void> {
   await Promise.all([
-    searchAvailable &&
-      queryClient.prefetchQuery({
-        queryKey: mothershipChatKeys.organizationList(organizationId, 'active'),
-        queryFn: async () => {
-          const chats = await listOrganizationChats.execute({
-            principal,
-            input: { organizationId, scope: 'active' },
-          })
-          return chats.map(mapChat)
-        },
-        staleTime: MOTHERSHIP_CHAT_LIST_STALE_TIME,
-      }),
+    queryClient.prefetchQuery({
+      queryKey: mothershipChatKeys.organizationList(organizationId, 'active'),
+      queryFn: async () => {
+        const chats = await listOrganizationChats.execute({
+          principal,
+          input: { organizationId, scope: 'active' },
+        })
+        return chats.map(mapChat)
+      },
+      staleTime: MOTHERSHIP_CHAT_LIST_STALE_TIME,
+    }),
     seedWorkspaceList(queryClient, principal.userId, activeOrganizationId),
     prefetchUserProfile(queryClient, principal.userId),
   ])

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

@@ -112,17 +112,17 @@ describe('WorkspaceSettingsSectionPage', () => {
   })
 
   it.each(Object.entries(UNIFIED_TO_ORGANIZATION_SECTION))(
-    'routes %s to organization %s when Search is disabled',
-    async (section, organizationSection) => {
+    'keeps %s in the workspace outside the organization rollout',
+    async (section) => {
       mockGetHostContext.mockResolvedValue({
         hostOrganizationId: 'org-target',
         features: { organizationSearch: false, knowledgeMemberAccess: true },
       })
 
-      await expect(WorkspaceSettingsSectionPage(pageProps(section))).rejects.toThrow(
-        `NEXT_REDIRECT:/o/org-target/settings/${organizationSection}`
-      )
-      expect(mockSectionPrefetch).not.toHaveBeenCalled()
+      const element = await WorkspaceSettingsSectionPage(pageProps(section))
+
+      expect(element).toBeTruthy()
+      expect(mockRedirect).not.toHaveBeenCalled()
       expect(mockAuthorizeSection).toHaveBeenCalledWith({
         workspaceId: 'workspace-b',
         userId: 'viewer-a',
@@ -132,19 +132,19 @@ describe('WorkspaceSettingsSectionPage', () => {
   )
 
   it.each([undefined, { credentialGroups: true, knowledgeMemberAccess: true }])(
-    'routes settings to the organization when older host context omits Search availability',
+    'keeps settings in the workspace when older host context omits the org rollout',
     async (features) => {
       mockGetHostContext.mockResolvedValue({ hostOrganizationId: 'org-target', features })
 
-      await expect(WorkspaceSettingsSectionPage(pageProps('billing'))).rejects.toThrow(
-        'NEXT_REDIRECT:/o/org-target/settings/billing'
-      )
-      expect(mockSectionPrefetch).not.toHaveBeenCalled()
+      await WorkspaceSettingsSectionPage(pageProps('billing'))
+
+      expect(mockRedirect).not.toHaveBeenCalled()
+      expect(mockSectionPrefetch).toHaveBeenCalledTimes(1)
     }
   )
 
   it.each(Object.entries(UNIFIED_TO_ORGANIZATION_SECTION))(
-    'routes %s to organization %s when Search is enabled',
+    'routes %s to organization %s only within the organization rollout',
     async (section, organizationSection) => {
       mockGetHostContext.mockResolvedValue({
         hostOrganizationId: 'org-target',

apps/sim/app/workspace/[workspaceId]/settings/[section]/page.tsx

@@ -60,7 +60,7 @@ export default async function WorkspaceSettingsSectionPage({
   const organizationSection = UNIFIED_TO_ORGANIZATION_SECTION[parsed]
   if (organizationSection) {
     const hostContext = await getWorkspaceHostContextForViewer(workspaceId, session.user.id)
-    if (hostContext?.hostOrganizationId) {
+    if (hostContext?.hostOrganizationId && hostContext.features?.organizationSearch) {
       const query = new URLSearchParams()
       for (const [key, value] of Object.entries((await searchParams) ?? {})) {
         for (const entry of Array.isArray(value) ? value : value === undefined ? [] : [value]) {

apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.test.tsx

@@ -0,0 +1,65 @@
+/**
+ * @vitest-environment jsdom
+ */
+import { act, type ComponentType, lazy, type ReactNode, Suspense } from 'react'
+import { createRoot } from 'react-dom/client'
+import { expect, it, vi } from 'vitest'
+
+vi.mock('next/dynamic', () => ({
+  default: (load: () => Promise<ComponentType>) => lazy(async () => ({ default: await load() })),
+}))
+vi.mock('posthog-js/react', () => ({ usePostHog: () => null }))
+vi.mock('@/lib/posthog/client', () => ({ captureEvent: vi.fn() }))
+vi.mock('@/lib/auth/auth-client', () => ({
+  useSession: () => ({ data: { user: { id: 'viewer-1', role: 'user' } }, isPending: false }),
+}))
+vi.mock('@/lib/core/config/deployment-shape', () => ({
+  useDeploymentShape: () => ({ billingEnabled: false }),
+}))
+vi.mock('@/app/workspace/[workspaceId]/providers/workspace-host-provider', () => ({
+  useWorkspaceHostContext: () => ({
+    hostOrganizationId: 'organization-1',
+    workspace: { id: 'workspace-1' },
+  }),
+}))
+vi.mock('@/app/workspace/[workspaceId]/settings/components/general/general', () => ({
+  General: () => <div>General settings</div>,
+}))
+vi.mock(
+  '@/app/workspace/[workspaceId]/settings/components/team-management/team-management',
+  () => ({
+    TeamManagement: ({ organizationId }: { organizationId: string }) => (
+      <div>Members of {organizationId}</div>
+    ),
+  })
+)
+vi.mock('@/app/workspace/[workspaceId]/settings/components/settings-panel', () => ({
+  SettingsSectionProvider: ({ children }: { children: ReactNode }) => children,
+}))
+vi.mock('@/app/workspace/[workspaceId]/settings/navigation', () => ({
+  getSettingsSectionMeta: () => null,
+}))
+
+import { SettingsPage } from '@/app/workspace/[workspaceId]/settings/[section]/settings'
+
+it('renders the inline member roster with billing disabled, while billing stays unavailable', async () => {
+  ;(globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true
+  const container = document.createElement('div')
+  const root = createRoot(container)
+  try {
+    await act(async () => {
+      root.render(
+        <Suspense>
+          <SettingsPage section='organization' />
+        </Suspense>
+      )
+    })
+    expect(container).toHaveTextContent('Members of organization-1')
+    expect(container).not.toHaveTextContent('General settings')
+
+    await act(async () => root.render(<SettingsPage section='billing' />))
+    expect(container).toHaveTextContent('General settings')
+  } finally {
+    act(() => root.unmount())
+  }
+})

apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx

@@ -138,7 +138,7 @@ export function SettingsPage({ section }: SettingsPageProps) {
   const normalizedSection: SettingsSection =
     (section as string) === 'subscription' ? 'billing' : section
   const effectiveSection =
-    !billingEnabled && (normalizedSection === 'billing' || normalizedSection === 'organization')
+    !billingEnabled && normalizedSection === 'billing'
       ? 'general'
       : normalizedSection === 'admin' && !sessionLoading && !isAdminRole
         ? 'general'
@@ -192,7 +192,7 @@ export function SettingsPage({ section }: SettingsPageProps) {
         />
       )}
       {effectiveSection === 'teammates' && <Teammates />}
-      {billingEnabled && effectiveSection === 'organization' && organizationId && (
+      {effectiveSection === 'organization' && organizationId && (
         <TeamManagement
           organizationId={organizationId}
           billingHref={`/workspace/${hostContext.workspace.id}/settings/billing`}