From 49dd79e1680c29f3ffc6276805c187339787a136 Mon Sep 17 00:00:00 2001
From: Maksim Sukharev <antreesy.web@gmail.com>
Date: Thu, 15 Jan 2026 10:43:43 +0100
Subject: [PATCH 1/2] fix: manage existing breakout rooms from conversation
 settings

- logic copied from BreakoutRoomsTab

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
---
 .../BreakoutRoomsSettings.vue                 | 67 ++++++++++++++++++-
 1 file changed, 66 insertions(+), 1 deletion(-)

diff --git a/src/components/ConversationSettings/BreakoutRoomsSettings.vue b/src/components/ConversationSettings/BreakoutRoomsSettings.vue
index f08600fa951..eac0eff717e 100644
--- a/src/components/ConversationSettings/BreakoutRoomsSettings.vue
+++ b/src/components/ConversationSettings/BreakoutRoomsSettings.vue
@@ -9,6 +9,16 @@
 			{{ hintText }}
 		</p>
 		<NcButton
+			v-if="hasBreakoutRooms"
+			variant="secondary"
+			@click="showParticipantsEditor = true">
+			<template #icon>
+				<IconDotsCircle :size="20" />
+			</template>
+			{{ t('spreed', 'Manage breakout rooms') }}
+		</NcButton>
+		<NcButton
+			v-else
 			variant="secondary"
 			@click="openBreakoutRoomsEditor">
 			<template #icon>
@@ -22,20 +32,43 @@
 		v-if="showBreakoutRoomsEditor"
 		:token="token"
 		@close="showBreakoutRoomsEditor = false" />
+
+	<!-- Participants editor -->
+	<NcModal
+		v-if="showParticipantsEditor"
+		container=".breakout-rooms-settings"
+		labelId="breakout-rooms-settings-editor"
+		@close="showParticipantsEditor = false">
+		<div class="breakout-rooms-settings__editor">
+			<h2 id="breakout-rooms-settings-editor" class="nc-dialog-alike-header">
+				{{ t('spreed', 'Manage breakout rooms') }}
+			</h2>
+			<BreakoutRoomsParticipantsEditor
+				:token="token"
+				:breakoutRooms="breakoutRooms"
+				@close="showParticipantsEditor = false" />
+		</div>
+	</NcModal>
 </template>
 
 <script>
 import { t } from '@nextcloud/l10n'
 import NcButton from '@nextcloud/vue/components/NcButton'
+import NcModal from '@nextcloud/vue/components/NcModal'
 import IconDotsCircle from 'vue-material-design-icons/DotsCircle.vue'
 import BreakoutRoomsEditor from '../BreakoutRoomsEditor/BreakoutRoomsEditor.vue'
+import BreakoutRoomsParticipantsEditor from '../BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue'
+import { CONVERSATION } from '../../constants.ts'
+import { useBreakoutRoomsStore } from '../../stores/breakoutRooms.ts'
 
 export default {
 	name: 'BreakoutRoomsSettings',
 
 	components: {
 		NcButton,
+		NcModal,
 		BreakoutRoomsEditor,
+		BreakoutRoomsParticipantsEditor,
 		IconDotsCircle,
 	},
 
@@ -49,9 +82,18 @@ export default {
 		},
 	},
 
+	setup() {
+		const breakoutRoomsStore = useBreakoutRoomsStore()
+
+		return {
+			breakoutRoomsStore,
+		}
+	},
+
 	data() {
 		return {
 			showBreakoutRoomsEditor: false,
+			showParticipantsEditor: false,
 		}
 	},
 
@@ -59,6 +101,24 @@ export default {
 		hintText() {
 			return t('spreed', 'Breakout rooms') // FIXME
 		},
+
+		conversation() {
+			return this.$store.getters.conversation(this.token) || this.$store.getters.dummyConversation
+		},
+
+		hasBreakoutRooms() {
+			return this.conversation.breakoutRoomMode !== CONVERSATION.BREAKOUT_ROOM_MODE.NOT_CONFIGURED
+		},
+
+		breakoutRooms() {
+			return this.breakoutRoomsStore.breakoutRooms(this.token)
+		},
+	},
+
+	created() {
+		if (this.hasBreakoutRooms) {
+			this.breakoutRoomsStore.fetchBreakoutRoomsParticipants(this.token)
+		}
 	},
 
 	methods: {
@@ -72,10 +132,15 @@ export default {
 
 <style lang="scss" scoped>
 .breakout-rooms-settings {
-	&__hint{
+	&__hint {
 		margin-bottom: calc(var(--default-grid-baseline) * 2);
 		color: var(--color-text-maxcontrast);
 	}
+
+	&__editor {
+		height: 100%;
+		padding: 20px;
+	}
 }
 
 </style>

From 2125d93b8b4a523a6a81ec9ecd7d6e2987d846b0 Mon Sep 17 00:00:00 2001
From: Maksim Sukharev <antreesy.web@gmail.com>
Date: Thu, 15 Jan 2026 10:44:19 +0100
Subject: [PATCH 2/2] fix(BreakoutRoomsEditor): show nested modal on top of
 settings dialog

- also drop redundant prop and fix appearance

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
---
 src/components/BreakoutRoomsEditor/BreakoutRoomsEditor.vue  | 6 ++++++
 .../BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue | 1 +
 .../ConversationSettings/BreakoutRoomsSettings.vue          | 1 +
 .../RightSidebar/BreakoutRooms/BreakoutRoomsActions.vue     | 1 -
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/BreakoutRoomsEditor/BreakoutRoomsEditor.vue b/src/components/BreakoutRoomsEditor/BreakoutRoomsEditor.vue
index 20070db34e6..f0c9eefa010 100644
--- a/src/components/BreakoutRoomsEditor/BreakoutRoomsEditor.vue
+++ b/src/components/BreakoutRoomsEditor/BreakoutRoomsEditor.vue
@@ -6,6 +6,7 @@
 <template>
 	<NcModal
 		:class="{ 'modal-mask__participants-step': isEditingParticipants }"
+		:container="container"
 		:labelId="dialogHeaderId"
 		@close="$emit('close')">
 		<div
@@ -109,6 +110,11 @@ export default {
 			type: String,
 			required: true,
 		},
+
+		container: {
+			type: String,
+			default: 'body',
+		},
 	},
 
 	emits: ['close'],
diff --git a/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue b/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue
index 7e434cc4c85..7d30dd2eb80 100644
--- a/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue
+++ b/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue
@@ -62,6 +62,7 @@
 				v-if="hasSelected"
 				variant="primary"
 				container=".participants-editor__buttons"
+				placement="top"
 				:menuName="t('spreed', 'Assign')">
 				<NcActionButton
 					v-for="(item, index) in assignments"
diff --git a/src/components/ConversationSettings/BreakoutRoomsSettings.vue b/src/components/ConversationSettings/BreakoutRoomsSettings.vue
index eac0eff717e..7f90d31acbc 100644
--- a/src/components/ConversationSettings/BreakoutRoomsSettings.vue
+++ b/src/components/ConversationSettings/BreakoutRoomsSettings.vue
@@ -30,6 +30,7 @@
 	<!-- Breakout rooms editor -->
 	<BreakoutRoomsEditor
 		v-if="showBreakoutRoomsEditor"
+		container=".breakout-rooms-settings"
 		:token="token"
 		@close="showBreakoutRoomsEditor = false" />
 
diff --git a/src/components/RightSidebar/BreakoutRooms/BreakoutRoomsActions.vue b/src/components/RightSidebar/BreakoutRooms/BreakoutRoomsActions.vue
index ad9116e8e3d..cd6761bd03d 100644
--- a/src/components/RightSidebar/BreakoutRooms/BreakoutRoomsActions.vue
+++ b/src/components/RightSidebar/BreakoutRooms/BreakoutRoomsActions.vue
@@ -103,7 +103,6 @@
 				<BreakoutRoomsParticipantsEditor
 					:token="mainToken"
 					:breakoutRooms="breakoutRooms"
-					:isCreatingRooms="false"
 					@close="closeParticipantsEditor" />
 			</div>
 		</NcModal>