hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-14 13:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3107 from tdonohue/port_3098_to_7x

Browse Source 
[Port dspace-7_x] Fixed item edit relationships with same type name but different entities all being shown under same label
This commit is contained in:
Tim Donohue
2024-06-10 09:32:40 -05:00
committed by GitHub
parent 0d3db9f19d 31ab05f4fe
commit 2d28dfc6e6
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,6 +64,7 @@ import { FieldChangeType } from '../../../../core/data/object-updates/field-chan
import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interface'; import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interface';
import { itemLinksToFollow } from '../../../../shared/utils/relation-query.utils'; import { itemLinksToFollow } from '../../../../shared/utils/relation-query.utils';
import { EditItemRelationshipsService } from '../edit-item-relationships.service'; import { EditItemRelationshipsService } from '../edit-item-relationships.service';
import { RequestParam } from '../../../../core/cache/models/request-param.model';
@Component({ @Component({
selector: 'ds-edit-relationship-list', selector: 'ds-edit-relationship-list',
@@ -464,15 +465,19 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
observableCombineLatest([ observableCombineLatest([
currentPagination$, currentPagination$,
this.currentItemIsLeftItem$, this.currentItemIsLeftItem$,
this.relatedEntityType$,
]).pipe( ]).pipe(
switchMap(([currentPagination, currentItemIsLeftItem]: [PaginationComponentOptions, boolean]) => { switchMap(([currentPagination, currentItemIsLeftItem, relatedEntityType]: [PaginationComponentOptions, boolean, ItemType]) => {
// get the relationships for the current item, relationshiptype and page // get the relationships for the current page, item, relationship type and related entity type
return this.relationshipService.getItemRelationshipsByLabel( return this.relationshipService.getItemRelationshipsByLabel(
this.item, this.item,
currentItemIsLeftItem ? this.relationshipType.leftwardType : this.relationshipType.rightwardType, currentItemIsLeftItem ? this.relationshipType.leftwardType : this.relationshipType.rightwardType,
{ {
elementsPerPage: currentPagination.pageSize, elementsPerPage: currentPagination.pageSize,
currentPage: currentPagination.currentPage currentPage: currentPagination.currentPage,
searchParams: [
new RequestParam('relatedEntityType', relatedEntityType.label),
],
}, },
true, true,
true, true,