Refactor errors => system messages

AuxStudio · Apr 30, 2018 · 369db9f · 369db9f
1 parent 42f4565
commit 369db9f
Show file tree

Hide file tree

Showing 34 changed files with 135 additions and 95 deletions.
diff --git a/SETUP_GUIDE.md b/SETUP_GUIDE.md
@@ -622,10 +622,14 @@ sudo rm ./App.js && sudo rm ./src/.gitignore && sudo rm ./src/package-lock.json
 
 ## 9. Setup ESLint and Prettier
 
+1.  Install dependencies:
+
 ```
 yarn add --dev eslint babel-eslint eslint-config-airbnb eslint-plugin-import eslint-plugin-jsx-a11y eslint-plugin-react eslint-plugin-react-native
 ```
 
+2.  Move config files:
+
 ```
 sudo mv ./src/.eslintrc.json ./.eslintrc.json && sudo mv ./src/.prettierrc ./prettierrc
 ```

diff --git a/reducers/appData/index.js b/reducers/appData/index.js
@@ -7,9 +7,9 @@ export default function appDataReducer(state = initialState, action = {}) {
   switch (action.type) {
     case 'SET_DATA':
       newState = utils.cloneObject(state);
-      newState.appData[action.payload.node] = action.payload.data;
-      newState.appState.loading = false;
-      newState.appState.refreshing = false;
+      newState[action.payload.node] = action.payload.data;
+      newState.loading = false;
+      newState.refreshing = false;
       return newState;
 
     default:

diff --git a/reducers/appState/index.js b/reducers/appState/index.js
@@ -7,52 +7,44 @@ export default function appStateReducer(state = initialState, action = {}) {
   switch (action.type) {
     case 'SET_APP_START':
       newState = utils.cloneObject(state);
-      newState.appState.appStart = !newState.appState.appStart;
+      newState.appStart = !newState.appStart;
       return newState;
 
     case 'TOGGLE_LOADING':
       newState = utils.cloneObject(state);
-      newState.appState.loading = !newState.appState.loading;
+      newState.loading = !newState.loading;
       return newState;
 
     case 'SET_DEVICE_LOCATION':
       newState = utils.cloneObject(state);
-      newState.appState.deviceLocation = action.payload;
+      newState.deviceLocation = action.payload;
       return newState;
 
     case 'SET_TEMPORARY_IMAGE':
       newState = utils.cloneObject(state);
-      newState.appState.temporaryImage = action.payload;
+      newState.temporaryImage = action.payload;
       return newState;
 
     case 'CLEAR_TEMPORARY_IMAGE':
       newState = utils.cloneObject(state);
-      newState.appState.temporaryImage = null;
-      return newState;
-
-    case 'SET_USER_PHOTO':
-      newState = utils.cloneObject(state);
-      newState.userData.profile.userPhotoURL = action.payload;
+      newState.temporaryImage = null;
       return newState;
 
     case 'TOGGLE_FEEDBACK_POSTED':
       newState = utils.cloneObject(state);
-      newState.appState.feedbackPosted = !newState.appState.feedbackPosted;
-      newState.appState.loading = false;
+      newState.feedbackPosted = !newState.feedbackPosted;
+      newState.loading = false;
       return newState;
 
-    // TODO: Refactor
-    case 'SET_MESSAGE':
+    case 'SET_SYSTEM_MESSAGE':
       newState = utils.cloneObject(state);
-      newState.appState.error = {
-        ...action.payload,
-      };
+      newState.systemMessage.message = action.payload.message; // instanceof Error
+      newState.systemMessage.error = action.error;
       return newState;
 
-    // TODO: Refactor
-    case 'RESET_MESSAGE':
+    case 'RESET_SYSTEM_MESSAGE':
       newState = utils.cloneObject(state);
-      newState.appState.error = initialState.appState.error;
+      newState.systemMessage = initialState.message;
       return newState;
 
     default:

diff --git a/reducers/appState/initialState.js b/reducers/appState/initialState.js
@@ -1,18 +1,9 @@
 const initialState = {
   appStart: false,
   loading: true,
-  // TODO: refactor this error object
-  error: {
-    errorType: null,
+  systemMessage: {
     message: null,
-    iconName: null,
-    success: null,
-    autoHide: null,
-    action: {
-      type: null,
-      text: null,
-      data: null,
-    },
+    error: null,
   },
   deviceLocation: null,
   temporaryImage: null,

diff --git a/reducers/user/index.js b/reducers/user/index.js
@@ -7,25 +7,30 @@ export default function userReducer(state = initialState, action = {}) {
   switch (action.type) {
     case 'UPDATE_USER_EMAIL':
       newState = utils.cloneObject(state);
-      newState.user.userEmail = action.payload;
+      newState.userEmail = action.payload;
       return newState;
 
     case 'UPDATE_USER_PASSWORD':
       newState = utils.cloneObject(state);
-      newState.user.userPassword = action.payload;
+      newState.userPassword = action.payload;
       return newState;
 
     case 'SIGN_IN_USER':
       newState = utils.cloneObject(state);
-      newState.user = {
+      newState = {
         ...action.payload,
       };
-      newState.user.authenticated = true;
+      newState.authenticated = true;
       return newState;
 
     case 'SIGN_OUT_USER':
       newState = utils.cloneObject(state);
-      newState.user = initialState.user;
+      newState = initialState;
+      return newState;
+
+    case 'SET_USER_PHOTO':
+      newState = utils.cloneObject(state);
+      newState.userPhotoURL = action.payload;
       return newState;
 
     default:

diff --git a/sagas/analytics/logEvent.js b/sagas/analytics/logEvent.js
@@ -16,9 +16,11 @@ export default function* logEvent(action) {
       });
     }
   } catch (error) {
+    const payload = error instanceof Error ? error : new Error(error);
+
     yield put({
-      type: 'SET_MESSAGE',
-      payload: new Error(error),
+      type: 'SET_SYSTEM_MESSAGE',
+      payload,
       error: true,
     });
   }

diff --git a/sagas/auth/getUserAuth.js b/sagas/auth/getUserAuth.js
@@ -22,9 +22,11 @@ export default function* getUserAuth(action) {
       });
     }
   } catch (error) {
+    const payload = error instanceof Error ? error : new Error(error);
+
     yield put({
-      type: 'SET_MESSAGE',
-      payload: new Error(error),
+      type: 'SET_SYSTEM_MESSAGE',
+      payload,
       error: true,
     });
   }

diff --git a/sagas/auth/getUserCredentialFromEmail.js b/sagas/auth/getUserCredentialFromEmail.js
@@ -17,7 +17,7 @@ export default function* getUserCredentialFromEmail(action) {
     }
   } catch (error) {
     yield put({
-      type: 'SET_MESSAGE',
+      type: 'SET_SYSTEM_MESSAGE',
       payload: new Error(error),
       error: true,
     });

diff --git a/sagas/auth/getUserCredentialFromFacebook.js b/sagas/auth/getUserCredentialFromFacebook.js
@@ -16,9 +16,11 @@ export default function* getUserCredentialFromFacebook(action) {
       });
     }
   } catch (error) {
+    const payload = error instanceof Error ? error : new Error(error);
+
     yield put({
-      type: 'SET_MESSAGE',
-      payload: new Error(error),
+      type: 'SET_SYSTEM_MESSAGE',
+      payload,
       error: true,
     });
   }

diff --git a/sagas/auth/getUserCredentialFromGoogle.js b/sagas/auth/getUserCredentialFromGoogle.js
@@ -16,9 +16,11 @@ export default function* getUserCredentialFromGoogle(action) {
       });
     }
   } catch (error) {
+    const payload = error instanceof Error ? error : new Error(error);
+
     yield put({
-      type: 'SET_MESSAGE',
-      payload: new Error(error),
+      type: 'SET_SYSTEM_MESSAGE',
+      payload,
       error: true,
     });
   }

diff --git a/sagas/auth/linkUserWithCredential.js b/sagas/auth/linkUserWithCredential.js
@@ -27,9 +27,11 @@ export default function* linkUserWithCredential(action) {
           payload: response,
         });
       } catch (error) {
+        const payload = error instanceof Error ? error : new Error(error);
+
         yield put({
-          type: 'SET_MESSAGE',
-          payload: new Error(error),
+          type: 'SET_SYSTEM_MESSAGE',
+          payload,
           error: true,
         });
       }
@@ -45,9 +47,11 @@ export default function* linkUserWithCredential(action) {
         payload: action.payload.credential,
       });
     } else {
+      const payload = error instanceof Error ? error : new Error(error);
+
       yield put({
-        type: 'SET_MESSAGE',
-        payload: new Error(error),
+        type: 'SET_SYSTEM_MESSAGE',
+        payload,
         error: true,
       });
     }

diff --git a/sagas/auth/sendPasswordResetEmail.js b/sagas/auth/sendPasswordResetEmail.js
@@ -14,9 +14,11 @@ export default function* sendPasswordResetEmail(action) {
       }
     }
   } catch (error) {
+    const payload = error instanceof Error ? error : new Error(error);
+
     yield put({
-      type: 'SET_MESSAGE',
-      payload: new Error(error),
+      type: 'SET_SYSTEM_MESSAGE',
+      payload,
       error: true,
     });
   }

diff --git a/sagas/auth/signInUserAnonymously.js b/sagas/auth/signInUserAnonymously.js
@@ -16,9 +16,11 @@ export default function* signInUserAnonymously(action) {
       });
     }
   } catch (error) {
+    const payload = error instanceof Error ? error : new Error(error);
+
     yield put({
-      type: 'SET_MESSAGE',
-      payload: new Error(error),
+      type: 'SET_SYSTEM_MESSAGE',
+      payload,
       error: true,
     });
   }

diff --git a/sagas/auth/signInUserWithCredential.js b/sagas/auth/signInUserWithCredential.js
@@ -18,16 +18,18 @@ export default function* signInUserWithCredential(action) {
   } catch (error) {
     if (error.message.code === 'auth/account-exists-with-different-credential') {
       yield put({
-        type: 'SET_MESSAGE',
+        type: 'SET_SYSTEM_MESSAGE',
         payload: new Error(
           "Hello! You've already signed in with someone else. Please try another option.",
         ),
         error: true,
       });
     } else {
+      const payload = error instanceof Error ? error : new Error(error);
+
       yield put({
-        type: 'SET_MESSAGE',
-        payload: new Error(error),
+        type: 'SET_SYSTEM_MESSAGE',
+        payload,
         error: true,
       });
     }

diff --git a/sagas/auth/signOutUser.js b/sagas/auth/signOutUser.js
@@ -16,9 +16,11 @@ export default function* signOutUser(action) {
       });
     }
   } catch (error) {
+    const payload = error instanceof Error ? error : new Error(error);
+
     yield put({
-      type: 'SET_MESSAGE',
-      payload: new Error(error),
+      type: 'SET_SYSTEM_MESSAGE',
+      payload,
       error: true,
     });
   }

diff --git a/sagas/database/getData.js b/sagas/database/getData.js
@@ -16,9 +16,11 @@ export default function* getData(action) {
       });
     }
   } catch (error) {
+    const payload = error instanceof Error ? error : new Error(error);
+
     yield put({
-      type: 'SET_MESSAGE',
-      payload: new Error(error),
+      type: 'SET_SYSTEM_MESSAGE',
+      payload,
       error: true,
     });
   }

diff --git a/sagas/database/pushData.js b/sagas/database/pushData.js
@@ -16,9 +16,11 @@ export default function* pushData(action) {
       });
     }
   } catch (error) {
+    const payload = error instanceof Error ? error : new Error(error);
+
     yield put({
-      type: 'SET_MESSAGE',
-      payload: new Error(error),
+      type: 'SET_SYSTEM_MESSAGE',
+      payload,
       error: true,
     });
   }

diff --git a/sagas/database/setData.js b/sagas/database/setData.js
@@ -16,9 +16,11 @@ export default function* setData(action) {
       });
     }
   } catch (error) {
+    const payload = error instanceof Error ? error : new Error(error);
+
     yield put({
-      type: 'SET_MESSAGE',
-      payload: new Error(error),
+      type: 'SET_SYSTEM_MESSAGE',
+      payload,
       error: true,
     });
   }

diff --git a/sagas/database/updateData.js b/sagas/database/updateData.js
@@ -16,9 +16,11 @@ export default function* updateData(action) {
       });
     }
   } catch (error) {
+    const payload = error instanceof Error ? error : new Error(error);
+
     yield put({
-      type: 'SET_MESSAGE',
-      payload: new Error(error),
+      type: 'SET_SYSTEM_MESSAGE',
+      payload,
       error: true,
     });
   }

diff --git a/sagas/http/get.js b/sagas/http/get.js
@@ -16,9 +16,11 @@ export default function* get(action) {
       });
     }
   } catch (error) {
+    const payload = error instanceof Error ? error : new Error(error);
+
     yield put({
-      type: 'SET_MESSAGE',
-      payload: new Error(error),
+      type: 'SET_SYSTEM_MESSAGE',
+      payload,
       error: true,
     });
   }

diff --git a/sagas/http/post.js b/sagas/http/post.js
@@ -16,9 +16,11 @@ export default function* get(action) {
       });
     }
   } catch (error) {
+    const payload = error instanceof Error ? error : new Error(error);
+
     yield put({
-      type: 'SET_MESSAGE',
-      payload: new Error(error),
+      type: 'SET_SYSTEM_MESSAGE',
+      payload,
       error: true,
     });
   }