Add captured slides to UploadingPresentations collection

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationWithAnnotationsMsgHdlr.scala

@@ -146,7 +146,7 @@ trait PresentationWithAnnotationsMsgHdlr extends RightsManagementTrait {
       log.error(s"No presentation set in meeting ${meetingId}")
     } else {
 
-      val jobId: String = RandomStringGenerator.randomAlphanumericString(16);
+      val jobId: String = s"${meetingId}-slides" // Used as the temporaryPresentationId upon upload
       val jobType = "PresentationWithAnnotationExportJob"
       val allPages: Boolean = m.allPages
       val pageCount = currentPres.get.pages.size

bigbluebutton-html5/imports/api/breakouts/server/publishers.js

@@ -33,6 +33,7 @@ function breakouts() {
       shortName: 1,
       timeRemaining: 1,
       captureNotes: 1,
+      captureSlides: 1,
     },
   };
 

bigbluebutton-html5/imports/ui/components/breakout-room/breakout-remaining-time/container.jsx

@@ -147,7 +147,7 @@ export default injectNotify(injectIntl(withTracker(({
       if (fromBreakoutPanel) data.bold = true;
     } else {
       clearInterval(timeRemainingInterval);
-      BreakoutService.setCapturedNotesUploading();
+      BreakoutService.setCapturedContentUploading();
       data.message = intl.formatMessage(timeEndedMessage || intlMessages.breakoutWillClose);
     }
   } else if (breakoutRoom) {

bigbluebutton-html5/imports/ui/components/breakout-room/service.js

@@ -38,13 +38,7 @@ const getBreakoutRoomUrl = (breakoutId) => {
   return breakoutUrlData;
 };
 
-const setCapturedNotesUploading = () => {
-  const breakoutRooms = findBreakouts();
-  breakoutRooms.forEach((breakout) => {
-    if (breakout.captureNotes) {
-      const filename = breakout.shortName;
-      const temporaryPresentationId = `${breakout.breakoutId}-notes`;
-
+const upsertCapturedContent = (filename, temporaryPresentationId) => {
   UploadingPresentations.upsert({
     temporaryPresentationId,
   }, {
@@ -61,12 +55,25 @@ const setCapturedNotesUploading = () => {
       uploadTimestamp: new Date(),
     },
   });
+};
+
+const setCapturedContentUploading = () => {
+  const breakoutRooms = findBreakouts();
+  breakoutRooms.forEach((breakout) => {
+    const filename = breakout.shortName;
+    const temporaryPresentationId = breakout.breakoutId;
+    if (breakout.captureNotes) {
+      upsertCapturedContent(filename, `${temporaryPresentationId}-notes`);
+    }
+
+    if (breakout.captureSlides) {
+      upsertCapturedContent(filename, `${temporaryPresentationId}-slides`);
     }
   });
 };
 
 const endAllBreakouts = () => {
-  setCapturedNotesUploading();
+  setCapturedContentUploading();
   makeCall('endAllBreakouts');
 };
 
@@ -244,5 +251,5 @@ export default {
   sortUsersByName: UserListService.sortUsersByName,
   isUserInBreakoutRoom,
   checkInviteModerators,
-  setCapturedNotesUploading,
+  setCapturedContentUploading,
 };