Merged in CSTPER-701-improveSuggestionNotifications (pull request #30)

Suggestions improvements picked from perucris

Approved-by: Giuseppe Digilio

Author: alemarte

src/app/openaire/reciter-suggestions/suggestion-actions/suggestion-actions.component.html

@@ -1,16 +1,23 @@
 <div class="d-inline">
   <div ngbDropdown class="d-inline">
-    <button class="btn btn-success" id="dropdownSubmission" ngbDropdownToggle
-            type="button">
+    <button *ngIf="isCollectionFixed; else chooseCollection" class="btn btn-success" type="button" (click)="approveAndImportCollectionFixed()">
       <i class="fa fa-check" aria-hidden="true"></i> {{ approveAndImportLabel() | translate}}
-      <span class="caret"></span>
     </button>
-    <div ngbDropdownMenu
-         class="dropdown-menu"
-         id="entityControlsDropdownMenu"
-         aria-labelledby="dropdownSubmission">
-      <ds-entity-dropdown (selectionChange)="openDialog($event)"></ds-entity-dropdown>
-    </div>
+    <ng-template #chooseCollection>
+      <button class="btn btn-success" id="dropdownSubmission" ngbDropdownToggle
+              type="button">
+        <i class="fa fa-check" aria-hidden="true"></i> {{ approveAndImportLabel() | translate}}
+        <span class="caret"></span>
+      </button>
+
+      <div ngbDropdownMenu
+           class="dropdown-menu"
+           id="entityControlsDropdownMenu"
+           aria-labelledby="dropdownSubmission">
+        <ds-entity-dropdown (selectionChange)="openDialog($event)"></ds-entity-dropdown>
+      </div>
+    </ng-template>
+
   </div>
   <button (click)="notMine()" class="btn btn-danger ml-2"><i class="fa fa-ban"></i>
     {{ notMineLabel() | translate}}</button>

src/app/openaire/reciter-suggestions/suggestion-actions/suggestion-actions.component.ts

@@ -18,9 +18,11 @@ export class SuggestionActionsComponent {
 
   @Input() isBulk = false;
 
-  @Input() public hasEvidence = false;
+  @Input() hasEvidence = false;
 
-  @Input() public seeEvidence = false;
+  @Input() seeEvidence = false;
+
+  @Input() isCollectionFixed = false;
 
   /**
    * The component is used to Delete suggestion
@@ -58,6 +60,14 @@ export class SuggestionActionsComponent {
       });
   }
 
+  approveAndImportCollectionFixed() {
+    this.approveAndImport.emit({
+      suggestion: this.isBulk ? undefined : this.object,
+      collectionId: null
+    });
+  }
+
+
   /**
    * Delete the suggestion
    */

src/app/openaire/reciter-suggestions/suggestion-list-element/suggestion-list-element.component.html

@@ -27,6 +27,7 @@
       <ds-suggestion-actions class="parent mt-2" [hasEvidence]="hasEvidences()"
                              [seeEvidence]="seeEvidence"
                              [object]="object"
+                             [isCollectionFixed]="isCollectionFixed"
                              (approveAndImport)="onApproveAndImport($event)"
                              (seeEvidences)="onSeeEvidences($event)"
                              (notMineClicked)="onNotMine($event)"

src/app/openaire/reciter-suggestions/suggestion-list-element/suggestion-list-element.component.ts

@@ -24,6 +24,8 @@ export class SuggestionListElementComponent implements OnInit {
 
   @Input() isSelected = false;
 
+  @Input() isCollectionFixed = false;
+
   public listableObject: any;
 
   public seeEvidence = false;

src/app/openaire/reciter-suggestions/suggestions-notification/suggestions-notification.component.html

@@ -1,6 +1,6 @@
 <ng-container *ngIf="(suggestionsRD$ | async) as suggestions">
   <ng-container *ngFor="let suggestion of suggestions" class="alert alert-info">
-    <div class="alert alert-success" *ngIf="suggestion.total > 0">
+    <div class="alert alert-success d-block" *ngIf="suggestion.total > 0">
       <div [innerHTML]="'mydspace.notification.suggestion.page' | translate: getNotificationSuggestionInterpolation(suggestion)">
       </div>
     </div>

src/app/openaire/reciter-suggestions/suggestions.service.ts

@@ -12,7 +12,7 @@ import { OpenaireSuggestionTarget } from '../../core/openaire/reciter-suggestion
 import { ResearcherProfileService } from '../../core/profile/researcher-profile.service';
 import { AuthService } from '../../core/auth/auth.service';
 import { EPerson } from '../../core/eperson/models/eperson.model';
-import { isNotEmpty } from '../../shared/empty.util';
+import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { ResearcherProfile } from '../../core/profile/model/researcher-profile.model';
 import {
   getAllSucceededRemoteDataPayload,
@@ -24,6 +24,9 @@ import { OpenaireSuggestion } from '../../core/openaire/reciter-suggestions/mode
 import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
 import { TranslateService } from '@ngx-translate/core';
 import { NoContent } from '../../core/shared/NoContent.model';
+import { environment } from '../../../environments/environment';
+import { SuggestionConfig } from '../../../config/layout-config.interfaces';
+import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
 
 export interface SuggestionBulkResult {
   success: number;
@@ -170,8 +173,10 @@ export class SuggestionsService {
    */
   public approveAndImport(workspaceitemService: WorkspaceitemDataService,
                           suggestion: OpenaireSuggestion,
-                          collectionId: string): Observable<string> {
-    return workspaceitemService.importExternalSourceEntry(suggestion.externalSourceUri, collectionId)
+                          collectionId: string): Observable<WorkspaceItem> {
+
+    const resolvedCollectionId = this.resolveCollectionId(suggestion, collectionId);
+    return workspaceitemService.importExternalSourceEntry(suggestion.externalSourceUri, resolvedCollectionId)
       .pipe(
         getFirstSucceededRemoteDataPayload(),
         catchError((error) => of(null))
@@ -200,7 +205,7 @@ export class SuggestionsService {
 
     return forkJoin(suggestions.map((suggestion: OpenaireSuggestion) =>
       this.approveAndImport(workspaceitemService, suggestion, collectionId)))
-      .pipe(map((results: string[]) => {
+      .pipe(map((results: WorkspaceItem[]) => {
         return {
           success: results.filter((result) => result != null).length,
           fails: results.filter((result) => result == null).length
@@ -240,10 +245,52 @@ export class SuggestionsService {
   public getNotificationSuggestionInterpolation(suggestionTarget: OpenaireSuggestionTarget): any {
     return {
       count: suggestionTarget.total,
-      source: this.translateService.instant('reciter.suggestion.source.' + suggestionTarget.source),
+      source: this.translateService.instant(this.translateSuggestionSource(suggestionTarget.source)),
+      type:  this.translateService.instant(this.translateSuggestionType(suggestionTarget.source)),
       suggestionId: suggestionTarget.id,
       displayName: suggestionTarget.display
     };
   }
 
+  public translateSuggestionType(source: string): string {
+    return 'reciter.suggestion.type.' + source;
+  }
+
+  public translateSuggestionSource(source: string): string {
+    return 'reciter.suggestion.source.' + source;
+  }
+
+  /**
+   * If the provided collectionId ha no value, tries to resolve it by suggestion source.
+   * @param suggestion
+   * @param collectionId
+   */
+  public resolveCollectionId(suggestion: OpenaireSuggestion, collectionId): string {
+    if (hasValue(collectionId)) {
+      return collectionId;
+    }
+    return environment.suggestion
+      .find((suggestionConf: SuggestionConfig) => suggestionConf.source === suggestion.source)
+      .collectionId;
+  }
+
+  /**
+   * Return true if all the suggestion are configured with the same fixed collection
+   * in the configuration.
+   * @param suggestions
+   */
+  public isCollectionFixed(suggestions: OpenaireSuggestion[]): boolean {
+    return this.getFixedCollectionIds(suggestions).length === 1;
+  }
+
+  private getFixedCollectionIds(suggestions: OpenaireSuggestion[]): string[] {
+    const collectionIds = {};
+    suggestions.forEach((suggestion: OpenaireSuggestion) => {
+      const conf = environment.suggestion.find((suggestionConf: SuggestionConfig) => suggestionConf.source === suggestion.source);
+      if (hasValue(conf)) {
+        collectionIds[conf.collectionId] = true;
+      }
+    });
+    return Object.keys(collectionIds);
+  }
 }

src/app/profile-page/profile-page.component.html

@@ -4,7 +4,10 @@ <h3 class="mb-4">{{'profile.head' | translate}}</h3>
     <div class="card mb-4">
       <div class="card-header">{{'profile.card.researcher' | translate}}</div>
       <div class="card-body">
-        <ds-profile-page-researcher-form [user]="user"></ds-profile-page-researcher-form>
+        <div class="mb-4">
+          <ds-profile-page-researcher-form [user]="user"></ds-profile-page-researcher-form>
+        </div>
+        <ds-suggestions-notification></ds-suggestions-notification>
       </div>
     </div>
     <div class="card mb-4">

src/app/profile-page/profile-page.module.ts

@@ -8,13 +8,15 @@ import { ProfilePageSecurityFormComponent } from './profile-page-security-form/p
 import { ProfilePageResearcherFormComponent } from './profile-page-researcher-form/profile-page-researcher-form.component';
 import { ThemedProfilePageComponent } from './themed-profile-page.component';
 import { UiSwitchModule } from 'ngx-ui-switch';
+import { OpenaireModule } from '../openaire/openaire.module';
 
 @NgModule({
   imports: [
     ProfilePageRoutingModule,
     CommonModule,
     SharedModule,
-    UiSwitchModule
+    UiSwitchModule,
+    OpenaireModule
   ],
   exports: [
     ProfilePageSecurityFormComponent

src/app/suggestions-page/suggestions-page.component.html

@@ -5,9 +5,10 @@
           <div *ngIf="suggestionsRD?.pageInfo?.totalElements > 0">
 
             <h2>
+              {{ translateSuggestionType() | translate }}
               {{'reciter.suggestion.suggestionFor' | translate}}
               <a target="_blank" [routerLink]="['/items', researcherUuid]">{{researcherName}}</a>
-              {{'reciter.suggestion.from.source' | translate}} {{ getSuggestionSourceLabel() | translate}}
+              {{'reciter.suggestion.from.source' | translate}} {{ translateSuggestionSource() | translate }}
             </h2>
 
             <div class="mb-3 mt-3">
@@ -16,6 +17,7 @@ <h2>
               <ds-suggestion-actions *ngIf="getSelectedSuggestionsCount() > 0"
                                       class="mt-2 ml-2"
                                      [isBulk]="true"
+                                     [isCollectionFixed]="isCollectionFixed(suggestionsRD.page)"
                                      (approveAndImport)="approveAndImportAllSelected($event)"
                                      (notMineClicked)="notMineAllSelected()"></ds-suggestion-actions>
               <i class='fas fa-circle-notch fa-spin' *ngIf="isBulkOperationPending"></i>
@@ -32,6 +34,7 @@ <h2>
                   <ds-suggestion-list-item
                     [object]="object"
                     [isSelected]="selectedSuggestions[object.id]"
+                    [isCollectionFixed]="isCollectionFixed([object])"
                     (notMineClicked)="notMine($event)"
                     (selected)="onSelected(object, $event)"
                     (approveAndImport)="approveAndImport($event)"></ds-suggestion-list-item>

src/app/suggestions-page/suggestions-page.component.ts

@@ -20,6 +20,7 @@ import { SuggestionTargetsStateService } from '../openaire/reciter-suggestions/s
 import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service';
 import { PaginationService } from '../core/pagination/pagination.service';
 import { FindListOptions } from '../core/data/request.models';
+import { WorkspaceItem } from '../core/submission/models/workspaceitem.model';
 
 @Component({
   selector: 'ds-suggestion-page',
@@ -59,10 +60,11 @@ export class SuggestionsPageComponent implements OnInit {
   targetRD$: Observable<RemoteData<OpenaireSuggestionTarget>>;
   targetId$: Observable<string>;
 
+  suggestionTarget: OpenaireSuggestionTarget;
   suggestionId: any;
+  suggestionSource: any;
   researcherName: any;
   researcherUuid: any;
-  suggestionSource: any;
 
   selectedSuggestions: { [id: string]: OpenaireSuggestion } = {};
   isBulkOperationPending = false;
@@ -93,6 +95,7 @@ export class SuggestionsPageComponent implements OnInit {
     this.targetRD$.pipe(
       getFirstSucceededRemoteDataPayload()
     ).subscribe((suggestionTarget: OpenaireSuggestionTarget) => {
+      this.suggestionTarget = suggestionTarget;
       this.suggestionId = suggestionTarget.id;
       this.researcherName = suggestionTarget.display;
       this.suggestionSource = suggestionTarget.source;
@@ -136,6 +139,15 @@ export class SuggestionsPageComponent implements OnInit {
       this.processing$.next(false);
       this.suggestionsRD$.next(results);
       this.suggestionService.clearSuggestionRequests();
+      // navigate to the mydspace if no suggestions remains
+
+      // if (results.totalElements === 0) {
+      //     const content = this.translateService.instant('reciter.suggestion.empty',
+      //       this.suggestionService.getNotificationSuggestionInterpolation(this.suggestionTarget));
+      //     this.notificationService.success('', content, {timeOut:0}, true);
+      // TODO if the target is not the current use route to the suggestion target page
+      //     this.router.navigate(['/mydspace']);
+      // }
     });
   }
 
@@ -181,9 +193,10 @@ export class SuggestionsPageComponent implements OnInit {
    */
   approveAndImport(event: SuggestionApproveAndImport) {
     this.suggestionService.approveAndImport(this.workspaceItemService, event.suggestion, event.collectionId)
-      .subscribe((response: any) => {
+      .subscribe((workspaceitem: WorkspaceItem) => {
+        const content = this.translateService.instant('reciter.suggestion.approveAndImport.success', { workspaceItemId: workspaceitem.id });
+        this.notificationService.success('', content, {timeOut:0}, true);
         this.suggestionTargetsStateService.dispatchRefreshUserSuggestionsAction();
-        this.notificationService.success(this.translateService.get('reciter.suggestion.approveAndImport.success'));
         this.updatePage();
       });
   }
@@ -248,8 +261,26 @@ export class SuggestionsPageComponent implements OnInit {
     return Object.keys(this.selectedSuggestions).length;
   }
 
-  getSuggestionSourceLabel(): string {
-    return 'reciter.suggestion.source.' + this.suggestionSource;
+  /**
+   * Return true if all the suggestion are configured with the same fixed collection in the configuration.
+   * @param suggestions
+   */
+  isCollectionFixed(suggestions: OpenaireSuggestion[]): boolean {
+    return this.suggestionService.isCollectionFixed(suggestions);
+  }
+
+  /**
+   * Label to be used to translate the suggestion source.
+   */
+  translateSuggestionSource() {
+    return this.suggestionService.translateSuggestionSource(this.suggestionSource);
+  }
+
+  /**
+   * Label to be used to translate the suggestion type.
+   */
+  translateSuggestionType() {
+    return this.suggestionService.translateSuggestionType(this.suggestionSource);
   }
 
 }