Migrate dashboard mode

Closes: #67469
elastic · Jun 17, 2020 · ccafe9a · ccafe9a
1 parent 3ee0bf2
commit ccafe9a
Show file tree

Hide file tree

Showing 14 changed files with 303 additions and 314 deletions.
diff --git a/x-pack/.i18nrc.json b/x-pack/.i18nrc.json
@@ -11,7 +11,7 @@
     "xpack.dashboard": "plugins/dashboard_enhanced",
     "xpack.discover": "plugins/discover_enhanced",
     "xpack.crossClusterReplication": "plugins/cross_cluster_replication",
-    "xpack.dashboardMode": "legacy/plugins/dashboard_mode",
+    "xpack.dashboardMode": "plugins/dashboard_mode",
     "xpack.data": "plugins/data_enhanced",
     "xpack.drilldowns": "plugins/drilldowns",
     "xpack.embeddableEnhanced": "plugins/embeddable_enhanced",

diff --git a/x-pack/index.js b/x-pack/index.js
@@ -7,7 +7,6 @@
 import { xpackMain } from './legacy/plugins/xpack_main';
 import { monitoring } from './legacy/plugins/monitoring';
 import { security } from './legacy/plugins/security';
-import { dashboardMode } from './legacy/plugins/dashboard_mode';
 import { beats } from './legacy/plugins/beats_management';
 import { maps } from './legacy/plugins/maps';
 import { spaces } from './legacy/plugins/spaces';
@@ -19,7 +18,6 @@ module.exports = function (kibana) {
     monitoring(kibana),
     spaces(kibana),
     security(kibana),
-    dashboardMode(kibana),
     beats(kibana),
     maps(kibana),
     ingestManager(kibana),

diff --git a/x-pack/legacy/plugins/dashboard_mode/index.js b/x-pack/legacy/plugins/dashboard_mode/index.js
diff --git a/x-pack/legacy/plugins/dashboard_mode/server/__tests__/dashboard_mode_request_interceptor.js b/x-pack/legacy/plugins/dashboard_mode/server/__tests__/dashboard_mode_request_interceptor.js
diff --git a/x-pack/legacy/plugins/dashboard_mode/server/dashboard_mode_request_interceptor.js b/x-pack/legacy/plugins/dashboard_mode/server/dashboard_mode_request_interceptor.js
diff --git a/...cy/plugins/dashboard_mode/server/index.js → ...lugins/dashboard_mode/common/constants.ts b/...cy/plugins/dashboard_mode/server/index.js → ...lugins/dashboard_mode/common/constants.ts
@@ -4,4 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { createDashboardModeRequestInterceptor } from './dashboard_mode_request_interceptor';
+export const UI_SETTINGS = {
+  CONFIG_DASHBOARD_ONLY_MODE_ROLES: 'xpackDashboardMode:roles',
+};
diff --git a/...cy/plugins/dashboard_mode/common/index.js → ...ck/plugins/dashboard_mode/common/index.ts b/...cy/plugins/dashboard_mode/common/index.js → ...ck/plugins/dashboard_mode/common/index.ts
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export * from './constants';
+export { UI_SETTINGS } from './constants';
diff --git a/x-pack/plugins/dashboard_mode/kibana.json b/x-pack/plugins/dashboard_mode/kibana.json
@@ -3,10 +3,13 @@
   "version": "8.0.0",
   "kibanaVersion": "kibana",
   "configPath": [
-    "xpack", "dashboard_mode"
+    "xpack",
+    "dashboard_mode"
   ],
   "requiredPlugins": [
-    "kibanaLegacy", "dashboard"
+    "kibanaLegacy",
+    "dashboard",
+    "security"
   ],
   "server": true,
   "ui": true

diff --git a/x-pack/plugins/dashboard_mode/server/index.ts b/x-pack/plugins/dashboard_mode/server/index.ts
@@ -4,17 +4,19 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { PluginConfigDescriptor } from 'kibana/server';
-
+import { PluginConfigDescriptor, PluginInitializerContext } from 'kibana/server';
 import { schema } from '@kbn/config-schema';
 
+import { DashboardModeServerPlugin } from './plugin';
+
 export const config: PluginConfigDescriptor = {
   schema: schema.object({
     enabled: schema.boolean({ defaultValue: true }),
   }),
 };
 
-export const plugin = () => ({
-  setup() {},
-  start() {},
-});
+export function plugin(initializerContext: PluginInitializerContext) {
+  return new DashboardModeServerPlugin(initializerContext);
+}
+
+export { DashboardModeServerPlugin as Plugin };