You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@superset.apache.org by "michael-s-molina (via GitHub)" <gi...@apache.org> on 2023/03/23 11:46:11 UTC

[GitHub] [superset] michael-s-molina commented on a diff in pull request #23460: refactor: introduce redux toolkit

michael-s-molina commented on code in PR #23460:
URL: https://github.com/apache/superset/pull/23460#discussion_r1146058596


##########
superset-frontend/spec/fixtures/mockStore.js:
##########
@@ -32,38 +29,38 @@ import { dashboardFilters } from './mockDashboardFilters';
 import { nativeFilters, dataMaskWith2Filters } from './mockNativeFilters';
 
 export const storeWithState = state =>
-  createStore(rootReducer, state, compose(applyMiddleware(thunk)));
+  setupStore({
+    disableDegugger: true,

Review Comment:
   ```suggestion
       disableDebugger: true,
   ```



##########
superset-frontend/spec/fixtures/mockStore.js:
##########
@@ -32,38 +29,38 @@ import { dashboardFilters } from './mockDashboardFilters';
 import { nativeFilters, dataMaskWith2Filters } from './mockNativeFilters';
 
 export const storeWithState = state =>
-  createStore(rootReducer, state, compose(applyMiddleware(thunk)));
+  setupStore({
+    disableDegugger: true,
+    initialState: state,
+  });
 
 export const getMockStore = overrideState =>
-  createStore(
-    rootReducer,
-    { ...mockState, ...overrideState },
-    compose(applyMiddleware(thunk)),
-  );
+  setupStore({
+    disableDegugger: true,
+    initialState: { ...mockState, ...overrideState },
+  });
 
 export const mockStore = getMockStore();
 
 export const getMockStoreWithTabs = () =>
-  createStore(
-    rootReducer,
-    {
+  setupStore({
+    disableDegugger: true,

Review Comment:
   ```suggestion
       disableDebugger: true,
   ```



##########
superset-frontend/spec/fixtures/mockStore.js:
##########
@@ -32,38 +29,38 @@ import { dashboardFilters } from './mockDashboardFilters';
 import { nativeFilters, dataMaskWith2Filters } from './mockNativeFilters';
 
 export const storeWithState = state =>
-  createStore(rootReducer, state, compose(applyMiddleware(thunk)));
+  setupStore({
+    disableDegugger: true,
+    initialState: state,
+  });
 
 export const getMockStore = overrideState =>
-  createStore(
-    rootReducer,
-    { ...mockState, ...overrideState },
-    compose(applyMiddleware(thunk)),
-  );
+  setupStore({
+    disableDegugger: true,
+    initialState: { ...mockState, ...overrideState },
+  });
 
 export const mockStore = getMockStore();
 
 export const getMockStoreWithTabs = () =>
-  createStore(
-    rootReducer,
-    {
+  setupStore({
+    disableDegugger: true,
+    initialState: {
       ...mockState,
       dashboardLayout: dashboardLayoutWithTabs,
       dashboardFilters: {},
     },
-    compose(applyMiddleware(thunk)),
-  );
+  });
 
 export const getMockStoreWithChartsInTabsAndRoot = () =>
-  createStore(
-    rootReducer,
-    {
+  setupStore({
+    disableDegugger: true,

Review Comment:
   ```suggestion
       disableDebugger: true,
   ```



##########
superset-frontend/spec/fixtures/mockStore.js:
##########
@@ -101,7 +98,10 @@ export const stateWithFilters = {
 // one chart with a filter that has been rejected,
 // and one chart with no filters set.
 export const getMockStoreWithFilters = () =>
-  createStore(rootReducer, stateWithFilters);
+  setupStore({
+    disableDegugger: true,

Review Comment:
   ```suggestion
       disableDebugger: true,
   ```



##########
superset-frontend/src/views/store.ts:
##########
@@ -135,13 +120,25 @@ export const store: Store = createStore(
  * setupStore with disableDebugger true enables the menu.tsx component to avoid connecting
  * to redux debugger so the application can connect to redux debugger
  */
-export function setupStore(disableDegugger = false): Store {
-  return createStore(
-    rootReducer,
-    {},
-    compose(
-      applyMiddleware(thunk, logger),
-      initEnhancer(false, undefined, disableDegugger),
-    ),
-  );
+export function setupStore({
+  disableDegugger = false,
+  initialState = {},
+  rootReducers = reducers,
+  ...overrides
+}: {
+  disableDegugger?: boolean;
+  initialState?: ConfigureStoreOptions['preloadedState'];
+  rootReducers?: ConfigureStoreOptions['reducer'];
+} & Partial<ConfigureStoreOptions> = {}): Store {
+  return configureStore({
+    preloadedState: initialState,
+    reducer: {
+      ...rootReducers,
+    },
+    middleware: getDefaultMiddleware => getDefaultMiddleware().concat(logger),
+    devTools: process.env.WEBPACK_MODE === 'development' && !disableDegugger,

Review Comment:
   ```suggestion
       devTools: process.env.WEBPACK_MODE === 'development' && !disableDebugger,
   ```



##########
superset-frontend/src/views/store.ts:
##########
@@ -135,13 +120,25 @@ export const store: Store = createStore(
  * setupStore with disableDebugger true enables the menu.tsx component to avoid connecting
  * to redux debugger so the application can connect to redux debugger
  */
-export function setupStore(disableDegugger = false): Store {
-  return createStore(
-    rootReducer,
-    {},
-    compose(
-      applyMiddleware(thunk, logger),
-      initEnhancer(false, undefined, disableDegugger),
-    ),
-  );
+export function setupStore({
+  disableDegugger = false,
+  initialState = {},
+  rootReducers = reducers,
+  ...overrides
+}: {
+  disableDegugger?: boolean;

Review Comment:
   ```suggestion
     disableDebugger?: boolean;
   ```



##########
superset-frontend/src/views/store.ts:
##########
@@ -135,13 +120,25 @@ export const store: Store = createStore(
  * setupStore with disableDebugger true enables the menu.tsx component to avoid connecting
  * to redux debugger so the application can connect to redux debugger
  */
-export function setupStore(disableDegugger = false): Store {
-  return createStore(
-    rootReducer,
-    {},
-    compose(
-      applyMiddleware(thunk, logger),
-      initEnhancer(false, undefined, disableDegugger),
-    ),
-  );
+export function setupStore({
+  disableDegugger = false,

Review Comment:
   ```suggestion
     disableDebugger = false,
   ```



##########
superset-frontend/spec/fixtures/mockStore.js:
##########
@@ -32,38 +29,38 @@ import { dashboardFilters } from './mockDashboardFilters';
 import { nativeFilters, dataMaskWith2Filters } from './mockNativeFilters';
 
 export const storeWithState = state =>
-  createStore(rootReducer, state, compose(applyMiddleware(thunk)));
+  setupStore({
+    disableDegugger: true,
+    initialState: state,
+  });
 
 export const getMockStore = overrideState =>
-  createStore(
-    rootReducer,
-    { ...mockState, ...overrideState },
-    compose(applyMiddleware(thunk)),
-  );
+  setupStore({
+    disableDegugger: true,

Review Comment:
   ```suggestion
       disableDebugger: true,
   ```



##########
superset-frontend/spec/fixtures/mockStore.js:
##########
@@ -132,7 +132,10 @@ export const stateWithNativeFilters = {
 };
 
 export const getMockStoreWithNativeFilters = () =>
-  createStore(rootReducer, stateWithNativeFilters);
+  setupStore({
+    disableDegugger: true,

Review Comment:
   ```suggestion
       disableDebugger: true,
   ```



##########
superset-frontend/src/views/menu.tsx:
##########
@@ -33,7 +33,7 @@ import { setupStore } from './store';
 
 // Disable connecting to redux debugger so that the React app injected
 // Below the menu like SqlLab or Explore can connect its redux store to the debugger
-const store = setupStore(true);
+const store = setupStore({ disableDegugger: true });

Review Comment:
   ```suggestion
   const store = setupStore({ disableDebugger: true });
   ```



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org