Merge pull request #2844 from alexandrevryghem/fix-home-page-issues

Fixed home page issues

Author: tdonohue

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/admin/admin-search-page/admin-search-page.component.html

@@ -1 +1 @@
-<ds-configuration-search-page configuration="administrativeView" [context]="context"></ds-configuration-search-page>
+<ds-themed-configuration-search-page configuration="administrativeView" [context]="context"></ds-themed-configuration-search-page>

src/app/admin/admin-search-page/admin-search-page.component.spec.ts

@@ -6,7 +6,7 @@ import {
 } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 
-import { ConfigurationSearchPageComponent } from '../../search-page/configuration-search-page.component';
+import { ThemedConfigurationSearchPageComponent } from '../../search-page/themed-configuration-search-page.component';
 import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { AdminSearchPageComponent } from './admin-search-page.component';
 
@@ -23,7 +23,7 @@ describe('AdminSearchPageComponent', () => {
       schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(AdminSearchPageComponent, {
       remove: {
-        imports: [ConfigurationSearchPageComponent],
+        imports: [ThemedConfigurationSearchPageComponent],
       },
     })
       .compileComponents();

src/app/admin/admin-search-page/admin-search-page.component.ts

@@ -1,14 +1,14 @@
 import { Component } from '@angular/core';
 
 import { Context } from '../../core/shared/context.model';
-import { ConfigurationSearchPageComponent } from '../../search-page/configuration-search-page.component';
+import { ThemedConfigurationSearchPageComponent } from '../../search-page/themed-configuration-search-page.component';
 
 @Component({
   selector: 'ds-admin-search-page',
   templateUrl: './admin-search-page.component.html',
   styleUrls: ['./admin-search-page.component.scss'],
   standalone: true,
-  imports: [ConfigurationSearchPageComponent],
+  imports: [ThemedConfigurationSearchPageComponent],
 })
 
 /**

src/app/admin/admin-workflow-page/admin-workflow-page.component.html

@@ -1 +1 @@
-<ds-configuration-search-page configuration="supervision" [context]="context"></ds-configuration-search-page>
+<ds-themed-configuration-search-page configuration="supervision" [context]="context"></ds-themed-configuration-search-page>

src/app/admin/admin-workflow-page/admin-workflow-page.component.spec.ts

@@ -5,7 +5,7 @@ import {
   waitForAsync,
 } from '@angular/core/testing';
 
-import { ConfigurationSearchPageComponent } from '../../search-page/configuration-search-page.component';
+import { ThemedConfigurationSearchPageComponent } from '../../search-page/themed-configuration-search-page.component';
 import { AdminWorkflowPageComponent } from './admin-workflow-page.component';
 
 describe('AdminSearchPageComponent', () => {
@@ -20,7 +20,7 @@ describe('AdminSearchPageComponent', () => {
       .overrideComponent(AdminWorkflowPageComponent, {
         remove: {
           imports: [
-            ConfigurationSearchPageComponent,
+            ThemedConfigurationSearchPageComponent,
           ],
         },
       })

src/app/admin/admin-workflow-page/admin-workflow-page.component.ts

@@ -1,14 +1,14 @@
 import { Component } from '@angular/core';
 
 import { Context } from '../../core/shared/context.model';
-import { ConfigurationSearchPageComponent } from '../../search-page/configuration-search-page.component';
+import { ThemedConfigurationSearchPageComponent } from '../../search-page/themed-configuration-search-page.component';
 
 @Component({
   selector: 'ds-admin-workflow-page',
   templateUrl: './admin-workflow-page.component.html',
   styleUrls: ['./admin-workflow-page.component.scss'],
   standalone: true,
-  imports: [ConfigurationSearchPageComponent],
+  imports: [ThemedConfigurationSearchPageComponent],
 })
 
 /**

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/community-list-page/community-list/community-list.component.html

@@ -7,7 +7,7 @@
       <span aria-hidden="true" class="btn btn-default invisible" cdkTreeNodeToggle>
         <span class="fa fa-chevron-right"></span>
       </span>
-      <div class="align-middle pt-2">
+      <div class="align-middle my-auto">
         <button *ngIf="(dataSource.loading$ | async) !== true" (click)="getNextPage(node)"
            class="btn btn-outline-primary btn-sm" role="button">
            <i class="fas fa-angle-down"></i> {{ 'communityList.showMore' | translate }}
@@ -37,10 +37,10 @@
         <span class="fa fa-chevron-right"></span>
       </span>
       <div class="d-flex flex-row">
-        <span class="align-middle pt-2 lead">
+        <span class="d-flex align-middle my-auto">
           <a [routerLink]="node.route" class="lead">{{ dsoNameService.getName(node.payload) }}</a>
           <span class="pr-2">&nbsp;</span>
-          <span *ngIf="node.payload.archivedItemsCount >= 0" class="badge badge-pill badge-secondary align-top archived-items-lead">{{node.payload.archivedItemsCount}}</span>
+          <span *ngIf="node.payload.archivedItemsCount >= 0" class="badge badge-pill badge-secondary align-top archived-items-lead my-auto">{{node.payload.archivedItemsCount}}</span>
         </span>
       </div>
     </div>
@@ -71,7 +71,7 @@
       <span aria-hidden="true" class="btn btn-default invisible" cdkTreeNodeToggle>
         <span class="fa fa-chevron-right"></span>
       </span>
-      <h6 class="align-middle pt-2">
+      <h6 class="align-middle my-auto">
         <a [routerLink]="node.route" class="lead">{{ dsoNameService.getName(node.payload) }}</a>
       </h6>
     </div>

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>