fix(integrations): keep the workspace gallery until the organization is on the Platform

Workspace Integrations sent every member of an organization with member Search to the
organization surface, which lists only Search connections, so they lost the workspace
credential gallery. Only an organization on the Platform has an integration center that
replaces it, so the host context now reports the platform-org-ui rollout and the link and
redirect follow it. Everyone else keeps the workspace routes, as on staging.

Author: waleedlatif1

apps/sim/lib/api/contracts/workspaces.ts

@@ -291,6 +291,11 @@ export const workspaceHostContextSchema = z.object({
       organizationSearch: z.boolean().optional(),
       /** Optional for rolling compatibility with app versions that predate the flag. */
       knowledgeMemberAccess: z.boolean().optional(),
+      /**
+       * Whether the host organization is on the Platform, whose integration center replaces the
+       * workspace's. Optional for rolling compatibility; absent keeps Integrations in the workspace.
+       */
+      platformOrgUi: z.boolean().optional(),
       /** Optional for rolling compatibility with app versions that predate administrator mode. */
       knowledgeSourceMirroredAccess: z.boolean().optional(),
       /**

apps/sim/lib/navigation/paths.test.ts

@@ -0,0 +1,45 @@
+/**
+ * @vitest-environment node
+ *
+ * Failure mode: a workspace member sent to the organization surface, which lists only Search
+ * connections, loses the workspace credential gallery. Only an organization on the Platform has an
+ * integration center that replaces it.
+ */
+import { describe, expect, it } from 'vitest'
+import { workspaceIntegrationsPath } from '@/lib/navigation/paths'
+
+const WORKSPACE = '/workspace/ws-1/integrations'
+
+describe('where a workspace’s Integrations lead', () => {
+  it.each([
+    ['a standalone workspace', { hostOrganizationId: null, features: {} }],
+    [
+      'a standalone workspace, even with stale organization features',
+      { hostOrganizationId: null, features: { organizationSearch: true, platformOrgUi: true } },
+    ],
+    [
+      'an organization with member Search but not on the Platform',
+      { hostOrganizationId: 'org-1', features: { organizationSearch: true, platformOrgUi: false } },
+    ],
+    [
+      'an app version that predates the Platform field',
+      { hostOrganizationId: 'org-1', features: { organizationSearch: true } },
+    ],
+    [
+      'a Platform organization the viewer cannot search in',
+      { hostOrganizationId: 'org-1', features: { organizationSearch: false, platformOrgUi: true } },
+    ],
+    ['an unresolved host context', null],
+  ])('stay in the workspace for %s', (_name, context) => {
+    expect(workspaceIntegrationsPath('ws-1', context)).toBe(WORKSPACE)
+  })
+
+  it('lead a member of a Platform organization to its integration center', () => {
+    expect(
+      workspaceIntegrationsPath('ws-1', {
+        hostOrganizationId: 'org-1',
+        features: { organizationSearch: true, platformOrgUi: true },
+      })
+    ).toBe('/o/org-1/integrations')
+  })
+})

apps/sim/lib/navigation/paths.ts

@@ -61,15 +61,21 @@ export function organizationRoutes(organizationId: string) {
 
 interface WorkspaceIntegrationContext {
   hostOrganizationId: string | null
-  features?: { organizationSearch?: boolean }
+  features?: { organizationSearch?: boolean; platformOrgUi?: boolean }
 }
 
-/** Organization members use the center; standalone workspaces retain their credential routes. */
+/**
+ * Members of an organization on the Platform use its integration center, which replaces the
+ * workspace's. Everyone else keeps the workspace credential routes: the organization surface lists
+ * only Search connections, so sending them there would hide their workspace credentials.
+ */
 export function workspaceIntegrationsPath(
   workspaceId: string,
   context: WorkspaceIntegrationContext | null
 ) {
-  return context?.features?.organizationSearch && context.hostOrganizationId
+  return context?.features?.organizationSearch &&
+    context.features.platformOrgUi &&
+    context.hostOrganizationId
     ? organizationRoutes(context.hostOrganizationId).integrations
     : `/workspace/${workspaceId}/integrations`
 }

apps/sim/lib/workspaces/host-context.test.ts

@@ -10,10 +10,13 @@ import {
 import { permissionsMock, permissionsMockFns } from '@sim/testing/mocks/permissions.mock'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-const { mockGetOrganizationSettingsAccess } = vi.hoisted(() => ({
+const { mockGetOrganizationSettingsAccess, mockIsPlatformOrgUiEnabled } = vi.hoisted(() => ({
   mockGetOrganizationSettingsAccess: vi.fn(),
+  mockIsPlatformOrgUiEnabled: vi.fn(),
 }))
 
+vi.mock('@/lib/platform/rollout', () => ({ isPlatformOrgUiEnabled: mockIsPlatformOrgUiEnabled }))
+
 vi.mock('@/lib/credential-groups/scoped-availability', () => credentialGroupsAvailabilityMock)
 
 vi.mock('@/lib/workspaces/permissions/utils', () => permissionsMock)
@@ -77,6 +80,7 @@ describe('getWorkspaceHostContextForViewer', () => {
       sourceMirrored: true,
     })
     mockIsKnowledgeMemberAccessAvailable.mockResolvedValue(true)
+    mockIsPlatformOrgUiEnabled.mockResolvedValue(false)
   })
 
   it.each([
@@ -102,6 +106,7 @@ describe('getWorkspaceHostContextForViewer', () => {
       expect(context?.features).toEqual({
         credentialGroups: true,
         organizationSearch,
+        platformOrgUi: false,
         knowledgeMemberAccess: workspaceKnowledge,
         knowledgeSourceMirroredAccess: workspaceKnowledge,
         chat: true,
@@ -134,9 +139,29 @@ describe('getWorkspaceHostContextForViewer', () => {
     })
     expect(context?.hostOrganizationId).toBe('org-host')
     expect(context?.features?.organizationSearch).toBe(false)
+    expect(context?.features?.platformOrgUi).toBe(false)
     expect(mockIsKnowledgeMemberAccessAvailable).not.toHaveBeenCalled()
+    expect(mockIsPlatformOrgUiEnabled).not.toHaveBeenCalled()
   })
 
+  it.each([true, false])(
+    'reports the host organization’s Platform rollout (%s) to its members',
+    async (enabled) => {
+      mockCheckWorkspaceAccess.mockResolvedValue(accessibleWorkspace('write', 'org-host'))
+      mockGetOrganizationSettingsAccess.mockResolvedValue({
+        role: 'member',
+        isMember: true,
+        isAdmin: false,
+      })
+      mockIsPlatformOrgUiEnabled.mockResolvedValue(enabled)
+
+      const context = await getWorkspaceHostContextForViewer('workspace-1', 'member-1')
+
+      expect(context?.features?.platformOrgUi).toBe(enabled)
+      expect(mockIsPlatformOrgUiEnabled).toHaveBeenCalledExactlyOnceWith('org-host')
+    }
+  )
+
   it('returns null before loading entitlements when the viewer has no access', async () => {
     mockCheckWorkspaceAccess.mockResolvedValue({
       exists: true,

apps/sim/lib/workspaces/host-context.ts

@@ -9,6 +9,7 @@ import {
   resolveKnowledgeAccessAvailability,
 } from '@/lib/knowledge/access/availability'
 import { getOrganizationSettingsAccess } from '@/lib/organizations/settings-access'
+import { isPlatformOrgUiEnabled } from '@/lib/platform/rollout'
 import { checkWorkspaceAccess } from '@/lib/workspaces/permissions/utils'
 
 /**
@@ -34,24 +35,28 @@ async function resolveWorkspaceHostContextForViewer(
       ? getOrganizationSettingsAccess(hostOrganizationId, userId)
       : Promise.resolve({ role: null, isMember: false, isAdmin: false }),
   ])
-  const [credentialGroupsAvailable, knowledgeAccess, organizationSearch, chat] = await Promise.all([
-    hostOrganizationId
-      ? isScopedCredentialGroupsAvailable({
-          kind: 'organization',
-          organizationId: hostOrganizationId,
-        })
-      : Promise.resolve(false),
-    resolveKnowledgeAccessAvailability({ workspaceId, ownerBilling }),
-    hostOrganizationId && hostOrganizationAccess.isMember
-      ? isKnowledgeMemberAccessAvailable({ organizationId: hostOrganizationId })
-      : Promise.resolve(false),
-    payerHasChatAccess({
-      billingEntity: ownerBilling.organizationId
-        ? { type: 'organization', id: ownerBilling.organizationId }
-        : { type: 'user', id: access.workspace.billedAccountUserId },
-      payerSubscription: { plan: ownerBilling.plan },
-    }),
-  ])
+  const [credentialGroupsAvailable, knowledgeAccess, organizationSearch, chat, platformOrgUi] =
+    await Promise.all([
+      hostOrganizationId
+        ? isScopedCredentialGroupsAvailable({
+            kind: 'organization',
+            organizationId: hostOrganizationId,
+          })
+        : Promise.resolve(false),
+      resolveKnowledgeAccessAvailability({ workspaceId, ownerBilling }),
+      hostOrganizationId && hostOrganizationAccess.isMember
+        ? isKnowledgeMemberAccessAvailable({ organizationId: hostOrganizationId })
+        : Promise.resolve(false),
+      payerHasChatAccess({
+        billingEntity: ownerBilling.organizationId
+          ? { type: 'organization', id: ownerBilling.organizationId }
+          : { type: 'user', id: access.workspace.billedAccountUserId },
+        payerSubscription: { plan: ownerBilling.plan },
+      }),
+      hostOrganizationId && hostOrganizationAccess.isMember
+        ? isPlatformOrgUiEnabled(hostOrganizationId)
+        : Promise.resolve(false),
+    ])
 
   return {
     workspace: {
@@ -72,6 +77,7 @@ async function resolveWorkspaceHostContextForViewer(
     features: {
       credentialGroups: credentialGroupsAvailable,
       organizationSearch,
+      platformOrgUi,
       knowledgeMemberAccess: knowledgeAccess.memberScoped,
       knowledgeSourceMirroredAccess: knowledgeAccess.sourceMirrored,
       chat,