CM-327: change the way how task updates are fetched

openimis · Sep 29, 2023 · 6dd5868 · 6dd5868
1 parent 8e96e77
commit 6dd5868
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 8 deletions.
diff --git a/src/actions.js b/src/actions.js
@@ -132,6 +132,12 @@ export const clearTaskGroup = () => (dispatch) => {
   });
 };
 
+export const clearTask = () => (dispatch) => {
+  dispatch({
+    type: CLEAR(ACTION_TYPE.GET_TASK),
+  });
+};
+
 export function deleteTaskGroup(taskGroup, clientMutationLabel) {
   const taskGroupsUuids = `ids: ["${decodeId(taskGroup?.id)}"]`;
   return PERFORM_MUTATION(

diff --git a/src/components/TaskApprovementPanel.js b/src/components/TaskApprovementPanel.js
@@ -39,7 +39,6 @@ function TaskApprovementPanel({
   mutation,
   journalize,
   confirmed,
-  setIsSaved,
 }) {
   const modulesManager = useModulesManager();
   const classes = useStyles();
@@ -80,7 +79,6 @@ function TaskApprovementPanel({
           user,
           approveOrFail,
         );
-        setIsSaved(true);
       }
     }
     return () => confirmed && clearConfirm(false);

diff --git a/src/pages/TaskDetailsPage.js b/src/pages/TaskDetailsPage.js
@@ -13,7 +13,7 @@ import _ from 'lodash';
 import TaskHeadPanel from '../components/TaskHeadPanel';
 import TaskPreviewPanel from '../components/TaskPreviewPanel';
 import TaskApprovementPanel from '../components/TaskApprovementPanel';
-import { fetchTask, updateTask } from '../actions';
+import { clearTask, fetchTask, updateTask } from '../actions';
 import { TASK_STATUS as taskStatus } from '../constants';
 
 const useStyles = makeStyles((theme) => ({
@@ -27,28 +27,39 @@ function TaskDetailsPage({
   fetchTask,
   updateTask,
   currentUser,
+  submittingMutation,
+  mutation,
+  clearTask,
 }) {
   const modulesManager = useModulesManager();
   const classes = useStyles();
   const history = useHistory();
   const { formatMessage } = useTranslations('tasksManagement', modulesManager);
   const [editedTask, setEditedTask] = useState({});
-  const [isSaved, setIsSaved] = useState(false);
   const back = () => history.goBack();
 
   useEffect(() => {
     if (taskUuid) {
       fetchTask(modulesManager, [`id: "${taskUuid}"`]);
-      setIsSaved(false);
     }
-  }, [taskUuid, isSaved]);
+  }, [taskUuid]);
+
+  useEffect(() => {
+    if (submittingMutation && mutation?.clientMutationId) {
+      fetchTask(modulesManager, [`clientMutationId: "${mutation?.clientMutationId}"`]);
+    }
+  }, [submittingMutation]);
 
   useEffect(() => {
     if (task) {
       setEditedTask(task);
     }
   }, [task]);
 
+  useEffect(() => () => {
+    clearTask();
+  }, []);
+
   const doesTaskChange = () => {
     if (_.isEqual(task, editedTask)) return false;
     return true;
@@ -64,7 +75,6 @@ function TaskDetailsPage({
         editedTask,
         formatMessage('task.update.mutationLabel'),
       );
-      setIsSaved(true);
     }
   };
 
@@ -98,7 +108,6 @@ function TaskDetailsPage({
         HeadPanel={TaskHeadPanel}
         formatMessage={formatMessage}
         Panels={panels()}
-        setIsSaved={setIsSaved}
         rights={rights}
         saveTooltip={formatMessage(
           `tasksManagement.saveButton.tooltip.${canSave() ? 'enabled' : 'disabled'}`,
@@ -111,13 +120,19 @@ function TaskDetailsPage({
 const mapDispatchToProps = (dispatch) => bindActionCreators({
   fetchTask,
   updateTask,
+  clearTask,
 }, dispatch);
 
 const mapStateToProps = (state, props) => ({
   rights: !!state.core && !!state.core.user && !!state.core.user.i_user ? state.core.user.i_user.rights : [],
   currentUser: !!state.core && !!state?.core?.user ? state.core.user : null,
   taskUuid: props.match.params.task_uuid,
+  submittingMutation: state.tasksManagement.submittingMutation,
+  mutation: state.tasksManagement.mutation,
   task: state.tasksManagement.task,
+  fetchingTask: state.tasksManagement.fetchingTask,
+  fetchedTask: state.tasksManagement.fetchedTask,
+  errorTask: state.tasksManagement.errorTask,
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(TaskDetailsPage);
diff --git a/src/reducer.js b/src/reducer.js
@@ -182,6 +182,14 @@ function reducer(
         errorTaskGroup: null,
         fetchedTaskGroup: false,
       };
+    case CLEAR(ACTION_TYPE.GET_TASK):
+      return {
+        ...state,
+        task: null,
+        fetchingTask: false,
+        errorTask: null,
+        fetchedTask: false,
+      };
     case REQUEST(ACTION_TYPE.MUTATION):
       return dispatchMutationReq(state, action);
     case ERROR(ACTION_TYPE.MUTATION):