Skip to content

Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure

TypeScript

fix(control-ui): retain connector data across tabs r3-m1

Josuécd2798be9893
diff --git a/control-ui/AGENTS.md b/control-ui/AGENTS.md
index df94004ce..2d9ec25be 100644
--- a/control-ui/AGENTS.md
+++ b/control-ui/AGENTS.md
@@ -8,3 +8,13 @@ provider-neutral documents:
This file is a discovery adapter only. The linked documents own the semantics
for this scope.
+
+<!-- BEGIN:nextjs-agent-rules -->
+
+# This is NOT the Next.js you know
+
+This version has breaking changes — APIs, conventions, and file structure may all differ from your training data. Read the relevant guide in `node_modules/next/dist/docs/` (resolved from this file's directory; in monorepos the `next` package may not be visible from the repo root) before writing any code. Heed deprecation notices.
+
+This block is written and re-added by `next dev` — verify at `node_modules/next/dist/server/lib/generate-agent-files.js`. Removing it from a diff only re-creates the uncommitted change; committing it with your work keeps the tree clean.
+
+<!-- END:nextjs-agent-rules -->
diff --git a/control-ui/app/mcp-servers/[name]/layout.tsx b/control-ui/app/mcp-servers/[name]/layout.tsx
new file mode 100644
index 000000000..d2f8da729
--- /dev/null
+++ b/control-ui/app/mcp-servers/[name]/layout.tsx
@@ -0,0 +1,14 @@
+'use client'
+
+import type { ReactNode } from 'react'
+import { useSelectedLayoutSegment } from 'next/navigation'
+import { ConnectorDetailProvider } from '@components/ConnectorDetailProvider'
+import { CONNECTOR_DETAIL_TABS } from '@constants/connectorDetail'
+
+export default function ConnectorLayout({ children }: { children: ReactNode }) {
+ const selectedSegment = useSelectedLayoutSegment()
+ const isDetailRoute =
+ selectedSegment === null || CONNECTOR_DETAIL_TABS.some(tab => tab === selectedSegment)
+
+ return isDetailRoute ? <ConnectorDetailProvider>{children}</ConnectorDetailProvider> : children
+}
diff --git a/control-ui/app/mcp-servers/[name]/page.tsx b/control-ui/app/mcp-servers/[name]/page.tsx
index 2b580c9cd..596fad422 100644
--- a/control-ui/app/mcp-servers/[name]/page.tsx
+++ b/control-ui/app/mcp-servers/[name]/page.tsx
@@ -1,8 +1,9 @@
'use client'
-import { useCallback, useEffect, useState } from 'react'
+import { useEffect, useState } from 'react'
import { useParams, useRouter } from 'next/navigation'
import { AuthGate } from '@components/AuthGate'
+import { useConnectorDetail } from '@components/ConnectorDetailProvider'
import { DetailPageShell } from '@components/DetailPageShell'
import { IconCable } from '@components/Sidebar/icons'
import { IconRefresh } from '@components/icons'
@@ -14,12 +15,7 @@ import {
type ConnectorDetailTab,
} from '@constants/connectorDetail'
import { CONTROL_ROUTES } from '@constants/routes'
-import {
- type McpServerCondition,
- type McpServerResource,
- getMcpServer,
- isSilentApiError,
-} from '@lib/api'
+import type { McpServerCondition } from '@lib/api'
function text(value: unknown, fallback = '—'): string {
return typeof value === 'string' && value.trim() ? value : fallback
@@ -88,35 +84,15 @@ export default function McpServerDetailPage() {
const router = useRouter()
const params = useParams<{ name: string; tab?: string | string[] }>()
const name = decodeURIComponent(params?.name ?? '')
+ const { server, loading, error, load } = useConnectorDetail()
const [activeTab, setActiveTab] = useState<ConnectorDetailTab>(() =>
parseConnectorDetailTab(params?.tab)
)
- const [server, setServer] = useState<McpServerResource | null>(null)
- const [loading, setLoading] = useState(true)
- const [error, setError] = useState('')
-
- const load = useCallback(async () => {
- setLoading(true)
- setError('')
- try {
- setServer(await getMcpServer(name))
- } catch (caught) {
- if (isSilentApiError(caught)) return
- setServer(null)
- setError(caught instanceof Error ? caught.message : `Connector ${name} was not found.`)
- } finally {
- setLoading(false)
- }
- }, [name])
function selectTab(next: ConnectorDetailTab) {
setActiveTab(next)
}
- useEffect(() => {
- if (name) void load()
- }, [load, name])
-
useEffect(() => {
setActiveTab(parseConnectorDetailTab(params?.tab))
}, [params?.tab])
@@ -132,7 +108,7 @@ export default function McpServerDetailPage() {
<AuthGate>
<DetailPageShell
icon={<IconCable />}
- title={loading ? 'Connector details' : `Connector: ${name}`}
+ title={`Connector: ${name}`}
subtitle="Review connector configuration and runtime status. Edit this connector to make changes."
backLabel="Back to connectors"
onBack={() => router.push(CONTROL_ROUTES.connectors.root)}
diff --git a/control-ui/components/ConnectorDetailProvider/index.tsx b/control-ui/components/ConnectorDetailProvider/index.tsx
new file mode 100644
index 000000000..c2c809a31
--- /dev/null
+++ b/control-ui/components/ConnectorDetailProvider/index.tsx
@@ -0,0 +1,86 @@
+'use client'
+
+import { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react'
+import { useParams } from 'next/navigation'
+import { getMcpServer, isSilentApiError } from '@lib/api'
+import type { McpServerResource } from '@lib/api'
+import type { ConnectorDetailProviderProps, ConnectorDetailState } from './types'
+
+const ConnectorDetailContext = createContext<ConnectorDetailState | null>(null)
+
+export function ConnectorDetailProvider({ children }: ConnectorDetailProviderProps) {
+ const params = useParams<{ name: string }>()
+ const name = decodeURIComponent(params?.name ?? '')
+ const requestId = useRef(0)
+ const [resourceState, setResourceState] = useState<{
+ name: string
+ server: McpServerResource | null
+ error: string
+ settled: boolean
+ }>({ name: '', server: null, error: '', settled: false })
+
+ const load = useCallback(async () => {
+ if (!name) return
+
+ const request = ++requestId.current
+ setResourceState(previous => ({
+ name,
+ server: previous.name === name ? previous.server : null,
+ error: '',
+ settled: false,
+ }))
+
+ try {
+ const server = await getMcpServer(name)
+ if (request !== requestId.current) return
+ setResourceState({ name, server, error: '', settled: true })
+ } catch (caught) {
+ if (request !== requestId.current) return
+ if (isSilentApiError(caught)) {
+ setResourceState(previous => ({
+ name,
+ server: previous.name === name ? previous.server : null,
+ error: '',
+ settled: true,
+ }))
+ return
+ }
+ setResourceState({
+ name,
+ server: null,
+ error: caught instanceof Error ? caught.message : `Connector ${name} was not found.`,
+ settled: true,
+ })
+ }
+ }, [name])
+
+ useEffect(() => {
+ if (name) {
+ void load()
+ } else {
+ setResourceState({ name: '', server: null, error: '', settled: true })
+ }
+
+ return () => {
+ requestId.current += 1
+ }
+ }, [load, name])
+
+ const value = useMemo<ConnectorDetailState>(
+ () => ({
+ server: resourceState.name === name ? resourceState.server : null,
+ loading: !resourceState.settled || resourceState.name !== name,
+ error: resourceState.name === name ? resourceState.error : '',
+ load,
+ }),
+ [load, name, resourceState]
+ )
+
+ return <ConnectorDetailContext.Provider value={value}>{children}</ConnectorDetailContext.Provider>
+}
+
+export function useConnectorDetail(): ConnectorDetailState {
+ const context = useContext(ConnectorDetailContext)
+ if (!context) throw new Error('useConnectorDetail must be used within ConnectorDetailProvider')
+ return context
+}
diff --git a/control-ui/components/ConnectorDetailProvider/types.ts b/control-ui/components/ConnectorDetailProvider/types.ts
new file mode 100644
index 000000000..03a41054a
--- /dev/null
+++ b/control-ui/components/ConnectorDetailProvider/types.ts
@@ -0,0 +1,13 @@
+import type { ReactNode } from 'react'
+import type { McpServerResource } from '@lib/api'
+
+export type ConnectorDetailState = {
+ server: McpServerResource | null
+ loading: boolean
+ error: string
+ load: () => Promise<void>
+}
+
+export type ConnectorDetailProviderProps = {
+ children: ReactNode
+}
diff --git a/control-ui/components/__tests__/McpServerDetailPage.test.tsx b/control-ui/components/__tests__/McpServerDetailPage.test.tsx
index ee481b417..f2c651bb8 100644
--- a/control-ui/components/__tests__/McpServerDetailPage.test.tsx
+++ b/control-ui/components/__tests__/McpServerDetailPage.test.tsx
@@ -2,12 +2,21 @@ import { afterEach, describe, expect, it, vi } from 'vitest'
import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'
import McpServerDetailPage from '../../app/mcp-servers/[name]/page'
import * as api from '../../lib/api'
+import { ConnectorDetailProvider } from '../ConnectorDetailProvider'
const navigation = vi.hoisted(() => ({
push: vi.fn(),
params: { name: 'search' } as { name: string; tab?: string },
}))
+function renderDetailPage() {
+ return render(
+ <ConnectorDetailProvider>
+ <McpServerDetailPage />
+ </ConnectorDetailProvider>
+ )
+}
+
vi.mock('next/navigation', () => ({
useParams: () => navigation.params,
useRouter: () => ({ push: navigation.push }),
@@ -30,6 +39,22 @@ afterEach(() => {
})
describe('McpServerDetailPage', () => {
+ it('keeps the route-derived connector name visible while its resource is loading', async () => {
+ let resolveResource: ((resource: Awaited<ReturnType<typeof api.getMcpServer>>) => void) | null =
+ null
+ vi.mocked(api.getMcpServer).mockReturnValue(
+ new Promise(resolve => {
+ resolveResource = resolve
+ })
+ )
+ renderDetailPage()
+
+ expect(screen.getByRole('heading', { name: 'Connector: search' })).toBeVisible()
+
+ resolveResource?.({ metadata: { name: 'search' }, spec: {} })
+ expect(await screen.findByRole('heading', { name: 'Connector: search' })).toBeVisible()
+ })
+
it('renders non-secret configuration in route-backed, read-only fields and links to edit', async () => {
vi.mocked(api.getMcpServer).mockResolvedValue({
metadata: { name: 'search', namespace: 'mcp-server' },
@@ -53,7 +78,7 @@ describe('McpServerDetailPage', () => {
],
},
})
- render(<McpServerDetailPage />)
+ renderDetailPage()
expect(await screen.findByRole('heading', { name: 'Connector: search' })).toBeVisible()
expect(screen.getByRole('tab', { name: 'Configuration' })).toHaveAttribute(
@@ -90,10 +115,14 @@ describe('McpServerDetailPage', () => {
],
},
})
- const { rerender } = render(<McpServerDetailPage />)
+ const { rerender } = renderDetailPage()
expect(await screen.findByRole('heading', { name: 'Configuration' })).toBeVisible()
navigation.params = { name: 'search', tab: 'runtime' }
- rerender(<McpServerDetailPage />)
+ rerender(
+ <ConnectorDetailProvider>
+ <McpServerDetailPage />
+ </ConnectorDetailProvider>
+ )
expect(await screen.findByRole('heading', { name: 'Runtime status' })).toBeVisible()
expect(screen.getByRole('tab', { name: 'Runtime status' })).toHaveAttribute(
@@ -123,7 +152,7 @@ describe('McpServerDetailPage', () => {
],
},
})
- render(<McpServerDetailPage />)
+ renderDetailPage()
expect(await screen.findByText('Search the public web')).toBeVisible()
fireEvent.click(screen.getByRole('tab', { name: 'Runtime status' }))
@@ -141,7 +170,7 @@ describe('McpServerDetailPage', () => {
vi.mocked(api.getMcpServer)
.mockResolvedValueOnce({ metadata: { name: 'search' }, spec: {} })
.mockRejectedValueOnce(new Error('Connector search was not found.'))
- render(<McpServerDetailPage />)
+ renderDetailPage()
await screen.findByRole('heading', { name: 'Connector: search' })
fireEvent.click(screen.getByRole('button', { name: 'Refresh connector' }))
await waitFor(() => expect(screen.getByRole('alert')).toHaveTextContent('was not found'))
diff --git a/control-ui/e2e/connector-detail-tab-navigation.spec.ts b/control-ui/e2e/connector-detail-tab-navigation.spec.ts
index 78858d229..8071a88a1 100644
--- a/control-ui/e2e/connector-detail-tab-navigation.spec.ts
+++ b/control-ui/e2e/connector-detail-tab-navigation.spec.ts
@@ -3,6 +3,8 @@ import { expect, test } from '@playwright/test'
test('connector detail tabs navigate once and browser back restores configuration', async ({
page,
}) => {
+ let connectorDetailRequests = 0
+
await page.addInitScript(() => {
window.localStorage.setItem('controlUiAdminToken', 'connector-detail-tab-test-token')
})
@@ -19,6 +21,7 @@ test('connector detail tabs navigate once and browser back restores configuratio
}
if (pathname.endsWith('/api/v1/admin/mcp-servers/search')) {
+ connectorDetailRequests += 1
await route.fulfill({
status: 200,
contentType: 'application/json',
@@ -39,14 +42,19 @@ test('connector detail tabs navigate once and browser back restores configuratio
await page.goto('/connectors/search')
await expect(page.getByRole('heading', { name: 'Connector: search' })).toBeVisible()
await expect(page.getByText('Search the public web')).toBeVisible()
+ expect(connectorDetailRequests).toBe(1)
await page.getByRole('tab', { name: 'Runtime status' }).click()
await expect(page).toHaveURL(/\/connectors\/search\/runtime$/)
await expect(page.getByRole('heading', { name: 'Runtime status' })).toBeVisible()
+ await expect(page.getByRole('heading', { name: 'Connector: search' })).toBeVisible()
await expect(page.getByText('Connector is ready.')).toBeVisible()
+ expect(connectorDetailRequests).toBe(1)
await page.goBack()
await expect(page).toHaveURL(/\/connectors\/search\/?$/)
await expect(page.getByRole('heading', { name: 'Configuration' })).toBeVisible()
+ await expect(page.getByRole('heading', { name: 'Connector: search' })).toBeVisible()
await expect(page.getByText('Search the public web')).toBeVisible()
+ expect(connectorDetailRequests).toBe(1)
})
diff --git a/control-ui/package-lock.json b/control-ui/package-lock.json
index 8ac38035d..fe2b14128 100644
--- a/control-ui/package-lock.json
+++ b/control-ui/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-ui",
- "version": "0.1.722",
+ "version": "0.1.723",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-ui",
- "version": "0.1.722",
+ "version": "0.1.723",
"dependencies": {
"@clerum/display-field": "file:../packages/display-field",
"@clerum/frontend-components": "file:../packages/frontend-components",
diff --git a/control-ui/package.json b/control-ui/package.json
index 8659af7c4..d64527ecd 100644
--- a/control-ui/package.json
+++ b/control-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-ui",
- "version": "0.1.722",
+ "version": "0.1.723",
"private": true,
"scripts": {
"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",