Merge branch 'master' into task/WG-6--arcgis-wms-layers

react/src/redux/authSlice.ts

@@ -5,7 +5,6 @@ import {
   removeTokenFromLocalStorage,
 } from '../utils/authUtils';
 import { AuthState, AuthenticatedUser } from '../types';
-import { geoapi } from './api/geoapi';
 
 // TODO consider moving to ../types/
 // check local storage for our initial state
@@ -41,18 +40,6 @@ const authSlice = createSlice({
       state.user = action.payload.user;
     },
   },
-  extraReducers: (builder) => {
-    builder.addMatcher(
-      geoapi.endpoints.getGeoapiUserInfo.matchFulfilled,
-      (state, action: PayloadAction<any>) => {
-        const u: any = {
-          username: action.payload.name,
-          email: action.payload.email,
-        };
-        state.user = u;
-      }
-    );
-  },
 });
 
 export const { loginSuccess, logout } = authSlice.actions;

react/src/redux/reducers/reducers.ts

@@ -1,10 +1,6 @@
 import { combineReducers } from 'redux';
-import { geoapi } from '../api/geoapi';
 import authReducer from '../authSlice';
-import projectsReducer from '../projectsSlice';
 
 export const reducer = combineReducers({
   auth: authReducer,
-  projects: projectsReducer,
-  [geoapi.reducerPath]: geoapi.reducer,
 });

react/src/redux/store.ts

@@ -1,13 +1,8 @@
 import { configureStore } from '@reduxjs/toolkit';
 import { reducer } from './reducers/reducers';
-import { geoapi } from './api/geoapi';
 
 const store = configureStore({
   reducer: reducer,
-  middleware: (getDefaultMiddleware) =>
-    getDefaultMiddleware({ serializableCheck: false }).concat(
-      geoapi.middleware
-    ),
 });
 
 export type RootState = ReturnType<typeof store.getState>;