Address review.

Author: abdelmalekkkkk

assets/js/components/ReportError.js

@@ -27,6 +27,7 @@ import { uniqWith } from 'lodash';
  */
 import { Fragment } from '@wordpress/element';
 import { __, sprintf } from '@wordpress/i18n';
+import { removeQueryArgs } from '@wordpress/url';
 
 /**
  * Internal dependencies
@@ -39,7 +40,6 @@ import {
 } from '@/js/util/errors';
 import { getInsufficientPermissionsErrorDescription } from '@/js/util/insufficient-permissions-error-description';
 import { purify } from '@/js/util/purify';
-import { removeParamFromURL } from '@/js/util/urls';
 import CTA from './notifications/CTA';
 import ReportErrorActions from './ReportErrorActions';
 import useViewOnly from '@/js/hooks/useViewOnly';
@@ -93,12 +93,15 @@ export default function ReportError( { moduleSlug, error } ) {
 		errors.map( ( err ) => ( {
 			...err,
 			message: getMessage( err ),
-			reconnectURL: err.data?.reconnectURL,
+			// The `code` parameter contains a session ID which can vary
+			// between requests, so we ignore it when comparing.
+			reconnectURL: err.data?.reconnectURL
+				? removeQueryArgs( err.data?.reconnectURL, 'code' )
+				: undefined,
 		} ) ),
 		( errorA, errorB ) =>
 			errorA.message === errorB.message &&
-			removeParamFromURL( errorA.reconnectURL, 'code' ) ===
-				removeParamFromURL( errorB.reconnectURL, 'code' )
+			errorA.reconnectURL === errorB.reconnectURL
 	);
 
 	const hasInsufficientPermissionsError = errors.some( ( err ) =>

assets/js/components/ReportError.test.js

@@ -571,7 +571,7 @@ describe( 'ReportError', () => {
 		expect( invalidateResolutionSpy ).toHaveBeenCalledTimes( 4 );
 	} );
 
-	it( 'should group errors based on `reconnectURL`', async () => {
+	it( 'it should not list error descriptions with the same `reconnectURL`s', async () => {
 		const { container } = render(
 			<ReportError
 				moduleSlug={ moduleName }

assets/js/util/urls.js

@@ -118,23 +118,3 @@ export function shortenURL( url, maxChars ) {
 	const extraChars = shortenedURL.length - Math.floor( maxChars ) + 1; // 1 is the length of "…".
 	return '…' + shortenedURL.substr( extraChars );
 }
-
-/**
- * Removes a query parameter from a URL.
- *
- * @since n.e.x.t
- *
- * @param {string} url   The URL to remove the query parameter from.
- * @param {string} param The query parameter to remove.
- * @return {string} The URL without the query param.
- */
-export function removeParamFromURL( url, param ) {
-	// Wrapped in try catch to avoid exceptions in the rare case the URL is invalid.
-	try {
-		const urlObject = new URL( url );
-		urlObject.searchParams.delete( param );
-		return urlObject.toString();
-	} catch {
-		return url;
-	}
-}