From f55e3cc088d3a1453b3e02a2cd6d345f759c84a9 Mon Sep 17 00:00:00 2001
From: Zilong Xia <zilongx@amazon.com>
Date: Tue, 23 Jul 2024 15:11:16 -0700
Subject: [PATCH 1/5] [Multiple Datasource][Version Decoupling] Add data source
 version and installed plugins in data source viewer returns

Signed-off-by: Zilong Xia <zilongx@amazon.com>
---
 src/plugins/data_source_management/public/components/utils.ts | 2 ++
 1 file changed, 2 insertions(+)

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,
   };
 }
 

From 6e9f08537ec1a3de5371b4936471100b7eda5310 Mon Sep 17 00:00:00 2001
From: Zilong Xia <zilongx@amazon.com>
Date: Tue, 23 Jul 2024 15:39:16 -0700
Subject: [PATCH 2/5] [Multiple Datasource][Version Decoupling] Add data source
 version and installed plugins in data source viewer returns

Signed-off-by: Zilong Xia <zilongx@amazon.com>
---
 .../components/data_source_view/data_source_view.tsx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

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..938aaa0b45c0 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
@@ -83,10 +83,7 @@ export class DataSourceView extends React.Component<DataSourceViewProps, DataSou
     }
 
     if (
-      (optionId === '' && this.props.hideLocalCluster) ||
-      (this.props.dataSourceFilter &&
-        this.props.selectedOption.filter(this.props.dataSourceFilter).length === 0)
-    ) {
+      optionId === '' && this.props.hideLocalCluster) {
       this.setState({
         selectedOption: [],
       });
@@ -100,6 +97,13 @@ 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([]);
+        }
+        console.log("selected", selectedDataSource)
         if (!this._isMounted) return;
         this.setState({
           selectedOption: [{ id: optionId, label: selectedDataSource.title }],

From 1f445ef39c7a8fe392c29a25759577a4f8acd4e9 Mon Sep 17 00:00:00 2001
From: Zilong Xia <zilongx@amazon.com>
Date: Tue, 23 Jul 2024 22:50:55 +0000
Subject: [PATCH 3/5] Lint fix

Signed-off-by: Zilong Xia <zilongx@amazon.com>
---
 .../components/data_source_view/data_source_view.tsx   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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 938aaa0b45c0..5f9d79ebded5 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,8 +82,7 @@ export class DataSourceView extends React.Component<DataSourceViewProps, DataSou
       return;
     }
 
-    if (
-      optionId === '' && this.props.hideLocalCluster) {
+    if (optionId === '' && this.props.hideLocalCluster) {
       this.setState({
         selectedOption: [],
       });
@@ -97,13 +96,16 @@ export class DataSourceView extends React.Component<DataSourceViewProps, DataSou
           optionId,
           this.props.savedObjectsClient!
         );
-        if (this.props.dataSourceFilter && [selectedDataSource].filter(this.props.dataSourceFilter).length === 0) {
+        if (
+          this.props.dataSourceFilter &&
+          [selectedDataSource].filter(this.props.dataSourceFilter).length === 0
+        ) {
           this.setState({
             selectedOption: [],
           });
           this.onSelectedDataSources([]);
         }
-        console.log("selected", selectedDataSource)
+
         if (!this._isMounted) return;
         this.setState({
           selectedOption: [{ id: optionId, label: selectedDataSource.title }],

From f32474837980df29a2dea39f4d2907e3d8ede1a2 Mon Sep 17 00:00:00 2001
From: ZilongX <99905560+ZilongX@users.noreply.github.com>
Date: Tue, 23 Jul 2024 15:55:21 -0700
Subject: [PATCH 4/5] 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>
---
 .../public/components/data_source_view/data_source_view.tsx      | 1 +
 1 file changed, 1 insertion(+)

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 5f9d79ebded5..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
@@ -104,6 +104,7 @@ export class DataSourceView extends React.Component<DataSourceViewProps, DataSou
             selectedOption: [],
           });
           this.onSelectedDataSources([]);
+          return;
         }
 
         if (!this._isMounted) return;

From eaef2dfab3937ea8f4ece885a9c890c6f04d9eca Mon Sep 17 00:00:00 2001
From: "opensearch-changeset-bot[bot]"
 <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
Date: Tue, 23 Jul 2024 22:55:38 +0000
Subject: [PATCH 5/5] Changeset file for PR #7420 created/updated

---
 changelogs/fragments/7420.yml | 2 ++
 1 file changed, 2 insertions(+)
 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