Code review fix

Signed-off-by: Jitendra Gundaniya <[email protected]>

src/reducers/index.js

@@ -61,7 +61,7 @@ function resetDataReducer(state = {}, action) {
  * @param {Object} action Redux action
  * @return {Object} Updated state
  */
-function updateStateFromPropsReducer(state = {}, action) {
+function updateStateFromOptionsReducer(state = {}, action) {
   if (action.type === UPDATE_STATE_FROM_OPTIONS) {
     return merge({}, state, action.payload);
   }
@@ -120,7 +120,7 @@ const combinedReducer = combineReducers({
 
 const rootReducer = (state, action) => {
   let newState = resetDataReducer(state, action);
-  newState = updateStateFromPropsReducer(newState, action);
+  newState = updateStateFromOptionsReducer(newState, action);
   return combinedReducer(newState, action);
 };
 

src/selectors/layout.js

@@ -13,7 +13,7 @@ import {
 
 const getSizeWarningFlag = (state) => state.flags.sizewarning;
 const getVisibleSidebar = (state) => state.visible.sidebar;
-const getDisplayGlobalToolbar = (state) => state.display.globalToolbar;
+const getDisplayGlobalNavigation = (state) => state.display.globalNavigation;
 const getDisplaySidebar = (state) => state.display.sidebar;
 const getVisibleCode = (state) => state.visible.code;
 const getIgnoreLargeWarning = (state) => state.ignoreLargeWarning;
@@ -78,15 +78,15 @@ export const getChartSize = createSelector(
     getVisibleCode,
     getChartSizeState,
     getDisplaySidebar,
-    getDisplayGlobalToolbar,
+    getDisplayGlobalNavigation,
   ],
   (
     visibleSidebar,
     visibleMetaSidebar,
     visibleCodeSidebar,
     chartSize,
     displaySidebar,
-    displayGlobalToolbar
+    displayGlobalNavigation
   ) => {
     const { left, top, width, height } = chartSize;
     if (!width || !height) {
@@ -98,7 +98,7 @@ export const getChartSize = createSelector(
 
     // Get the actual sidebar width
     const sidebarWidthActual =
-      displaySidebar || displayGlobalToolbar
+      displaySidebar || displayGlobalNavigation
         ? getSidebarWidth(isSidebarVisible, sidebarWidth)
         : 0;