unbridled-41 commented on PR #5926:
URL:
https://github.com/apache/rocketmq-dashboard/pull/5926#issuecomment-6091168282
### Sibling note: the delay placeholder is #5920, and the two branches
conflict
This PR handles the *backlog* placeholder (`consumeStatsAvailable=false` →
`totalLag` 0). The other half of the same provider state is the *delay*
placeholder (`consumptionTimestampAvailable=false` → `delaySeconds` 0), which
is fixed separately in #5920 (`fix/consumer-delay-unavailable`) — rendering,
ordering, the health diagnostics and the CSV export. Nothing here depends on
it, and no shared code is duplicated beyond the two `sorts unknown after known`
helpers.
They do conflict textually, because both touch the same regions: a trial
merge of `fix/consumer-stats-unavailable` + `fix/consumer-delay-unavailable`
conflicts in 4 files (6 hunks) — `web/src/api/metadata.ts`,
`web/src/pages/instance/consumer.tsx`,
`web/src/pages/instance/__tests__/ConsumerPage.test.tsx`,
`web/src/utils/consumerGroupDiagnostics.test.ts`. The resolution is "keep both"
in every hunk (both optional flags on the interface, both sort helpers, both
diagnostics issues, both tests as separate cases).
I verified the combination by resolving that merge locally (EITHER order is
fine; the second branch to land needs the rebase):
```
cd web && npx tsc -b # clean
cd web && npx vitest run src/utils/consumerGroupDiagnostics.test.ts \
src/services/consumerService.test.ts
src/pages/instance/__tests__/ConsumerPage.test.tsx
Test Files 3 passed (3)
Tests 78 passed (78) # this PR's cases and #5920's cases together
```
So if #5920 lands first, rebasing this branch is mechanical and I am happy
to do it — just say the word (I cannot force-push on my own initiative).
--
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]
