From cf7c57a92668d6811c1347ca465eb413fdcdfa00 Mon Sep 17 00:00:00 2001 From: Manuel Rojas Date: Thu, 15 Feb 2024 17:00:56 -0600 Subject: [PATCH 1/2] #25748 Fixing firefox issue --- .../dot-toolbar-announcements.component.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-announcements/dot-toolbar-announcements.component.ts b/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-announcements/dot-toolbar-announcements.component.ts index 54798fb82b34..54a6338247cf 100644 --- a/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-announcements/dot-toolbar-announcements.component.ts +++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-announcements/dot-toolbar-announcements.component.ts @@ -43,8 +43,10 @@ export class DotToolbarAnnouncementsComponent implements OnInit, OnChanges { }); } - ngOnChanges(): void { - this.announcementsStore.markAnnouncementsAsRead(); + ngOnChanges(changes): void { + if (!changes.showUnreadAnnouncement.currentValue) { + this.announcementsStore.markAnnouncementsAsRead(); + } } typesIcons = { From e988f3821a04da7f7b16ad733d2bd5fb6b14325a Mon Sep 17 00:00:00 2001 From: Manuel Rojas Date: Fri, 16 Feb 2024 09:45:11 -0600 Subject: [PATCH 2/2] #25748 Added a test for showUnreadAnnouncement --- .../dot-toolbar-announcements.component.spec.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-announcements/dot-toolbar-announcements.component.spec.ts b/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-announcements/dot-toolbar-announcements.component.spec.ts index 5f25dce6468a..6c9d3a6daf8b 100644 --- a/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-announcements/dot-toolbar-announcements.component.spec.ts +++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-announcements/dot-toolbar-announcements.component.spec.ts @@ -81,4 +81,13 @@ describe('DotToolbarAnnouncementsComponent', () => { const announcementLink = spectator.query(byTestId('announcement_link')); expect(announcementLink.getAttribute('target')).toBe('_blank'); }); + + it('should call markAnnouncementsAsRead when showUnreadAnnouncement is false', () => { + const markAnnouncementsAsReadSpy = spyOn( + spectator.component.announcementsStore, + 'markAnnouncementsAsRead' + ); + spectator.setInput('showUnreadAnnouncement', false); + expect(markAnnouncementsAsReadSpy).toHaveBeenCalled(); + }); });