From ff852b390e6607572e465afdf8bbd0dea345b878 Mon Sep 17 00:00:00 2001 From: Oleg Shuralev Date: Sun, 12 Jan 2020 01:53:04 +0300 Subject: [PATCH] [UI] Topic Details --- frontend/package-lock.json | 24 +++---- frontend/package.json | 8 +-- frontend/src/components/Nav/ClusterMenu.tsx | 7 +- .../components/Topics/Details/ConfigRow.tsx | 13 ---- .../src/components/Topics/Details/Details.tsx | 62 +++++++++++----- .../Topics/Details/DetailsContainer.ts | 11 ++- .../Topics/Details/Messages/Messages.tsx | 20 ++++++ .../Details/Messages/MessagesContainer.ts | 20 ++++++ .../Topics/Details/Overview/Overview.tsx | 72 +++++++++++++++++++ .../Details/Overview/OverviewContainer.ts | 30 ++++++++ .../components/Topics/Details/Partition.tsx | 22 ------ .../src/components/Topics/Details/Replica.tsx | 34 --------- .../Topics/Details/Settings/Settings.tsx | 20 ++++++ .../Details/Settings/SettingsContainer.ts | 23 ++++++ frontend/src/components/Topics/List/List.tsx | 1 + .../src/components/Topics/List/ListItem.tsx | 7 ++ frontend/src/components/Topics/Topics.tsx | 4 +- .../src/components/Topics/TopicsContainer.ts | 2 - .../common/Dashboard/MetricsWrapper.tsx | 15 ++-- frontend/src/lib/api/topics.ts | 10 ++- frontend/src/lib/paths.ts | 11 +++ .../src/redux/reducers/topics/actionType.ts | 4 ++ frontend/src/redux/reducers/topics/actions.ts | 8 ++- frontend/src/redux/reducers/topics/reducer.ts | 48 +++++++++---- .../src/redux/reducers/topics/selectors.ts | 6 ++ frontend/src/redux/reducers/topics/thunks.ts | 22 +++++- 26 files changed, 360 insertions(+), 144 deletions(-) delete mode 100644 frontend/src/components/Topics/Details/ConfigRow.tsx create mode 100644 frontend/src/components/Topics/Details/Messages/Messages.tsx create mode 100644 frontend/src/components/Topics/Details/Messages/MessagesContainer.ts create mode 100644 frontend/src/components/Topics/Details/Overview/Overview.tsx create mode 100644 frontend/src/components/Topics/Details/Overview/OverviewContainer.ts delete mode 100644 frontend/src/components/Topics/Details/Partition.tsx delete mode 100644 frontend/src/components/Topics/Details/Replica.tsx create mode 100644 frontend/src/components/Topics/Details/Settings/Settings.tsx create mode 100644 frontend/src/components/Topics/Details/Settings/SettingsContainer.ts create mode 100644 frontend/src/lib/paths.ts diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 1241f9a0f0..3b914feed6 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1489,9 +1489,9 @@ } }, "@types/jest": { - "version": "24.0.24", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.0.24.tgz", - "integrity": "sha512-vgaG968EDPSJPMunEDdZvZgvxYSmeH8wKqBlHSkBt1pV2XlLEVDzsj1ZhLuI4iG4Pv841tES61txSBF0obh4CQ==", + "version": "24.0.25", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.0.25.tgz", + "integrity": "sha512-hnP1WpjN4KbGEK4dLayul6lgtys6FPz0UfxMeMQCv0M+sTnzN3ConfiO72jHgLxl119guHgI8gLqDOrRLsyp2g==", "requires": { "jest-diff": "^24.3.0" } @@ -1507,9 +1507,9 @@ "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==" }, "@types/node": { - "version": "12.12.21", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.21.tgz", - "integrity": "sha512-8sRGhbpU+ck1n0PGAUgVrWrWdjSW2aqNeyC15W88GRsMpSwzv6RJGlLhE7s2RhVSOdyDmxbqlWSeThq4/7xqlA==" + "version": "12.12.24", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.24.tgz", + "integrity": "sha512-1Ciqv9pqwVtW6FsIUKSZNB82E5Cu1I2bBTj1xuIHXLe/1zYLl3956Nbhg2MzSYHVfl9/rmanjbQIb7LibfCnug==" }, "@types/parse-json": { "version": "4.0.0", @@ -1527,9 +1527,9 @@ "integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==" }, "@types/react": { - "version": "16.9.16", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.16.tgz", - "integrity": "sha512-dQ3wlehuBbYlfvRXfF5G+5TbZF3xqgkikK7DWAsQXe2KnzV+kjD4W2ea+ThCrKASZn9h98bjjPzoTYzfRqyBkw==", + "version": "16.9.17", + "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.17.tgz", + "integrity": "sha512-UP27In4fp4sWF5JgyV6pwVPAQM83Fj76JOcg02X5BZcpSu5Wx+fP9RMqc2v0ssBoQIFvD5JdKY41gjJJKmw6Bg==", "requires": { "@types/prop-types": "*", "csstype": "^2.2.0" @@ -11745,9 +11745,9 @@ } }, "redux": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/redux/-/redux-4.0.4.tgz", - "integrity": "sha512-vKv4WdiJxOWKxK0yRoaK3Y4pxxB0ilzVx6dszU2W8wLxlb2yikRph4iV/ymtdJ6ZxpBLFbyrxklnT5yBbQSl3Q==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/redux/-/redux-4.0.5.tgz", + "integrity": "sha512-VSz1uMAH24DM6MF72vcojpYPtrTUu3ByVWfPL1nPfVRb5mZVTve5GnNCUV53QM/BZ66xfWrm0CTWoM+Xlz8V1w==", "requires": { "loose-envify": "^1.4.0", "symbol-observable": "^1.2.0" diff --git a/frontend/package.json b/frontend/package.json index e1fd95695c..a7bf70a1cb 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -7,9 +7,9 @@ "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^7.1.2", "@types/classnames": "^2.2.9", - "@types/jest": "^24.0.0", - "@types/node": "^12.0.0", - "@types/react": "^16.9.0", + "@types/jest": "^24.0.25", + "@types/node": "^12.12.24", + "@types/react": "^16.9.17", "@types/react-dom": "^16.9.0", "@types/react-redux": "^7.1.5", "@types/react-router-dom": "^5.1.3", @@ -24,7 +24,7 @@ "react-redux": "^7.1.3", "react-router-dom": "^5.1.2", "react-scripts": "3.3.0", - "redux": "^4.0.4", + "redux": "^4.0.5", "redux-thunk": "^2.3.0", "reselect": "^4.0.0", "typesafe-actions": "^5.1.0", diff --git a/frontend/src/components/Nav/ClusterMenu.tsx b/frontend/src/components/Nav/ClusterMenu.tsx index 886069127d..fe112139ee 100644 --- a/frontend/src/components/Nav/ClusterMenu.tsx +++ b/frontend/src/components/Nav/ClusterMenu.tsx @@ -1,6 +1,7 @@ import React, { CSSProperties } from 'react'; import { Cluster } from 'types'; import { NavLink } from 'react-router-dom'; +import { clusterBrokersPath, clusterTopicsPath } from 'lib/paths'; interface Props extends Cluster {} @@ -26,15 +27,15 @@ const ClusterMenu: React.FC = ({ }) => (