Skip to content

Commit e25f2ea

Browse files
Merge branch 'w2p-115434_byLabel-related-entity-type_contribute-7.6' into w2p-115434_byLabel-related-entity-type_contribute-main
# Conflicts: # src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
2 parents b0a8a50 + 38916ae commit e25f2ea

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ import {
4343
AppConfig,
4444
} from '../../../../../config/app-config.interface';
4545
import { LinkService } from '../../../../core/cache/builders/link.service';
46+
import { RequestParam } from '../../../../core/cache/models/request-param.model';
4647
import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
4748
import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model';
4849
import { FieldUpdates } from '../../../../core/data/object-updates/field-updates.model';
@@ -494,15 +495,19 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
494495
observableCombineLatest([
495496
currentPagination$,
496497
this.currentItemIsLeftItem$,
498+
this.relatedEntityType$,
497499
]).pipe(
498-
switchMap(([currentPagination, currentItemIsLeftItem]: [PaginationComponentOptions, boolean]) => {
499-
// get the relationships for the current item, relationshiptype and page
500+
switchMap(([currentPagination, currentItemIsLeftItem, relatedEntityType]: [PaginationComponentOptions, boolean, ItemType]) => {
501+
// get the relationships for the current page, item, relationship type and related entity type
500502
return this.relationshipService.getItemRelationshipsByLabel(
501503
this.item,
502504
currentItemIsLeftItem ? this.relationshipType.leftwardType : this.relationshipType.rightwardType,
503505
{
504506
elementsPerPage: currentPagination.pageSize,
505507
currentPage: currentPagination.currentPage,
508+
searchParams: [
509+
new RequestParam('relatedEntityType', relatedEntityType.label),
510+
],
506511
},
507512
true,
508513
true,

0 commit comments

Comments
 (0)