PROD-4239, PROD-4240 - fix spinning overlay, merge solution for blank page

Author: vas3a

.environments/.env.dev

@@ -17,7 +17,7 @@ REACT_APP_DATADOG_PUBLIC_TOKEN=puba0825671e469d16f940c5a30dc738f11
 
 REACT_APP_MEMBER_VERIFY_LOOKER=3322
 
-REACT_APP_SPRIG_ENV_ID=dev
+REACT_APP_SPRIG_ENV_ID=bUcousVQ0-yF
 
 # Filestack configuration for uploading Submissions
 REACT_APP_FILESTACK_API_KEY='AzFINuQoqTmqw0QEoaw9az'

src/apps/self-service/src/containers/legacy/BasicInfoLegacy/index.jsx

@@ -160,7 +160,7 @@ const BasicInfoLegacy = ({
 
   return (
     <>
-      <LoadingSpinner hide={!isLoading} />
+      <LoadingSpinner hide={!isLoading} overlay />
       <ContactSupportModal
         workId={challenge?.id}
         isOpen={showSupportModal}

src/apps/self-service/src/containers/legacy/BrandingLegacy/index.jsx

@@ -123,7 +123,7 @@ const BrandingLegacy = ({ saveBranding, setProgressItem, isLoggedIn }) => {
 
   return (
     <>
-      <LoadingSpinner hide={initialized} />
+      <LoadingSpinner hide={initialized} overlay />
       <Breadcrumb items={breadcrumbs} />
       <WebsiteDesignBannerLegacy />
       <PageContent>

src/apps/self-service/src/containers/legacy/PageDetailsLegacy/index.jsx

@@ -96,7 +96,7 @@ const PageDetailsLegacy = ({ savePageDetails, setProgressItem, isLoggedIn }) =>
 
   return (
     <>
-      <LoadingSpinner hide={!isLoading} />
+      <LoadingSpinner hide={!isLoading} overlay />
       <Breadcrumb items={breadcrumbs} />
       <WebsiteDesignBannerLegacy />
       <PageContent>

src/apps/self-service/src/containers/legacy/ReviewLegacy/index.jsx

@@ -197,7 +197,7 @@ const ReviewLegacy = ({
         isOpen={isOrderContractModalOpen}
         onClose={() => setIsOrderContractModalOpen(false)}
       />
-      <LoadingSpinner hide={!isLoading} />
+      <LoadingSpinner hide={!isLoading} overlay />
       <Breadcrumb items={breadcrumbs} />
       {banner}
       <PageContent styleName={"container"}>

src/apps/self-service/src/containers/legacy/WebsitePurposeLegacy/index.jsx

@@ -94,7 +94,7 @@ const WebsitePurposeLegacy = ({ saveWebsitePurpose, setProgressItem, isLoggedIn
 
   return (
     <>
-      <LoadingSpinner hide={!isLoading} />
+      <LoadingSpinner hide={!isLoading} overlay />
       <Breadcrumb items={breadcrumbs} />
       <WebsiteDesignBannerLegacy />
       <PageContent>

src/apps/self-service/src/containers/products/basic-info/BasicInfo.jsx

@@ -226,7 +226,7 @@ const BasicInfo = ({
 
   return (
     <>
-      <LoadingSpinner hide={!isLoading} />
+      <LoadingSpinner hide={!isLoading} overlay />
       <ContactSupportModal
         challengeId={challenge?.id}
         isOpen={showSupportModal}

src/apps/self-service/src/containers/products/review/Review.jsx

@@ -203,7 +203,7 @@ const Review = ({
         isOpen={isOrderContractModalOpen}
         onClose={() => setIsOrderContractModalOpen(false)}
       />
-      <LoadingSpinner hide={!isLoading} />
+      <LoadingSpinner hide={!isLoading} overlay />
       <Breadcrumb
         items={breadcrumb.map((item) => ({
           ...item,

src/apps/self-service/src/containers/select-work-type/SelectWorkType.jsx

@@ -157,7 +157,7 @@ const SelectWorkType = ({
 
   return (
     <>
-      <LoadingSpinner hide={!isLoading} />
+      <LoadingSpinner hide={!isLoading} overlay />
       <ContactSupportModal
         workId={challenge?.id}
         isOpen={showSupportModal}

src/apps/self-service/src/lib/work-provider/work-functions/work-factory/work.factory.ts

@@ -715,7 +715,13 @@ function getType(challenge: Challenge): WorkType {
     }
 
     // parse the form
-    const form: { form: IntakeForm } = JSON.parse(intakeForm.value)
+    const form: { form: IntakeForm } = (() => {
+        try {
+            return JSON.parse(intakeForm.value)
+        } catch {
+            return {form: undefined}
+        }
+    })()
     const workTypeKey: (keyof typeof WorkType) | undefined = Object.entries(WorkType)
         .find(([, value]) => value === form.form?.workType?.selectedWorkType)
         ?.[0] as keyof typeof WorkType