amp-autocomplete: preserve existing query parameters in src (#26589)

Currently, if the `query` attribute is specified, existing query parameters in the source url are replaced with the specified value.
ampproject · Feb 13, 2020 · cd15c73 · cd15c73
1 parent c701777
commit cd15c73
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/extensions/amp-autocomplete/0.1/amp-autocomplete.js b/extensions/amp-autocomplete/0.1/amp-autocomplete.js
@@ -28,6 +28,7 @@ import {
   batchFetchJsonFor,
   requestForBatchFetch,
 } from '../../../src/batched-json';
+import {addParamToUrl} from '../../../src/url';
 import {createCustomEvent} from '../../../src/event-helper';
 import {dev, user, userAssert} from '../../../src/log';
 import {dict, hasOwn, map, ownProperty} from '../../../src/utils/object';
@@ -439,9 +440,7 @@ export class AmpAutocomplete extends AMP.BaseElement {
    * @private
    */
   generateSrc_(opt_query = '') {
-    const encodedQueryKey = encodeURIComponent(this.queryKey_);
-    const encodedQuery = encodeURIComponent(opt_query);
-    return `${this.srcBase_}?${encodedQueryKey}=${encodedQuery}`;
+    return addParamToUrl(this.srcBase_, this.queryKey_, opt_query);
   }
 
   /**

diff --git a/extensions/amp-autocomplete/0.1/test/test-amp-autocomplete.js b/extensions/amp-autocomplete/0.1/test/test-amp-autocomplete.js
@@ -996,5 +996,18 @@ describes.realWin(
         );
       });
     });
+
+    it('should preserve existing query parameters when generating src values from "query" attribute', () => {
+      return impl.layoutCallback().then(() => {
+        impl.queryKey_ = 'q';
+        impl.srcBase_ = 'https://www.data.com/?param=1';
+        expect(impl.generateSrc_('')).to.equal(
+          'https://www.data.com/?param=1&q='
+        );
+        expect(impl.generateSrc_('abc')).to.equal(
+          'https://www.data.com/?param=1&q=abc'
+        );
+      });
+    });
   }
 );