From ebb19a6053f3159e01eea431ec16e61a9d34c841 Mon Sep 17 00:00:00 2001 From: Robert Joonas Date: Sun, 24 Mar 2024 18:16:30 +0000 Subject: [PATCH] Turn Top Stats into a fn component --- assets/js/dashboard/stats/graph/top-stats.js | 193 +++++++++--------- .../js/dashboard/stats/graph/visitor-graph.js | 2 +- 2 files changed, 97 insertions(+), 98 deletions(-) diff --git a/assets/js/dashboard/stats/graph/top-stats.js b/assets/js/dashboard/stats/graph/top-stats.js index bb1ffb515..b8478a7d7 100644 --- a/assets/js/dashboard/stats/graph/top-stats.js +++ b/assets/js/dashboard/stats/graph/top-stats.js @@ -14,100 +14,102 @@ function Maybe({condition, children}) { } } -export default class TopStats extends React.Component { - renderPercentageComparison(name, comparison, forceDarkBg = false) { - const formattedComparison = numberFormatter(Math.abs(comparison)) - - const defaultClassName = classNames({ - "pl-2 text-xs dark:text-gray-100": !forceDarkBg, - "pl-2 text-xs text-gray-100": forceDarkBg - }) - - const noChangeClassName = classNames({ - "pl-2 text-xs text-gray-700 dark:text-gray-300": !forceDarkBg, - "pl-2 text-xs text-gray-300": forceDarkBg - }) - - if (comparison > 0) { - const color = name === 'Bounce rate' ? 'text-red-400' : 'text-green-500' - return ↑ {formattedComparison}% - } else if (comparison < 0) { - const color = name === 'Bounce rate' ? 'text-green-500' : 'text-red-400' - return ↓ {formattedComparison}% - } else if (comparison === 0) { - return 〰 0% - } else { - return null - } +function renderPercentageComparison(name, comparison, forceDarkBg = false) { + const formattedComparison = numberFormatter(Math.abs(comparison)) + + const defaultClassName = classNames({ + "pl-2 text-xs dark:text-gray-100": !forceDarkBg, + "pl-2 text-xs text-gray-100": forceDarkBg + }) + + const noChangeClassName = classNames({ + "pl-2 text-xs text-gray-700 dark:text-gray-300": !forceDarkBg, + "pl-2 text-xs text-gray-300": forceDarkBg + }) + + if (comparison > 0) { + const color = name === 'Bounce rate' ? 'text-red-400' : 'text-green-500' + return ↑ {formattedComparison}% + } else if (comparison < 0) { + const color = name === 'Bounce rate' ? 'text-green-500' : 'text-red-400' + return ↓ {formattedComparison}% + } else if (comparison === 0) { + return 〰 0% + } else { + return null } +} - topStatNumberShort(name, value) { - if (['visit duration', 'time on page'].includes(name.toLowerCase())) { - return durationFormatter(value) - } else if (['bounce rate', 'conversion rate'].includes(name.toLowerCase())) { - return value + '%' - } else if (['average revenue', 'total revenue'].includes(name.toLowerCase())) { - return value?.short - } else { - return numberFormatter(value) - } +function topStatNumberShort(name, value) { + if (['visit duration', 'time on page'].includes(name.toLowerCase())) { + return durationFormatter(value) + } else if (['bounce rate', 'conversion rate'].includes(name.toLowerCase())) { + return value + '%' + } else if (['average revenue', 'total revenue'].includes(name.toLowerCase())) { + return value?.short + } else { + return numberFormatter(value) } +} - topStatNumberLong(name, value) { - if (['visit duration', 'time on page'].includes(name.toLowerCase())) { - return durationFormatter(value) - } else if (['bounce rate', 'conversion rate'].includes(name.toLowerCase())) { - return value + '%' - } else if (['average revenue', 'total revenue'].includes(name.toLowerCase())) { - return value?.long - } else { - return (value || 0).toLocaleString() - } +function topStatNumberLong(name, value) { + if (['visit duration', 'time on page'].includes(name.toLowerCase())) { + return durationFormatter(value) + } else if (['bounce rate', 'conversion rate'].includes(name.toLowerCase())) { + return value + '%' + } else if (['average revenue', 'total revenue'].includes(name.toLowerCase())) { + return value?.long + } else { + return (value || 0).toLocaleString() } +} - topStatTooltip(stat, query) { +export default function TopStats(props) { + const {site, query, data, onMetricUpdate, tooltipBoundary, lastLoadTimestamp} = props + + function tooltip(stat) { let statName = stat.name.toLowerCase() statName = stat.value === 1 ? statName.slice(0, -1) : statName return (
{query.comparison &&
- {this.topStatNumberLong(stat.name, stat.value)} vs. {this.topStatNumberLong(stat.name, stat.comparison_value)} {statName} - {this.renderPercentageComparison(stat.name, stat.change, true)} + {topStatNumberLong(stat.name, stat.value)} vs. {topStatNumberLong(stat.name, stat.comparison_value)} {statName} + {renderPercentageComparison(stat.name, stat.change, true)}
} {!query.comparison &&
- {this.topStatNumberLong(stat.name, stat.value)} {statName} + {topStatNumberLong(stat.name, stat.value)} {statName}
} - {stat.name === 'Current visitors' &&

Last updated s ago

} + {stat.name === 'Current visitors' &&

Last updated s ago

}
) } - canMetricBeGraphed(stat) { + function canMetricBeGraphed(stat) { return !!stat.graph_metric } - maybeUpdateMetric(stat) { - if (this.canMetricBeGraphed(stat)) { - storage.setItem(`metric__${this.props.site.domain}`, stat.graph_metric) - this.props.onMetricUpdate(stat.graph_metric) + function maybeUpdateMetric(stat) { + if (canMetricBeGraphed(stat)) { + storage.setItem(`metric__${site.domain}`, stat.graph_metric) + onMetricUpdate(stat.graph_metric) } } - blinkingDot() { + function blinkingDot() { return (
) } - getStoredMetric() { - return storage.getItem(`metric__${this.props.site.domain}`) + function getStoredMetric() { + return storage.getItem(`metric__${site.domain}`) } - renderStatName(stat) { - const isSelected = stat.graph_metric === this.getStoredMetric() + function renderStatName(stat) { + const isSelected = stat.graph_metric === getStoredMetric() const [statDisplayName, statExtraName] = stat.name.split(/(\(.+\))/g) @@ -124,48 +126,45 @@ export default class TopStats extends React.Component { ) } - render() { - const { topStatData, query, site } = this.props - - const stats = topStatData && topStatData.top_stats.map((stat, index) => { - - const className = classNames('px-4 md:px-6 w-1/2 my-4 lg:w-auto group select-none', { - 'cursor-pointer': this.canMetricBeGraphed(stat), - 'lg:border-l border-gray-300': index > 0, - 'border-r lg:border-r-0': index % 2 === 0 - }) - - return ( - { this.maybeUpdateMetric(stat) }} boundary={this.props.tooltipBoundary}> - {this.renderStatName(stat)} -
-
- -

{this.topStatNumberShort(stat.name, stat.value)}

- - { this.renderPercentageComparison(stat.name, stat.change) } - -
- -

{ formatDateRange(site, topStatData.from, topStatData.to) }

-
-
+ function renderStat(stat, index) { + const className = classNames('px-4 md:px-6 w-1/2 my-4 lg:w-auto group select-none', { + 'cursor-pointer': canMetricBeGraphed(stat), + 'lg:border-l border-gray-300': index > 0, + 'border-r lg:border-r-0': index % 2 === 0 + }) + return ( + { maybeUpdateMetric(stat) }} boundary={tooltipBoundary}> + {renderStatName(stat)} +
+
+ +

{topStatNumberShort(stat.name, stat.value)}

+ + { renderPercentageComparison(stat.name, stat.change) } + +
-
-

{ this.topStatNumberShort(stat.name, stat.comparison_value) }

-

{ formatDateRange(site, topStatData.comparing_from, topStatData.comparing_to) }

-
+

{ formatDateRange(site, data.from, data.to) }

+
+ + +
+

{ topStatNumberShort(stat.name, stat.comparison_value) }

+

{ formatDateRange(site, data.comparing_from, data.comparing_to) }

- - ) - }) +
+
+
+ ) + } - if (stats && query && query.period === 'realtime') { - stats.push(this.blinkingDot()) - } + const stats = data && data.top_stats.map(renderStat) - return stats || null; + if (stats && query.period === 'realtime') { + stats.push(blinkingDot()) } + + return stats || null; } diff --git a/assets/js/dashboard/stats/graph/visitor-graph.js b/assets/js/dashboard/stats/graph/visitor-graph.js index b8acb120c..50b2bc124 100644 --- a/assets/js/dashboard/stats/graph/visitor-graph.js +++ b/assets/js/dashboard/stats/graph/visitor-graph.js @@ -122,7 +122,7 @@ export default function VisitorGraph(props) { {loading === LoadingState.loading && renderLoader()}
- +
{loading === LoadingState.updatingGraph && renderLoader()}