[Multiple Datasource][Version Decoupling] Add data source version and…

… installed plugins in MDS data source viewer returns (#7172) * [Multiple Datasource][Version Decoupling] Add data source version and installed plugins in MDS data source viewer returns Signed-off-by: Zilong Xia <[email protected]> * Changeset file for PR #7172 created/updated --------- Signed-off-by: Zilong Xia <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> (cherry picked from commit 901e39f) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-project · Jul 5, 2024 · 6264d4a · 6264d4a
1 parent 71a791b
commit 6264d4a
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 14 deletions.
diff --git a/changelogs/fragments/7172.yml b/changelogs/fragments/7172.yml
@@ -0,0 +1,2 @@
+fix:
+- [MDS][Version Decoupling] Add dataSourceVersion' and  'installedPlugins in viewer returns ([#7172](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/7172))
diff --git a/...gement/public/components/data_source_aggregated_view/data_source_aggregated_view.test.tsx b/...gement/public/components/data_source_aggregated_view/data_source_aggregated_view.test.tsx
@@ -127,7 +127,7 @@ describe('DataSourceAggregatedView: read all view (displayAllCompatibleDataSourc
       // Renders normally
       expect(component).toMatchSnapshot();
       expect(client.find).toBeCalledWith({
-        fields: ['id', 'title', 'auth.type'],
+        fields: ['id', 'title', 'auth.type', 'dataSourceVersion', 'installedPlugins'],
         perPage: 10000,
         type: 'data-source',
       });
@@ -247,7 +247,7 @@ describe('DataSourceAggregatedView: read active view (displayAllCompatibleDataSo
       // Should render normally
       expect(component).toMatchSnapshot();
       expect(client.find).toBeCalledWith({
-        fields: ['id', 'title', 'auth.type'],
+        fields: ['id', 'title', 'auth.type', 'dataSourceVersion', 'installedPlugins'],
         perPage: 10000,
         type: 'data-source',
       });

diff --git a/..._management/public/components/data_source_aggregated_view/data_source_aggregated_view.tsx b/..._management/public/components/data_source_aggregated_view/data_source_aggregated_view.tsx
@@ -97,7 +97,13 @@ export class DataSourceAggregatedView extends React.Component<
 
   async componentDidMount() {
     this._isMounted = true;
-    getDataSourcesWithFields(this.props.savedObjectsClient, ['id', 'title', 'auth.type'])
+    getDataSourcesWithFields(this.props.savedObjectsClient, [
+      'id',
+      'title',
+      'auth.type',
+      'dataSourceVersion',
+      'installedPlugins',
+    ])
       .then((fetchedDataSources) => {
         const allDataSourcesIdToTitleMap = new Map();
 

diff --git a/...ata_source_management/public/components/data_source_menu/create_data_source_menu.test.tsx b/...ata_source_management/public/components/data_source_menu/create_data_source_menu.test.tsx
@@ -56,7 +56,7 @@ describe('create data source menu', () => {
     const component = render(<TestComponent {...props} />);
     expect(component).toMatchSnapshot();
     expect(client.find).toBeCalledWith({
-      fields: ['id', 'title', 'auth.type'],
+      fields: ['id', 'title', 'auth.type', 'dataSourceVersion', 'installedPlugins'],
       perPage: 10000,
       type: 'data-source',
     });
@@ -86,7 +86,7 @@ describe('create data source menu', () => {
 
     expect(component).toMatchSnapshot();
     expect(client.find).toBeCalledWith({
-      fields: ['id', 'title', 'auth.type'],
+      fields: ['id', 'title', 'auth.type', 'dataSourceVersion', 'installedPlugins'],
       perPage: 10000,
       type: 'data-source',
     });
@@ -158,7 +158,7 @@ describe('when setMenuMountPoint is provided', () => {
     await refresh();
     expect(component).toMatchSnapshot();
     expect(client.find).toBeCalledWith({
-      fields: ['id', 'title', 'auth.type'],
+      fields: ['id', 'title', 'auth.type', 'dataSourceVersion', 'installedPlugins'],
       perPage: 10000,
       type: 'data-source',
     });

diff --git a/...ment/public/components/data_source_multi_selectable/data_source_multi_selectable.test.tsx b/...ment/public/components/data_source_multi_selectable/data_source_multi_selectable.test.tsx
@@ -49,7 +49,7 @@ describe('DataSourceMultiSelectable', () => {
     );
     expect(component).toMatchSnapshot();
     expect(client.find).toBeCalledWith({
-      fields: ['id', 'title', 'auth.type'],
+      fields: ['id', 'title', 'auth.type', 'dataSourceVersion', 'installedPlugins'],
       perPage: 10000,
       type: 'data-source',
     });
@@ -68,7 +68,7 @@ describe('DataSourceMultiSelectable', () => {
     );
     expect(component).toMatchSnapshot();
     expect(client.find).toBeCalledWith({
-      fields: ['id', 'title', 'auth.type'],
+      fields: ['id', 'title', 'auth.type', 'dataSourceVersion', 'installedPlugins'],
       perPage: 10000,
       type: 'data-source',
     });

diff --git a/...anagement/public/components/data_source_multi_selectable/data_source_multi_selectable.tsx b/...anagement/public/components/data_source_multi_selectable/data_source_multi_selectable.tsx
@@ -83,6 +83,8 @@ export class DataSourceMultiSelectable extends React.Component<
         'id',
         'title',
         'auth.type',
+        'dataSourceVersion',
+        'installedPlugins',
       ]);
 
       if (fetchedDataSources?.length) {

diff --git a/...ource_management/public/components/data_source_selectable/data_source_selectable.test.tsx b/...ource_management/public/components/data_source_selectable/data_source_selectable.test.tsx
@@ -56,7 +56,7 @@ describe('DataSourceSelectable', () => {
     );
     expect(component).toMatchSnapshot();
     expect(client.find).toBeCalledWith({
-      fields: ['id', 'title', 'auth.type'],
+      fields: ['id', 'title', 'auth.type', 'dataSourceVersion', 'installedPlugins'],
       perPage: 10000,
       type: 'data-source',
     });
@@ -76,7 +76,7 @@ describe('DataSourceSelectable', () => {
     );
     expect(component).toMatchSnapshot();
     expect(client.find).toBeCalledWith({
-      fields: ['id', 'title', 'auth.type'],
+      fields: ['id', 'title', 'auth.type', 'dataSourceVersion', 'installedPlugins'],
       perPage: 10000,
       type: 'data-source',
     });

diff --git a/...ata_source_management/public/components/data_source_selectable/data_source_selectable.tsx b/...ata_source_management/public/components/data_source_selectable/data_source_selectable.tsx
@@ -184,6 +184,8 @@ export class DataSourceSelectable extends React.Component<
         'id',
         'title',
         'auth.type',
+        'dataSourceVersion',
+        'installedPlugins',
       ]);
 
       const dataSourceOptions: DataSourceOption[] = getFilteredDataSources(

diff --git a/...ce_management/public/components/data_source_selector/create_data_source_selector.test.tsx b/...ce_management/public/components/data_source_selector/create_data_source_selector.test.tsx
@@ -45,7 +45,7 @@ describe('create data source selector', () => {
     const component = render(<TestComponent {...props} />);
     expect(component).toMatchSnapshot();
     expect(client.find).toBeCalledWith({
-      fields: ['id', 'title', 'auth.type'],
+      fields: ['id', 'title', 'auth.type', 'dataSourceVersion', 'installedPlugins'],
       perPage: 10000,
       type: 'data-source',
     });

diff --git a/...ta_source_management/public/components/data_source_selector/data_source_selector.test.tsx b/...ta_source_management/public/components/data_source_selector/data_source_selector.test.tsx
@@ -46,7 +46,7 @@ describe('DataSourceSelector', () => {
     );
     expect(component).toMatchSnapshot();
     expect(client.find).toBeCalledWith({
-      fields: ['id', 'title', 'auth.type'],
+      fields: ['id', 'title', 'auth.type', 'dataSourceVersion', 'installedPlugins'],
       perPage: 10000,
       type: 'data-source',
     });
@@ -67,7 +67,7 @@ describe('DataSourceSelector', () => {
     );
     expect(component).toMatchSnapshot();
     expect(client.find).toBeCalledWith({
-      fields: ['id', 'title', 'auth.type'],
+      fields: ['id', 'title', 'auth.type', 'dataSourceVersion', 'installedPlugins'],
       perPage: 10000,
       type: 'data-source',
     });

diff --git a/...ns/data_source_management/public/components/data_source_selector/data_source_selector.tsx b/...ns/data_source_management/public/components/data_source_selector/data_source_selector.tsx
@@ -145,6 +145,8 @@ export class DataSourceSelector extends React.Component<
         'id',
         'title',
         'auth.type',
+        'dataSourceVersion',
+        'installedPlugins',
       ]);
 
       // 2. Process

diff --git a/src/plugins/data_source_management/public/components/utils.ts b/src/plugins/data_source_management/public/components/utils.ts
@@ -43,7 +43,7 @@ export async function getDataSources(savedObjectsClient: SavedObjectsClientContr
   return savedObjectsClient
     .find({
       type: 'data-source',
-      fields: ['id', 'description', 'title'],
+      fields: ['id', 'description', 'title', 'dataSourceVersion', 'installedPlugins'],
       perPage: 10000,
     })
     .then(
@@ -52,12 +52,16 @@ export async function getDataSources(savedObjectsClient: SavedObjectsClientContr
           const id = source.id;
           const title = source.get('title');
           const description = source.get('description');
+          const datasourceversion = source.get('dataSourceVersion');
+          const installedplugins = source.get('installedPlugins');
 
           return {
             id,
             title,
             description,
             sort: `${title}`,
+            datasourceversion,
+            installedplugins,
           };
         }) || []
     );
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		fix:
		- [MDS][Version Decoupling] Add dataSourceVersion' and 'installedPlugins in viewer returns ([#7172](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/7172))