- additional cleanup and validation / fixes

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

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

@@ -16,7 +16,7 @@ const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser
 });
 
-const mapDispatchToProps = (dispatch) => ({});
+const mapDispatchToProps = () => ({});
 
 export default connect(mapStateToProps, mapDispatchToProps)(TaskUpsertModalComponent);
 

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

@@ -119,9 +119,15 @@ export function TaskUpsertModalContainer({ bodyshop, currentUser, taskUpsert, to
         taskId: existingTask.id,
         task: replaceUndefinedWithNull(values)
       },
-      refetchQueries: ["GET_JOB_BY_PK"]
+      refetchQueries: []
     };
 
+    // We have relationship IDS, so we need to refetch the job
+    if (jobid || joblineid || billid || partsorderid) {
+      taskObject.refetchQueries.push("GET_JOB_BY_PK");
+    }
+
+    // We have a relationship query, so we need to refetch the query
     if (query && Object.keys(query).length) {
       taskObject.refetchQueries.push(Object.keys(query)[0]);
     }
@@ -180,9 +186,15 @@ export function TaskUpsertModalContainer({ bodyshop, currentUser, taskUpsert, to
           }
         ]
       },
-      refetchQueries: ["GET_JOB_BY_PK"]
+      refetchQueries: []
     };
 
+    // We have relationship IDS, so we need to refetch the job
+    if (jobid || joblineid || billid || partsorderid) {
+      newTaskObject.refetchQueries.push("GET_JOB_BY_PK");
+    }
+
+    // We have a relationship query, so we need to refetch the query
     if (query && Object.keys(query).length) {
       newTaskObject.refetchQueries.push(Object.keys(query)[0]);
     }