From 3c6d47e42fbd839cce3aff24bf18e926fbabc24d Mon Sep 17 00:00:00 2001 From: Jean-Louis Leysens Date: Wed, 10 Mar 2021 09:54:54 +0100 Subject: [PATCH 1/3] remove "deprecated: " from console warning --- src/plugins/console/public/lib/utils/index.ts | 2 +- .../console/public/lib/utils/utils.test.js | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/plugins/console/public/lib/utils/index.ts b/src/plugins/console/public/lib/utils/index.ts index 0aac2d01ad758..d3cc0263e1d78 100644 --- a/src/plugins/console/public/lib/utils/index.ts +++ b/src/plugins/console/public/lib/utils/index.ts @@ -55,7 +55,7 @@ export function extractDeprecationMessages(warnings: string) { return _.map(splitOnUnquotedCommaSpace(warnings), (warning) => { const match = re.exec(warning); // extract the actual warning if there was a match - return '#! Deprecation: ' + (match !== null ? unescape(match[1]) : warning); + return '#! ' + (match !== null ? unescape(match[1]) : warning); }); } diff --git a/src/plugins/console/public/lib/utils/utils.test.js b/src/plugins/console/public/lib/utils/utils.test.js index ff851bbea3c46..be11a92fddc07 100644 --- a/src/plugins/console/public/lib/utils/utils.test.js +++ b/src/plugins/console/public/lib/utils/utils.test.js @@ -14,48 +14,48 @@ describe('Utils class', () => { utils.extractDeprecationMessages( '299 Elasticsearch-6.0.0-alpha1-SNAPSHOT-abcdef1 "this is a warning" "Mon, 27 Feb 2017 14:52:14 GMT"' ) - ).toEqual(['#! Deprecation: this is a warning']); + ).toEqual(['#! this is a warning']); expect( utils.extractDeprecationMessages( '299 Elasticsearch-6.0.0-alpha1-SNAPSHOT-abcdef1 "this is a warning"' ) - ).toEqual(['#! Deprecation: this is a warning']); + ).toEqual(['#! this is a warning']); expect( utils.extractDeprecationMessages( '299 Elasticsearch-6.0.0-alpha1-SNAPSHOT-abcdef1 "this is a warning" "Mon, 27 Feb 2017 14:52:14 GMT", 299 Elasticsearch-6.0.0-alpha1-SNAPSHOT-abcdef1 "this is a second warning" "Mon, 27 Feb 2017 14:52:14 GMT"' ) - ).toEqual(['#! Deprecation: this is a warning', '#! Deprecation: this is a second warning']); + ).toEqual(['#! this is a warning', '#! this is a second warning']); expect( utils.extractDeprecationMessages( '299 Elasticsearch-6.0.0-alpha1-SNAPSHOT-abcdef1 "this is a warning", 299 Elasticsearch-6.0.0-alpha1-SNAPSHOT-abcdef1 "this is a second warning"' ) - ).toEqual(['#! Deprecation: this is a warning', '#! Deprecation: this is a second warning']); + ).toEqual(['#! this is a warning', '#! this is a second warning']); expect( utils.extractDeprecationMessages( '299 Elasticsearch-6.0.0-alpha1-SNAPSHOT-abcdef1 "this is a warning, and it includes a comma" "Mon, 27 Feb 2017 14:52:14 GMT"' ) - ).toEqual(['#! Deprecation: this is a warning, and it includes a comma']); + ).toEqual(['#! this is a warning, and it includes a comma']); expect( utils.extractDeprecationMessages( '299 Elasticsearch-6.0.0-alpha1-SNAPSHOT-abcdef1 "this is a warning, and it includes a comma"' ) - ).toEqual(['#! Deprecation: this is a warning, and it includes a comma']); + ).toEqual(['#! this is a warning, and it includes a comma']); expect( utils.extractDeprecationMessages( '299 Elasticsearch-6.0.0-alpha1-SNAPSHOT-abcdef1 "this is a warning, and it includes an escaped backslash \\\\ and a pair of \\"escaped quotes\\"" "Mon, 27 Feb 2017 14:52:14 GMT"' ) ).toEqual([ - '#! Deprecation: this is a warning, and it includes an escaped backslash \\ and a pair of "escaped quotes"', + '#! this is a warning, and it includes an escaped backslash \\ and a pair of "escaped quotes"', ]); expect( utils.extractDeprecationMessages( '299 Elasticsearch-6.0.0-alpha1-SNAPSHOT-abcdef1 "this is a warning, and it includes an escaped backslash \\\\ and a pair of \\"escaped quotes\\""' ) ).toEqual([ - '#! Deprecation: this is a warning, and it includes an escaped backslash \\ and a pair of "escaped quotes"', + '#! this is a warning, and it includes an escaped backslash \\ and a pair of "escaped quotes"', ]); }); From 0dcb1650cfec41fff041dfd3fc4af9e62b69f6a3 Mon Sep 17 00:00:00 2001 From: Jean-Louis Leysens Date: Wed, 10 Mar 2021 10:26:32 +0100 Subject: [PATCH 2/3] refactor "deprecation" to "warning" --- .../use_send_current_request_to_es/send_request_to_es.ts | 6 +++--- src/plugins/console/public/lib/utils/index.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/console/public/application/hooks/use_send_current_request_to_es/send_request_to_es.ts b/src/plugins/console/public/application/hooks/use_send_current_request_to_es/send_request_to_es.ts index 898d8e809fca1..aeaa2f76816e4 100644 --- a/src/plugins/console/public/application/hooks/use_send_current_request_to_es/send_request_to_es.ts +++ b/src/plugins/console/public/application/hooks/use_send_current_request_to_es/send_request_to_es.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { extractDeprecationMessages } from '../../../lib/utils'; +import { extractWarningMessages } from '../../../lib/utils'; import { XJson } from '../../../../../es_ui_shared/public'; const { collapseLiteralStrings } = XJson; // @ts-ignore @@ -88,8 +88,8 @@ export function sendRequestToES(args: EsRequestArgs): Promise const warnings = xhr.getResponseHeader('warning'); if (warnings) { - const deprecationMessages = extractDeprecationMessages(warnings); - value = deprecationMessages.join('\n') + '\n' + value; + const warningMessages = extractWarningMessages(warnings); + value = warningMessages.join('\n') + '\n' + value; } if (isMultiRequest) { diff --git a/src/plugins/console/public/lib/utils/index.ts b/src/plugins/console/public/lib/utils/index.ts index d3cc0263e1d78..71b305807e61d 100644 --- a/src/plugins/console/public/lib/utils/index.ts +++ b/src/plugins/console/public/lib/utils/index.ts @@ -48,7 +48,7 @@ export function formatRequestBodyDoc(data: string[], indent: boolean) { }; } -export function extractDeprecationMessages(warnings: string) { +export function extractWarningMessages(warnings: string) { // pattern for valid warning header const re = /\d{3} [0-9a-zA-Z!#$%&'*+-.^_`|~]+ \"((?:\t| |!|[\x23-\x5b]|[\x5d-\x7e]|[\x80-\xff]|\\\\|\\")*)\"(?: \"[^"]*\")?/; // split on any comma that is followed by an even number of quotes From 50ea9988f720cc2f48571cd2b68145af8acd4f92 Mon Sep 17 00:00:00 2001 From: Jean-Louis Leysens Date: Wed, 10 Mar 2021 16:15:15 +0100 Subject: [PATCH 3/3] complete name refactor in test files --- .../console/public/lib/utils/utils.test.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/plugins/console/public/lib/utils/utils.test.js b/src/plugins/console/public/lib/utils/utils.test.js index be11a92fddc07..d7fc690e1bc24 100644 --- a/src/plugins/console/public/lib/utils/utils.test.js +++ b/src/plugins/console/public/lib/utils/utils.test.js @@ -11,47 +11,47 @@ import * as utils from '.'; describe('Utils class', () => { test('extract deprecation messages', function () { expect( - utils.extractDeprecationMessages( + utils.extractWarningMessages( '299 Elasticsearch-6.0.0-alpha1-SNAPSHOT-abcdef1 "this is a warning" "Mon, 27 Feb 2017 14:52:14 GMT"' ) ).toEqual(['#! this is a warning']); expect( - utils.extractDeprecationMessages( + utils.extractWarningMessages( '299 Elasticsearch-6.0.0-alpha1-SNAPSHOT-abcdef1 "this is a warning"' ) ).toEqual(['#! this is a warning']); expect( - utils.extractDeprecationMessages( + utils.extractWarningMessages( '299 Elasticsearch-6.0.0-alpha1-SNAPSHOT-abcdef1 "this is a warning" "Mon, 27 Feb 2017 14:52:14 GMT", 299 Elasticsearch-6.0.0-alpha1-SNAPSHOT-abcdef1 "this is a second warning" "Mon, 27 Feb 2017 14:52:14 GMT"' ) ).toEqual(['#! this is a warning', '#! this is a second warning']); expect( - utils.extractDeprecationMessages( + utils.extractWarningMessages( '299 Elasticsearch-6.0.0-alpha1-SNAPSHOT-abcdef1 "this is a warning", 299 Elasticsearch-6.0.0-alpha1-SNAPSHOT-abcdef1 "this is a second warning"' ) ).toEqual(['#! this is a warning', '#! this is a second warning']); expect( - utils.extractDeprecationMessages( + utils.extractWarningMessages( '299 Elasticsearch-6.0.0-alpha1-SNAPSHOT-abcdef1 "this is a warning, and it includes a comma" "Mon, 27 Feb 2017 14:52:14 GMT"' ) ).toEqual(['#! this is a warning, and it includes a comma']); expect( - utils.extractDeprecationMessages( + utils.extractWarningMessages( '299 Elasticsearch-6.0.0-alpha1-SNAPSHOT-abcdef1 "this is a warning, and it includes a comma"' ) ).toEqual(['#! this is a warning, and it includes a comma']); expect( - utils.extractDeprecationMessages( + utils.extractWarningMessages( '299 Elasticsearch-6.0.0-alpha1-SNAPSHOT-abcdef1 "this is a warning, and it includes an escaped backslash \\\\ and a pair of \\"escaped quotes\\"" "Mon, 27 Feb 2017 14:52:14 GMT"' ) ).toEqual([ '#! this is a warning, and it includes an escaped backslash \\ and a pair of "escaped quotes"', ]); expect( - utils.extractDeprecationMessages( + utils.extractWarningMessages( '299 Elasticsearch-6.0.0-alpha1-SNAPSHOT-abcdef1 "this is a warning, and it includes an escaped backslash \\\\ and a pair of \\"escaped quotes\\""' ) ).toEqual([