OCLOMRS-954: Reset adding and deleting org members (#675)

openmrs · Mar 20, 2021 · edea323 · edea323
1 parent 64a08fe
commit edea323
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/src/apps/organisations/components/ViewOrgsPage.tsx b/src/apps/organisations/components/ViewOrgsPage.tsx
@@ -45,7 +45,7 @@ const ViewOrganisationsPage: React.FC<Props> = ({ organisations = [], profile, r
 
   useEffect(() => {
     if (profile) {
-      retrieveOrganisations(profile?.username);
+      retrieveOrganisations(profile?.username, initialQ, PER_PAGE, page);
     } else retrieveOrganisations(url, initialQ, PER_PAGE, page); 
   },[retrieveOrganisations, url, initialQ, page, profile]); // eslint-disable-line react-hooks/exhaustive-deps
 

diff --git a/src/apps/organisations/pages/ViewOrgPage.tsx b/src/apps/organisations/pages/ViewOrgPage.tsx
@@ -13,7 +13,9 @@ import {
   addOrgMemberAction,
   addOrgMemberLoadingSelector,
   deleteOrgMemberAction,
-  deleteOrgMemberErrorSelector
+  deleteOrgMemberErrorSelector,
+  resetAddOrgMemberAction,
+  resetDeleteOrgMemberAction
 } from "../redux";
 import Header from "../../../components/Header";
 import { 
@@ -55,6 +57,8 @@ interface Props {
   deleteMember: (
       ...args: Parameters<typeof deleteOrgMemberAction>
   ) => void;
+  resetAddOrgMember: () => void;
+  resetDeleteOrgMember: () => void;
 }
 
 const useStyles = makeStyles((theme) => 
@@ -76,6 +80,8 @@ const ViewOrganisationPage: React.FC<Props> = ({
   retrieveOrgSources, 
   retrieveOrgCollections,
   retrieveOrgMembers,
+  resetAddOrgMember,
+  resetDeleteOrgMember,
   addOrgMember,
   organisation,
   sources,
@@ -92,6 +98,11 @@ const ViewOrganisationPage: React.FC<Props> = ({
 
   const orgUrl = url.replace("/user", "").replace("edit/", "");
 
+  useEffect(() => {
+    resetAddOrgMember();
+    resetDeleteOrgMember();
+  }, []); // eslint-disable-line react-hooks/exhaustive-deps
+
   useEffect(() => {
     retrieveOrg(orgUrl);
     retrieveOrgSources(orgUrl);
@@ -145,6 +156,8 @@ const mapActionsToProps = {
   retrieveOrgSources: retrieveOrgSourcesAction,
   retrieveOrgCollections: retrieveOrgCollectionsAction,
   retrieveOrgMembers: retrieveOrgMembersAction,
+  resetAddOrgMember: resetAddOrgMemberAction,
+  resetDeleteOrgMember: resetDeleteOrgMemberAction,
   addOrgMember: addOrgMemberAction,
   deleteMember:deleteOrgMemberAction
 };

diff --git a/src/apps/organisations/redux/actions.ts b/src/apps/organisations/redux/actions.ts
@@ -100,6 +100,18 @@ const resetEditOrganisationAction = () => {
   }
 };
 
+const resetAddOrgMemberAction = () => {
+  return (dispatch: Function) => {
+    dispatch(resetAction(CREATE_ORG_MEMBER_ACTION));
+  }
+};
+
+const resetDeleteOrgMemberAction = () => {
+  return (dispatch: Function) => {
+    dispatch(resetAction(DELETE_ORG_MEMBER_ACTION));
+  }
+};
+
 const retrieveOrganisationAction = (orgUrl: string) => {
   return async (dispatch: Function) => {
     await dispatch(
@@ -143,6 +155,8 @@ export {
   editOrganisationAction,
   retrieveOrganisationAction,
   resetEditOrganisationAction,
+  resetAddOrgMemberAction,
+  resetDeleteOrgMemberAction,
   retrieveOrgCollectionsAction,
   retrieveOrgSourcesAction,
   deleteOrganisationAction,