Merge remote-tracking branch 'origin/dspace-cris-2023_02_x' into DSC-…

…1387-export-menu-in-person-entity-main-cris
4Science · Feb 6, 2024 · 02d4e04 · 02d4e04
2 parents 4c2d08c + b1e0abb
commit 02d4e04
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 7 deletions.
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/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/dso-selector/dso-selector/dso-selector.component.html b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
@@ -6,12 +6,12 @@
            [formControl]="input" ngbAutofocus (keyup.enter)="selectSingleResult()">
 </div>
 <div class="dropdown-divider"></div>
-<div class="scrollable-menu list-group">
+<div id="scrollable-menu-dso-selector-{{randomSeed}}" class="scrollable-menu list-group">
   <div
     infiniteScroll
     [infiniteScrollDistance]="1"
     [infiniteScrollThrottle]="0"
-    [infiniteScrollContainer]="'.scrollable-menu'"
+    [infiniteScrollContainer]="'#scrollable-menu-dso-selector-' + randomSeed"
     [fromRoot]="true"
     (scrolled)="onScrollDown()">
     <ng-container *ngIf="listEntries$ | async">

diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
@@ -142,6 +142,11 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
    */
   public subs: Subscription[] = [];
 
+  /**
+   * Random seed of 4 characters to avoid duplicate ids
+   */
+  randomSeed: string = Math.random().toString(36).substring(2, 6);
+
   constructor(
     protected searchService: SearchService,
     protected notifcationsService: NotificationsService,

diff --git a/...d/search/item-export/item-export-modal-launcher/item-export-modal-launcher.component.scss b/...d/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;
 }