Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Fix linking in dashboard sources/utm details modal (#4151)
Karl-Aksel Puulmanne5c3eabe3128
diff --git a/assets/js/dashboard/stats/modals/sources.js b/assets/js/dashboard/stats/modals/sources.jsindex 1d969f95a9..c6f7829e03 100644--- a/assets/js/dashboard/stats/modals/sources.js+++ b/assets/js/dashboard/stats/modals/sources.js@@ -6,7 +6,7 @@ import * as api from '../../api'import numberFormatter, { durationFormatter } from '../../util/number-formatter'import { parseQuery } from '../../query'import { updatedQuery } from "../../util/url";-import { hasGoalFilter } from "../../util/filters";+import { FILTER_OPERATIONS, hasGoalFilter, replaceFilterByPrefix } from "../../util/filters";const TITLES = {sources: 'Top Sources',@@ -34,7 +34,7 @@ class SourcesModal extends React.Component {const { query, page, sources } = this.stateconst detailed = this.showExtra()- api.get(`/api/stats/${encodeURIComponent(site.domain)}/${this.currentFilter()}`, query, { limit: 100, page, detailed })+ api.get(`/api/stats/${encodeURIComponent(site.domain)}/${this.currentView()}`, query, { limit: 100, page, detailed }).then((res) => this.setState({ loading: false, sources: sources.concat(res), moreResultsAvailable: res.length === 100 }))}@@ -48,11 +48,21 @@ class SourcesModal extends React.Component {}}- currentFilter() {+ currentView() {const urlparts = this.props.location.pathname.split('/')return urlparts[urlparts.length - 1]}+ filterKey() {+ const view = this.currentView()+ if (view === 'sources') return 'source'+ if (view === 'utm_mediums') return 'utm_medium'+ if (view === 'utm_sources') return 'utm_source'+ if (view === 'utm_campaigns') return 'utm_campaign'+ if (view === 'utm_contents') return 'utm_content'+ if (view === 'utm_terms') return 'utm_term'+ }+showExtra() {return this.state.query.period !== 'realtime' && !hasGoalFilter(this.state.query)}@@ -82,7 +92,7 @@ class SourcesModal extends React.Component {}icon(source) {- if (this.currentFilter() === 'sources') {+ if (this.currentView() === 'sources') {return (<imgsrc={`/favicon/sources/${encodeURIComponent(source.name)}`}@@ -93,20 +103,13 @@ class SourcesModal extends React.Component {}renderSource(source) {- const searchParams = {}- const filter = this.currentFilter()- if (filter === 'sources') searchParams['source'] = source.name- if (filter === 'utm_mediums') searchParams['utm_medium'] = source.name- if (filter === 'utm_sources') searchParams['utm_source'] = source.name- if (filter === 'utm_campaigns') searchParams['utm_campaign'] = source.name- if (filter === 'utm_contents') searchParams['utm_content'] = source.name- if (filter === 'utm_terms') searchParams['utm_term'] = source.name+ const filters = replaceFilterByPrefix(this.state.query, this.filterKey(), [FILTER_OPERATIONS.is, this.filterKey(), [source.name]])return (<tr className="text-sm dark:text-gray-200" key={source.name}><td className="p-2">{this.icon(source)}- <Link className="hover:underline" to={{ search: updatedQuery(searchParams), pathname: '/' + encodeURIComponent(this.props.site.domain) }}>{source.name}</Link>+ <Link className="hover:underline" to={{ search: updatedQuery({ filters }), pathname: '/' + encodeURIComponent(this.props.site.domain) }}>{source.name}</Link></td>{this.showConversionRate() && <td className="p-2 w-32 font-medium" align="right">{numberFormatter(source.total_visitors)}</td>}<td className="p-2 w-32 font-medium" align="right">{numberFormatter(source.visitors)}</td>@@ -144,7 +147,7 @@ class SourcesModal extends React.Component {}title() {- return TITLES[this.currentFilter()]+ return TITLES[this.currentView()]}render() {