Skip to content

Commit c1aabf6

Browse files
authored
Merge pull request DSpace#3720 from alexandrevryghem/w2p-117573_remove-observable-function-calls-from-template_contribute-main
Embed the community/collection on the edit EPerson page
2 parents 5a71902 + 11626e2 commit c1aabf6

3 files changed

Lines changed: 12 additions & 3 deletions

File tree

src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
343343
this.groups$ = this.groupsDataService.findListByHref(eperson._links.groups.href, {
344344
currentPage: 1,
345345
elementsPerPage: this.config.pageSize,
346-
});
346+
}, undefined, undefined, followLink('object'));
347347
}
348348
this.formGroup.patchValue({
349349
firstName: eperson != null ? eperson.firstMetadataValue('eperson.firstname') : '',

src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<ds-metadata-field-wrapper [hideIfNoTextContent]="false">
99
<ds-thumbnail [thumbnail]="item?.thumbnail | async"></ds-thumbnail>
1010
</ds-metadata-field-wrapper>
11-
<ng-container *ngVar="(getFiles() | async) as bitstreams">
11+
<ng-container *ngIf="(bitstreams$ | async) as bitstreams">
1212
<ds-metadata-field-wrapper [label]="('item.page.files' | translate)">
1313
<div *ngIf="bitstreams?.length > 0" class="file-section">
1414
<button class="btn btn-link" *ngFor="let file of bitstreams; let last=last;" (click)="downloadBitstreamFile(file?.uuid)">

src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import {
66
import {
77
Component,
88
Input,
9+
OnChanges,
10+
SimpleChanges,
911
} from '@angular/core';
1012
import { TranslateModule } from '@ngx-translate/core';
1113
import { Observable } from 'rxjs';
@@ -22,6 +24,7 @@ import { getFirstSucceededRemoteListPayload } from '../../../../core/shared/oper
2224
import { ThemedItemPageTitleFieldComponent } from '../../../../item-page/simple/field-components/specific-field/title/themed-item-page-field.component';
2325
import { ThemedThumbnailComponent } from '../../../../thumbnail/themed-thumbnail.component';
2426
import { fadeInOut } from '../../../animations/fade';
27+
import { hasValue } from '../../../empty.util';
2528
import { MetadataFieldWrapperComponent } from '../../../metadata-field-wrapper/metadata-field-wrapper.component';
2629
import { ThemedBadgesComponent } from '../../../object-collection/shared/badges/themed-badges.component';
2730
import { ItemSubmitterComponent } from '../../../object-collection/shared/mydspace-item-submitter/item-submitter.component';
@@ -41,7 +44,7 @@ import { ThemedItemDetailPreviewFieldComponent } from './item-detail-preview-fie
4144
standalone: true,
4245
imports: [NgIf, ThemedBadgesComponent, ThemedItemPageTitleFieldComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, VarDirective, NgFor, ThemedItemDetailPreviewFieldComponent, ItemSubmitterComponent, AsyncPipe, FileSizePipe, TranslateModule],
4346
})
44-
export class ItemDetailPreviewComponent {
47+
export class ItemDetailPreviewComponent implements OnChanges {
4548
/**
4649
* The item to display
4750
*/
@@ -80,6 +83,12 @@ export class ItemDetailPreviewComponent {
8083
) {
8184
}
8285

86+
ngOnChanges(changes: SimpleChanges): void {
87+
if (hasValue(changes.item)) {
88+
this.bitstreams$ = this.getFiles();
89+
}
90+
}
91+
8392
/**
8493
* Perform bitstream download
8594
*/

0 commit comments

Comments
 (0)