Merge pull request #4017 from 4Science/task/main/CST-18016

OpenAlex Integration

Author: tdonohue

src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component.html

@@ -1 +1 @@
-<ds-publication-claim [source]="'openaire'"></ds-publication-claim>
+<ds-suggestion-sources></ds-suggestion-sources>

src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component.spec.ts

@@ -6,8 +6,9 @@ import {
   waitForAsync,
 } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
+import { MockComponent } from 'ng-mocks';
 
-import { PublicationClaimComponent } from '../../../notifications/suggestion-targets/publication-claim/publication-claim.component';
+import { SuggestionSourcesComponent } from '../../../notifications/suggestions/sources/suggestion-sources.component';
 import { AdminNotificationsPublicationClaimPageComponent } from './admin-notifications-publication-claim-page.component';
 
 describe('AdminNotificationsPublicationClaimPageComponent', () => {
@@ -20,17 +21,10 @@ describe('AdminNotificationsPublicationClaimPageComponent', () => {
         CommonModule,
         TranslateModule.forRoot(),
         AdminNotificationsPublicationClaimPageComponent,
-      ],
-      providers: [
-        AdminNotificationsPublicationClaimPageComponent,
+        MockComponent(SuggestionSourcesComponent),
       ],
       schemas: [NO_ERRORS_SCHEMA],
-    }).overrideComponent(AdminNotificationsPublicationClaimPageComponent, {
-      remove: {
-        imports: [PublicationClaimComponent],
-      },
-    })
-      .compileComponents();
+    }).compileComponents();
   }));
 
   beforeEach(() => {

src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component.ts

@@ -1,14 +1,12 @@
 import { Component } from '@angular/core';
 
-import { PublicationClaimComponent } from '../../../notifications/suggestion-targets/publication-claim/publication-claim.component';
+import { SuggestionSourcesComponent } from '../../../notifications/suggestions/sources/suggestion-sources.component';
 
 @Component({
   selector: 'ds-admin-notifications-publication-claim-page',
   templateUrl: './admin-notifications-publication-claim-page.component.html',
   styleUrls: ['./admin-notifications-publication-claim-page.component.scss'],
-  imports: [
-    PublicationClaimComponent,
-  ],
+  imports: [ SuggestionSourcesComponent ],
   standalone: true,
 })
 export class AdminNotificationsPublicationClaimPageComponent {

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

@@ -2,7 +2,8 @@ import { Route } from '@angular/router';
 
 import { authenticatedGuard } from '../../core/auth/authenticated.guard';
 import { i18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
-import { qualityAssuranceBreadcrumbResolver } from '../../core/breadcrumbs/quality-assurance-breadcrumb.resolver';
+import { sourcesBreadcrumbResolver } from '../../core/breadcrumbs/sources-breadcrumb.resolver';
+import { PublicationClaimComponent } from '../../notifications/suggestions/targets/publication-claim/publication-claim.component';
 import { AdminNotificationsPublicationClaimPageResolver } from '../../quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page-resolver.service';
 import { QualityAssuranceEventsPageComponent } from '../../quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component';
 import { qualityAssuranceEventsPageResolver } from '../../quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.resolver';
@@ -33,13 +34,28 @@ export const ROUTES: Route[] = [
       showBreadcrumbsFluid: false,
     },
   },
+  {
+    canActivate: [ authenticatedGuard ],
+    path: `${PUBLICATION_CLAIMS_PATH}/:sourceId`,
+    pathMatch: 'full',
+    component: PublicationClaimComponent,
+    resolve: {
+      breadcrumb: sourcesBreadcrumbResolver,
+      openaireQualityAssuranceEventsParams: AdminNotificationsPublicationClaimPageResolver,
+    },
+    data: {
+      title: 'admin.notifications.publicationclaim.page.title',
+      breadcrumbKey: 'admin.notifications.publicationclaim',
+      showBreadcrumbsFluid: false,
+    },
+  },
   {
     canActivate: [authenticatedGuard],
     path: `${QUALITY_ASSURANCE_EDIT_PATH}/:sourceId`,
     component: QualityAssuranceTopicsPageComponent,
     pathMatch: 'full',
     resolve: {
-      breadcrumb: qualityAssuranceBreadcrumbResolver,
+      breadcrumb: sourcesBreadcrumbResolver,
       openaireQualityAssuranceTopicsParams: QualityAssuranceTopicsPageResolver,
     },
     data: {
@@ -85,7 +101,7 @@ export const ROUTES: Route[] = [
     component: QualityAssuranceEventsPageComponent,
     pathMatch: 'full',
     resolve: {
-      breadcrumb: qualityAssuranceBreadcrumbResolver,
+      breadcrumb: sourcesBreadcrumbResolver,
       openaireQualityAssuranceEventsParams: qualityAssuranceEventsPageResolver,
     },
     data: {

src/app/app.config.ts

@@ -10,6 +10,7 @@ import {
 import {
   NoPreloading,
   provideRouter,
+  withComponentInputBinding,
   withEnabledBlockingInitialNavigation,
   withInMemoryScrolling,
   withPreloading,
@@ -109,6 +110,7 @@ export const commonAppConfig: ApplicationConfig = {
       withInMemoryScrolling(APP_ROUTING_SCROLL_CONF),
       withEnabledBlockingInitialNavigation(),
       withPreloading(NoPreloading),
+      withComponentInputBinding(),
     ),
     {
       provide: APP_BASE_HREF,

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

@@ -1,15 +1,17 @@
-import { qualityAssuranceBreadcrumbResolver } from './quality-assurance-breadcrumb.resolver';
+import { sourcesBreadcrumbResolver } from './sources-breadcrumb.resolver';
 
-describe('qualityAssuranceBreadcrumbResolver', () => {
+describe('sourcesBreadcrumbResolver', () => {
   describe('resolve', () => {
     let resolver: any;
-    let qualityAssuranceBreadcrumbService: any;
+    let sourcesBreadcrumbService: any;
     let route: any;
+    const i18nKey = 'breadcrumbKey';
     const fullPath = '/test/quality-assurance/';
-    const expectedKey = 'testSourceId:testTopicId';
+    const expectedKey = 'breadcrumbKey:testSourceId:testTopicId';
 
     beforeEach(() => {
       route = {
+        data: { breadcrumbKey: i18nKey },
         paramMap: {
           get: function (param) {
             return this[param];
@@ -18,13 +20,13 @@ describe('qualityAssuranceBreadcrumbResolver', () => {
           topicId: 'testTopicId',
         },
       };
-      qualityAssuranceBreadcrumbService = {};
-      resolver = qualityAssuranceBreadcrumbResolver;
+      sourcesBreadcrumbService = {};
+      resolver = sourcesBreadcrumbResolver;
     });
 
     it('should resolve the breadcrumb config', () => {
-      const resolvedConfig = resolver(route as any, { url: fullPath + 'testSourceId' } as any, qualityAssuranceBreadcrumbService);
-      const expectedConfig = { provider: qualityAssuranceBreadcrumbService, key: expectedKey, url: fullPath };
+      const resolvedConfig = resolver(route as any, { url: fullPath + 'testSourceId' } as any, sourcesBreadcrumbService);
+      const expectedConfig = { provider: sourcesBreadcrumbService, key: expectedKey, url: fullPath };
       expect(resolvedConfig).toEqual(expectedConfig);
     });
   });

…ty-assurance-breadcrumb.resolver.spec.ts …umbs/sources-breadcrumb.resolver.spec.tssrc/app/core/breadcrumbs/quality-assurance-breadcrumb.resolver.spec.ts renamed to src/app/core/breadcrumbs/sources-breadcrumb.resolver.spec.ts src/app/core/breadcrumbs/quality-assurance-breadcrumb.resolver.spec.ts renamed to src/app/core/breadcrumbs/sources-breadcrumb.resolver.spec.ts

@@ -6,16 +6,17 @@ import {
 } from '@angular/router';
 
 import { BreadcrumbConfig } from '../../breadcrumbs/breadcrumb/breadcrumb-config.model';
-import { QualityAssuranceBreadcrumbService } from './quality-assurance-breadcrumb.service';
+import { SourcesBreadcrumbService } from './sources-breadcrumb.service';
 
-export const qualityAssuranceBreadcrumbResolver: ResolveFn<BreadcrumbConfig<string>> = (
+export const sourcesBreadcrumbResolver: ResolveFn<BreadcrumbConfig<string>> = (
   route: ActivatedRouteSnapshot,
   state: RouterStateSnapshot,
-  breadcrumbService: QualityAssuranceBreadcrumbService = inject(QualityAssuranceBreadcrumbService),
+  breadcrumbService: SourcesBreadcrumbService = inject(SourcesBreadcrumbService),
 ): BreadcrumbConfig<string> => {
+  const breadcrumbKey = route.data.breadcrumbKey;
   const sourceId = route.paramMap.get('sourceId');
   const topicId = route.paramMap.get('topicId');
-  let key = sourceId;
+  let key = `${breadcrumbKey}:${sourceId}`;
 
   if (topicId) {
     key += `:${topicId}`;

…quality-assurance-breadcrumb.resolver.ts …eadcrumbs/sources-breadcrumb.resolver.tssrc/app/core/breadcrumbs/quality-assurance-breadcrumb.resolver.ts renamed to src/app/core/breadcrumbs/sources-breadcrumb.resolver.ts src/app/core/breadcrumbs/quality-assurance-breadcrumb.resolver.ts renamed to src/app/core/breadcrumbs/sources-breadcrumb.resolver.ts

@@ -0,0 +1,60 @@
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { getTestScheduler } from 'jasmine-marbles';
+
+import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
+import { SourcesBreadcrumbService } from './sources-breadcrumb.service';
+
+describe('SourcesBreadcrumbService', () => {
+  let service: SourcesBreadcrumbService;
+  let translateService: any = {
+    instant: (str) => str,
+  };
+
+  let exampleString;
+  let exampleSource;
+  let exampleTopic;
+  let exampleArg;
+  let exampleArgTopic;
+  let exampleURL;
+  let exampleQaKey;
+
+  function init() {
+    exampleString = 'admin.quality-assurance';
+    exampleSource = 'sourceId';
+    exampleTopic = 'topic';
+    exampleArg = `${exampleString}:${exampleSource}`;
+    exampleArgTopic = `${exampleString}:${exampleSource}:${exampleTopic}`;
+    exampleURL = '/test/quality-assurance/';
+    exampleQaKey = 'admin.quality-assurance.breadcrumbs';
+  }
+
+  beforeEach(waitForAsync(() => {
+    init();
+    TestBed.configureTestingModule({}).compileComponents();
+  }));
+
+  beforeEach(() => {
+    service = new SourcesBreadcrumbService(translateService);
+  });
+
+  describe('getBreadcrumbs', () => {
+
+    it('should return a breadcrumb based on source only', () => {
+      const breadcrumbs = service.getBreadcrumbs(exampleArg, exampleURL);
+      getTestScheduler().expectObservable(breadcrumbs).toBe('(a|)', { a: [new Breadcrumb(exampleQaKey, exampleURL),
+        new Breadcrumb(exampleSource, exampleURL + exampleSource)],
+      });
+    });
+
+    it('should return a breadcrumb based also on topic', () => {
+      const breadcrumbs = service.getBreadcrumbs(exampleArgTopic, exampleURL);
+      getTestScheduler().expectObservable(breadcrumbs).toBe('(a|)', { a: [new Breadcrumb(exampleQaKey, exampleURL),
+        new Breadcrumb(exampleSource, exampleURL + exampleSource),
+        new Breadcrumb(exampleTopic, undefined)],
+      });
+    });
+  });
+});

src/app/core/breadcrumbs/sources-breadcrumb.service.spec.ts

@@ -14,9 +14,9 @@ import { BreadcrumbsProviderService } from './breadcrumbsProviderService';
 @Injectable({
   providedIn: 'root',
 })
-export class QualityAssuranceBreadcrumbService implements BreadcrumbsProviderService<string> {
+export class SourcesBreadcrumbService implements BreadcrumbsProviderService<string> {
 
-  private QUALITY_ASSURANCE_BREADCRUMB_KEY = 'admin.quality-assurance.breadcrumbs';
+  private BREADCRUMB_SUFFIX = '.breadcrumbs';
   constructor(
     private translationService: TranslateService,
   ) {
@@ -31,15 +31,16 @@ export class QualityAssuranceBreadcrumbService implements BreadcrumbsProviderSer
    */
   getBreadcrumbs(key: string, url: string): Observable<Breadcrumb[]> {
     const args = key.split(':');
-    const sourceId = args[0];
-    const topicId = args.length > 2 ? args[args.length - 1] : args[1];
+    const breadcrumbKey = args[0] + this.BREADCRUMB_SUFFIX;
+    const sourceId = args[1];
+    const topicId = args.length > 3 ? args[args.length - 1] : args[2];
 
     if (topicId) {
-      return observableOf( [new Breadcrumb(this.translationService.instant(this.QUALITY_ASSURANCE_BREADCRUMB_KEY), url),
+      return observableOf( [new Breadcrumb(this.translationService.instant(breadcrumbKey), url),
         new Breadcrumb(sourceId, `${url}${sourceId}`),
         new Breadcrumb(topicId, undefined)]);
     } else {
-      return observableOf([new Breadcrumb(this.translationService.instant(this.QUALITY_ASSURANCE_BREADCRUMB_KEY), url),
+      return observableOf([new Breadcrumb(this.translationService.instant(breadcrumbKey), url),
         new Breadcrumb(sourceId, `${url}${sourceId}`)]);
     }