Apply dataSource plugin as dependent for cm and dsm plugins (opensear…

…ch-project#2150) Signed-off-by: Louis Chu <[email protected]> Apply dataSource plugin as dependent for cm and dsm plugins (opensearch-project#2150)
kristenTian · Sep 14, 2022 · 22ef83d · 22ef83d
1 parent 61f8725
commit 22ef83d
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 15 deletions.
diff --git a/src/plugins/credential_management/opensearch_dashboards.json b/src/plugins/credential_management/opensearch_dashboards.json
@@ -3,6 +3,6 @@
   "version": "opensearchDashboards",
   "server": false,
   "ui": true,
-  "requiredPlugins": ["management"],
+  "requiredPlugins": ["management", "dataSource"],
   "requiredBundles": ["opensearchDashboardsReact"]
 }
diff --git a/...ential_management/public/components/create_credential_wizard/create_credential_wizard.tsx b/...ential_management/public/components/create_credential_wizard/create_credential_wizard.tsx
@@ -21,7 +21,7 @@ import {
   EuiFieldPassword,
 } from '@elastic/eui';
 import { DocLinksStart } from 'src/core/public';
-import { Credential } from '../../../../data_source/common';
+import { Credential } from '../../../../data_source/public';
 
 import { getCreateBreadcrumbs } from '../breadcrumbs';
 import { CredentialManagmentContextValue } from '../../types';

diff --git a/src/plugins/credential_management/public/components/edit_credential/edit_credential.tsx b/src/plugins/credential_management/public/components/edit_credential/edit_credential.tsx
@@ -25,7 +25,7 @@ import {
   EuiConfirmModal,
 } from '@elastic/eui';
 import { DocLinksStart } from 'src/core/public';
-import { Credential } from '../../../../data_source/common';
+import { Credential } from '../../../../data_source/public';
 
 import { getCreateBreadcrumbs } from '../breadcrumbs';
 import { CredentialManagmentContextValue } from '../../types';

diff --git a/src/plugins/credential_management/public/plugin.ts b/src/plugins/credential_management/public/plugin.ts
@@ -6,12 +6,7 @@
 import { i18n } from '@osd/i18n';
 
 import { CoreSetup, CoreStart, Plugin } from '../../../core/public';
-
-import { ManagementSetup } from '../../management/public';
-
-export interface CredentialManagementSetupDependencies {
-  management: ManagementSetup;
-}
+import { CredentialManagementSetupDependencies } from './types';
 
 const sectionsHeader = i18n.translate('credentialManagement.credential.sectionsHeader', {
   defaultMessage: 'Credentials',

diff --git a/src/plugins/credential_management/public/types.ts b/src/plugins/credential_management/public/types.ts
@@ -12,13 +12,12 @@ import {
   NotificationsStart,
   DocLinksStart,
 } from 'src/core/public';
-import { NavigationPublicPluginStart } from '../../navigation/public';
-import { ManagementAppMountParams } from '../../management/public';
+import { ManagementAppMountParams, ManagementSetup } from 'src/plugins/management/public';
 
 import { OpenSearchDashboardsReactContextValue } from '../../opensearch_dashboards_react/public';
 
-export interface AppPluginStartDependencies {
-  navigation: NavigationPublicPluginStart;
+export interface CredentialManagementSetupDependencies {
+  management: ManagementSetup;
 }
 
 export interface CredentialManagementContext {

diff --git a/src/plugins/data_source/opensearch_dashboards.json b/src/plugins/data_source/opensearch_dashboards.json
@@ -3,7 +3,7 @@
   "version": "opensearchDashboards",
   "opensearchDashboardsVersion": "opensearchDashboards",
   "server": true,
-  "ui": false,
+  "ui": true,
   "requiredPlugins": [],
   "optionalPlugins": []
 }
diff --git a/src/plugins/data_source/public/index.ts b/src/plugins/data_source/public/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { DataSourcePublicPlugin } from './plugin';
+
+// This exports static code and TypeScript types,
+// as well as, OpenSearch Dashboards Platform `plugin()` initializer.
+export function plugin() {
+  return new DataSourcePublicPlugin();
+}
+
+export { DataSourcePublicPluginSetup, DataSourcePublicPluginStart } from './types';
+
+export { Credential } from '../common';
diff --git a/src/plugins/data_source/public/plugin.ts b/src/plugins/data_source/public/plugin.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { CoreSetup, CoreStart, Plugin } from '../../../core/public';
+import { DataSourcePublicPluginSetup, DataSourcePublicPluginStart } from './types';
+
+export class DataSourcePublicPlugin
+  implements Plugin<DataSourcePublicPluginSetup, DataSourcePublicPluginStart> {
+  public setup(core: CoreSetup): DataSourcePublicPluginSetup {
+    return {};
+  }
+
+  public start(core: CoreStart): DataSourcePublicPluginStart {
+    return {};
+  }
+
+  public stop() {}
+}
diff --git a/src/plugins/data_source/public/types.ts b/src/plugins/data_source/public/types.ts
@@ -0,0 +1,10 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface DataSourcePublicPluginSetup {}
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface DataSourcePublicPluginStart {}
diff --git a/src/plugins/data_source_management/opensearch_dashboards.json b/src/plugins/data_source_management/opensearch_dashboards.json
@@ -3,7 +3,7 @@
   "version": "opensearchDashboards",
   "server": false,
   "ui": true,
-  "requiredPlugins": ["management", "credentialManagement"],
+  "requiredPlugins": ["management", "dataSource"],
   "optionalPlugins": [],
   "requiredBundles": ["opensearchDashboardsReact"]
 }