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

Toast messages in front-end

Browse Source
This commit is contained in:
Daniel Petri Rocha 2022-08-24 15:31:20 +02:00
parent b3e97ed52b
commit 94fc8a4d41
9 changed files with 95 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bbb-export-annotations/workers/collector.js
View File

@ -82,7 +82,7 @@ const exportJob = JSON.parse(job);
presId: exportJob.presId,
pageNumber: 1,
totalPages: pages.length,
status: 'collecting',
status: 'COLLECTING',
error: false,
},
},

4
bbb-export-annotations/workers/process.js
View File

@ -14,7 +14,7 @@ const [jobId, statusUpdate] = workerData;
const logger = new Logger('presAnn Process Worker');
logger.info('Processing PDF for job ' + jobId);
statusUpdate.core.body.status = 'processing';
statusUpdate.core.body.status = 'PROCESSING';
const kickOffNotifierWorker = (jobType, filename) => {
return new Promise((resolve, reject) => {
@ -787,7 +787,7 @@ async function process_presentation_annotations() {
await client.connect();
client.on('error', (err) => console.log('Redis Client Error', err));
client.on('error', (err) => logger.info('Redis Client Error', err));
// 1. Get the job
const job = fs.readFileSync(path.join(dropbox, 'job'));

2
bigbluebutton-html5/imports/api/presentations/server/eventHandlers.js
View File

@ -5,6 +5,7 @@ import handlePresentationCurrentSet from './handlers/presentationCurrentSet';
import handlePresentationConversionUpdate from './handlers/presentationConversionUpdate';
import handlePresentationDownloadableSet from './handlers/presentationDownloadableSet';
import handlePresentationExport from './handlers/presentationExport';
import handlePresentationExportToastUpdate from './handlers/presentationExportToastUpdate';
RedisPubSub.on('PdfConversionInvalidErrorEvtMsg', handlePresentationConversionUpdate);
RedisPubSub.on('PresentationPageGeneratedEvtMsg', handlePresentationConversionUpdate);
@ -16,3 +17,4 @@ RedisPubSub.on('RemovePresentationEvtMsg', handlePresentationRemove);
RedisPubSub.on('SetCurrentPresentationEvtMsg', handlePresentationCurrentSet);
RedisPubSub.on('SetPresentationDownloadableEvtMsg', handlePresentationDownloadableSet);
RedisPubSub.on('NewPresAnnFileAvailableEvtMsg', handlePresentationExport);
RedisPubSub.on('PresAnnStatusEvtMsg', handlePresentationExportToastUpdate);

21
bigbluebutton-html5/imports/api/presentations/server/handlers/presentationExportToastUpdate.js Normal file
View File

@ -0,0 +1,21 @@
import { check } from 'meteor/check';
import setPresentationExportingProgress from '/imports/api/presentations/server/modifiers/setPresentationExportingProgress';
export default function handlePresentationExportToastUpdate({ body }, meetingId) {
check(body, Object);
check(meetingId, String);
const {
presId, pageNumber, totalPages, status, error,
} = body;
check(presId, String);
check(pageNumber, Number);
check(totalPages, Number);
check(status, String);
check(error, Boolean);
setPresentationExportingProgress(meetingId, presId, {
pageNumber, totalPages, status, error,
});
}

3
bigbluebutton-html5/imports/api/presentations/server/modifiers/setPresentationExporting.js
View File

@ -22,8 +22,7 @@ export default function setPresentationExporting(meetingId, presentationId, expo
const { numberAffected } = Presentations.upsert(selector, modifier);
if (numberAffected) {
const status = `isRunning=${exportation.isRunning} error=${exportation.error}`;
Logger.info(`Set exporting status on presentation ${presentationId} in meeting ${meetingId} ${status}`);
Logger.info(`Set exporting status on presentation ${presentationId} in meeting ${meetingId} status=${exportation.status}`);
}
} catch (err) {
Logger.error(`Could not set exporting status on pres ${presentationId} in meeting ${meetingId} ${err}`);

27
bigbluebutton-html5/imports/api/presentations/server/modifiers/setPresentationExportingProgress.js Normal file
View File

@ -0,0 +1,27 @@
import { check } from 'meteor/check';
import Presentations from '/imports/api/presentations';
import Logger from '/imports/startup/server/logger';
export default function setPresentationExportingProgress(meetingId, presentationId, exportation) {
check(meetingId, String);
check(presentationId, String);
check(exportation, Object);
const selector = {
meetingId,
id: presentationId,
};
const modifier = {
$set: {
exportation,
},
};
try {
Presentations.upsert(selector, modifier);
} catch (err) {
const state = `pageNumber=${exportation.pageNumber} totalPages=${exportation.totalPages} status=${exportation.status} error=${exportation.error}`;
Logger.error(`Could not update exporting progress for presentation ${presentationId} in meeting ${meetingId} ${state} ${err}`);
}
}

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

@ -253,6 +253,14 @@ const intlMessages = defineMessages({
id: 'app.presentationUploader.sending',
description: 'sending label',
},
collecting: {
id: 'app.presentationUploader.collecting',
description: 'collecting label',
},
processing: {
id: 'app.presentationUploader.processing',
description: 'processing label',
},
sent: {
id: 'app.presentationUploader.sent',
description: 'sent label',
@ -265,6 +273,8 @@ const intlMessages = defineMessages({
const EXPORT_STATUSES = {
RUNNING: 'RUNNING',
COLLECTING: 'COLLECTING',
PROCESSING: 'PROCESSING',
TIMEOUT: 'TIMEOUT',
EXPORTED: 'EXPORTED',
};
@ -427,7 +437,7 @@ class PresentationUploader extends Component {
isCurrent: false,
conversion: { done: false, error: false },
upload: { done: false, error: false, progress: 0 },
exportation: { isRunning: false, error: false },
exportation: { error: false },
onProgress: (event) => {
if (!event.lengthComputable) {
this.deepMergeUpdateFileKey(id, 'upload', {
@ -647,8 +657,9 @@ class PresentationUploader extends Component {
const observer = (exportation) => {
this.deepMergeUpdateFileKey(item.id, 'exportation', exportation);
if (exportation.status === EXPORT_STATUSES.RUNNING) {
if ([EXPORT_STATUSES.RUNNING,
EXPORT_STATUSES.COLLECTING,
EXPORT_STATUSES.PROCESSING].includes(exportation.status)) {
this.setState((prevState) => {
prevState.presExporting.add(item.id);
return {
@ -667,12 +678,12 @@ class PresentationUploader extends Component {
closeOnClick: true,
onClose: () => {
this.exportToastId = null;
const presToShow = this.getPresentationsToShow();
const isAnyRunning = presToShow.some(
(p) => p.exportation.status === EXPORT_STATUSES.RUNNING
|| p.exportation.status === EXPORT_STATUSES.COLLECTING
|| p.exportation.status === EXPORT_STATUSES.PROCESSING,
);
if (!isAnyRunning) {
this.setState({ presExporting: new Set() });
}
@ -894,7 +905,7 @@ class PresentationUploader extends Component {
const presToShow = this.getPresentationsToShow();
const isAllExported = presToShow.every(
(p) => p.exportation.status === EXPORT_STATUSES.EXPORTED
(p) => p.exportation.status === EXPORT_STATUSES.EXPORTED,
);
const shouldDismiss = isAllExported && this.exportToastId;
@ -904,12 +915,13 @@ class PresentationUploader extends Component {
if (presExporting.size) {
this.setState({ presExporting: new Set() });
}
return;
}
const presToShowSorted = [
...presToShow.filter((p) => p.exportation.status === EXPORT_STATUSES.RUNNING),
...presToShow.filter((p) => p.exportation.status === EXPORT_STATUSES.COLLECTING),
...presToShow.filter((p) => p.exportation.status === EXPORT_STATUSES.PROCESSING),
...presToShow.filter((p) => p.exportation.status === EXPORT_STATUSES.TIMEOUT),
...presToShow.filter((p) => p.exportation.status === EXPORT_STATUSES.EXPORTED),
];
@ -939,19 +951,27 @@ class PresentationUploader extends Component {
renderToastExportItem(item) {
const { status } = item.exportation;
const loading = status === EXPORT_STATUSES.RUNNING;
const loading = (status === EXPORT_STATUSES.RUNNING
|| status === EXPORT_STATUSES.COLLECTING
|| status === EXPORT_STATUSES.PROCESSING);
const done = status === EXPORT_STATUSES.EXPORTED;
let icon;
switch (status) {
case EXPORT_STATUSES.RUNNING:
icon = 'blank'
icon = 'blank';
break;
case EXPORT_STATUSES.COLLECTING:
icon = 'blank';
break;
case EXPORT_STATUSES.PROCESSING:
icon = 'blank';
break;
case EXPORT_STATUSES.EXPORTED:
icon = 'check'
icon = 'check';
break;
case EXPORT_STATUSES.TIMEOUT:
icon = 'warning'
icon = 'warning';
break;
default:
break;
@ -990,6 +1010,12 @@ class PresentationUploader extends Component {
switch (item.exportation.status) {
case EXPORT_STATUSES.RUNNING:
return intl.formatMessage(intlMessages.sending);
case EXPORT_STATUSES.COLLECTING:
return intl.formatMessage(intlMessages.collecting,
{ 0: item.exportation.pageNumber, 1: item.exportation.totalPages });
case EXPORT_STATUSES.PROCESSING:
return intl.formatMessage(intlMessages.processing,
{ 0: item.exportation.pageNumber, 1: item.exportation.totalPages });
case EXPORT_STATUSES.TIMEOUT:
return intl.formatMessage(intlMessages.exportingTimeout);
case EXPORT_STATUSES.EXPORTED:

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

@ -60,7 +60,7 @@ const getPresentations = () => Presentations
isRemovable: removable,
conversion: conversion || { done: true, error: false },
uploadTimestamp,
exportation: exportation || { isRunning: false, error: false },
exportation: exportation || { error: false },
};
});
@ -277,7 +277,7 @@ const exportPresentationToChat = (presentationId, observer) => {
const cursor = Presentations.find({ id: presentationId });
const checkStatus = (exportation) => {
const shouldStop = lastStatus.status === 'RUNNING' && exportation.status !== 'RUNNING';
const shouldStop = lastStatus.status === 'PROCESSING' && exportation.status === 'EXPORTED';
if (shouldStop) {
observer(exportation, true);

2
bigbluebutton-html5/public/locales/en.json
View File

@ -236,6 +236,8 @@
"app.presentationUploader.exportToastHeaderPlural": "Sending to chat ({0} items)",
"app.presentationUploader.exporting": "Sending to chat",
"app.presentationUploader.sending": "Sending...",
"app.presentationUploader.collecting": "Extracting slide {0} of {1}...",
"app.presentationUploader.processing": "Annotating slide {0} of {1}...",
"app.presentationUploader.sent": "Sent",
"app.presentationUploader.exportingTimeout": "The export is taking too long...",
"app.presentationUploader.export": "Send to chat",