Merge branch 'master' into issue-52426-tsvb-support-for-histograms

package.json

@@ -87,6 +87,7 @@
     "**/@types/hoist-non-react-statics": "^3.3.1",
     "**/@types/chai": "^4.2.11",
     "**/cypress/@types/lodash": "^4.14.155",
+    "**/cypress/lodash": "^4.15.19",
     "**/typescript": "3.9.5",
     "**/graphql-toolkit/lodash": "^4.17.15",
     "**/hoist-non-react-statics": "^3.3.2",

src/plugins/data/common/field_formats/converters/url.ts

@@ -30,7 +30,7 @@ import {
 } from '../types';
 
 const templateMatchRE = /{{([\s\S]+?)}}/g;
-const whitelistUrlSchemes = ['http://', 'https://'];
+const allowedUrlSchemes = ['http://', 'https://'];
 
 const URL_TYPES = [
   {
@@ -161,7 +161,7 @@ export class UrlFormat extends FieldFormat {
 
         return this.generateImgHtml(url, imageLabel);
       default:
-        const inWhitelist = whitelistUrlSchemes.some((scheme) => url.indexOf(scheme) === 0);
+        const inWhitelist = allowedUrlSchemes.some((scheme) => url.indexOf(scheme) === 0);
         if (!inWhitelist && !parsedUrl) {
           return url;
         }

src/plugins/kibana_utils/public/state_management/url/hash_unhash_url.test.ts

@@ -116,7 +116,7 @@ describe('hash unhash url', () => {
         expect(mockStorage.length).toBe(3);
       });
 
-      it('hashes only whitelisted properties', () => {
+      it('hashes only allow-listed properties', () => {
         const stateParamKey1 = '_g';
         const stateParamValue1 = '(yes:!t)';
         const stateParamKey2 = '_a';
@@ -227,7 +227,7 @@ describe('hash unhash url', () => {
         );
       });
 
-      it('unhashes only whitelisted properties', () => {
+      it('un-hashes only allow-listed properties', () => {
         const stateParamKey1 = '_g';
         const stateParamValueHashed1 = 'h@4e60e02';
         const state1 = { yes: true };

src/plugins/kibana_utils/public/state_management/url/hash_unhash_url.ts

@@ -35,7 +35,7 @@ export const hashUrl = createQueryReplacer(hashQuery);
 
 // naive hack, but this allows to decouple these utils from AppState, GlobalState for now
 // when removing AppState, GlobalState and migrating to IState containers,
-// need to make sure that apps explicitly passing this whitelist to hash
+// need to make sure that apps explicitly passing this allow-list to hash
 const __HACK_HARDCODED_LEGACY_HASHABLE_PARAMS = ['_g', '_a', '_s'];
 function createQueryMapper(queryParamMapper: (q: string) => string | null) {
   return (

yarn.lock

@@ -20903,10 +20903,10 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-[email protected], [email protected], lodash@>4.17.4, lodash@^4, lodash@^4.0.0, lodash@^4.0.1, lodash@^4.10.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.1, lodash@~4.17.10, lodash@~4.17.15, lodash@~4.17.5:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
-  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+[email protected], [email protected], lodash@>4.17.4, lodash@^4, lodash@^4.0.0, lodash@^4.0.1, lodash@^4.10.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.15.19, lodash@^4.17.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.1, lodash@~4.17.10, lodash@~4.17.15, lodash@~4.17.5:
+  version "4.17.19"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
+  integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
 
 lodash@^3.10.1:
   version "3.10.1"