unbridled-41 commented on PR #5920:
URL:
https://github.com/apache/rocketmq-dashboard/pull/5920#issuecomment-6091169396
### Sibling note: the backlog placeholder is #5926, and the two branches
conflict
Symmetric to the note on #5926: that PR handles
`consumeStatsAvailable=false` (backlog 0), this one
`consumptionTimestampAvailable=false` (delay 0), and both encode "the console
must not read the provider's placeholder as a measurement" — two independent
flags of the same `GroupLiveSnapshot`.
A trial merge of the two branches 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`. Every hunk resolves to "keep
both" (both optional fields, both sort helpers, both diagnostics issues, both
tests). I resolved that merge locally to check the combination:
```
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 #5926's cases together
```
Either merge order works; the second branch to land needs a rebase, which is
mechanical — happy to do it once the other one is merged.
--
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]
