Merged in bugfix/DSC-1208 (pull request DSpace#804)

[DSC-1208] SUPSI: End User Agreement shows acceptance hint box twice Approved-by: Andrea Barbasso
4Science · Sep 21, 2023 · 1432516 · 1432516
2 parents 411a425 + 85812a0
commit 1432516
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.ts b/src/app/info/end-user-agreement/end-user-agreement.component.ts
@@ -62,7 +62,7 @@ export class EndUserAgreementComponent implements OnInit, OnDestroy {
           if (authorized) {
 
             if (!accepted) {
-              this.notificationsService.warning(this.translate.instant('info.end-user-agreement.accept.warning'));
+              this.notificationsService.warning(this.translate.instant('info.end-user-agreement.accept.warning'), {});
             }
             this.accepted = accepted;
             this.alreadyAccepted = accepted;

diff --git a/src/app/shared/notifications/notifications-board/notifications-board.component.ts b/src/app/shared/notifications/notifications-board/notifications-board.component.ts
@@ -11,6 +11,7 @@ import {
 import { select, Store } from '@ngrx/store';
 import { BehaviorSubject, Subscription } from 'rxjs';
 import difference from 'lodash/difference';
+import isEqual from 'lodash/isEqual';
 
 import { NotificationsService } from '../notifications.service';
 import { AppState } from '../../../app.reducer';
@@ -132,11 +133,11 @@ export class NotificationsBoardComponent implements OnInit, OnDestroy {
   }
 
   private checkStandard(checker: INotification, item: INotification): boolean {
-    return checker.type === item.type && checker.title === item.title && checker.content === item.content;
+    return checker.type === item.type && checker.title === item.title && isEqual(checker.content, item.content);
   }
 
   private checkHtml(checker: INotification, item: INotification): boolean {
-    return checker.html ? checker.type === item.type && checker.title === item.title && checker.content === item.content && checker.html === item.html : false;
+    return checker.html ? checker.type === item.type && checker.title === item.title && isEqual(checker.content, item.content) && checker.html === item.html : false;
   }
 
   // Attach all the changes received in the options object