hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 18:14:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

119602: Compare notifications by id to correctly update store

Browse Source
This commit is contained in:
Andreas Awouters
2024-11-29 10:44:44 +01:00
parent c38352ed22
commit cdec4880d2
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/shared/notifications/notifications-board/notifications-board.component.ts
View File

@@ -10,7 +10,6 @@ import {
import { select, Store } from '@ngrx/store'; import { select, Store } from '@ngrx/store';
import { BehaviorSubject, Subscription, take } from 'rxjs'; import { BehaviorSubject, Subscription, take } from 'rxjs';
import difference from 'lodash/difference';
import { NotificationsService } from '../notifications.service'; import { NotificationsService } from '../notifications.service';
import { AppState } from '../../../app.reducer'; import { AppState } from '../../../app.reducer';
@@ -23,6 +22,7 @@ import {
AccessibilitySetting AccessibilitySetting
} from '../../../accessibility/accessibility-settings.service'; } from '../../../accessibility/accessibility-settings.service';
import cloneDeep from 'lodash/cloneDeep'; import cloneDeep from 'lodash/cloneDeep';
import differenceWith from 'lodash/differenceWith';
@Component({ @Component({
selector: 'ds-notifications-board', selector: 'ds-notifications-board',
@@ -69,13 +69,13 @@ export class NotificationsBoardComponent implements OnInit, OnDestroy {
this.notifications = []; this.notifications = [];
} else if (state.length > this.notifications.length) { } else if (state.length > this.notifications.length) {
// Add // Add
const newElem = difference(state, this.notifications); const newElem = differenceWith(state, this.notifications, this.byId);
newElem.forEach((notification) => { newElem.forEach((notification) => {
this.add(notification); this.add(notification);
}); });
} else { } else {
// Remove // Remove
const delElem = difference(this.notifications, state); const delElem = differenceWith(this.notifications, state, this.byId);
delElem.forEach((notification) => { delElem.forEach((notification) => {
this.notifications = this.notifications.filter((item: INotification) => item.id !== notification.id); this.notifications = this.notifications.filter((item: INotification) => item.id !== notification.id);
@@ -85,6 +85,9 @@ export class NotificationsBoardComponent implements OnInit, OnDestroy {
}); });
} }
private byId = (notificationA: INotification, notificationB: INotification) =>
notificationA.id === notificationB.id;
// Add the new notification to the notification array // Add the new notification to the notification array
add(item: INotification): void { add(item: INotification): void {
const toBlock: boolean = this.block(item); const toBlock: boolean = this.block(item);