ydb-embedded-ui 1.2.1 → 1.2.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+### [1.2.2](https://www.github.com/ydb-platform/ydb-embedded-ui/compare/v1.2.1...v1.2.2) (2022-05-04)
+
+
+### Bug Fixes
+
+* code-review ([288fda3](https://www.github.com/ydb-platform/ydb-embedded-ui/commit/288fda3cd207908e9b5c0486c4d486c6f2e17dd4))
+* reducer clusterInfo should not be used ([1cafcbf](https://www.github.com/ydb-platform/ydb-embedded-ui/commit/1cafcbfb15f668b100cf6628b540b7cd234f6024))
+
 ### [1.2.1](https://www.github.com/ydb-platform/ydb-embedded-ui/compare/v1.2.0...v1.2.1) (2022-04-27)
 
 

package/dist/containers/App/App.js

@@ -17,6 +17,8 @@ registerLanguages();
 class App extends React.Component {
     static propTypes = {
         isAuthenticated: PropTypes.bool,
+        singleClusterMode: PropTypes.bool,
+        clusterName: PropTypes.string,
         children: PropTypes.node,
     };
 
@@ -40,9 +42,10 @@ class App extends React.Component {
     }
 
     renderContentWithNavigation() {
+        const {singleClusterMode, clusterName} = this.props;
         return (
             <AsideNavigation>
-                <Content singleClusterMode={this.props.singleClusterMode} />
+                <Content singleClusterMode={singleClusterMode} clusterName={clusterName} />
                 <div id="fullscreen-root"></div>
             </AsideNavigation>
         );
@@ -58,6 +61,7 @@ function mapStateToProps(state) {
         isAuthenticated: state.authentication.isAuthenticated,
         internalUser: state.authentication.user,
         singleClusterMode: state.singleClusterMode,
+        clusterName: state.cluster.data?.Name,
     };
 }
 

package/dist/containers/App/Content.js

@@ -59,7 +59,7 @@ export function Content(props) {
     };
     return (
         <React.Fragment>
-            {!isClustersPage && <Header />}
+            {!isClustersPage && <Header clusterName={props.clusterName} />}
             <main className={b('main')}>{renderRoute()}</main>
             <ReduxTooltip />
             <AppIcons />
@@ -70,6 +70,7 @@ export function Content(props) {
 Content.propTypes = {
     singleClusterMode: PropTypes.bool,
     children: PropTypes.node,
+    clusterName: PropTypes.string,
 };
 
 function ContentWrapper(props) {

package/dist/containers/Header/Header.tsx

@@ -26,16 +26,16 @@ function ClusterName({name}: {name: string}) {
     );
 }
 
-function Header() {
+interface HeaderProps {
+    clusterName: string
+}
+
+function Header({clusterName}: HeaderProps) {
     const dispatch = useDispatch();
     const {data: host}: {data: {ClusterName?: string}} = useSelector((state: any) => state.host);
     const {singleClusterMode, header}: {singleClusterMode: boolean; header: HeaderItemType[]} =
         useSelector((state: any) => state);
 
-    const clusterName: string = useSelector(
-        (state: any) => state.cluster.data?.Name || state.clusterInfo.title,
-    );
-
     const location = useLocation();
     const history = useHistory();
 

package/dist/store/reducers/index.js

@@ -20,7 +20,6 @@ import tablet from './tablet';
 import executeQuery from './executeQuery';
 import explainQuery from './explainQuery';
 import tabletsFilters from './tabletsFilters';
-import clusterInfo from './clusterInfo';
 import settings from './settings';
 import preview from './preview';
 import nodesList from './clusterNodes';
@@ -63,7 +62,6 @@ export const rootReducer = {
     explainQuery,
     tabletsFilters,
     heatmap,
-    clusterInfo,
     settings,
     preview,
     nodesList,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ydb-embedded-ui",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "files": [
     "dist"
   ],

package/dist/store/reducers/clusterInfo.js

@@ -1,48 +0,0 @@
-import {createRequestActionTypes, createApiRequest} from '../utils';
-import '../../services/api';
-
-const FETCH_CLUSTER = createRequestActionTypes('cluster', 'FETCH_CLUSTER');
-
-const initialState = {loading: false};
-
-const clusterInfo = function (state = initialState, action) {
-    switch (action.type) {
-        case FETCH_CLUSTER.REQUEST: {
-            return {
-                ...state,
-                loading: true,
-            };
-        }
-        case FETCH_CLUSTER.SUCCESS: {
-            const {data = {}} = action;
-
-            return {
-                ...state,
-                ...data,
-                loading: false,
-                error: undefined,
-            };
-        }
-        case FETCH_CLUSTER.FAILURE: {
-            return {
-                ...state,
-                error: action.error,
-                loading: false,
-            };
-        }
-        default:
-            return state;
-    }
-};
-
-export function getCluster(name) {
-    return createApiRequest({
-        request: window.api.getClustersList(),
-        actions: FETCH_CLUSTER,
-        dataHandler: ({clusters = []}) => {
-            return clusters.filter((item) => item.name === name)[0];
-        },
-    });
-}
-
-export default clusterInfo;