Repository navigation
Conversation
…ropped A new active version of the default template can drop the saved default preset, and for classic templates the parameters that have saved default values. The server rejects saving them again, so the Edit templates dialog warns, leaves them out of the save, and enables Save to store the cleanup. Save waits for the preset and parameter lists that decide this, and pauses with Retry when one fails to load.
|
@codex review |
Codex Review Summary: ✅ CompletedThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 470adeadf2
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| const presetsQuery = useQuery({ | ||
| ...templateVersionPresets(defaultTemplate?.active_version_id ?? ""), | ||
| enabled: defaultTemplate !== undefined && hasDefaultPreset, | ||
| }); |
There was a problem hiding this comment.
Cancel default-value queries when the dialog closes
When either new version-scoped request stalls, closing and reopening the dialog does not start a fresh request: these query functions ignore React Query's abort signal, while handleOpenChange cancels only the project and template-list queries. React Query therefore reuses the pending promise, and isLoadingDefaults can leave Save unavailable indefinitely; cancel and invalidate both default-value queries on close or wire cancellation into their query functions.
AGENTS.md reference: site/AGENTS.md:L11-L11
Useful? React with 👍 / 👎.
| await user.click(await screen.findByRole("button", { name: "Retry" })); | ||
| const save = screen.getByRole("button", { name: /Save/ }); | ||
| await waitFor(() => expect(save).toHaveAttribute("aria-disabled", "false")); |
There was a problem hiding this comment.
Verify saving is blocked before retrying
This test clicks Retry before ever attempting to save, so it still passes if refreshFailed is accidentally removed from canSave and a failed preset request allows the stale preset to be submitted. Attempt Save while the error is active and assert that onSave remains untouched, then retry and verify the successful callback; this also replaces the DOM-attribute synchronization with the non-visual outcome FE1 requires.
AGENTS.md reference: site/AGENTS.md:L7-L7
Useful? React with 👍 / 👎.
| }); | ||
|
|
||
| const save = await screen.findByRole("button", { name: /Save/ }); | ||
| await waitFor(() => expect(save).toHaveAttribute("aria-disabled", "false")); |
There was a problem hiding this comment.
Synchronize tests without asserting DOM attributes
This assertion, along with the new checks at lines 199 and 565, uses aria-disabled presence as test synchronization even though these tests ultimately care about the onSave callback. Await the relevant mocked query completion and exercise the interaction directly, leaving the callback payload as the observable outcome so the tests do not become coupled to how the button's disabled state is rendered.
AGENTS.md reference: site/AGENTS.md:L7-L7
Useful? React with 👍 / 👎.
…t-templates/stale-defaults
…t-templates/stale-defaults
…t-templates/stale-defaults
Adds the API for attaching workspace templates to a chat project, on the schema and queries in #32309. A project can attach templates, turn on a limit that restricts its chats to them, and set a default template with either a default preset or default parameter values. Attaching a template never grants access to it: every reader is checked against the template's own sharing. This PR stores and returns `limit_templates`; #32310 enforces it. - The limit is opt-in. `limit_templates` is off unless a request turns it on, which is what every existing project gets. - Templates are attached and detached one at a time with `PUT` and `DELETE /chats/projects/{project}/templates/{template}`, so a caller never replaces a list they can only partly see. Attaching needs project `update` and template `use`. Detaching needs project `update` and template `read`, and a template the caller cannot read is reported as not found. `POST /chats/projects` accepts `template_ids`, `limit_templates`, and `default_template` for the new project. - `PATCH /chats/projects/{project}` sets `limit_templates` and `default_template`, and no longer changes which templates are attached. The default must be an attached template the caller can read, and its preset must belong to the template's active version. Default parameter names and values are checked against that version for templates on the classic parameter flow; dynamic parameters are checked when a workspace is built. Detaching the default template clears the default. - Project responses list only the attached templates the caller can read, as `templates`, and count the rest as `hidden_template_count`. `default_template` is omitted when the caller cannot read it. Deleted, deprecated, and agent-disabled templates are left out and are not counted as hidden. - Editing uses `chat_project:update`, which the project owner and the project `admin` ACL role have. - Attaching and detaching are audited as writes to the project, with the template list before and after, including the templates attached while creating a project. Changes to `limit_templates` and the default template are part of the project's own audit diff. Not included: showing which project members lack access to an attached template, and MCP server attachments. Stack (merge top to bottom): - #32309 - #30754 👈 - #32310 - #30755 - #32371 - #32372 - #30756 - #32373 - #32374 - #32375 - #30898 - #32376 - #32377 - #32378 - #32379
…t-templates/stale-defaults
A new active version of a project's default template can drop what the project saved as defaults. The server rejects saving such defaults again. Before this PR the dialog kept them in the draft without a warning, so a later save that touched the default template could be rejected.
The Edit templates dialog now warns about them and leaves them out of the save, and Save is enabled to store the cleanup:
Save waits for the preset and parameter lists that decide this, and pauses with Retry when one fails to load. Only the lists the draft uses count, so a failed preset list is ignored after a switch to parameter values.
Templates that are deleted, deprecated, or closed to agents need no cleanup, because the server leaves them out.
Split out of #30898.
Stack (merge top to bottom):