remove Command verbiage, refactor slightly

This commit is contained in:
Ashwin Bhat
2024-10-09 08:54:37 -07:00
parent 58e796a5a8
commit 936a50b14b
2 changed files with 34 additions and 40 deletions

View File

@@ -19,7 +19,7 @@ import ResourcesTab, { Resource } from "./components/ResourcesTab";
import NotificationsTab from "./components/NotificationsTab";
import PromptsTab, { Prompt } from "./components/PromptsTab";
import ToolsTab, { Tool as ToolType } from "./components/ToolsTab";
import CommandHistory from "./components/CommandHistory";
import History from "./components/CommandHistory";
const App = () => {
const [socket, setSocket] = useState<WebSocket | null>(null);
@@ -40,8 +40,8 @@ const App = () => {
"/Users/ashwin/code/example-servers/build/everything/index.js",
);
const [mcpConnected, setMcpConnected] = useState<boolean>(false);
const [commandHistory, setCommandHistory] = useState<
Array<{ command: string; response: string | null }>
const [requestHistory, setRequestHistory] = useState<
Array<{ request: string; response: string | null }>
>([]);
useEffect(() => {
@@ -59,34 +59,28 @@ const App = () => {
if (message.type === "resources") {
setResources(message.data.resources);
setError(null);
updateCommandHistory(message);
} else if (message.type === "resource") {
setResourceContent(JSON.stringify(message.data, null, 2));
setError(null);
updateCommandHistory(message);
} else if (message.type === "prompts") {
setPrompts(message.data.prompts);
setError(null);
updateCommandHistory(message);
} else if (message.type === "prompt") {
setPromptContent(JSON.stringify(message.data, null, 2));
setError(null);
updateCommandHistory(message);
} else if (message.type === "tools") {
setTools(message.data.tools);
setError(null);
updateCommandHistory(message);
} else if (message.type === "toolResult") {
setToolResult(JSON.stringify(message.data, null, 2));
setError(null);
updateCommandHistory(message);
} else if (message.type === "error") {
setError(message.message);
updateCommandHistory(message);
} else if (message.type === "connected") {
setMcpConnected(true);
updateCommandHistory(message);
}
updateRequestHistory(message);
};
ws.onerror = () => {
@@ -101,13 +95,13 @@ const App = () => {
return () => ws.close();
}, []);
const updateCommandHistory = (response: unknown) => {
setCommandHistory((prev) => {
const lastCommand = prev[prev.length - 1];
if (lastCommand && lastCommand.response === null) {
const updateRequestHistory = (response: unknown) => {
setRequestHistory((prev) => {
const lastRequest = prev[prev.length - 1];
if (lastRequest && lastRequest.response === null) {
const updatedHistory = [...prev];
updatedHistory[updatedHistory.length - 1] = {
...lastCommand,
...lastRequest,
response: JSON.stringify(response),
};
return updatedHistory;
@@ -120,9 +114,9 @@ const App = () => {
if (socket) {
console.log("Sending WebSocket message:", message);
socket.send(JSON.stringify(message));
setCommandHistory((prev) => [
setRequestHistory((prev) => [
...prev,
{ command: JSON.stringify(message), response: null },
{ request: JSON.stringify(message), response: null },
]);
}
};
@@ -260,7 +254,7 @@ const App = () => {
</div>
</div>
</div>
<CommandHistory commandHistory={commandHistory} />
<History requestHistory={requestHistory} />
</div>
);
};

View File

@@ -1,17 +1,17 @@
import { useState } from "react";
import { Copy } from "lucide-react";
const CommandHistory = ({
commandHistory,
const History = ({
requestHistory,
}: {
commandHistory: Array<{ command: string; response: string | null }>;
requestHistory: Array<{ request: string; response: string | null }>;
}) => {
const [expandedCommands, setExpandedCommands] = useState<{
const [expandedRequests, setExpandedRequests] = useState<{
[key: number]: boolean;
}>({});
const toggleCommandExpansion = (index: number) => {
setExpandedCommands((prev) => ({ ...prev, [index]: !prev[index] }));
const toggleRequestExpansion = (index: number) => {
setExpandedRequests((prev) => ({ ...prev, [index]: !prev[index] }));
};
const copyToClipboard = (text: string) => {
@@ -20,12 +20,12 @@ const CommandHistory = ({
return (
<div className="w-64 bg-white shadow-md p-4 overflow-y-auto">
<h2 className="text-lg font-semibold mb-4">Command History</h2>
<h2 className="text-lg font-semibold mb-4">History</h2>
<ul className="space-y-3">
{commandHistory
{requestHistory
.slice()
.reverse()
.map((cmd, index) => (
.map((request, index) => (
<li
key={index}
className="text-sm text-gray-600 bg-gray-100 p-2 rounded"
@@ -33,52 +33,52 @@ const CommandHistory = ({
<div
className="flex justify-between items-center cursor-pointer"
onClick={() =>
toggleCommandExpansion(commandHistory.length - 1 - index)
toggleRequestExpansion(requestHistory.length - 1 - index)
}
>
<span className="font-mono">
{commandHistory.length - index}.{" "}
{JSON.parse(cmd.command).type}
{requestHistory.length - index}.{" "}
{JSON.parse(request.request).type}
</span>
<span>
{expandedCommands[commandHistory.length - 1 - index]
{expandedRequests[requestHistory.length - 1 - index]
? "▼"
: "▶"}
</span>
</div>
{expandedCommands[commandHistory.length - 1 - index] && (
{expandedRequests[requestHistory.length - 1 - index] && (
<>
<div className="mt-2">
<div className="flex justify-between items-center mb-1">
<span className="font-semibold text-blue-600">
Command:
Request:
</span>
<button
onClick={() => copyToClipboard(cmd.command)}
onClick={() => copyToClipboard(request.request)}
className="text-blue-500 hover:text-blue-700"
>
<Copy size={16} />
</button>
</div>
<pre className="whitespace-pre-wrap break-words bg-blue-50 p-2 rounded">
{JSON.stringify(JSON.parse(cmd.command), null, 2)}
{JSON.stringify(JSON.parse(request.request), null, 2)}
</pre>
</div>
{cmd.response && (
{request.response && (
<div className="mt-2">
<div className="flex justify-between items-center mb-1">
<span className="font-semibold text-green-600">
Response:
</span>
<button
onClick={() => copyToClipboard(cmd.response!)}
onClick={() => copyToClipboard(request.response!)}
className="text-blue-500 hover:text-blue-700"
>
<Copy size={16} />
</button>
</div>
<pre className="whitespace-pre-wrap break-words bg-green-50 p-2 rounded">
{JSON.stringify(JSON.parse(cmd.response), null, 2)}
{JSON.stringify(JSON.parse(request.response), null, 2)}
</pre>
</div>
)}
@@ -91,4 +91,4 @@ const CommandHistory = ({
);
};
export default CommandHistory;
export default History;