CM-158: fix download and switching tabs (#23)

* CM-158: fix download and switching tabs * CM-158: fix eslint
openimis · Jul 19, 2023 · 9d92755 · 9d92755
1 parent fc68e04
commit 9d92755
Show file tree

Hide file tree

Showing 7 changed files with 74 additions and 6 deletions.
diff --git a/src/actions.js b/src/actions.js
@@ -6,7 +6,9 @@ import {
   formatGQLString,
 } from '@openimis/fe-core';
 import { ACTION_TYPE } from './reducer';
-import { ERROR, REQUEST, SUCCESS } from './util/action-type';
+import {
+  CLEAR, ERROR, REQUEST, SUCCESS,
+} from './util/action-type';
 
 const INDIVIDUAL_FULL_PROJECTION = [
   'id',
@@ -204,3 +206,21 @@ export function downloadGroupIndividuals(params) {
     }`;
   return graphql(payload, ACTION_TYPE.GROUP_INDIVIDUAL_EXPORT);
 }
+
+export const clearGroupIndividualExport = () => (dispatch) => {
+  dispatch({
+    type: CLEAR(ACTION_TYPE.GROUP_INDIVIDUAL_EXPORT),
+  });
+};
+
+export const clearIndividualExport = () => (dispatch) => {
+  dispatch({
+    type: CLEAR(ACTION_TYPE.INDIVIDUAL_EXPORT),
+  });
+};
+
+export const clearGroupExport = () => (dispatch) => {
+  dispatch({
+    type: CLEAR(ACTION_TYPE.GROUP_EXPORT),
+  });
+};
diff --git a/src/components/GroupIndividualSearcher.js b/src/components/GroupIndividualSearcher.js
@@ -24,7 +24,11 @@ import {
 import EditIcon from '@material-ui/icons/Edit';
 import DeleteIcon from '@material-ui/icons/Delete';
 import {
-  fetchGroupIndividuals, deleteGroupIndividual, downloadGroupIndividuals, updateGroupIndividual,
+  fetchGroupIndividuals,
+  deleteGroupIndividual,
+  clearGroupIndividualExport,
+  downloadGroupIndividuals,
+  updateGroupIndividual,
 } from '../actions';
 import {
   DEFAULT_PAGE_SIZE,
@@ -56,6 +60,7 @@ function GroupIndividualSearcher({
   updateGroupIndividual,
   groupIndividualsPageInfo,
   groupIndividualsTotalCount,
+  clearGroupIndividualExport,
   groupId,
   downloadGroupIndividuals,
   groupIndividualExport,
@@ -231,6 +236,7 @@ function GroupIndividualSearcher({
         groupIndividualExport,
         `${formatMessage(intl, 'individual', 'export.filename.individuals')}.csv`,
       )();
+      clearGroupIndividualExport();
     }
   }, [groupIndividualExport]);
 
@@ -332,6 +338,7 @@ const mapDispatchToProps = (dispatch) => bindActionCreators(
     fetchGroupIndividuals,
     updateGroupIndividual,
     deleteGroupIndividual,
+    clearGroupIndividualExport,
     downloadGroupIndividuals,
     coreConfirm,
     clearConfirm,

diff --git a/src/components/GroupSearcher.js b/src/components/GroupSearcher.js
@@ -22,7 +22,9 @@ import {
 } from '@material-ui/core';
 import EditIcon from '@material-ui/icons/Edit';
 import DeleteIcon from '@material-ui/icons/Delete';
-import { deleteGroup, downloadGroups, fetchGroups } from '../actions';
+import {
+  deleteGroup, downloadGroups, fetchGroups, clearGroupExport,
+} from '../actions';
 import {
   DEFAULT_PAGE_SIZE,
   ROWS_PER_PAGE_OPTIONS,
@@ -48,6 +50,7 @@ function GroupSearcher({
   deleteGroup,
   confirmed,
   submittingMutation,
+  clearGroupExport,
   mutation,
   coreConfirm,
   clearConfirm,
@@ -169,6 +172,7 @@ function GroupSearcher({
   useEffect(() => {
     if (groupExport) {
       downloadExport(groupExport, `${formatMessage(intl, 'individual', 'export.filename.groups')}.csv`)();
+      clearGroupExport();
     }
   }, [groupExport]);
 
@@ -255,6 +259,7 @@ const mapDispatchToProps = (dispatch) => bindActionCreators(
   {
     fetchGroups,
     downloadGroups,
+    clearGroupExport,
     deleteGroup,
     coreConfirm,
     clearConfirm,

diff --git a/src/components/IndividualSearcher.js b/src/components/IndividualSearcher.js
@@ -23,7 +23,9 @@ import {
 } from '@material-ui/core';
 import EditIcon from '@material-ui/icons/Edit';
 import DeleteIcon from '@material-ui/icons/Delete';
-import { fetchIndividuals, deleteIndividual, downloadIndividuals } from '../actions';
+import {
+  fetchIndividuals, deleteIndividual, downloadIndividuals, clearIndividualExport,
+} from '../actions';
 import {
   DEFAULT_PAGE_SIZE,
   ROWS_PER_PAGE_OPTIONS,
@@ -52,6 +54,7 @@ function IndividualSearcher({
   individuals,
   individualsPageInfo,
   individualsTotalCount,
+  clearIndividualExport,
   groupId,
   downloadIndividuals,
   individualExport,
@@ -175,6 +178,7 @@ function IndividualSearcher({
   useEffect(() => {
     if (individualExport) {
       downloadExport(individualExport, `${formatMessage(intl, 'individual', 'export.filename.individuals')}.csv`)();
+      clearIndividualExport();
     }
   }, [individualExport]);
 
@@ -275,6 +279,7 @@ const mapDispatchToProps = (dispatch) => bindActionCreators(
     fetchIndividuals,
     deleteIndividual,
     downloadIndividuals,
+    clearIndividualExport,
     coreConfirm,
     clearConfirm,
     journalize,

diff --git a/src/index.js b/src/index.js
@@ -15,7 +15,7 @@ import GroupsPage from './pages/GroupsPage';
 import GroupPage from './pages/GroupPage';
 import { IndividualsListTabLabel, IndividualsListTabPanel } from './components/IndividualsListTab';
 import GroupIndividualSearcher from './components/GroupIndividualSearcher';
-import { downloadIndividuals, fetchIndividuals } from './actions';
+import { clearIndividualExport, downloadIndividuals, fetchIndividuals } from './actions';
 
 const ROUTE_INDIVIDUALS = 'individuals';
 const ROUTE_INDIVIDUAL = 'individuals/individual';
@@ -40,6 +40,7 @@ const DEFAULT_CONFIG = {
     { key: 'individual.GroupIndividualSearcher', ref: GroupIndividualSearcher },
     { key: 'individual.actions.fetchIndividuals', ref: fetchIndividuals },
     { key: 'individual.actions.downloadIndividuals', ref: downloadIndividuals },
+    { key: 'individual.actions.clearIndividualExport', ref: clearIndividualExport },
   ],
   'individual.TabPanel.label': [
     IndividualsListTabLabel,

diff --git a/src/reducer.js b/src/reducer.js
@@ -11,7 +11,9 @@ import {
   pageInfo,
   decodeId,
 } from '@openimis/fe-core';
-import { REQUEST, SUCCESS, ERROR } from './util/action-type';
+import {
+  REQUEST, SUCCESS, ERROR, CLEAR,
+} from './util/action-type';
 
 export const ACTION_TYPE = {
   MUTATION: 'INDIVIDUAL_MUTATION',
@@ -306,6 +308,33 @@ function reducer(
         fetchingGroupIndividualExport: false,
         errorGroupIndividualExport: formatServerError(action.payload),
       };
+    case CLEAR(ACTION_TYPE.GROUP_EXPORT):
+      return {
+        ...state,
+        fetchingGroupExport: false,
+        fetchedGroupExport: false,
+        groupExport: null,
+        groupExportPageInfo: {},
+        errorGroupExport: null,
+      };
+    case CLEAR(ACTION_TYPE.GROUP_INDIVIDUAL_EXPORT):
+      return {
+        ...state,
+        fetchingGroupIndividualExport: false,
+        fetchedGroupIndividualExport: false,
+        groupIndividualExport: null,
+        groupIndividualExportPageInfo: {},
+        errorGroupIndividualExport: null,
+      };
+    case CLEAR(ACTION_TYPE.INDIVIDUAL_EXPORT):
+      return {
+        ...state,
+        fetchingIndividualExport: false,
+        fetchedIndividualExport: false,
+        individualExport: null,
+        individualExportPageInfo: {},
+        errorIndividualExport: null,
+      };
     case REQUEST(ACTION_TYPE.MUTATION):
       return dispatchMutationReq(state, action);
     case ERROR(ACTION_TYPE.MUTATION):

diff --git a/src/util/action-type.js b/src/util/action-type.js
@@ -1,3 +1,4 @@
 export const REQUEST = (actionTypeName) => `${actionTypeName}_REQ`;
 export const SUCCESS = (actionTypeName) => `${actionTypeName}_RESP`;
 export const ERROR = (actionTypeName) => `${actionTypeName}_ERR`;
+export const CLEAR = (actionTypeName) => `${actionTypeName}_CLEAR`;