Collapse ServerSettingsForm into accordion and add subtle ListToggle variant
Wraps every section of ServerSettingsForm (Connection Mode, Custom Headers, Request Metadata, Timeouts, OAuth Settings) in a controlled Mantine Accordion. The accordion is driven by new required `expandedSections` / `onExpandedSectionsChange` props so the parent owns expand/collapse state — consistent with the dumb-component principle. Adds a `variant?: "default" | "subtle"` prop to ListToggle. In subtle mode it renders as an ActionIcon with `variant="subtle"`, `color="gray"`, and a 16px icon so it visually matches Mantine's CloseButton in modal headers (transparent until hover). Adds a WithSettingsModal story on UnconnectedView that presents the form inside a Mantine Modal with a custom three-column header: subtle ListToggle on the left (expands/collapses all sections at once), "Server Settings" Title centered, CloseButton on the right. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
63daed5613
commit
8483b98c37
5 changed files with 264 additions and 96 deletions
|
|
@ -23,3 +23,19 @@ export const Collapsed: Story = {
|
||||||
onToggle: fn(),
|
onToggle: fn(),
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const SubtleExpanded: Story = {
|
||||||
|
args: {
|
||||||
|
compact: false,
|
||||||
|
variant: "subtle",
|
||||||
|
onToggle: fn(),
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
export const SubtleCollapsed: Story = {
|
||||||
|
args: {
|
||||||
|
compact: true,
|
||||||
|
variant: "subtle",
|
||||||
|
onToggle: fn(),
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,27 @@
|
||||||
import { Button } from "@mantine/core";
|
import { ActionIcon, Button } from "@mantine/core";
|
||||||
import { RiExpandVerticalLine, RiCollapseVerticalLine } from "react-icons/ri";
|
import { RiExpandVerticalLine, RiCollapseVerticalLine } from "react-icons/ri";
|
||||||
|
|
||||||
export interface ListToggleProps {
|
export interface ListToggleProps {
|
||||||
compact: boolean;
|
compact: boolean;
|
||||||
onToggle: () => void;
|
onToggle: () => void;
|
||||||
|
variant?: "default" | "subtle";
|
||||||
}
|
}
|
||||||
|
|
||||||
export function ListToggle({ compact, onToggle }: ListToggleProps) {
|
export function ListToggle({
|
||||||
|
compact,
|
||||||
|
onToggle,
|
||||||
|
variant = "default",
|
||||||
|
}: ListToggleProps) {
|
||||||
const Icon = compact ? RiExpandVerticalLine : RiCollapseVerticalLine;
|
const Icon = compact ? RiExpandVerticalLine : RiCollapseVerticalLine;
|
||||||
|
|
||||||
|
if (variant === "subtle") {
|
||||||
|
return (
|
||||||
|
<ActionIcon variant="subtle" color="gray" size="md" onClick={onToggle}>
|
||||||
|
<Icon size={16} />
|
||||||
|
</ActionIcon>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Button size="sm" onClick={onToggle}>
|
<Button size="sm" onClick={onToggle}>
|
||||||
<Icon size={20} />
|
<Icon size={20} />
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,8 @@ const meta: Meta<typeof ServerSettingsForm> = {
|
||||||
title: "Groups/ServerSettingsForm",
|
title: "Groups/ServerSettingsForm",
|
||||||
component: ServerSettingsForm,
|
component: ServerSettingsForm,
|
||||||
args: {
|
args: {
|
||||||
|
expandedSections: ["connectionMode"],
|
||||||
|
onExpandedSectionsChange: fn(),
|
||||||
onConnectionModeChange: fn(),
|
onConnectionModeChange: fn(),
|
||||||
onAddHeader: fn(),
|
onAddHeader: fn(),
|
||||||
onRemoveHeader: fn(),
|
onRemoveHeader: fn(),
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,13 @@
|
||||||
import {
|
import {
|
||||||
|
Accordion,
|
||||||
ActionIcon,
|
ActionIcon,
|
||||||
Button,
|
Button,
|
||||||
Divider,
|
|
||||||
Group,
|
Group,
|
||||||
NumberInput,
|
NumberInput,
|
||||||
Select,
|
Select,
|
||||||
Stack,
|
Stack,
|
||||||
Text,
|
Text,
|
||||||
TextInput,
|
TextInput,
|
||||||
Title,
|
|
||||||
} from "@mantine/core";
|
} from "@mantine/core";
|
||||||
|
|
||||||
export interface KeyValuePair {
|
export interface KeyValuePair {
|
||||||
|
|
@ -16,6 +15,13 @@ export interface KeyValuePair {
|
||||||
value: string;
|
value: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export type ServerSettingsSection =
|
||||||
|
| "connectionMode"
|
||||||
|
| "headers"
|
||||||
|
| "metadata"
|
||||||
|
| "timeouts"
|
||||||
|
| "oauth";
|
||||||
|
|
||||||
export interface ServerSettingsFormProps {
|
export interface ServerSettingsFormProps {
|
||||||
connectionMode: "proxy" | "direct";
|
connectionMode: "proxy" | "direct";
|
||||||
headers: KeyValuePair[];
|
headers: KeyValuePair[];
|
||||||
|
|
@ -25,6 +31,8 @@ export interface ServerSettingsFormProps {
|
||||||
oauthClientId?: string;
|
oauthClientId?: string;
|
||||||
oauthClientSecret?: string;
|
oauthClientSecret?: string;
|
||||||
oauthScopes?: string;
|
oauthScopes?: string;
|
||||||
|
expandedSections: ServerSettingsSection[];
|
||||||
|
onExpandedSectionsChange: (sections: ServerSettingsSection[]) => void;
|
||||||
onConnectionModeChange: (mode: string) => void;
|
onConnectionModeChange: (mode: string) => void;
|
||||||
onAddHeader: () => void;
|
onAddHeader: () => void;
|
||||||
onRemoveHeader: (index: number) => void;
|
onRemoveHeader: (index: number) => void;
|
||||||
|
|
@ -105,6 +113,8 @@ export function ServerSettingsForm({
|
||||||
oauthClientId,
|
oauthClientId,
|
||||||
oauthClientSecret,
|
oauthClientSecret,
|
||||||
oauthScopes,
|
oauthScopes,
|
||||||
|
expandedSections,
|
||||||
|
onExpandedSectionsChange,
|
||||||
onConnectionModeChange,
|
onConnectionModeChange,
|
||||||
onAddHeader,
|
onAddHeader,
|
||||||
onRemoveHeader,
|
onRemoveHeader,
|
||||||
|
|
@ -122,8 +132,17 @@ export function ServerSettingsForm({
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Stack gap="md">
|
<Accordion
|
||||||
<Title order={5}>Connection Mode</Title>
|
multiple
|
||||||
|
value={expandedSections}
|
||||||
|
onChange={(value) =>
|
||||||
|
onExpandedSectionsChange(value as ServerSettingsSection[])
|
||||||
|
}
|
||||||
|
variant="separated"
|
||||||
|
>
|
||||||
|
<Accordion.Item value="connectionMode">
|
||||||
|
<Accordion.Control>Connection Mode</Accordion.Control>
|
||||||
|
<Accordion.Panel>
|
||||||
<Select
|
<Select
|
||||||
data={CONNECTION_MODE_OPTIONS}
|
data={CONNECTION_MODE_OPTIONS}
|
||||||
value={connectionMode}
|
value={connectionMode}
|
||||||
|
|
@ -136,14 +155,19 @@ export function ServerSettingsForm({
|
||||||
: undefined
|
: undefined
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
|
</Accordion.Panel>
|
||||||
|
</Accordion.Item>
|
||||||
|
|
||||||
<Divider />
|
<Accordion.Item value="headers">
|
||||||
|
<Accordion.Control>Custom Headers</Accordion.Control>
|
||||||
|
<Accordion.Panel>
|
||||||
|
<Stack gap="md">
|
||||||
<Group justify="space-between">
|
<Group justify="space-between">
|
||||||
<Title order={5}>Custom Headers</Title>
|
<HintText>
|
||||||
|
Headers sent with every HTTP request to this server
|
||||||
|
</HintText>
|
||||||
<AddButton onClick={onAddHeader}>+ Add Header</AddButton>
|
<AddButton onClick={onAddHeader}>+ Add Header</AddButton>
|
||||||
</Group>
|
</Group>
|
||||||
<HintText>Headers sent with every HTTP request to this server</HintText>
|
|
||||||
{headers.length === 0 ? (
|
{headers.length === 0 ? (
|
||||||
<EmptyHint>No custom headers configured</EmptyHint>
|
<EmptyHint>No custom headers configured</EmptyHint>
|
||||||
) : (
|
) : (
|
||||||
|
|
@ -153,16 +177,20 @@ export function ServerSettingsForm({
|
||||||
onRemove={onRemoveHeader}
|
onRemove={onRemoveHeader}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
</Stack>
|
||||||
|
</Accordion.Panel>
|
||||||
|
</Accordion.Item>
|
||||||
|
|
||||||
<Divider />
|
<Accordion.Item value="metadata">
|
||||||
|
<Accordion.Control>Request Metadata</Accordion.Control>
|
||||||
|
<Accordion.Panel>
|
||||||
|
<Stack gap="md">
|
||||||
<Group justify="space-between">
|
<Group justify="space-between">
|
||||||
<Title order={5}>Request Metadata</Title>
|
|
||||||
<AddButton onClick={onAddMetadata}>+ Add Metadata</AddButton>
|
|
||||||
</Group>
|
|
||||||
<HintText>
|
<HintText>
|
||||||
Metadata sent with every MCP request (included in _meta field)
|
Metadata sent with every MCP request (included in _meta field)
|
||||||
</HintText>
|
</HintText>
|
||||||
|
<AddButton onClick={onAddMetadata}>+ Add Metadata</AddButton>
|
||||||
|
</Group>
|
||||||
{metadata.length === 0 ? (
|
{metadata.length === 0 ? (
|
||||||
<EmptyHint>No request metadata configured</EmptyHint>
|
<EmptyHint>No request metadata configured</EmptyHint>
|
||||||
) : (
|
) : (
|
||||||
|
|
@ -172,10 +200,13 @@ export function ServerSettingsForm({
|
||||||
onRemove={onRemoveMetadata}
|
onRemove={onRemoveMetadata}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
</Stack>
|
||||||
|
</Accordion.Panel>
|
||||||
|
</Accordion.Item>
|
||||||
|
|
||||||
<Divider />
|
<Accordion.Item value="timeouts">
|
||||||
|
<Accordion.Control>Timeouts</Accordion.Control>
|
||||||
<Title order={5}>Timeouts</Title>
|
<Accordion.Panel>
|
||||||
<Group>
|
<Group>
|
||||||
<NumberInput
|
<NumberInput
|
||||||
label="Connection Timeout"
|
label="Connection Timeout"
|
||||||
|
|
@ -190,12 +221,16 @@ export function ServerSettingsForm({
|
||||||
onChange={handleTimeoutChange("requestTimeout")}
|
onChange={handleTimeoutChange("requestTimeout")}
|
||||||
/>
|
/>
|
||||||
</Group>
|
</Group>
|
||||||
|
</Accordion.Panel>
|
||||||
|
</Accordion.Item>
|
||||||
|
|
||||||
<Divider />
|
<Accordion.Item value="oauth">
|
||||||
|
<Accordion.Control>OAuth Settings</Accordion.Control>
|
||||||
<Title order={5}>OAuth Settings</Title>
|
<Accordion.Panel>
|
||||||
|
<Stack gap="md">
|
||||||
<HintText>
|
<HintText>
|
||||||
Pre-configure OAuth credentials for servers requiring authentication
|
Pre-configure OAuth credentials for servers requiring
|
||||||
|
authentication
|
||||||
</HintText>
|
</HintText>
|
||||||
<TextInput
|
<TextInput
|
||||||
label="Client ID"
|
label="Client ID"
|
||||||
|
|
@ -206,7 +241,9 @@ export function ServerSettingsForm({
|
||||||
label="Client Secret"
|
label="Client Secret"
|
||||||
value={oauthClientSecret ?? ""}
|
value={oauthClientSecret ?? ""}
|
||||||
type="password"
|
type="password"
|
||||||
onChange={(e) => onOAuthChange("clientSecret", e.currentTarget.value)}
|
onChange={(e) =>
|
||||||
|
onOAuthChange("clientSecret", e.currentTarget.value)
|
||||||
|
}
|
||||||
/>
|
/>
|
||||||
<TextInput
|
<TextInput
|
||||||
label="Scopes"
|
label="Scopes"
|
||||||
|
|
@ -214,5 +251,8 @@ export function ServerSettingsForm({
|
||||||
onChange={(e) => onOAuthChange("scopes", e.currentTarget.value)}
|
onChange={(e) => onOAuthChange("scopes", e.currentTarget.value)}
|
||||||
/>
|
/>
|
||||||
</Stack>
|
</Stack>
|
||||||
|
</Accordion.Panel>
|
||||||
|
</Accordion.Item>
|
||||||
|
</Accordion>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,22 @@
|
||||||
|
import { useState } from "react";
|
||||||
import type { Meta, StoryObj } from "@storybook/react-vite";
|
import type { Meta, StoryObj } from "@storybook/react-vite";
|
||||||
|
import { Box, CloseButton, Group, Modal, Title } from "@mantine/core";
|
||||||
import { fn } from "storybook/test";
|
import { fn } from "storybook/test";
|
||||||
import { UnconnectedView } from "./UnconnectedView.js";
|
import { UnconnectedView } from "./UnconnectedView.js";
|
||||||
import { ServerListScreen } from "../../screens/ServerListScreen/ServerListScreen";
|
import { ServerListScreen } from "../../screens/ServerListScreen/ServerListScreen";
|
||||||
|
import {
|
||||||
|
ServerSettingsForm,
|
||||||
|
type ServerSettingsSection,
|
||||||
|
} from "../../groups/ServerSettingsForm/ServerSettingsForm";
|
||||||
|
|
||||||
|
const ALL_SETTINGS_SECTIONS: ServerSettingsSection[] = [
|
||||||
|
"connectionMode",
|
||||||
|
"headers",
|
||||||
|
"metadata",
|
||||||
|
"timeouts",
|
||||||
|
"oauth",
|
||||||
|
];
|
||||||
|
import { ListToggle } from "../../elements/ListToggle/ListToggle";
|
||||||
import type { ServerCardProps } from "../../groups/ServerCard/ServerCard";
|
import type { ServerCardProps } from "../../groups/ServerCard/ServerCard";
|
||||||
|
|
||||||
const meta: Meta<typeof UnconnectedView> = {
|
const meta: Meta<typeof UnconnectedView> = {
|
||||||
|
|
@ -93,6 +108,88 @@ export const WithServers: Story = {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
function SettingsModalStory() {
|
||||||
|
const [expandedSections, setExpandedSections] = useState<
|
||||||
|
ServerSettingsSection[]
|
||||||
|
>(["connectionMode"]);
|
||||||
|
const allExpanded = expandedSections.length === ALL_SETTINGS_SECTIONS.length;
|
||||||
|
return (
|
||||||
|
<UnconnectedView onToggleTheme={fn()}>
|
||||||
|
<ServerListScreen
|
||||||
|
servers={[
|
||||||
|
{
|
||||||
|
name: "everything-server",
|
||||||
|
version: "1.0.0",
|
||||||
|
transport: "stdio",
|
||||||
|
connectionMode: "Via Proxy",
|
||||||
|
command: "npx -y @modelcontextprotocol/server-everything",
|
||||||
|
status: "disconnected",
|
||||||
|
canTestClientFeatures: false,
|
||||||
|
...makeServerCallbacks(),
|
||||||
|
},
|
||||||
|
]}
|
||||||
|
onAddManually={fn()}
|
||||||
|
onImportConfig={fn()}
|
||||||
|
onImportServerJson={fn()}
|
||||||
|
/>
|
||||||
|
<Modal
|
||||||
|
opened
|
||||||
|
onClose={fn()}
|
||||||
|
withCloseButton={false}
|
||||||
|
title={
|
||||||
|
<Group justify="space-between" wrap="nowrap" w="100%">
|
||||||
|
<ListToggle
|
||||||
|
compact={allExpanded}
|
||||||
|
variant="subtle"
|
||||||
|
onToggle={() =>
|
||||||
|
setExpandedSections(allExpanded ? [] : ALL_SETTINGS_SECTIONS)
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
<Title order={4} ta="center" style={{ flex: 1 }}>
|
||||||
|
Server Settings
|
||||||
|
</Title>
|
||||||
|
<Box>
|
||||||
|
<CloseButton onClick={fn()} />
|
||||||
|
</Box>
|
||||||
|
</Group>
|
||||||
|
}
|
||||||
|
size="lg"
|
||||||
|
centered
|
||||||
|
styles={{ title: { flex: 1 } }}
|
||||||
|
>
|
||||||
|
<ServerSettingsForm
|
||||||
|
connectionMode="proxy"
|
||||||
|
headers={[
|
||||||
|
{ key: "Authorization", value: "Bearer token-abc-123" },
|
||||||
|
{ key: "X-Request-Id", value: "req-456" },
|
||||||
|
]}
|
||||||
|
metadata={[{ key: "userId", value: "user-789" }]}
|
||||||
|
connectionTimeout={30000}
|
||||||
|
requestTimeout={60000}
|
||||||
|
oauthClientId="my-client-id"
|
||||||
|
oauthClientSecret="super-secret-value"
|
||||||
|
oauthScopes="read write"
|
||||||
|
expandedSections={expandedSections}
|
||||||
|
onExpandedSectionsChange={setExpandedSections}
|
||||||
|
onConnectionModeChange={fn()}
|
||||||
|
onAddHeader={fn()}
|
||||||
|
onRemoveHeader={fn()}
|
||||||
|
onHeaderChange={fn()}
|
||||||
|
onAddMetadata={fn()}
|
||||||
|
onRemoveMetadata={fn()}
|
||||||
|
onMetadataChange={fn()}
|
||||||
|
onTimeoutChange={fn()}
|
||||||
|
onOAuthChange={fn()}
|
||||||
|
/>
|
||||||
|
</Modal>
|
||||||
|
</UnconnectedView>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export const WithSettingsModal: Story = {
|
||||||
|
render: () => <SettingsModalStory />,
|
||||||
|
};
|
||||||
|
|
||||||
export const ManyServers: Story = {
|
export const ManyServers: Story = {
|
||||||
args: {
|
args: {
|
||||||
children: (
|
children: (
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue