From a9c5c20c5aa810d516eb28d87ee1f217336fe90a Mon Sep 17 00:00:00 2001
From: Marie Verdonck <maria.verdonck@atmire.com>
Date: Fri, 16 Jun 2023 11:45:26 +0200
Subject: [PATCH] 102415: Provide all external sources of correct entity type
 in edit relationships ({item-page}/edit/relationship)

---
 .../dynamic-lookup-relation-modal.component.ts  | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
index 69c2ac3b7f..95acd0f41d 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
@@ -30,6 +30,10 @@ import { getAllSucceededRemoteDataPayload } from '../../../../../core/shared/ope
 import { followLink } from '../../../../utils/follow-link-config.model';
 import { RelationshipType } from '../../../../../core/shared/item-relationships/relationship-type.model';
 import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { FindListOptions } from '../../../../../core/data/request.models';
+import { RequestParam } from '../../../../../core/cache/models/request-param.model';
+import { getFirstSucceededRemoteDataPayload } from '../../../../../core/shared/operators';
+import { PaginatedList } from '../../../../../core/data/paginated-list.model';
 
 @Component({
   selector: 'ds-dynamic-lookup-relation-modal',
@@ -202,6 +206,19 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
       ).pipe(
         getAllSucceededRemoteDataPayload()
       );
+    } else {
+      const findListOptions = Object.assign({}, new FindListOptions(), {
+        elementsPerPage: 5,
+        currentPage: 1,
+        searchParams: [
+          new RequestParam('entityType', this.relationshipOptions.relationshipType)
+        ]
+      });
+      this.externalSourcesRD$ = this.externalSourceService.searchBy('findByEntityType', findListOptions,
+        true, true, followLink('entityTypes'))
+        .pipe(getFirstSucceededRemoteDataPayload(), map((r: PaginatedList<ExternalSource>) => {
+          return r.page;
+        }));
     }
 
     this.setTotals();