Skip to content

Commit 1f4700c

Browse files
Merge remote-tracking branch 'refs/remotes/alex/w2p-113901_edit-item-relationships-does-not-display-tilted-relationships' into dspace-7_x
# Conflicts: # src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
2 parents 27c57d6 + 7a9bb4d commit 1f4700c

3 files changed

Lines changed: 13 additions & 5 deletions

File tree

src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,10 @@ describe('EditRelationshipListComponent', () => {
163163
getFieldUpdates: observableOf({
164164
[relationships[0].uuid]: fieldUpdate1,
165165
[relationships[1].uuid]: fieldUpdate2
166-
})
166+
}),
167+
// eslint-disable-next-line @typescript-eslint/no-empty-function
168+
initialize: () => {
169+
},
167170
}
168171
);
169172

src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -479,9 +479,14 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
479479
...linksToFollow
480480
);
481481
}),
482-
).subscribe((rd: RemoteData<PaginatedList<Relationship>>) => {
483-
this.relationshipsRd$.next(rd);
484-
})
482+
tap((rd: RemoteData<PaginatedList<Relationship>>) => {
483+
this.relationshipsRd$.next(rd);
484+
}),
485+
getAllSucceededRemoteData(),
486+
getRemoteDataPayload(),
487+
).subscribe((relationshipPaginatedList: PaginatedList<Relationship>) => {
488+
this.objectUpdatesService.initialize(this.url, relationshipPaginatedList.page, new Date());
489+
}),
485490
);
486491

487492
// keep isLastPage$ up to date based on relationshipsRd$

src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ <h4 class="modal-title" id="modal-title">{{ ('submission.sections.describe.relat
8585
<button class="btn btn-primary submit"
8686
[disabled]="(toAdd.length == 0 && toRemove.length == 0) || isPending"
8787
(click)="submitEv()">
88-
<span *ngIf="isPending" class="spinner-border spinner-border-sm" role="status"
88+
<span *ngIf="isPending" class="spinner-border spinner-border-sm mr-1" role="status"
8989
aria-hidden="true"></span>
9090
<i *ngIf="!isPending" class="fas fa-save"></i>
9191
<span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>

0 commit comments

Comments
 (0)