Added functionality to disable COAR notify support link in footer

Also fixed error that showed a blank page instead of a 404 when disabling EULA/Privacy Policy pages

Author: alexandrevryghem

config/config.example.yml

@@ -407,10 +407,11 @@ mediaViewer:
 
 # Whether the end user agreement is required before users use the repository.
 # If enabled, the user will be required to accept the agreement before they can use the repository.
-# And whether the privacy statement should exist or not.
+# And whether the privacy statement/COAR notify support page should exist or not.
 info:
   enableEndUserAgreement: true
   enablePrivacyStatement: true
+  enableCOARNotifySupport: true
 
 # Whether to enable Markdown (https://commonmark.org/) and MathJax (https://www.mathjax.org/)
 # display in supported metadata fields. By default, only dc.description.abstract is supported.

src/app/app-routing-paths.ts

@@ -34,7 +34,6 @@ export function getBitstreamRequestACopyRoute(item, bitstream): { routerLink: st
     },
   };
 }
-export const COAR_NOTIFY_SUPPORT = 'coar-notify-support';
 
 export const HOME_PAGE_PATH = 'home';
 

src/app/footer/footer.component.html

@@ -82,10 +82,10 @@ <h5 class="text-uppercase">Footer Content</h5>
         </li>
       </ul>
     </div>
-    <div class="notify-enabled text-white" [hidden]="!coarLdnEnabled">
+    <div *ngIf="coarLdnEnabled$ | async" class="notify-enabled text-white">
       <a class="coar-notify-support-route" routerLink="info/coar-notify-support">
         <img class="n-coar" src="assets/images/n-coar.png" [attr.alt]="'menu.header.image.logo' | translate" />
-        COAR Notify
+        {{ 'footer.link.coar-notify-support' | translate }}
       </a>
     </div>
   </div>

src/app/footer/footer.component.spec.ts

@@ -1,9 +1,3 @@
-// ... test imports
-import { CommonModule } from '@angular/common';
-import {
-  CUSTOM_ELEMENTS_SCHEMA,
-  DebugElement,
-} from '@angular/core';
 import {
   ComponentFixture,
   fakeAsync,
@@ -13,28 +7,19 @@ import {
 } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { ActivatedRoute } from '@angular/router';
-import { StoreModule } from '@ngrx/store';
-import {
-  TranslateLoader,
-  TranslateModule,
-} from '@ngx-translate/core';
+import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
-import { environment } from 'src/environments/environment';
 
-import { storeModuleConfig } from '../app.reducer';
+import { APP_CONFIG } from '../../config/app-config.interface';
+import { environment } from '../../environments/environment.test';
 import { NotifyInfoService } from '../core/coar-notify/notify-info/notify-info.service';
 import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
-import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock';
 import { ActivatedRouteStub } from '../shared/testing/active-router.stub';
 import { AuthorizationDataServiceStub } from '../shared/testing/authorization-service.stub';
-// Load the implementations that should be tested
 import { FooterComponent } from './footer.component';
 
 let comp: FooterComponent;
-let compAny: any;
 let fixture: ComponentFixture<FooterComponent>;
-let de: DebugElement;
-let el: HTMLElement;
 
 let notifyInfoService = {
   isCoarConfigEnabled: () => of(true),
@@ -43,30 +28,23 @@ let notifyInfoService = {
 describe('Footer component', () => {
   beforeEach(waitForAsync(() => {
     return TestBed.configureTestingModule({
-      imports: [CommonModule, StoreModule.forRoot({}, storeModuleConfig), TranslateModule.forRoot({
-        loader: {
-          provide: TranslateLoader,
-          useClass: TranslateLoaderMock,
-        },
-      }), FooterComponent],
+      imports: [
+        TranslateModule.forRoot(),
+      ],
       providers: [
         FooterComponent,
         { provide: AuthorizationDataService, useClass: AuthorizationDataServiceStub },
         { provide: NotifyInfoService, useValue: notifyInfoService },
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
+        { provide: APP_CONFIG, useValue: environment },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     });
   }));
 
   // synchronous beforeEach
   beforeEach(() => {
     fixture = TestBed.createComponent(FooterComponent);
     comp = fixture.componentInstance;
-    compAny = comp as any;
-    // query for the title <p> by CSS element selector
-    de = fixture.debugElement.query(By.css('p'));
-    el = de.nativeElement;
   });
 
   it('should create footer', inject([FooterComponent], (app: FooterComponent) => {
@@ -76,23 +54,25 @@ describe('Footer component', () => {
 
 
   it('should set showPrivacyPolicy to the value of environment.info.enablePrivacyStatement', () => {
+    comp.ngOnInit();
     expect(comp.showPrivacyPolicy).toBe(environment.info.enablePrivacyStatement);
   });
 
   it('should set showEndUserAgreement to the value of environment.info.enableEndUserAgreement', () => {
+    comp.ngOnInit();
     expect(comp.showEndUserAgreement).toBe(environment.info.enableEndUserAgreement);
   });
 
   describe('showCookieSettings', () => {
     it('should call cookies.showSettings() if cookies is defined', () => {
       const cookies = jasmine.createSpyObj('cookies', ['showSettings']);
-      compAny.cookies = cookies;
+      comp.cookies = cookies;
       comp.showCookieSettings();
       expect(cookies.showSettings).toHaveBeenCalled();
     });
 
     it('should not call cookies.showSettings() if cookies is undefined', () => {
-      compAny.cookies = undefined;
+      comp.cookies = undefined;
       expect(() => comp.showCookieSettings()).not.toThrow();
     });
 
@@ -107,9 +87,7 @@ describe('Footer component', () => {
       fixture.detectChanges();
     });
 
-    it('should set coarLdnEnabled based on notifyInfoService', () => {
-      expect(comp.coarLdnEnabled).toBeTruthy();
-      // Check if COAR Notify section is rendered
+    it('should render COAR notify support link', () => {
       const notifySection = fixture.debugElement.query(By.css('.notify-enabled'));
       expect(notifySection).toBeTruthy();
     });

src/app/footer/footer.component.ts

@@ -5,13 +5,21 @@ import {
 } from '@angular/common';
 import {
   Component,
+  Inject,
+  OnInit,
   Optional,
 } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
-import { Observable } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 
-import { environment } from '../../environments/environment';
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../config/app-config.interface';
 import { NotifyInfoService } from '../core/coar-notify/notify-info/notify-info.service';
 import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../core/data/feature-authorization/feature-id';
@@ -25,27 +33,31 @@ import { hasValue } from '../shared/empty.util';
   standalone: true,
   imports: [NgIf, RouterLink, AsyncPipe, DatePipe, TranslateModule],
 })
-export class FooterComponent {
+export class FooterComponent implements OnInit {
   dateObj: number = Date.now();
 
   /**
    * A boolean representing if to show or not the top footer container
    */
   showTopFooter = false;
-  showPrivacyPolicy = environment.info.enablePrivacyStatement;
-  showEndUserAgreement = environment.info.enableEndUserAgreement;
+  showPrivacyPolicy: boolean;
+  showEndUserAgreement: boolean;
   showSendFeedback$: Observable<boolean>;
-  coarLdnEnabled: boolean;
+  coarLdnEnabled$: Observable<boolean>;
 
   constructor(
-    @Optional() private cookies: KlaroService,
-    private authorizationService: AuthorizationDataService,
-    private notifyInfoService: NotifyInfoService,
+    @Optional() public cookies: KlaroService,
+    protected authorizationService: AuthorizationDataService,
+    protected notifyInfoService: NotifyInfoService,
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
+  }
+
+  ngOnInit(): void {
+    this.showPrivacyPolicy = this.appConfig.info.enablePrivacyStatement;
+    this.showEndUserAgreement = this.appConfig.info.enableEndUserAgreement;
+    this.coarLdnEnabled$ = this.appConfig.info.enableCOARNotifySupport ? this.notifyInfoService.isCoarConfigEnabled() : observableOf(false);
     this.showSendFeedback$ = this.authorizationService.isAuthorized(FeatureID.CanSendFeedback);
-    this.notifyInfoService.isCoarConfigEnabled().subscribe(coarLdnEnabled => {
-      this.coarLdnEnabled = coarLdnEnabled;
-    });
   }
 
   showCookieSettings() {

src/app/info/info-routes.ts

@@ -1,17 +1,26 @@
+import {
+  Route,
+  Routes,
+} from '@angular/router';
+
 import { environment } from '../../environments/environment';
 import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { notifyInfoGuard } from '../core/coar-notify/notify-info/notify-info.guard';
 import { feedbackGuard } from '../core/feedback/feedback.guard';
+import { hasValue } from '../shared/empty.util';
 import { ThemedEndUserAgreementComponent } from './end-user-agreement/themed-end-user-agreement.component';
 import { ThemedFeedbackComponent } from './feedback/themed-feedback.component';
 import {
+  COAR_NOTIFY_SUPPORT,
   END_USER_AGREEMENT_PATH,
   FEEDBACK_PATH,
   PRIVACY_PATH,
 } from './info-routing-paths';
+import { NotifyInfoComponent } from './notify-info/notify-info.component';
 import { ThemedPrivacyComponent } from './privacy/themed-privacy.component';
 
 
-export const ROUTES = [
+export const ROUTES: Routes = [
   {
     path: FEEDBACK_PATH,
     component: ThemedFeedbackComponent,
@@ -31,4 +40,16 @@ export const ROUTES = [
     resolve: { breadcrumb: i18nBreadcrumbResolver },
     data: { title: 'info.privacy.title', breadcrumbKey: 'info.privacy' },
   } : undefined,
-];
+  environment.info.enableCOARNotifySupport ? {
+    path: COAR_NOTIFY_SUPPORT,
+    component: NotifyInfoComponent,
+    canActivate: [notifyInfoGuard],
+    resolve: {
+      breadcrumb: i18nBreadcrumbResolver,
+    },
+    data: {
+      title: 'info.coar-notify-support.title',
+      breadcrumbKey: 'info.coar-notify-support',
+    },
+  } : undefined,
+].filter((route: Route) => hasValue(route));

src/app/info/info-routing-paths.ts

@@ -3,6 +3,7 @@ import { getInfoModulePath } from '../app-routing-paths';
 export const END_USER_AGREEMENT_PATH = 'end-user-agreement';
 export const PRIVACY_PATH = 'privacy';
 export const FEEDBACK_PATH = 'feedback';
+export const COAR_NOTIFY_SUPPORT = 'coar-notify-support';
 
 export function getEndUserAgreementPath() {
   return getSubPath(END_USER_AGREEMENT_PATH);
@@ -16,6 +17,10 @@ export function getFeedbackPath() {
   return getSubPath(FEEDBACK_PATH);
 }
 
+export function getCOARNotifySupportPath(): string {
+  return getSubPath(COAR_NOTIFY_SUPPORT);
+}
+
 function getSubPath(path: string) {
   return `${getInfoModulePath()}/${path}`;
 }

…y/notify-info/notify-info.component.html …o/notify-info/notify-info.component.htmlsrc/app/core/coar-notify/notify-info/notify-info.component.html renamed to src/app/info/notify-info/notify-info.component.html src/app/core/coar-notify/notify-info/notify-info.component.html renamed to src/app/info/notify-info/notify-info.component.html

@@ -6,9 +6,9 @@ import { ActivatedRoute } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 
-import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
+import { NotifyInfoService } from '../../core/coar-notify/notify-info/notify-info.service';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { NotifyInfoComponent } from './notify-info.component';
-import { NotifyInfoService } from './notify-info.service';
 
 describe('NotifyInfoComponent', () => {
   let component: NotifyInfoComponent;