Merge pull request #111 from topcoder-platform/PROD-2331_drafts-not-saving

mmattlin · web-flow · commit 89b841c88fd3 · 2022-06-30T14:14:57.000-07:00
PROD-2331 Drafts not saving -&gt; dev
diff --git a/src/IntakeForm.jsx b/src/IntakeForm.jsx
@@ -46,7 +46,7 @@ export default function IntakeForm() {
       event.preventDefault();
       event.returnValue = "";
     }
-    dispatch(triggerAutoSave(true));
+    dispatch(triggerAutoSave(true, isLoggedIn));
   };
 
   useEffect(() => {
@@ -195,7 +195,7 @@ export default function IntakeForm() {
           />
 
           <Route
-            element={<SelectWorkType />}
+            element={<SelectWorkType isLoggedIn={isLoggedIn} />}
             path="/wizard"
           />
         </Routes>
diff --git a/src/actions/autoSave.js b/src/actions/autoSave.js
@@ -8,10 +8,11 @@ export const autoSaveInitErrored = (error) => ({
   payload: error,
 });
 
-export const triggerAutoSave = (isTriggered, isForced) => ({
+export const triggerAutoSave = (isTriggered, isLoggedIn, isForced) => ({
   type: ACTIONS.AUTO_SAVE.TRIGGER_AUTO_SAVE,
   payload: {
     isTriggered,
+    isLoggedIn,
     isForced,
   },
 });
@@ -30,7 +31,7 @@ export const sendAutoSavedPatch = (dataToSave, challengeId) => (dispatch) => {
     .then((patched) => {
       dispatch(getChallenge(patched));
     })
-    .catch((e) => {});
+    .catch((e) => { });
 };
 
 export const storeAutoSavedCookie = (dataToSave) => (dispatch) => {
diff --git a/src/autoSaveBeforeLogin.js b/src/autoSaveBeforeLogin.js
@@ -17,14 +17,14 @@ let CREATION_IN_PROGRESS = false;
 
 export const saveUpdatesMiddleware = ({ dispatch, getState }) => {
   const handleAutoSave = () => {
-    const { progress, form, authUser, challenge, autoSave } = getState();
+    const { progress, form, challenge, autoSave } = getState();
     const isEmptyForm = !form?.workType?.selectedWorkType;
     if (isEmptyForm) return;
 
     let challengeId = loadChallengeId() || challenge?.id;
     const dataToSave = { progress, form };
     const currentStep = _.get(dataToSave, "progress.currentStep", 1);
-    if (authUser?.isLoggedIn && (autoSave.forced || currentStep >= 3)) {
+    if (autoSave.isLoggedIn && (autoSave.forced || currentStep >= 3)) {
       const triggerSave = () => {
         challengeId = loadChallengeId() || challenge?.id;
         if (!challengeId) {
diff --git a/src/reducers/autoSave.js b/src/reducers/autoSave.js
@@ -18,6 +18,7 @@ const autoSaveReducer = (state = initialState, action) => {
         ...state,
         triggered: action.payload.isTriggered,
         forced: action.payload.isForced,
+        isLoggedIn: action.payload.isLoggedIn,
       };
     case ACTIONS.AUTO_SAVE.COOKIE_CLEARED:
       return {
diff --git a/src/routes/BasicInfoLegacy/index.jsx b/src/routes/BasicInfoLegacy/index.jsx
@@ -46,6 +46,7 @@ const BasicInfoLegacy = ({
   savePageDetails,
   toggleSupportModal,
   saveWorkType,
+  isLoggedIn,
 }) => {
   const [formData, setFormData] = useState({
     projectTitle: { title: "Project Title", option: "", value: "" },
@@ -121,7 +122,7 @@ const BasicInfoLegacy = ({
         selectedWorkType: "Website Design",
         selectedWorkTypeDetail: "Website Design",
       });
-      dispatch(triggerAutoSave(true));
+      dispatch(triggerAutoSave(true, isLoggedIn));
     }
 
     if (basicInfo && basicInfo?.projectTitle?.value.length > 0) {
@@ -131,7 +132,7 @@ const BasicInfoLegacy = ({
     setFirstMounted(false);
 
     return () => {
-      dispatch(triggerAutoSave(true));
+      dispatch(triggerAutoSave(true, isLoggedIn));
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [basicInfo, currentStep, dispatch, setProgressItem, firstMounted]);
diff --git a/src/routes/BrandingLegacy/index.jsx b/src/routes/BrandingLegacy/index.jsx
@@ -26,7 +26,7 @@ import styles from "./styles.module.scss";
 /**
  * Branding Page
  */
-const BrandingLegacy = ({ saveBranding, setProgressItem }) => {
+const BrandingLegacy = ({ saveBranding, setProgressItem, isLoggedIn }) => {
 
   const navigate = useNavigate()
 
@@ -89,9 +89,9 @@ const BrandingLegacy = ({ saveBranding, setProgressItem }) => {
     setFirstMounted(false);
 
     return () => {
-      dispatch(triggerAutoSave(true));
+      dispatch(triggerAutoSave(true, isLoggedIn));
     };
-  }, [currentStep, branding, dispatch, setProgressItem, firstMounted, navigate]);
+  }, [currentStep, branding, dispatch, setProgressItem, firstMounted, navigate, isLoggedIn]);
 
   const isFormValid =
     formData?.theme?.value &&
diff --git a/src/routes/PageDetailsLegacy/index.jsx b/src/routes/PageDetailsLegacy/index.jsx
@@ -27,7 +27,7 @@ import styles from "./styles.module.scss";
 /**
  * Page Details Page
  */
-const PageDetailsLegacy = ({ savePageDetails, setProgressItem }) => {
+const PageDetailsLegacy = ({ savePageDetails, setProgressItem, isLoggedIn }) => {
 
   const navigate = useNavigate()
   const [isLoading] = useState(false);
@@ -69,9 +69,9 @@ const PageDetailsLegacy = ({ savePageDetails, setProgressItem }) => {
     setFirstMounted(false);
 
     return () => {
-      dispatch(triggerAutoSave(true));
+      dispatch(triggerAutoSave(true, isLoggedIn));
     };
-  }, [currentStep, pageDetails, dispatch, setProgressItem, firstMounted, navigate]);
+  }, [currentStep, pageDetails, dispatch, setProgressItem, firstMounted, navigate, isLoggedIn]);
 
   const onNext = () => {
     navigate("/self-service/work/new/website-design/login-prompt");
diff --git a/src/routes/Products/DataAdvisory/index.jsx b/src/routes/Products/DataAdvisory/index.jsx
@@ -66,6 +66,7 @@ export default function DataAdvisory({ isLoggedIn }) {
           showIcon
           workItemConfig={dataAdvisory}
           breadcrumb={dataAdvisory.breadcrumbs.review}
+          isLoggedIn={isLoggedIn}
         />}
         path="/review"
       />
diff --git a/src/routes/Products/DataExploration/index.jsx b/src/routes/Products/DataExploration/index.jsx
@@ -66,6 +66,7 @@ export default function DataExploration({ isLoggedIn }) {
           showIcon
           workItemConfig={dataExploration}
           breadcrumb={dataExploration.breadcrumbs.review}
+          isLoggedIn={isLoggedIn}
         />}
         path="/review"
       />
diff --git a/src/routes/Products/FindMeData/index.jsx b/src/routes/Products/FindMeData/index.jsx
@@ -66,6 +66,7 @@ export default function FindMeData({ isLoggedIn }) {
           showIcon
           workItemConfig={findMeData}
           breadcrumb={findMeData.breadcrumbs.review}
+          isLoggedIn={isLoggedIn}
         />}
         path="/review"
       />
diff --git a/src/routes/Products/WebsiteDesign/index.jsx b/src/routes/Products/WebsiteDesign/index.jsx
@@ -66,6 +66,7 @@ export default function WebsiteDesign({ isLoggedIn }) {
           showIcon
           workItemConfig={websiteDesign}
           breadcrumb={websiteDesign.breadcrumbs.review}
+          isLoggedIn={isLoggedIn}
         />}
         path="/review"
       />
diff --git a/src/routes/Products/WebsiteDesignLegacy/index.jsx b/src/routes/Products/WebsiteDesignLegacy/index.jsx
@@ -14,17 +14,17 @@ export default function WebsiteDesignLegacy({ isLoggedIn }) {
     <Routes>
 
       <Route
-        element={<BasicInfoLegacy />}
+        element={<BasicInfoLegacy isLoggedIn={isLoggedIn} />}
         path="/basic-info"
       />
 
       <Route
-        element={<WebsitePurposeLegacy />}
+        element={<WebsitePurposeLegacy isLoggedIn={isLoggedIn} />}
         path="/website-purpose"
       />
 
       <Route
-        element={<PageDetailsLegacy />}
+        element={<PageDetailsLegacy isLoggedIn={isLoggedIn} />}
         path="/page-details"
       />
 
@@ -37,7 +37,7 @@ export default function WebsiteDesignLegacy({ isLoggedIn }) {
       />
 
       <Route
-        element={<BrandingLegacy />}
+        element={<BrandingLegacy isLoggedIn={isLoggedIn} />}
         path="/branding"
       />
 
@@ -48,6 +48,7 @@ export default function WebsiteDesignLegacy({ isLoggedIn }) {
             introText="Your Website Design project includes up to 5 unique Visual Design solutions. Each solution will match your specified scope and device types. You will receive industry-standard source files to take take forward to further design and/or development. Design deliverables will NOT include functional code."
             banner={<WebsiteDesignBannerLegacy />}
             showProgress
+            isLoggedIn={isLoggedIn}
           />
         }
         path="/review"
diff --git a/src/routes/Products/components/BasicInfo/index.jsx b/src/routes/Products/components/BasicInfo/index.jsx
@@ -155,7 +155,7 @@ const BasicInfo = ({
   const onNext = () => {
     setProgressItem(isLoggedIn ? 7 : 5);
     saveBasicInfo(formData);
-    dispatch(triggerAutoSave(true, true));
+    dispatch(triggerAutoSave(true, isLoggedIn, true));
     navigate(isLoggedIn ? `${baseUrl}/review` : `${baseUrl}/login-prompt`);
   };
 
@@ -173,7 +173,7 @@ const BasicInfo = ({
         selectedWorkType: workItemConfig.type,
         selectedWorkTypeDetail: workItemConfig.title,
       });
-      dispatch(triggerAutoSave(true));
+      dispatch(triggerAutoSave(true, isLoggedIn));
     }
 
     if (!!basicInfo?.projectTitle?.value?.length) {
@@ -183,7 +183,7 @@ const BasicInfo = ({
     setFirstMounted(false);
 
     return () => {
-      dispatch(triggerAutoSave(true, false));
+      dispatch(triggerAutoSave(true, isLoggedIn, false));
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [basicInfo, currentStep, dispatch, setProgressItem, firstMounted]);
@@ -217,7 +217,7 @@ const BasicInfo = ({
 
   const saveForm = (autoSave) => {
     saveBasicInfo(formData);
-    dispatch(triggerAutoSave(autoSave, true));
+    dispatch(triggerAutoSave(autoSave, isLoggedIn, true));
     if (autoSave) navigate("/self-service");
   };
 
diff --git a/src/routes/Review/index.jsx b/src/routes/Review/index.jsx
@@ -58,6 +58,7 @@ const Review = ({
   secondaryBanner,
   workItemConfig,
   breadcrumb,
+  isLoggedIn
 }) => {
   const dispatch = useDispatch();
   const [paymentFailed, setPaymentFailed] = useState(false);
@@ -116,9 +117,9 @@ const Review = ({
     setFirstMounted(false);
 
     return () => {
-      dispatch(triggerAutoSave(true));
+      dispatch(triggerAutoSave(true, isLoggedIn));
     };
-  }, [currentStep, formData, dispatch, setProgressItem, firstMounted, navigate]);
+  }, [currentStep, formData, dispatch, setProgressItem, firstMounted, navigate, isLoggedIn]);
 
   const [anotherFirstMounted, setAnotherFirstMounted] = useState(true);
   useEffect(() => {
diff --git a/src/routes/ReviewLegacy/index.jsx b/src/routes/ReviewLegacy/index.jsx
@@ -59,6 +59,7 @@ const ReviewLegacy = ({
   showIcon,
   enableEdit = true,
   secondaryBanner,
+  isLoggedIn,
 }) => {
 
   const dispatch = useDispatch();
@@ -101,9 +102,9 @@ const ReviewLegacy = ({
     setFirstMounted(false);
 
     return () => {
-      dispatch(triggerAutoSave(true));
+      dispatch(triggerAutoSave(true, isLoggedIn));
     };
-  }, [currentStep, formData, dispatch, setProgressItem, firstMounted, navigate]);
+  }, [currentStep, formData, dispatch, setProgressItem, firstMounted, navigate, isLoggedIn]);
 
   const [anotherFirstMounted, setAnotherFirstMounted] = useState(true);
   useEffect(() => {
diff --git a/src/routes/SelectWorkType/index.jsx b/src/routes/SelectWorkType/index.jsx
@@ -118,6 +118,7 @@ const SelectWorkType = ({
   saveWorkType,
   setProgressItem,
   toggleSupportModal,
+  isLoggedIn,
 }) => {
 
   const dispatch = useDispatch();
@@ -131,7 +132,7 @@ const SelectWorkType = ({
 
   useEffect(() => {
     return () => {
-      dispatch(triggerAutoSave(true));
+      dispatch(triggerAutoSave(true, isLoggedIn));
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
@@ -143,7 +144,7 @@ const SelectWorkType = ({
     });
     setProgressItem(2);
     navigate(selectedItem.startRoute);
-    dispatch(triggerAutoSave(true));
+    dispatch(triggerAutoSave(true, isLoggedIn));
   };
 
   const onShowSupportModal = () => {
diff --git a/src/routes/WebsitePurposeLegacy/index.jsx b/src/routes/WebsitePurposeLegacy/index.jsx
@@ -26,7 +26,7 @@ import { Breadcrumb } from "../../../src-ts";
 /**
  * Website Purpose Page
  */
-const WebsitePurposeLegacy = ({ saveWebsitePurpose, setProgressItem }) => {
+const WebsitePurposeLegacy = ({ saveWebsitePurpose, setProgressItem, isLoggedIn }) => {
 
   const navigate = useNavigate()
 
@@ -82,9 +82,9 @@ const WebsitePurposeLegacy = ({ saveWebsitePurpose, setProgressItem }) => {
     setFirstMounted(false);
 
     return () => {
-      dispatch(triggerAutoSave(true));
+      dispatch(triggerAutoSave(true, isLoggedIn));
     };
-  }, [currentStep, websitePurpose, dispatch, setProgressItem, firstMounted, navigate]);
+  }, [currentStep, websitePurpose, dispatch, setProgressItem, firstMounted, navigate, isLoggedIn]);
 
   const breadcrumbs = [
     { url: ROUTES.DASHBOARD_PAGE, name: "My work" },
