Merge pull request #2187 from lindapaiste/refactor/redux-toolkit

Install and configure Redux Toolkit

Author: raclim

Diff for: client/middleware.js

@@ -0,0 +1,5 @@
+import { createListenerMiddleware } from '@reduxjs/toolkit';
+
+const listenerMiddleware = createListenerMiddleware();
+
+export default listenerMiddleware;

Diff for: client/modules/App/App.jsx

@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import React, { useEffect, useRef, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { useLocation } from 'react-router-dom';
-import getConfig from '../../utils/getConfig';
+import { showReduxDevTools } from '../../store';
 import DevTools from './components/DevTools';
 import { setPreviousPath } from '../IDE/actions/ide';
 import { setLanguage } from '../IDE/actions/preferences';
@@ -52,9 +52,7 @@ const App = ({ children }) => {
   return (
     <div className="app">
       <CookieConsent hide={hide} />
-      {isMounted &&
-        !window.devToolsExtension &&
-        getConfig('NODE_ENV') === 'development' && <DevTools />}
+      {isMounted && showReduxDevTools() && <DevTools />}
       {children}
     </div>
   );

Diff for: client/modules/IDE/selectors/collections.js

@@ -1,4 +1,4 @@
-import { createSelector } from 'reselect';
+import { createSelector } from '@reduxjs/toolkit';
 import differenceInMilliseconds from 'date-fns/differenceInMilliseconds';
 import { find, orderBy } from 'lodash';
 import { DIRECTION } from '../actions/sorting';

Diff for: client/modules/IDE/selectors/files.js

@@ -1,4 +1,4 @@
-import { createSelector } from 'reselect';
+import { createSelector } from '@reduxjs/toolkit';
 
 const selectFiles = (state) => state.files;
 

Diff for: client/modules/IDE/selectors/project.js

@@ -1,4 +1,4 @@
-import { createSelector } from 'reselect';
+import { createSelector } from '@reduxjs/toolkit';
 
 export const selectProjectOwner = (state) => state.project.owner;
 export const selectProjectId = (state) => state.project.id;

Diff for: client/modules/IDE/selectors/projects.js

@@ -1,4 +1,4 @@
-import { createSelector } from 'reselect';
+import { createSelector } from '@reduxjs/toolkit';
 import differenceInMilliseconds from 'date-fns/differenceInMilliseconds';
 import { orderBy } from 'lodash';
 import { DIRECTION } from '../actions/sorting';

Diff for: client/modules/IDE/selectors/users.js

@@ -1,4 +1,4 @@
-import { createSelector } from 'reselect';
+import { createSelector } from '@reduxjs/toolkit';
 import getConfig from '../../../utils/getConfig';
 
 export const getAuthenticated = (state) => state.user.authenticated;

Diff for: client/store.js

@@ -1,30 +1,36 @@
-import { createStore, applyMiddleware, compose } from 'redux';
-import thunk from 'redux-thunk';
+import { configureStore } from '@reduxjs/toolkit';
+import listenerMiddleware from './middleware';
 import DevTools from './modules/App/components/DevTools';
 import rootReducer from './reducers';
 import { clearState, loadState } from './persistState';
 import getConfig from './utils/getConfig';
 
-export default function configureStore(initialState) {
-  const enhancers = [applyMiddleware(thunk)];
-
-  if (getConfig('CLIENT') && getConfig('NODE_ENV') === 'development') {
-    // Enable DevTools only when rendering on client and during development.
-    enhancers.push(
-      window.devToolsExtension
-        ? window.devToolsExtension()
-        : DevTools.instrument()
-    );
-  }
+// Enable DevTools only when rendering on client and during development.
+// Display the dock monitor only if no browser extension is found.
+export function showReduxDevTools() {
+  return (
+    getConfig('CLIENT') &&
+    getConfig('NODE_ENV') === 'development' &&
+    !window.__REDUX_DEVTOOLS_EXTENSION__
+  );
+}
 
+export default function setupStore(initialState) {
   const savedState = loadState();
   clearState();
 
-  const store = createStore(
-    rootReducer,
-    savedState != null ? savedState : initialState,
-    compose(...enhancers)
-  );
+  const store = configureStore({
+    reducer: rootReducer,
+    middleware: (getDefaultMiddleware) =>
+      getDefaultMiddleware({
+        thunk: true,
+        serializableCheck: true,
+        // TODO: enable immutableCheck once the mutations are fixed.
+        immutableCheck: false
+      }).concat(listenerMiddleware.middleware),
+    preloadedState: savedState || initialState,
+    enhancers: showReduxDevTools() ? [DevTools.instrument()] : []
+  });
 
   if (module.hot) {
     // Enable Webpack hot module replacement for reducers