Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(chat): exported presentation notification (backport to 2.6) #19280

Merged
merged 1 commit into from
Jan 12, 2024
Merged

fix(chat): exported presentation notification (backport to 2.6) #19280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 14 additions & 0 deletions bigbluebutton-html5/imports/ui/components/chat/alert/component.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const CHAT_CONFIG = Meteor.settings.public.chat;
const PUBLIC_CHAT_CLEAR = CHAT_CONFIG.chat_clear;
const PUBLIC_CHAT_ID = CHAT_CONFIG.public_id;
const POLL_RESULT_KEY = CHAT_CONFIG.system_messages_keys.chat_poll_result;
const EXPORTED_PRESENTATION_KEY = CHAT_CONFIG.system_messages_keys.chat_exported_presentation;

const propTypes = {
pushAlertEnabled: PropTypes.bool.isRequired,
Expand Down Expand Up @@ -66,6 +67,10 @@ const intlMessages = defineMessages({
id: 'app.toast.chat.pollClick',
description: 'chat toast click message for polls',
},
exportedPresentation: {
id: 'app.toast.chat.exportedPresentation',
description: 'chat toast message for exportedPresentation',
}
});

const ALERT_INTERVAL = 5000; // 5 seconds
Expand Down Expand Up @@ -189,6 +194,13 @@ const ChatAlert = (props) => {
</Styled.PushMessageContent>
);

const createExportedPresentationMessage = (filename) => (
<Styled.PushMessageContent>
<Styled.UserNameMessage>{intl.formatMessage(intlMessages.exportedPresentation)}</Styled.UserNameMessage>
<Styled.ContentMessageExportedPresentation>{filename}</Styled.ContentMessageExportedPresentation>
</Styled.PushMessageContent>
);

if (_.isEqual(prevUnreadMessages, unreadMessages)) {
return null;
}
Expand All @@ -203,6 +215,8 @@ const ChatAlert = (props) => {
if (mappedMessage.id.includes(POLL_RESULT_KEY)) {
content = createPollMessage();
isPollResult = true;
} else if (mappedMessage.id.includes(EXPORTED_PRESENTATION_KEY)) {
content = createExportedPresentationMessage(mappedMessage.extra.filename);
} else {
content = createMessage(mappedMessage.sender.name, mappedMessage.content.slice(-5));
}
Expand Down
5 changes: 5 additions & 0 deletions bigbluebutton-html5/imports/ui/components/chat/alert/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,14 @@ const ContentMessagePoll = styled(ContentMessage)`
margin-top: ${fontSizeSmall};
`;

const ContentMessageExportedPresentation = styled(ContentMessage)`
margin-top: ${fontSizeSmall};
`;

export default {
PushMessageContent,
UserNameMessage,
ContentMessage,
ContentMessagePoll,
ContentMessageExportedPresentation,
};
3 changes: 2 additions & 1 deletion bigbluebutton-html5/imports/ui/components/chat/service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ const mapGroupMessage = (message) => {
time: message.timestamp || message.time,
sender: null,
key: message.key,
chatId: message.chatId
chatId: message.chatId,
extra: message.extra,
};

if (message.sender && message.sender !== SYSTEM_CHAT_TYPE) {
Expand Down
1 change: 1 addition & 0 deletions bigbluebutton-html5/public/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,6 +812,7 @@
"app.toast.chat.system": "System",
"app.toast.chat.poll": "Poll Results",
"app.toast.chat.pollClick": "Poll results were published. Click here to see.",
"app.toast.chat.exportedPresentation": "Presentation file",
"app.toast.clearedEmoji.label": "Emoji status cleared",
"app.toast.setEmoji.label": "Emoji status set to {0}",
"app.toast.meetingMuteOn.label": "All users have been muted",
Expand Down