yyqdbngt commented on PR #4054: URL: https://github.com/apache/rocketmq-dashboard/pull/4054#issuecomment-5693696348
Rebased onto the current `rocketmq-studio` head (`1e8cc591`) and re-verified. Conflicts and how they were resolved: - `QueryHistoryServiceTest.java` — duplicate imports; kept the upstream import block. - `web/src/components/MessageQueryHistoryDrawer.tsx` — upstream had moved the drawer to i18n while this branch still used literal Chinese labels. The delete column and the clear-history action were re-expressed with `t(...)` keys, and the new keys were added to `web/src/i18n/translations.ts` (`messageHistory.deleteConfirm`, `.deleted`, `.deleteFailed`, `.clear`, `.clearMessages`, `.clearTraces`, `.clearMessagesConfirm`, `.clearTracesConfirm`, `.clearIrreversible`, `.cleared`, `.clearFailed`). The Chinese strings are unchanged, so the added drawer tests keep asserting the same visible text. - The statistics row now keeps upstream's layout and wraps it in a space-between `Flex` so the clear button sits on the right. Verification on the rebased head: - `go`/`maven`: `mvn -o -B test -Dtest=QueryHistoryServiceTest,QueryHistoryControllerTest` → `Tests run: 24, Failures: 0, Errors: 0, Skipped: 0` (Controller 8, Service 16). - `npx vitest run src/components/__tests__/MessageQueryHistoryDrawer.test.tsx` → 5 passed, including `deletes one message history row after confirmation and refreshes` and `clears the trace history after confirmation and refreshes`. - `npx vitest run src/i18n src/components/__tests__/MessageQueryHistoryDrawer.test.tsx` → 14 passed. - `npx eslint` on the four changed web files → clean. -- 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]
