Merge branch 'gdpr-metrics_2023_02_x_DSC-1413' into metrics_text_2023_02_x_DSC_1522

Author: atarix83

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,

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);
   }
 
   /**

src/app/core/eperson/group-data.service.ts

@@ -41,6 +41,7 @@ import { Operation } from 'fast-json-patch';
 import { RestRequestMethod } from '../data/rest-request-method';
 import { dataService } from '../data/base/data-service.decorator';
 import { getGroupEditRoute } from '../../access-control/access-control-routing-paths';
+import { isNotEmpty } from '../../shared/empty.util';
 
 const groupRegistryStateSelector = (state: AppState) => state.groupRegistry;
 const editGroupSelector = createSelector(groupRegistryStateSelector, (groupRegistryState: GroupRegistryState) => groupRegistryState.editGroup);
@@ -56,7 +57,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 +92,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)),
     );
   }

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>

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);

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)),
     );
   }
 

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>

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);
+}

src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts

@@ -30,7 +30,7 @@ import { FeatureID } from '../../../../core/data/feature-authorization/feature-i
   templateUrl: '../dso-selector-modal-wrapper.component.html',
 })
 export class ExportBatchSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
-  configuration = 'backend';
+  configuration = 'communityOrCollection';
   objectType = DSpaceObjectType.DSPACEOBJECT;
   selectorTypes = [DSpaceObjectType.COLLECTION];
   action = SelectorActionType.EXPORT_BATCH;

src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.ts

@@ -16,7 +16,7 @@ import { Observable, of } from 'rxjs';
   templateUrl: '../dso-selector-modal-wrapper.component.html',
 })
 export class ImportBatchSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
-  configuration = 'backend';
+  configuration = 'communityOrCollection';
   objectType = DSpaceObjectType.DSPACEOBJECT;
   selectorTypes = [DSpaceObjectType.COLLECTION];
   action = SelectorActionType.IMPORT_BATCH;