Skip to content

DBC22-6874: fix Bulletin header unread count pill #1399

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

Open
ray-oxd wants to merge 1 commit into
base: main
Choose a base branch
from
Open

DBC22-6874: fix Bulletin header unread count pill #1399

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/frontend/src/Components/shared/header/Header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,18 +102,14 @@ export default function Header({ isMaintenance }) {
return 0;
}

if (advisoriesData.length !== 0 && advisoriesData[0].last_notified_at == null) {
return 0;
}

const readAdvisories = advisoriesData.filter(advisory => {
// Do not count preview items as unread
// Do not count preview items or never-notified items as unread
if (!advisory.id || !advisory.last_notified_at) {
return true;
}

return cmsContext.readAdvisories.includes(
advisory.id.toString() + '-' + advisory.last_notified_at
advisory.id.toString() + '-' + advisory.last_notified_at.toString()
);
});

Expand All @@ -125,13 +121,17 @@ export default function Header({ isMaintenance }) {
return 0;
}

if (bulletinsData.length !== 0 && bulletinsData[0].last_notified_at == null) {
return 0;
}
const readBulletins = bulletinsData.filter(bulletin => {
// Do not count preview items or never-notified items as unread
if (!bulletin.id || !bulletin.last_notified_at) {
return true;
}

return cmsContext.readBulletins.includes(
bulletin.id.toString() + '-' + bulletin.last_notified_at.toString()
);
});

const readBulletins = bulletinsData.filter(bulletin => cmsContext.readBulletins.includes(
bulletin.id.toString() + '-' + bulletin.last_notified_at
));
return bulletinsData.length - readBulletins.length;
}

Expand Down
Loading