From 8849f140fbf47e8a15dda672ecec7770d49308b7 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Thu, 28 Nov 2024 22:39:08 +0100
Subject: [PATCH 1/2] 117287: Removed method calls returning observables from
 ItemDetailPreviewComponent

---
 .../item-detail-preview.component.html                |  2 +-
 .../item-detail-preview.component.ts                  | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html
index bd00c9411f2..c2f5299d4bc 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html
@@ -8,7 +8,7 @@
         <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
           <ds-themed-thumbnail [thumbnail]="item?.thumbnail | async"></ds-themed-thumbnail>
         </ds-metadata-field-wrapper>
-        <ng-container *ngVar="(getFiles() | async) as bitstreams">
+        <ng-container *ngIf="(bitstreams$ | async) as bitstreams">
           <ds-metadata-field-wrapper [label]="('item.page.files' | translate)">
             <div *ngIf="bitstreams?.length > 0" class="file-section">
               <button class="btn btn-link" *ngFor="let file of bitstreams; let last=last;" (click)="downloadBitstreamFile(file?.uuid)">
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts
index 2e290bfffa5..b881590f4bf 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input } from '@angular/core';
+import { Component, Input, OnChanges, SimpleChanges } from '@angular/core';
 
 import { Observable } from 'rxjs';
 import { first } from 'rxjs/operators';
@@ -13,6 +13,7 @@ import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service
 import { SearchResult } from '../../../search/models/search-result.model';
 import { Context } from '../../../../core/shared/context.model';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { hasValue } from '../../../empty.util';
 
 /**
  * This component show metadata for the given item object in the detail view.
@@ -23,7 +24,7 @@ import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
   templateUrl: './item-detail-preview.component.html',
   animations: [fadeInOut]
 })
-export class ItemDetailPreviewComponent {
+export class ItemDetailPreviewComponent implements OnChanges {
   /**
    * The item to display
    */
@@ -62,6 +63,12 @@ export class ItemDetailPreviewComponent {
   ) {
   }
 
+  ngOnChanges(changes: SimpleChanges): void {
+    if (hasValue(changes.item)) {
+      this.bitstreams$ = this.getFiles();
+    }
+  }
+
   /**
    * Perform bitstream download
    */

From 5ee721f2c4b11c1d25c974d2e7c5880e7b9c45de Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 6 Dec 2024 18:08:57 +0100
Subject: [PATCH 2/2] 117287: Embed the communities/collections on the EPerson
 groups

---
 .../epeople-registry/eperson-form/eperson-form.component.ts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
index 296038ca2ba..2e136711789 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
@@ -279,7 +279,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
         this.groups = this.groupsDataService.findListByHref(eperson._links.groups.href, {
           currentPage: 1,
           elementsPerPage: this.config.pageSize
-        });
+        }, undefined, undefined, followLink('object'));
       }
       this.formGroup.patchValue({
         firstName: eperson != null ? eperson.firstMetadataValue('eperson.firstname') : '',