From 959b2d5e7a137e019a00ba4aa1dd3ae642bc3ac6 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Mon, 6 Feb 2023 17:15:07 +0200 Subject: [PATCH] Remove ListReport conditional render --- assets/js/dashboard/filters.js | 4 +- assets/js/dashboard/stats/devices/index.js | 64 +++++++--------------- 2 files changed, 23 insertions(+), 45 deletions(-) diff --git a/assets/js/dashboard/filters.js b/assets/js/dashboard/filters.js index 98413e60a..631e4ef2e 100644 --- a/assets/js/dashboard/filters.js +++ b/assets/js/dashboard/filters.js @@ -50,11 +50,11 @@ function filterText(key, rawValue, query) { return <>{eventName}.{metaKey} {toFilterType(metaValue)} {valueWithoutPrefix(metaValue)} } if (key === "browser_version") { - const browserName = query.filters.browser ? query.filters.browser : 'Browser' + const browserName = query.filters.browser === '(not set)' ? 'Browser' : query.filters.browser return <>{browserName}.Version {type} {value} } if (key === "os_version") { - const osName = query.filters.os ? query.filters.os : 'OS' + const osName = query.filters.os === '(not set)' ? 'OS' : query.filters.os return <>{osName}.Version {type} {value} } if (key === "country") { diff --git a/assets/js/dashboard/stats/devices/index.js b/assets/js/dashboard/stats/devices/index.js index ef519310b..c3f8867cc 100644 --- a/assets/js/dashboard/stats/devices/index.js +++ b/assets/js/dashboard/stats/devices/index.js @@ -25,25 +25,16 @@ function BrowserVersions({ query, site }) { return api.get(url.apiPath(site, '/browser-versions'), query) } - if (query.filters.browser == "(not set)") { - return ( - - ) - } else { - return ( - - ) - } + const browserName = query.filters.browser === '(not set)' ? 'Browser' : query.filters.browser + + return ( + + ) } @@ -67,25 +58,16 @@ function OperatingSystemVersions({ query, site }) { return api.get(url.apiPath(site, '/operating-system-versions'), query) } - if (query.filters.os == "(not set)") { - return ( - - ) - } else { - return ( - - ) - } + const osName = query.filters.os === '(not set)' ? 'Operating System' : query.filters.os + + return ( + + ) } @@ -139,11 +121,7 @@ function iconFor(screenSize) { ) } else if (screenSize === '(not set)') { - return ( - - - - ) + return null } }