refactor(search): apply the simplify passes to the Sim Search surface

One availability gate for every members-mode refusal, the shared role
gate behind the admin-first message, setup fields precomputed on the
catalog, the connect flow owned by the enrollment hook and shared by the
strip and the Search page, the latest attempt derived instead of
cross-resets, a trailing adornment slot on the chip in place of a loader
wrapper, the processor's source access as one object with the
connector-row rule in one place, and the first connect's independent
lookups run together after its synchronous checks.

Author: waleedlatif1

apps/sim/app/api/files/authorization.ts

@@ -491,10 +491,13 @@ async function verifyCopilotFileAccess(
  * signal only: it reflects whether the file is still part of a live KB, not who
  * owns it (ownership comes from the binding).
  */
+/** A reader once resolved: a person's or the workspace's tokens, or the system reading its own rows. */
+type ResolvedKnowledgeFileAccess = KnowledgeAccessScope | SystemAccessScope
+
 async function hasActiveKbDocumentForKey(
   cloudKey: string,
   workspaceId: string,
-  access: KnowledgeAccessScope | SystemAccessScope
+  access: ResolvedKnowledgeFileAccess
 ): Promise<boolean> {
   const rows = await db
     .select({ id: document.id })
@@ -525,13 +528,13 @@ async function hasActiveKbDocumentForKey(
  * else — an internal token, a tool running with the workflow owner's id —
  * reads as the workspace, never as the person whose id it happens to carry.
  */
-export type KnowledgeFileAccess = 'user' | KnowledgeAccessScope | SystemAccessScope
+export type KnowledgeFileAccess = 'user' | ResolvedKnowledgeFileAccess
 
 async function resolveKnowledgeFileAccess(
   knowledgeAccess: KnowledgeFileAccess | undefined,
   userId: string,
   workspaceId: string
-): Promise<KnowledgeAccessScope | SystemAccessScope> {
+): Promise<ResolvedKnowledgeFileAccess> {
   if (knowledgeAccess === 'user') return resolveUserKnowledgeAccessScope(userId, workspaceId)
   return knowledgeAccess ?? WORKSPACE_ACCESS_SCOPE
 }

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

@@ -3,10 +3,10 @@
 import { useMemo, useState } from 'react'
 import { Button, Chip } from '@sim/emcn'
 import type { WorkspaceKnowledgeSearchResult } from '@/lib/api/contracts/knowledge'
+import { connectorDisplayName } from '@/lib/sim-search/connectors'
 import { SourceCard } from '@/app/workspace/[workspaceId]/home/components/message-content/components/source-card'
 import type { SourceTagData } from '@/app/workspace/[workspaceId]/home/components/message-content/components/special-tags'
 import { isIndexing } from '@/app/workspace/[workspaceId]/home/components/search-sources'
-import { CONNECTOR_META_REGISTRY } from '@/connectors/registry'
 import { useWorkspaceMemberConnectors } from '@/hooks/queries/kb/connectors'
 import { useKnowledgeBasesQuery, useWorkspaceKnowledgeSearch } from '@/hooks/queries/kb/knowledge'
 
@@ -58,18 +58,14 @@ function toSource(result: WorkspaceKnowledgeSearchResult): SourceTagData | null
     url: result.sourceUrl,
     title: result.documentName ?? undefined,
     siteName: result.connectorType
-      ? connectorName(result.connectorType)
+      ? connectorDisplayName(result.connectorType)
       : result.knowledgeBaseName || undefined,
     connectorType: result.connectorType ?? undefined,
     snippet: toSnippet(result.content),
     updatedAt: result.sourceModifiedAt ?? undefined,
   }
 }
 
-function connectorName(connectorType: string): string {
-  return CONNECTOR_META_REGISTRY[connectorType]?.name ?? connectorType
-}
-
 /**
  * Arrow keys walk the result links, the way a search page does; Enter on a
  * focused link opens it natively. Focus stops at either end.
@@ -134,7 +130,7 @@ export function KnowledgeSearchResults({
     ...new Set(
       memberConnectors
         .filter(isIndexing)
-        .map((connection) => connectorName(connection.connectorType))
+        .map((connection) => connectorDisplayName(connection.connectorType))
     ),
   ]
   const documents = useMemo(() => groupResultsByDocument(results ?? []), [results])
@@ -203,7 +199,7 @@ export function KnowledgeSearchResults({
               active={sourceFilter === type}
               onClick={() => setSourceFilter(sourceFilter === type ? null : type)}
             >
-              {type === 'upload' ? 'Uploads' : connectorName(type)}
+              {type === 'upload' ? 'Uploads' : connectorDisplayName(type)}
             </Chip>
           ))}
           <span className='mx-1 self-center text-[var(--text-muted)] text-caption'>·</span>

apps/sim/app/workspace/[workspaceId]/home/components/search-sources/index.ts

@@ -1 +1 @@
-export { isIndexing, SearchSources, simSearchConnectionsByType } from './search-sources'
+export { isIndexing, SearchSources } from './search-sources'

apps/sim/app/workspace/[workspaceId]/home/components/search-sources/search-sources.tsx

@@ -1,15 +1,14 @@
 'use client'
 
-import { useMemo, useState } from 'react'
+import { useMemo } from 'react'
 import { Chip } from '@sim/emcn'
 import { Loader, Plus } from '@sim/emcn/icons'
 import {
   canConnectPersonally,
-  isSearchConnectorAvailable,
-  personalSetupFields,
   SEARCH_CONNECTORS,
   type SearchConnector,
   SIM_SEARCH_KNOWLEDGE_BASE_NAME,
+  searchConnectorUnavailableReason,
 } from '@/lib/sim-search/connectors'
 import { SourceSetupModal } from '@/app/workspace/[workspaceId]/home/components/search-sources/source-setup-modal'
 import { useWorkspaceHostContext } from '@/app/workspace/[workspaceId]/providers/workspace-host-provider'
@@ -23,20 +22,14 @@ import { CONNECTABLE_MEMBERSHIPS, useMemberEnrollment } from '@/hooks/use-member
 import { usePermissionConfig } from '@/hooks/use-permission-config'
 
 const EMPTY_MEMBER_CONNECTORS: WorkspaceMemberConnector[] = []
-const MEMBER_ACCESS_UNAVAILABLE = 'Per-member access is not available in this workspace'
 
 /** The sources a person can connect themselves, alphabetical. */
 const PERSONAL_SEARCH_CONNECTORS = SEARCH_CONNECTORS.filter((connector) =>
   canConnectPersonally(connector.meta)
 )
 
-/** A chip's trailing icon is a component, so the spinning loader needs a wrapper to carry `animate`. */
-function SpinningLoader({ className }: { className?: string }) {
-  return <Loader className={className} animate />
-}
-
 /** The Sim Search connection per source, keyed by connector type. */
-export function simSearchConnectionsByType(
+function simSearchConnectionsByType(
   connectors: readonly WorkspaceMemberConnector[]
 ): Map<string, WorkspaceMemberConnector> {
   const byType = new Map<string, WorkspaceMemberConnector>()
@@ -108,6 +101,7 @@ function SourceChip({
   const title =
     unavailableReason ??
     (connected ? `${connector.meta.name}: ${state}` : `Connect ${connector.meta.name}`)
+  const busy = waiting || isIndexing(connection)
   return (
     <Chip
       shape='round'
@@ -116,7 +110,10 @@ function SourceChip({
       onClick={actionable ? onConnect : undefined}
       title={title}
       leftAdornment={<BrandIcon icon={connector.meta.icon} className='size-[14px] flex-shrink-0' />}
-      rightIcon={waiting || isIndexing(connection) ? SpinningLoader : actionable ? Plus : undefined}
+      rightIcon={!busy && actionable ? Plus : undefined}
+      rightAdornment={
+        busy ? <Loader className='size-[14px] text-[var(--text-icon)]' animate /> : undefined
+      }
     >
       <span className='flex items-center gap-1.5'>
         <span>{connector.meta.name}</span>
@@ -163,50 +160,42 @@ export function SearchSources({ workspaceId }: SearchSourcesProps) {
     [memberConnectors]
   )
   const membershipQueryKeys = useMemo(() => [memberConnectorKeys.list(workspaceId)], [workspaceId])
-  const { connect, connectSource, isAwaiting, isPending, error } = useMemberEnrollment({
-    membershipQueryKeys,
-    connectedConnectorIds,
-  })
-  const [setupConnector, setSetupConnector] = useState<SearchConnector | null>(null)
+  const {
+    connectSource,
+    connectSearchSource,
+    setupConnector,
+    closeSetup,
+    isAwaiting,
+    isPending,
+    error,
+  } = useMemberEnrollment({ membershipQueryKeys, connectedConnectorIds })
 
-  const rank = (connector: SearchConnector) =>
-    connectionByType.get(connector.type)?.viewerMembership === 'connected' ? 0 : 1
-  const ordered = [...PERSONAL_SEARCH_CONNECTORS].sort(
-    (a, b) => rank(a) - rank(b) || a.meta.name.localeCompare(b.meta.name)
-  )
-
-  const startConnect = (connector: SearchConnector) => {
-    const connection = connectionByType.get(connector.type)
-    if (connection) {
-      connect(connection.knowledgeBaseId, connection.connectorId)
-      return
-    }
-    if (personalSetupFields(connector.meta).length > 0) {
-      setSetupConnector(connector)
-      return
-    }
-    connectSource(workspaceId, connector.type)
-  }
+  /** Connected sources first; the catalog is already alphabetical, so the partition keeps the order. */
+  const isConnected = (connector: SearchConnector) =>
+    connectionByType.get(connector.type)?.viewerMembership === 'connected'
+  const ordered = [
+    ...PERSONAL_SEARCH_CONNECTORS.filter(isConnected),
+    ...PERSONAL_SEARCH_CONNECTORS.filter((connector) => !isConnected(connector)),
+  ]
 
   return (
     <div className='flex flex-col gap-2'>
       <div className='flex flex-wrap gap-1.5'>
         {ordered.map((connector) => {
           const connection = connectionByType.get(connector.type)
-          const unavailableReason = !isSearchConnectorAvailable(connector, integrationAvailability)
-            ? `${connector.meta.name} is unavailable in this deployment`
-            : memberAccessAvailable
-              ? null
-              : MEMBER_ACCESS_UNAVAILABLE
           return (
             <SourceChip
               key={connector.type}
               connector={connector}
               connection={connection}
-              unavailableReason={unavailableReason}
+              unavailableReason={searchConnectorUnavailableReason(
+                connector,
+                integrationAvailability,
+                memberAccessAvailable
+              )}
               waiting={connection ? isAwaiting(connection.connectorId) : false}
               disabled={isPending}
-              onConnect={() => startConnect(connector)}
+              onConnect={() => connectSearchSource(workspaceId, connector, connection)}
             />
           )
         })}
@@ -215,10 +204,7 @@ export function SearchSources({ workspaceId }: SearchSourcesProps) {
       {setupConnector && (
         <SourceSetupModal
           connector={setupConnector}
-          fields={personalSetupFields(setupConnector.meta)}
-          onOpenChange={(open) => {
-            if (!open) setSetupConnector(null)
-          }}
+          onClose={closeSetup}
           onConnect={(sourceConfig) =>
             connectSource(workspaceId, setupConnector.type, sourceConfig)
           }

apps/sim/app/workspace/[workspaceId]/home/components/search-sources/source-setup-modal.tsx

@@ -9,12 +9,10 @@ import {
   ChipModalHeader,
 } from '@sim/emcn'
 import type { SearchConnector } from '@/lib/sim-search/connectors'
-import type { ConnectorConfigField } from '@/connectors/types'
 
 interface SourceSetupModalProps {
   connector: SearchConnector
-  fields: readonly ConnectorConfigField[]
-  onOpenChange: (open: boolean) => void
+  onClose: () => void
   /** Connects the source with the filled-in fields; the caller opens the OAuth tab in this click. */
   onConnect: (sourceConfig: Record<string, string>) => void
 }
@@ -23,26 +21,26 @@ interface SourceSetupModalProps {
  * The few fields a source needs before its first connect, such as a site and
  * a space. Everyone after the first person clicks straight through.
  */
-export function SourceSetupModal({
-  connector,
-  fields,
-  onOpenChange,
-  onConnect,
-}: SourceSetupModalProps) {
+export function SourceSetupModal({ connector, onClose, onConnect }: SourceSetupModalProps) {
+  const fields = connector.setupFields
   const [values, setValues] = useState<Record<string, string>>({})
   const complete = fields.every((field) => values[field.id]?.trim())
 
   const submit = () => {
     if (!complete) return
     onConnect(Object.fromEntries(fields.map((field) => [field.id, values[field.id]?.trim() ?? ''])))
-    onOpenChange(false)
+    onClose()
   }
 
   return (
-    <ChipModal open onOpenChange={onOpenChange} srTitle={`Connect ${connector.meta.name}`}>
-      <ChipModalHeader onClose={() => onOpenChange(false)}>
-        Connect {connector.meta.name}
-      </ChipModalHeader>
+    <ChipModal
+      open
+      onOpenChange={(open) => {
+        if (!open) onClose()
+      }}
+      srTitle={`Connect ${connector.meta.name}`}
+    >
+      <ChipModalHeader onClose={onClose}>Connect {connector.meta.name}</ChipModalHeader>
       <ChipModalBody>
         {fields.map((field) =>
           field.type === 'dropdown' ? (
@@ -76,7 +74,7 @@ export function SourceSetupModal({
         )}
       </ChipModalBody>
       <ChipModalFooter
-        onCancel={() => onOpenChange(false)}
+        onCancel={onClose}
         primaryAction={{ label: 'Connect', onClick: submit, disabled: !complete }}
       />
     </ChipModal>

apps/sim/app/workspace/[workspaceId]/search/components/member-connectors-section/member-connectors-section.tsx

@@ -2,6 +2,7 @@
 
 import { useMemo } from 'react'
 import { Button } from '@sim/emcn'
+import { connectorDisplayName } from '@/lib/sim-search/connectors'
 import { IntegrationTile } from '@/app/workspace/[workspaceId]/integrations/components/integrations-showcase'
 import {
   RESOURCE_LIST_STACK,
@@ -19,11 +20,6 @@ import {
 
 const SHARED_WITH_YOU_LABEL = 'Shared with you'
 
-/** The name a per-member connector shows, from its registry entry. */
-export function memberConnectorName(connector: WorkspaceMemberConnector): string {
-  return CONNECTOR_META_REGISTRY[connector.connectorType]?.name ?? connector.connectorType
-}
-
 interface MemberConnectorsSectionProps {
   workspaceId: string
   /** The per-member connectors to show, already narrowed by the page's search. */
@@ -59,7 +55,7 @@ export function MemberConnectorsSection({ workspaceId, connectors }: MemberConne
         <div className={RESOURCE_LIST_STACK}>
           {connectors.map((connector) => {
             const meta = CONNECTOR_META_REGISTRY[connector.connectorType]
-            const name = memberConnectorName(connector)
+            const name = connectorDisplayName(connector.connectorType)
             const waiting = isAwaiting(connector.connectorId)
             const state =
               describeMembership({

apps/sim/app/workspace/[workspaceId]/search/search.test.tsx

@@ -62,15 +62,28 @@ vi.mock('@/lib/sim-search/connectors', () => {
     serviceName: name,
     serviceIcon: icon,
     blockType: type,
+    setupFields: [],
   })
+  const isSearchConnectorAvailable = (
+    candidate: { blockType: string },
+    availability: ReadonlyMap<string, { oauthAvailable: boolean }>
+  ) => availability.get(candidate.blockType)?.oauthAvailable ?? true
   return {
     SIM_SEARCH_KNOWLEDGE_BASE_NAME: 'Sim Search',
     canConnectPersonally: (meta: { permissionScopedListing?: unknown }) =>
       Boolean(meta.permissionScopedListing),
-    isSearchConnectorAvailable: (
-      candidate: { blockType: string },
-      availability: ReadonlyMap<string, { oauthAvailable: boolean }>
-    ) => availability.get(candidate.blockType)?.oauthAvailable ?? true,
+    connectorDisplayName: (connectorType: string) => connectorType,
+    isSearchConnectorAvailable,
+    searchConnectorUnavailableReason: (
+      candidate: { blockType: string; meta: { name: string } },
+      availability: ReadonlyMap<string, { oauthAvailable: boolean }>,
+      memberAccessAvailable: boolean
+    ) =>
+      !isSearchConnectorAvailable(candidate, availability)
+        ? `${candidate.meta.name} is unavailable in this deployment`
+        : memberAccessAvailable
+          ? null
+          : 'Per-member access is not available in this workspace',
     SEARCH_CONNECTORS: [
       connector('google_drive', 'Google Drive', 'Sync Drive files', true),
       connector('confluence', 'Confluence', 'Sync Confluence pages', false),
@@ -116,6 +129,16 @@ vi.mock('@/hooks/use-member-enrollment', async () => {
     useMemberEnrollment: () => ({
       connect: mockConnect,
       connectSource: mockConnectSource,
+      connectSearchSource: (
+        workspaceId: string,
+        connector: { type: string },
+        connection: { knowledgeBaseId: string; connectorId: string } | undefined
+      ) =>
+        connection
+          ? mockConnect(connection.knowledgeBaseId, connection.connectorId)
+          : mockConnectSource(workspaceId, connector.type),
+      setupConnector: null,
+      closeSetup: () => {},
       isAwaiting: () => false,
       isPending: false,
       error: null,
@@ -167,7 +190,7 @@ describe('Search', () => {
     const text = container?.textContent ?? ''
     expect(text).toContain('Connected · 12 documents')
     expect(text).toContain('Set up by a workspace admin from a knowledge base.')
-    expect(text).toContain('Unavailable in this deployment. Contact your administrator.')
+    expect(text).toContain('Slack is unavailable in this deployment')
     expect(text).toContain('Sales')
   })
 
@@ -189,9 +212,7 @@ describe('Search', () => {
 
     expect(sectionLabels()).toEqual(['Sim Search Connectors'])
     const text = container?.textContent ?? ''
-    expect(text).toContain(
-      'Per-member access is not available in this workspace. Contact your administrator.'
-    )
+    expect(text).toContain('Per-member access is not available in this workspace')
     expect(text).not.toContain('Connected · 12 documents')
     expect(buttons().find((button) => button.textContent === 'Connect')).toBeUndefined()
   })