[7.x] Cleanup OSS code from visualizations wizard (#89092) (#89409)

* Cleanup OSS code from visualizations wizard (#89092) * Cleanup OSS code from visualizations wizard * Remove unecessary translations * Remove unused translation * Fix functional test * Disable the functional test for OSS * Remove from oss correctly :D * Fix ci # Conflicts: # .github/CODEOWNERS # docs/developer/plugin-list.asciidoc # packages/kbn-optimizer/limits.yml * fix plugin list docs * Change plugins docs list
elastic · Jan 27, 2021 · ddc2058 · ddc2058
1 parent 198ca1b
commit ddc2058
Show file tree

Hide file tree

Showing 40 changed files with 11 additions and 569 deletions.
diff --git a/.i18nrc.json b/.i18nrc.json
@@ -61,8 +61,6 @@
     "visTypeVislib": "src/plugins/vis_type_vislib",
     "visTypeXy": "src/plugins/vis_type_xy",
     "visualizations": "src/plugins/visualizations",
-    "lensOss": "src/plugins/lens_oss",
-    "mapsOss": "src/plugins/maps_oss",
     "visualize": "src/plugins/visualize",
     "apmOss": "src/plugins/apm_oss",
     "usageCollection": "src/plugins/usage_collection"

diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc
@@ -128,11 +128,6 @@ in Kibana, e.g. visualizations. It has the form of a flyout panel.
 |The legacyExport plugin adds support for the legacy saved objects export format.
 
 
-|{kib-repo}blob/{branch}/src/plugins/lens_oss/README.md[lensOss]
-|The lens_oss plugin registers the lens visualization on OSS.
-It is registered as disabled. The x-pack plugin should unregister this.
-
-
 |{kib-repo}blob/{branch}/src/plugins/management[management]
 |WARNING: Missing README.
 
@@ -141,11 +136,6 @@ It is registered as disabled. The x-pack plugin should unregister this.
 |Internal objects used by the Coordinate, Region, and Vega visualizations.
 
 
-|{kib-repo}blob/{branch}/src/plugins/maps_oss/README.md[mapsOss]
-|The maps_oss plugin registers the maps visualization on OSS.
-It is registered as disabled. The x-pack plugin should unregister this.
-
-
 |{kib-repo}blob/{branch}/src/plugins/navigation/README.md[navigation]
 |The navigation plugins exports the TopNavMenu component.
 It also provides a stateful version of it on the start contract.

diff --git a/packages/kbn-config/src/deprecation/deprecation_factory.test.ts b/packages/kbn-config/src/deprecation/deprecation_factory.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { ConfigDeprecationLogger } from './types';
-import { configDeprecationFactory, copyFromRoot } from './deprecation_factory';
+import { configDeprecationFactory } from './deprecation_factory';
 
 describe('DeprecationFactory', () => {
   const { rename, unused, renameFromRoot, unusedFromRoot } = configDeprecationFactory;
@@ -239,89 +239,6 @@ describe('DeprecationFactory', () => {
     });
   });
 
-  describe('copyFromRoot', () => {
-    it('copies a property to a different namespace', () => {
-      const rawConfig = {
-        originplugin: {
-          deprecated: 'toberenamed',
-          valid: 'valid',
-        },
-        destinationplugin: {
-          property: 'value',
-        },
-      };
-      const processed = copyFromRoot('originplugin.deprecated', 'destinationplugin.renamed')(
-        rawConfig,
-        'does-not-matter',
-        logger
-      );
-      expect(processed).toEqual({
-        originplugin: {
-          deprecated: 'toberenamed',
-          valid: 'valid',
-        },
-        destinationplugin: {
-          renamed: 'toberenamed',
-          property: 'value',
-        },
-      });
-      expect(deprecationMessages.length).toEqual(0);
-    });
-
-    it('does not alter config if origin property is not present', () => {
-      const rawConfig = {
-        myplugin: {
-          new: 'new',
-          valid: 'valid',
-        },
-        someOtherPlugin: {
-          property: 'value',
-        },
-      };
-      const processed = copyFromRoot('myplugin.deprecated', 'myplugin.new')(
-        rawConfig,
-        'does-not-matter',
-        logger
-      );
-      expect(processed).toEqual({
-        myplugin: {
-          new: 'new',
-          valid: 'valid',
-        },
-        someOtherPlugin: {
-          property: 'value',
-        },
-      });
-      expect(deprecationMessages.length).toEqual(0);
-    });
-
-    it('does not alter config if they both exist', () => {
-      const rawConfig = {
-        myplugin: {
-          deprecated: 'deprecated',
-          renamed: 'renamed',
-        },
-        someOtherPlugin: {
-          property: 'value',
-        },
-      };
-      const processed = copyFromRoot('myplugin.deprecated', 'someOtherPlugin.property')(
-        rawConfig,
-        'does-not-matter',
-        logger
-      );
-      expect(processed).toEqual({
-        myplugin: {
-          deprecated: 'deprecated',
-          renamed: 'renamed',
-        },
-        someOtherPlugin: {
-          property: 'value',
-        },
-      });
-    });
-  });
-
   describe('unused', () => {
     it('removes the unused property from the config and logs a warning is present', () => {
       const rawConfig = {

diff --git a/packages/kbn-config/src/deprecation/deprecation_factory.ts b/packages/kbn-config/src/deprecation/deprecation_factory.ts
@@ -45,26 +45,6 @@ const _rename = (
   return config;
 };
 
-const _copy = (
-  config: Record<string, any>,
-  rootPath: string,
-  originKey: string,
-  destinationKey: string
-) => {
-  const originPath = getPath(rootPath, originKey);
-  const originValue = get(config, originPath);
-  if (originValue === undefined) {
-    return config;
-  }
-
-  const destinationPath = getPath(rootPath, destinationKey);
-  const destinationValue = get(config, destinationPath);
-  if (destinationValue === undefined) {
-    set(config, destinationPath, originValue);
-  }
-  return config;
-};
-
 const _unused = (
   config: Record<string, any>,
   rootPath: string,
@@ -89,12 +69,6 @@ const renameFromRoot = (oldKey: string, newKey: string, silent?: boolean): Confi
   log
 ) => _rename(config, '', log, oldKey, newKey, silent);
 
-export const copyFromRoot = (originKey: string, destinationKey: string): ConfigDeprecation => (
-  config,
-  rootPath,
-  log
-) => _copy(config, '', originKey, destinationKey);
-
 const unused = (unusedKey: string): ConfigDeprecation => (config, rootPath, log) =>
   _unused(config, rootPath, log, unusedKey);
 

diff --git a/packages/kbn-config/src/deprecation/index.ts b/packages/kbn-config/src/deprecation/index.ts
@@ -13,5 +13,5 @@ export {
   ConfigDeprecationFactory,
   ConfigDeprecationProvider,
 } from './types';
-export { configDeprecationFactory, copyFromRoot } from './deprecation_factory';
+export { configDeprecationFactory } from './deprecation_factory';
 export { applyDeprecations } from './apply_deprecations';
diff --git a/packages/kbn-config/src/index.ts b/packages/kbn-config/src/index.ts
@@ -14,7 +14,6 @@ export {
   ConfigDeprecationLogger,
   ConfigDeprecationProvider,
   ConfigDeprecationWithContext,
-  copyFromRoot,
 } from './deprecation';
 
 export { RawConfigurationProvider, RawConfigService, getConfigFromFiles } from './raw';

diff --git a/packages/kbn-optimizer/limits.yml b/packages/kbn-optimizer/limits.yml
@@ -44,16 +44,14 @@ pageLoadAssetSize:
   kibanaReact: 162353
   kibanaUtils: 198829
   lens: 96624
-  licenseManagement: 41961
-  lensOss: 19341
+  licenseManagement: 41817
   licensing: 39008
   lists: 202261
   logstash: 53548
   management: 46112
   maps: 183754
   mapsLegacy: 116961
   mapsLegacyLicensing: 20214
-  mapsOss: 19284
   ml: 82187
   monitoring: 50000
   navigation: 37413

diff --git a/src/plugins/lens_oss/README.md b/src/plugins/lens_oss/README.md
diff --git a/src/plugins/lens_oss/common/constants.ts b/src/plugins/lens_oss/common/constants.ts
diff --git a/src/plugins/lens_oss/common/index.ts b/src/plugins/lens_oss/common/index.ts
diff --git a/src/plugins/lens_oss/config.ts b/src/plugins/lens_oss/config.ts
diff --git a/src/plugins/lens_oss/kibana.json b/src/plugins/lens_oss/kibana.json
diff --git a/src/plugins/lens_oss/public/index.ts b/src/plugins/lens_oss/public/index.ts
diff --git a/src/plugins/lens_oss/public/plugin.ts b/src/plugins/lens_oss/public/plugin.ts
diff --git a/src/plugins/lens_oss/public/vis_type_alias.ts b/src/plugins/lens_oss/public/vis_type_alias.ts
diff --git a/src/plugins/lens_oss/server/index.ts b/src/plugins/lens_oss/server/index.ts
diff --git a/src/plugins/lens_oss/tsconfig.json b/src/plugins/lens_oss/tsconfig.json
diff --git a/src/plugins/maps_oss/README.md b/src/plugins/maps_oss/README.md