[Index Patterns] Move rollup config to index pattern management

src/plugins/index_pattern_management/public/mocks.ts

@@ -19,14 +19,7 @@ import {
 } from './plugin';
 import { IndexPatternManagmentContext } from './types';
 
-const createSetupContract = (): IndexPatternManagementSetup => ({
-  creation: {
-    addCreationConfig: jest.fn(),
-  } as any,
-  list: {
-    addListConfig: jest.fn(),
-  } as any,
-});
+const createSetupContract = (): IndexPatternManagementSetup => {};
 
 const createStartContract = (): IndexPatternManagementStart => ({
   creation: {

src/plugins/index_pattern_management/public/plugin.ts

@@ -81,7 +81,10 @@ export class IndexPatternManagementPlugin
       },
     });
 
-    return this.indexPatternManagementService.setup({ httpClient: core.http });
+    return this.indexPatternManagementService.setup({
+      httpClient: core.http,
+      uiSettings: core.uiSettings,
+    });
   }
 
   public start(core: CoreStart, plugins: IndexPatternManagementStartDependencies) {

x-pack/plugins/rollup/public/index_pattern_creation/components/rollup_prompt/index.js → src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/index.ts

@@ -1,8 +1,9 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
  */
 
 export { RollupPrompt } from './rollup_prompt';

x-pack/plugins/rollup/public/index_pattern_creation/components/rollup_prompt/rollup_prompt.js → src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/rollup_prompt.tsx

@@ -1,8 +1,9 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
  */
 
 import React from 'react';

src/plugins/index_pattern_management/public/service/creation/index.ts

@@ -8,3 +8,5 @@
 
 export { IndexPatternCreationConfig, IndexPatternCreationOption } from './config';
 export { IndexPatternCreationManager } from './manager';
+// @ts-ignore
+export { RollupIndexPatternCreationConfig } from './rollup_creation_config';

x-pack/plugins/rollup/public/index_pattern_creation/rollup_index_pattern_creation_config.js → src/plugins/index_pattern_management/public/service/creation/rollup_creation_config.js

@@ -1,15 +1,16 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
  */
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 
 import { RollupPrompt } from './components/rollup_prompt';
-import { IndexPatternCreationConfig } from '../../../../../src/plugins/index_pattern_management/public';
+import { IndexPatternCreationConfig } from '.';
 
 const rollupIndexPatternTypeName = i18n.translate(
   'xpack.rollupJobs.editRollupIndexPattern.createIndex.defaultTypeName',

src/plugins/index_pattern_management/public/service/index_pattern_management_service.ts

@@ -6,11 +6,20 @@
  * Side Public License, v 1.
  */
 
-import { HttpSetup } from '../../../../core/public';
-import { IndexPatternCreationManager, IndexPatternCreationConfig } from './creation';
-import { IndexPatternListManager, IndexPatternListConfig } from './list';
+import { HttpSetup, CoreSetup } from '../../../../core/public';
+import {
+  IndexPatternCreationManager,
+  IndexPatternCreationConfig,
+  RollupIndexPatternCreationConfig,
+} from './creation';
+import {
+  IndexPatternListManager,
+  IndexPatternListConfig,
+  RollupIndexPatternListConfig,
+} from './list';
 interface SetupDependencies {
   httpClient: HttpSetup;
+  uiSettings: CoreSetup['uiSettings'];
 }
 
 /**
@@ -27,17 +36,24 @@ export class IndexPatternManagementService {
     this.indexPatternListConfig = new IndexPatternListManager();
   }
 
-  public setup({ httpClient }: SetupDependencies) {
+  public setup({ httpClient, uiSettings }: SetupDependencies) {
     const creationManagerSetup = this.indexPatternCreationManager.setup(httpClient);
     creationManagerSetup.addCreationConfig(IndexPatternCreationConfig);
 
     const indexPatternListConfigSetup = this.indexPatternListConfig.setup();
     indexPatternListConfigSetup.addListConfig(IndexPatternListConfig);
 
+    // todo move to shared plugin
+    if (uiSettings.get('rollups:enableIndexPatterns')) {
+      creationManagerSetup.addCreationConfig(RollupIndexPatternCreationConfig);
+      indexPatternListConfigSetup.addListConfig(RollupIndexPatternListConfig);
+    }
+    /*
     return {
       creation: creationManagerSetup,
       list: indexPatternListConfigSetup,
     };
+    */
   }
 
   public start() {

src/plugins/index_pattern_management/public/service/list/index.ts

@@ -8,3 +8,5 @@
 
 export { IndexPatternListConfig } from './config';
 export { IndexPatternListManager } from './manager';
+// @ts-ignore
+export { RollupIndexPatternListConfig } from './rollup_list_config';

x-pack/plugins/rollup/public/index_pattern_list/rollup_index_pattern_list_config.js → src/plugins/index_pattern_management/public/service/list/rollup_list_config.js

@@ -1,11 +1,12 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
  */
 
-import { IndexPatternListConfig } from '../../../../../src/plugins/index_pattern_management/public';
+import { IndexPatternListConfig } from '.';
 
 function isRollup(indexPattern) {
   return (

x-pack/plugins/rollup/kibana.json

@@ -5,7 +5,6 @@
   "server": true,
   "ui": true,
   "requiredPlugins": [
-    "indexPatternManagement",
     "management",
     "licensing",
     "features"

x-pack/plugins/rollup/public/plugin.ts

@@ -12,14 +12,13 @@ import { rollupBadgeExtension, rollupToggleExtension } from './extend_index_mana
 import { RollupIndexPatternCreationConfig } from './index_pattern_creation/rollup_index_pattern_creation_config';
 // @ts-ignore
 import { RollupIndexPatternListConfig } from './index_pattern_list/rollup_index_pattern_list_config';
-import { CONFIG_ROLLUPS, UIM_APP_NAME } from '../common';
+import { UIM_APP_NAME } from '../common';
 import {
   FeatureCatalogueCategory,
   HomePublicPluginSetup,
 } from '../../../../src/plugins/home/public';
 import { ManagementSetup } from '../../../../src/plugins/management/public';
 import { IndexManagementPluginSetup } from '../../index_management/public';
-import { IndexPatternManagementSetup } from '../../../../src/plugins/index_pattern_management/public';
 // @ts-ignore
 import { setHttp, init as initDocumentation } from './crud_app/services/index';
 import { setNotifications, setFatalErrors, setUiStatsReporter } from './kibana_services';
@@ -29,20 +28,13 @@ export interface RollupPluginSetupDependencies {
   home?: HomePublicPluginSetup;
   management: ManagementSetup;
   indexManagement?: IndexManagementPluginSetup;
-  indexPatternManagement: IndexPatternManagementSetup;
   usageCollection?: UsageCollectionSetup;
 }
 
 export class RollupPlugin implements Plugin {
   setup(
     core: CoreSetup,
-    {
-      home,
-      management,
-      indexManagement,
-      indexPatternManagement,
-      usageCollection,
-    }: RollupPluginSetupDependencies
+    { home, management, indexManagement, usageCollection }: RollupPluginSetupDependencies
   ) {
     setFatalErrors(core.fatalErrors);
     if (usageCollection) {
@@ -54,12 +46,14 @@ export class RollupPlugin implements Plugin {
       indexManagement.extensionsService.addToggle(rollupToggleExtension);
     }
 
+    /*
     const isRollupIndexPatternsEnabled = core.uiSettings.get(CONFIG_ROLLUPS);
 
     if (isRollupIndexPatternsEnabled) {
       indexPatternManagement.creation.addCreationConfig(RollupIndexPatternCreationConfig);
       indexPatternManagement.list.addListConfig(RollupIndexPatternListConfig);
     }
+    */
 
     if (home) {
       home.featureCatalogue.register({

x-pack/plugins/rollup/tsconfig.json

@@ -16,7 +16,6 @@
   "references": [
     { "path": "../../../src/core/tsconfig.json" },
     // required plugins
-    { "path": "../../../src/plugins/index_pattern_management/tsconfig.json" },
     { "path": "../../../src/plugins/management/tsconfig.json" },
     { "path": "../licensing/tsconfig.json" },
     { "path": "../features/tsconfig.json" },