Skip to content

Commit 2920495

Browse files
camielvsclaude
andcommitted
fix(projects): offer the project picker on remote pipelines
The editor hid the top-nav project picker for pipelines saved to a backend, because the picker only understood browser pipelines: it looked their projects up by local name and filed them as a browser pipeline pointer. Give the picker a pipeline reference that is either a browser pipeline, by name, or a backend pipeline, by id. A backend pipeline's projects are matched on the resource's entity id, and adding it files the same `pipeline` resource the project page already reads. A draft has no id until its first save, so it can still choose where runs go but cannot be added to a project before then. Keep looking up the pipeline's projects while the "Add to a project" dialog is open. Choosing that option closes the dropdown, which switched the lookup off, so the dialog never marked the projects the pipeline was already in. For a browser pipeline that added a duplicate pointer; for a backend pipeline the backend refuses the duplicate and the add fails. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
1 parent bde1474 commit 2920495

13 files changed

Lines changed: 397 additions & 40 deletions

File tree

‎src/components/Project/AddToProjectDialog.test.tsx‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import userEvent from "@testing-library/user-event";
33
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
44

55
import { pointerTo } from "@/services/localPipelines/localPipelinesService";
6+
import type { ProjectPipelineRef } from "@/services/projects/pipelineResource";
67
import { useAddResourceToProject } from "@/services/projects/useProjectResources";
78
import { useReachableProjects } from "@/services/projects/useReachableProjects";
89

@@ -40,10 +41,13 @@ function mockProjects(items = [{ id: "project-1", name: "Churn work" }]) {
4041
} as unknown as ReturnType<typeof useReachableProjects>);
4142
}
4243

43-
const dialog = (memberProjectIds: string[] = []) =>
44+
const dialog = (
45+
memberProjectIds: string[] = [],
46+
pipeline: ProjectPipelineRef = { source: "local", name: "Churn model" },
47+
) =>
4448
render(
4549
<AddToProjectDialog
46-
pipelineName="Churn model"
50+
pipeline={pipeline}
4751
memberProjectIds={memberProjectIds}
4852
onOpenChange={onOpenChange}
4953
onAdded={onAdded}
@@ -76,6 +80,27 @@ describe("AddToProjectDialog", () => {
7680
});
7781
});
7882

83+
it("files a backend pipeline by its id rather than as a browser pointer", async () => {
84+
dialog([], {
85+
source: "remote",
86+
pipelineId: "pipeline-7",
87+
name: "Churn model",
88+
});
89+
90+
await userEvent.click(screen.getByRole("button", { name: /Churn work/ }));
91+
92+
await waitFor(() => expect(mutate).toHaveBeenCalled());
93+
expect(mutate.mock.calls[0][0]).toEqual({
94+
projectId: "project-1",
95+
input: {
96+
entity: "pipeline",
97+
entityId: "pipeline-7",
98+
name: "Churn model",
99+
},
100+
});
101+
expect(pointerTo).not.toHaveBeenCalled();
102+
});
103+
79104
/** Attribution follows membership, so the project just joined is where runs go. */
80105
it("sends the runs of this tab to the project it joined", async () => {
81106
dialog();

‎src/components/Project/AddToProjectDialog.tsx‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,37 @@ import { useEffect } from "react";
33
import useToastNotification from "@/hooks/useToastNotification";
44
import { useAnalytics } from "@/providers/AnalyticsProvider";
55
import { pointerTo } from "@/services/localPipelines/localPipelinesService";
6+
import {
7+
type ProjectPipelineRef,
8+
remotePipelineResourceInput,
9+
} from "@/services/projects/pipelineResource";
610
import {
711
DescriptorTooLargeError,
812
localPipelineResourceInput,
913
} from "@/services/projects/resourceDescriptor";
14+
import type { CreateResourceInput } from "@/services/projects/types";
1015
import { useAddResourceToProject } from "@/services/projects/useProjectResources";
1116
import { useReachableProjects } from "@/services/projects/useReachableProjects";
1217

1318
import { PickFromListDialog } from "./PickFromListDialog";
1419

1520
interface AddToProjectDialogProps {
16-
pipelineName: string;
21+
pipeline: ProjectPipelineRef;
1722
memberProjectIds: readonly string[];
1823
onOpenChange: (open: boolean) => void;
1924
onAdded: (projectId: string) => void;
2025
}
2126

27+
async function resourceInputFor(
28+
pipeline: ProjectPipelineRef,
29+
): Promise<CreateResourceInput> {
30+
return pipeline.source === "remote"
31+
? remotePipelineResourceInput(pipeline.pipelineId, pipeline.name)
32+
: localPipelineResourceInput(await pointerTo(pipeline.name));
33+
}
34+
2235
export function AddToProjectDialog({
23-
pipelineName,
36+
pipeline,
2437
memberProjectIds,
2538
onOpenChange,
2639
onAdded,
@@ -44,7 +57,7 @@ export function AddToProjectDialog({
4457
const add = async (projectId: string) => {
4558
let input;
4659
try {
47-
input = localPipelineResourceInput(await pointerTo(pipelineName));
60+
input = await resourceInputFor(pipeline);
4861
} catch (problem) {
4962
notify(
5063
problem instanceof DescriptorTooLargeError
@@ -71,7 +84,7 @@ export function AddToProjectDialog({
7184
return (
7285
<PickFromListDialog
7386
title="Add to a project"
74-
helpText={`Runs of "${pipelineName}" can then be attributed to the project you pick.`}
87+
helpText={`Runs of "${pipeline.name}" can then be attributed to the project you pick.`}
7588
noun="project"
7689
icon="Folder"
7790
items={items}

‎src/components/Project/ProjectPicker.test.tsx‎

Lines changed: 39 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,19 @@ import { render, screen, waitFor } from "@testing-library/react";
22
import userEvent from "@testing-library/user-event";
33
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
44

5+
import type { ProjectPipelineRef } from "@/services/projects/pipelineResource";
56
import type { PipelineProjectMembership } from "@/services/projects/usePipelineProjects";
67
import { usePipelineProjects } from "@/services/projects/usePipelineProjects";
78
import { useDeleteProjectResource } from "@/services/projects/useProjectResources";
89

910
import { ProjectPicker } from "./ProjectPicker";
1011
import { useRunProjectContext } from "./useRunProjectContext";
1112

13+
const CHURN_MODEL: ProjectPipelineRef = {
14+
source: "local",
15+
name: "Churn model",
16+
};
17+
1218
const setProjectId = vi.fn();
1319
const removeResource = vi.fn();
1420
const notify = vi.fn();
@@ -93,14 +99,14 @@ describe("ProjectPicker", () => {
9399
it("shows nothing at all while projects are switched off", () => {
94100
given({ enabled: false });
95101

96-
const { container } = render(<ProjectPicker pipelineName="Churn model" />);
102+
const { container } = render(<ProjectPicker pipeline={CHURN_MODEL} />);
97103

98104
expect(container).toBeEmptyDOMElement();
99105
});
100106

101107
/** The old chip only appeared once a project was set, so there was nothing to click. */
102108
it("offers itself on a pipeline that belongs to no project", () => {
103-
render(<ProjectPicker pipelineName="Churn model" />);
109+
render(<ProjectPicker pipeline={CHURN_MODEL} />);
104110

105111
expect(
106112
screen.getByRole("button", { name: "Project for runs: No project" }),
@@ -110,7 +116,7 @@ describe("ProjectPicker", () => {
110116
it("names the project the runs of this tab go to", () => {
111117
given({ projectId: "project-1", projectName: "Churn work" });
112118

113-
render(<ProjectPicker pipelineName="Churn model" />);
119+
render(<ProjectPicker pipeline={CHURN_MODEL} />);
114120

115121
expect(
116122
screen.getByRole("button", { name: "Project for runs: Churn work" }),
@@ -127,7 +133,7 @@ describe("ProjectPicker", () => {
127133
],
128134
});
129135

130-
render(<ProjectPicker pipelineName="Churn model" />);
136+
render(<ProjectPicker pipeline={CHURN_MODEL} />);
131137
await open();
132138

133139
expect(
@@ -148,7 +154,7 @@ describe("ProjectPicker", () => {
148154
],
149155
});
150156

151-
render(<ProjectPicker pipelineName="Churn model" />);
157+
render(<ProjectPicker pipeline={CHURN_MODEL} />);
152158
await open();
153159
await userEvent.click(
154160
screen.getByRole("menuitemradio", { name: "Q3 models" }),
@@ -160,7 +166,7 @@ describe("ProjectPicker", () => {
160166
it("stops sending them anywhere", async () => {
161167
given({ projectId: "project-1", projectName: "Churn work" });
162168

163-
render(<ProjectPicker pipelineName="Churn model" />);
169+
render(<ProjectPicker pipeline={CHURN_MODEL} />);
164170
await open();
165171
await userEvent.click(
166172
screen.getByRole("menuitemradio", { name: "No project" }),
@@ -176,7 +182,7 @@ describe("ProjectPicker", () => {
176182
it("lists a chosen project the pipeline is not in", async () => {
177183
given({ projectId: "project-9", projectName: "Somebody else's" });
178184

179-
render(<ProjectPicker pipelineName="Churn model" />);
185+
render(<ProjectPicker pipeline={CHURN_MODEL} />);
180186
await open();
181187

182188
expect(
@@ -187,7 +193,7 @@ describe("ProjectPicker", () => {
187193
it("offers no removal from a project the pipeline is not in", async () => {
188194
given({ projectId: "project-9", projectName: "Somebody else's" });
189195

190-
render(<ProjectPicker pipelineName="Churn model" />);
196+
render(<ProjectPicker pipeline={CHURN_MODEL} />);
191197
await open();
192198

193199
expect(screen.queryByText(/^Remove from/)).not.toBeInTheDocument();
@@ -200,7 +206,7 @@ describe("ProjectPicker", () => {
200206
memberships: [membership("project-1", "Churn work")],
201207
});
202208

203-
render(<ProjectPicker pipelineName="Churn model" />);
209+
render(<ProjectPicker pipeline={CHURN_MODEL} />);
204210
await open();
205211
await userEvent.click(screen.getByText("Remove from Churn work"));
206212
await userEvent.click(
@@ -223,7 +229,7 @@ describe("ProjectPicker", () => {
223229
memberships: [membership("project-1", "Churn work")],
224230
});
225231

226-
render(<ProjectPicker pipelineName="Churn model" />);
232+
render(<ProjectPicker pipeline={CHURN_MODEL} />);
227233
await open();
228234
await userEvent.click(screen.getByText("Remove from Churn work"));
229235

@@ -234,10 +240,31 @@ describe("ProjectPicker", () => {
234240
});
235241

236242
it("waits to be asked before reading every project's contents", () => {
237-
render(<ProjectPicker pipelineName="Churn model" />);
243+
render(<ProjectPicker pipeline={CHURN_MODEL} />);
238244

239-
expect(usePipelineProjects).toHaveBeenCalledWith("Churn model", {
245+
expect(usePipelineProjects).toHaveBeenCalledWith(CHURN_MODEL, {
240246
enabled: false,
241247
});
242248
});
249+
250+
it("keeps looking up the pipeline's projects while it is being added to one", async () => {
251+
render(<ProjectPicker pipeline={CHURN_MODEL} />);
252+
await open();
253+
await userEvent.click(screen.getByText("Add to a project..."));
254+
255+
expect(screen.getByText("add to project dialog")).toBeInTheDocument();
256+
expect(
257+
screen.queryByRole("menuitem", { name: /Add to a project/ }),
258+
).not.toBeInTheDocument();
259+
expect(usePipelineProjects).toHaveBeenLastCalledWith(CHURN_MODEL, {
260+
enabled: true,
261+
});
262+
});
263+
264+
it("offers no adding while there is no pipeline to add", async () => {
265+
render(<ProjectPicker pipeline={undefined} />);
266+
await open();
267+
268+
expect(screen.queryByText("Add to a project...")).not.toBeInTheDocument();
269+
});
243270
});

‎src/components/Project/ProjectPicker.tsx‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import { Icon } from "@/components/ui/icon";
1616
import { InlineStack } from "@/components/ui/layout";
1717
import { Spinner } from "@/components/ui/spinner";
1818
import { Text } from "@/components/ui/typography";
19+
import type { ProjectPipelineRef } from "@/services/projects/pipelineResource";
1920
import { usePipelineProjects } from "@/services/projects/usePipelineProjects";
2021
import { tracking } from "@/utils/tracking";
2122

@@ -25,16 +26,16 @@ import { useConfirmedResourceRemoval } from "./useConfirmedResourceRemoval";
2526
import { useRunProjectContext } from "./useRunProjectContext";
2627

2728
interface ProjectPickerProps {
28-
pipelineName: string | undefined;
29+
pipeline: ProjectPipelineRef | undefined;
2930
}
3031

31-
export function ProjectPicker({ pipelineName }: ProjectPickerProps) {
32+
export function ProjectPicker({ pipeline }: ProjectPickerProps) {
3233
const { enabled, projectId, projectName, setProjectId } =
3334
useRunProjectContext();
3435
const [open, setOpen] = useState(false);
3536
const [addOpen, setAddOpen] = useState(false);
36-
const { memberships, isPending, error } = usePipelineProjects(pipelineName, {
37-
enabled: open,
37+
const { memberships, isPending, error } = usePipelineProjects(pipeline, {
38+
enabled: open || addOpen,
3839
});
3940
const { confirmAndRemove, confirmation: confirmationProps } =
4041
useConfirmedResourceRemoval({
@@ -118,7 +119,7 @@ export function ProjectPicker({ pipelineName }: ProjectPickerProps) {
118119
</InlineStack>
119120
)}
120121

121-
{pipelineName && (
122+
{pipeline && (
122123
<>
123124
<DropdownMenuSeparator />
124125
<DropdownMenuItem
@@ -146,9 +147,9 @@ export function ProjectPicker({ pipelineName }: ProjectPickerProps) {
146147
</DropdownMenuContent>
147148
</DropdownMenu>
148149

149-
{addOpen && pipelineName && (
150+
{addOpen && pipeline && (
150151
<AddToProjectDialog
151-
pipelineName={pipelineName}
152+
pipeline={pipeline}
152153
memberProjectIds={memberships.map(
153154
(membership) => membership.project.id,
154155
)}

‎src/components/Project/RunProjectField.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
SelectValue,
88
} from "@/components/ui/select";
99
import { Paragraph } from "@/components/ui/typography";
10+
import { localProjectPipeline } from "@/services/projects/pipelineResource";
1011
import { usePipelineProjects } from "@/services/projects/usePipelineProjects";
1112

1213
import { NO_PROJECT, projectOptions } from "./projectOptions";
@@ -30,7 +31,7 @@ export function RunProjectField({
3031
}: RunProjectFieldProps) {
3132
const { enabled, projectName } = useRunProjectContext();
3233
const { memberships } = usePipelineProjects(
33-
enabled ? pipelineName : undefined,
34+
enabled ? localProjectPipeline(pipelineName) : undefined,
3435
);
3536

3637
const options = projectOptions(memberships, value, projectName);

‎src/components/shared/ReactFlow/FlowSidebar/sections/RunsAndSubmission.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import GoogleCloudSubmissionDialog from "@/components/shared/Submitters/GoogleCl
55
import TangleSubmitter from "@/components/shared/Submitters/Tangle/TangleSubmitter";
66
import { BlockStack } from "@/components/ui/layout";
77
import { useComponentSpec } from "@/providers/ComponentSpecProvider";
8+
import { localProjectPipeline } from "@/services/projects/pipelineResource";
89
import { isFixableIssue } from "@/utils/validations";
910

1011
import { RecentExecutionsButton } from "../components/RecentExecutionsButton";
@@ -30,7 +31,7 @@ const RunsAndSubmission = () => {
3031
<SidebarSection title="Runs & Submissions" headerAction={showMoreButton}>
3132
<BlockStack as="ul" gap="1">
3233
<li className="w-full px-2.5">
33-
<ProjectPicker pipelineName={componentSpec?.name} />
34+
<ProjectPicker pipeline={localProjectPipeline(componentSpec?.name)} />
3435
</li>
3536
<li className="w-full">
3637
{isAuthorized ? (

‎src/routes/v2/pages/Editor/components/EditorMenuBar/EditorMenuBar.tsx‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import {
2020
CanvasMenuBar,
2121
} from "@/routes/v2/shared/components/CanvasMenuBar";
2222
import { useSharedStores } from "@/routes/v2/shared/store/SharedStoreContext";
23+
import { projectPipelineOf } from "@/services/projects/pipelineResource";
2324
import { tracking } from "@/utils/tracking";
2425

2526
import { AutoSaveIndicator } from "./components/AutoSaveIndicator";
@@ -158,9 +159,11 @@ export const EditorMenuBar = observer(function EditorMenuBar() {
158159
>
159160
{displayMenu && (
160161
<>
161-
{!isRemote && (
162-
<ProjectPicker pipelineName={activePipeline?.storageKey} />
163-
)}
162+
<ProjectPicker
163+
pipeline={
164+
activePipeline ? projectPipelineOf(activePipeline) : undefined
165+
}
166+
/>
164167
<QuickRunButton />
165168
<div className="w-px h-5 bg-stone-700" />
166169
</>

0 commit comments

Comments
 (0)