Skip to content

imprv: Unchanged revision#10770

Merged
mergify[bot] merged 13 commits intomasterfrom
imprv/unchanged-revision
Feb 9, 2026
Merged

imprv: Unchanged revision#10770
mergify[bot] merged 13 commits intomasterfrom
imprv/unchanged-revision

Conversation

@yuki-takei
Copy link
Contributor

@yuki-takei yuki-takei commented Feb 6, 2026

When revisionId is not provided in page update requests, the server failed to resolve previousRevision, causing errors for unchanged revisions (revisions with identical content to their predecessor).

Changes

Server: Two-stage previousRevision fallback

  • Priority 1: Use request revisionId parameter (for conflict detection)
  • Priority 2: Fall back to currentPage.revision (for diff detection)
  • Added error handling and logging for both paths
// Before: Single source, fails if revisionId missing
previousRevision = await Revision.findById(sanitizeRevisionId);

// After: Fallback chain with error handling
previousRevision = null;
if (sanitizeRevisionId != null) {
  try {
    previousRevision = await Revision.findById(sanitizeRevisionId);
  } catch (error) { /* log */ }
}
if (previousRevision == null && currentPage.revision != null) {
  try {
    previousRevision = await Revision.findById(currentPage.revision);
  } catch (error) { /* log */ }
}

Client: Enable comparison selection for all revisions

  • Removed hasDiff condition on compare radio buttons in PageRevisionTable
  • Users can now select any revision for comparison, including unchanged ones

UI: Improved unchanged revision layout

  • Better flexbox spacing for "No diff" display in Revision component
  • Centered "No diff" label with proper alignment

@yuki-takei
Copy link
Contributor Author

@copilot 説明を追加して

Copy link
Contributor

Copilot AI commented Feb 6, 2026

@yuki-takei I've opened a new pull request, #10771, to work on those changes. Once the pull request is ready, I'll request review from you.

@yuki-takei
Copy link
Contributor Author

@mergify queue

@mergify
Copy link
Contributor

mergify bot commented Feb 9, 2026

queue

❌ The pull request has been removed from the queue default

Details

The merge conditions cannot be satisfied due to failing checks.

You can take a look at Queue: Embarked in merge queue check runs for more details about the failure.

@mergify
Copy link
Contributor

mergify bot commented Feb 9, 2026

Merge Queue Status

🚫 The pull request has left the queue (rule: default) at c72681b

This pull request spent 3 minutes 37 seconds in the queue, including 3 minutes 26 seconds running CI.
The checks were run on draft #10772.

Required conditions to merge
  • -check-failure ~= ci-app-
  • check-success = test-prod-node20 / build-prod
  • check-success ~= ci-app-launch-dev
  • check-success ~= ci-app-lint
  • check-success ~= ci-app-test
  • check-success ~= test-prod-node20 / launch-prod
  • check-success ~= test-prod-node20 / run-playwright
  • -check-failure ~= ci-slackbot-
  • -check-failure ~= test-prod-node20 /

Reason

The merge conditions cannot be satisfied due to failing checks

Failing checks:

Hint

You may have to fix your CI before adding the pull request to the queue again.
If you update this pull request, to fix the CI, it will automatically be requeued once the queue conditions match again.
If you think this was a flaky issue instead, you can requeue the pull request, without updating it, by posting a @mergifyio requeue comment.

@mergify mergify bot added the queued label Feb 9, 2026
mergify bot added a commit that referenced this pull request Feb 9, 2026
@mergify mergify bot added dequeued and removed queued labels Feb 9, 2026
@yuki-takei
Copy link
Contributor Author

@mergify queue

@mergify
Copy link
Contributor

mergify bot commented Feb 9, 2026

queue

✅ The pull request has been merged automatically

Details

The pull request has been merged automatically at 285e83a

@mergify
Copy link
Contributor

mergify bot commented Feb 9, 2026

Merge Queue Status

✅ The pull request has been merged at 712dbfa

This pull request spent 13 minutes 38 seconds in the queue, including 12 minutes 41 seconds running CI.
The checks were run on draft #10773.

Required conditions to merge
  • -check-failure ~= ci-app-
  • -check-failure ~= ci-slackbot-
  • -check-failure ~= test-prod-node20 /
  • check-success = test-prod-node20 / build-prod
  • check-success ~= ci-app-launch-dev
  • check-success ~= ci-app-lint
  • check-success ~= ci-app-test
  • check-success ~= test-prod-node20 / launch-prod
  • check-success ~= test-prod-node20 / run-playwright

@mergify mergify bot removed the dequeued label Feb 9, 2026
@yuki-takei
Copy link
Contributor Author

@mergify queue

@mergify
Copy link
Contributor

mergify bot commented Feb 9, 2026

queue

☑️ Command queue ignored because it is already running from a previous command.

@mergify mergify bot added the queued label Feb 9, 2026
mergify bot added a commit that referenced this pull request Feb 9, 2026
@mergify mergify bot merged commit 285e83a into master Feb 9, 2026
27 checks passed
@mergify mergify bot deleted the imprv/unchanged-revision branch February 9, 2026 10:02
@mergify mergify bot removed the queued label Feb 9, 2026
@github-actions github-actions bot mentioned this pull request Feb 9, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants