From 08445f2857bf493721e939e71cea81509b99df3e Mon Sep 17 00:00:00 2001
From: nathan <nathangray.bsc+github@gmail.com>
Date: Thu, 29 Jun 2023 07:55:10 -0600
Subject: [PATCH] Calendar: Improve videoconference link for recurring events
 to include recurrence date

---
 calendar/js/app.ts              |  2 +-
 calendar/js/et2_widget_event.ts | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/calendar/js/app.ts b/calendar/js/app.ts
index cfdbbe4a26..7c3ccc7e01 100644
--- a/calendar/js/app.ts
+++ b/calendar/js/app.ts
@@ -4519,7 +4519,7 @@ export class CalendarApp extends EgwApp
 				( typeof _data.start != "string" ? _data.start.toJSON() : _data.start).slice(0,-1),
                 ( typeof _data.end != "string" ? _data.end.toJSON() : _data.end).slice(0,-1),
 				{
-					participants:Object.keys(_data.participants).filter(v => {return v.match(/^[0-9|e|c]/)})
+					participants: Object.keys(_data.participants ?? []).filter(v => {return v.match(/^[0-9|e|c]/)})
 				}], function(_value){
 					if (_value)
 					{
diff --git a/calendar/js/et2_widget_event.ts b/calendar/js/et2_widget_event.ts
index 0d512ff39a..ef2aabcbdc 100644
--- a/calendar/js/et2_widget_event.ts
+++ b/calendar/js/et2_widget_event.ts
@@ -554,10 +554,11 @@ export class et2_calendar_event extends et2_valueWidget implements et2_IDetached
 						{
 								// Click handler is set in _bind_videoconference()
 								location += (this.options.value.location.trim() ? '<br />' : '') +
-										'<span data-videoconference="' + this.options.value['##videoconference'] +
-										'" data-id="' + this.options.value['id'] + '" data-title="' + this.options.value['title'] +
-										'" data-start="' + this.options.value['start'].toJSON() + '" data-end="' + this.options.value['end'].toJSON() + '">' +
-										this.egw().lang('Video conference') +
+									'<span data-videoconference="' + this.options.value['##videoconference'] +
+									'" data-id="' + this.options.value['id'] + '" data-app_id="' + this.options.value['app_id'] +
+									'" data-title="' + this.options.value['title'] +
+									'" data-start="' + this.options.value['start'].toJSON() + '" data-end="' + this.options.value['end'].toJSON() + '">' +
+									this.egw().lang('Video conference') +
 										'<img src="' + this.egw().image('videoconference', 'calendar') + '"/></span>';
 								this._bind_videoconference();
 						}
@@ -726,8 +727,8 @@ export class et2_calendar_event extends et2_valueWidget implements et2_IDetached
 				jQuery('body').off(vc_event)
 						.on(vc_event, '[data-videoconference]', function (event)
 						{
-								let data = egw.dataGetUIDdata("calendar::" + this.dataset.id);
-								app.calendar.joinVideoConference(this.dataset.videoconference, data.data || this.dataset);
+							let data = egw.dataGetUIDdata("calendar::" + this.dataset.app_id);
+							app.calendar.joinVideoConference(this.dataset.videoconference, data?.data || this.dataset);
 						});
 		}