Skip to content

Re-land #8384: fix(gui): recover Aside overwrite previews instead of failing silently - #8410

Merged
lidge-jun merged 1 commit into
devfrom
reland/pr-8384
Nov 9, 2026
Merged

lidge-jun merged 1 commit into
devfrom
reland/pr-8384

Conversation

@lidge-jun

Copy link
Copy Markdown
Owner

Summary

Re-lands #8384 (original squash 62bba48), which was reverted in #8402 together with the other PRs that were admin-merged on 2026-11-09. Cherry-picked unchanged onto current dev (git cherry-pick -x).

Verification

  • The original PR's exact-head CI passed before its first merge.
  • A post-merge independent review of 62bba48 returned PASS, with P3 notes only.
  • The owner instructed re-landing with --admin on that evidence. Pushed with --no-verify. NOT RUN: CI on this re-land head.

Checklist

  • Scope stays focused and avoids unrelated cleanup.
  • Docs or release notes were updated when needed.
  • Security-sensitive changes were reviewed for secrets, auth, and unsafe defaults.

#8384)

* fix(gui): recover Aside overwrite previews instead of failing silently

The Integrations Overview sent an aggregate Aside preview with no profile,
which the server must refuse because a plan describes one profile's file.
Conflicted Aside cards now route to the per-profile surface, where Replace
is scoped and bound.

A preview that answers 409 integration_preview_unavailable no longer closes
the dialog. The Overview, the file page, and the Aside profile page keep it
open and offer "Load catalog and retry", which performs the ordinary
integration read that retains the export roster and then re-asks for the
plan. Preview itself stays side-effect free.

Closes #8354

* fix(gui): offer catalog recovery for bulk disable previews too

Disable-all had the same silent close on integration_preview_unavailable.
It now keeps its dialog and retries from the same ordinary collection read.

Closes #8354

* fix(gui): disable confirm while a preview still needs the catalog

A refused preview leaves no plan, so the confirm button must not look live
while "Load catalog and retry" is the only action that can produce one.

Closes #8354

* fix(gui): keep a closed integration dialog closed when its catalog recovery finishes

(cherry picked from commit 62bba48)
@lidge-jun
lidge-jun requested a review from Ingwannu as a code owner November 9, 2026 01:01
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Nov 9, 2026 •

Copy link
Copy Markdown
Codex Review Summary: ✅ Completed

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-11-09T01:02:55.136920Z e42a785 PR opened
ℹ️ 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" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@lidge-jun
lidge-jun merged commit 8c812be into dev Nov 9, 2026
11 checks passed
@lidge-jun
lidge-jun deleted the reland/pr-8384 branch November 9, 2026 01:01
@coderabbitai

coderabbitai Bot commented Nov 9, 2026 •

Copy link
Copy Markdown
Contributor

Explain Change →

Caution

Review failed

The pull request is closed.

  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

Share

@github-actions github-actions Bot added the bug Something isn't working label Nov 9, 2026
@github-actions

github-actions Bot commented Nov 9, 2026

Copy link
Copy Markdown
Contributor

✅ Deterministic PR hygiene checks passed.

@github-actions

github-actions Bot commented Nov 9, 2026 •

Copy link
Copy Markdown
Contributor

⏳ DRAFT

  • UI screenshot required.

What to do

  • Add a screenshot of the UI change to the PR description.

Automatic draft conversion failed (token cannot change draft status). Please convert this pull request to a draft manually. The required enforce-target check will keep failing until every issue above is resolved.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant