Refactor ExportPipeline ContactInformation to use the new implementation

uktrade · Feb 9, 2024 · 94fd358 · 94fd358
1 parent 0a4b6e0
commit 94fd358
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 45 deletions.
diff --git a/src/client/modules/ExportPipeline/ExportForm/ExportFormFields.jsx b/src/client/modules/ExportPipeline/ExportForm/ExportFormFields.jsx
@@ -29,8 +29,7 @@ import {
 import ResourceOptionsField from '../../../components/Form/elements/ResourceOptionsField'
 import Task from '../../../components/Task'
 
-import { TASK_REDIRECT_TO_CONTACT_FORM } from '../../../components/ContactForm/state'
-import { TASK_SAVE_EXPORT, ID as STATE_ID } from './state'
+import { TASK_SAVE_EXPORT } from './state'
 
 import { transformArrayIdNameToValueLabel } from '../../../transformers'
 import { validateTeamMembers } from './validation'
@@ -177,29 +176,10 @@ const ExportFormFields = ({
                   }
                   autoScroll={values.scrollToContact}
                 />
-                <Task>
-                  {(getTask) => {
-                    const openContactFormTask = getTask(
-                      TASK_REDIRECT_TO_CONTACT_FORM,
-                      STATE_ID
-                    )
-                    return (
-                      <ContactInformation
-                        companyId={exportItem.company.id}
-                        onOpenContactForm={({ redirectUrl }) => {
-                          openContactFormTask.start({
-                            payload: {
-                              values,
-                              url: redirectUrl,
-                              storeId: STATE_ID,
-                            },
-                          })
-                        }}
-                      />
-                    )
-                  }}
-                </Task>
-
+                <ContactInformation
+                  companyId={exportItem.company.id}
+                  redirectMode="soft"
+                />
                 <ResourceOptionsField
                   resource={ExportExperienceResource}
                   field={FieldRadios}

diff --git a/src/client/modules/ExportPipeline/ExportForm/state.js b/src/client/modules/ExportPipeline/ExportForm/state.js
@@ -5,31 +5,24 @@ import { transformAPIValuesForForm } from '../transformers'
 export const ID = 'exportForm'
 export const TASK_SAVE_EXPORT = 'TASK_SAVE_EXPORT'
 
-export const overwriteObjectWithSessionStorageValues = (
-  exportItem,
-  searchParams
-) => {
-  const valuesFromStorage = JSON.parse(window.sessionStorage.getItem(ID))
+export const addContactToItem = (item, searchParams) => {
   const contactLabel = searchParams.get('new-contact-name')
   const contactValue = searchParams.get('new-contact-id')
   const newContact =
     contactLabel && contactValue
       ? { value: contactValue, label: contactLabel }
       : null
 
-  if (valuesFromStorage && newContact) {
-    const mergedValues = {
-      ...transformAPIValuesForForm(exportItem),
-      ...valuesFromStorage,
-    }
-
+  if (newContact) {
+    const formValues = transformAPIValuesForForm(item)
     return {
-      ...mergedValues,
-      contacts: [...mergedValues.contacts, newContact],
+      ...formValues,
+      contacts: [...formValues.contacts, newContact],
       scrollToContact: true,
     }
   }
-  return { ...transformAPIValuesForForm(exportItem) }
+
+  return { ...transformAPIValuesForForm(item) }
 }
 
 export const state2props = (state, { location }) => {
@@ -39,19 +32,19 @@ export const state2props = (state, { location }) => {
 
   if (exportItem) {
     return {
-      exportItem: overwriteObjectWithSessionStorageValues(
-        exportItem,
-        searchParams
-      ),
+      exportItem: addContactToItem(exportItem, searchParams),
     }
   }
 
   if (company) {
     return {
-      exportItem: overwriteObjectWithSessionStorageValues(
+      exportItem: addContactToItem(
         {
           company,
-          owner: { id: state.currentAdviserId, name: state.currentAdviserName },
+          owner: {
+            id: state.currentAdviserId,
+            name: state.currentAdviserName,
+          },
         },
         searchParams
       ),