From fd43c37d1ce57532c2d53328fa5e2bb51ea8d1fa Mon Sep 17 00:00:00 2001
From: greta <gretadoci@gmail.com>
Date: Mon, 6 Jan 2025 11:40:38 +0100
Subject: [PATCH] fixup! feat:select existing talk roomfor convesations

Signed-off-by: greta <gretadoci@gmail.com>
---
 src/components/Editor/AddTalkModal.vue | 60 ++++++++++++++++++++------
 src/views/EditSidebar.vue              |  8 +++-
 2 files changed, 54 insertions(+), 14 deletions(-)

diff --git a/src/components/Editor/AddTalkModal.vue b/src/components/Editor/AddTalkModal.vue
index c2ad63829..e57d3a297 100644
--- a/src/components/Editor/AddTalkModal.vue
+++ b/src/components/Editor/AddTalkModal.vue
@@ -5,17 +5,23 @@
 		@open="fetchTalkConversations">
 		<div class="modal-content">
 			<h2>{{ t('calendar', 'Select a talk room from the list') }}</h2>
-			<ul>
-				<li v-for="conversation in talkConversations" :key="conversation.id">
-					<NcButton @click="selectConversation(conversation)">
-						{{ t('calendar', 'Select') }}
-					</NcButton>
-				</li>
-			</ul>
-			<h2>{{ t('calendar', 'Create a new talk room') }}</h2>
-			<NcButton @click="createTalkRoom">
-				{{ t('calendar', 'Create a new talk room') }}
-			</NcButton>
+			<div class="talk-room-list">
+				<ul>
+					<li v-for="conversation in talkConversations" :key="conversation.id">
+						<NcButton @click="selectConversation(conversation)">
+							{{ t('calendar', 'Select') }}
+						</NcButton>
+					</li>
+				</ul>
+			</div>
+			<div class="sticky-footer">
+				<NcButton @click="createTalkRoom">
+					<template #icon>
+						<IconAdd :size="20" />
+					</template>
+					{{ t('calendar', 'Create a new conversation') }}
+				</NcButton>
+			</div>
 		</div>
 	</NcModal>
 </template>
@@ -29,12 +35,17 @@ import axios from '@nextcloud/axios'
 import { createTalkRoom } from '../../services/talkService.js'
 import { showError, showSuccess } from '@nextcloud/dialogs'
 import { generateOcsUrl } from '@nextcloud/router'
+import IconAdd from 'vue-material-design-icons/Plus.vue'
+import useCalendarObjectInstanceStore from '../../store/calendarObjects.js'
+import { mapStores } from 'pinia';
+
 
 export default {
 	name: 'AddTalkModal',
 	components: {
 		NcButton,
 		NcModal,
+		IconAdd,
 	},
 	props: {
 		calendarObjectInstance: {
@@ -53,12 +64,16 @@ export default {
 			creatingTalkRoom: false,
 		}
 	},
+	computed: {
+		...mapStores(useCalendarObjectInstanceStore),
+
+	},
 	methods: {
 		async fetchTalkConversations() {
 			try {
 				const response = await axios.get(generateOcsUrl('apps/spreed/api/v1/room'))
 				this.talkConversations = response.data.ocs.data.filter(conversation =>
-					conversation.joinable || conversation.is_moderator,
+					conversation.joinable
 				)
 			} catch (error) {
 				console.error('Error fetching Talk conversations:', error)
@@ -113,5 +128,24 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang="css" scoped>
+.talk-room-list {
+	flex: 1;
+	overflow-y: auto;
+	padding-bottom: 16px;
+}
+
+.sticky-footer {
+	position: sticky;
+	bottom: 0;
+	padding: 16px;
+	text-align: right;
+}
+h2 {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	text-align: center;
+	height: 30px;
+}
 </style>
diff --git a/src/views/EditSidebar.vue b/src/views/EditSidebar.vue
index 02baa6b23..92d018323 100644
--- a/src/views/EditSidebar.vue
+++ b/src/views/EditSidebar.vue
@@ -91,10 +91,14 @@
 					@update:value="updateLocation" />
 				<AddTalkModal v-if="isModalOpen"
 					:conversations="talkConversations"
+					:calendar-object-instance="calendarObjectInstance"
 					@close="closeModal" />
 				<NcButton :disabled="isCreateTalkRoomButtonDisabled"
 					class="add-talk-button"
 					@click="openModal">
+					<template #icon>
+						<IconCheck :size="16" />
+					</template>
 					{{ t('calendar','Add Talk') }}
 				</NcButton>
 			</div>
@@ -326,6 +330,7 @@ import { mapStores, mapState } from 'pinia'
 import AddTalkModal from '../components/Editor/AddTalkModal.vue'
 import { createTalkRoom, doesContainTalkLink } from '../services/talkService.js'
 import { showError, showSuccess } from '@nextcloud/dialogs'
+import IconCheck from 'vue-material-design-icons/Check.vue'
 
 export default {
 	name: 'EditSidebar',
@@ -361,6 +366,7 @@ export default {
 		AttachmentsList,
 		CalendarPickerHeader,
 		PropertyTitle,
+		IconCheck,
 	},
 	mixins: [
 		EditorMixin,
@@ -761,13 +767,13 @@ export default {
 	display: flex;
 	align-items: center;
 	gap: 4px;
+	width: 100%;
 }
 .add-talk-button {
 	flex-shrink: 0;
 }
 .property-location {
 	margin-top: 10px;
-	margin-left: -43px;
 	flex-grow: 1;
 }
 .property-description {