Fix adjusting the query parameters when removing a specific parameter… (Dash-Industry-Forum#4748)

* Fix adjusting the query parameters when removing a specific parameter from the URL.

* Remove invalid comment

Author: dsilhavy

src/core/Utils.js

@@ -108,17 +108,21 @@ class Utils {
         // Get the search parameters
         const params = new URLSearchParams(parsedUrl.search);
 
-        if (!params || params.size === 0) {
+        if (!params || params.size === 0 || !params.has(queryParameter)) {
             return url;
         }
 
-        // Remove the CMCD parameter
+        // Remove the queryParameter
         params.delete(queryParameter);
 
-        // Reconstruct the URL without the CMCD parameter
-        parsedUrl.search = params.toString();
+        // Manually reconstruct the query string without re-encoding
+        const queryString = Array.from(params.entries())
+            .map(([key, value]) => `${key}=${value}`)
+            .join('&');
 
-        return parsedUrl.toString();
+        // Reconstruct the URL
+        const baseUrl = `${parsedUrl.origin}${parsedUrl.pathname}`;
+        return queryString ? `${baseUrl}?${queryString}` : baseUrl;
     }
 
     static parseHttpHeaders(headerStr) {

test/unit/test/core/core.Utils.js

@@ -177,6 +177,12 @@ describe('Utils', () => {
             expect(modifiedUrl).to.be.equal('http://13.38.43.87:8080/packeng/dash_ll.toml/ateme.mpd');
         })
 
+        it('Should remove query parameter from URL and keep the existing one', () => {
+            const url = 'http://13.38.43.87:8080/packeng/dash_ll.toml/ateme.mpd?CMCD=ot%3Dm%2Cpr%3D0.9900013331200346%2Csf%3Dd%2Csid%3D%22f3a875e8-da06-4261-b9fb-124ea694c524%22%2Cst%3Dl&test=123';
+            const modifiedUrl = Utils.removeQueryParameterFromUrl(url, 'CMCD');
+            expect(modifiedUrl).to.be.equal('http://13.38.43.87:8080/packeng/dash_ll.toml/ateme.mpd?test=123');
+        })
+
         it('Should return original URL as query parameter to be removed is not included', () => {
             const url = 'http://13.38.43.87:8080/packeng/dash_ll.toml/ateme.mpd?CMCD=ot%3Dm%2Cpr%3D0.9900013331200346%2Csf%3Dd%2Csid%3D%22f3a875e8-da06-4261-b9fb-124ea694c524%22%2Cst%3Dl';
             const modifiedUrl = Utils.removeQueryParameterFromUrl(url, 'C');