unbridled-41 commented on PR #3151:
URL:
https://github.com/apache/rocketmq-dashboard/pull/3151#issuecomment-5602383640
## Merge & re-validation (base advanced to 0c54d985)
The base branch advanced substantially since this PR was opened (36126024 →
0c54d985), including two upstream merges that touch the same file this PR
changes: #3154 (`4ecf6323`, broker config diff request guard) and #3997
(`4d596463`, per-broker daily message counters). GitHub reported this branch as
conflicting.
Resolved by merging `origin/rocketmq-studio` into this branch as a merge
commit (`57e755a2`); no history rewrite, the original fix commit `c673380b` is
unchanged:
- **`web/src/pages/cluster/index.tsx`** — one semantic conflict in
`openBrokerConfigDiff`: this PR routes the call through the registry row's
owning instance (`resolveRegistryTargetInstanceId`), while the now-merged #3154
added the `brokerConfigDiffRequestRef` generation guard to the same function.
Resolution combines both (same composition the auto-merged
`openNameServerConfigDiff` already exhibits): resolve `targetInstanceId` first,
then bump the guard, call `getBrokerConfigDiff(cluster.id, targetInstanceId)`,
and check the guard after the await.
- **`web/src/pages/cluster/__tests__/ClusterPage.test.tsx`** — both sides
appended tests at the same position; resolution keeps this PR's three
regression tests and upstream's "renders per-broker daily message counters"
test.
Re-validation on the merged tree:
- `npx vitest run src/pages/cluster/__tests__/ClusterPage.test.tsx` →
**28/28 passed** — this PR's three tests ("targets broker config actions at the
instance that owns the registry row", both "rejects broker config actions..."
variants) and the upstream guard/counter tests all pass **simultaneously**,
confirming the two fixes compose correctly.
- Full web suite `npx vitest run` → 983 tests, 981 passed, 2 failed —
`ConsumerPage > shows group health diagnostics...` and `TopicPage > keeps
failed topics selected...`, both untouched files that pass in isolation (54/54
combined); load flakiness under full-suite parallelism, consistent with
previous rounds.
- `npx tsc --noEmit` clean; `npx eslint` on both files 0 errors/0 warnings;
`npm run build` succeeded (10.49s).
- CI: the upstream `CI (pull_request)` workflow ends in `startup_failure`
for all branches (0 check-runs), so all suites were run locally.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
