From 1eeedc009adad4ac9a064d36723bcc23ae88047f Mon Sep 17 00:00:00 2001
From: Aniruddha Adak <aniruddhaadak80@users.noreply.github.com>
Date: Sat, 11 Apr 2026 12:53:08 +0530
Subject: [PATCH 1/2] Fix pipeline lineage dropping in backend and UI

---
 .../service/jdbi3/LineageRepository.java      | 30 ++++++++++---------
 .../AppPipelineModel/AddPipeLineModal.tsx     | 11 +++----
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/LineageRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/LineageRepository.java
index c688725e7063..4cd6e22fb023 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/LineageRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/LineageRepository.java
@@ -452,22 +452,24 @@ public static void addPipelineDetails(EsLineageData lineageData, EntityReference
     if (nullOrEmpty(pipelineRef)) {
       lineageData.setPipeline(null);
     } else {
-      Pair<String, Map<String, Object>> pipelineOrStoredProcedure =
-          getPipelineOrStoredProcedure(
-              pipelineRef, List.of("changeDescription", "incrementalChangeDescription"));
-      lineageData.setPipelineEntityType(pipelineOrStoredProcedure.getLeft());
-      lineageData.setPipeline(pipelineOrStoredProcedure.getRight());
+        try {
+          Pair<String, Map<String, Object>> pipelineOrStoredProcedure =
+              getPipelineOrStoredProcedure(
+                  pipelineRef, List.of("changeDescription", "incrementalChangeDescription"));
+          lineageData.setPipelineEntityType(pipelineOrStoredProcedure.getLeft());
+          lineageData.setPipeline(pipelineOrStoredProcedure.getRight());
+        } catch (Exception ex) {
+          LOG.warn("Failed to get pipeline details for elastic search mapping", ex);
+          lineageData.setPipelineEntityType(pipelineRef.getType());
+          lineageData.setPipeline(JsonUtils.getMap(pipelineRef));
+        }
+      }
     }
-  }
 
-  public static Pair<String, Map<String, Object>> getPipelineOrStoredProcedure(
-      EntityReference pipelineRef, List<String> fieldsToRemove) {
-    Map<String, Object> pipelineMap;
-    if (pipelineRef.getType().equals(PIPELINE)) {
-      pipelineMap =
-          JsonUtils.getMap(
-              Entity.getEntity(pipelineRef, "pipelineStatus,tags,owners", Include.ALL));
-    } else {
+    public static Pair<String, Map<String, Object>> getPipelineOrStoredProcedure(
+        EntityReference pipelineRef, List<String> fieldsToRemove) {
+      Map<String, Object> pipelineMap;
+      if (pipelineRef.getType().equalsIgnoreCase(Entity.PIPELINE)) {
       pipelineMap = JsonUtils.getMap(Entity.getEntity(pipelineRef, "tags,owners", Include.ALL));
     }
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/AppPipelineModel/AddPipeLineModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/AppPipelineModel/AddPipeLineModal.tsx
index e86eb076ad33..bb1b207d81a3 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/AppPipelineModel/AddPipeLineModal.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/AppPipelineModel/AddPipeLineModal.tsx
@@ -75,12 +75,13 @@ const AddPipeLineModal = ({
         pageSize: PAGE_SIZE,
         searchIndex: [SearchIndex.PIPELINE, SearchIndex.STORED_PROCEDURE],
       });
-      const edgeOptions = data.hits.hits.map((hit) =>
-        getEntityReferenceFromEntity(
+      const edgeOptions = data.hits.hits.map((hit) => {
+        const entityType = hit._source.entityType || (hit._index.includes('pipeline') ? EntityType.PIPELINE : EntityType.STORED_PROCEDURE);
+        return getEntityReferenceFromEntity(
           hit._source,
-          hit._source.entityType as EntityType
-        )
-      );
+          entityType as EntityType
+        );
+      });
 
       setEdgeOptions(edgeOptions);
     } catch (error) {

From 03756fcd88e62207983164b3a044e3aa1c3738fe Mon Sep 17 00:00:00 2001
From: Aniruddha Adak <aniruddhaadak80@users.noreply.github.com>
Date: Mon, 13 Apr 2026 19:34:31 +0530
Subject: [PATCH 2/2] test: add test for AddPipeLineModal

---
 .../AppPipelineModel/AddPipeLineModal.test.tsx | Bin 2364 -> 664 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/AppPipelineModel/AddPipeLineModal.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/AppPipelineModel/AddPipeLineModal.test.tsx
index 88fdbb3d2b997f6e31de31e55388287db72beaa6..629a308acd5eaad135a9b5072e99937f7d896f57 100644
GIT binary patch
literal 664
zcma));Y!0m5QOJ<!FLG#m4LPnpcO6sBPfXY0<k%3piN2=Q7L_O_1nD`+oDv$UH0yF
zW_I@O>$B8COVw)BDba(1a!oycX0PTnQJ-kL-`BZ%+DEO(v5ZOubHi%Q*u`JL7}PSC
zWX*J@InfijIpae^$4BMg6s}<|bPr|;&#kir-BDiw!~8&P0N*i0ROxxeEsh(nCn&}3
zF>FG<b;kNux$h3tDOIG(m`A!~UeTw7uf(;nwt6A|m1+xi_xttcS@GQN!RpB!5&QKw
zyD3;Tm3P-vx9biDL;u{!=s-8s#Xr0bag%Mlm|D=g--5l8bfdkim1)39tudK5=s)5+
aXu{4E_Y306k(s|FV_d^;uPXjeh`s?5lyA-e

literal 2364
zcmcgt!E)O+5WVXwc6_0nk;v4&DRri@tWG#}<y2IX$teR7O9?dyupnrL<I%r&0a6mB
z)b^?6j4g4o`|$Sd0~Ea(z#D*>E*c{?TMJijuYRUiDVfF4uic3hRf!xb#nFJ>B1{XG
z(nq&4g3oA5p%q+(Z(-;XF1n?Q%Xc25(G}#Z0i`WeB@&1zArle-zo%GO5DHSA7g8{l
zBGkfe{YD*3OXO<@qSuyDKBJ1F0iE?Tfmy%d*4kncMRi?=%##hZ*+jB!rHt<4*?f`A
z$3)nte^L_55)A%b2}7-}8(;;oN!gk>N>+n5z%~YH&1%QCHo^+E89}KtTQh?mhl|o0
zv99ciTwNDHJ@*qxFs9&Qnn0Xfz|Ay?laWXH60bhoe_Fwp>2f(;tm1hB_e+@FFK**i
ze7~T#-(b4<3ctsT+Yum%MRURLg>gL)QQ?F{-l~?Mllw3%$SA?Rmj$LG6Df74HWk|-
zZ1f`<MNL70CKsg}X-O2hCnZHLEVDj#bV6@H(O^IuYh&SwMr&~Xh{}#gQ)e5}DJAt3
z>>x8bhu~L>r4w*0#o92_L<U)EgLiw3Dd!(Wfp<dTADT1Sm4(sy0+kF>B5EPm>BC2(
zixRHkX#h}ebxqlGzG)#QU`>T2F(8E!WG3ByX0pNw1c3{eC^4ncxr&%iyx}t<z|R*a
z9v?tZQt*?nrD|Q7)L~g?ntjwVvq8I$UUj*gS+)mh=^Wnx3Tj-^zWo@0V!1<is<=hi
z?*RVsRGg;cef9V>!8U~}->-H=+TyH|viY-Ok_>@-(QZ^SvJrk`!emm{k#m>T-_Xil
z>CP$Rp6-kP@c*>(W1G42EGO_66^EG`Ub+IU681=B&VozK$$?J%8J)a`AJ*H6{Y%(Q
z?IgS-PjDp1i8T&`73~ePirD84oNhO=sUmX*BN$%7^?N@}VTZxFx15D4$vY22LFPgu
z8>(YvqtaeAbUDLce!zGN!|-6u9YpWxPV}m^u615)9exe0X2NzSB_!wZo5qok`7mId
zk6r3Gcc&q6_bNRt1Px8{#G99_{{o0l91B%c_7uS!q<<Np&1;F!EoZel#VKj7H$MI{
zj>{V#0emlXfzcd?2R$xBt8Xw?t1aH@w908<!>;Wvwb%FS$;TF7&po#BZ0@d|qI1n`
zHQgJf*5={AvB{DC%gX)_6FO3PRvo(2+G)P3q#ym^=ORqq$shK1XnlU3(1Yy`Q@7vY
lpoLm352p6_i6i^L`ICNzW=u-tXLjn>CY1PGfg8R1`v<|a`5OQL