unbridled-41 commented on PR #4189: URL: https://github.com/apache/rocketmq-dashboard/pull/4189#issuecomment-5602223452
## Merge & re-validation (base advanced to 0c54d985) The base branch advanced by 5 commits after this PR was opened — most notably #2677 (`d7cbf3ed`), which rewrote `web/src/components/MetricsExplorer.tsx` (+835/-137) and its test file (+291). GitHub therefore reported this branch as conflicting. Resolved by merging `origin/rocketmq-studio` into this branch as a merge commit (`f4484121`); no history rewrite, the original fix commit `29873660` is unchanged: - **Conflict**: exactly one hunk — the refs declaration block, where this PR's `rangeIdRef` declaration + sync effect collided with two refs newly added by upstream (`dataSourceNamesRef`, `pendingAuthReplayRef`). Resolution keeps both blocks; no logic was reworked. - **Fix survived the rewrite**: the profiles-effect change auto-merged cleanly, and the defect this PR fixes is still present in the new base (`loadAll(initialProfile, RANGE_OPTIONS[0])`), so the fix remains necessary. The regression test `reuses the selected range when the instance prop changes` passes on the merged result. Re-validation on the merged tree (base `0c54d985` + fix + merge): - `npx vitest run src/components/__tests__/MetricsExplorer.test.tsx` → **26/26 passed**, 3 consecutive isolated runs (26 upstream tests incl. the new history/CSV/auth-replay suites + the regression test from this PR). - Full web suite `npx vitest run` → 981 tests, 979 passed, 2 failed — `MetricsExplorer > requires credentials again when restoring a protected data source history item` and `ConsumerPage > shows group health diagnostics...`, both pass in isolation (26/26 and 31/31) and are load-flaky under full-suite parallelism (the same file has been the recurring flaky file in this sandbox; the MetricsExplorer case is upstream's own test, failing the same way on upstream code under load). - `npx tsc --noEmit` clean; `npx eslint` on both files 0 errors/0 warnings; `npm run build` succeeded (11.09s). - CI: as before, 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]
