[GitHub] mistercrunch closed pull request #4836: Refactoring on exploreReducer.js

[GitBox <gi...@apache.org>]

mistercrunch closed pull request #4836: Refactoring on exploreReducer.js
URL: https://github.com/apache/incubator-superset/pull/4836
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/superset/assets/src/explore/reducers/exploreReducer.js b/superset/assets/src/explore/reducers/exploreReducer.js
index e366f285f4..e6cb827a62 100644
--- a/superset/assets/src/explore/reducers/exploreReducer.js
+++ b/superset/assets/src/explore/reducers/exploreReducer.js
@@ -5,44 +5,70 @@ import * as actions from '../actions/exploreActions';
 export default function exploreReducer(state = {}, action) {
   const actionHandlers = {
     [actions.TOGGLE_FAVE_STAR]() {
-      return Object.assign({}, state, { isStarred: action.isStarred });
+      return {
+        ...state,
+        isStarred: action.isStarred,
+      };
     },
     [actions.FETCH_DATASOURCE_STARTED]() {
-      return Object.assign({}, state, { isDatasourceMetaLoading: true });
+      return {
+        ...state,
+        isDatasourceMetaLoading: true,
+      };
     },
     [actions.FETCH_DATASOURCE_SUCCEEDED]() {
-      return Object.assign({}, state, { isDatasourceMetaLoading: false });
+      return {
+        ...state,
+        isDatasourceMetaLoading: false,
+      };
     },
     [actions.FETCH_DATASOURCE_FAILED]() {
-      // todo(alanna) handle failure/error state
-      return Object.assign({}, state,
-        {
-          isDatasourceMetaLoading: false,
-          controlPanelAlert: action.error,
-        });
+      return {
+        ...state,
+        isDatasourceMetaLoading: false,
+        controlPanelAlert: action.error,
+      };
     },
     [actions.SET_DATASOURCE]() {
-      return Object.assign({}, state, { datasource: action.datasource });
+
+      return {
+        ...state,
+        datasource: action.datasource,
+      };
     },
     [actions.FETCH_DATASOURCES_STARTED]() {
-      return Object.assign({}, state, { isDatasourcesLoading: true });
+
+      return {
+        ...state,
+        isDatasourcesLoading: true,
+      };
     },
     [actions.FETCH_DATASOURCES_SUCCEEDED]() {
-      return Object.assign({}, state, { isDatasourcesLoading: false });
+
+      return {
+        ...state,
+        isDatasourcesLoading: false,
+      };
     },
     [actions.FETCH_DATASOURCES_FAILED]() {
-      // todo(alanna) handle failure/error state
-      return Object.assign({}, state,
-        {
-          isDatasourcesLoading: false,
-          controlPanelAlert: action.error,
-        });
+
+      return {
+        ...state,
+        isDatasourcesLoading: false,
+        controlPanelAlert: action.error,
+      };
     },
     [actions.SET_DATASOURCES]() {
-      return Object.assign({}, state, { datasources: action.datasources });
+      return {
+        ...state,
+        datasources: action.datasources,
+      };
     },
     [actions.REMOVE_CONTROL_PANEL_ALERT]() {
-      return Object.assign({}, state, { controlPanelAlert: null });
+      return {
+        ...state,
+        controlPanelAlert: null,
+      };
     },
     [actions.SET_FIELD_VALUE]() {
       const controls = Object.assign({}, state.controls);
@@ -50,32 +76,45 @@ export default function exploreReducer(state = {}, action) {
       control.value = action.value;
       control.validationErrors = action.validationErrors;
       controls[action.controlName] = control;
-      const changes = { controls };
+      const changes = {
+        controls,
+      };
       if (control.renderTrigger) {
         changes.triggerRender = true;
       }
-      return Object.assign({}, state, changes);
+      return {
+        ...state,
+        ...changes,
+      };
     },
     [actions.SET_EXPLORE_CONTROLS]() {
-      const controls = getControlsState(state, action.formData);
-      return Object.assign({}, state, { controls });
+      return {
+        ...state,
+        controls: getControlsState(state, action.formData),
+      };
     },
     [actions.UPDATE_CHART_TITLE]() {
       const updatedSlice = Object.assign({}, state.slice, { slice_name: action.slice_name });
-      return Object.assign({}, state, { slice: updatedSlice });
+      return {
+        ...state,
+        slice: updatedSlice,
+      };
     },
     [actions.RESET_FIELDS]() {
-      const controls = getControlsState(state, getFormDataFromControls(state.controls));
-      return Object.assign({}, state, { controls });
+      return {
+        ...state,
+        controls: getControlsState(state, getFormDataFromControls(state.controls)),
+      };
     },
     [actions.CREATE_NEW_SLICE]() {
-      return Object.assign({}, state, {
+      return {
+        ...state,
         slice: action.slice,
         controls: getControlsState(state, action.form_data),
         can_add: action.can_add,
         can_download: action.can_download,
         can_overwrite: action.can_overwrite,
-      });
+      };
     },
   };
   if (action.type in actionHandlers) {


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services