merge CST-5337

Author: FrancescoMolinaro

src/app/admin/admin-notifications/admin-notifications-routing.module.ts

@@ -11,9 +11,11 @@ import { AdminQualityAssuranceTopicsPageResolver } from './admin-quality-assuran
 import { AdminQualityAssuranceEventsPageResolver } from './admin-quality-assurance-events-page/admin-quality-assurance-events-page.resolver';
 import { AdminQualityAssuranceSourcePageComponent } from './admin-quality-assurance-source-page-component/admin-quality-assurance-source-page.component';
 import { AdminQualityAssuranceSourcePageResolver } from './admin-quality-assurance-source-page-component/admin-quality-assurance-source-page-resolver.service';
-import { SourceDataResolver } from './admin-quality-assurance-source-page-component/admin-quality-assurance-source-data.reslover';
 import {QualityAssuranceBreadcrumbResolver} from '../../core/breadcrumbs/quality-assurance-breadcrumb.resolver';
 import {QualityAssuranceBreadcrumbService} from '../../core/breadcrumbs/quality-assurance-breadcrumb.service';
+import {
+  SourceDataResolver
+} from "./admin-quality-assurance-source-page-component/admin-quality-assurance-source-data.resolver";
 
 @NgModule({
   imports: [

src/app/admin/admin-notifications/admin-notifications.module.ts

@@ -6,15 +6,15 @@ import { AdminNotificationsRoutingModule } from './admin-notifications-routing.m
 import { AdminQualityAssuranceTopicsPageComponent } from './admin-quality-assurance-topics-page/admin-quality-assurance-topics-page.component';
 import { AdminQualityAssuranceEventsPageComponent } from './admin-quality-assurance-events-page/admin-quality-assurance-events-page.component';
 import { AdminQualityAssuranceSourcePageComponent } from './admin-quality-assurance-source-page-component/admin-quality-assurance-source-page.component';
-import {SuggestionNotificationsModule} from '../../suggestion-notifications/suggestion-notifications.module';
+import {NotificationsModule} from '../../notifications/notifications.module';
 
 @NgModule({
   imports: [
     CommonModule,
     SharedModule,
     CoreModule.forRoot(),
     AdminNotificationsRoutingModule,
-    SuggestionNotificationsModule
+    NotificationsModule
   ],
   declarations: [
     AdminQualityAssuranceTopicsPageComponent,

…uality-assurance-source-data.reslover.ts …uality-assurance-source-data.resolver.tssrc/app/admin/admin-notifications/admin-quality-assurance-source-page-component/admin-quality-assurance-source-data.reslover.ts renamed to src/app/admin/admin-notifications/admin-quality-assurance-source-page-component/admin-quality-assurance-source-data.resolver.ts src/app/admin/admin-notifications/admin-quality-assurance-source-page-component/admin-quality-assurance-source-data.reslover.ts renamed to src/app/admin/admin-notifications/admin-quality-assurance-source-page-component/admin-quality-assurance-source-data.resolver.ts

@@ -3,13 +3,15 @@ import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot, Router } from '@a
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { QualityAssuranceSourceObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-source.model';
-import { QualityAssuranceSourceService } from '../../../suggestion-notifications/qa/source/quality-assurance-source.service';
+import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceSourceService } from '../../../notifications/qa/source/quality-assurance-source.service';
+import {environment} from '../../../../environments/environment';
 /**
  * This class represents a resolver that retrieve the route data before the route is activated.
  */
 @Injectable()
 export class SourceDataResolver implements Resolve<Observable<QualityAssuranceSourceObject[]>> {
+  private  pageSize = environment.qualityAssuranceConfig.pageSize;
   /**
    * Initialize the effect class variables.
    * @param {QualityAssuranceSourceService} qualityAssuranceSourceService
@@ -25,7 +27,7 @@ export class SourceDataResolver implements Resolve<Observable<QualityAssuranceSo
    * @returns Observable<QualityAssuranceSourceObject[]>
    */
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<QualityAssuranceSourceObject[]> {
-    return this.qualityAssuranceSourceService.getSources(5,0).pipe(
+    return this.qualityAssuranceSourceService.getSources(this.pageSize, 0).pipe(
         map((sources: PaginatedList<QualityAssuranceSourceObject>) => {
           if (sources.page.length === 1) {
              this.router.navigate([this.getResolvedUrl(route) + '/' + sources.page[0].id]);

src/app/core/breadcrumbs/quality-assurance-breadcrumb.service.ts

@@ -5,9 +5,8 @@ import { Injectable } from '@angular/core';
 import {map} from 'rxjs/operators';
 import {getFirstCompletedRemoteData} from '../shared/operators';
 import {TranslateService} from '@ngx-translate/core';
-import {
-  QualityAssuranceTopicDataService
-} from '../suggestion-notifications/qa/topics/quality-assurance-topic-data.service';
+import {QualityAssuranceTopicDataService} from "../notifications/qa/topics/quality-assurance-topic-data.service";
+
 
 
 /**
@@ -42,7 +41,7 @@ export class QualityAssuranceBreadcrumbService implements BreadcrumbsProviderSer
         map((topic) => {
             return [new Breadcrumb(this.translationService.instant(this.QUALITY_ASSURANCE_BREADCRUMB_KEY), url),
               new Breadcrumb(sourceId, `${url}${sourceId}`),
-              new Breadcrumb(topic.payload.name, undefined)];
+              new Breadcrumb(topicId, undefined)];
         })
       );
     } else {

src/app/core/core.module.ts

@@ -157,9 +157,9 @@ import { SequenceService } from './shared/sequence.service';
 import { CoreState } from './core-state.model';
 import { GroupDataService } from './eperson/group-data.service';
 import { SubmissionAccessesModel } from './config/models/config-submission-accesses.model';
-import { QualityAssuranceTopicObject } from './suggestion-notifications/qa/models/quality-assurance-topic.model';
-import { QualityAssuranceEventObject } from './suggestion-notifications/qa/models/quality-assurance-event.model';
-import { QualityAssuranceSourceObject } from './suggestion-notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceTopicObject } from './notifications/qa/models/quality-assurance-topic.model';
+import { QualityAssuranceEventObject } from './notifications/qa/models/quality-assurance-event.model';
+import { QualityAssuranceSourceObject } from './notifications/qa/models/quality-assurance-source.model';
 import { RatingAdvancedWorkflowInfo } from './tasks/models/rating-advanced-workflow-info.model';
 import { AdvancedWorkflowInfo } from './tasks/models/advanced-workflow-info.model';
 import { SelectReviewerAdvancedWorkflowInfo } from './tasks/models/select-reviewer-advanced-workflow-info.model';

src/app/core/data/feature-authorization/feature-id.ts

@@ -34,4 +34,5 @@ export enum FeatureID {
   CanEditItem = 'canEditItem',
   CanRegisterDOI = 'canRegisterDOI',
   CanSubscribe = 'canSubscribeDso',
+  CanSeeQA = 'canSeeQA'
 }

…ity-assurance-event-data.service.spec.ts …ity-assurance-event-data.service.spec.tssrc/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.spec.ts renamed to src/app/core/notifications/qa/events/quality-assurance-event-data.service.spec.ts src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.spec.ts renamed to src/app/core/notifications/qa/events/quality-assurance-event-data.service.spec.ts

@@ -22,7 +22,7 @@ export interface QualityAssuranceEventMessageObject {
 /**
  * The interface representing the Quality Assurance event message
  */
-export interface OpenaireQualityAssuranceEventMessageObject {
+export interface SourceQualityAssuranceEventMessageObject {
   /**
    * The type of 'value'
    */
@@ -69,9 +69,9 @@ export interface OpenaireQualityAssuranceEventMessageObject {
   title: string;
 
   /**
-   * The OPENAIRE ID.
+   * The Source ID.
    */
-  openaireId: string;
+  sourceId: string;
 
   /**
    * The PID href.
@@ -136,7 +136,7 @@ export class QualityAssuranceEventObject implements CacheableObject {
    * The suggestion data. Data may vary depending on the source
    */
   @autoserialize
-  message: OpenaireQualityAssuranceEventMessageObject;
+  message: SourceQualityAssuranceEventMessageObject;
 
   /**
    * The type of this ConfigObject