From cc98afca0df3db7fd10e3feb27ddd8b1ae25c55b Mon Sep 17 00:00:00 2001
From: Oleg Shuralev <workshur@gmail.com>
Date: Sun, 12 Jan 2020 21:39:43 +0300
Subject: [PATCH] [UI] Details

---
 frontend/src/components/Nav/Nav.tsx           |  2 +-
 .../src/components/Topics/Details/Details.tsx |  2 -
 .../Topics/Details/DetailsContainer.ts        |  7 +--
 .../Topics/Details/Overview/Overview.tsx      | 37 ++++++------
 .../Topics/Details/Settings/Settings.tsx      | 59 +++++++++++++++++--
 .../Details/Settings/SettingsContainer.ts     | 19 ++++--
 frontend/src/components/Topics/List/List.tsx  | 10 ++--
 .../src/components/Topics/List/ListItem.tsx   |  4 +-
 .../common/Breadcrumb/Breadcrumb.tsx          |  4 +-
 frontend/src/lib/api/topics.ts                |  4 +-
 .../src/redux/reducers/topics/actionType.ts   |  4 ++
 frontend/src/redux/reducers/topics/actions.ts |  8 ++-
 frontend/src/redux/reducers/topics/reducer.ts | 11 ++++
 .../src/redux/reducers/topics/selectors.ts    | 12 +++-
 frontend/src/redux/reducers/topics/thunks.ts  | 12 ++++
 frontend/src/types/topic.ts                   | 12 +++-
 16 files changed, 155 insertions(+), 52 deletions(-)

diff --git a/frontend/src/components/Nav/Nav.tsx b/frontend/src/components/Nav/Nav.tsx
index b84c025120..1cd7a526a4 100644
--- a/frontend/src/components/Nav/Nav.tsx
+++ b/frontend/src/components/Nav/Nav.tsx
@@ -31,7 +31,7 @@ const Nav: React.FC<Props> = ({
     </p>
     {!isClusterListFetched && <div className="loader" />}
 
-    {isClusterListFetched && clusters.map((cluster) => <ClusterMenu {...cluster} key={cluster.id}/>)}
+    {isClusterListFetched && clusters.map((cluster, index) => <ClusterMenu {...cluster} key={`cluster-list-item-key-${index}`}/>)}
   </aside>
 );
 
diff --git a/frontend/src/components/Topics/Details/Details.tsx b/frontend/src/components/Topics/Details/Details.tsx
index fd1abc3d79..dec65ae2ea 100644
--- a/frontend/src/components/Topics/Details/Details.tsx
+++ b/frontend/src/components/Topics/Details/Details.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import cx from 'classnames';
 import { ClusterId, Topic, TopicDetails, TopicName } from 'types';
 import Breadcrumb from 'components/common/Breadcrumb/Breadcrumb';
 import { NavLink, Switch, Route } from 'react-router-dom';
@@ -11,7 +10,6 @@ import SettingsContainer from './Settings/SettingsContainer';
 interface Props extends Topic, TopicDetails {
   clusterId: ClusterId;
   topicName: TopicName;
-  fetchTopicDetails: (clusterId: ClusterId, topicName: TopicName) => void;
 }
 
 const Details: React.FC<Props> = ({
diff --git a/frontend/src/components/Topics/Details/DetailsContainer.ts b/frontend/src/components/Topics/Details/DetailsContainer.ts
index e1b0998b05..717b3114fd 100644
--- a/frontend/src/components/Topics/Details/DetailsContainer.ts
+++ b/frontend/src/components/Topics/Details/DetailsContainer.ts
@@ -1,10 +1,6 @@
 import { connect } from 'react-redux';
-import {
-  fetchTopicDetails,
-} from 'redux/reducers/topics/thunks';
 import Details from './Details';
-import { RootState, TopicName, ClusterId } from 'types';
-import { getTopicByName } from 'redux/reducers/topics/selectors';
+import { RootState } from 'types';
 import { withRouter, RouteComponentProps } from 'react-router-dom';
 
 interface RouteProps {
@@ -17,7 +13,6 @@ interface OwnProps extends RouteComponentProps<RouteProps> { }
 const mapStateToProps = (state: RootState, { match: { params: { topicName, clusterId } } }: OwnProps) => ({
   clusterId,
   topicName,
-  ...getTopicByName(state, topicName),
 });
 
 export default withRouter(
diff --git a/frontend/src/components/Topics/Details/Overview/Overview.tsx b/frontend/src/components/Topics/Details/Overview/Overview.tsx
index d330860268..e44c2df3b8 100644
--- a/frontend/src/components/Topics/Details/Overview/Overview.tsx
+++ b/frontend/src/components/Topics/Details/Overview/Overview.tsx
@@ -34,7 +34,7 @@ const Overview: React.FC<Props> = ({
 
   return (
     <>
-      <MetricsWrapper wrapperClassName="notification">
+      <MetricsWrapper>
         <Indicator label="Partitions">
           {partitionCount}
         </Indicator>
@@ -49,28 +49,29 @@ const Overview: React.FC<Props> = ({
           <span className="subtitle has-text-weight-light"> of {replicas}</span>
         </Indicator>
         <Indicator label="Type">
-          <div className="tag is-primary">
+          <span className="tag is-primary">
             {internal ? 'Internal' : 'External'}
-          </div>
+          </span>
         </Indicator>
       </MetricsWrapper>
-
-      <table className="table is-striped is-fullwidth">
-        <thead>
-          <tr>
-            <th>Partition ID</th>
-            <th>Broker leader</th>
-          </tr>
-        </thead>
-        <tbody>
-          {partitions.map(({ partition, leader }) => (
+      <div className="box">
+        <table className="table is-striped is-fullwidth">
+          <thead>
             <tr>
-              <td>{partition}</td>
-              <td>{leader}</td>
+              <th>Partition ID</th>
+              <th>Broker leader</th>
             </tr>
-          ))}
-        </tbody>
-      </table>
+          </thead>
+          <tbody>
+            {partitions.map(({ partition, leader }) => (
+              <tr key={`partition-list-item-key-${partition}`}>
+                <td>{partition}</td>
+                <td>{leader}</td>
+              </tr>
+            ))}
+          </tbody>
+        </table>
+      </div>
     </>
   );
 }
diff --git a/frontend/src/components/Topics/Details/Settings/Settings.tsx b/frontend/src/components/Topics/Details/Settings/Settings.tsx
index c07dfc6ff9..839f28f4a3 100644
--- a/frontend/src/components/Topics/Details/Settings/Settings.tsx
+++ b/frontend/src/components/Topics/Details/Settings/Settings.tsx
@@ -1,19 +1,70 @@
 import React from 'react';
-import { ClusterId, TopicName } from 'types';
+import { ClusterId, TopicName, TopicConfig } from 'types';
 
 interface Props {
   clusterId: ClusterId;
   topicName: TopicName;
+  config?: TopicConfig[];
+  isFetched: boolean;
+  fetchTopicConfig: (clusterId: ClusterId, topicName: TopicName) => void;
+}
+
+const ConfigListItem: React.FC<TopicConfig> = ({
+  name,
+  value,
+  defaultValue,
+}) => {
+  const hasCustomValue = value !== defaultValue;
+
+  return (
+    <tr>
+      <td className={hasCustomValue ? 'has-text-weight-bold' : ''}>
+        {name}
+      </td>
+      <td className={hasCustomValue ? 'has-text-weight-bold' : ''}>
+        {value}
+      </td>
+      <td
+        className="has-text-grey"
+        title="Default Value"
+      >
+        {hasCustomValue && defaultValue}
+      </td>
+    </tr>
+  )
 }
 
 const Sertings: React.FC<Props> = ({
   clusterId,
   topicName,
+  isFetched,
+  fetchTopicConfig,
+  config,
 }) => {
+  React.useEffect(
+    () => { fetchTopicConfig(clusterId, topicName); },
+    [fetchTopicConfig, clusterId, topicName],
+  );
+
+  if (!isFetched || !config) {
+    return (null);
+  }
+
   return (
-    <h1>
-      Settings {clusterId}/{topicName}
-    </h1>
+    <div className="box">
+      <table className="table is-striped is-fullwidth">
+        <thead>
+          <tr>
+            <th>Key</th>
+            <th>Value</th>
+            <th>Default Value</th>
+          </tr>
+        </thead>
+        <tbody>
+          {config.map((item, index) => <ConfigListItem key={`config-list-item-key-${index}`} {...item} />)}
+        </tbody>
+      </table>
+    </div>
   );
 }
 
diff --git a/frontend/src/components/Topics/Details/Settings/SettingsContainer.ts b/frontend/src/components/Topics/Details/Settings/SettingsContainer.ts
index cfa1967c0b..32805cf08b 100644
--- a/frontend/src/components/Topics/Details/Settings/SettingsContainer.ts
+++ b/frontend/src/components/Topics/Details/Settings/SettingsContainer.ts
@@ -1,10 +1,15 @@
 import { connect } from 'react-redux';
+import { RootState, ClusterId, TopicName } from 'types';
+import { withRouter, RouteComponentProps } from 'react-router-dom';
 import {
-  fetchTopicDetails,
+  fetchTopicConfig,
 } from 'redux/reducers/topics/thunks';
 import Settings from './Settings';
-import { RootState } from 'types';
-import { withRouter, RouteComponentProps } from 'react-router-dom';
+import {
+  getTopicConfig,
+  getTopicConfigFetched,
+} from 'redux/reducers/topics/selectors';
+
 
 interface RouteProps {
   clusterId: string;
@@ -16,8 +21,14 @@ interface OwnProps extends RouteComponentProps<RouteProps> { }
 const mapStateToProps = (state: RootState, { match: { params: { topicName, clusterId } } }: OwnProps) => ({
   clusterId,
   topicName,
+  config: getTopicConfig(state, topicName),
+  isFetched: getTopicConfigFetched(state),
 });
 
+const mapDispatchToProps = {
+  fetchTopicConfig: (clusterId: ClusterId, topicName: TopicName) => fetchTopicConfig(clusterId, topicName),
+}
+
 export default withRouter(
-  connect(mapStateToProps)(Settings)
+  connect(mapStateToProps, mapDispatchToProps)(Settings)
 );
diff --git a/frontend/src/components/Topics/List/List.tsx b/frontend/src/components/Topics/List/List.tsx
index c678c56952..9b3b0ac5a7 100644
--- a/frontend/src/components/Topics/List/List.tsx
+++ b/frontend/src/components/Topics/List/List.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
-import { Topic, TopicDetails } from 'types';
+import { TopicWithDetailedInfo } from 'types';
 import ListItem from './ListItem';
 import Breadcrumb from 'components/common/Breadcrumb/Breadcrumb';
 
 interface Props {
-  topics: (Topic & TopicDetails)[];
-  externalTopics: (Topic & TopicDetails)[];
+  topics: (TopicWithDetailedInfo)[];
+  externalTopics: (TopicWithDetailedInfo)[];
 }
 
 const List: React.FC<Props> = ({
@@ -48,9 +48,9 @@ const List: React.FC<Props> = ({
             </tr>
           </thead>
           <tbody>
-            {items.map((topic) => (
+            {items.map((topic, index) => (
               <ListItem
-                key={topic.name}
+                key={`topic-list-item-key-${index}`}
                 {...topic}
               />
             ))}
diff --git a/frontend/src/components/Topics/List/ListItem.tsx b/frontend/src/components/Topics/List/ListItem.tsx
index e096671819..0ca652295b 100644
--- a/frontend/src/components/Topics/List/ListItem.tsx
+++ b/frontend/src/components/Topics/List/ListItem.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import cx from 'classnames';
 import { NavLink } from 'react-router-dom';
-import { Topic, TopicDetails } from 'types';
+import { TopicWithDetailedInfo } from 'types';
 
-const ListItem: React.FC<Topic & TopicDetails> = ({
+const ListItem: React.FC<TopicWithDetailedInfo> = ({
   name,
   internal,
   partitions,
diff --git a/frontend/src/components/common/Breadcrumb/Breadcrumb.tsx b/frontend/src/components/common/Breadcrumb/Breadcrumb.tsx
index addce4d4bd..d37cd7cddf 100644
--- a/frontend/src/components/common/Breadcrumb/Breadcrumb.tsx
+++ b/frontend/src/components/common/Breadcrumb/Breadcrumb.tsx
@@ -17,8 +17,8 @@ const Breadcrumb: React.FC<Props> = ({
   return (
     <nav className="breadcrumb" aria-label="breadcrumbs">
       <ul>
-        {links && links.map(({ label, href }) => (
-          <li key={label}>
+        {links && links.map(({ label, href }, index) => (
+          <li key={`breadcrumb-item-key-${index}`}>
             <NavLink to={href}>{label}</NavLink>
           </li>
         ))}
diff --git a/frontend/src/lib/api/topics.ts b/frontend/src/lib/api/topics.ts
index f3c13ccaff..2cd0ac4cd5 100644
--- a/frontend/src/lib/api/topics.ts
+++ b/frontend/src/lib/api/topics.ts
@@ -3,14 +3,14 @@ import {
   Topic,
   ClusterId,
   TopicDetails,
-  TopicConfigs,
+  TopicConfig,
 } from 'types';
 import {
   BASE_URL,
   BASE_PARAMS,
 } from 'lib/constants';
 
-export const getTopicConfig = (clusterId: ClusterId, topicName: TopicName): Promise<TopicConfigs> =>
+export const getTopicConfig = (clusterId: ClusterId, topicName: TopicName): Promise<TopicConfig[]> =>
   fetch(`${BASE_URL}/clusters/${clusterId}/topics/${topicName}/config`, { ...BASE_PARAMS })
     .then(res => res.json());
 
diff --git a/frontend/src/redux/reducers/topics/actionType.ts b/frontend/src/redux/reducers/topics/actionType.ts
index ac913fc96e..dff0cf167b 100644
--- a/frontend/src/redux/reducers/topics/actionType.ts
+++ b/frontend/src/redux/reducers/topics/actionType.ts
@@ -6,6 +6,10 @@ enum ActionType {
   GET_TOPIC_DETAILS__REQUEST = 'GET_TOPIC_DETAILS__REQUEST',
   GET_TOPIC_DETAILS__SUCCESS = 'GET_TOPIC_DETAILS__SUCCESS',
   GET_TOPIC_DETAILS__FAILURE = 'GET_TOPIC_DETAILS__FAILURE',
+
+  GET_TOPIC_CONFIG__REQUEST = 'GET_TOPIC_CONFIG__REQUEST',
+  GET_TOPIC_CONFIG__SUCCESS = 'GET_TOPIC_CONFIG__SUCCESS',
+  GET_TOPIC_CONFIG__FAILURE = 'GET_TOPIC_CONFIG__FAILURE',
 }
 
 export default ActionType;
diff --git a/frontend/src/redux/reducers/topics/actions.ts b/frontend/src/redux/reducers/topics/actions.ts
index c6fe4fcc6b..82f689ba84 100644
--- a/frontend/src/redux/reducers/topics/actions.ts
+++ b/frontend/src/redux/reducers/topics/actions.ts
@@ -1,6 +1,6 @@
 import { createAsyncAction} from 'typesafe-actions';
 import ActionType from './actionType';
-import { Topic, TopicDetails, TopicName} from 'types';
+import { Topic, TopicDetails, TopicName, TopicConfig} from 'types';
 
 export const fetchTopicListAction = createAsyncAction(
   ActionType.GET_TOPICS__REQUEST,
@@ -13,3 +13,9 @@ export const fetchTopicDetailsAction = createAsyncAction(
   ActionType.GET_TOPIC_DETAILS__SUCCESS,
   ActionType.GET_TOPIC_DETAILS__FAILURE,
 )<undefined, { topicName: TopicName, details: TopicDetails }, undefined>();
+
+export const fetchTopicConfigAction = createAsyncAction(
+  ActionType.GET_TOPIC_CONFIG__REQUEST,
+  ActionType.GET_TOPIC_CONFIG__SUCCESS,
+  ActionType.GET_TOPIC_CONFIG__FAILURE,
+)<undefined, { topicName: TopicName, config: TopicConfig[] }, undefined>();
diff --git a/frontend/src/redux/reducers/topics/reducer.ts b/frontend/src/redux/reducers/topics/reducer.ts
index 9e1a9ebd59..47add74dd3 100644
--- a/frontend/src/redux/reducers/topics/reducer.ts
+++ b/frontend/src/redux/reducers/topics/reducer.ts
@@ -42,6 +42,17 @@ const reducer = (state = initialState, action: Action): TopicsState => {
           }
         }
       }
+    case actionType.GET_TOPIC_CONFIG__SUCCESS:
+      return {
+        ...state,
+        byName: {
+          ...state.byName,
+          [action.payload.topicName]: {
+            ...state.byName[action.payload.topicName],
+            config: action.payload.config,
+          }
+        }
+      }
     default:
       return state;
   }
diff --git a/frontend/src/redux/reducers/topics/selectors.ts b/frontend/src/redux/reducers/topics/selectors.ts
index 8ca38b2fdf..815c59bd2c 100644
--- a/frontend/src/redux/reducers/topics/selectors.ts
+++ b/frontend/src/redux/reducers/topics/selectors.ts
@@ -8,7 +8,8 @@ const getAllNames = (state: RootState) => topicsState(state).allNames;
 const getTopicMap = (state: RootState) => topicsState(state).byName;
 
 const getTopicListFetchingStatus = createFetchingSelector('GET_TOPICS');
-const getTopiDetailsFetchingStatus = createFetchingSelector('GET_TOPIC_DETAILS');
+const getTopicDetailsFetchingStatus = createFetchingSelector('GET_TOPIC_DETAILS');
+const getTopicConfigFetchingStatus = createFetchingSelector('GET_TOPIC_CONFIG');
 
 export const getIsTopicListFetched = createSelector(
   getTopicListFetchingStatus,
@@ -16,7 +17,12 @@ export const getIsTopicListFetched = createSelector(
 );
 
 export const getIsTopicDetailsFetched = createSelector(
-  getTopicListFetchingStatus,
+  getTopicDetailsFetchingStatus,
+  (status) => status === FetchStatus.fetched,
+);
+
+export const getTopicConfigFetched = createSelector(
+  getTopicConfigFetchingStatus,
   (status) => status === FetchStatus.fetched,
 );
 
@@ -45,3 +51,5 @@ export const getTopicByName = createSelector(
   getTopicName,
   (topics, topicName) => topics[topicName],
 );
+
+export const getTopicConfig = createSelector(getTopicByName, ({ config }) => config);
diff --git a/frontend/src/redux/reducers/topics/thunks.ts b/frontend/src/redux/reducers/topics/thunks.ts
index d4bea636d9..9564a8f821 100644
--- a/frontend/src/redux/reducers/topics/thunks.ts
+++ b/frontend/src/redux/reducers/topics/thunks.ts
@@ -1,10 +1,12 @@
 import {
   getTopics,
   getTopicDetails,
+  getTopicConfig,
 } from 'lib/api';
 import {
   fetchTopicListAction,
   fetchTopicDetailsAction,
+  fetchTopicConfigAction,
 } from './actions';
 import { PromiseThunk, ClusterId, TopicName } from 'types';
 
@@ -27,3 +29,13 @@ export const fetchTopicDetails = (clusterId: ClusterId, topicName: TopicName): P
     dispatch(fetchTopicDetailsAction.failure());
   }
 }
+
+export const fetchTopicConfig = (clusterId: ClusterId, topicName: TopicName): PromiseThunk<void> => async (dispatch) => {
+  dispatch(fetchTopicConfigAction.request());
+  try {
+    const config = await getTopicConfig(clusterId, topicName);
+    dispatch(fetchTopicConfigAction.success({ topicName, config }));
+  } catch (e) {
+    dispatch(fetchTopicConfigAction.failure());
+  }
+}
diff --git a/frontend/src/types/topic.ts b/frontend/src/types/topic.ts
index 36f27ec229..875fb0aeaa 100644
--- a/frontend/src/types/topic.ts
+++ b/frontend/src/types/topic.ts
@@ -1,6 +1,8 @@
 export type TopicName = string;
-export interface TopicConfigs {
-  [key: string]: string;
+export interface TopicConfig {
+  name: string;
+  value: string;
+  defaultValue: string;
 }
 
 export interface TopicReplica {
@@ -31,7 +33,11 @@ export interface Topic {
   partitions: TopicPartition[];
 }
 
+export interface TopicWithDetailedInfo extends Topic, TopicDetails {
+  config?: TopicConfig[];
+}
+
 export interface TopicsState {
-  byName: { [topicName: string]: Topic & TopicDetails },
+  byName: { [topicName: string]: TopicWithDetailedInfo },
   allNames: TopicName[],
 }