From 80f5cad37a8043fb7069987810c372771b3ac799 Mon Sep 17 00:00:00 2001 From: Evans Aboge Date: Wed, 3 Aug 2022 10:31:18 +0300 Subject: [PATCH 1/2] stop sanitizing query url --- .../query-runner/query-input/share-query/ShareQuery.tsx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/app/views/query-runner/query-input/share-query/ShareQuery.tsx b/src/app/views/query-runner/query-input/share-query/ShareQuery.tsx index da1864f853..10647e572b 100644 --- a/src/app/views/query-runner/query-input/share-query/ShareQuery.tsx +++ b/src/app/views/query-runner/query-input/share-query/ShareQuery.tsx @@ -7,7 +7,6 @@ import { useSelector } from 'react-redux'; import { componentNames, eventTypes, telemetry } from '../../../../../telemetry'; import { IRootState } from '../../../../../types/root'; -import { sanitizeQueryUrl } from '../../../../utils/query-url-sanitization'; import { translateMessage } from '../../../../utils/translate-messages'; import { copy } from '../../../common/copy'; import { CopyButton } from '../../../common/copy/CopyButton'; @@ -19,10 +18,7 @@ export const ShareQuery = () => { const { sampleQuery } = useSelector((state: IRootState) => state); const [showShareQueryDialog, setShareQuaryDialogStatus] = useState(true); - const query = { ...sampleQuery }; - const sanitizedQueryUrl = sanitizeQueryUrl(query.sampleUrl); - query.sampleUrl = sanitizedQueryUrl; - const shareLink = createShareLink(query); + const shareLink = createShareLink(sampleQuery); const toggleShareQueryDialogState = () => { setShareQuaryDialogStatus(prevState => !prevState); @@ -37,7 +33,7 @@ export const ShareQuery = () => { telemetry.trackEvent(eventTypes.BUTTON_CLICK_EVENT, { ComponentName: componentNames.SHARE_QUERY_COPY_BUTTON, - QuerySignature: `${sampleQuery.selectedVerb} ${sanitizedQueryUrl}` + QuerySignature: `${sampleQuery.selectedVerb} ${sampleQuery}` }); } From bc8159ce51bfd52c56730f794f33173cc550c807 Mon Sep 17 00:00:00 2001 From: Evans Aboge Date: Wed, 3 Aug 2022 10:50:08 +0300 Subject: [PATCH 2/2] fix query signature --- .../query-runner/query-input/share-query/ShareQuery.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/app/views/query-runner/query-input/share-query/ShareQuery.tsx b/src/app/views/query-runner/query-input/share-query/ShareQuery.tsx index 10647e572b..fcc8ebdd7e 100644 --- a/src/app/views/query-runner/query-input/share-query/ShareQuery.tsx +++ b/src/app/views/query-runner/query-input/share-query/ShareQuery.tsx @@ -7,6 +7,7 @@ import { useSelector } from 'react-redux'; import { componentNames, eventTypes, telemetry } from '../../../../../telemetry'; import { IRootState } from '../../../../../types/root'; +import { sanitizeQueryUrl } from '../../../../utils/query-url-sanitization'; import { translateMessage } from '../../../../utils/translate-messages'; import { copy } from '../../../common/copy'; import { CopyButton } from '../../../common/copy/CopyButton'; @@ -18,6 +19,8 @@ export const ShareQuery = () => { const { sampleQuery } = useSelector((state: IRootState) => state); const [showShareQueryDialog, setShareQuaryDialogStatus] = useState(true); + const query = { ...sampleQuery }; + const sanitizedQueryUrl = sanitizeQueryUrl(query.sampleUrl); const shareLink = createShareLink(sampleQuery); const toggleShareQueryDialogState = () => { @@ -33,7 +36,7 @@ export const ShareQuery = () => { telemetry.trackEvent(eventTypes.BUTTON_CLICK_EVENT, { ComponentName: componentNames.SHARE_QUERY_COPY_BUTTON, - QuerySignature: `${sampleQuery.selectedVerb} ${sampleQuery}` + QuerySignature: `${query.selectedVerb} ${sanitizedQueryUrl}` }); }