BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19734 from ramonlsouza/issue-19180

Browse Source 
fix: Download presentation popup window is broken
This commit is contained in:
Ramón Souza 2024-03-06 17:51:11 -03:00 committed by GitHub
commit 361717c69a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bigbluebutton-html5/imports/ui/components/presentation/component.jsx
View File

@ -206,6 +206,7 @@ class Presentation extends PureComponent {
numPages, numPages,
currentPresentationId, currentPresentationId,
fitToWidth, fitToWidth,
downloadPresentationUri,
} = this.props; } = this.props;
const { const {
presentationWidth, presentationWidth,
@ -258,8 +259,9 @@ class Presentation extends PureComponent {
); );
if ( if (
prevProps?.currentPresentation?.id !== currentPresentation.id || prevProps?.currentPresentation?.id !== currentPresentation.id
(downloadableOn && !userIsPresenter) || prevProps?.downloadPresentationUri !== downloadPresentationUri
|| (downloadableOn && !userIsPresenter)
) { ) {
if (this.currentPresentationToastId) { if (this.currentPresentationToastId) {
toast.update(this.currentPresentationToastId, { toast.update(this.currentPresentationToastId, {

7
bigbluebutton-html5/imports/ui/components/presentation/container.jsx
View File

@ -117,10 +117,15 @@ export default lockContextContainer(
} }
} }
const currentPresentation = PresentationService.getCurrentPresentation(podId); const currentPresentation = PresentationService.getCurrentPresentation(podId);
const downloadPresentationUri = currentPresentation
? `${APP_CONFIG.bbbWebBase}/${currentPresentation?.originalFileURI}`
: null;
return { return {
currentSlide, currentSlide,
slidePosition, slidePosition,
downloadPresentationUri: PresentationService.downloadPresentationUri(podId), downloadPresentationUri,
multiUser: multiUser:
(WhiteboardService.hasMultiUserAccess(currentSlide && currentSlide.id, Auth.userID) (WhiteboardService.hasMultiUserAccess(currentSlide && currentSlide.id, Auth.userID)
|| WhiteboardService.isMultiUserActive(currentSlide?.id) || WhiteboardService.isMultiUserActive(currentSlide?.id)

12
bigbluebutton-html5/imports/ui/components/presentation/service.js
View File

@ -6,23 +6,12 @@ import { safeMatch } from '/imports/utils/string-utils';
const POLL_SETTINGS = Meteor.settings.public.poll; const POLL_SETTINGS = Meteor.settings.public.poll;
const MAX_CUSTOM_FIELDS = POLL_SETTINGS.maxCustom; const MAX_CUSTOM_FIELDS = POLL_SETTINGS.maxCustom;
const MAX_CHAR_LIMIT = POLL_SETTINGS.maxTypedAnswerLength; const MAX_CHAR_LIMIT = POLL_SETTINGS.maxTypedAnswerLength;
const APP = Meteor.settings.public.app;
const getCurrentPresentation = (podId) => Presentations.findOne({ const getCurrentPresentation = (podId) => Presentations.findOne({
podId, podId,
current: true, current: true,
}); });
const downloadPresentationUri = (podId) => {
const currentPresentation = getCurrentPresentation(podId);
if (!currentPresentation) {
return null;
}
const { originalFileURI: uri } = currentPresentation;
return `${APP.bbbWebBase}/${uri}`;
};
const isPresentationDownloadable = (podId) => { const isPresentationDownloadable = (podId) => {
const currentPresentation = getCurrentPresentation(podId); const currentPresentation = getCurrentPresentation(podId);
if (!currentPresentation) { if (!currentPresentation) {
@ -248,7 +237,6 @@ export default {
getCurrentSlide, getCurrentSlide,
getSlidePosition, getSlidePosition,
isPresentationDownloadable, isPresentationDownloadable,
downloadPresentationUri,
currentSlidHasContent, currentSlidHasContent,
parseCurrentSlideContent, parseCurrentSlideContent,
getCurrentPresentation, getCurrentPresentation,