Merge branch 'dspace-cris-7' into DSC-867

# Conflicts:
#	src/app/shared/metric/metric-dimensions/metric-dimensions.component.ts
#	src/app/shared/metric/metric-embedded/metric-embedded-download/metric-embedded-download.component.html
#	src/app/shared/metric/metric-embedded/metric-embedded-view/metric-embedded-view.component.html
#	src/app/shared/metric/metric-googlescholar/metric-googlescholar.component.html
#	src/app/shared/metric/metric-loader/base-metric.component.ts

Author: Davide Negretti

config/config.example.yml

@@ -113,9 +113,15 @@ submission:
         - value: 600
           style: text-success
         - value: 500
-          style: text-info
-        - value: 400
           style: text-warning
+        - value: 400
+          style: text-danger
+        - value: 300
+          style: text-dark
+        - value: 200
+          style: text-dark
+        - value: 100
+          style: text-dark
         # default configuration
         - value: default
           style: text-muted

package.json

@@ -194,7 +194,7 @@
     "eslint": "^8.2.0",
     "eslint-plugin-deprecation": "^1.3.2",
     "eslint-plugin-import": "^2.25.4",
-    "eslint-plugin-jsdoc": "^38.0.6",
+    "eslint-plugin-jsdoc": "^39.6.4",
     "eslint-plugin-unused-imports": "^2.0.0",
     "express-static-gzip": "^2.1.5",
     "fork-ts-checker-webpack-plugin": "^6.0.3",

src/app/core/auth/auth.interceptor.ts

@@ -25,6 +25,8 @@ import { AuthMethod } from './models/auth.method';
 import { AuthMethodType } from './models/auth.method-type';
 import { hasAuthMethodRendering } from '../../shared/log-in/methods/log-in.methods-decorator';
 
+export const ON_BEHALF_OF_HEADER = 'X-On-Behalf-Of';
+
 @Injectable()
 export class AuthInterceptor implements HttpInterceptor {
 
@@ -224,7 +226,7 @@ export class AuthInterceptor implements HttpInterceptor {
       // When present, add the ID of the EPerson we're impersonating to the headers
       const impersonatingID = authService.getImpersonateID();
       if (hasValue(impersonatingID)) {
-        newHeaders = newHeaders.set('X-On-Behalf-Of', impersonatingID);
+        newHeaders = newHeaders.set(ON_BEHALF_OF_HEADER, impersonatingID);
       }
 
       // Clone the request to add the new header.

src/app/cris-layout/cris-layout-loader/cris-layout-vertical/cris-layout-sidebar/cris-layout-sidebar.component.scss

@@ -87,7 +87,7 @@
 .menu-toggle {
   position: absolute;
   top: 0;
-  left: -50px;
+  left: -30px;
   z-index: 1000;
   opacity: 0.5;
 }

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metrics/metric-row/metric-row.component.html

@@ -1,7 +1,7 @@
 <ng-container *ngFor="let metric of metricRow.metrics">
   <ng-container *ngIf="metric">
-    <div class="col-3 mb-2">
-      <ds-metric-loader [metric]="metric"></ds-metric-loader>
-    </div>
+     <ds-metric-loader [metric]="metric" class="col-3 mb-2"
+                       [class.d-none]="(isHidden(metric.id) | async)"
+                       (hide)="toggleVisibility(metric.id, $event)"></ds-metric-loader>
   </ng-container>
 </ng-container>

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metrics/metric-row/metric-row.component.ts

@@ -1,4 +1,7 @@
 import { Component, Input } from '@angular/core';
+
+import { BehaviorSubject, Observable, of } from 'rxjs';
+
 import { CrisLayoutMetricRow } from '../../../../../../core/layout/models/tab.model';
 
 /**
@@ -15,4 +18,20 @@ export class MetricRowComponent {
    * Current row configuration
    */
   @Input() metricRow: CrisLayoutMetricRow;
+
+  private isVisible$: BehaviorSubject<Map<string, boolean>> = new BehaviorSubject(new Map());
+
+  toggleVisibility(metricId, event) {
+    const newMap: Map<string, boolean> = this.isVisible$.value;
+    newMap.set(metricId, event);
+    this.isVisible$.next(newMap);
+  }
+
+  isHidden(metricId): Observable<boolean> {
+    if (this.isVisible$.value.has(metricId)) {
+      return of(this.isVisible$.value.get(metricId));
+    } else {
+      return of(false);
+    }
+  }
 }

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/cris-layout-box-container.component.scss

@@ -9,3 +9,9 @@
   box-shadow: none !important;
   width: 100%;
 }
+
+:host ::ng-deep .card {
+  margin-bottom: var(--ds-submission-sections-margin-bottom);
+  overflow: unset;
+}
+

src/app/cris-layout/cris-layout.module.ts

@@ -4,6 +4,8 @@ import { CommonModule } from '@angular/common';
 import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
 
 import { SharedModule } from '../shared/shared.module';
+import { MetricsModule } from './../shared/metric/metrics.module';
+
 import { CrisLayoutLoaderDirective } from './directives/cris-layout-loader.directive';
 import { CrisLayoutComponent } from './cris-layout.component';
 import { CrisLayoutLeadingComponent } from './cris-layout-leading/cris-layout-leading.component';
@@ -103,6 +105,7 @@ const ENTRY_COMPONENTS = [
     NgbAccordionModule,
     ComcolModule,
     MiradorViewerModule,
+    MetricsModule
   ],
   exports: [
     CrisLayoutComponent,

src/app/explore-page/explore-page.component.html

@@ -1,7 +1,7 @@
 <div class="container">
-  <div *ngFor="let sectionComponents of ( sectionComponentRows | async )" class="row mb-3">
+  <div *ngFor="let sectionComponents of ( sectionComponentRows | async )" class="row">
     <div *ngFor="let sectionComponent of sectionComponents" [ngSwitch]="sectionComponent.componentType"
-         [ngClass]="sectionComponent.style">
+         [ngClass]="sectionComponent.style" [class.col]="!hasColClass(sectionComponent.style)" class="pb-4">
       <ds-themed-top-section *ngSwitchCase="'top'"
                              [sectionId]="sectionId"
                              [topSection]="sectionComponent"></ds-themed-top-section>

src/app/explore-page/explore-page.component.ts

@@ -45,4 +45,13 @@ export class ExplorePageComponent implements OnInit {
             map ( (section) => section.componentRows)
         );
     }
+
+  /**
+   * Check if style contains 'col' or 'col-x'
+   * @param style the style of the cell (a list of classes separated by space)
+   */
+  hasColClass(style) {
+    return style?.split(' ').filter((c) => (c === 'col' || c.startsWith('col-'))).length > 0;
+  }
+
 }