From cd9005c0445862560920f91eb842854dc54faa77 Mon Sep 17 00:00:00 2001 From: Paul D'Ambra Date: Wed, 27 Mar 2024 09:16:41 +0000 Subject: [PATCH] revert: "fix: element stats API is only returning rage clicks" (#21180) Revert "fix: element stats API is only returning rage clicks (#21178)" This reverts commit 195f0c54232ad0aceb9978ff8b990d18bfbf4aba. --- frontend/src/toolbar/elements/heatmapLogic.ts | 6 ++---- frontend/src/toolbar/toolbarConfigLogic.ts | 10 ++-------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/frontend/src/toolbar/elements/heatmapLogic.ts b/frontend/src/toolbar/elements/heatmapLogic.ts index 026ff248c0f69..de7232bd70dfd 100644 --- a/frontend/src/toolbar/elements/heatmapLogic.ts +++ b/frontend/src/toolbar/elements/heatmapLogic.ts @@ -119,14 +119,12 @@ export const heatmapLogic = kea([ )}${includeEventsParams}` } - // toolbar fetch collapses URL query params to an object - // but this URL has multiple with the same name, - // so we must pass it through only-add-token + // toolbar fetch collapses queryparams but this URL has multiple with the same name const response = await toolbarFetch( url || defaultUrl, 'GET', undefined, - url ? 'use-as-provided' : 'only-add-token' + url ? 'use-as-provided' : 'full' ) if (response.status === 403) { diff --git a/frontend/src/toolbar/toolbarConfigLogic.ts b/frontend/src/toolbar/toolbarConfigLogic.ts index afd1f6f47a2fb..c0650d7552d55 100644 --- a/frontend/src/toolbar/toolbarConfigLogic.ts +++ b/frontend/src/toolbar/toolbarConfigLogic.ts @@ -103,14 +103,10 @@ export async function toolbarFetch( /* allows caller to control how the provided URL is altered before use if "full" then the payload and URL are taken apart and reconstructed - if "only-add-token" the URL is unchanged, but the temporary token is added to the URL - if "use-as-provided" then the URL is used as-is, the token is not added - + if "use-as-provided" then the URL is used as-is, and the payload is not used this is because the heatmapLogic needs more control over how the query parameters are constructed - the call to elementStats allows multiple query parameter with the same name - passing it through url construction loses information */ - urlConstruction: 'full' | 'only-add-token' | 'use-as-provided' = 'full' + urlConstruction: 'full' | 'use-as-provided' = 'full' ): Promise { const temporaryToken = toolbarConfigLogic.findMounted()?.values.temporaryToken const apiURL = toolbarConfigLogic.findMounted()?.values.apiURL @@ -118,8 +114,6 @@ export async function toolbarFetch( let fullUrl: string if (urlConstruction === 'use-as-provided') { fullUrl = url - } else if (urlConstruction === 'only-add-token') { - fullUrl = `${url}&temporary_token=${temporaryToken}` } else { const { pathname, searchParams } = combineUrl(url) const params = { ...searchParams, temporary_token: temporaryToken }