diff --git a/assets/js/dashboard/filters.js b/assets/js/dashboard/filters.js index 769040435..51624475c 100644 --- a/assets/js/dashboard/filters.js +++ b/assets/js/dashboard/filters.js @@ -31,58 +31,58 @@ function clearAllFilters(history, query) { function filterText(key, value, query) { if (key === "goal") { - return Completed goal {value} + return <>Completed goal {value} } if (key === "props") { const [metaKey, metaValue] = Object.entries(value)[0] const eventName = query.filters.goal ? query.filters.goal : 'event' - return {eventName}.{metaKey} is {metaValue} + return <>{eventName}.{metaKey} is {metaValue} } if (key === "source") { - return Source: {value} + return <>Source: {value} } if (key === "utm_medium") { - return UTM medium: {value} + return <>UTM medium: {value} } if (key === "utm_source") { - return UTM source: {value} + return <>UTM source: {value} } if (key === "utm_campaign") { - return UTM campaign: {value} + return <>UTM campaign: {value} } if (key === "referrer") { - return Referrer: {value} + return <>Referrer: {value} } if (key === "screen") { - return Screen size: {value} + return <>Screen size: {value} } if (key === "browser") { - return Browser: {value} + return <>Browser: {value} } if (key === "browser_version") { const browserName = query.filters.browser ? query.filters.browser : 'Browser' - return {browserName}.Version: {value} + return <>{browserName}.Version: {value} } if (key === "os") { - return Operating System: {value} + return <>Operating System: {value} } if (key === "os_version") { const osName = query.filters.os ? query.filters.os : 'OS' - return {osName}.Version: {value} + return <>{osName}.Version: {value} } if (key === "country") { const allCountries = Datamap.prototype.worldTopo.objects.world.geometries; const selectedCountry = allCountries.find((c) => c.id === value) || {properties: {name: value}}; - return Country: {selectedCountry.properties.name} + return <>Country: {selectedCountry.properties.name} } if (key === "page") { - return Page: {value} + return <>Page: {value} } if (key === "entry_page") { - return Entry Page: {value} + return <>Entry Page: {value} } if (key === "exit_page") { - return Exit Page: {value} + return <>Exit Page: {value} } throw new Error(`Unknown filter: ${key}`) @@ -93,7 +93,7 @@ function renderDropdownFilter(site, history, [key, value], query) { return (
- {filterText(key, value, query)} + {filterText(key, value, query)} removeFilter(key, history, query)}>✕
@@ -108,7 +108,7 @@ function renderDropdownFilter(site, history, [key, value], query) { to={{ pathname: `/${encodeURIComponent(site.domain)}/filter/${filterGroupForFilter(key)}`, search: window.location.search }} className="group flex w-full justify-between items-center" > - {filterText(key, value, query)} + {filterText(key, value, query)} removeFilter(key, history, query)}> @@ -249,12 +249,12 @@ class Filters extends React.Component { {key === 'props' ? ( - {filterText(key, value, query)} + {filterText(key, value, query)} ) : ( <> - {filterText(key, value, query)} + {filterText(key, value, query)} )} @@ -328,7 +328,7 @@ class Filters extends React.Component { if (this.state.wrapped !== 2) { return ( -
+
{(appliedFilters(query).map((filter) => this.renderListFilter(history, filter, query)))}
); diff --git a/assets/js/dashboard/stats/current-visitors.js b/assets/js/dashboard/stats/current-visitors.js index a61f5d9e5..69a82d7be 100644 --- a/assets/js/dashboard/stats/current-visitors.js +++ b/assets/js/dashboard/stats/current-visitors.js @@ -1,6 +1,6 @@ import React from 'react'; -import * as api from '../api' import { Link } from 'react-router-dom' +import * as api from '../api' import { appliedFilters } from '../query'; export default class CurrentVisitors extends React.Component { @@ -20,7 +20,7 @@ export default class CurrentVisitors extends React.Component { } render() { - if (appliedFilters(this.props.query) !== []) { return null } + if (appliedFilters(this.props.query).length >= 1) { return null } const query = new URLSearchParams(window.location.search) query.set('period', 'realtime') @@ -30,13 +30,13 @@ export default class CurrentVisitors extends React.Component { return ( - + {currentVisitors} current visitor{currentVisitors === 1 ? '' : 's'} ) - } else { - return null } + + return null } }