align to branch, update test

Author: FrancescoMolinaro

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

@@ -12,6 +12,8 @@ import { AdminQualityAssuranceEventsPageResolver } from './admin-quality-assuran
 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';
 
 @NgModule({
   imports: [
@@ -22,7 +24,7 @@ import { SourceDataResolver } from './admin-quality-assurance-source-page-compon
         component: AdminQualityAssuranceTopicsPageComponent,
         pathMatch: 'full',
         resolve: {
-          breadcrumb: I18nBreadcrumbResolver,
+          breadcrumb: QualityAssuranceBreadcrumbResolver,
           openaireQualityAssuranceTopicsParams: AdminQualityAssuranceTopicsPageResolver
         },
         data: {
@@ -53,7 +55,7 @@ import { SourceDataResolver } from './admin-quality-assurance-source-page-compon
         component: AdminQualityAssuranceEventsPageComponent,
         pathMatch: 'full',
         resolve: {
-          breadcrumb: I18nBreadcrumbResolver,
+          breadcrumb: QualityAssuranceBreadcrumbResolver,
           openaireQualityAssuranceEventsParams: AdminQualityAssuranceEventsPageResolver
         },
         data: {
@@ -70,7 +72,9 @@ import { SourceDataResolver } from './admin-quality-assurance-source-page-compon
     SourceDataResolver,
     AdminQualityAssuranceTopicsPageResolver,
     AdminQualityAssuranceEventsPageResolver,
-    AdminQualityAssuranceSourcePageResolver
+    AdminQualityAssuranceSourcePageResolver,
+    QualityAssuranceBreadcrumbResolver,
+    QualityAssuranceBreadcrumbService
   ]
 })
 /**

src/app/core/breadcrumbs/quality-assurance-breadcrumb.resolver.spec.ts

@@ -11,19 +11,19 @@ describe('QualityAssuranceBreadcrumbResolver', () => {
     beforeEach(() => {
       route = {
         paramMap: {
-          get: function () {
-            return this;
+          get: function (param) {
+            return this[param]
           },
           sourceId: 'testSourceId',
-          topicId: 'testSourceId:testTopicId'
+          topicId: 'testTopicId'
         }
       };
       qualityAssuranceBreadcrumbService = {};
       resolver = new QualityAssuranceBreadcrumbResolver(qualityAssuranceBreadcrumbService);
     });
 
     it('should resolve the breadcrumb config', () => {
-      const resolvedConfig = resolver.resolve(route, {url: fullPath} as any);
+      const resolvedConfig = resolver.resolve(route as any, {url: fullPath + 'testSourceId'} as any);
       const expectedConfig = { provider: qualityAssuranceBreadcrumbService, key: expectedKey, url: fullPath };
       expect(resolvedConfig).toEqual(expectedConfig);
     });

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

@@ -19,7 +19,11 @@ export class QualityAssuranceBreadcrumbResolver implements Resolve<BreadcrumbCon
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): BreadcrumbConfig<string> {
     const sourceId = route.paramMap.get('sourceId');
     const topicId = route.paramMap.get('topicId');
-    const key = topicId ?? sourceId;
+    let key = sourceId;
+
+    if (topicId) {
+      key += `:${topicId}`;
+    }
     const fullPath = state.url;
     const url = fullPath.substr(0, fullPath.indexOf(sourceId));
 

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

@@ -6,7 +6,9 @@ import {QualityAssuranceBreadcrumbService} from './quality-assurance-breadcrumb.
 describe('QualityAssuranceBreadcrumbService', () => {
   let service: QualityAssuranceBreadcrumbService;
   let dataService: any;
-  let translateService: any;
+  let translateService: any = {
+    instant: (str) => str,
+  };
 
   let exampleString;
   let exampleURL;

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

@@ -7,7 +7,7 @@ import {getFirstCompletedRemoteData} from '../shared/operators';
 import {TranslateService} from '@ngx-translate/core';
 import {
   QualityAssuranceTopicDataService
-} from "../suggestion-notifications/qa/topics/quality-assurance-topic-data.service";
+} from '../suggestion-notifications/qa/topics/quality-assurance-topic-data.service';
 
 
 /**
@@ -37,7 +37,7 @@ export class QualityAssuranceBreadcrumbService implements BreadcrumbsProviderSer
     const topicId = key.split(':')[1];
 
     if (topicId) {
-      return this.qualityAssuranceService.getTopic(`${sourceId}:${topicId}`).pipe(
+      return this.qualityAssuranceService.getTopic(topicId).pipe(
         getFirstCompletedRemoteData(),
         map((topic) => {
             return [new Breadcrumb(this.translationService.instant(this.QUALITY_ASSURANCE_BREADCRUMB_KEY), url),

src/app/suggestion-notifications/qa/events/quality-assurance-events.component.html

@@ -4,10 +4,6 @@
       <h2 class="border-bottom pb-2">
         <div class="d-flex justify-content-between">
           {{'notifications.events.title'| translate}}
-          <a class="btn btn-outline-secondary" [routerLink]="['/admin/notifications/quality-assurance']">
-            <i class="fas fa-angle-double-left"></i>
-            {{'quality-assurance.events.back' | translate}}
-          </a>
         </div>
       </h2>
       <ds-alert [type]="'alert-info'" [content]="'quality-assurance.events.description'"></ds-alert>