- Progress commit

Signed-off-by: Dave Richer <dave@imexsystems.ca>

client/src/components/task-upsert-modal/task-upsert-modal.container.jsx

@@ -5,14 +5,12 @@ import {useTranslation} from "react-i18next";
 import {connect} from "react-redux";
 import {createStructuredSelector} from "reselect";
 import {MUTATION_INSERT_NEW_TASK, MUTATION_UPDATE_TASK} from "../../graphql/tasks.queries";
-import {
-  QUERY_GET_TASKS_JOB_DETAILS,
-  QUERY_GET_TASKS_JOB_DETAILS_BY_ID
-} from "../../graphql/jobs.queries.js";
+import {QUERY_GET_TASKS_JOB_DETAILS_BY_ID} from "../../graphql/jobs.queries.js";
 import {toggleModalVisible} from "../../redux/modals/modals.actions";
 import {selectTaskUpsert} from "../../redux/modals/modals.selectors";
 import {selectBodyshop, selectCurrentUser} from "../../redux/user/user.selectors";
 import TaskUpsertModalComponent from "./task-upsert-modal.component";
+import {replaceUndefinedWithNull} from "../../utils/undefinedtonull.js";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -41,16 +39,14 @@ export function TaskUpsertModalContainer({
   const [selectedJobDetails, setSelectedJobDetails] = useState(null);
   const [jobIdState, setJobIdState] = useState(null);
 
-
   const {
-    loading: jobDetailsLoading,
-    error: jobDetailsError,
-    data: jobDetailsData
+    loading: loading,
+    error: error,
+    data: data
   } = useQuery(QUERY_GET_TASKS_JOB_DETAILS_BY_ID, {
     variables: {id: jobIdState},
-    skip: !jobIdState, // Skip the query if jobIdState is null
+    skip: !jobIdState,
   });
-  const {loading, error, data} = useQuery(QUERY_GET_TASKS_JOB_DETAILS);
 
   /**
    * Set the selected job id when the modal is opened and jobId is passed as a prop or when an existing task is passed as a prop
@@ -72,16 +68,6 @@ export function TaskUpsertModalContainer({
     }
   }, [existingTask, form, open]);
 
-  /**
-   * Reset the form values when the selected job id changes
-   */
-  useEffect(() => {
-    form.setFieldsValue({
-      joblineid: undefined,
-      billid: undefined,
-      partsorderid: undefined,
-    });
-  }, [selectedJobId, form]);
 
   /**
    * Set the job id state when the selected job id changes
@@ -97,10 +83,11 @@ export function TaskUpsertModalContainer({
    * Set the selected job details when the job details query is successful
    */
   useEffect(() => {
-    if (!jobDetailsLoading && !jobDetailsError && jobDetailsData) {
-      setSelectedJobDetails(jobDetailsData.jobs_by_pk);
+    if (!loading && !error && data) {
+      setSelectedJobDetails(data.jobs_by_pk);
     }
-  }, [jobDetailsLoading, jobDetailsError, jobDetailsData]);
+  }, [loading, error, data]);
+
 
   /**
    * Handle the form submit
@@ -109,13 +96,11 @@ export function TaskUpsertModalContainer({
    */
   const handleFinish = async (formValues) => {
     const {...values} = formValues;
-
     if (existingTask) {
       await updateTask({
         variables: {
           taskId: existingTask.id,
-          task: values,
-          jobid: selectedJobId,
+          task: replaceUndefinedWithNull(values)
         },
       });
 
@@ -128,19 +113,19 @@ export function TaskUpsertModalContainer({
       await insertTask({
         variables: {
           taskInput: [
-            {...values, jobid: selectedJobId, created_by: currentUser.email, bodyshopid: bodyshop.id},
+            {
+              ...replaceUndefinedWithNull(values),
+              created_by: currentUser.email,
+              bodyshopid: bodyshop.id
+            },
           ],
         },
-        updateQueries: {
-          query: QUERY_GET_TASKS_JOB_DETAILS,
-        },
         update(cache) {
           cache.modify({
             fields: {
               tasks(existingTasks) {
                 return [{
                   ...values, 
-                  jobid: selectedJobId,
                   created_by: currentUser.email,
                   bodyshopid: bodyshop.id
                   }, ...existingTasks]
@@ -154,7 +139,7 @@ export function TaskUpsertModalContainer({
       form.resetFields();
       toggleModalVisible();
       notification["success"]({
-        message: t("tasks.successes.create"),
+        message: t("tasks.successes.created"),
       });
     }
   };
@@ -176,7 +161,7 @@ export function TaskUpsertModalContainer({
     >
       <Form form={form} onFinish={handleFinish} layout="vertical">
         <TaskUpsertModalComponent form={form} loading={loading} error={error} data={data}
-                                  selectedJobId={setSelectedJobId}
+                                  selectedJobId={selectedJobId}
                                   setSelectedJobId={setSelectedJobId}
                                   selectedJobDetails={selectedJobDetails}/>