plausible/analytics
1
1
Fork 0
mirror of https://github.com/plausible/analytics.git synced 2024-11-22 10:43:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove ListReport conditional render

Browse Source
This commit is contained in:
Uku Taht 2023-02-06 17:15:07 +02:00
parent 2ff76dea8b
commit 959b2d5e7a
2 changed files with 23 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/js/dashboard/filters.js
View File

@ -50,11 +50,11 @@ function filterText(key, rawValue, query) {
return <>{eventName}.{metaKey} {toFilterType(metaValue)} <b>{valueWithoutPrefix(metaValue)}</b></>
}
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} <b>{value}</b></>
}
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} <b>{value}</b></>
}
if (key === "country") {

64
assets/js/dashboard/stats/devices/index.js
View File

@ -25,25 +25,16 @@ function BrowserVersions({ query, site }) {
return api.get(url.apiPath(site, '/browser-versions'), query)
}
if (query.filters.browser == "(not set)") {
return (
<ListReport
fetchData={fetchData}
filter={{}}
keyLabel="Browser"
query={query}
/>
)
} else {
return (
<ListReport
fetchData={fetchData}
filter={{ browser_version: 'name' }}
keyLabel={query.filters.browser + ' version'}
query={query}
/>
)
}
const browserName = query.filters.browser === '(not set)' ? 'Browser' : query.filters.browser
return (
<ListReport
fetchData={fetchData}
filter={{ browser_version: 'name' }}
keyLabel={browserName + ' version'}
query={query}
/>
)
}
@ -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 (
<ListReport
fetchData={fetchData}
filter={{}}
keyLabel="Operating System"
query={query}
/>
)
} else {
return (
<ListReport
fetchData={fetchData}
filter={{ os_version: 'name' }}
keyLabel={query.filters.os + ' version'}
query={query}
/>
)
}
const osName = query.filters.os === '(not set)' ? 'Operating System' : query.filters.os
return (
<ListReport
fetchData={fetchData}
filter={{ os_version: 'name' }}
keyLabel={osName + ' version'}
query={query}
/>
)
}
@ -139,11 +121,7 @@ function iconFor(screenSize) {
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" className="-mt-px feather"><rect x="2" y="3" width="20" height="14" rx="2" ry="2" /><line x1="8" y1="21" x2="16" y2="21" /><line x1="12" y1="17" x2="12" y2="21" /></svg>
)
} else if (screenSize === '(not set)') {
return (
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" className="-mt-px feather">
<path strokeLinecap="round" strokeLinejoin="round" d="M9.879 7.519c1.171-1.025 3.071-1.025 4.242 0 1.172 1.025 1.172 2.687 0 3.712-.203.179-.43.326-.67.442-.745.361-1.45.999-1.45 1.827v.75M21 12a9 9 0 11-18 0 9 9 0 0118 0zm-9 5.25h.008v.008H12v-.008z" />
</svg>
)
return null
}
}