inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-5379] change notification history service storage variable (#7026)

Browse Source 
* change notification history service storage variable

* fix mark as read
This commit is contained in:
Eugenio Romano
2021-05-14 14:52:28 +01:00
committed by GitHub
parent 65e3a21c25
commit 77e1a08b23
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/core/notifications/components/notification-history.component.spec.ts
View File

@@ -63,7 +63,7 @@ describe('Notification History Component', () => {
}));
afterEach(() => {
storage.removeItem('notifications');
storage.removeItem(NotificationHistoryComponent.NOTIFICATION_STORAGE);
fixture.destroy();
});
@@ -89,7 +89,7 @@ describe('Notification History Component', () => {
const markAllAsRead = <HTMLButtonElement> overlayContainerElement.querySelector('#adf-notification-history-mark-as-read');
markAllAsRead.click();
fixture.detectChanges();
expect(storage.getItem('notifications')).toBeNull();
expect(storage.getItem(NotificationHistoryComponent.NOTIFICATION_STORAGE)).toBeNull();
expect(component.notifications.length).toBe(0);
done();
});
@@ -150,7 +150,7 @@ describe('Notification History Component', () => {
});
it('should read notifications from local storage', (done) => {
storage.setItem('notifications', JSON.stringify([{
storage.setItem(NotificationHistoryComponent.NOTIFICATION_STORAGE, JSON.stringify([{
messages: ['My new message'],
datetime: new Date(),
type: NOTIFICATION_TYPE.RECURSIVE

17
lib/core/notifications/components/notification-history.component.ts
View File

@@ -32,6 +32,7 @@ import { Pagination } from '@alfresco/js-api';
export class NotificationHistoryComponent implements OnDestroy, OnInit, AfterViewInit {
public static MAX_NOTIFICATION_STACK_LENGTH = 100;
public static NOTIFICATION_STORAGE = 'notification-history';
@ViewChild(MatMenuTrigger, { static: true })
trigger: MatMenuTrigger;
@@ -61,16 +62,16 @@ export class NotificationHistoryComponent implements OnDestroy, OnInit, AfterVie
}
ngOnInit() {
this.notifications = JSON.parse(this.storageService.getItem('notifications')) || [];
this.notifications = JSON.parse(this.storageService.getItem(NotificationHistoryComponent.NOTIFICATION_STORAGE)) || [];
}
ngAfterViewInit(): void {
this.notificationService.notifications$
.pipe(takeUntil(this.onDestroy$))
.subscribe((notification: NotificationModel) => {
this.addNewNotification(notification);
this.cd.detectChanges();
});
.pipe(takeUntil(this.onDestroy$))
.subscribe((notification: NotificationModel) => {
this.addNewNotification(notification);
this.cd.detectChanges();
});
}
ngOnDestroy() {
@@ -90,7 +91,7 @@ export class NotificationHistoryComponent implements OnDestroy, OnInit, AfterVie
}
saveNotifications() {
this.storageService.setItem('notifications', JSON.stringify(this.notifications.filter((notification) =>
this.storageService.setItem(NotificationHistoryComponent.NOTIFICATION_STORAGE, JSON.stringify(this.notifications.filter((notification) =>
notification.type !== NOTIFICATION_TYPE.RECURSIVE
)));
}
@@ -112,7 +113,7 @@ export class NotificationHistoryComponent implements OnDestroy, OnInit, AfterVie
markAsRead() {
this.notifications = [];
this.paginatedNotifications = [];
this.storageService.removeItem('notifications');
this.storageService.removeItem(NotificationHistoryComponent.NOTIFICATION_STORAGE);
this.createPagination();
this.trigger.closeMenu();
}