root/fusion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(FN-1735): merge fusion/fn-1735

Browse Source
This commit is contained in:
gsxdsm
2026-04-14 09:44:52 -07:00
parent 16001e6fc9
commit 5bb94b211f
2 changed files with 276 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/dashboard/app/components/GitManagerModal.tsx
View File

@@ -836,6 +836,7 @@ export function GitManagerModal({ isOpen, onClose, tasks, addToast, projectId }:
onPull={handlePull}
onPush={handlePush}
addToast={addToast}
projectId={projectId}
/>
)}
</div>
@@ -1646,6 +1647,7 @@ function RemotesPanel({
onPull,
onPush,
addToast,
projectId,
}: {
status: GitStatus | null;
remoteLoading: string | null;
@@ -1654,6 +1656,7 @@ function RemotesPanel({
onPull: () => void;
onPush: () => void;
addToast: (message: string, type?: ToastType) => void;
projectId?: string;
}) {
const [remotes, setRemotes] = useState<GitRemoteDetailed[]>([]);
const [loading, setLoading] = useState(false);
@@ -1727,7 +1730,7 @@ function RemotesPanel({
const loadRemotes = async () => {
setLoading(true);
try {
const data = await fetchGitRemotesDetailed();
const data = await fetchGitRemotesDetailed(projectId);
setRemotes(data);
} catch (err: any) {
addToast(err.message || "Failed to load remotes", "error");
@@ -1739,7 +1742,7 @@ function RemotesPanel({
const loadAheadCommits = async () => {
setLoadingAhead(true);
try {
const commits = await fetchAheadCommits();
const commits = await fetchAheadCommits(projectId);
setAheadCommits(commits);
} catch {
// Silently ignore — ahead commits are a nice-to-have
@@ -1753,7 +1756,7 @@ function RemotesPanel({
setLoadingRemoteCommits(true);
setRemoteCommitsError(null);
try {
const commits = await fetchRemoteCommits(remoteName, undefined, 10);
const commits = await fetchRemoteCommits(remoteName, undefined, 10, projectId);
setRemoteCommits(commits);
} catch (err: any) {
setRemoteCommitsError(err.message || "Failed to load remote commits");
@@ -1769,7 +1772,7 @@ function RemotesPanel({
setRemoteActionLoading("add");
try {
await addGitRemote(newRemoteName.trim(), newRemoteUrl.trim());
await addGitRemote(newRemoteName.trim(), newRemoteUrl.trim(), projectId);
addToast(`Remote '${newRemoteName}' added successfully`, "success");
setNewRemoteName("");
setNewRemoteUrl("");
@@ -1787,7 +1790,7 @@ function RemotesPanel({
setRemoteActionLoading(`remove-${name}`);
try {
await removeGitRemote(name);
await removeGitRemote(name, projectId);
addToast(`Remote '${name}' removed`, "success");
await loadRemotes();
} catch (err: any) {
@@ -1802,7 +1805,7 @@ function RemotesPanel({
setRemoteActionLoading(`rename-${oldName}`);
try {
await renameGitRemote(oldName, editNameValue.trim());
await renameGitRemote(oldName, editNameValue.trim(), projectId);
addToast(`Remote renamed to '${editNameValue.trim()}'`, "success");
setEditingRemote(null);
setEditNameValue("");
@@ -1819,7 +1822,7 @@ function RemotesPanel({
setRemoteActionLoading(`url-${name}`);
try {
await updateGitRemoteUrl(name, editUrlValue.trim());
await updateGitRemoteUrl(name, editUrlValue.trim(), projectId);
addToast(`Remote URL updated`, "success");
setEditingRemote(null);
setEditUrlValue("");

272
packages/dashboard/app/components/__tests__/GitManagerModal.test.tsx
View File

@@ -1177,7 +1177,7 @@ describe("GitManagerModal", () => {
await user.click(screen.getByRole("button", { name: /^add$/i }));
await waitFor(() => {
expect(addGitRemote).toHaveBeenCalledWith("origin", "https://github.com/test/repo.git");
expectLatestCallStartsWith(addGitRemote as any, "origin", "https://github.com/test/repo.git");
expect(mockAddToast).toHaveBeenCalledWith("Remote 'origin' added successfully", "success");
});
});
@@ -1233,7 +1233,7 @@ describe("GitManagerModal", () => {
await waitFor(() => {
expect(window.confirm).toHaveBeenCalledWith("Are you sure you want to remove remote 'origin'?");
expect(removeGitRemote).toHaveBeenCalledWith("origin");
expectLatestCallStartsWith(removeGitRemote as any, "origin");
expect(mockAddToast).toHaveBeenCalledWith("Remote 'origin' removed", "success");
});
});
@@ -1267,7 +1267,7 @@ describe("GitManagerModal", () => {
await user.click(saveButton as HTMLButtonElement);
await waitFor(() => {
expect(renameGitRemote).toHaveBeenCalledWith("origin", "upstream");
expectLatestCallStartsWith(renameGitRemote as any, "origin", "upstream");
expect(mockAddToast).toHaveBeenCalledWith("Remote renamed to 'upstream'", "success");
});
});
@@ -1300,7 +1300,7 @@ describe("GitManagerModal", () => {
await user.click(saveButton as HTMLButtonElement);
await waitFor(() => {
expect(updateGitRemoteUrl).toHaveBeenCalledWith("origin", "https://new-url.com/repo.git");
expectLatestCallStartsWith(updateGitRemoteUrl as any, "origin", "https://new-url.com/repo.git");
expect(mockAddToast).toHaveBeenCalledWith("Remote URL updated", "success");
});
});
@@ -1422,7 +1422,7 @@ describe("GitManagerModal", () => {
await user.click(saveButton as HTMLButtonElement);
await waitFor(() => {
expect(renameGitRemote).toHaveBeenCalledWith("origin", "upstream");
expectLatestCallStartsWith(renameGitRemote as any, "origin", "upstream");
});
});
@@ -1456,7 +1456,7 @@ describe("GitManagerModal", () => {
await user.click(saveButton as HTMLButtonElement);
await waitFor(() => {
expect(updateGitRemoteUrl).toHaveBeenCalledWith("origin", "https://new-url.com/repo.git");
expectLatestCallStartsWith(updateGitRemoteUrl as any, "origin", "https://new-url.com/repo.git");
});
});
@@ -2089,4 +2089,264 @@ describe("GitManagerModal", () => {
// fetchCommitDiff should have been called for both commits
expect(fetchCommitDiff).toHaveBeenCalledTimes(2);
});
// ── projectId Propagation ───────────────────────────────────────
describe("projectId propagation", () => {
it("passes projectId to fetchGitRemotesDetailed when remotes tab loads", async () => {
render(
<GitManagerModal
isOpen={true}
onClose={vi.fn()}
tasks={mockTasks}
addToast={mockAddToast}
projectId="proj-abc"
/>
);
fireEvent.click(screen.getByRole("tab", { name: /remotes/i }));
await waitFor(() => {
expect(fetchGitRemotesDetailed).toHaveBeenCalledWith("proj-abc");
});
});
it("passes projectId to fetchRemote when Fetch is clicked", async () => {
const user = userEvent.setup();
render(
<GitManagerModal
isOpen={true}
onClose={vi.fn()}
tasks={mockTasks}
addToast={mockAddToast}
projectId="proj-abc"
/>
);
fireEvent.click(screen.getByRole("tab", { name: /remotes/i }));
const fetchButton = await screen.findByRole("button", { name: /fetch/i });
await user.click(fetchButton);
await waitFor(() => {
expectLatestCallStartsWith(fetchRemote as any, undefined, "proj-abc");
});
});
it("passes projectId to fetchAheadCommits when ahead commits are loaded", async () => {
// Mock status with ahead > 0 to trigger loadAheadCommits
(fetchGitStatus as any).mockResolvedValue({
branch: "main",
commit: "abc1234",
isDirty: false,
ahead: 2,
behind: 0,
});
(fetchAheadCommits as any).mockResolvedValue([
{
hash: "aaa1111",
shortHash: "aaa1",
message: "Ahead commit 1",
author: "Dev",
date: "2026-01-01T00:00:00Z",
parents: [],
},
]);
render(
<GitManagerModal
isOpen={true}
onClose={vi.fn()}
tasks={mockTasks}
addToast={mockAddToast}
projectId="proj-abc"
/>
);
fireEvent.click(screen.getByRole("tab", { name: /remotes/i }));
await waitFor(() => {
expect(fetchAheadCommits).toHaveBeenCalledWith("proj-abc");
});
});
it("passes projectId to fetchRemoteCommits when remote commits are loaded", async () => {
(fetchRemoteCommits as any).mockResolvedValue([
{
hash: "rc1",
shortHash: "rc1",
message: "Remote commit 1",
author: "Dev",
date: "2026-01-01T00:00:00Z",
parents: [],
},
]);
render(
<GitManagerModal
isOpen={true}
onClose={vi.fn()}
tasks={mockTasks}
addToast={mockAddToast}
projectId="proj-abc"
/>
);
fireEvent.click(screen.getByRole("tab", { name: /remotes/i }));
await waitFor(() => {
expect(fetchRemoteCommits).toHaveBeenCalledWith("origin", undefined, 10, "proj-abc");
});
});
it("passes projectId to addGitRemote when adding a new remote", async () => {
const user = userEvent.setup();
(fetchGitRemotesDetailed as any).mockResolvedValue([]);
(addGitRemote as any).mockResolvedValue(undefined);
render(
<GitManagerModal
isOpen={true}
onClose={vi.fn()}
tasks={mockTasks}
addToast={mockAddToast}
projectId="proj-abc"
/>
);
fireEvent.click(screen.getByRole("tab", { name: /remotes/i }));
await waitFor(() => {
expect(screen.getByText("Add Remote")).toBeInTheDocument();
});
await user.click(screen.getByText("Add Remote"));
const nameInput = screen.getByPlaceholderText("Remote name (e.g., origin)");
const urlInput = screen.getByPlaceholderText("Repository URL");
await user.type(nameInput, "newremote");
await user.type(urlInput, "https://github.com/test/repo.git");
await user.click(screen.getByRole("button", { name: /^add$/i }));
await waitFor(() => {
expect(addGitRemote).toHaveBeenCalledWith("newremote", "https://github.com/test/repo.git", "proj-abc");
});
});
it("passes projectId to removeGitRemote when removing a remote", async () => {
const user = userEvent.setup();
vi.spyOn(window, "confirm").mockReturnValue(true);
(fetchGitRemotesDetailed as any).mockResolvedValue([
{
name: "origin",
fetchUrl: "https://github.com/dustinbyrne/kb.git",
pushUrl: "https://github.com/dustinbyrne/kb.git",
},
]);
(removeGitRemote as any).mockResolvedValue(undefined);
render(
<GitManagerModal
isOpen={true}
onClose={vi.fn()}
tasks={mockTasks}
addToast={mockAddToast}
projectId="proj-abc"
/>
);
fireEvent.click(screen.getByRole("tab", { name: /remotes/i }));
await waitFor(() => {
expect(screen.getByText("origin")).toBeInTheDocument();
});
const removeButton = screen.getByTitle("Remove remote");
await user.click(removeButton);
await waitFor(() => {
expect(removeGitRemote).toHaveBeenCalledWith("origin", "proj-abc");
});
});
it("passes projectId to renameGitRemote when renaming a remote", async () => {
const user = userEvent.setup();
(fetchGitRemotesDetailed as any).mockResolvedValue([
{
name: "origin",
fetchUrl: "https://github.com/dustinbyrne/kb.git",
pushUrl: "https://github.com/dustinbyrne/kb.git",
},
]);
(renameGitRemote as any).mockResolvedValue(undefined);
render(
<GitManagerModal
isOpen={true}
onClose={vi.fn()}
tasks={mockTasks}
addToast={mockAddToast}
projectId="proj-abc"
/>
);
fireEvent.click(screen.getByRole("tab", { name: /remotes/i }));
await waitFor(() => {
expect(screen.getByText("origin")).toBeInTheDocument();
});
const renameButton = screen.getByTitle("Edit remote name");
await user.click(renameButton);
const nameInput = screen.getByDisplayValue("origin");
await user.clear(nameInput);
await user.type(nameInput, "upstream");
const saveButton = nameInput.closest(".gm-remote-edit")?.querySelector(".btn.btn-sm.btn-primary");
expect(saveButton).toBeTruthy();
await user.click(saveButton as HTMLButtonElement);
await waitFor(() => {
expect(renameGitRemote).toHaveBeenCalledWith("origin", "upstream", "proj-abc");
});
});
it("passes projectId to updateGitRemoteUrl when updating remote URL", async () => {
const user = userEvent.setup();
(fetchGitRemotesDetailed as any).mockResolvedValue([
{
name: "origin",
fetchUrl: "https://old-url.com/repo.git",
pushUrl: "https://old-url.com/repo.git",
},
]);
(updateGitRemoteUrl as any).mockResolvedValue(undefined);
render(
<GitManagerModal
isOpen={true}
onClose={vi.fn()}
tasks={mockTasks}
addToast={mockAddToast}
projectId="proj-abc"
/>
);
fireEvent.click(screen.getByRole("tab", { name: /remotes/i }));
await waitFor(() => {
expect(screen.getByText("origin")).toBeInTheDocument();
});
const editButton = screen.getByTitle("Edit remote URL");
await user.click(editButton);
const urlInput = screen.getByDisplayValue("https://old-url.com/repo.git");
await user.clear(urlInput);
await user.type(urlInput, "https://new-url.com/repo.git");
const saveButton = urlInput.closest(".gm-remote-edit")?.querySelector(".btn.btn-sm.btn-primary");
expect(saveButton).toBeTruthy();
await user.click(saveButton as HTMLButtonElement);
await waitFor(() => {
expect(updateGitRemoteUrl).toHaveBeenCalledWith("origin", "https://new-url.com/repo.git", "proj-abc");
});
});
});
});