fix(access): preserve standalone requests on navigation lookup failures

Author: waleedlatif1

apps/sim/app/access-requests/page.test.tsx

@@ -18,6 +18,7 @@ vi.mock('@/ee/access-requests/components/organization-access-requests', () => ({
 }))
 
 import AccessRequestsPage from '@/app/access-requests/page'
+import { MyAccessRequests } from '@/ee/access-requests/components/my-access-requests'
 
 describe('access request sign-in redirect', () => {
   beforeEach(() => {
@@ -124,4 +125,20 @@ describe('access request sign-in redirect', () => {
     expect(redirect).not.toHaveBeenCalled()
     expect(organizationContext).not.toHaveBeenCalled()
   })
+
+  it('renders the standalone requester when the optional organization navigation lookup fails', async () => {
+    authMockFns.mockGetSession.mockResolvedValue({ user: { id: 'viewer' } })
+    organizationContext.mockRejectedValue(new Error('Organization context unavailable'))
+
+    const page = await AccessRequestsPage({
+      searchParams: Promise.resolve({ organizationId: 'organization', requestId: 'request' }),
+    })
+
+    expect(redirect).not.toHaveBeenCalled()
+    expect(page.props.children.type).toBe(MyAccessRequests)
+    expect(page.props.children.props).toEqual({
+      scope: { kind: 'organization', organizationId: 'organization' },
+      standalone: true,
+    })
+  })
 })

apps/sim/app/access-requests/page.tsx

@@ -1,5 +1,6 @@
 import { Suspense } from 'react'
 import { ChipLink } from '@sim/emcn'
+import { createLogger } from '@sim/logger'
 import type { Metadata } from 'next'
 import { redirect } from 'next/navigation'
 import { createSearchParamsCache, createSerializer } from 'nuqs/server'
@@ -28,6 +29,7 @@ interface AccessRequestsPageProps {
 const entrySearchParams = createSearchParamsCache(accessRequestEntrySearchParams)
 const serializeEntrySearchParams = createSerializer(accessRequestEntrySearchParams)
 const serializeRequesterSearchParams = createSerializer(accessRequestSearchParams)
+const logger = createLogger('AccessRequestsPage')
 
 /** Session-only entry so access requests remain reachable outside the organization Search rollout. */
 export default async function AccessRequestsPage({ searchParams }: AccessRequestsPageProps) {
@@ -53,7 +55,13 @@ export default async function AccessRequestsPage({ searchParams }: AccessRequest
   }
 
   if (params.view !== 'admin') {
-    const context = await getOrganizationSurfaceContext(params.organizationId, session.user.id)
+    const context = await getOrganizationSurfaceContext(
+      params.organizationId,
+      session.user.id
+    ).catch((error) => {
+      logger.warn('Unable to resolve organization navigation for access requests', { error })
+      return null
+    })
     if (context?.searchAccess.memberScoped) {
       redirect(
         serializeRequesterSearchParams(organizationRoutes(params.organizationId).accessRequests, {