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
alexandrevryghem · Jun 2, 2024 · e25f2ea · e25f2ea
2 parents b0a8a50 + 38916ae
commit e25f2ea
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/...t-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/...t-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -43,6 +43,7 @@ import {
   AppConfig,
 } from '../../../../../config/app-config.interface';
 import { LinkService } from '../../../../core/cache/builders/link.service';
+import { RequestParam } from '../../../../core/cache/models/request-param.model';
 import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
 import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model';
 import { FieldUpdates } from '../../../../core/data/object-updates/field-updates.model';
@@ -494,15 +495,19 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
       observableCombineLatest([
         currentPagination$,
         this.currentItemIsLeftItem$,
+        this.relatedEntityType$,
       ]).pipe(
-        switchMap(([currentPagination, currentItemIsLeftItem]: [PaginationComponentOptions, boolean]) => {
-          // get the relationships for the current item, relationshiptype and page
+        switchMap(([currentPagination, currentItemIsLeftItem, relatedEntityType]: [PaginationComponentOptions, boolean, ItemType]) => {
+          // get the relationships for the current page, item, relationship type and related entity type
           return this.relationshipService.getItemRelationshipsByLabel(
             this.item,
             currentItemIsLeftItem ? this.relationshipType.leftwardType : this.relationshipType.rightwardType,
             {
               elementsPerPage: currentPagination.pageSize,
               currentPage: currentPagination.currentPage,
+              searchParams: [
+                new RequestParam('relatedEntityType', relatedEntityType.label),
+              ],
             },
             true,
             true,