fix(integrations): preserve connect deep links

Author: TheodoreSpeaks

apps/sim/app/workspace/[workspaceId]/integrations/[block]/integration-block-detail.tsx

@@ -24,7 +24,10 @@ import {
 } from '@/app/workspace/[workspaceId]/integrations/components/connect-service-account-modal'
 import { IntegrationSection } from '@/app/workspace/[workspaceId]/integrations/components/integration-section'
 import { IntegrationTile } from '@/app/workspace/[workspaceId]/integrations/components/integrations-showcase'
-import { CONNECT_MODE } from '@/app/workspace/[workspaceId]/integrations/connect-route'
+import {
+  CONNECT_MODE,
+  resolveAvailableConnectMode,
+} from '@/app/workspace/[workspaceId]/integrations/connect-route'
 import { useScrollRestoration } from '@/app/workspace/[workspaceId]/integrations/hooks/use-scroll-restoration'
 import {
   RESOURCE_LIST_STACK,
@@ -109,9 +112,15 @@ export function IntegrationBlockDetail({ integration, workspaceId }: Integration
   useEffect(() => {
     if (hasHandledConnectQueryRef.current || !connectMode || permissionConfigLoading) return
 
-    if (connectMode === CONNECT_MODE.oauth && oauthService && oauthAvailable) {
+    const availableConnectMode = resolveAvailableConnectMode(connectMode, {
+      oauth: Boolean(oauthService) && oauthAvailable,
+      serviceAccount: hasServiceAccount,
+    })
+    if (!availableConnectMode) return
+
+    if (availableConnectMode === CONNECT_MODE.oauth) {
       setOAuthOpen(true)
-    } else if (connectMode === CONNECT_MODE.serviceAccount && hasServiceAccount) {
+    } else {
       setServiceAccountOpen(true)
     }
 

apps/sim/app/workspace/[workspaceId]/integrations/connect-route.test.ts

@@ -0,0 +1,39 @@
+import { describe, expect, it } from 'vitest'
+import {
+  CONNECT_MODE,
+  resolveAvailableConnectMode,
+} from '@/app/workspace/[workspaceId]/integrations/connect-route'
+
+describe('resolveAvailableConnectMode', () => {
+  it('keeps a service-account deep link pending until its modal is available', () => {
+    expect(
+      resolveAvailableConnectMode(CONNECT_MODE.serviceAccount, {
+        oauth: false,
+        serviceAccount: false,
+      })
+    ).toBeNull()
+
+    expect(
+      resolveAvailableConnectMode(CONNECT_MODE.serviceAccount, {
+        oauth: false,
+        serviceAccount: true,
+      })
+    ).toBe(CONNECT_MODE.serviceAccount)
+  })
+
+  it('only resolves OAuth when OAuth is available', () => {
+    expect(
+      resolveAvailableConnectMode(CONNECT_MODE.oauth, {
+        oauth: false,
+        serviceAccount: true,
+      })
+    ).toBeNull()
+
+    expect(
+      resolveAvailableConnectMode(CONNECT_MODE.oauth, {
+        oauth: true,
+        serviceAccount: false,
+      })
+    ).toBe(CONNECT_MODE.oauth)
+  })
+})

apps/sim/app/workspace/[workspaceId]/integrations/connect-route.ts

@@ -10,3 +10,22 @@ export const CONNECT_MODE = {
   oauth: 'oauth',
   serviceAccount: 'service-account',
 } as const
+
+export type ConnectMode = (typeof CONNECT_MODE)[keyof typeof CONNECT_MODE]
+
+interface ConnectModeAvailability {
+  oauth: boolean
+  serviceAccount: boolean
+}
+
+/** `null` lets callers preserve the deep-link while deployment and block visibility hydrate. */
+export function resolveAvailableConnectMode(
+  connectMode: ConnectMode,
+  availability: ConnectModeAvailability
+): ConnectMode | null {
+  if (connectMode === CONNECT_MODE.oauth && availability.oauth) return connectMode
+  if (connectMode === CONNECT_MODE.serviceAccount && availability.serviceAccount) {
+    return connectMode
+  }
+  return null
+}