Merged dspace-cris-2023_02_x into DSC-1309-maintenance

Author: vins01-4science

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dspace-angular",
-  "version": "2023.02.02-snapshot",
+  "version": "2023.02.03-SNAPSHOT",
   "scripts": {
     "ng": "ng",
     "config:watch": "nodemon",

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

@@ -1,10 +1,10 @@
-<div class="{{box.style}} w-100">
-	<div class="container" *ngIf="metricRows">
+<div [class]="box.style" class="w-100">
+	<div *ngIf="metricRows">
 		<!-- PRINT ROWS -->
 		<div ds-metric-row
          *ngFor="let metricRow of (metricRows | async)"
          [metricRow]="metricRow"
-         class="d-flex flex-wrap gap-3 mb-3">
+         class="d-flex flex-row flex-wrap align-items-center gap-3">
     </div>
 	</div>
 </div>

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

@@ -2,11 +2,12 @@
 	border: 1px solid black;
 	border-radius: 3px;
 }
-:host {
-	display: flex;
-	// flex:1;
-}
 
 ngb-accordion {
 	flex-grow: 1;
 }
+
+// This class should be applied to the altmetrics box in the CRIS layout tool
+.altmetrics-wrapper {
+  padding: 15px 70px;
+}

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

@@ -67,15 +67,18 @@ export class CrisLayoutMetricsBoxComponent extends CrisLayoutBoxModelComponent i
     if (isPlatformBrowser(this.platformId)) {
       this.metricsBoxConfiguration = this.box.configuration as MetricsBoxConfiguration;
       this.subs.push(
-        this.itemService.getMetrics(this.item.uuid).pipe(getFirstSucceededRemoteDataPayload())
-          .subscribe((result) => {
-            const matchingMetrics = this.metricsComponentService.getMatchingMetrics(
-              result.page,
-              this.metricsBoxConfiguration.maxColumns,
-              this.metricsBoxConfiguration.metrics
-            );
-            this.metricRows.next(matchingMetrics);
-          }));
+        this.itemService.getMetrics(this.item.uuid).pipe(
+          getFirstSucceededRemoteDataPayload(),
+        ).subscribe((result) => {
+          const matchingMetrics = this.metricsComponentService.getMatchingMetrics(
+            result.page,
+            this.metricsBoxConfiguration.maxColumns,
+            this.metricsBoxConfiguration.metrics,
+          );
+          this.metricRows.next(matchingMetrics);
+          },
+        ),
+      );
     }
   }
 

src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts

@@ -36,6 +36,5 @@ export class PersonSearchResultListElementComponent extends ItemSearchResultList
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.showThumbnails = this.appConfig.browseBy.showThumbnails;
   }
 }

src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts

@@ -1,15 +1,20 @@
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import {
+  listableObjectComponent
+} from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { Context } from '../../../../../core/shared/context.model';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
-import { Component } from '@angular/core';
-import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
+import { Component, Inject } from '@angular/core';
+import {
+  SidebarSearchListElementComponent
+} from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
 import { Item } from '../../../../../core/shared/item.model';
 import { isNotEmpty } from '../../../../../shared/empty.util';
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 import { LinkService } from '../../../../../core/cache/builders/link.service';
 import { TranslateService } from '@ngx-translate/core';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { APP_CONFIG, AppConfig } from '../../../../../../config/app-config.interface';
 
 @listableObjectComponent('PersonSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent('PersonSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
@@ -22,12 +27,13 @@ import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service
  * a sidebar search modal
  */
 export class PersonSidebarSearchListElementComponent extends SidebarSearchListElementComponent<ItemSearchResult, Item> {
-  constructor(protected truncatableService: TruncatableService,
+  constructor(@Inject(APP_CONFIG) protected appConfig: AppConfig,
+              protected truncatableService: TruncatableService,
               protected linkService: LinkService,
               protected translateService: TranslateService,
               public dsoNameService: DSONameService,
   ) {
-    super(truncatableService, linkService, dsoNameService);
+    super(appConfig, truncatableService, linkService, dsoNameService);
   }
 
   /**

src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.html

@@ -40,7 +40,10 @@
       <div class="card p-1">
         <ng-container
           *ngFor="let match of object.matchObjects | slice: (pageConfig.currentPage-1) * pageConfig.pageSize : pageConfig.currentPage * pageConfig.pageSize">
-          <ds-themed-item-list-preview [item]="match" [object]="itemPreviewObject" [metadataList]="metadataList">
+          <ds-themed-item-list-preview [item]="match"
+                                       [object]="itemPreviewObject"
+                                       [metadataList]="metadataList"
+                                       [showThumbnails]="showThumbnails">
           </ds-themed-item-list-preview>
           <div class="offset-2">
             <a class="btn btn-primary mt-1" ngbTooltip="{{'submission.workflow.generic.view-help' | translate}}"

src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts

@@ -1,8 +1,12 @@
 import { Component, Inject, OnInit } from '@angular/core';
 import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
-import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
+import {
+  SearchResultListElementComponent
+} from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import {
+  listableObjectComponent
+} from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { Item } from '../../../../../core/shared/item.model';
 import { Context } from '../../../../../core/shared/context.model';
@@ -72,7 +76,6 @@ export class OrgUnitSearchResultListSubmissionElementComponent extends SearchRes
           }
         );
     }
-    this.showThumbnails = this.appConfig.browseBy.showThumbnails;
   }
 
   select(value) {

src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts

@@ -1,8 +1,12 @@
 import { Component, Inject, OnInit } from '@angular/core';
 import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
-import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
+import {
+  SearchResultListElementComponent
+} from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import {
+  listableObjectComponent
+} from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { Item } from '../../../../../core/shared/item.model';
 import { Context } from '../../../../../core/shared/context.model';
@@ -65,7 +69,6 @@ export class PersonSearchResultListSubmissionElementComponent extends SearchResu
         this.selectedName = nameVariant || defaultValue;
         }
       );
-    this.showThumbnails = this.appConfig.browseBy.showThumbnails;
   }
 
   select(value) {

src/app/item-page/cris-item-page-tab.resolver.ts

@@ -54,7 +54,11 @@ export class CrisItemPageTabResolver implements Resolve<RemoteData<PaginatedList
                 const givenTab = urlSplit[1];
                 const itemPageRoute = getItemPageRoute(itemRD.payload);
                 const isValidTab = tabsRD.payload.page.some((tab) => !givenTab || `/${tab.shortname}` === givenTab);
-                const mainTab = tabsRD.payload.page.filter((tab) => !tab.leading)[0];
+
+                const mainTab = tabsRD.payload.page.length === 1
+                  ? tabsRD.payload.page[0]
+                  : tabsRD.payload.page.find(tab => !tab.leading);
+
                 if (!isValidTab) {
                   // If wrong tab is given redirect to 404 page
                   this.router.navigateByUrl(getPageNotFoundRoute(), { skipLocationChange: true, replaceUrl: false });