-
-
Notifications
You must be signed in to change notification settings - Fork 225
fix(elicitation): allow dialog to be closed via X button and on error #1919
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
nuthalapativarun
wants to merge
2
commits into
MCPJam:main
Choose a base branch
from
nuthalapativarun:fix/elicitation-dialog-close
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
117 changes: 117 additions & 0 deletions
117
mcpjam-inspector/client/src/components/__tests__/ElicitationDialog.test.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| import { describe, it, expect, vi } from "vitest"; | ||
| import { render, screen } from "@testing-library/react"; | ||
| import userEvent from "@testing-library/user-event"; | ||
| import { ElicitationDialog } from "../ElicitationDialog"; | ||
| import type { DialogElicitation } from "../ToolsTab"; | ||
|
|
||
| vi.mock("@mcpjam/design-system/dialog", () => ({ | ||
| Dialog: ({ | ||
| open, | ||
| onOpenChange, | ||
| children, | ||
| }: { | ||
| open: boolean; | ||
| onOpenChange: (open: boolean) => void; | ||
| children: React.ReactNode; | ||
| }) => | ||
| open ? ( | ||
| <div role="dialog"> | ||
| <button | ||
| data-testid="dialog-x-button" | ||
| onClick={() => onOpenChange(false)} | ||
| /> | ||
| {children} | ||
| </div> | ||
| ) : null, | ||
| DialogContent: ({ children }: { children: React.ReactNode }) => ( | ||
| <div>{children}</div> | ||
| ), | ||
| DialogHeader: ({ children }: { children: React.ReactNode }) => ( | ||
| <div>{children}</div> | ||
| ), | ||
| DialogTitle: ({ children }: { children: React.ReactNode }) => ( | ||
| <div>{children}</div> | ||
| ), | ||
| DialogDescription: ({ children }: { children: React.ReactNode }) => ( | ||
| <div>{children}</div> | ||
| ), | ||
| DialogFooter: ({ children }: { children: React.ReactNode }) => ( | ||
| <div>{children}</div> | ||
| ), | ||
| })); | ||
|
|
||
| vi.mock("@mcpjam/design-system/button", () => ({ | ||
| Button: ({ | ||
| children, | ||
| onClick, | ||
| disabled, | ||
| }: { | ||
| children: React.ReactNode; | ||
| onClick?: () => void; | ||
| disabled?: boolean; | ||
| }) => ( | ||
| <button onClick={onClick} disabled={disabled}> | ||
| {children} | ||
| </button> | ||
| ), | ||
| })); | ||
|
|
||
| const makeRequest = (overrides?: Partial<DialogElicitation>): DialogElicitation => ({ | ||
| requestId: "req-1", | ||
| message: "Please provide your name", | ||
| schema: { | ||
| type: "object", | ||
| properties: { | ||
| name: { type: "string", description: "Your name" }, | ||
| }, | ||
| required: ["name"], | ||
| }, | ||
| timestamp: new Date().toISOString(), | ||
| ...overrides, | ||
| }); | ||
|
|
||
| describe("ElicitationDialog", () => { | ||
| it("does not render when elicitationRequest is null", () => { | ||
| const onResponse = vi.fn(); | ||
| render(<ElicitationDialog elicitationRequest={null} onResponse={onResponse} />); | ||
| expect(screen.queryByRole("dialog")).not.toBeInTheDocument(); | ||
| }); | ||
|
|
||
| it("renders when elicitationRequest is set", () => { | ||
| const onResponse = vi.fn(); | ||
| render( | ||
| <ElicitationDialog | ||
| elicitationRequest={makeRequest()} | ||
| onResponse={onResponse} | ||
| />, | ||
| ); | ||
| expect(screen.getByRole("dialog")).toBeInTheDocument(); | ||
| expect(screen.getByText("Please provide your name")).toBeInTheDocument(); | ||
| }); | ||
|
|
||
| it("calls onResponse with cancel when Cancel button is clicked", async () => { | ||
| const user = userEvent.setup(); | ||
| const onResponse = vi.fn().mockResolvedValue(undefined); | ||
| render( | ||
| <ElicitationDialog | ||
| elicitationRequest={makeRequest()} | ||
| onResponse={onResponse} | ||
| />, | ||
| ); | ||
| await user.click(screen.getByText("Cancel")); | ||
| expect(onResponse).toHaveBeenCalledWith("cancel"); | ||
| }); | ||
|
|
||
| it("calls onResponse with cancel when the X button closes the dialog", async () => { | ||
| const user = userEvent.setup(); | ||
| const onResponse = vi.fn().mockResolvedValue(undefined); | ||
| render( | ||
| <ElicitationDialog | ||
| elicitationRequest={makeRequest()} | ||
| onResponse={onResponse} | ||
| />, | ||
| ); | ||
| await user.click(screen.getByTestId("dialog-x-button")); | ||
| expect(onResponse).toHaveBeenCalledWith("cancel"); | ||
| }); | ||
| }); | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.