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

Merge pull request #16703 from danielpetri1/unread-notification

Browse Source 
fix: Notes notification perpetually unread
This commit is contained in:
Anton Georgiev 2023-02-14 08:53:30 -05:00 committed by GitHub
commit ad6eef4d12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bigbluebutton-html5/imports/ui/components/notes/component.jsx
View File

@ -63,7 +63,6 @@ const Notes = ({
isToSharedNotesBeShow,
shouldShowSharedNotesOnPresentationArea,
}) => {
useEffect(() => () => Service.setLastRev(), []);
const [shouldRenderNotes, setShouldRenderNotes] = useState(false);
const { isChrome } = browserInfo;
const isOnMediaArea = area === 'media';

26
bigbluebutton-html5/imports/ui/components/notes/service.js
View File

@ -34,28 +34,13 @@ const hasPermission = () => {
return true;
};
const getLastRev = () => {
const lastRev = Session.get('notesLastRev');
if (!lastRev) return -1;
const getLastRev = () => (Session.get('notesLastRev') || 0);
return lastRev;
};
const getRev = () => PadsService.getRev(NOTES_CONFIG.id);
const setLastRev = () => {
const rev = PadsService.getRev(NOTES_CONFIG.id);
const lastRev = getLastRev();
const markNotesAsRead = () => Session.set('notesLastRev', getRev());
if (rev !== 0 && rev > lastRev) {
Session.set('notesLastRev', rev);
}
};
const hasUnreadNotes = () => {
const rev = PadsService.getRev(NOTES_CONFIG.id);
const lastRev = getLastRev();
return rev !== 0 && rev > lastRev;
};
const hasUnreadNotes = () => (getRev() > getLastRev());
const isEnabled = () => isSharedNotesEnabled();
@ -87,8 +72,7 @@ export default {
toggleNotesPanel,
hasPermission,
isEnabled,
setLastRev,
getLastRev,
markNotesAsRead,
hasUnreadNotes,
isSharedNotesPinned,
pinSharedNotes,

30
bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/component.jsx
View File

@ -10,7 +10,8 @@ const propTypes = {
intl: PropTypes.shape({
formatMessage: PropTypes.func.isRequired,
}).isRequired,
rev: PropTypes.number.isRequired,
isPinned: PropTypes.bool.isRequired,
sidebarContentPanel: PropTypes.string.isRequired,
};
const intlMessages = defineMessages({
@ -51,28 +52,29 @@ class UserNotes extends Component {
}
componentDidMount() {
const {
rev,
} = this.props;
const lastRev = NotesService.getLastRev();
if (rev !== 0 && rev > lastRev) this.setUnread(true);
this.setUnread(NotesService.hasUnreadNotes());
}
componentDidUpdate(prevProps) {
const { sidebarContentPanel, rev, isPinned } = this.props;
const { sidebarContentPanel, isPinned } = this.props;
const { unread } = this.state;
if (sidebarContentPanel !== PANELS.SHARED_NOTES && !unread) {
if (prevProps.rev !== rev) this.setUnread(true);
const notesOpen = sidebarContentPanel === PANELS.SHARED_NOTES && !isPinned;
const notesClosed = (prevProps.sidebarContentPanel === PANELS.SHARED_NOTES
&& sidebarContentPanel !== PANELS.SHARED_NOTES)
|| (prevProps.isPinned && !isPinned);
if (notesOpen && unread) {
NotesService.markNotesAsRead();
this.setUnread(false);
} else if (!unread && NotesService.hasUnreadNotes()) {
this.setUnread(true);
}
if (sidebarContentPanel === PANELS.SHARED_NOTES && unread) {
if (notesClosed) {
NotesService.markNotesAsRead();
this.setUnread(false);
}
if (!isPinned && prevProps.isPinned && unread) this.setUnread(false);
}
setUnread(unread) {

3
bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/container.jsx
View File

@ -1,6 +1,5 @@
import React from 'react';
import { withTracker } from 'meteor/react-meteor-data';
import PadsService from '/imports/ui/components/pads/service';
import NotesService from '/imports/ui/components/notes/service';
import lockContextContainer from '/imports/ui/components/lock-viewers/context/container';
import UserNotes from './component';
@ -16,7 +15,7 @@ const UserNotesContainer = (props) => {
export default lockContextContainer(withTracker(({ userLocks }) => {
const shouldDisableNotes = userLocks.userNotes;
return {
rev: PadsService.getRev(NotesService.ID),
unread: NotesService.hasUnreadNotes(),
disableNotes: shouldDisableNotes,
isPinned: NotesService.isSharedNotesPinned(),
};