From 22b45c135f8995544c35bce932fb238348013784 Mon Sep 17 00:00:00 2001
From: "opensearch-trigger-bot[bot]"
 <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 10:20:59 -0700
Subject: [PATCH] Add data source reference id in data layer search request
 (#623) (#624)

Signed-off-by: Junqiu Lei <junqiu@amazon.com>
(cherry picked from commit 1e88c7187eea6a292fc967982dc3a089a6fd1f74)

Co-authored-by: Junqiu Lei <junqiu@amazon.com>
---
 CHANGELOG.md                          | 1 +
 public/model/layerRenderController.ts | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7dfe96ec..39419d06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Features
 ### Enhancements
 ### Bug Fixes
+* Add data source reference id in data layer search request ([#623](https://github.com/opensearch-project/dashboards-maps/pull/623))
 ### Infrastructure
 ### Documentation
 ### Maintenance
diff --git a/public/model/layerRenderController.ts b/public/model/layerRenderController.ts
index 77786413..6576a4d4 100644
--- a/public/model/layerRenderController.ts
+++ b/public/model/layerRenderController.ts
@@ -76,6 +76,7 @@ export const prepareDataLayerSource = (
           ...(timeFilters ? [timeFilters] : []),
         ]);
       }
+      const dataSourceId = indexPattern?.dataSourceRef?.id;
       const request = {
         params: {
           index: indexPatternRefName,
@@ -85,6 +86,7 @@ export const prepareDataLayerSource = (
             query: mergedQuery,
           },
         },
+        ...(!!dataSourceId && { dataSourceId }),
       };
 
       const search$ = data.search.search(request).subscribe({