From 9dd3b97cb800dcae137f44ea7af9b695bc9f8e2b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 23 Jul 2024 22:59:22 +0000
Subject: [PATCH] [Multiple Datasource][Version Decoupling] Add data source
 version and installed plugins in data source viewer returns (#7420)

* [Multiple Datasource][Version Decoupling] Add data source version and installed plugins in data source viewer returns

Signed-off-by: Zilong Xia <zilongx@amazon.com>

* [Multiple Datasource][Version Decoupling] Add data source version and installed plugins in data source viewer returns

Signed-off-by: Zilong Xia <zilongx@amazon.com>

* Lint fix

Signed-off-by: Zilong Xia <zilongx@amazon.com>

* Update src/plugins/data_source_management/public/components/data_source_view/data_source_view.tsx

Co-authored-by: Lu Yu <nluyu@amazon.com>
Signed-off-by: ZilongX <99905560+ZilongX@users.noreply.github.com>

* Changeset file for PR #7420 created/updated

---------

Signed-off-by: Zilong Xia <zilongx@amazon.com>
Signed-off-by: ZilongX <99905560+ZilongX@users.noreply.github.com>
Co-authored-by: Lu Yu <nluyu@amazon.com>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
(cherry picked from commit 2bbd9fec995fc311f0d97c640352931de491c92d)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 changelogs/fragments/7420.yml                   |  2 ++
 .../data_source_view/data_source_view.tsx       | 17 ++++++++++++-----
 .../public/components/utils.ts                  |  2 ++
 3 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 changelogs/fragments/7420.yml

diff --git a/changelogs/fragments/7420.yml b/changelogs/fragments/7420.yml
new file mode 100644
index 000000000000..7426906bfd47
--- /dev/null
+++ b/changelogs/fragments/7420.yml
@@ -0,0 +1,2 @@
+fix:
+- [Version Decoupling] Add data source version and installed plugins in data source viewer returns ([#7420](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/7420))
\ No newline at end of file
diff --git a/src/plugins/data_source_management/public/components/data_source_view/data_source_view.tsx b/src/plugins/data_source_management/public/components/data_source_view/data_source_view.tsx
index f80710b6452e..3adcf65612c4 100644
--- a/src/plugins/data_source_management/public/components/data_source_view/data_source_view.tsx
+++ b/src/plugins/data_source_management/public/components/data_source_view/data_source_view.tsx
@@ -82,11 +82,7 @@ export class DataSourceView extends React.Component<DataSourceViewProps, DataSou
       return;
     }
 
-    if (
-      (optionId === '' && this.props.hideLocalCluster) ||
-      (this.props.dataSourceFilter &&
-        this.props.selectedOption.filter(this.props.dataSourceFilter).length === 0)
-    ) {
+    if (optionId === '' && this.props.hideLocalCluster) {
       this.setState({
         selectedOption: [],
       });
@@ -100,6 +96,17 @@ export class DataSourceView extends React.Component<DataSourceViewProps, DataSou
           optionId,
           this.props.savedObjectsClient!
         );
+        if (
+          this.props.dataSourceFilter &&
+          [selectedDataSource].filter(this.props.dataSourceFilter).length === 0
+        ) {
+          this.setState({
+            selectedOption: [],
+          });
+          this.onSelectedDataSources([]);
+          return;
+        }
+
         if (!this._isMounted) return;
         this.setState({
           selectedOption: [{ id: optionId, label: selectedDataSource.title }],
diff --git a/src/plugins/data_source_management/public/components/utils.ts b/src/plugins/data_source_management/public/components/utils.ts
index aa54f8b352fe..b1ccf2c9130c 100644
--- a/src/plugins/data_source_management/public/components/utils.ts
+++ b/src/plugins/data_source_management/public/components/utils.ts
@@ -205,6 +205,8 @@ export async function getDataSourceById(
     endpoint: attributes.endpoint,
     description: attributes.description || '',
     auth: attributes.auth,
+    datasourceversion: attributes.dataSourceVersion,
+    installedplugins: attributes.installedPlugins,
   };
 }