diff options
| author | Paul Slaughter <pslaughter@gitlab.com> | 2019-08-19 09:00:10 -0500 |
|---|---|---|
| committer | Paul Slaughter <pslaughter@gitlab.com> | 2019-08-19 10:28:23 -0500 |
| commit | 4fdc34c10950863ad04a68dc2117371c95db7478 (patch) | |
| tree | b7355bf68cbc240be181f309840e788bbabb9cea | |
| parent | b1905a396f7e7da89280aea4436eb7261d1cd34c (diff) | |
| download | gitlab-ce-4fdc34c10950863ad04a68dc2117371c95db7478.tar.gz | |
Fix mergeUrlParams handling of `+`
**What was the issue?**
If a param value had `+`, it would be encoded as a
literal `+` instead of a space.
| -rw-r--r-- | app/assets/javascripts/lib/utils/url_utility.js | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/fe-fix-merge-url-params-with-plus.yml | 5 | ||||
| -rw-r--r-- | spec/frontend/lib/utils/url_utility_spec.js | 6 |
3 files changed, 18 insertions, 1 deletions
diff --git a/app/assets/javascripts/lib/utils/url_utility.js b/app/assets/javascripts/lib/utils/url_utility.js index 1336b6a5461..7ead9d46fbb 100644 --- a/app/assets/javascripts/lib/utils/url_utility.js +++ b/app/assets/javascripts/lib/utils/url_utility.js @@ -1,5 +1,11 @@ import { join as joinPaths } from 'path'; +// Returns a decoded url parameter value +// - Treats '+' as '%20' +function decodeUrlParameter(val) { + return decodeURIComponent(val.replace(/\+/g, '%20')); +} + // Returns an array containing the value(s) of the // of the key passed as an argument export function getParameterValues(sParam, url = window.location) { @@ -30,7 +36,7 @@ export function mergeUrlParams(params, url) { .forEach(part => { if (part.length) { const kv = part.split('='); - merged[decodeURIComponent(kv[0])] = decodeURIComponent(kv.slice(1).join('=')); + merged[decodeUrlParameter(kv[0])] = decodeUrlParameter(kv.slice(1).join('=')); } }); } diff --git a/changelogs/unreleased/fe-fix-merge-url-params-with-plus.yml b/changelogs/unreleased/fe-fix-merge-url-params-with-plus.yml new file mode 100644 index 00000000000..7ca8ae0a8f6 --- /dev/null +++ b/changelogs/unreleased/fe-fix-merge-url-params-with-plus.yml @@ -0,0 +1,5 @@ +--- +title: Fix search preserving space when change branch +merge_request: 31973 +author: minghuan lei +type: fixed diff --git a/spec/frontend/lib/utils/url_utility_spec.js b/spec/frontend/lib/utils/url_utility_spec.js index a986bc49f28..b0bdd924921 100644 --- a/spec/frontend/lib/utils/url_utility_spec.js +++ b/spec/frontend/lib/utils/url_utility_spec.js @@ -94,6 +94,12 @@ describe('URL utility', () => { it('adds and updates encoded params', () => { expect(urlUtils.mergeUrlParams({ a: '&', q: '?' }, '?a=%23#frag')).toBe('?a=%26&q=%3F#frag'); }); + + it('treats "+" as "%20"', () => { + expect(urlUtils.mergeUrlParams({ ref: 'bogus' }, '?a=lorem+ipsum&ref=charlie')).toBe( + '?a=lorem%20ipsum&ref=bogus', + ); + }); }); describe('removeParams', () => { |