Do not register SO in the legacy platform

src/core/server/core_app/core_app.ts

@@ -52,6 +52,17 @@ export class CoreApp {
     router.get({ path: '/core', validate: false }, async (context, req, res) =>
       res.ok({ body: { version: '0.0.1' } })
     );
+
+    coreSetup.savedObjects.registerType({
+      name: 'server',
+      hidden: false,
+      namespaceType: 'single',
+      mappings: {
+        properties: {
+          uuid: { type: 'keyword' },
+        },
+      },
+    });
   }
   private registerStaticDirs(coreSetup: InternalCoreSetup) {
     coreSetup.http.registerStaticDir('/ui/{path*}', Path.resolve(__dirname, './assets'));

src/legacy/core_plugins/kibana/index.js

@@ -23,7 +23,6 @@ import { promisify } from 'util';
 
 import { importApi } from './server/routes/api/import';
 import { exportApi } from './server/routes/api/export';
-import mappings from './mappings.json';
 import { getUiSettingDefaults } from './server/ui_setting_defaults';
 import { registerCspCollector } from './server/lib/csp_usage_collector';
 import { injectVars } from './inject_vars';
@@ -138,7 +137,6 @@ export default function(kibana) {
         };
       },
 
-      mappings,
       uiSettingDefaults: getUiSettingDefaults(),
     },
 

src/legacy/core_plugins/timelion/index.ts

@@ -62,7 +62,6 @@ const timelionPluginInitializer: LegacyPluginInitializer = ({ Plugin }: LegacyPl
       },
       styleSheetPaths: resolve(__dirname, 'public/index.scss'),
       hacks: [resolve(__dirname, 'public/legacy')],
-      mappings: require('./mappings.json'),
       uiSettingDefaults: {
         'timelion:showTutorial': {
           name: i18n.translate('timelion.uiSettings.showTutorialLabel', {

src/plugins/timelion/kibana.json

@@ -0,0 +1,8 @@
+{
+  "id": "timelion",
+  "version": "0.0.1",
+  "kibanaVersion": "kibana",
+  "configPath": "timelion",
+  "ui": false,
+  "server": true
+}

src/plugins/timelion/server/index.ts

@@ -0,0 +1,22 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { PluginInitializerContext } from 'src/core/server';
+import { TimelionPlugin } from './plugin';
+
+export const plugin = (context: PluginInitializerContext) => new TimelionPlugin(context);

src/plugins/timelion/server/plugin.ts

@@ -0,0 +1,52 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { CoreSetup, Plugin, PluginInitializerContext } from 'src/core/server';
+
+export class TimelionPlugin implements Plugin {
+  constructor(context: PluginInitializerContext) {}
+
+  setup(core: CoreSetup) {
+    core.savedObjects.registerType({
+      name: 'timelion-sheet',
+      hidden: false,
+      namespaceType: 'single',
+      mappings: {
+        properties: {
+          description: { type: 'text' },
+          hits: { type: 'integer' },
+          kibanaSavedObjectMeta: {
+            properties: {
+              searchSourceJSON: { type: 'text' },
+            },
+          },
+          timelion_chart_height: { type: 'integer' },
+          timelion_columns: { type: 'integer' },
+          timelion_interval: { type: 'keyword' },
+          timelion_other_interval: { type: 'keyword' },
+          timelion_rows: { type: 'integer' },
+          timelion_sheet: { type: 'text' },
+          title: { type: 'text' },
+          version: { type: 'integer' },
+        },
+      },
+    });
+  }
+  start() {}
+  stop() {}
+}

x-pack/legacy/plugins/maps/index.js

@@ -4,18 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import mappings from './mappings.json';
 import { i18n } from '@kbn/i18n';
 import { resolve } from 'path';
-import { migrations } from './migrations';
 import { getAppTitle } from '../../../plugins/maps/common/i18n_getters';
 import { MapPlugin } from './server/plugin';
-import {
-  APP_ID,
-  APP_ICON,
-  createMapPath,
-  MAP_SAVED_OBJECT_TYPE,
-} from '../../../plugins/maps/common/constants';
+import { APP_ID, APP_ICON } from '../../../plugins/maps/common/constants';
 import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
 
 export function maps(kibana) {
@@ -48,29 +41,6 @@ export function maps(kibana) {
         };
       },
       styleSheetPaths: `${__dirname}/public/index.scss`,
-      savedObjectSchemas: {
-        'maps-telemetry': {
-          isNamespaceAgnostic: true,
-        },
-      },
-      savedObjectsManagement: {
-        [MAP_SAVED_OBJECT_TYPE]: {
-          icon: APP_ICON,
-          defaultSearchField: 'title',
-          isImportableAndExportable: true,
-          getTitle(obj) {
-            return obj.attributes.title;
-          },
-          getInAppUrl(obj) {
-            return {
-              path: createMapPath(obj.id),
-              uiCapabilitiesPath: 'maps.show',
-            };
-          },
-        },
-      },
-      mappings,
-      migrations,
     },
     config(Joi) {
       return Joi.object({

x-pack/plugins/maps/server/plugin.ts

@@ -8,6 +8,7 @@ import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'src/core
 import { PluginSetupContract as FeaturesPluginSetupContract } from '../../features/server';
 
 import { APP_ID, APP_ICON, MAP_SAVED_OBJECT_TYPE } from '../common/constants';
+import { mapSavedObjects, mapsTelemetrySavedObjects } from './saved_objects';
 
 interface SetupDeps {
   features: FeaturesPluginSetupContract;
@@ -47,6 +48,9 @@ export class MapsPlugin implements Plugin {
         },
       },
     });
+
+    core.savedObjects.registerType(mapsTelemetrySavedObjects);
+    core.savedObjects.registerType(mapSavedObjects);
   }
   start(core: CoreStart) {}
 }

x-pack/plugins/maps/server/saved_objects/index.ts

@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+export { mapsTelemetrySavedObjects } from './maps_telemetry';
+export { mapSavedObjects } from './map';

x-pack/plugins/maps/server/saved_objects/map.ts

@@ -0,0 +1,41 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { SavedObjectsType } from 'src/core/server';
+import { APP_ICON, createMapPath } from '../../common/constants';
+// @ts-ignore
+import { migrations } from './migrations';
+
+export const mapSavedObjects: SavedObjectsType = {
+  name: 'map',
+  hidden: false,
+  namespaceType: 'single',
+  mappings: {
+    properties: {
+      description: { type: 'text' },
+      title: { type: 'text' },
+      version: { type: 'integer' },
+      bounds: { type: 'geo_shape' },
+      mapStateJSON: { type: 'text' },
+      layerListJSON: { type: 'text' },
+      uiStateJSON: { type: 'text' },
+    },
+  },
+  management: {
+    icon: APP_ICON,
+    defaultSearchField: 'title',
+    importableAndExportable: true,
+    getTitle(obj) {
+      return obj.attributes.title;
+    },
+    getInAppUrl(obj) {
+      return {
+        path: createMapPath(obj.id),
+        uiCapabilitiesPath: 'maps.show',
+      };
+    },
+  },
+  migrations: migrations.map,
+};