BC-8954 - remove room member directly (#3547)

Removing a single room member by using the corresponding button in the three dot menu of the "actions"-column of the room members page does not work. --------- Co-authored-by: Murat Merdoglu <[email protected]>
hpi-schul-cloud · Feb 11, 2025 · 997c7ff · 997c7ff
1 parent ba23b01
commit 997c7ff
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 18 deletions.
diff --git a/src/modules/data/room/roomMembers/roomMembers.composable.ts b/src/modules/data/room/roomMembers/roomMembers.composable.ts
@@ -65,7 +65,7 @@ export const useRoomMembers = (roomId: string) => {
 				};
 			});
 			isLoading.value = false;
-		} catch (error) {
+		} catch {
 			showFailure(t("pages.rooms.members.error.load"));
 			isLoading.value = false;
 		}
@@ -96,7 +96,7 @@ export const useRoomMembers = (roomId: string) => {
 						!roomMembers.value.some((member) => member.userId === user.id)
 					);
 				});
-		} catch (error) {
+		} catch {
 			showFailure(t("pages.rooms.members.error.load"));
 		}
 	};
@@ -132,25 +132,36 @@ export const useRoomMembers = (roomId: string) => {
 					displaySchoolRole: schoolRole[member.schoolRoleName],
 				}))
 			);
-		} catch (error) {
+		} catch {
 			showFailure(t("pages.rooms.members.error.add"));
 		}
 	};
 
-	const removeMembers = async () => {
+	const removeMembers = async (userIds: string[]) => {
 		try {
 			await roomApi.roomControllerRemoveMembers(roomId, {
-				userIds: selectedIds.value,
+				userIds,
 			});
 			roomMembers.value = roomMembers.value.filter(
-				(member) => !selectedIds.value.includes(member.userId)
+				(member) => !userIds.includes(member.userId)
 			);
 			selectedIds.value = [];
-		} catch (error) {
+		} catch {
 			showFailure(t("pages.rooms.members.error.remove"));
 		}
 	};
 
+	const leaveRoom = async () => {
+		isLoading.value = true;
+		try {
+			await roomApi.roomControllerLeaveRoom(roomId);
+		} catch {
+			showFailure(t("pages.rooms.members.error.remove"));
+		} finally {
+			isLoading.value = false;
+		}
+	};
+
 	const updateMembersRole = async (
 		roleName: ChangeRoomRoleBodyParamsRoleNameEnum,
 		id?: string
@@ -177,7 +188,7 @@ export const useRoomMembers = (roomId: string) => {
 					member.displayRoomRole = roomRole[roleName];
 				}
 			});
-		} catch (error) {
+		} catch {
 			showFailure(t("pages.rooms.members.error.updateRole"));
 		}
 	};
@@ -187,6 +198,7 @@ export const useRoomMembers = (roomId: string) => {
 		fetchMembers,
 		getPotentialMembers,
 		getSchools,
+		leaveRoom,
 		removeMembers,
 		updateMembersRole,
 		currentUser,

diff --git a/src/modules/data/room/roomMembers/roomMembers.composable.unit.ts b/src/modules/data/room/roomMembers/roomMembers.composable.unit.ts
@@ -303,8 +303,7 @@ describe("useRoomMembers", () => {
 
 	describe("removeMembers", () => {
 		it("should remove a members from the room", async () => {
-			const { removeMembers, roomMembers, selectedIds } =
-				useRoomMembers(roomId);
+			const { removeMembers, roomMembers } = useRoomMembers(roomId);
 
 			roomApiMock.roomControllerRemoveMembers.mockResolvedValue(
 				mockApiResponse({})
@@ -313,9 +312,7 @@ describe("useRoomMembers", () => {
 			const membersMock = roomMemberFactory(RoleName.Roomeditor).buildList(3);
 			roomMembers.value = membersMock;
 
-			selectedIds.value = [membersMock[1].userId];
-
-			await removeMembers();
+			await removeMembers([membersMock[1].userId]);
 
 			expect(roomApiMock.roomControllerRemoveMembers).toHaveBeenCalledWith(
 				roomId,
@@ -333,7 +330,34 @@ describe("useRoomMembers", () => {
 			const error = new Error("Test error");
 			roomApiMock.roomControllerRemoveMembers.mockRejectedValue(error);
 
-			await removeMembers();
+			await removeMembers(["id"]);
+
+			expect(mockedBoardNotifierCalls.showFailure).toHaveBeenCalledWith(
+				"pages.rooms.members.error.remove"
+			);
+		});
+	});
+
+	describe("leaveRoom", () => {
+		it("should call the leaveRoom api", async () => {
+			const { leaveRoom } = useRoomMembers(roomId);
+
+			roomApiMock.roomControllerLeaveRoom.mockResolvedValue(
+				mockApiResponse({})
+			);
+
+			await leaveRoom();
+
+			expect(roomApiMock.roomControllerLeaveRoom).toHaveBeenCalledWith(roomId);
+		});
+
+		it("should throw an error if the API call fails", async () => {
+			const { leaveRoom } = useRoomMembers(roomId);
+
+			const error = new Error("Test error");
+			roomApiMock.roomControllerLeaveRoom.mockRejectedValue(error);
+
+			await leaveRoom();
 
 			expect(mockedBoardNotifierCalls.showFailure).toHaveBeenCalledWith(
 				"pages.rooms.members.error.remove"

diff --git a/src/modules/page/room/RoomMembers.page.unit.ts b/src/modules/page/room/RoomMembers.page.unit.ts
@@ -259,7 +259,7 @@ describe("RoomMembersPage", () => {
 			);
 			await leaveMenu.trigger("click");
 
-			expect(mockRoomMemberCalls.removeMembers).toHaveBeenCalled();
+			expect(mockRoomMemberCalls.leaveRoom).toHaveBeenCalled();
 		});
 
 		it("should not call remove method when dialog is cancelled", async () => {

diff --git a/src/modules/page/room/RoomMembers.page.vue b/src/modules/page/room/RoomMembers.page.vue
@@ -137,6 +137,7 @@ const {
 	fetchMembers,
 	getPotentialMembers,
 	getSchools,
+	leaveRoom,
 	removeMembers,
 	updateMembersRole,
 } = useRoomMembers(roomId);
@@ -179,8 +180,8 @@ const onUpdateRoleOrSchool = async (payload: {
 	await getPotentialMembers(payload.schoolRole, payload.schoolId);
 };
 
-const onRemoveMembers = async () => {
-	await removeMembers();
+const onRemoveMembers = async (userIds: string[]) => {
+	await removeMembers(userIds);
 };
 
 const onLeaveRoom = async () => {
@@ -192,7 +193,7 @@ const onLeaveRoom = async () => {
 	});
 
 	if (!shouldLeave) return;
-	await removeMembers();
+	await leaveRoom();
 	router.push("/rooms");
 };