From db325419cd4aa113bb1e7e8a02c877c1d02baddf Mon Sep 17 00:00:00 2001 From: ppisljar Date: Sun, 10 Jul 2016 16:34:15 +0200 Subject: [PATCH 1/7] fix #7332 - saving vis with % in name causes error --- src/ui/public/utils/__tests__/slugify_id.js | 6 +++++- src/ui/public/utils/slugify_id.js | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ui/public/utils/__tests__/slugify_id.js b/src/ui/public/utils/__tests__/slugify_id.js index 18541030f0c4d..57f7f2181501b 100644 --- a/src/ui/public/utils/__tests__/slugify_id.js +++ b/src/ui/public/utils/__tests__/slugify_id.js @@ -9,18 +9,22 @@ describe('slugifyId()', function () { ['test?test', 'test-questionmark-test'], ['test=test', 'test-equal-test'], ['test&test', 'test-ampersand-test'], + ['test%test', 'test-percent-test'], ['test / test', 'test-slash-test'], ['test ? test', 'test-questionmark-test'], ['test = test', 'test-equal-test'], ['test & test', 'test-ampersand-test'], + ['test % test', 'test-percent-test'], ['test / ^test', 'test-slash-^test'], ['test ? test', 'test-questionmark-test'], ['test = test', 'test-equal-test'], ['test & test', 'test-ampersand-test'], + ['test % test', 'test-percent-test'], ['test/test/test', 'test-slash-test-slash-test'], ['test?test?test', 'test-questionmark-test-questionmark-test'], ['test&test&test', 'test-ampersand-test-ampersand-test'], - ['test=test=test', 'test-equal-test-equal-test'] + ['test=test=test', 'test-equal-test-equal-test'], + ['test%test%test', 'test-percent-test-percent-test'] ]; _.each(fixtures, function (fixture) { diff --git a/src/ui/public/utils/slugify_id.js b/src/ui/public/utils/slugify_id.js index b0f1920e501e6..0894d9356593e 100644 --- a/src/ui/public/utils/slugify_id.js +++ b/src/ui/public/utils/slugify_id.js @@ -6,7 +6,8 @@ export default function (id) { '/' : '-slash-', '\\?' : '-questionmark-', '\\&' : '-ampersand-', - '=' : '-equal-' + '=' : '-equal-', + '%' : '-percent-' }; _.each(trans, function (val, key) { let regex = new RegExp(key, 'g'); From 25d34d012c867eba3b884bda0e104a78c017d7ff Mon Sep 17 00:00:00 2001 From: ppisljar Date: Wed, 13 Jul 2016 13:28:19 +0200 Subject: [PATCH 2/7] updating tests to test with % in visualization name --- test/functional/apps/visualize/_area_chart.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/functional/apps/visualize/_area_chart.js b/test/functional/apps/visualize/_area_chart.js index 977a30339e259..2a301ef80eeb7 100644 --- a/test/functional/apps/visualize/_area_chart.js +++ b/test/functional/apps/visualize/_area_chart.js @@ -60,7 +60,7 @@ bdd.describe('visualize app', function describeIndexTests() { }); bdd.describe('area charts', function indexPatternCreation() { - var vizName1 = 'Visualization AreaChart'; + var vizName1 = 'Visualization % AreaChart'; bdd.it('should save and load', function pageHeader() { return PageObjects.visualize.saveVisualization(vizName1) From ef372ca308bf5a6e744899865a5999b6ac633973 Mon Sep 17 00:00:00 2001 From: ppisljar Date: Wed, 13 Jul 2016 16:04:04 +0200 Subject: [PATCH 3/7] - updated the test (wont pass until # is fixed) --- test/functional/apps/visualize/_area_chart.js | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/test/functional/apps/visualize/_area_chart.js b/test/functional/apps/visualize/_area_chart.js index 2a301ef80eeb7..3f471f689a888 100644 --- a/test/functional/apps/visualize/_area_chart.js +++ b/test/functional/apps/visualize/_area_chart.js @@ -60,7 +60,32 @@ bdd.describe('visualize app', function describeIndexTests() { }); bdd.describe('area charts', function indexPatternCreation() { - var vizName1 = 'Visualization % AreaChart'; + var vizName1 = 'Visualization AreaChart'; + + bdd.it('should save and load with special characters', function pageHeader() { + let vizName2 = vizName1 + '/?&=%'; + return PageObjects.visualize.saveVisualization(vizName2) + .then(function (message) { + PageObjects.common.debug('Saved viz message = ' + message); + PageObjects.common.saveScreenshot('Visualize-area-chart-save-toast'); + expect(message).to.be('Visualization Editor: Saved Visualization \"' + vizName2 + '\"'); + }) + .then(function testVisualizeWaitForToastMessageGone() { + return PageObjects.visualize.waitForToastMessageGone(); + }) + .then(function loadSavedVisualization() { + return PageObjects.visualize.loadSavedVisualization(vizName2); + }) + .then(function () { + return PageObjects.visualize.waitForVisualization(); + }) + // We have to sleep sometime between loading the saved visTitle + // and trying to access the chart below with getXAxisLabels + // otherwise it hangs. + .then(function sleep() { + return PageObjects.common.sleep(2000); + }); + }); bdd.it('should save and load', function pageHeader() { return PageObjects.visualize.saveVisualization(vizName1) From 721d3bc29e9272b84dd5723fc439fae3d18f6735 Mon Sep 17 00:00:00 2001 From: ppisljar Date: Thu, 14 Jul 2016 13:29:42 +0200 Subject: [PATCH 4/7] - fix for #7733 strings with special charracters are not found unless we add a space after it (searching for "test %*" wont work but searching for "test % *" will ) --- .../visualize/saved_visualizations/saved_visualizations.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js b/src/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js index 512cfd407cb44..bf21e2f3a3bb6 100644 --- a/src/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js +++ b/src/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js @@ -84,7 +84,7 @@ app.service('savedVisualizations', function (Promise, es, kbnIndex, SavedVis, Pr body = { query: { simple_query_string: { - query: searchString + '*', + query: searchString + (['/', '!', '?', '&', '=', '%'].indexOf(searchString[searchString.length - 1]) === -1 ? '' : ' ') + '*', fields: ['title^3', 'description'], default_operator: 'AND' } From a484283837e55ba7fae8a608e657e296fed76281 Mon Sep 17 00:00:00 2001 From: ppisljar Date: Mon, 18 Jul 2016 16:13:42 +0200 Subject: [PATCH 5/7] - added analyze_wildcard to query body --- .../saved_visualizations.js | 5 ++-- test/functional/apps/visualize/_area_chart.js | 29 +++++-------------- 2 files changed, 10 insertions(+), 24 deletions(-) diff --git a/src/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js b/src/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js index bf21e2f3a3bb6..2b845d6391563 100644 --- a/src/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js +++ b/src/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js @@ -84,9 +84,10 @@ app.service('savedVisualizations', function (Promise, es, kbnIndex, SavedVis, Pr body = { query: { simple_query_string: { - query: searchString + (['/', '!', '?', '&', '=', '%'].indexOf(searchString[searchString.length - 1]) === -1 ? '' : ' ') + '*', + query: searchString + '*', fields: ['title^3', 'description'], - default_operator: 'AND' + default_operator: 'AND', + analyze_wildcard: true } } }; diff --git a/test/functional/apps/visualize/_area_chart.js b/test/functional/apps/visualize/_area_chart.js index 3f471f689a888..e97471a575d82 100644 --- a/test/functional/apps/visualize/_area_chart.js +++ b/test/functional/apps/visualize/_area_chart.js @@ -63,28 +63,13 @@ bdd.describe('visualize app', function describeIndexTests() { var vizName1 = 'Visualization AreaChart'; bdd.it('should save and load with special characters', function pageHeader() { - let vizName2 = vizName1 + '/?&=%'; - return PageObjects.visualize.saveVisualization(vizName2) - .then(function (message) { - PageObjects.common.debug('Saved viz message = ' + message); - PageObjects.common.saveScreenshot('Visualize-area-chart-save-toast'); - expect(message).to.be('Visualization Editor: Saved Visualization \"' + vizName2 + '\"'); - }) - .then(function testVisualizeWaitForToastMessageGone() { - return PageObjects.visualize.waitForToastMessageGone(); - }) - .then(function loadSavedVisualization() { - return PageObjects.visualize.loadSavedVisualization(vizName2); - }) - .then(function () { - return PageObjects.visualize.waitForVisualization(); - }) - // We have to sleep sometime between loading the saved visTitle - // and trying to access the chart below with getXAxisLabels - // otherwise it hangs. - .then(function sleep() { - return PageObjects.common.sleep(2000); - }); + const vizNamewithSpecialChars = vizName1 + '/?&=%'; + return PageObjects.visualize.saveVisualization(vizNamewithSpecialChars) + .then(function (message) { + PageObjects.common.debug(`Saved viz message = ${message}`); + PageObjects.common.saveScreenshot('Visualize-area-chart-save-toast'); + expect(message).to.be(`Visualization Editor: Saved Visualization "${vizNamewithSpecialChars}"`); + }); }); bdd.it('should save and load', function pageHeader() { From 2f4e5aa0fa3a9af9e69797a61f2803e5f82a9ce3 Mon Sep 17 00:00:00 2001 From: ppisljar Date: Tue, 26 Jul 2016 18:03:30 +0200 Subject: [PATCH 6/7] removing screenshot from test --- test/functional/apps/visualize/_area_chart.js | 1 - 1 file changed, 1 deletion(-) diff --git a/test/functional/apps/visualize/_area_chart.js b/test/functional/apps/visualize/_area_chart.js index e97471a575d82..2c6c95f450ac1 100644 --- a/test/functional/apps/visualize/_area_chart.js +++ b/test/functional/apps/visualize/_area_chart.js @@ -67,7 +67,6 @@ bdd.describe('visualize app', function describeIndexTests() { return PageObjects.visualize.saveVisualization(vizNamewithSpecialChars) .then(function (message) { PageObjects.common.debug(`Saved viz message = ${message}`); - PageObjects.common.saveScreenshot('Visualize-area-chart-save-toast'); expect(message).to.be(`Visualization Editor: Saved Visualization "${vizNamewithSpecialChars}"`); }); }); From 30fcbb636cd99fb1bc3f834055dce0cf8a62fbd1 Mon Sep 17 00:00:00 2001 From: ppisljar Date: Wed, 27 Jul 2016 15:20:05 +0200 Subject: [PATCH 7/7] fixing test --- test/functional/apps/visualize/_area_chart.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/functional/apps/visualize/_area_chart.js b/test/functional/apps/visualize/_area_chart.js index 2c6c95f450ac1..8176333202185 100644 --- a/test/functional/apps/visualize/_area_chart.js +++ b/test/functional/apps/visualize/_area_chart.js @@ -68,6 +68,9 @@ bdd.describe('visualize app', function describeIndexTests() { .then(function (message) { PageObjects.common.debug(`Saved viz message = ${message}`); expect(message).to.be(`Visualization Editor: Saved Visualization "${vizNamewithSpecialChars}"`); + }) + .then(function testVisualizeWaitForToastMessageGone() { + return PageObjects.visualize.waitForToastMessageGone(); }); });