fix: counter update on preservation space tab

src/app/features/preservation-space/components/routables/preservation-space-home/preservation-space-home.routable.ts

@@ -9,16 +9,18 @@ import {
   RoutesEnum,
 } from "@app/shared/enums/routes.enum";
 import {LocalStateModel} from "@app/shared/models/local-state.model";
+import {AppNotificationInboxState} from "@app/stores/notification-inbox/app-notification-inbox.state";
 import {Enums} from "@enums";
 import {Navigate} from "@ngxs/router-plugin";
 import {Store} from "@ngxs/store";
 import {Tab} from "@shared/components/containers/shared-tabs/shared-tabs.container";
 import {DataTestEnum} from "@shared/enums/data-test.enum";
 import {IconNameEnum} from "@shared/enums/icon-name.enum";
-import {SessionStorageEnum} from "@shared/enums/session-storage.enum";
-import {SessionStorageHelper} from "@shared/helpers/session-storage.helper";
 import {Observable} from "rxjs";
-import {MARK_AS_TRANSLATABLE} from "solidify-frontend";
+import {
+  MARK_AS_TRANSLATABLE,
+  MemoizedUtil,
+} from "solidify-frontend";
 
 @Component({
   selector: "dlcm-preservation-space-home-routable",
@@ -63,7 +65,7 @@ export class PreservationSpaceHomeRoutable extends SharedAbstractPresentational
       titleToTranslate: MARK_AS_TRANSLATABLE("preservationSpace.notificationInbox.home.title"),
       suffixUrl: PreservationSpaceRoutesEnum.notificationInbox,
       route: () => [...this.rootUrl, PreservationSpaceRoutesEnum.notificationInbox],
-      numberNew: () => SessionStorageHelper.getListItem(SessionStorageEnum.notificationInboxPending).length,
+      numberNew: () => MemoizedUtil.total(this.store, AppNotificationInboxState),
       dataTest: DataTestEnum.preservationSpaceTabRequestReceived,
     },
     {

src/app/features/preservation-space/notification/stores/preservation-space-notification.state.ts

@@ -8,6 +8,7 @@ import {
   PreservationSpaceNotificationStatusHistoryState,
   PreservationSpaceNotificationStatusHistoryStateModel,
 } from "@app/features/preservation-space/notification/stores/status-history/preservation-space-notification-status-history.state";
+import {AppAction} from "@app/stores/app.action";
 import {Enums} from "@enums";
 import {NotificationDlcm} from "@models";
 import {Navigate} from "@ngxs/router-plugin";
@@ -247,6 +248,7 @@ export class PreservationSpaceNotificationState extends ResourceState<Preservati
       this.notificationService.showSuccess(MARK_AS_TRANSLATABLE("preservationSpace.notifications.setRead.success"));
     }
     SessionStorageHelper.removeItemInList(SessionStorageEnum.notificationInboxPending, (action.parentAction as PreservationSpaceNotificationAction.SetProcessed).notificationId);
+    this.store.dispatch(new AppAction.UpdateNotificationInbox);
   }
 
   @Action(PreservationSpaceNotificationAction.SetProcessedFail)
@@ -276,6 +278,7 @@ export class PreservationSpaceNotificationState extends ResourceState<Preservati
     this.removeNotificationPendingListAndRefresh(ctx, (action.parentAction as PreservationSpaceNotificationAction.SetRefuse).notificationId, (action.parentAction as PreservationSpaceNotificationAction.SetRefuse).mode);
     this.notificationService.showSuccess(MARK_AS_TRANSLATABLE("preservationSpace.notifications.setRefuse.success"));
     SessionStorageHelper.removeItemInList(SessionStorageEnum.notificationInboxPending, (action.parentAction as PreservationSpaceNotificationAction.SetRefuse).notificationId);
+    this.store.dispatch(new AppAction.UpdateNotificationInbox);
   }
 
   @Action(PreservationSpaceNotificationAction.SetRefuseFail)
@@ -305,6 +308,7 @@ export class PreservationSpaceNotificationState extends ResourceState<Preservati
       this.notificationService.showSuccess(MARK_AS_TRANSLATABLE("preservationSpace.notifications.setUnread.success"));
     }
     SessionStorageHelper.addItemInList(SessionStorageEnum.notificationInboxPending, (action.parentAction as PreservationSpaceNotificationAction.SetPending).notificationId);
+    this.store.dispatch(new AppAction.UpdateNotificationInbox);
   }
 
   private removeNotificationPendingListAndRefresh(ctx: StateContext<PreservationSpaceNotificationStateModel>,

src/app/shared/components/containers/shared-tabs/shared-tabs.container.html

@@ -18,11 +18,11 @@
     >
     </dlcm-shared-icon>
     <span class="label"
-          [matBadge]="(tab.numberNew | isNullOrUndefined) || tab.numberNew()"
+          [matBadge]="(tab.numberNew | isNullOrUndefined) || (tab.numberNew() | solidifyAsync)"
           matBadgeColor="primary"
           matBadgeSize="small"
           matBadgeOverlap="false"
-          [matBadgeHidden]="(tab.numberNew | isNullOrUndefined) || tab.numberNew() === 0"
+          [matBadgeHidden]="(tab.numberNew | isNullOrUndefined) || (tab.numberNew() | solidifyAsync) === 0"
     >{{tab.titleToTranslate | translate}}</span>
   </li>
 </ul>

src/app/shared/components/containers/shared-tabs/shared-tabs.container.ts

@@ -16,6 +16,7 @@ import {Store} from "@ngxs/store";
 import {SharedAbstractContainer} from "@shared/components/containers/shared-abstract/shared-abstract.container";
 import {DataTestEnum} from "@shared/enums/data-test.enum";
 import {IconNameEnum} from "@shared/enums/icon-name.enum";
+import {ObservableOrPromiseOrValue} from "@shared/models/extra-button-toolbar.model";
 import {
   BehaviorSubject,
   Observable,
@@ -141,6 +142,6 @@ export interface Tab {
   titleToTranslate: string;
   conditionDisplay?: () => boolean | Observable<boolean> | undefined;
   route?: () => string | string[];
-  numberNew?: () => number;
+  numberNew?: () => ObservableOrPromiseOrValue<number>;
   dataTest?: DataTestEnum;
 }

src/app/stores/app.action.ts

@@ -98,6 +98,10 @@ export namespace AppAction {
     static readonly type: string = `[${state}] Start Polling Notification`;
   }
 
+  export class UpdateNotificationInbox {
+    static readonly type: string = `[${state}] Update Notification Inbox`;
+  }
+
   export class Login extends BaseAction {
     static readonly type: string = `[${state}] Login`;
   }

src/app/stores/app.state.ts

@@ -418,47 +418,56 @@ export class AppState extends BasicState<AppStateModel> {
 
   @Action(AppAction.StartPollingNotification)
   startPollingNotification(ctx: StateContext<AppStateModel>, action: AppAction.StartPollingNotification): void {
+    if (ctx.getState().isLoggedIn) {
+      this.store.dispatch(new AppAction.UpdateNotificationInbox);
+    }
+
     PollingHelper.startPollingObs({
       intervalRefreshInSecond: environment.refreshNotificationInboxAvailableIntervalInSecond,
       filter: () => ctx.getState().isLoggedIn,
       actionToDo: () => {
-        const queryParameters = new QueryParameters(environment.maximalPageSizeToRetrievePaginationInfo);
-        const searchItems = queryParameters.search.searchItems;
-        const NOTIFICATION_STATUS: keyof NotificationDlcm = "notificationStatus";
-        MappingObjectUtil.set(searchItems, NOTIFICATION_STATUS, Enums.Notification.StatusEnum.PENDING);
-
-        this._actions$.pipe(
-          ofActionCompleted(AppNotificationInboxAction.GetAllSuccess),
-          take(1),
-          tap(result => {
-            if (!result.result.successful) {
-              return;
-            }
-            const actionSuccess = (result.action as AppNotificationInboxAction.GetAllSuccess);
-            const listNewNotificationInboxPending = actionSuccess.list._data.map(newNotification => newNotification.resId);
-            const listOldNotificationInboxPending = SessionStorageHelper.getListItem(SessionStorageEnum.notificationInboxPending);
-            let counterNewNotification = 0;
-            listNewNotificationInboxPending.forEach(newNotificationId => {
-              if (!listOldNotificationInboxPending.includes(newNotificationId)) {
-                counterNewNotification++;
-              }
-            });
-            if (counterNewNotification > 0) {
-              const actionNotification = {
-                text: MARK_AS_TRANSLATABLE("app.notification.action.see"),
-                callback: () => this.store.dispatch(new Navigate([RoutesEnum.preservationSpaceNotificationInbox])),
-              };
-              this.notificationService.showSuccess(MARK_AS_TRANSLATABLE("app.notification.notificationInbox.newIncoming"), {"number": counterNewNotification}, actionNotification);
-            }
-            SessionStorageHelper.initItemInList(SessionStorageEnum.notificationInboxPending, listNewNotificationInboxPending);
-          }),
-        ).subscribe();
-
-        this.store.dispatch(new AppNotificationInboxAction.GetAll(queryParameters));
+        this.store.dispatch(new AppAction.UpdateNotificationInbox);
       },
     }).subscribe();
   }
 
+  @Action(AppAction.UpdateNotificationInbox)
+  updateNotificationInbox(ctx: StateContext<AppStateModel>, action: AppAction.UpdateNotificationInbox): void {
+    const queryParameters = new QueryParameters(environment.maximalPageSizeToRetrievePaginationInfo);
+    const searchItems = queryParameters.search.searchItems;
+    const NOTIFICATION_STATUS: keyof NotificationDlcm = "notificationStatus";
+    MappingObjectUtil.set(searchItems, NOTIFICATION_STATUS, Enums.Notification.StatusEnum.PENDING);
+
+    this._actions$.pipe(
+      ofActionCompleted(AppNotificationInboxAction.GetAllSuccess),
+      take(1),
+      tap(result => {
+        if (!result.result.successful) {
+          return;
+        }
+        const actionSuccess = (result.action as AppNotificationInboxAction.GetAllSuccess);
+        const listNewNotificationInboxPending = actionSuccess.list._data.map(newNotification => newNotification.resId);
+        const listOldNotificationInboxPending = SessionStorageHelper.getListItem(SessionStorageEnum.notificationInboxPending);
+        let counterNewNotification = 0;
+        listNewNotificationInboxPending.forEach(newNotificationId => {
+          if (!listOldNotificationInboxPending.includes(newNotificationId)) {
+            counterNewNotification++;
+          }
+        });
+        if (counterNewNotification > 0) {
+          const actionNotification = {
+            text: MARK_AS_TRANSLATABLE("app.notification.action.see"),
+            callback: () => this.store.dispatch(new Navigate([RoutesEnum.preservationSpaceNotificationInbox])),
+          };
+          this.notificationService.showSuccess(MARK_AS_TRANSLATABLE("app.notification.notificationInbox.newIncoming"), {"number": counterNewNotification}, actionNotification);
+        }
+        SessionStorageHelper.initItemInList(SessionStorageEnum.notificationInboxPending, listNewNotificationInboxPending);
+      }),
+    ).subscribe();
+
+    this.store.dispatch(new AppNotificationInboxAction.GetAll(queryParameters));
+  }
+
   @Action(AppAction.Login)
   login(ctx: StateContext<AppStateModel>, action: AppAction.Login): Observable<boolean> {
     return this.oauthService.tryLogin()

src/app/stores/notification-inbox/app-notification-inbox.state.ts

@@ -2,10 +2,7 @@ import {Injectable} from "@angular/core";
 import {AdminResourceApiEnum} from "@app/shared/enums/api.enum";
 import {LocalStateEnum} from "@app/shared/enums/local-state.enum";
 import {appNotificationInboxActionNameSpace} from "@app/stores/notification-inbox/app-notification-inbox.action";
-import {
-  NotificationDlcm,
-  Person,
-} from "@models";
+import {NotificationDlcm} from "@models";
 import {
   Actions,
   State,
@@ -32,7 +29,7 @@ export interface AppNotificationInboxStateModel extends ResourceStateModel<Notif
     queryParameters: new QueryParameters(environment.defaultEnumValuePageSizeOption),
   },
 })
-export class AppNotificationInboxState extends ResourceState<AppNotificationInboxStateModel, Person> {
+export class AppNotificationInboxState extends ResourceState<AppNotificationInboxStateModel, NotificationDlcm> {
   constructor(protected apiService: ApiService,
               protected store: Store,
               protected notificationService: NotificationService,