Merge pull request #12964 from nextcloud/fix/12955/hide-ban-for-feder…

…ated-users fix(Participant): hide ban option for federated users
nextcloud · Aug 15, 2024 · d4899f7 · d4899f7
2 parents 681add4 + d9e6c9c
commit d4899f7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/components/RightSidebar/Participants/Participant.spec.js b/src/components/RightSidebar/Participants/Participant.spec.js
@@ -709,11 +709,11 @@ describe('Participant.vue', () => {
 				await testCanBan()
 			})
 
-			test('allows a moderator to ban a federated user', async () => {
+			test('doesn not allow a moderator to ban a federated user', async () => {
 				conversation.participantType = PARTICIPANT.TYPE.MODERATOR
 				participant.actorType = ATTENDEE.ACTOR_TYPE.FEDERATED_USERS
 				participant.participantType = PARTICIPANT.TYPE.USER
-				await testCanBan()
+				await testCannotBan()
 			})
 
 			test('allows a moderator to ban a guest', async () => {

diff --git a/src/components/RightSidebar/Participants/Participant.vue b/src/components/RightSidebar/Participants/Participant.vue
@@ -290,7 +290,7 @@
 				:name="removeParticipantLabel"
 				:container="container">
 				<p> {{ removeDialogMessage }} </p>
-				<template v-if="supportBanV1 && showPermissionsOptions">
+				<template v-if="showBanOption">
 					<NcCheckboxRadioSwitch :checked.sync="isBanParticipant">
 						{{ t('spreed', 'Also ban from this conversation') }}
 					</NcCheckboxRadioSwitch>
@@ -742,6 +742,12 @@ export default {
 			return this.participantTypeIsModerator(this.participantType)
 		},
 
+		showBanOption() {
+			return this.supportBanV1
+				&& this.participant.actorType !== ATTENDEE.ACTOR_TYPE.FEDERATED_USERS
+				&& this.showPermissionsOptions
+		},
+
 		showPermissionsOptions() {
 			return this.canBeModerated
 				&& !this.isModerator