Merged dspace-cris-2023_02_x into DSC-1486-item-page-resolver-maintenance

atarix83 · atarix83 · commit 9acb3b6d38b2 · 2024-02-06T17:35:40.000Z
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
@@ -237,6 +237,7 @@ import {
 } from './metadata/schema-json-ld/schema-types/product/product-creative-work-schema-type';
 import { ProductDatasetSchemaType } from './metadata/schema-json-ld/schema-types/product/product-dataset-schema-type';
 import { PersonSchemaType } from './metadata/schema-json-ld/schema-types/Person/person-schema-type';
+import { InternalLinkService } from './services/internal-link.service';
 
 /**
  * When not in production, endpoint responses can be mocked for testing purposes
@@ -270,6 +271,7 @@ const PROVIDERS = [
   { provide: DspaceRestService, useFactory: restServiceFactory, deps: [MOCK_RESPONSE_MAP, HttpClient] },
   EPersonDataService,
   LinkHeadService,
+  InternalLinkService,
   HALEndpointService,
   HostWindowService,
   ItemDataService,
diff --git a/src/app/core/data/processes/process-data.service.ts b/src/app/core/data/processes/process-data.service.ts
@@ -68,10 +68,11 @@ export class ProcessDataService extends IdentifiableDataService<Process> impleme
   /**
    * Get a process' output files
    * @param processId The ID of the process
+   * @param useCacheVersionIfAvailable If value needs to be red from cache or not
    */
-  getFiles(processId: string): Observable<RemoteData<PaginatedList<Bitstream>>> {
+  getFiles(processId: string, useCacheVersionIfAvailable = true): Observable<RemoteData<PaginatedList<Bitstream>>> {
     const href$ = this.getFilesEndpoint(processId);
-    return this.bitstreamDataService.findListByHref(href$);
+    return this.bitstreamDataService.findListByHref(href$, {}, useCacheVersionIfAvailable);
   }
 
   /**
diff --git a/src/app/core/eperson/group-data.service.ts b/src/app/core/eperson/group-data.service.ts
@@ -56,7 +56,7 @@ export class GroupDataService extends IdentifiableDataService<Group> implements
   public subgroupsEndpoint = 'subgroups';
 
   private createData: CreateData<Group>;
-  private searchData: SearchData<Group>;
+  private searchData: SearchDataImpl<Group>;
   private patchData: PatchData<Group>;
   private deleteData: DeleteData<Group>;
 
@@ -91,9 +91,9 @@ export class GroupDataService extends IdentifiableDataService<Group> implements
     const options = new FindListOptions();
     options.searchParams = [new RequestParam('groupName', groupName)];
 
-    return this.searchBy(searchHref, options).pipe(
+    return this.findByHref(this.searchData.getSearchByHref(searchHref, options)).pipe(
       getRemoteDataPayload(),
-      map((groups: PaginatedList<Group>) => groups.totalElements > 0),
+      map((group: Group) => isNotEmpty(group)),
       catchError(() => observableOf(false)),
     );
   }
diff --git a/src/app/item-page/full/field-components/file-section/full-file-section.component.html b/src/app/item-page/full/field-components/file-section/full-file-section.component.html
@@ -33,7 +33,7 @@ <h5 class="simple-view-element-header">{{"item.page.filesection.original.bundle"
                           </ng-container>
                         </dl>
                     </div>
-                    <div class="col-2">
+                    <div *ngIf="!hasNoDownload(file)" class="col-2">
                         <ds-themed-file-download-link [bitstream]="file" [item]="item">
                             {{"item.page.filesection.download" | translate}}
                         </ds-themed-file-download-link>
diff --git a/src/app/item-page/full/field-components/file-section/full-file-section.component.ts b/src/app/item-page/full/field-components/file-section/full-file-section.component.ts
@@ -108,6 +108,10 @@ export class FullFileSectionComponent extends FileSectionComponent implements On
     return hasValue(bundle) && !isEmpty(bundle.page);
   }
 
+  hasNoDownload(bitstream: Bitstream) {
+    return bitstream?.allMetadataValues('bitstream.viewer.provider').includes('nodownload');
+  }
+
   ngOnDestroy(): void {
     this.paginationService.clearPagination(this.originalOptions.id);
     this.paginationService.clearPagination(this.licenseOptions.id);
diff --git a/src/app/process-page/detail/process-detail.component.ts b/src/app/process-page/detail/process-detail.component.ts
@@ -146,7 +146,7 @@ export class ProcessDetailComponent implements OnInit, OnDestroy {
 
     this.filesRD$ = this.processRD$.pipe(
       getFirstSucceededRemoteDataPayload(),
-      switchMap((process: Process) => this.processService.getFiles(process.processId))
+      switchMap((process: Process) => this.processService.getFiles(process.processId, false)),
     );
   }
 
diff --git a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html
@@ -1,3 +1,3 @@
 <div *ngIf="logo" class="dso-logo mb-3">
-    <img [src]="logo._links.content.href" class="img-fluid" [attr.alt]="alternateText ? alternateText : null" (error)="errorHandler($event)"/>
+    <img [src]="logo._links.content.href" class="w-100 img-fluid" [attr.alt]="alternateText ? alternateText : null" (error)="errorHandler($event)"/>
 </div>
diff --git a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.scss b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.scss
@@ -0,0 +1,4 @@
+img {
+  max-width: var(--ds-comcol-logo-max-width);
+  max-height: var(--ds-comcol-logo-max-height);
+}
diff --git a/src/app/shared/explore/section-component/counters-section/counters-section.component.html b/src/app/shared/explore/section-component/counters-section/counters-section.component.html
@@ -1,27 +1,30 @@
 <div>
-  <div class="card">
-    <div class = "row d-flex justify-content-center">
+  <div class="card p-3">
+    <div class="d-flex flex-wrap flex-row justify-content-around gap-4">
       <div *ngIf="isLoading$ | async">
         <ds-loading message="{{'loading.default' | translate}}"></ds-loading>
       </div>
-     <div *ngFor="let counter of (counterData$ | async)"
-        class="px-4 py-1 d-flex flex-column" style="flex: 1 0 100px">
-          <div (click)="goToLink(counter.link)"
-            [ngStyle]="{'cursor': counter.link? 'pointer' : 'inherit'}"
-            class="col d-flex justify-content-center text-center align-items-center">
-              <i [ngClass]="counter.icon"></i>
+      <ng-container *ngFor="let counter of (counterData$ | async)">
+        <ng-container *ngIf="counter.link; else countersSectionContent">
+          <a class="text-decoration-none" *ngIf="internalLinkService.isLinkInternal(counter.link)" [routerLink]="internalLinkService.getRelativePath(counter.link)">
+            <ng-container *ngTemplateOutlet="countersSectionContent"></ng-container>
+          </a>
+          <a class="text-decoration-none" *ngIf="!internalLinkService.isLinkInternal(counter.link)" [href]="counter.link" [target]="'_blank'">
+            <ng-container *ngTemplateOutlet="countersSectionContent"></ng-container>
+          </a>
+        </ng-container>
+        <ng-template #countersSectionContent>
+          <div class="d-flex flex-wrap flex-column justify-content-between align-items-center gapy-1 counters-section">
+            <i class="d-block mb-2" [ngClass]="counter.icon"></i>
+            <div class="counters-label text-center">
+              {{ 'explore.counters-section.' + counter.label | translate }}
+            </div>
+            <div class="text-center font-weight-bold">
+              <b>{{ counter.count }}</b>
+            </div>
           </div>
-          <div (click)="goToLink(counter.link)"
-            [ngStyle]="{'cursor': counter.link? 'pointer' : 'inherit'}"
-            class="col d-flex justify-content-center text-center align-items-center">
-              {{'explore.counters-section.' + counter.label | translate}}
-          </div>
-          <div (click)="goToLink(counter.link)"
-            [ngStyle]="{'cursor': counter.link? 'pointer' : 'inherit'}"
-            class="col d-flex justify-content-center text-center align-items-center">
-              <b>{{counter.count}}</b>
-           </div>
-      </div>
+        </ng-template>
+      </ng-container>
     </div>
   </div>
 </div>
diff --git a/src/app/shared/explore/section-component/counters-section/counters-section.component.scss b/src/app/shared/explore/section-component/counters-section/counters-section.component.scss
@@ -0,0 +1,13 @@
+.counters-section {
+    min-width: 120px;
+    max-width: 140px;
+    color: var(--bs-gray-800);
+
+    &:hover {
+        color: #{darken($gray-800, 20%)};
+    }
+}
+
+.counters-label {
+    line-height: 1.25;
+}
diff --git a/src/app/shared/explore/section-component/counters-section/counters-section.component.ts b/src/app/shared/explore/section-component/counters-section/counters-section.component.ts
@@ -4,19 +4,19 @@ import { isPlatformServer } from '@angular/common';
 import { BehaviorSubject, forkJoin, Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { NativeWindowRef, NativeWindowService } from '../../../../core/services/window.service';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { SearchObjects } from '../../../search/models/search-objects.model';
 import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
 import { PaginationComponentOptions } from '../../../pagination/pagination-component-options.model';
 import { SectionComponent } from '../../../../core/layout/models/section.model';
 import { SearchService } from '../../../../core/shared/search/search.service';
 import { PaginatedSearchOptions } from '../../../search/models/paginated-search-options.model';
-import { hasValue } from '../../../empty.util';
 import { UUIDService } from '../../../../core/shared/uuid.service';
+import { InternalLinkService } from 'src/app/core/services/internal-link.service';
 
 @Component({
   selector: 'ds-counters-section',
+  styleUrls: ['./counters-section.component.scss'],
   templateUrl: './counters-section.component.html'
 })
 export class CountersSectionComponent implements OnInit {
@@ -38,10 +38,12 @@ export class CountersSectionComponent implements OnInit {
   });
 
 
-  constructor(private searchService: SearchService,
+  constructor(
+              public internalLinkService: InternalLinkService,
+              private searchService: SearchService,
               private uuidService: UUIDService,
               @Inject(PLATFORM_ID) private platformId: Object,
-              @Inject(NativeWindowService) protected _window: NativeWindowRef,) {
+  ) {
 
   }
 
@@ -69,12 +71,6 @@ export class CountersSectionComponent implements OnInit {
         )));
     this.counterData$.subscribe(() => this.isLoading$.next(false));
   }
-
-  goToLink(link: string) {
-    if (hasValue(link)) {
-      this._window.nativeWindow.location.href = link;
-    }
-  }
 }
 
 
diff --git a/src/app/shared/search/item-export/item-export-modal-launcher/item-export-modal-launcher.component.scss b/src/app/shared/search/item-export/item-export-modal-launcher/item-export-modal-launcher.component.scss
@@ -1,3 +1,7 @@
 :host {
   display: none;
 }
+
+.dropdown-menu {
+  z-index: 1020;
+}
diff --git a/src/app/shared/search/search.component.html b/src/app/shared/search/search.component.html
@@ -96,7 +96,7 @@
 </ng-template>
 
 <ng-template #searchForm>
-    <div class="d-flex flex-wrap flex-xl-nowrap search-form-flex-wrapper">
+    <div class="d-flex flex-wrap flex-xl-nowrap search-form-flex-wrapper" [class.justify-content-end]="!searchEnabled">
         <div *ngIf="!(isXsOrSm$ | async) && showFilterToggle && showSidebar">
             <button class="btn btn-outline-secondary"
                     ngbTooltip="{{'search.sidebar.show.hide.filters.tooltip' | translate}}"
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
@@ -140,4 +140,8 @@
   --ds-dso-edit-security-width: 136px;
   --ds-dso-edit-actions-width: 173px;
   --ds-dso-edit-virtual-tooltip-min-width: 300px;
+
+
+  --ds-comcol-logo-max-width: 500px;
+  --ds-comcol-logo-max-height: 500px;
 }

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ export class ProcessDetailComponent implements OnInit, OnDestroy {`
`146`	`146`
`147`	`147`	`this.filesRD$ = this.processRD$.pipe(`
`148`	`148`	`getFirstSucceededRemoteDataPayload(),`
`149`		`- switchMap((process: Process) => this.processService.getFiles(process.processId))`
	`149`	`+ switchMap((process: Process) => this.processService.getFiles(process.processId, false)),`
`150`	`150`	`);`
`151`	`151`	`}`
`152`	`152`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +img {
 +  max-width: var(--ds-comcol-logo-max-width);
 +  max-height: var(--ds-comcol-logo-max-height);
 +}