From 1e91556a951b9d8b3918c4ba849b0e0ea27c9494 Mon Sep 17 00:00:00 2001
From: Robbie <robbie.coomber@gmail.com>
Date: Tue, 19 Dec 2023 15:19:36 +0000
Subject: [PATCH] chore(web-analytics): Tidy action to url in web analytics
 logic (#19409)

Tidy action to url in web analytics logic
---
 .../scenes/web-analytics/webAnalyticsLogic.ts | 110 ++++++++----------
 1 file changed, 51 insertions(+), 59 deletions(-)

diff --git a/frontend/src/scenes/web-analytics/webAnalyticsLogic.ts b/frontend/src/scenes/web-analytics/webAnalyticsLogic.ts
index a42ab511a4010..c16ac149d5ca0 100644
--- a/frontend/src/scenes/web-analytics/webAnalyticsLogic.ts
+++ b/frontend/src/scenes/web-analytics/webAnalyticsLogic.ts
@@ -887,17 +887,57 @@ export const webAnalyticsLogic = kea<webAnalyticsLogicType>([
         isGreaterThanMd: (window: Window) => window.innerWidth > 768,
     }),
 
-    actionToUrl(({ values }) => ({
-        setWebAnalyticsFilters: () => stateToUrl(values),
-        togglePropertyFilter: () => stateToUrl(values),
-        setDates: () => stateToUrl(values),
-        setInterval: () => stateToUrl(values),
-        setDeviceTab: () => stateToUrl(values),
-        setSourceTab: () => stateToUrl(values),
-        setGraphsTab: () => stateToUrl(values),
-        setPathTab: () => stateToUrl(values),
-        setGeographyTab: () => stateToUrl(values),
-    })),
+    actionToUrl(({ values }) => {
+        const stateToUrl = (): string => {
+            const {
+                webAnalyticsFilters,
+                dateFilter: { dateTo, dateFrom, interval },
+                sourceTab,
+                deviceTab,
+                pathTab,
+                geographyTab,
+                graphsTab,
+            } = values
+
+            const urlParams = new URLSearchParams()
+            if (webAnalyticsFilters.length > 0) {
+                urlParams.set('filters', JSON.stringify(webAnalyticsFilters))
+            }
+            if (dateFrom !== initialDateFrom || dateTo !== initialDateTo || interval !== initialInterval) {
+                urlParams.set('date_from', dateFrom ?? '')
+                urlParams.set('date_to', dateTo ?? '')
+                urlParams.set('interval', interval ?? '')
+            }
+            if (deviceTab) {
+                urlParams.set('device_tab', deviceTab)
+            }
+            if (sourceTab) {
+                urlParams.set('source_tab', sourceTab)
+            }
+            if (graphsTab) {
+                urlParams.set('graphs_tab', graphsTab)
+            }
+            if (pathTab) {
+                urlParams.set('path_tab', pathTab)
+            }
+            if (geographyTab) {
+                urlParams.set('geography_tab', geographyTab)
+            }
+            return `/web?${urlParams.toString()}`
+        }
+
+        return {
+            setWebAnalyticsFilters: stateToUrl,
+            togglePropertyFilter: stateToUrl,
+            setDates: stateToUrl,
+            setInterval: stateToUrl,
+            setDeviceTab: stateToUrl,
+            setSourceTab: stateToUrl,
+            setGraphsTab: stateToUrl,
+            setPathTab: stateToUrl,
+            setGeographyTab: stateToUrl,
+        }
+    }),
 
     urlToAction(({ actions }) => ({
         '/web': (
@@ -923,51 +963,3 @@ const isDefinitionStale = (definition: EventDefinition | PropertyDefinition): bo
     const parsedLastSeen = definition.last_seen_at ? dayjs(definition.last_seen_at) : null
     return !!parsedLastSeen && dayjs().diff(parsedLastSeen, 'seconds') > STALE_EVENT_SECONDS
 }
-
-const stateToUrl = ({
-    webAnalyticsFilters,
-    dateFilter: { dateFrom, dateTo, interval },
-    deviceTab,
-    sourceTab,
-    graphsTab,
-    pathTab,
-    geographyTab,
-}: {
-    webAnalyticsFilters: WebAnalyticsPropertyFilters
-    dateFilter: {
-        dateFrom: string | null
-        dateTo: string | null
-        interval: string | null
-    }
-    deviceTab: string | null
-    sourceTab: string | null
-    graphsTab: string | null
-    pathTab: string | null
-    geographyTab: string | null
-}): string => {
-    const urlParams = new URLSearchParams()
-    if (webAnalyticsFilters.length > 0) {
-        urlParams.set('filters', JSON.stringify(webAnalyticsFilters))
-    }
-    if (dateFrom !== initialDateFrom || dateTo !== initialDateTo || interval !== initialInterval) {
-        urlParams.set('date_from', dateFrom ?? '')
-        urlParams.set('date_to', dateTo ?? '')
-        urlParams.set('interval', interval ?? '')
-    }
-    if (deviceTab) {
-        urlParams.set('device_tab', deviceTab)
-    }
-    if (sourceTab) {
-        urlParams.set('source_tab', sourceTab)
-    }
-    if (graphsTab) {
-        urlParams.set('graphs_tab', graphsTab)
-    }
-    if (pathTab) {
-        urlParams.set('path_tab', pathTab)
-    }
-    if (geographyTab) {
-        urlParams.set('geography_tab', geographyTab)
-    }
-    return `/web?${urlParams.toString()}`
-}