Error handling in membership update

rciam · Feb 25, 2025 · 37dd0b2 · 37dd0b2
1 parent 1ad2229
commit 37dd0b2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [1.5.5] - 2025-02-25
 
 ### Fixed
+- Alerts for update membership requests 
 - Return 409 conflict for concurrent group membership update
 
 ## [1.5.4] - 2025-02-24

diff --git a/src/main/resources/theme/rciam-group/account/messages/messages_en.properties b/src/main/resources/theme/rciam-group/account/messages/messages_en.properties
@@ -294,6 +294,7 @@ editMembershipDisabled=Cannot edit a suspended Membership
 updateMembershipMessage=Membership Update 
 updateMembershipSuccessMessage= Was completed succesfully
 updateMembershipErrorMessage=Failed due to an error: {{param_0}}
+updateMembershipErrorMessageNoError=Failed due to an unexpected error
 enrollmentConfigurationExpirationDateSwitchDisabledTooltip=Setting an expiration date is required
 enrollmentConfigurationTooltipExpirationDate=Expiration Date for this membership. Switching this of will make the membership not expire
 adminGroupMemberActivatePendingTooltip=Enable Pending Membership Now

diff --git a/...es/theme/rciam-group/account/src/app/group-widgets/GroupAdminPage/EditMembershipModal.tsx b/...es/theme/rciam-group/account/src/app/group-widgets/GroupAdminPage/EditMembershipModal.tsx
@@ -12,6 +12,7 @@ import { GroupRolesTable } from '../GroupRolesTable';
 interface EditMembershipModalProps {
     membership: Membership;
     setMembership: any;
+    setAlert:any;
     fetchGroupMembers: any;
 };
 
@@ -36,7 +37,6 @@ export const EditMembershipModal: React.FC<EditMembershipModalProps> = (props) =
     const [errors, setErrors] = useState<any>({});
     const [modalInfo, setModalInfo] = useState({});
     const [loading, setLoading] = useState(false);
-    const [alert, setAlert] = useState({});
     const [membership, setMembership] = useState<Membership>({
         "validFrom": "",
         "membershipExpiresAt": "",
@@ -193,18 +193,16 @@ export const EditMembershipModal: React.FC<EditMembershipModalProps> = (props) =
 
     let updateMembership = () => {
         setLoading(true);
-        groupsService!.doPut<any>("/group-admin/group/" + props.membership.group.id + "/member/" + props.membership?.id, { ...membership })
+        groupsService!.doPut<any>("/group-admin/group/" + props.membership.group.id + "/member/" + props.membership?.id, { ...membership})
             .then((response: HttpResponse<any>) => {
                 props.fetchGroupMembers();
                 setLoading(false);
                 props?.setMembership({});
                 if (response.status === 200 || response.status === 204) {
-                    setAlert({ message: Msg.localize('updateMembershipMessage'), variant: "success", description: Msg.localize('updateMembershipSuccessMessage') })
+                    props.setAlert({ message: Msg.localize('updateMembershipMessage'), variant: "success", description: Msg.localize('updateMembershipSuccessMessage') })
                 }
                 else {
-                    if (response.data.error) {
-                        setAlert({ message: Msg.localize('updateMembershipMessage'), variant: "danger", description: Msg.localize('updateMembershipErrorMessage', [response.data.error]) })
-                    }
+                    props.setAlert({ message: Msg.localize('updateMembershipMessage'), variant: "danger", description: response?.data?.error?Msg.localize('updateMembershipErrorMessage', [response.data.error]):Msg.localize("updateMembershipErrorMessageNoError") })
                 }
             })
     }
@@ -247,7 +245,6 @@ export const EditMembershipModal: React.FC<EditMembershipModalProps> = (props) =
                     </Button>
                 ]}
             >
-                <Alerts alert={alert} close={() => { setAlert({}) }} />
                 <Loading active={loading} />
                 <Form>
                 <FormGroup

diff --git a/...resources/theme/rciam-group/account/src/app/group-widgets/GroupAdminPage/GroupMembers.tsx b/...resources/theme/rciam-group/account/src/app/group-widgets/GroupAdminPage/GroupMembers.tsx
@@ -321,7 +321,7 @@ export const GroupMembers: FC<any> = (props) => {
       <Loading active={loading} />
       <ConfirmationModal modalInfo={modalInfo} />
       <UserActionModal setAlert={setAlert} user={selectedUser} setUser={setSelectedUser} groupId={props.groupId} fetchGroupMembers={fetchGroupMembers} />
-      <EditMembershipModal membership={editMembership} setMembership={setEditMembership} fetchGroupMembers={fetchGroupMembers} />
+      <EditMembershipModal membership={editMembership} setMembership={setEditMembership} setAlert={setAlert} fetchGroupMembers={fetchGroupMembers} />
       <TableActionBar
         childComponent={
           <React.Fragment>