Move credential saved object to data source plugin and add UI fast fo…

…llow-up fixes Signed-off-by: Louis Chu <clingzhi@amazon.com>
opensearch-project · Aug 3, 2022 · 1897883 · 1897883
1 parent 0805a2e
commit 1897883
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 85 deletions.
diff --git a/config/opensearch_dashboards.yml b/config/opensearch_dashboards.yml
@@ -184,3 +184,6 @@
 # Set the value of this setting to false to suppress search usage telemetry
 # for reducing the load of OpenSearch cluster.
 # data.search.usageTelemetry.enabled: false
+
+# Set the value of this setting to true to fetch data from multiple OpenSearch clusters
+# data_source.enabled: false
diff --git a/src/plugins/credential_management/.i18nrc.json b/src/plugins/credential_management/.i18nrc.json
diff --git a/src/plugins/credential_management/opensearch_dashboards.json b/src/plugins/credential_management/opensearch_dashboards.json
@@ -1,7 +1,7 @@
 {
   "id": "credentialManagement",
   "version": "opensearchDashboards",
-  "server": true,
+  "server": false,
   "ui": true,
   "requiredPlugins": ["management"],
   "requiredBundles": ["opensearchDashboardsReact"]

diff --git a/src/plugins/credential_management/public/components/create_button/create_button.tsx b/src/plugins/credential_management/public/components/create_button/create_button.tsx
@@ -3,16 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-// @ts-ignore
-import { euiColorAccent } from '@elastic/eui/dist/eui_theme_light.json';
 import React from 'react';
-import * as H from 'history';
+import { History } from 'history';
 
 import { EuiButton } from '@elastic/eui';
 import { FormattedMessage } from '@osd/i18n/react';
 
 interface Props {
-  history: H.History;
+  history: History;
 }
 
 export const CreateButton = ({ history }: Props) => {

diff --git a/src/plugins/credential_management/server/index.ts b/src/plugins/credential_management/server/index.ts
diff --git a/src/plugins/credential_management/server/plugin.ts b/src/plugins/credential_management/server/plugin.ts
diff --git a/src/plugins/credential_management/server/saved_objects/index.ts b/src/plugins/credential_management/server/saved_objects/index.ts
diff --git a/src/plugins/credential_management/server/types.ts b/src/plugins/credential_management/server/types.ts
diff --git a/src/plugins/data_source/server/plugin.ts b/src/plugins/data_source/server/plugin.ts
@@ -4,7 +4,7 @@
  */
 
 import { PluginInitializerContext, CoreSetup, CoreStart, Plugin, Logger } from 'src/core/server';
-import { dataSource } from './saved_objects';
+import { dataSource, credential } from './saved_objects';
 
 import { DataSourcePluginSetup, DataSourcePluginStart } from './types';
 
@@ -17,6 +17,11 @@ export class DataSourcePlugin implements Plugin<DataSourcePluginSetup, DataSourc
 
   public setup(core: CoreSetup) {
     this.logger.debug('data_source: Setup');
+
+    // Register credential saved object type
+    core.savedObjects.registerType(credential);
+
+    // Register data source saved object type
     core.savedObjects.registerType(dataSource);
 
     return {};

diff --git a/..._objects/credential_saved_objects_type.ts → ..._objects/credential_saved_objects_type.ts b/..._objects/credential_saved_objects_type.ts → ..._objects/credential_saved_objects_type.ts
@@ -5,7 +5,7 @@
 
 import { SavedObjectsType } from 'opensearch-dashboards/server';
 
-export const credentialSavedObjectType: SavedObjectsType = {
+export const credential: SavedObjectsType = {
   name: 'credential',
   hidden: false,
   namespaceType: 'agnostic',

diff --git a/src/plugins/data_source/server/saved_objects/index.ts b/src/plugins/data_source/server/saved_objects/index.ts
@@ -3,4 +3,5 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+export { credential } from './credential_saved_objects_type';
 export { dataSource } from './data_source';