fix: proposal logbook sometimes show wrong content & message count no…

…t display (#1046)

* fix: proposal logbook show wrong content

* fix: total message count not display bug

* fix: test fail fix - permission specific issue

* fix: e2e test permission error fix

* fix: test 403 error fix

CI/ESS/e2e/.env.backend-next

@@ -27,3 +27,6 @@ RABBITMQ_PASSWORD="rabbitmq"
 REGISTER_DOI_URI="https://mds.test.datacite.org/doi"
 REGISTER_METADATA_URI="https://mds.test.datacite.org/metadata"
 SITE="ESS"
+ADMIN_GROUPS=admin,ingestor,archivemanager
+CREATE_DATASET_GROUPS=group1,group2,group3
+DELETE_GROUPS=archivemanager

src/app/proposals/view-proposal-page/view-proposal-page.component.ts

@@ -103,9 +103,7 @@ export class ViewProposalPageComponent implements OnInit, OnDestroy {
       this.vm$.subscribe((vm) => {
         if (vm.proposal) {
           this.proposal = vm.proposal;
-          this.store.dispatch(
-            fetchLogbookAction({ name: this.proposal.proposalId  })
-          );
+
         }
       })
     );
@@ -116,6 +114,9 @@ export class ViewProposalPageComponent implements OnInit, OnDestroy {
         this.store.dispatch(
           fetchProposalDatasetsAction({ proposalId: params.id })
         );
+        this.store.dispatch(
+          fetchLogbookAction({ name: params.id  })
+        );
       })
     );
 

src/app/state-management/actions/logbooks.actions.ts

@@ -39,7 +39,7 @@ export const clearLogbookAction = createAction("[Logbook] Clear Logbook");
 
 export const fetchCountAction = createAction(
   "[Logbook] Fetch Count",
-  props<{ name: string }>()
+  props<{ name?: string; pid?: string }>()
 );
 export const fetchCountCompleteAction = createAction(
   "[Logbook] Fetch Count Complete",

src/app/state-management/effects/logbooks.effects.ts

@@ -34,8 +34,8 @@ export class LogbookEffects {
     return this.actions$.pipe(
       ofType(fromActions.fetchLogbookAction),
       concatLatestFrom(() => this.filters$),
-      mergeMap(([{ name }, filters]) =>
-        this.logbookApi
+      mergeMap(([{ name }, filters]) =>{
+        return this.logbookApi
           .findByName(encodeURIComponent(name), JSON.stringify(filters))
           .pipe(
             timeout(3000),
@@ -44,7 +44,9 @@ export class LogbookEffects {
               fromActions.fetchCountAction({ name }),
             ]),
             catchError(() => of(fromActions.fetchLogbookFailedAction()))
-          )
+          );
+      }
+
       )
     );
   });
@@ -59,7 +61,8 @@ export class LogbookEffects {
           .pipe(
             timeout(3000),
             mergeMap((logbook) => [
-              fromActions.fetchLogbookCompleteAction({ logbook })
+              fromActions.fetchLogbookCompleteAction({ logbook }),
+              fromActions.fetchCountAction({ pid })
             ]),
             catchError(() => of(fromActions.fetchDatasetLogbookFailedAction()))
           )
@@ -71,15 +74,18 @@ export class LogbookEffects {
     return this.actions$.pipe(
       ofType(fromActions.fetchCountAction),
       concatLatestFrom(() => this.filters$),
-      mergeMap(([{ name }, filters]) => {
+      mergeMap(([{ name,pid }, filters]) => {
         const { skip, limit, sortField, ...theRest } = filters;
-        return this.logbookApi
-          .findByName(encodeURIComponent(name), JSON.stringify(theRest))
+        return (name ? this.logbookApi
+          .findByName(encodeURIComponent(name), JSON.stringify(theRest)) : this.logbookApi
+          .findDatasetLogbook(encodeURIComponent(pid), JSON.stringify(theRest)))
           .pipe(
-            map((logbook: Logbook) =>
-              fromActions.fetchCountCompleteAction({
+            map((logbook: Logbook) => {
+              return fromActions.fetchCountCompleteAction({
                 count: logbook.messages.length,
-              })
+              });
+            }
+
             ),
             catchError(() => of(fromActions.fetchCountFailedAction()))
           );