Merge remote-tracking branch '4Science-github/CST-5337' into CST-5249…

…_suggestion
DSpace · Jul 7, 2022 · de6b533 · de6b533
2 parents 63bba67 + 0942a1e
commit de6b533
Show file tree

Hide file tree

Showing 7 changed files with 112 additions and 99 deletions.
diff --git a/src/app/suggestion-notifications/qa/events/quality-assurance-events.component.html b/src/app/suggestion-notifications/qa/events/quality-assurance-events.component.html
@@ -91,7 +91,7 @@ <h3 class="border-bottom pb-2">
                     <hr>
                     <div>
                       {{(eventElement.hasProject ? 'quality-assurance.event.project.found' : 'quality-assurance.event.project.notFound') | translate}}
-                      <a target="_blank" *ngIf="eventElement.hasProject" title="{{eventElement.projectTitle}}" [routerLink]="['/items', eventElement.projectId]">{{eventElement.handle}}</a>
+                      <a target="_blank" *ngIf="eventElement.hasProject" title="{{eventElement.projectTitle}}" [routerLink]="['/items', eventElement.projectId]">{{eventElement.handle}} </a>
                       <div class="btn-group">
                         <button class="btn btn-outline-primary btn-sm"
                                 [disabled]="eventElement.isRunning"
@@ -108,25 +108,36 @@ <h3 class="border-bottom pb-2">
                     </div>
                   </td>
                   <td>
-                    <div class="btn-group-vertical button-width">
+                    <div class="btn-group button-width">
                       <button *ngIf="showTopic.indexOf('/PROJECT') !== -1"
                               class="btn btn-outline-success btn-sm button-width"
+                              ngbTooltip="{{'quality-assurance.event.action.import' | translate}}"
+                              container="body"
                               [disabled]="eventElement.isRunning"
                               (click)="modalChoice('ACCEPTED', eventElement, acceptModal)">
                         <i class="fas fa-check"></i>
-                        <span class="d-none d-sm-inline">{{'quality-assurance.event.action.import' | translate}}</span>
                       </button>
-                      <button *ngIf="showTopic.indexOf('/PROJECT') == -1" class="btn btn-outline-success btn-sm button-width" [disabled]="eventElement.isRunning" (click)="executeAction('ACCEPTED', eventElement)">
+                      <button *ngIf="showTopic.indexOf('/PROJECT') == -1"
+                              class="btn btn-outline-success btn-sm button-width"
+                              ngbTooltip="{{'quality-assurance.event.action.accept' | translate}}"
+                              container="body"
+                              [disabled]="eventElement.isRunning"
+                              (click)="executeAction('ACCEPTED', eventElement)">
                         <i class="fas fa-check"></i>
-                        <span class="d-none d-sm-inline">{{'quality-assurance.event.action.accept' | translate}}</span>
                       </button>
-                      <button class="btn btn-outline-dark btn-sm button-width" [disabled]="eventElement.isRunning" (click)="openModal('DISCARDED', eventElement, ignoreModal)">
-                        <i class="fas fa-trash-alt"></i>
-                        <span class="d-none d-sm-inline">{{'quality-assurance.event.action.ignore' | translate}}</span>
+                      <button class="btn btn-outline-dark btn-sm button-width"
+                              ngbTooltip="{{'quality-assurance.event.action.ignore' | translate}}"
+                              container="body"
+                              [disabled]="eventElement.isRunning"
+                              (click)="openModal('DISCARDED', eventElement, ignoreModal)">
+                        <i class="fas fa-ban"></i>
                       </button>
-                      <button class="btn btn-outline-danger btn-sm button-width" [disabled]="eventElement.isRunning" (click)="openModal('REJECTED', eventElement, rejectModal)">
+                      <button class="btn btn-outline-danger btn-sm button-width"
+                              ngbTooltip="{{'quality-assurance.event.action.reject' | translate}}"
+                              container="body"
+                              [disabled]="eventElement.isRunning"
+                              (click)="openModal('REJECTED', eventElement, rejectModal)">
                         <i class="fas fa-trash-alt"></i>
-                        <span class="d-none d-sm-inline">{{'quality-assurance.event.action.reject' | translate}}</span>
                       </button>
                     </div>
                   </td>
@@ -155,13 +166,13 @@ <h4 class="modal-title" id="acceptModal">{{'quality-assurance.event.sure' | tran
   <div class="modal-body">
     <p>{{'quality-assurance.event.accept.description' | translate}}</p>
 
-    <button class="btn btn-outline-success float-left" (click)="modal.close('do')">
+    <button class="btn btn-outline-success float-right" (click)="modal.close('do')">
       <i class="fas fa-check"></i>
-      <span class="d-none d-sm-inline">{{'quality-assurance.event.action.import' | translate}}</span>
+      <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.import' | translate}}</span>
     </button>
-    <button class="btn btn-outline-secondary float-right" (click)="modal.close('cancel')">
+    <button class="btn btn-outline-secondary" (click)="modal.close('cancel')">
       <i class="fas fa-close"></i>
-      <span class="d-none d-sm-inline">{{'quality-assurance.event.action.cancel' | translate}}</span>
+      <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.cancel' | translate}}</span>
     </button>
   </div>
 </ng-template>
@@ -172,16 +183,13 @@ <h4 class="modal-title" id="ignoreModal">{{'quality-assurance.event.sure' | tran
   </div>
   <div class="modal-body">
     <p>{{'quality-assurance.event.ignore.description' | translate}}</p>
-
-    <!-- textarea class="form-control mb-2" [(ngModel)]="selectedReason" placeholder="{{'quality-assurance.event.reason' |translate}}"></textarea -->
-
-    <button class="btn btn-outline-danger float-left" (click)="modal.close('do')">
+    <button class="btn btn-outline-danger float-right" (click)="modal.close('do')">
       <i class="fas fa-trash-alt"></i>
-      <span class="d-none d-sm-inline">{{'quality-assurance.event.action.ignore' | translate}}</span>
+      <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.ignore' | translate}}</span>
     </button>
-    <button class="btn btn-outline-secondary float-right" (click)="modal.close('cancel')">
+    <button class="btn btn-outline-secondary" (click)="modal.close('cancel')">
       <i class="fas fa-close"></i>
-      <span class="d-none d-sm-inline">{{'quality-assurance.event.action.cancel' | translate}}</span>
+      <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.cancel' | translate}}</span>
     </button>
   </div>
 </ng-template>
@@ -192,16 +200,13 @@ <h4 class="modal-title" id="rejectModal">{{'quality-assurance.event.sure' | tran
   </div>
   <div class="modal-body">
     <p>{{'quality-assurance.event.reject.description' | translate}}</p>
-
-    <!-- textarea class="form-control mb-2" [(ngModel)]="selectedReason" placeholder="{{'quality-assurance.event.reason' |translate}}"></textarea -->
-
-    <button class="btn btn-outline-danger float-left" (click)="modal.close('do')">
+    <button class="btn btn-outline-danger float-right" (click)="modal.close('do')">
       <i class="fas fa-trash-alt"></i>
-      <span class="d-none d-sm-inline">{{'quality-assurance.event.action.reject' | translate}}</span>
+      <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.reject' | translate}}</span>
     </button>
-    <button class="btn btn-outline-secondary float-right" (click)="modal.close('cancel')">
+    <button class="btn btn-outline-secondary" (click)="modal.close('cancel')">
       <i class="fas fa-close"></i>
-      <span class="d-none d-sm-inline">{{'quality-assurance.event.action.cancel' | translate}}</span>
+      <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.cancel' | translate}}</span>
     </button>
   </div>
 </ng-template>
diff --git a/src/app/suggestion-notifications/qa/events/quality-assurance-events.component.ts b/src/app/suggestion-notifications/qa/events/quality-assurance-events.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
@@ -10,25 +10,27 @@ import { SortDirection, SortOptions } from '../../../core/cache/models/sort-opti
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import {
-  QualityAssuranceEventObject,
-  OpenaireQualityAssuranceEventMessageObject
+  OpenaireQualityAssuranceEventMessageObject,
+  QualityAssuranceEventObject
 } from '../../../core/suggestion-notifications/qa/models/quality-assurance-event.model';
-import { QualityAssuranceEventRestService } from '../../../core/suggestion-notifications/qa/events/quality-assurance-event-rest.service';
+import {
+  QualityAssuranceEventRestService
+} from '../../../core/suggestion-notifications/qa/events/quality-assurance-event-rest.service';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 import { Metadata } from '../../../core/shared/metadata.utils';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
-import { hasValue } from '../../../shared/empty.util';
+import { hasValue, isEmpty } from '../../../shared/empty.util';
 import { ItemSearchResult } from '../../../shared/object-collection/shared/item-search-result.model';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import {
-  QualityAssuranceEventData,
-  ProjectEntryImportModalComponent
+  ProjectEntryImportModalComponent,
+  QualityAssuranceEventData
 } from '../project-entry-import-modal/project-entry-import-modal.component';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { combineLatest } from 'rxjs/internal/observable/combineLatest';
 import { Item } from '../../../core/shared/item.model';
-import {FindListOptions} from '../../../core/data/find-list-options.model';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
 
 /**
  * Component to display the Quality Assurance event list.
@@ -38,7 +40,7 @@ import {FindListOptions} from '../../../core/data/find-list-options.model';
   templateUrl: './quality-assurance-events.component.html',
   styleUrls: ['./quality-assurance-events.scomponent.scss'],
 })
-export class QualityAssuranceEventsComponent implements OnInit {
+export class QualityAssuranceEventsComponent implements OnInit, OnDestroy {
   /**
    * The pagination system configuration for HTML listing.
    * @type {PaginationComponentOptions}
@@ -376,47 +378,50 @@ export class QualityAssuranceEventsComponent implements OnInit {
    *    the Quality Assurance event item
    */
   protected setEventUpdated(events: QualityAssuranceEventObject[]): void {
-    this.subs.push(
-      from(events).pipe(
-        mergeMap((event: QualityAssuranceEventObject) => {
-          const related$ = event.related.pipe(
-            getFirstCompletedRemoteData(),
-          );
-          const target$ = event.target.pipe(
-            getFirstCompletedRemoteData()
-          );
-          return combineLatest([related$, target$]).pipe(
-            map(([relatedItemRD, targetItemRD]: [RemoteData<Item>, RemoteData<Item>]) => {
-              const data: QualityAssuranceEventData = {
-                event: event,
-                id: event.id,
-                title: event.title,
-                hasProject: false,
-                projectTitle: null,
-                projectId: null,
-                handle: null,
-                reason: null,
-                isRunning: false,
-                target: (targetItemRD?.hasSucceeded) ? targetItemRD.payload : null,
-              };
-              if (relatedItemRD?.hasSucceeded && relatedItemRD?.payload?.id) {
-                data.hasProject = true;
-                data.projectTitle = event.message.title;
-                data.projectId = relatedItemRD?.payload?.id;
-                data.handle = relatedItemRD?.payload?.handle;
-              }
-              return data;
-            })
-          );
-        }),
-        scan((acc: any, value: any) => [...acc, value], []),
-        take(events.length)
-      ).subscribe(
-        (eventsReduced) => {
-          this.eventsUpdated$.next(eventsReduced);
-        }
-      )
-    );
+    if (isEmpty(events)) {
+      this.eventsUpdated$.next([]);
+    } else {
+      this.subs.push(
+        from(events).pipe(
+          mergeMap((event: QualityAssuranceEventObject) => {
+            const related$ = event.related.pipe(
+              getFirstCompletedRemoteData(),
+            );
+            const target$ = event.target.pipe(
+              getFirstCompletedRemoteData()
+            );
+            return combineLatest([related$, target$]).pipe(
+              map(([relatedItemRD, targetItemRD]: [RemoteData<Item>, RemoteData<Item>]) => {
+                const data: QualityAssuranceEventData = {
+                  event: event,
+                  id: event.id,
+                  title: event.title,
+                  hasProject: false,
+                  projectTitle: null,
+                  projectId: null,
+                  handle: null,
+                  reason: null,
+                  isRunning: false,
+                  target: (targetItemRD?.hasSucceeded) ? targetItemRD.payload : null,
+                };
+                if (relatedItemRD?.hasSucceeded && relatedItemRD?.payload?.id) {
+                  data.hasProject = true;
+                  data.projectTitle = event.message.title;
+                  data.projectId = relatedItemRD?.payload?.id;
+                  data.handle = relatedItemRD?.payload?.handle;
+                }
+                return data;
+              })
+            );
+          }),
+          scan((acc: any, value: any) => [...acc, value], []),
+          take(events.length)
+        ).subscribe((eventsReduced) => {
+            this.eventsUpdated$.next(eventsReduced);
+          }
+        )
+      );
+    }
   }
 
   protected computePIDHref(event: OpenaireQualityAssuranceEventMessageObject) {

diff --git a/src/app/suggestion-notifications/reciter-suggestions/selectors.ts b/src/app/suggestion-notifications/reciter-suggestions/selectors.ts
@@ -10,7 +10,7 @@ import {subStateSelector} from '../../submission/selectors';
  * @param {AppState} state Top level state.
  * @return {SuggestionNotificationsState}
  */
-const _getReciterSuggestionTargetState = createFeatureSelector<SuggestionNotificationsState>('suggestion-notifications');
+const _getReciterSuggestionTargetState = createFeatureSelector<SuggestionNotificationsState>('suggestionNotifications');
 
 // Reciter Suggestion Targets
 // ----------------------------------------------------------------------------

diff --git a/src/app/suggestion-notifications/selectors.ts b/src/app/suggestion-notifications/selectors.ts
@@ -4,15 +4,17 @@ import { suggestionNotificationsSelector, SuggestionNotificationsState } from '.
 import { QualityAssuranceTopicObject } from '../core/suggestion-notifications/qa/models/quality-assurance-topic.model';
 import { QualityAssuranceTopicState } from './qa/topics/quality-assurance-topics.reducer';
 import { QualityAssuranceSourceState } from './qa/source/quality-assurance-source.reducer';
-import { QualityAssuranceSourceObject } from '../core/suggestion-notifications/qa/models/quality-assurance-source.model';
+import {
+  QualityAssuranceSourceObject
+} from '../core/suggestion-notifications/qa/models/quality-assurance-source.model';
 
 /**
  * Returns the Notifications state.
  * @function _getNotificationsState
  * @param {AppState} state Top level state.
  * @return {SuggestionNotificationsState}
  */
-const _getNotificationsState = createFeatureSelector<SuggestionNotificationsState>('suggestion-notifications');
+const _getNotificationsState = createFeatureSelector<SuggestionNotificationsState>('suggestionNotifications');
 
 // Quality Assurance topics
 // ----------------------------------------------------------------------------

diff --git a/src/app/suggestion-notifications/suggestion-notifications-state.service.spec.ts b/src/app/suggestion-notifications/suggestion-notifications-state.service.spec.ts
@@ -25,7 +25,7 @@ describe('NotificationsStateService', () => {
     function init(mode: string) {
       if (mode === 'empty') {
         initialState = {
-          notifications: {
+          suggestionNotifications: {
             qaTopic: {
               topics: [],
               processing: false,
@@ -39,7 +39,7 @@ describe('NotificationsStateService', () => {
         };
       } else {
         initialState = {
-          notifications: {
+          suggestionNotifications: {
             qaTopic: {
               topics: [
                 qualityAssuranceTopicObjectMorePid,
@@ -63,7 +63,7 @@ describe('NotificationsStateService', () => {
         init('empty');
         TestBed.configureTestingModule({
           imports: [
-            StoreModule.forRoot({ notifications: suggestionNotificationsReducers } as any),
+            StoreModule.forRoot({ suggestionNotifications: suggestionNotificationsReducers } as any),
           ],
           providers: [
             provideMockStore({ initialState }),
@@ -155,7 +155,7 @@ describe('NotificationsStateService', () => {
         init('full');
         TestBed.configureTestingModule({
           imports: [
-            StoreModule.forRoot({ notifications: suggestionNotificationsReducers } as any),
+            StoreModule.forRoot({ suggestionNotifications: suggestionNotificationsReducers } as any),
           ],
           providers: [
             provideMockStore({ initialState }),
@@ -251,7 +251,7 @@ describe('NotificationsStateService', () => {
         init('full');
         TestBed.configureTestingModule({
           imports: [
-            StoreModule.forRoot({ notifications: suggestionNotificationsReducers } as any),
+            StoreModule.forRoot({ suggestionNotifications: suggestionNotificationsReducers } as any),
           ],
           providers: [
             provideMockStore({ initialState }),
@@ -283,7 +283,7 @@ describe('NotificationsStateService', () => {
     function init(mode: string) {
       if (mode === 'empty') {
         initialState = {
-          notifications: {
+          suggestionNotifications: {
             qaSource: {
               source: [],
               processing: false,
@@ -297,7 +297,7 @@ describe('NotificationsStateService', () => {
         };
       } else {
         initialState = {
-          notifications: {
+          suggestionNotifications: {
             qaSource: {
               source: [
                 qualityAssuranceSourceObjectMorePid,
@@ -321,7 +321,7 @@ describe('NotificationsStateService', () => {
         init('empty');
         TestBed.configureTestingModule({
           imports: [
-            StoreModule.forRoot({ notifications: suggestionNotificationsReducers } as any),
+            StoreModule.forRoot({ suggestionNotifications: suggestionNotificationsReducers } as any),
           ],
           providers: [
             provideMockStore({ initialState }),
@@ -413,7 +413,7 @@ describe('NotificationsStateService', () => {
         init('full');
         TestBed.configureTestingModule({
           imports: [
-            StoreModule.forRoot({ notifications: suggestionNotificationsReducers } as any),
+            StoreModule.forRoot({ suggestionNotifications: suggestionNotificationsReducers } as any),
           ],
           providers: [
             provideMockStore({ initialState }),
@@ -509,7 +509,7 @@ describe('NotificationsStateService', () => {
         init('full');
         TestBed.configureTestingModule({
           imports: [
-            StoreModule.forRoot({ notifications: suggestionNotificationsReducers } as any),
+            StoreModule.forRoot({ suggestionNotifications: suggestionNotificationsReducers } as any),
           ],
           providers: [
             provideMockStore({ initialState }),