fix(org): keep staging's shared modules and revert only the redesigned views

Hooks, contracts, key factories and lib helpers stay at staging, and the legacy
view adapts to them. Jama and Flow reconnect through the saved-credential modal
and disconnect through Search. Exports only the new views used are unexported or
deleted, and the e2e script returns to the legacy view's selectors.

Author: waleedlatif1

apps/sim/app/_shell/providers/get-query-client.ts

@@ -1,7 +1,7 @@
 import { isServer, QueryClient } from '@tanstack/react-query'
 import { isDesktopApp } from '@/lib/desktop'
 
-export function makeQueryClient() {
+function makeQueryClient() {
   return new QueryClient({
     defaultOptions: {
       queries: {

apps/sim/app/o/[organizationId]/components/organization-sidebar/components/organization-header/organization-header.tsx

@@ -18,7 +18,7 @@ import { useRouter } from 'next/navigation'
 import { IdentityTile } from '@/components/identity-tile/identity-tile'
 import { getOrganizationSettingsHref } from '@/components/settings/navigation'
 import { SettingsGuardedLink } from '@/components/settings/settings-guarded-link'
-import type { OrganizationSurfaceOrganization } from '@/lib/organizations/surface'
+import type { OrganizationSurfaceContext } from '@/lib/organizations/surface'
 import { LOGO_ACCEPT_ATTRIBUTE } from '@/lib/uploads/client/logo-file'
 import { InviteModal } from '@/app/workspace/[workspaceId]/components/invite-modal'
 import { SidebarRenameRow } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/sidebar-rename-row'
@@ -32,7 +32,7 @@ function getOrganizationInitial(name: string): string {
 }
 
 interface OrganizationHeaderProps {
-  organization: OrganizationSurfaceOrganization
+  organization: OrganizationSurfaceContext['organization']
   /** Organization admins may change its logo and name. */
   canEditIdentity: boolean
   canInviteMembers: boolean

apps/sim/app/o/[organizationId]/components/organization-sidebar/hooks/index.ts

@@ -1,3 +1,2 @@
 export type { OrganizationChat } from './use-organization-chats'
 export { useOrganizationChats } from './use-organization-chats'
-export { useOrganizationWorkspaces } from './use-organization-workspaces'

apps/sim/app/o/[organizationId]/components/search-landing-history.tsx

@@ -21,7 +21,7 @@ export function SearchLandingHistory({
   onSearch,
   children,
 }: SearchLandingHistoryProps) {
-  const history = useSearchHistory(organizationId)
+  const history = useSearchHistory(organizationId, userId)
   const clear = useClearSearchHistory(organizationId, userId)
   const [selection, setSelection] = useState<'sources' | 'queries' | null>(null)
   const data = history.isError ? undefined : history.data

apps/sim/app/o/[organizationId]/integrations/account-connection-actions.tsx

@@ -5,11 +5,14 @@ import { ChipConfirmModal, ChipModalError } from '@sim/emcn'
 import { type SettingsAction, SettingsActionChips } from '@/components/settings/settings-header'
 import type { ViewerSearchSourceAccount } from '@/lib/api/contracts/knowledge/connectors'
 import { useDisconnectPersonalOrganizationAccount } from '@/hooks/queries/organization-accounts'
+import { useRemovePersonalSearchCredential } from '@/hooks/queries/personal-search-integrations'
 
 interface AccountConnectionActionsProps {
   organizationId: string
   integrationName: string
   account?: ViewerSearchSourceAccount
+  /** A saved credential (Jama, Flow) is removed through Search, not the managed-account route. */
+  saved?: boolean
   onConnect?: () => void
   connectLabel: 'Connect' | 'Add account'
   onReconnect: () => void
@@ -23,14 +26,17 @@ export function AccountConnectionActions({
   organizationId,
   integrationName,
   account,
+  saved = false,
   onConnect,
   connectLabel,
   onReconnect,
   canReconnect,
   canConnect,
   connectionPending,
 }: AccountConnectionActionsProps) {
-  const disconnect = useDisconnectPersonalOrganizationAccount()
+  const disconnectManaged = useDisconnectPersonalOrganizationAccount()
+  const removeSaved = useRemovePersonalSearchCredential()
+  const disconnect = saved ? removeSaved : disconnectManaged
   const [confirming, setConfirming] = useState(false)
   const pending = connectionPending || disconnect.isPending
   const actions: SettingsAction[] = []
@@ -78,11 +84,12 @@ export function AccountConnectionActions({
             pendingLabel: 'Disconnecting',
             pending: disconnect.isPending,
             disabled: disconnect.isPending,
-            onClick: () =>
-              disconnect.mutate(
-                { credentialId: account.credentialId, organizationId },
-                { onSuccess: () => setConfirming(false) }
-              ),
+            onClick: () => {
+              const body = { credentialId: account.credentialId, organizationId }
+              const onSuccess = () => setConfirming(false)
+              if (saved) removeSaved.mutate(body, { onSuccess })
+              else disconnectManaged.mutate(body, { onSuccess })
+            },
           }}
         >
           <ChipModalError>{disconnect.error?.message}</ChipModalError>

apps/sim/app/o/[organizationId]/integrations/integration-detail.tsx

@@ -2,9 +2,10 @@
 
 import { type ReactNode, useState } from 'react'
 import { toast } from '@sim/emcn'
+import type { MemberIntegration } from '@/lib/credential-groups/member-integrations'
+import { liveSearchSavedMemberProvider } from '@/lib/sim-search/live/source-catalog'
 import { AccountConnectionActions } from '@/app/o/[organizationId]/integrations/account-connection-actions'
 import { AccountToolPermissionsContent } from '@/app/o/[organizationId]/integrations/accounts/[credentialId]/tool-permissions'
-import type { MemberIntegration } from '@/app/o/[organizationId]/integrations/utils'
 import {
   CredentialDetailHeading,
   CredentialDetailLayout,
@@ -32,6 +33,13 @@ interface IntegrationDetailProps {
   children?: ReactNode
 }
 
+function savedProviderIdFor(provider: string) {
+  const providerId = liveSearchSavedMemberProvider(provider)
+  return providerId === 'jama-service-account' || providerId === 'flow-service-account'
+    ? providerId
+    : null
+}
+
 /** The selected account owns every permission and connection action in this view. */
 export function IntegrationDetail({
   organizationId,
@@ -50,7 +58,12 @@ export function IntegrationDetail({
       ? integration.accounts[0]
       : undefined
   const target = integration.connectionTarget
-  const [savedOpen, setSavedOpen] = useState(false)
+  const savedProvider = savedProviderIdFor(integration.provider)
+  const [savedConnection, setSavedConnection] = useState<{
+    providerId: 'jama-service-account' | 'flow-service-account'
+    credentialId?: string
+    displayName?: string
+  } | null>(null)
   return (
     <CredentialDetailLayout
       back={back}
@@ -61,16 +74,24 @@ export function IntegrationDetail({
             organizationId={organizationId}
             integrationName={integration.name}
             account={selected}
+            saved={Boolean(savedProvider)}
             connectLabel={integration.accounts.length ? 'Add account' : 'Connect'}
             onConnect={
               !target
                 ? undefined
                 : 'savedProviderId' in target
-                  ? () => setSavedOpen(true)
+                  ? () => savedProvider && setSavedConnection({ providerId: savedProvider })
                   : () => connect.mutate({ organizationId, ...target }, { onError })
             }
             onReconnect={() => {
-              if (selected) reconnect.mutate(selected.credentialId, { onError })
+              if (!selected) return
+              if (savedProvider)
+                setSavedConnection({
+                  providerId: savedProvider,
+                  credentialId: selected.credentialId,
+                  displayName: selected.displayName,
+                })
+              else reconnect.mutate(selected.credentialId, { onError })
             }}
             connectionPending={connect.isPending || reconnect.isPending}
             canConnect={integration.ready}
@@ -127,12 +148,12 @@ export function IntegrationDetail({
           credentialId={selected.credentialId}
         />
       )}
-      {savedOpen && target && 'savedProviderId' in target && (
+      {savedConnection && (
         <SavedSearchCredentialModal
           organizationId={organizationId}
-          connection={{ providerId: target.savedProviderId }}
-          onClose={() => setSavedOpen(false)}
-          onCreated={() => setSavedOpen(false)}
+          connection={savedConnection}
+          onClose={() => setSavedConnection(null)}
+          onCreated={() => setSavedConnection(null)}
         />
       )}
     </CredentialDetailLayout>

apps/sim/app/o/[organizationId]/integrations/live-member-integrations.tsx

@@ -4,17 +4,15 @@ import type { ReactNode } from 'react'
 import { ChipLink } from '@sim/emcn'
 import { ArrowLeft } from '@sim/emcn/icons'
 import { useQueryStates } from 'nuqs'
+import { memberIntegrationEntries } from '@/lib/credential-groups/member-integrations'
 import { organizationRoutes } from '@/lib/navigation/paths'
 import { OrganizationPage } from '@/app/o/[organizationId]/components/organization-page'
 import { IntegrationDetail } from '@/app/o/[organizationId]/integrations/integration-detail'
 import {
   integrationViewParsers,
   serializeIntegrationView,
 } from '@/app/o/[organizationId]/integrations/search-params'
-import {
-  memberIntegrationEntries,
-  memberIntegrationStatus,
-} from '@/app/o/[organizationId]/integrations/utils'
+import { memberIntegrationStatus } from '@/app/o/[organizationId]/integrations/utils'
 import {
   GenericSecretSourceIcon,
   GenericSecretSourceRow,