Merge pull request #479 from topcoder-platform/PROD-1999_make-it-async

PROD-1999 made the redirect async -> Dev

Author: hentrymartin

src/actions/autoSave.js

@@ -8,30 +8,25 @@ export const autoSaveInitErrored = (error) => ({
   payload: error,
 });
 
-export const triggerAutoSave = (isTriggered, isSaveLater) => ({
+export const triggerAutoSave = (isTriggered, isForced) => ({
   type: ACTIONS.AUTO_SAVE.TRIGGER_AUTO_SAVE,
   payload: {
     isTriggered,
-    isSaveLater,
+    isForced,
   },
 });
 
 export const triggerCookieClear = () => ({
   type: ACTIONS.AUTO_SAVE.TRIGGER_COOKIE_CLEARED,
 });
 
-export const resetSaveLater = () => ({
-  type: ACTIONS.AUTO_SAVE.RESET_IS_SAVE_LATER,
-  payload: false,
-});
-
 export const autoSaveCookieCleared = (isCookieCleared) => ({
   type: ACTIONS.AUTO_SAVE.COOKIE_CLEARED,
   payload: isCookieCleared,
 });
 
 export const sendAutoSavedPatch = (dataToSave, challengeId) => (dispatch) => {
-  return patchChallenge(dataToSave, challengeId)
+  patchChallenge(dataToSave, challengeId)
     .then((patched) => {
       dispatch(getChallenge(patched));
     })

src/autoSaveBeforeLogin.js

@@ -3,7 +3,6 @@ import CryptoJS from "crypto-js";
 import _ from "lodash";
 import moment from "moment";
 import "moment-timezone";
-import { navigate } from "@reach/router";
 import config from "../config";
 import {
   autoSaveCookieCleared,
@@ -23,7 +22,7 @@ export const saveUpdatesMiddleware = ({ dispatch, getState }) => {
     let challengeId = loadChallengeId() || challenge?.id;
     const dataToSave = { progress, form };
     const currentStep = _.get(dataToSave, "progress.currentStep", 1);
-    if (authUser?.isLoggedIn && (autoSave?.isSaveLater || currentStep >= 3)) {
+    if (authUser?.isLoggedIn && (autoSave.forced || currentStep >= 3)) {
       const triggerSave = () => {
         challengeId = loadChallengeId() || challenge?.id;
         if (!challengeId) {
@@ -67,21 +66,17 @@ export const saveUpdatesMiddleware = ({ dispatch, getState }) => {
       : undefined;
     const formString = JSON.stringify(dataToSave);
     if (metaData?.value !== formString) {
-      const promise = dispatch(sendAutoSavedPatch(formString, challengeId));
-      promise.then(() => {
-        if (autoSave.isSaveLater) navigate("/self-service");
-      });
+      dispatch(sendAutoSavedPatch(formString, challengeId));
     }
   };
 
   return (next) => (action) => {
     const result = next(action);
-    if ([ACTIONS.AUTO_SAVE.TRIGGER_AUTO_SAVE].includes(result.type)) {
-      handleAutoSave();
-    }
 
     if ([ACTIONS.AUTO_SAVE.TRIGGER_COOKIE_CLEARED].includes(result.type)) {
       clearCache();
+    } else if ([ACTIONS.AUTO_SAVE.TRIGGER_AUTO_SAVE].includes(result.type)) {
+      handleAutoSave();
     }
     return result;
   };

src/constants/index.js

@@ -594,7 +594,6 @@ export const ACTIONS = {
     COOKIE_CLEARED: "COOKIE_CLEARED",
     TRIGGER_AUTO_SAVE: "TRIGGER_AUTO_SAVE",
     INIT_ERRORED: "INIT_ERRORED",
-    RESET_IS_SAVE_LATER: "RESET_IS_SAVE_LATER",
     TRIGGER_COOKIE_CLEARED: "TRIGGER_COOKIE_CLEARED",
   },
   CHALLENGE: {

src/reducers/autoSave.js

@@ -8,7 +8,7 @@ const initialState = {
   triggered: false,
   cookieCleared: false,
   initErrored: null,
-  isSaveLater: false,
+  forced: false,
 };
 
 const autoSaveReducer = (state = initialState, action) => {
@@ -17,12 +17,7 @@ const autoSaveReducer = (state = initialState, action) => {
       return {
         ...state,
         triggered: action.payload.isTriggered,
-        isSaveLater: action.payload.isSaveLater,
-      };
-    case ACTIONS.AUTO_SAVE.RESET_IS_SAVE_LATER:
-      return {
-        ...state,
-        isSaveLater: action.payload,
+        forced: action.payload.isForced,
       };
     case ACTIONS.AUTO_SAVE.COOKIE_CLEARED:
       return {

src/routes/Products/components/BasicInfo/index.jsx

@@ -20,11 +20,7 @@ import {
   savePageDetails,
   saveWorkType,
 } from "../../../../actions/form";
-import {
-  triggerAutoSave,
-  resetSaveLater,
-  triggerCookieClear,
-} from "../../../../actions/autoSave";
+import { triggerAutoSave, triggerCookieClear } from "../../../../actions/autoSave";
 import { setProgressItem } from "../../../../actions/progress";
 import BackIcon from "../../../../assets/images/icon-back-arrow.svg";
 import SaveForLaterIcon from "../../../../assets/images/save-for-later-icon.svg";
@@ -58,6 +54,7 @@ const BasicInfo = ({
   toggleSupportModal,
   workItemConfig,
   isLoggedIn,
+  triggerCookieClear,
   breadcrumb = [],
 }) => {
   const defaultFormData = {
@@ -153,7 +150,7 @@ const BasicInfo = ({
   const onNext = () => {
     setProgressItem(isLoggedIn ? 7 : 5);
     saveBasicInfo(formData);
-    dispatch(triggerAutoSave(true));
+    dispatch(triggerAutoSave(true, true));
     navigate(isLoggedIn ? `${baseUrl}/review` : `${baseUrl}/login-prompt`);
   };
 
@@ -181,7 +178,7 @@ const BasicInfo = ({
     setFirstMounted(false);
 
     return () => {
-      dispatch(triggerAutoSave(true));
+      dispatch(triggerAutoSave(true, false));
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [basicInfo, currentStep, dispatch, setProgressItem, firstMounted]);
@@ -217,12 +214,10 @@ const BasicInfo = ({
     dispatch(getUserProfile());
   }, [dispatch]);
 
-  const saveForm = (autoSave, saveLater) => {
+  const saveForm = (autoSave) => {
     saveBasicInfo(formData);
-    dispatch(triggerAutoSave(autoSave, saveLater));
-    setTimeout(() => {
-      dispatch(resetSaveLater());
-    }, 100);
+    dispatch(triggerAutoSave(autoSave, true));
+    if (autoSave) navigate("/self-service");
   };
 
   return (
@@ -283,7 +278,7 @@ const BasicInfo = ({
                     disabled={!isFormValid}
                     size={BUTTON_SIZE.MEDIUM}
                     type={BUTTON_TYPE.SECONDARY}
-                    onClick={() => saveForm(true, true)}
+                    onClick={() => saveForm(true)}
                   >
                     <SaveForLaterIcon />
                     <span>SAVE FOR LATER</span>
@@ -316,6 +311,7 @@ const mapDispatchToProps = {
   savePageDetails,
   toggleSupportModal,
   saveWorkType,
+  triggerCookieClear,
 };
 
 export default connect(mapStateToProps, mapDispatchToProps)(BasicInfo);

src/routes/Products/components/BasicInfoForm/index.jsx

@@ -205,7 +205,7 @@ const BasicInfoForm = ({
               onChange={(e) =>
                 handleInputChange(e.target.name, e.target.value, e.target.value)
               }
-              onBlur={() => saveForm(false, false)}
+              onBlur={() => saveForm(false)}
             />
           </FormField>
         </div>