123123213weqw opened a new pull request, #1036:
URL: https://github.com/apache/rocketmq-dashboard/pull/1036
## What is the purpose of the change
When a real RocketMQ cluster (configured via `STUDIO_ROCKETMQ_NAMESRV_ADDR`)
is described by `RealClusterProvider` and no proxy is provisioned, the produced
`ClusterVO` leaves `proxies`, `tpsHistory` and `config` as `null`. The cluster
page dereferences them directly (`c.proxies.length`, `cluster.config`, summary
counts), so a null payload throws a `TypeError` and the page goes blank.
This PR makes the payload safe on both sides:
- **Backend**: `RealClusterProvider` now defaults a live cluster's absent
runtime collections to empty — `proxies`/`tpsHistory` as `List.of()`, `config`
as an empty `ClusterConfigVO` — so the API never serializes JSON `null` for
these component lists.
- **Frontend**: every `brokers`/`proxies`/`nameServers`/`config` access in
the cluster page is guarded with `?? []` / `?? {}`, and the summary counts are
extracted into a pure `countClusterComponents` helper with unit tests.
## Brief changelog
- `server/.../cluster/broker/RealClusterProvider.java`: default `config` and
`tpsHistory` to safe empty values (proxies already defaulted to `List.of()`).
- `web/src/pages/cluster/index.tsx`: null-safe access to `brokers`,
`proxies`, `nameServers`, `selectedProxy.proxies`, `cluster.config`; use
`countClusterComponents`.
- `web/src/pages/cluster/clusterStats.ts` (new): pure summary-count helper
with empty-collection fallbacks.
- `web/src/pages/cluster/clusterStats.test.ts` (new): unit tests for empty,
mixed and null component lists.
- `server/.../cluster/broker/RealClusterProviderTest.java`: new test
asserting non-null `proxies`/`tpsHistory`/`config` for a live cluster without a
proxy.
## Verifying this change
- `mvn test -Dtest=RealClusterProviderTest` — 4 tests pass (3 existing + 1
new).
- `npm test` (`vitest run`) — 391 tests pass, including the new
`clusterStats.test.ts`.
- `eslint src/pages/cluster` — no errors.
Follow this checklist to help us incorporate your contribution quickly and
easily. Notice, `it would be helpful if you could finish the following 5
checklist(the last one is not necessary)before request the community to review
your PR`.
- [x] Make sure there is a [Github
issue](https://github.com/apache/rocketmq/issues) filed for the change (usually
before you start working on it). Trivial changes like typos do not require a
Github issue. Your pull request should address just this issue, without pulling
in other changes - one PR resolves one issue.
- [x] Format the pull request title like `[ISSUE #123] Fix UnknownException
when host config not exist`. Each commit in the pull request should have a
meaningful subject line and body.
- [x] Write a pull request description that is detailed enough to understand
what the pull request does, how, and why.
- [x] Write necessary unit-test(over 80% coverage) to verify your logic
correction, more mock a little better when cross module dependency exist. If
the new feature or significant change is committed, please remember to add
integration-test in [test
module](https://github.com/apache/rocketmq/tree/master/test).
- [x] Run `mvn -B clean apache-rat:check findbugs:findbugs
checkstyle:checkstyle` to make sure basic checks pass. Run `mvn clean install
-DskipITs` to make sure unit-test pass. Run `mvn clean test-compile
failsafe:integration-test` to make sure integration-test pass.
- [ ] If this contribution is large, please file an [Apache Individual
Contributor License Agreement](http://www.apache.org/licenses/#clas).
Closes #995
--
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]
