Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
import { SourceControlProviderKind } from "@t3tools/contracts";
import * as Option from "effect/Option";
import { expect, it, vi } from "vite-plus/test";
import { page, userEvent } from "vite-plus/test/browser";

import { act, render } from "../../test/render";
import { PublishRepositoryDialog } from "./GitActionsControl";

const publish = vi.hoisted(() => ({ run: vi.fn() }));

vi.mock("~/state/query", () => ({
useEnvironmentQuery: () => ({
data: {
versionControlSystems: [],
sourceControlProviders: [
{
kind: SourceControlProviderKind.make("github"),
label: "GitHub",
status: "available",
version: Option.none(),
installHint: "Install gh",
detail: Option.none(),
auth: {
status: "authenticated",
account: Option.none(),
host: Option.none(),
detail: Option.none(),
},
},
],
},
}),
}));

vi.mock("~/state/sourceControlActions", () => ({
useGitStackedAction: vi.fn(),
useSourceControlActionRunning: vi.fn(),
useVcsInitAction: vi.fn(),
useVcsPullAction: vi.fn(),
useSourceControlPublishRepositoryAction: () => ({
isAllowed: true,
isPending: false,
run: publish.run,
}),
}));

function setup() {
publish.run.mockReset();
publish.run.mockReturnValue(new Promise(() => {}));
}

it("keeps composition Enter in the repository path from publishing", async () => {
setup();
await using _screen = await render(
<PublishRepositoryDialog
open
onOpenChange={() => {}}
environmentId={null}
threadRef={null}
gitCwd="/repo"
/>,
);
await page.getByRole("button", { name: "Next" }).click();
const path = page.getByRole("textbox", { name: "Repository" });
await path.fill("octo/repo");

for (const nativeEvent of [{ isComposing: true }, { keyCode: 229 }]) {
const event = new KeyboardEvent("keydown", {
key: "Enter",
...nativeEvent,
bubbles: true,
cancelable: true,
});
await act(() => path.element().dispatchEvent(event));
expect(publish.run).not.toHaveBeenCalled();
expect(event.defaultPrevented).toBe(false);
}

await userEvent.keyboard("{Enter}");
expect(publish.run).toHaveBeenCalledOnce();
});
12 changes: 8 additions & 4 deletions apps/web/src/components/GitActionsControl.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ interface PublishRepositoryDialogProps {
readonly gitCwd: string;
}

function PublishRepositoryDialog(props: PublishRepositoryDialogProps) {
export function PublishRepositoryDialog(props: PublishRepositoryDialogProps) {
const openLink = useOpenLink(props.threadRef);
const navigate = useNavigate();
const sourceControlDiscovery = useEnvironmentQuery(
Expand Down Expand Up @@ -691,10 +691,14 @@ function PublishRepositoryDialog(props: PublishRepositoryDialogProps) {
setPublishRepositoryOverride(event.target.value);
}}
onKeyDown={(event) => {
if (event.key === "Enter") {
event.preventDefault();
submitPublishRepository();
if (event.key !== "Enter") {
return;
}
if (event.nativeEvent.isComposing || event.keyCode === 229) {
return;
}
event.preventDefault();
submitPublishRepository();
}}
placeholder={publishPathPlaceholder}
disabled={publishRepositoryAction.isPending}
Expand Down
Loading