fix(navigation): restore organization return from shared workspaces

Author: TheodoreSpeaks

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/workspace-header.test.tsx

@@ -6,18 +6,14 @@ import { createRoot, type Root } from 'react-dom/client'
 import { renderToString } from 'react-dom/server'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
-const { mockNavigateToSettings, mockWorkspacePermissions, hostContext } = vi.hoisted(() => ({
+const { mockNavigateToSettings, mockWorkspacePermissions, organizationList } = vi.hoisted(() => ({
   mockNavigateToSettings: vi.fn(),
-  hostContext: {
-    hostOrganizationId: null as string | null,
-    viewer: { isHostOrganizationMember: false },
-    features: { organizationSearch: false as boolean | undefined },
-  },
+  organizationList: { data: [] as { id: string }[] | undefined },
   mockWorkspacePermissions: { canAdmin: true, canEdit: true, canRead: true },
 }))
 
-vi.mock('@/app/workspace/[workspaceId]/providers/workspace-host-provider', () => ({
-  useWorkspaceHostContext: () => hostContext,
+vi.mock('@/hooks/queries/organization', () => ({
+  useOrganizationList: () => organizationList,
 }))
 
 const onWorkspaceSwitch = vi.fn()
@@ -29,7 +25,6 @@ vi.mock('next/navigation', () => ({
   useRouter: () => ({ push: vi.fn() }),
   usePathname: () => '/workspace/ws-emir/home',
 }))
-vi.mock('@/lib/auth/auth-client', () => ({ useActiveOrganization: () => ({ data: null }) }))
 vi.mock('@/hooks/use-settings-navigation', () => ({
   useSettingsNavigation: () => ({
     navigateToSettings: mockNavigateToSettings,
@@ -170,9 +165,7 @@ function typeInto(input: HTMLInputElement, value: string) {
 
 beforeEach(() => {
   vi.clearAllMocks()
-  hostContext.hostOrganizationId = null
-  hostContext.viewer.isHostOrganizationMember = false
-  hostContext.features.organizationSearch = false
+  organizationList.data = []
   Object.assign(mockWorkspacePermissions, { canAdmin: true, canEdit: true, canRead: true })
   // jsdom implements neither; the component scrolls the active row into view.
   Element.prototype.scrollIntoView = vi.fn()
@@ -187,8 +180,7 @@ describe('WorkspaceHeader workspace switcher highlight', () => {
   it.each([null, 'organization'])(
     'keeps access requests out of the workspace switcher (%s)',
     (organizationId) => {
-      hostContext.hostOrganizationId = organizationId
-      render()
+      render({ workspaces: WORKSPACES.map((workspace) => ({ ...workspace, organizationId })) })
       expect(document.body).not.toHaveTextContent('My access requests')
       expect(document.body).not.toHaveTextContent('Review access requests')
     }
@@ -414,28 +406,24 @@ describe('WorkspaceHeader workspace switcher highlight', () => {
 })
 
 describe('WorkspaceHeader context navigation', () => {
-  it('links to the current host organization for enrolled members', () => {
-    hostContext.hostOrganizationId = 'host-org'
-    hostContext.viewer.isHostOrganizationMember = true
-    hostContext.features.organizationSearch = true
-    render()
-    expect(document.querySelector('a[href="/o/host-org"]')).toHaveTextContent(
-      'Back to organization'
-    )
-  })
+  it.each([null, 'another-organization', 'viewer-organization'])(
+    'links to the viewer organization landing independently of workspace host %s',
+    (organizationId) => {
+      organizationList.data = [{ id: 'viewer-organization' }]
+      render({ workspaces: WORKSPACES.map((workspace) => ({ ...workspace, organizationId })) })
+      expect(document.querySelector('a[href="/o"]')).toHaveTextContent('Back to organization')
+      expect(document.querySelector('a[href^="/o/"]')).toBeNull()
+    }
+  )
 
-  it.each([
-    { org: null, member: true, enabled: true },
-    { org: 'host-org', member: false, enabled: true },
-    { org: 'host-org', member: true, enabled: false },
-    { org: 'host-org', member: true, enabled: undefined },
-  ])('hides inaccessible organization navigation: %j', ({ org, member, enabled }) => {
-    hostContext.hostOrganizationId = org
-    hostContext.viewer.isHostOrganizationMember = member
-    hostContext.features.organizationSearch = enabled
-    render()
-    expect(document.querySelector('a[href^="/o/"]')).toBeNull()
-  })
+  it.each([[], undefined])(
+    'hides organization navigation without loaded memberships: %j',
+    (data) => {
+      organizationList.data = data
+      render()
+      expect(document.body).not.toHaveTextContent('Back to organization')
+    }
+  )
 
   it('keeps settings in the profile menu instead of duplicating it in the switcher', () => {
     render()

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/workspace-header.tsx

@@ -34,9 +34,7 @@ import { WorkspaceContextMenu } from '@/components/workspaces/workspace-context-
 import { useDeploymentShape } from '@/lib/core/config/deployment-shape'
 import { WORKSPACE_SEARCH_THRESHOLD } from '@/lib/workspaces/constants'
 import { getWorkspaceInitial } from '@/lib/workspaces/initials'
-import { getWorkspaceOrganizationHref } from '@/lib/workspaces/organization-navigation'
 import { InviteModal } from '@/app/workspace/[workspaceId]/components/invite-modal'
-import { useWorkspaceHostContext } from '@/app/workspace/[workspaceId]/providers/workspace-host-provider'
 import { useWorkspacePermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
 import { SidebarRenameRow } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/sidebar-rename-row'
 import { DeleteModal } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/delete-modal/delete-modal'
@@ -50,6 +48,7 @@ import {
   type WorkspaceCreationPolicy,
   workspaceKeys,
 } from '@/hooks/queries/workspace'
+import { useOrganizationNavigationHref } from '@/hooks/use-organization-navigation'
 import { usePermissionConfig } from '@/hooks/use-permission-config'
 import { useSettingsNavigation } from '@/hooks/use-settings-navigation'
 
@@ -273,8 +272,7 @@ function WorkspaceHeaderImpl({
 
   const { navigateToSettings } = useSettingsNavigation()
   const queryClient = useQueryClient()
-  const hostContext = useWorkspaceHostContext()
-  const organizationHref = getWorkspaceOrganizationHref(hostContext)
+  const organizationHref = useOrganizationNavigationHref()
 
   const activeWorkspaceFull = workspaces.find((w) => w.id === workspaceId) || null
   const isWorkspaceReady = !isWorkspacesLoading && activeWorkspaceFull !== null

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx

@@ -49,7 +49,6 @@ import { DOCS_URL, SLACK_COMMUNITY_URL } from '@/lib/help-links'
 import { SIM_RESOURCES_DRAG_TYPE } from '@/lib/mothership/resource-types'
 import { captureEvent } from '@/lib/posthog/client'
 import { LOGO_ACCEPT_ATTRIBUTE } from '@/lib/uploads/client/logo-file'
-import { getWorkspaceOrganizationHref } from '@/lib/workspaces/organization-navigation'
 import { useSidebarChrome } from '@/app/workspace/[workspaceId]/components/workspace-chrome'
 import { CONNECT_MODE } from '@/app/workspace/[workspaceId]/integrations/connect-route'
 import { useRegisterGlobalCommands } from '@/app/workspace/[workspaceId]/providers/global-commands-provider'
@@ -137,6 +136,7 @@ import { useUpdateWorkflow } from '@/hooks/queries/workflows'
 import type { Workspace } from '@/hooks/queries/workspace'
 import { useContextMenu } from '@/hooks/use-context-menu'
 import { useMothershipChatEvents } from '@/hooks/use-mothership-chat-events'
+import { useOrganizationNavigationHref } from '@/hooks/use-organization-navigation'
 import { usePermissionConfig } from '@/hooks/use-permission-config'
 import { useSettingsNavigation } from '@/hooks/use-settings-navigation'
 import { useFolderStore } from '@/stores/folders/store'
@@ -820,7 +820,7 @@ export const Sidebar = memo(function Sidebar() {
       onNavigate: () => handleOpenSettings(id),
     }))
 
-  const organizationHref = getWorkspaceOrganizationHref(hostContext)
+  const organizationHref = useOrganizationNavigationHref()
   if (organizationHref) {
     profileNavigationLinks.push({
       label: 'Organization',

apps/sim/hooks/use-organization-navigation.ts

@@ -0,0 +1,8 @@
+import { ORGANIZATIONS_PATH } from '@/lib/navigation/paths'
+import { useOrganizationList } from '@/hooks/queries/organization'
+
+/** Account navigation follows the viewer's memberships, independently of the workspace host. */
+export function useOrganizationNavigationHref(): string | null {
+  const { data: organizations } = useOrganizationList()
+  return organizations?.length ? ORGANIZATIONS_PATH : null
+}

apps/sim/lib/navigation/paths.ts

@@ -23,7 +23,7 @@ export const WORKSPACES_PATH = '/workspace'
 export const WORKSPACE_SETTINGS_PATH = `${WORKSPACES_PATH}?redirect=settings`
 
 /** Root of the organization surface; `/o` alone resolves like {@link APP_ENTRY_PATH}. */
-const ORGANIZATIONS_PATH = '/o'
+export const ORGANIZATIONS_PATH = '/o'
 
 /**
  * Every destination under one organization's surface, built from one place so the