#25738 Adding small refactor

dotCMS · Jan 22, 2024 · e88aa08 · e88aa08
1 parent a7ebc08
commit e88aa08
Show file tree

Hide file tree

Showing 7 changed files with 1,442 additions and 1,405 deletions.
diff --git a/...web/apps/dotcms-ui/src/app/api/services/dot-announcements.ts/dot-announcements.service.ts b/...web/apps/dotcms-ui/src/app/api/services/dot-announcements.ts/dot-announcements.service.ts
@@ -2,7 +2,7 @@ import { HttpClient } from '@angular/common/http';
 import { Injectable, Signal, computed, inject } from '@angular/core';
 import { toSignal } from '@angular/core/rxjs-interop';
 
-import { catchError, pluck } from 'rxjs/operators';
+import { catchError, pluck, tap } from 'rxjs/operators';
 
 export type Announcement = {
     title: string;
@@ -25,6 +25,14 @@ export class AnnouncementsService {
 
     private announcementsData$ = this.http.get<Announcement[]>(this.announcementsUrl).pipe(
         pluck('entity'),
+        tap((announcements: Announcement[]) => {
+            announcements.map((announcement) => {
+                announcement.url = `${announcement.url}?utm_source=dotcms&utm_medium=application&utm_campaign=announcement_menu`;
+            });
+
+            return announcements;
+        }),
+
         catchError(() => [])
     );
 
@@ -48,8 +56,10 @@ export class AnnouncementsService {
             (id) => !storedAnnouncementIds.includes(id)
         );
 
-        localStorage.setItem('announcementsData', JSON.stringify(newAnnouncements));
-
         return isNewAnnouncement;
     });
+
+    saveAnnouncementsData: Signal<void> = computed(() => {
+        localStorage.setItem('announcementsData', JSON.stringify(this.announcements()));
+    });
 }
diff --git a/...s/dot-toolbar/components/dot-toolbar-announcements/dot-toolbar-announcements.component.ts b/...s/dot-toolbar/components/dot-toolbar-announcements/dot-toolbar-announcements.component.ts
@@ -1,5 +1,5 @@
 import { NgClass, NgForOf, CommonModule } from '@angular/common';
-import { Component, OnInit, Signal, inject, signal } from '@angular/core';
+import { Component, Signal, inject } from '@angular/core';
 import { RouterLink } from '@angular/router';
 
 import {
@@ -17,16 +17,12 @@ import { DotMessagePipe } from '@dotcms/ui';
     imports: [NgForOf, NgClass, DotMessagePipe, RouterLink, CommonModule],
     providers: [AnnouncementsService]
 })
-export class DotToolbarAnnouncementsComponent implements OnInit {
+export class DotToolbarAnnouncementsComponent {
     announcementsService = inject(AnnouncementsService);
 
     announcements: Signal<Announcement[]> = this.announcementsService.announcements;
 
-    unreadAnnouncements: Signal<boolean> = signal(false);
-
-    ngOnInit(): void {
-        this.unreadAnnouncements = this.announcementsService.unreadAnnouncements;
-    }
+    unreadAnnouncements: Signal<boolean> = this.announcementsService.unreadAnnouncements;
 
     knowledgeCenterLinks = [
         {

diff --git a/...dot-toolbar/components/dot-toolbar-notifications/dot-toolbar-notifications.component.html b/...dot-toolbar/components/dot-toolbar-notifications/dot-toolbar-notifications.component.html
@@ -8,7 +8,7 @@
     <span
         class="badge"
         id="dot-toolbar-notifications-badge"
-        *ngIf="!annocumentsMarkedAsRead"></span>
+        *ngIf="announcementsService.unreadAnnouncements()"></span>
 
     <p-overlayPanel
         #toolbarAnnouncements

diff --git a/...s/dot-toolbar/components/dot-toolbar-notifications/dot-toolbar-notifications.component.ts b/...s/dot-toolbar/components/dot-toolbar-notifications/dot-toolbar-notifications.component.ts
@@ -135,7 +135,7 @@ export class DotToolbarNotificationsComponent implements OnInit {
     }
 
     markAnnocumentsAsRead(): void {
-        this.annocumentsMarkedAsRead = this.announcementsService.unreadAnnouncements();
         this.activeAnnouncements = false;
+        this.announcementsService.saveAnnouncementsData();
     }
 }