Merge pull request #13 from openimis/develop

MERGING RELEASE branches
openimis · Apr 24, 2023 · 3db3427 · 3db3427
2 parents 6c38eb1 + 56d6745
commit 3db3427
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/src/components/PayerForm.js b/src/components/PayerForm.js
@@ -21,6 +21,7 @@ const PayerForm = (props) => {
       Panels={[FundingPanel]}
       save={onSave}
       back={onBack}
+      openDirty={onSave}
       actions={[
         {
           doIt: onReset,

diff --git a/src/constants.js b/src/constants.js
@@ -3,4 +3,6 @@ export const RIGHT_PAYERS_ADD = 121802;
 export const RIGHT_PAYERS_DELETE = 121804;
 export const RIGHT_PAYERS_EDIT = 121803;
 
+export const MODULE_NAME = "payer";
+
 export const PAYER_TYPES = ["C", "D", "G", "L", "O", "P"];
diff --git a/src/pages/PayersPage.js b/src/pages/PayersPage.js
@@ -1,8 +1,15 @@
-import React from "react";
-import { useTranslations, useModulesManager, historyPush, withTooltip, withHistory } from "@openimis/fe-core";
+import React, { useEffect } from "react";
+import {
+  useTranslations,
+  useModulesManager,
+  historyPush,
+  withTooltip,
+  withHistory,
+  clearCurrentPaginationPage,
+} from "@openimis/fe-core";
 import { makeStyles } from "@material-ui/styles";
-import { useSelector } from "react-redux";
-import { RIGHT_PAYERS_ADD, RIGHT_PAYERS_DELETE } from "../constants";
+import { useSelector, useDispatch } from "react-redux";
+import { RIGHT_PAYERS_ADD, RIGHT_PAYERS_DELETE, MODULE_NAME } from "../constants";
 import { usePayerDeleteMutation } from "../hooks";
 import { Fab } from "@material-ui/core";
 import AddIcon from "@material-ui/icons/Add";
@@ -15,9 +22,11 @@ const useStyles = makeStyles((theme) => ({
 
 const PayersPage = (props) => {
   const { history } = props;
+  const dispatch = useDispatch();
   const modulesManager = useModulesManager();
   const { formatMessage, formatMessageWithValues } = useTranslations("payer", modulesManager);
   const rights = useSelector((state) => state.core?.user?.i_user?.rights ?? []);
+  const module = useSelector((state) => state.core?.savedPagination?.module);
   const classes = useStyles();
   const deleteMutation = usePayerDeleteMutation();
   const onDoubleClick = (payer, newTab) =>
@@ -32,6 +41,10 @@ const PayersPage = (props) => {
 
   const canDelete = (payer) => rights.includes(RIGHT_PAYERS_DELETE) && !payer.validityTo;
 
+  useEffect(() => {
+    if (module !== MODULE_NAME) dispatch(clearCurrentPaginationPage());
+  }, [module]);
+
   return (
     <div className={classes.page}>
       <PayerSearcher onDelete={onDelete} canDelete={canDelete} onDoubleClick={onDoubleClick} />