improvement(platform): keep the embedded organization view beside the zone

Author: waleedlatif1

apps/sim/app/_shell/providers/session-provider.tsx

@@ -1,26 +1,18 @@
 'use client'
 
 import type React from 'react'
-import { createContext, useDeferredValue, useEffect, useMemo } from 'react'
+import { useDeferredValue, useEffect, useMemo } from 'react'
 import { createLogger } from '@sim/logger'
 import { useQueryClient } from '@tanstack/react-query'
 import { client } from '@/lib/auth/client'
+import { SessionContext, type SessionHookResult } from '@/lib/auth/session-context'
 import {
   type AppSession,
   extractSessionDataFromAuthClientResult,
   getActiveOrganizationId,
 } from '@/lib/auth/session-response'
 import { sessionKeys, useSessionQuery } from '@/hooks/queries/session'
 
-export type SessionHookResult = {
-  data: AppSession
-  isPending: boolean
-  error: Error | null
-  refetch: () => Promise<void>
-}
-
-export const SessionContext = createContext<SessionHookResult | null>(null)
-
 const logger = createLogger('SessionProvider')
 
 export function SessionProvider({ children }: { children: React.ReactNode }) {

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

@@ -6,15 +6,15 @@ import {
   searchConnectionTargetSchema,
 } from '@/lib/knowledge/search/connection-target'
 import { organizationRoutes } from '@/lib/navigation/paths'
-import { SEARCH_CONNECTORS } from '@/lib/sim-search/connectors'
-import { slackSearchIntegrationsPath } from '@/lib/slack-search/onboarding'
-import { requireIntegrationsViewer } from '@/app/o/[organizationId]/integrations/access'
-import { HydratedIntegrations } from '@/app/o/[organizationId]/integrations/hydrated-integrations'
 import {
   loadIntegrationConnectionParams,
   loadIntegrationView,
   serializeIntegrationView,
-} from '@/app/o/[organizationId]/integrations/search-params'
+} from '@/lib/organizations/integrations-search-params'
+import { SEARCH_CONNECTORS } from '@/lib/sim-search/connectors'
+import { slackSearchIntegrationsPath } from '@/lib/slack-search/onboarding'
+import { requireIntegrationsViewer } from '@/app/o/[organizationId]/integrations/access'
+import { HydratedIntegrations } from '@/app/o/[organizationId]/integrations/hydrated-integrations'
 import {
   GENERIC_SECRETS_SEGMENT,
   integrationPath,

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

@@ -4,7 +4,7 @@ import { organizationRoutes } from '@/lib/navigation/paths'
 import {
   integrationSearchParsers,
   serializeIntegrationView,
-} from '@/app/o/[organizationId]/integrations/search-params'
+} from '@/lib/organizations/integrations-search-params'
 import { OrganizationSecretsPage } from '@/app/o/[organizationId]/integrations/secrets/organization-secrets-page'
 
 export const metadata: Metadata = { title: 'Generic Secrets' }

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

@@ -1,7 +1,7 @@
 import type { ReactNode } from 'react'
 import { notFound, redirect } from 'next/navigation'
 import { organizationRoutes } from '@/lib/navigation/paths'
-import { resolveOrganizationSurfaceHeaderMeta } from '@/platform/embedded/lib/data/settings-sections'
+import { resolveOrganizationSurfaceHeaderMeta } from '@/lib/organizations/settings-sections'
 
 interface OrganizationSettingsSectionLayoutProps {
   children: ReactNode

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

@@ -9,6 +9,7 @@ import {
 import { prefetchStandaloneGeneral } from '@/components/settings/prefetch-standalone-general'
 import { getSession } from '@/lib/auth'
 import { organizationRoutes } from '@/lib/navigation/paths'
+import { resolveOrganizationSurfaceSection } from '@/lib/organizations/settings-sections'
 import { isPlatformAdmin } from '@/lib/permissions/super-user'
 import { authorizeOrganizationSettingsSection } from '@/lib/settings/application/organization-section-access'
 import { getQueryClient } from '@/app/_shell/providers/get-query-client'
@@ -17,7 +18,6 @@ import { getLegacyAccessRequestsQuery } from '@/ee/access-requests/lib/navigatio
 import { isPlatformSettingsSection } from '@/platform/embedded/app/(shell)/settings/_components/platform-sections'
 import { PlatformSettingsSectionHost } from '@/platform/embedded/app/(shell)/settings/_components/settings-section-host'
 import { prefetchPermissionEditorCatalog } from '@/platform/embedded/lib/data/prefetch-permission-editor'
-import { resolveOrganizationSurfaceSection } from '@/platform/embedded/lib/data/settings-sections'
 
 interface OrganizationSettingsSectionPageProps {
   params: Promise<{ organizationId: string; section: string }>

apps/sim/app/o/[organizationId]/settings/settings-frame.tsx

@@ -4,14 +4,14 @@ import { type ReactNode, useContext } from 'react'
 import { usePathname } from 'next/navigation'
 import { createPortal } from 'react-dom'
 import { useSettingsNavigationState } from '@/components/settings/settings-navigation-provider'
+import { resolveOrganizationSurfaceHeaderMeta } from '@/lib/organizations/settings-sections'
 import { MobileTitleSlot } from '@/app/workspace/[workspaceId]/components/workspace-chrome/mobile-title-slot'
 import { Surface } from '@/platform/design-system/components/surface/surface'
 import {
   SettingsBreadcrumb,
   SettingsMobileTitle,
   SettingsScreen,
 } from '@/platform/embedded/app/(shell)/settings/_components/settings-screen/settings-screen'
-import { resolveOrganizationSurfaceHeaderMeta } from '@/platform/embedded/lib/data/settings-sections'
 
 interface SettingsFrameProps {
   children: ReactNode

apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/search-transitions.test.tsx

@@ -42,10 +42,10 @@ import {
   resolveDeploymentShape,
   seedDeploymentShape,
 } from '@/lib/core/config/deployment-shape'
-import { SearchHistory } from '@/app/o/[organizationId]/_redesign/search/search-history'
-import { OrganizationSearchSurface } from '@/app/o/[organizationId]/_redesign/search/search-surface'
 import { knowledgeKeys } from '@/hooks/queries/utils/knowledge-keys'
 import { searchHistoryKeys } from '@/hooks/queries/utils/search-history-keys'
+import { SearchHistory } from '@/platform/embedded/app/(shell)/search/_components/search-surface/search-history'
+import { OrganizationSearchSurface } from '@/platform/embedded/app/(shell)/search/_components/search-surface/search-surface'
 import { useMothershipDraftsStore } from '@/stores/mothership-drafts/store'
 
 nextNavigationMockFns.mockUsePathname.mockReturnValue('/o/organization/search')