Merge remote-tracking branch 'upstream/master'

Author: mistic

docs/management/advanced-options.asciidoc

@@ -454,7 +454,8 @@ of buckets to try to represent.
 
 [horizontal]
 [[visualization-colormapping]]`visualization:colorMapping`::
-Maps values to specified colors in visualizations.
+**This setting is deprecated and will not be supported as of 8.0.**
+Maps values to specific colors in *Visualize* charts and *TSVB*. This setting does not apply to *Lens*.
 
 [[visualization-dimmingopacity]]`visualization:dimmingOpacity`::
 The opacity of the chart items that are dimmed when highlighting another element

examples/embeddable_examples/public/book/book_embeddable_factory.tsx

@@ -127,9 +127,10 @@ export class BookEmbeddableFactoryDefinition
 
   private async unwrapMethod(savedObjectId: string): Promise<BookSavedObjectAttributes> {
     const { savedObjectsClient } = await this.getStartServices();
-    const savedObject: SimpleSavedObject<BookSavedObjectAttributes> = await savedObjectsClient.get<
-      BookSavedObjectAttributes
-    >(this.type, savedObjectId);
+    const savedObject: SimpleSavedObject<BookSavedObjectAttributes> = await savedObjectsClient.get<BookSavedObjectAttributes>(
+      this.type,
+      savedObjectId
+    );
     return { ...savedObject.attributes };
   }
 
@@ -163,9 +164,9 @@ export class BookEmbeddableFactoryDefinition
 
   private async getAttributeService() {
     if (!this.attributeService) {
-      this.attributeService = (await this.getStartServices()).getAttributeService<
-        BookSavedObjectAttributes
-      >(this.type, {
+      this.attributeService = (
+        await this.getStartServices()
+      ).getAttributeService<BookSavedObjectAttributes>(this.type, {
         saveMethod: this.saveMethod.bind(this),
         unwrapMethod: this.unwrapMethod.bind(this),
         checkForDuplicateTitle: this.checkForDuplicateTitleMethod.bind(this),

package.json

@@ -92,6 +92,7 @@
     "**/load-grunt-config/lodash": "^4.17.20",
     "**/minimist": "^1.2.5",
     "**/node-jose/node-forge": "^0.10.0",
+    "**/prismjs": "1.22.0",
     "**/request": "^2.88.2",
     "**/trim": "0.0.3",
     "**/typescript": "4.0.2"
@@ -510,7 +511,7 @@
     "@types/pdfmake": "^0.1.15",
     "@types/pegjs": "^0.10.1",
     "@types/pngjs": "^3.4.0",
-    "@types/prettier": "^2.0.2",
+    "@types/prettier": "^2.1.5",
     "@types/pretty-ms": "^5.0.0",
     "@types/prop-types": "^15.7.3",
     "@types/proper-lockfile": "^3.0.1",
@@ -626,7 +627,7 @@
     "enzyme-adapter-utils": "^1.13.0",
     "enzyme-to-json": "^3.4.4",
     "eslint": "^6.8.0",
-    "eslint-config-prettier": "^6.11.0",
+    "eslint-config-prettier": "^6.15.0",
     "eslint-import-resolver-node": "0.3.2",
     "eslint-import-resolver-webpack": "0.11.1",
     "eslint-module-utils": "2.5.0",
@@ -762,7 +763,7 @@
     "postcss": "^7.0.32",
     "postcss-loader": "^3.0.0",
     "postcss-prefix-selector": "^1.7.2",
-    "prettier": "^2.1.1",
+    "prettier": "^2.2.0",
     "pretty-ms": "5.0.0",
     "proxyquire": "1.8.0",
     "querystring": "^0.2.0",

packages/kbn-test/src/functional_test_runner/lib/snapshots/decorate_snapshot_ui.ts

@@ -196,6 +196,7 @@ function getSnapshotState(file: string, test: Test, updateSnapshots: boolean) {
     path.join(dirname + `/__snapshots__/` + filename.replace(path.extname(filename), '.snap')),
     {
       updateSnapshot: updateSnapshots ? 'all' : 'new',
+      // @ts-expect-error
       getPrettier: () => prettier,
       getBabelTraverse: () => babelTraverse,
     }

src/core/server/elasticsearch/elasticsearch_service.test.ts

@@ -57,7 +57,9 @@ let coreContext: CoreContext;
 const logger = loggingSystemMock.create();
 
 let mockClusterClientInstance: ReturnType<typeof elasticsearchClientMock.createCustomClusterClient>;
-let mockLegacyClusterClientInstance: ReturnType<typeof elasticsearchServiceMock.createLegacyCustomClusterClient>;
+let mockLegacyClusterClientInstance: ReturnType<
+  typeof elasticsearchServiceMock.createLegacyCustomClusterClient
+>;
 
 beforeEach(() => {
   env = Env.createDefault(REPO_ROOT, getEnvOptions());

src/core/server/saved_objects/migrations/mocks.ts

@@ -20,9 +20,7 @@
 import { SavedObjectMigrationContext } from './types';
 import { SavedObjectsMigrationLogger } from './core';
 
-export const createSavedObjectsMigrationLoggerMock = (): jest.Mocked<
-  SavedObjectsMigrationLogger
-> => {
+export const createSavedObjectsMigrationLoggerMock = (): jest.Mocked<SavedObjectsMigrationLogger> => {
   const mock = {
     debug: jest.fn(),
     info: jest.fn(),

src/core/server/saved_objects/saved_objects_service.test.ts

@@ -217,9 +217,8 @@ describe('SavedObjectsService', () => {
       await soService.setup(setupDeps);
       soService.start(createStartDeps());
       expect(migratorInstanceMock.runMigrations).toHaveBeenCalledTimes(0);
-      ((setupDeps.elasticsearch.esNodesCompatibility$ as any) as BehaviorSubject<
-        NodesVersionCompatibility
-      >).next({
+      ((setupDeps.elasticsearch
+        .esNodesCompatibility$ as any) as BehaviorSubject<NodesVersionCompatibility>).next({
         isCompatible: true,
         incompatibleNodes: [],
         warningNodes: [],

src/core/server/saved_objects/service/lib/repository_create_repository.test.ts

@@ -66,9 +66,7 @@ describe('SavedObjectsRepository#createRepository', () => {
   });
 
   const migrator = mockKibanaMigrator.create({ types: typeRegistry.getAllTypes() });
-  const RepositoryConstructor = (SavedObjectsRepository as unknown) as jest.Mock<
-    SavedObjectsRepository
-  >;
+  const RepositoryConstructor = (SavedObjectsRepository as unknown) as jest.Mock<SavedObjectsRepository>;
 
   beforeEach(() => {
     RepositoryConstructor.mockClear();

src/plugins/charts/server/plugin.ts

@@ -41,8 +41,18 @@ export class ChartsServerPlugin implements Plugin<object, object> {
         }),
         type: 'json',
         description: i18n.translate('charts.advancedSettings.visualization.colorMappingText', {
-          defaultMessage: 'Maps values to specified colors within visualizations',
+          defaultMessage:
+            'Maps values to specific colors in <strong>Visualize</strong> charts and <strong>TSVB</strong>. This setting does not apply to <strong>Lens.</strong>',
         }),
+        deprecation: {
+          message: i18n.translate(
+            'charts.advancedSettings.visualization.colorMappingTextDeprecation',
+            {
+              defaultMessage: 'This setting is deprecated and will not be supported as of 8.0.',
+            }
+          ),
+          docLinksKey: 'visualizationSettings',
+        },
         category: ['visualization'],
         schema: schema.string(),
       },

src/plugins/console/public/application/models/legacy_core_editor/legacy_core_editor.ts

@@ -368,20 +368,21 @@ export class LegacyCoreEditor implements CoreEditor {
 
     // disable standard context based autocompletion.
     // @ts-ignore
-    ace.define('ace/autocomplete/text_completer', ['require', 'exports', 'module'], function (
-      require: any,
-      exports: any
-    ) {
-      exports.getCompletions = function (
-        innerEditor: any,
-        session: any,
-        pos: any,
-        prefix: any,
-        callback: any
-      ) {
-        callback(null, []);
-      };
-    });
+    ace.define(
+      'ace/autocomplete/text_completer',
+      ['require', 'exports', 'module'],
+      function (require: any, exports: any) {
+        exports.getCompletions = function (
+          innerEditor: any,
+          session: any,
+          pos: any,
+          prefix: any,
+          callback: any
+        ) {
+          callback(null, []);
+        };
+      }
+    );
 
     const langTools = ace.acequire('ace/ext/language_tools');