Changed users state from the redux store

Author: TOPOFGR

functions/.gitignore

@@ -10,4 +10,6 @@ node_modules/
 lib/
 
 #Necessary config for testing
-env.json
+env.json
+
+service-account-key.json

src/pages/User/User.test.js

@@ -8,7 +8,7 @@ describe('<User /> rendering', () => {
   it('should render without crashing', () => {
     const { component } = shallowWithProviders(<User />)({
       users: {
-        list: [],
+        data: [],
       },
     });
 
@@ -18,7 +18,7 @@ describe('<User /> rendering', () => {
   it('should not show the spinner when creating a user', () => {
     const { component } = mountWithProviders(<User />)({
       users: {
-        list: [],
+        data: [],
       },
     });
 
@@ -28,7 +28,7 @@ describe('<User /> rendering', () => {
   it('should render the UserForm component when creating a user', () => {
     const { component } = mountWithProviders(<User />)({
       users: {
-        list: [],
+        data: [],
       },
     });
 

src/pages/User/index.jsx

@@ -16,7 +16,7 @@ const User = () => {
   const { success, userData, error } = useSelector(
     (state) => ({
       success: state.users.success,
-      userData: state.users.list.find((user) => user.id === id),
+      userData: state.users.data.find((user) => user.id === id),
       error: state.users.error,
     }),
     shallowEqual

src/pages/Users/index.jsx

@@ -14,7 +14,7 @@ import classes from './Users.module.scss';
 const Users = () => {
   const { usersList, isAdmin, error, loading, deleted } = useSelector(
     (state) => ({
-      usersList: state.users.list,
+      usersList: state.users.data,
       isAdmin: state.auth.userData.isAdmin,
       error: state.users.error,
       loading: state.users.loading,

src/state/actions/users.js

@@ -51,12 +51,12 @@ export const fetchUsers = (userId = '') => {
       }
 
       const user = { ...userData, id: userId };
-      const users = getState().users.list;
+      const users = getState().users.data;
       users.push(user);
 
       return dispatch(
         USERS_FETCH_DATA_SUCCESS({
-          list: users,
+          data: users,
         })
       );
     }
@@ -81,7 +81,7 @@ export const fetchUsers = (userId = '') => {
 
     return dispatch(
       USERS_FETCH_DATA_SUCCESS({
-        list: usersData.filter((user) => user.id !== id),
+        data: usersData.filter((user) => user.id !== id),
       })
     );
   };
@@ -100,7 +100,7 @@ export const deleteUser = (id) => {
     dispatch(USERS_DELETE_USER_INIT());
     const { locale } = getState().preferences;
     const { logoUrl } = getState()
-      .users.list.filter((user) => user.id === id)
+      .users.data.filter((user) => user.id === id)
       .pop();
 
     const deleteLogoTask = logoUrl ? deleteLogo(logoUrl) : null;
@@ -236,7 +236,7 @@ export const modifyUser = ({
     const { locale } = getState().preferences;
     const { logoUrl } = isProfile
       ? getState().auth.userData
-      : getState().users.list.find((user) => user.id === id) ||
+      : getState().users.data.find((user) => user.id === id) ||
         getState().users.user;
 
     let deleteLogoTask;

src/state/reducers/users/index.js

@@ -18,7 +18,7 @@ import {
 } from 'state/actions/users';
 
 const initialState = {
-  list: [],
+  data: [],
   loading: false,
   error: null,
   success: false,
@@ -33,7 +33,7 @@ export const usersReducer = createReducer(
     }),
     [USERS_FETCH_DATA_SUCCESS]: (state, payload) => ({
       ...state,
-      list: payload.list,
+      data: payload.data,
       loading: false,
       error: null,
     }),
@@ -48,7 +48,7 @@ export const usersReducer = createReducer(
     }),
     [USERS_DELETE_USER_SUCCESS]: (state, payload) => ({
       ...state,
-      list: state.list.filter((elem) => elem.id !== payload.id),
+      data: state.data.filter((elem) => elem.id !== payload.id),
       loading: false,
       error: null,
       deleted: true,
@@ -64,7 +64,7 @@ export const usersReducer = createReducer(
     }),
     [USERS_CREATE_USER_SUCCESS]: (state, payload) => ({
       ...state,
-      list: state.list.concat(payload.user),
+      data: state.data.concat(payload.user),
       loading: false,
       error: null,
       success: true,
@@ -80,9 +80,9 @@ export const usersReducer = createReducer(
     }),
     [USERS_MODIFY_USER_SUCCESS]: (state, payload) => ({
       ...state,
-      list: !state.list
+      data: !state.data
         ? []
-        : state.list.map((elem) => {
+        : state.data.map((elem) => {
             if (elem.id === payload.id) {
               return {
                 name: payload.user.name,

src/state/reducers/users/users.test.js

@@ -19,7 +19,7 @@ import { usersReducer } from '.';
 
 describe('Establishments reducer', () => {
   const initialState = {
-    list: [],
+    data: [],
     loading: false,
     error: null,
     success: false,
@@ -47,7 +47,7 @@ describe('Establishments reducer', () => {
     });
   });
 
-  it('should set error to null, loading to false and list with the corresponding values when USERS_FETCH_DATA_SUCCESS actions is fired', () => {
+  it('should set error to null, loading to false and data with the corresponding values when USERS_FETCH_DATA_SUCCESS actions is fired', () => {
     const userData = [
       {
         name: 'Test name',
@@ -57,26 +57,26 @@ describe('Establishments reducer', () => {
       },
     ];
 
-    reducerTest(initialState, USERS_FETCH_DATA_SUCCESS({ list: userData }), {
+    reducerTest(initialState, USERS_FETCH_DATA_SUCCESS({ data: userData }), {
       ...initialState,
-      list: userData,
+      data: userData,
       loading: false,
       error: null,
     });
   });
 
   it('should set error to null, loading to false and user with the corresponding values when USERS_FETCH_DATA_SUCCESS actions is fired', () => {
-    const list = [
+    const data = [
       {
         name: 'Test name',
         email: 'Test email',
         location: 'Test location',
         createdAt: '11/20/2020',
       },
     ];
-    reducerTest(initialState, USERS_FETCH_DATA_SUCCESS({ list }), {
+    reducerTest(initialState, USERS_FETCH_DATA_SUCCESS({ data }), {
       ...initialState,
-      list,
+      data,
       loading: false,
       error: null,
     });
@@ -93,7 +93,7 @@ describe('Establishments reducer', () => {
     const user = { id: 'exampleId' };
 
     reducerTest(
-      { ...initialState, list: [user] },
+      { ...initialState, data: [user] },
       USERS_DELETE_USER_SUCCESS({ id: 'exampleId' }),
       { ...initialState, error: null, loading: false, deleted: true }
     );
@@ -129,7 +129,7 @@ describe('Establishments reducer', () => {
 
     reducerTest(initialState, USERS_CREATE_USER_SUCCESS({ user }), {
       ...initialState,
-      list: user,
+      data: user,
       success: true,
     });
   });
@@ -170,14 +170,14 @@ describe('Establishments reducer', () => {
     };
 
     reducerTest(
-      { ...initialState, list: initialUsers },
+      { ...initialState, data: initialUsers },
       USERS_MODIFY_USER_SUCCESS({
         user: resultUser,
         id: 'test id',
       }),
       {
         ...initialState,
-        list: [resultUser],
+        data: [resultUser],
         loading: false,
         error: null,
         success: true,