From 5d0adf434159e9d3f39110871422bad17a960510 Mon Sep 17 00:00:00 2001 From: greta Date: Mon, 30 Dec 2024 14:26:25 +0100 Subject: [PATCH] feat:select existing talk roomfor convesations Signed-off-by: greta --- src/components/Editor/AddTalkModal.vue | 252 +++++++++++++++++++++++++ src/services/talkService.js | 2 +- src/store/calendarObjectInstance.js | 2 +- src/views/EditSidebar.vue | 105 ++++++++++- 4 files changed, 356 insertions(+), 5 deletions(-) create mode 100644 src/components/Editor/AddTalkModal.vue diff --git a/src/components/Editor/AddTalkModal.vue b/src/components/Editor/AddTalkModal.vue new file mode 100644 index 0000000000..b6189303fb --- /dev/null +++ b/src/components/Editor/AddTalkModal.vue @@ -0,0 +1,252 @@ + + + + + diff --git a/src/services/talkService.js b/src/services/talkService.js index 08de68be1b..eed7a85b95 100644 --- a/src/services/talkService.js +++ b/src/services/talkService.js @@ -126,7 +126,7 @@ export function doesContainTalkLink(text) { * @param {string} token The token to the call room * @return {string} */ -function generateURLForToken(token = '') { +export function generateURLForToken(token = '') { return window.location.protocol + '//' + window.location.host + generateUrl('/call/' + token) } diff --git a/src/store/calendarObjectInstance.js b/src/store/calendarObjectInstance.js index 641ddd24f2..0d00c43ea0 100644 --- a/src/store/calendarObjectInstance.js +++ b/src/store/calendarObjectInstance.js @@ -421,7 +421,7 @@ export default defineStore('calendarObjectInstance', { * @param {string=} data.language Preferred language of the attendee * @param {string=} data.timezoneId Preferred timezone of the attendee * @param {object=} data.organizer Principal of the organizer to be set if not present - * @param {string|array} data.member Group membership(s) + * @param {string | Array} data.member Group membership(s) */ addAttendee({ calendarObjectInstance, diff --git a/src/views/EditSidebar.vue b/src/views/EditSidebar.vue index 7e96b9ea72..cb851f583a 100644 --- a/src/views/EditSidebar.vue +++ b/src/views/EditSidebar.vue @@ -82,7 +82,23 @@ @update-end-time="updateEndTime" @update-end-timezone="updateEndTimezone" @toggle-all-day="toggleAllDay" /> - +
+ + + + {{ t('calendar','Add Talk conversation') }} + +