Skip to content

Commit

Permalink
Merge pull request #3103 from alexandrevryghem/w2p-113901_edit-item-r…
Browse files Browse the repository at this point in the history
…elationships-does-not-display-tilted-relationships_contribute-7_x

[Port dspace-7_x] Fixed edit item relationships tab not displaying tilted relationships
  • Loading branch information
tdonohue authored Jun 6, 2024
2 parents 27c57d6 + 1f4700c commit 0d3db9f
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,10 @@ describe('EditRelationshipListComponent', () => {
getFieldUpdates: observableOf({
[relationships[0].uuid]: fieldUpdate1,
[relationships[1].uuid]: fieldUpdate2
})
}),
// eslint-disable-next-line @typescript-eslint/no-empty-function
initialize: () => {
},
}
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -479,9 +479,14 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
...linksToFollow
);
}),
).subscribe((rd: RemoteData<PaginatedList<Relationship>>) => {
this.relationshipsRd$.next(rd);
})
tap((rd: RemoteData<PaginatedList<Relationship>>) => {
this.relationshipsRd$.next(rd);
}),
getAllSucceededRemoteData(),
getRemoteDataPayload(),
).subscribe((relationshipPaginatedList: PaginatedList<Relationship>) => {
this.objectUpdatesService.initialize(this.url, relationshipPaginatedList.page, new Date());
}),
);

// keep isLastPage$ up to date based on relationshipsRd$
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ <h4 class="modal-title" id="modal-title">{{ ('submission.sections.describe.relat
<button class="btn btn-primary submit"
[disabled]="(toAdd.length == 0 && toRemove.length == 0) || isPending"
(click)="submitEv()">
<span *ngIf="isPending" class="spinner-border spinner-border-sm" role="status"
<span *ngIf="isPending" class="spinner-border spinner-border-sm mr-1" role="status"
aria-hidden="true"></span>
<i *ngIf="!isPending" class="fas fa-save"></i>
<span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
Expand Down

0 comments on commit 0d3db9f

Please sign in to comment.