Skip to content

Commit 8df08aa

Browse files
committed
fix(composer): preserve exact review repository selectors
1 parent 9e4c8a5 commit 8df08aa

3 files changed

Lines changed: 84 additions & 2 deletions

File tree

‎apps/mobile/src/state/queries.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ export function useComposerPullRequestSearch(input: {
153153
: null,
154154
);
155155
const exactEntry = exact.data
156-
? { ...exact.data, ...legacyThreadPullRequestKey(exact.data) }
156+
? { ...exact.data, host: legacyThreadPullRequestKey(exact.data).host }
157157
: null;
158158
const entries = (() => {
159159
if (input.query === null || input.projectId === null || input.repository === null) return [];
Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
import { EnvironmentId, ProjectId, ProviderDriverKind } from "@t3tools/contracts";
2+
import { expect, it, vi } from "vite-plus/test";
3+
4+
vi.mock("@effect/atom-react", () => ({ useAtomValue: () => false }));
5+
vi.mock("~/state/entities", () => ({ useVisibleThreadShells: () => [] }));
6+
vi.mock("~/state/environments", () => ({
7+
useEnvironmentIdentities: () => [],
8+
useEnvironmentMachines: () => new Map(),
9+
}));
10+
vi.mock("~/state/peerLinks", () => ({ offersLinkedEnvironmentsAtom: () => null }));
11+
vi.mock("~/state/queries", () => ({
12+
useComposerPathSearch: () => ({ entries: [], isPending: false, searchedTarget: null }),
13+
useDebouncedValue: (value: unknown) => value,
14+
useThreadSearch: () => undefined,
15+
}));
16+
vi.mock("~/state/pullRequests", () => ({
17+
usePullRequestList: () => ({
18+
data: { entries: [], providers: [], errors: [] },
19+
isPending: false,
20+
error: null,
21+
}),
22+
pullRequestEnvironment: { detail: () => null },
23+
}));
24+
vi.mock("~/state/query", () => ({
25+
useEnvironmentQuery: () => ({
26+
data: {
27+
provider: "azure-devops",
28+
projectId: "project",
29+
repository: "web",
30+
number: 7,
31+
title: "An older Azure review",
32+
url: "https://dev.azure.com/org-a/project/_git/web/pullrequest/7",
33+
headBranch: "feature",
34+
baseBranch: "main",
35+
state: "open",
36+
updatedAt: "2020-01-01T00:00:00.000Z",
37+
},
38+
isPending: false,
39+
error: null,
40+
}),
41+
}));
42+
43+
import { render } from "../../../test/render";
44+
import { useComposerMenuItems } from "./useComposerMenuItems";
45+
46+
function ExactNumberSuggestions() {
47+
const menu = useComposerMenuItems({
48+
composerTrigger: { kind: "pull-request", query: "7", rangeStart: 0, rangeEnd: 2 },
49+
environmentId: EnvironmentId.make("environment"),
50+
linkedEnvironments: new Map(),
51+
gitCwd: null,
52+
activeThreadId: null,
53+
pullRequestProjectId: ProjectId.make("project"),
54+
pullRequestRepository: "web",
55+
threadPullRequests: [],
56+
sideChatAvailable: false,
57+
sideChatDisabledReason: null,
58+
freshSessionAvailable: false,
59+
compactSlashCommandAvailable: false,
60+
selectedProvider: ProviderDriverKind.make("codex"),
61+
selectedProviderSkills: [],
62+
selectedProviderSlashCommands: [],
63+
showSkillsInSlashMenu: false,
64+
workspaceSkillsScanning: false,
65+
questionAttachmentTarget: null,
66+
modelMentions: { instanceEntries: [], modelOptionsByInstance: new Map() },
67+
});
68+
return menu.items.map((item) =>
69+
item.type === "pull-request" ? (
70+
<a key={item.id} href={item.pullRequest.url}>
71+
{item.pullRequest.title}
72+
</a>
73+
) : null,
74+
);
75+
}
76+
77+
it("offers an exact Azure review outside the recent list using the project's short repository", async () => {
78+
await using screen = await render(<ExactNumberSuggestions />);
79+
await expect
80+
.element(screen.getByRole("link", { name: "An older Azure review" }))
81+
.toHaveAttribute("href", "https://dev.azure.com/org-a/project/_git/web/pullrequest/7");
82+
});

‎apps/web/src/components/chat/useComposerMenuItems.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ export function useComposerMenuItems({
334334
? [
335335
{
336336
...exactPullRequestLookup.data,
337-
...legacyThreadPullRequestKey(exactPullRequestLookup.data),
337+
host: legacyThreadPullRequestKey(exactPullRequestLookup.data).host,
338338
},
339339
]
340340
: [];

0 commit comments

Comments
 (0)