update the investment on company changes

uktrade · Jan 2, 2024 · f715c17 · f715c17
1 parent 2d8210a
commit f715c17
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 26 deletions.
diff --git a/src/client/modules/Tasks/TaskForm/TaskFormFields.jsx b/src/client/modules/Tasks/TaskForm/TaskFormFields.jsx
@@ -14,7 +14,7 @@ import {
   FieldCompaniesTypeahead,
   FieldTypeahead,
 } from '../../../components'
-
+import { ID as TASK_DETAILS_ID } from '../TaskDetails/state'
 import { validateDaysRange, validateIfDateInFuture } from './validators'
 import { FORM_LAYOUT, OPTIONS_YES_NO } from '../../../../common/constants'
 import { OPTIONS } from './constants'
@@ -23,6 +23,7 @@ import { TASK_SAVE_TASK_DETAILS } from './state'
 import Task from '../../../components/Task'
 import { TASK_GET_PROJECTS_LIST } from '../../Investments/Projects/state'
 import { INVESTMENTS__PROJECTS_LOADED } from '../../../actions'
+import Effect from '../../../components/Effect'
 
 const StyledFieldInput = styled(FieldInput)`
   text-align: center;
@@ -66,7 +67,7 @@ const TaskFormFields = ({
       submitButtonLabel="Save task"
       cancelButtonLabel="Back"
     >
-      {({ values }) => (
+      {({ values, setFieldValue }) => (
         <>
           <FieldInput
             label="Task title"
@@ -152,30 +153,47 @@ const TaskFormFields = ({
             initialValue={task?.company}
           />
           {(task?.company || values.company) && (
-            <>
-              {/* todo - this needs to refire the query when the company value changes */}
-              <Task.Status
-                name={TASK_GET_PROJECTS_LIST}
-                startOnRender={{
-                  payload: {
-                    limit: 250,
-                    companyId: task?.company?.value || values.company.value,
-                  },
-                  onSuccessDispatch: INVESTMENTS__PROJECTS_LOADED,
-                }}
-              ></Task.Status>
+            <Task>
+              {(getTask) => {
+                const getProjectsTask = getTask(
+                  TASK_GET_PROJECTS_LIST,
+                  TASK_DETAILS_ID
+                )
+
+                const companyId = values.company?.value || task?.company?.value
 
-              {companyInvestmentProjects && (
-                <FieldTypeahead
-                  options={companyInvestmentProjects}
-                  name="investmentProject"
-                  label="Investment project (optional)"
-                  hint="This will link the task to the project selected. The task will be added to your task list on the homepage."
-                  initialValue={task?.investmentProject}
-                  placeholder="Type to search for investment projects"
-                />
-              )}
-            </>
+                return (
+                  <>
+                    <Effect
+                      dependencyList={[companyId]}
+                      effect={() => {
+                        setFieldValue('investmentProject', {
+                          value: null,
+                          label: null,
+                        })
+                        getProjectsTask.start({
+                          payload: {
+                            limit: 250,
+                            companyId: companyId,
+                          },
+                          onSuccessDispatch: INVESTMENTS__PROJECTS_LOADED,
+                        })
+                      }}
+                    />
+                    {companyInvestmentProjects && (
+                      <FieldTypeahead
+                        options={companyInvestmentProjects}
+                        name="investmentProject"
+                        label="Investment project (optional)"
+                        hint="This will link the task to the project selected. The task will be added to your task list on the homepage."
+                        initialValue={task?.investmentProject}
+                        placeholder="Type to search for investment projects"
+                      />
+                    )}
+                  </>
+                )
+              }}
+            </Task>
           )}
         </>
       )}

diff --git a/src/client/modules/Tasks/TaskForm/transformers.js b/src/client/modules/Tasks/TaskForm/transformers.js
@@ -36,7 +36,7 @@ export const transformTaskFormValuesForAPI = (
 })
 
 const getUniquePKValue = (formValues) => {
-  if (formValues.investmentProject) {
+  if (formValues?.investmentProject?.value) {
     return {
       investment_project: formValues.investmentProject.value,
       company: null,