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 new tab links + shared links losing URL context (#4278)
hq18188006c4519
diff --git a/assets/js/dashboard.js b/assets/js/dashboard.jsindex a172b05264..693e179866 100644--- a/assets/js/dashboard.js+++ b/assets/js/dashboard.js@@ -31,7 +31,8 @@ if (container) {background: container.dataset.background,isDbip: container.dataset.isDbip === 'true',flags: JSON.parse(container.dataset.flags),- validIntervalsByPeriod: JSON.parse(container.dataset.validIntervalsByPeriod)+ validIntervalsByPeriod: JSON.parse(container.dataset.validIntervalsByPeriod),+ shared: !!container.dataset.sharedLinkAuth,}const loggedIn = container.dataset.loggedIn === 'true'diff --git a/assets/js/dashboard/filters.js b/assets/js/dashboard/filters.jsindex 62bc2d2d91..0b26a158dc 100644--- a/assets/js/dashboard/filters.js+++ b/assets/js/dashboard/filters.js@@ -84,7 +84,7 @@ function filterDropdownOption(site, option) {<Menu.Item key={option}>{({ active }) => (<Link- to={{ pathname: `/${encodeURIComponent(site.domain)}/filter/${option}`, search: window.location.search }}+ to={{ pathname: `/filter/${option}`, search: window.location.search }}className={classNames(active ? 'bg-gray-100 dark:bg-gray-900 text-gray-900 dark:text-gray-100' : 'text-gray-800 dark:text-gray-300','block px-4 py-2 text-sm font-medium'@@ -101,7 +101,7 @@ function DropdownContent({ history, site, query, wrapped }) {const [addingFilter, setAddingFilter] = useState(false);if (wrapped === WRAPSTATE.unwrapped || addingFilter) {- let filterModals = {...FILTER_MODAL_TO_FILTER_GROUP}+ let filterModals = { ...FILTER_MODAL_TO_FILTER_GROUP }if (!site.propsAvailable) delete filterModals.propsreturn Object.keys(filterModals).map((option) => filterDropdownOption(site, option))@@ -193,7 +193,7 @@ function Filters(props) {title={`Edit filter: ${formattedFilters[type]}`}className="flex w-full h-full items-center py-2 pl-3"to={{- pathname: `/${encodeURIComponent(site.domain)}/filter/${FILTER_GROUP_TO_MODAL_TYPE[type]}`,+ pathname: `/filter/${FILTER_GROUP_TO_MODAL_TYPE[type]}`,search: window.location.search}}>@@ -231,7 +231,7 @@ function Filters(props) {}function trackFilterMenu() {- window.plausible && window.plausible('Filter Menu: Open', {u: `${window.location.protocol}//${window.location.hostname}/:dashboard`})+ window.plausible && window.plausible('Filter Menu: Open', { u: `${window.location.protocol}//${window.location.hostname}/:dashboard` })}function renderDropDown() {diff --git a/assets/js/dashboard/router.js b/assets/js/dashboard/router.jsindex 4605c9fd15..8f591f6224 100644--- a/assets/js/dashboard/router.js+++ b/assets/js/dashboard/router.js@@ -28,50 +28,50 @@ function ScrollToTop() {export default function Router({ site, loggedIn, currentUserRole }) {return (- <BrowserRouter>- <Route path="/:domain">+ <BrowserRouter basename={site.shared ? `/share/${encodeURIComponent(site.domain)}` : encodeURIComponent(site.domain)}>+ <Route path="/"><ScrollToTop /><Dash site={site} loggedIn={loggedIn} currentUserRole={currentUserRole} /><Switch>- <Route exact path={["/:domain/sources", "/:domain/utm_mediums", "/:domain/utm_sources", "/:domain/utm_campaigns", "/:domain/utm_contents", "/:domain/utm_terms"]}>+ <Route exact path={["/sources", "/utm_mediums", "/utm_sources", "/utm_campaigns", "/utm_contents", "/utm_terms"]}><SourcesModal site={site} /></Route>- <Route exact path="/:domain/referrers/Google">+ <Route exact path="/referrers/Google"><GoogleKeywordsModal site={site} /></Route>- <Route exact path="/:domain/referrers/:referrer">+ <Route exact path="/referrers/:referrer"><ReferrersDrilldownModal site={site} /></Route>- <Route path="/:domain/pages">+ <Route path="/pages"><PagesModal site={site} /></Route>- <Route path="/:domain/entry-pages">+ <Route path="/entry-pages"><EntryPagesModal site={site} /></Route>- <Route path="/:domain/exit-pages">+ <Route path="/exit-pages"><ExitPagesModal site={site} /></Route>- <Route path="/:domain/countries">- <ModalTable title="Top countries" site={site} endpoint={url.apiPath(site, '/countries')} filterKey="country" keyLabel="Country" renderIcon={renderCountryIcon} showPercentage={true}/>+ <Route path="/countries">+ <ModalTable title="Top countries" site={site} endpoint={url.apiPath(site, '/countries')} filterKey="country" keyLabel="Country" renderIcon={renderCountryIcon} showPercentage={true} /></Route>- <Route path="/:domain/regions">+ <Route path="/regions"><ModalTable title="Top regions" site={site} endpoint={url.apiPath(site, '/regions')} filterKey="region" keyLabel="Region" renderIcon={renderRegionIcon} /></Route>- <Route path="/:domain/cities">+ <Route path="/cities"><ModalTable title="Top cities" site={site} endpoint={url.apiPath(site, '/cities')} filterKey="city" keyLabel="City" renderIcon={renderCityIcon} /></Route>- <Route path="/:domain/custom-prop-values/:prop_key">+ <Route path="/custom-prop-values/:prop_key"><PropsModal site={site} /></Route>- <Route path="/:domain/conversions">+ <Route path="/conversions"><ConversionsModal site={site} /></Route>- <Route path={["/:domain/filter/:field"]}>+ <Route path={["/filter/:field"]}><FilterModal site={site} /></Route></Switch></Route>- </BrowserRouter>+ </BrowserRouter >);}diff --git a/assets/js/dashboard/stats/behaviours/conversions.js b/assets/js/dashboard/stats/behaviours/conversions.jsindex c474b57867..6161b9457f 100644--- a/assets/js/dashboard/stats/behaviours/conversions.js+++ b/assets/js/dashboard/stats/behaviours/conversions.js@@ -34,7 +34,7 @@ export default function Conversions(props) {BUILD_EXTRA && { name: 'total_revenue', label: 'Revenue', hiddenOnMobile: true },BUILD_EXTRA && { name: 'average_revenue', label: 'Average', hiddenOnMobile: true }]}- detailsLink={url.sitePath(site, '/conversions')}+ detailsLink={url.sitePath('conversions')}maybeHideDetails={true}query={query}color="bg-red-50"diff --git a/assets/js/dashboard/stats/behaviours/goal-conversions.js b/assets/js/dashboard/stats/behaviours/goal-conversions.jsindex 516ed11ae1..0996e33d25 100644--- a/assets/js/dashboard/stats/behaviours/goal-conversions.js+++ b/assets/js/dashboard/stats/behaviours/goal-conversions.js@@ -64,7 +64,7 @@ function SpecialPropBreakdown(props) {{ name: 'events', label: 'Events', hiddenOnMobile: true },CR_METRIC]}- detailsLink={url.sitePath(site, `/custom-prop-values/${prop}`)}+ detailsLink={url.sitePath(`custom-prop-values/${prop}`)}externalLinkDest={externalLinkDest()}maybeHideDetails={true}query={query}diff --git a/assets/js/dashboard/stats/behaviours/props.js b/assets/js/dashboard/stats/behaviours/props.jsindex 7eb7e32618..4986b215df 100644--- a/assets/js/dashboard/stats/behaviours/props.js+++ b/assets/js/dashboard/stats/behaviours/props.js@@ -98,7 +98,7 @@ export default function Properties(props) {BUILD_EXTRA && { name: 'total_revenue', label: 'Revenue', hiddenOnMobile: true },BUILD_EXTRA && { name: 'average_revenue', label: 'Average', hiddenOnMobile: true }]}- detailsLink={url.sitePath(site, `/custom-prop-values/${propKey}`)}+ detailsLink={`/custom-prop-values/${propKey}`}maybeHideDetails={true}query={query}color="bg-red-50"diff --git a/assets/js/dashboard/stats/graph/stats-export.js b/assets/js/dashboard/stats/graph/stats-export.jsindex 6716b2eb1e..0c3613a817 100644--- a/assets/js/dashboard/stats/graph/stats-export.js+++ b/assets/js/dashboard/stats/graph/stats-export.js@@ -2,7 +2,7 @@ import React, { useState } from "react"import * as api from '../../api'import { getCurrentInterval } from "./interval-picker"-export default function StatsExport({site, query}) {+export default function StatsExport({ site, query }) {const [exporting, setExporting] = useState(false)function startExport() {@@ -50,4 +50,4 @@ export default function StatsExport({site, query}) {{!exporting && renderExportLink()}</div>)-}\ No newline at end of file+}diff --git a/assets/js/dashboard/stats/locations/index.js b/assets/js/dashboard/stats/locations/index.jsindex 488a6a3984..23f4a4bc2d 100644--- a/assets/js/dashboard/stats/locations/index.js+++ b/assets/js/dashboard/stats/locations/index.js@@ -4,108 +4,108 @@ import * as storage from '../../util/storage'import CountriesMap from './map'import * as api from '../../api'-import {apiPath, sitePath} from '../../util/url'+import { apiPath, sitePath } from '../../util/url'import ListReport from '../reports/list'import { VISITORS_METRIC, maybeWithCR } from '../reports/metrics';import { getFiltersByKeyPrefix } from '../../util/filters';import ImportedQueryUnsupportedWarning from '../imported-query-unsupported-warning';-function Countries({query, site, onClick, afterFetchData}) {- function fetchData() {- return api.get(apiPath(site, '/countries'), query, { limit: 9 })- }-- function renderIcon(country) {- return <span className="mr-2">{country.flag}</span>- }-- function getFilterFor(listItem) {- return {- prefix: "country",- filter: ["is", "country", [listItem['code']]],- labels: { [listItem['code']]: listItem['name'] }- }- }-- return (- <ListReport- fetchData={fetchData}- afterFetchData={afterFetchData}- getFilterFor={getFilterFor}- onClick={onClick}- keyLabel="Country"- metrics={maybeWithCR([VISITORS_METRIC], query)}- detailsLink={sitePath(site, '/countries')}- query={query}- renderIcon={renderIcon}- color="bg-orange-50"- />- )+function Countries({ query, site, onClick, afterFetchData }) {+ function fetchData() {+ return api.get(apiPath(site, '/countries'), query, { limit: 9 })+ }++ function renderIcon(country) {+ return <span className="mr-2">{country.flag}</span>+ }++ function getFilterFor(listItem) {+ return {+ prefix: "country",+ filter: ["is", "country", [listItem['code']]],+ labels: { [listItem['code']]: listItem['name'] }+ }+ }++ return (+ <ListReport+ fetchData={fetchData}+ afterFetchData={afterFetchData}+ getFilterFor={getFilterFor}+ onClick={onClick}+ keyLabel="Country"+ metrics={maybeWithCR([VISITORS_METRIC], query)}+ detailsLink={sitePath('countries')}+ query={query}+ renderIcon={renderIcon}+ color="bg-orange-50"+ />+ )}-function Regions({query, site, onClick, afterFetchData}) {- function fetchData() {- return api.get(apiPath(site, '/regions'), query, {limit: 9})- }-- function renderIcon(region) {- return <span className="mr-2">{region.country_flag}</span>- }-- function getFilterFor(listItem) {- return {- prefix: "region",- filter: ["is", "region", [listItem['code']]],- labels: { [listItem['code']]: listItem['name'] }- }- }-- return (- <ListReport- fetchData={fetchData}- afterFetchData={afterFetchData}- getFilterFor={getFilterFor}- onClick={onClick}- keyLabel="Region"- metrics={maybeWithCR([VISITORS_METRIC], query)}- detailsLink={sitePath(site, '/regions')}- query={query}- renderIcon={renderIcon}- color="bg-orange-50"- />- )+function Regions({ query, site, onClick, afterFetchData }) {+ function fetchData() {+ return api.get(apiPath(site, '/regions'), query, { limit: 9 })+ }++ function renderIcon(region) {+ return <span className="mr-2">{region.country_flag}</span>+ }++ function getFilterFor(listItem) {+ return {+ prefix: "region",+ filter: ["is", "region", [listItem['code']]],+ labels: { [listItem['code']]: listItem['name'] }+ }+ }++ return (+ <ListReport+ fetchData={fetchData}+ afterFetchData={afterFetchData}+ getFilterFor={getFilterFor}+ onClick={onClick}+ keyLabel="Region"+ metrics={maybeWithCR([VISITORS_METRIC], query)}+ detailsLink={sitePath('regions')}+ query={query}+ renderIcon={renderIcon}+ color="bg-orange-50"+ />+ )}-function Cities({query, site, afterFetchData}) {- function fetchData() {- return api.get(apiPath(site, '/cities'), query, {limit: 9})- }-- function renderIcon(city) {- return <span className="mr-2">{city.country_flag}</span>- }-- function getFilterFor(listItem) {- return {- prefix: "city",- filter: ["is", "city", [listItem['code']]],- labels: { [listItem['code']]: listItem['name'] }- }- }-- return (- <ListReport- fetchData={fetchData}- afterFetchData={afterFetchData}- getFilterFor={getFilterFor}- keyLabel="City"- metrics={maybeWithCR([VISITORS_METRIC], query)}- detailsLink={sitePath(site, '/cities')}- query={query}- renderIcon={renderIcon}- color="bg-orange-50"- />- )+function Cities({ query, site, afterFetchData }) {+ function fetchData() {+ return api.get(apiPath(site, '/cities'), query, { limit: 9 })+ }++ function renderIcon(city) {+ return <span className="mr-2">{city.country_flag}</span>+ }++ function getFilterFor(listItem) {+ return {+ prefix: "city",+ filter: ["is", "city", [listItem['code']]],+ labels: { [listItem['code']]: listItem['name'] }+ }+ }++ return (+ <ListReport+ fetchData={fetchData}+ afterFetchData={afterFetchData}+ getFilterFor={getFilterFor}+ keyLabel="City"+ metrics={maybeWithCR([VISITORS_METRIC], query)}+ detailsLink={sitePath('cities')}+ query={query}+ renderIcon={renderIcon}+ color="bg-orange-50"+ />+ )}@@ -117,116 +117,116 @@ const labelFor = {export default class Locations extends React.Component {constructor(props) {- super(props)- this.onCountryFilter = this.onCountryFilter.bind(this)- this.onRegionFilter = this.onRegionFilter.bind(this)- this.afterFetchData = this.afterFetchData.bind(this)- this.tabKey = `geoTab__${ props.site.domain}`- const storedTab = storage.getItem(this.tabKey)- this.state = {- mode: storedTab || 'map',- loading: true,- skipImportedReason: null- }- }-- componentDidUpdate(prevProps, prevState) {- const isRemovingFilter = (filterName) => {- return getFiltersByKeyPrefix(prevProps.query, filterName).length > 0 &&- getFiltersByKeyPrefix(this.props.query, filterName).length == 0- }-- if (this.state.mode === 'cities' && isRemovingFilter('region')) {- this.setMode('regions')()- }-- if (this.state.mode === 'regions' && isRemovingFilter('country')) {- this.setMode(this.countriesRestoreMode || 'countries')()- }-- if (this.props.query !== prevProps.query || this.state.mode !== prevState.mode) {- this.setState({loading: true})- }- }-- setMode(mode) {- return () => {- storage.setItem(this.tabKey, mode)- this.setState({mode})- }- }-- onCountryFilter(mode) {- return () => {- this.countriesRestoreMode = mode- this.setMode('regions')()- }- }-- onRegionFilter() {- this.setMode('cities')()- }-- afterFetchData(apiResponse) {- this.setState({loading: false, skipImportedReason: apiResponse.skip_imported_reason})- }+ super(props)+ this.onCountryFilter = this.onCountryFilter.bind(this)+ this.onRegionFilter = this.onRegionFilter.bind(this)+ this.afterFetchData = this.afterFetchData.bind(this)+ this.tabKey = `geoTab__${props.site.domain}`+ const storedTab = storage.getItem(this.tabKey)+ this.state = {+ mode: storedTab || 'map',+ loading: true,+ skipImportedReason: null+ }+ }++ componentDidUpdate(prevProps, prevState) {+ const isRemovingFilter = (filterName) => {+ return getFiltersByKeyPrefix(prevProps.query, filterName).length > 0 &&+ getFiltersByKeyPrefix(this.props.query, filterName).length == 0+ }++ if (this.state.mode === 'cities' && isRemovingFilter('region')) {+ this.setMode('regions')()+ }++ if (this.state.mode === 'regions' && isRemovingFilter('country')) {+ this.setMode(this.countriesRestoreMode || 'countries')()+ }++ if (this.props.query !== prevProps.query || this.state.mode !== prevState.mode) {+ this.setState({ loading: true })+ }+ }++ setMode(mode) {+ return () => {+ storage.setItem(this.tabKey, mode)+ this.setState({ mode })+ }+ }++ onCountryFilter(mode) {+ return () => {+ this.countriesRestoreMode = mode+ this.setMode('regions')()+ }+ }++ onRegionFilter() {+ this.setMode('cities')()+ }++ afterFetchData(apiResponse) {+ this.setState({ loading: false, skipImportedReason: apiResponse.skip_imported_reason })+ }renderContent() {- switch(this.state.mode) {- case "cities":- return <Cities site={this.props.site} query={this.props.query} afterFetchData={this.afterFetchData} />- case "regions":- return <Regions onClick={this.onRegionFilter} site={this.props.site} query={this.props.query} afterFetchData={this.afterFetchData} />- case "countries":- return <Countries onClick={this.onCountryFilter('countries')} site={this.props.site} query={this.props.query} afterFetchData={this.afterFetchData} />- case "map":- default:- return <CountriesMap onClick={this.onCountryFilter('map')} site={this.props.site} query={this.props.query} afterFetchData={this.afterFetchData} />- }- }+ switch (this.state.mode) {+ case "cities":+ return <Cities site={this.props.site} query={this.props.query} afterFetchData={this.afterFetchData} />+ case "regions":+ return <Regions onClick={this.onRegionFilter} site={this.props.site} query={this.props.query} afterFetchData={this.afterFetchData} />+ case "countries":+ return <Countries onClick={this.onCountryFilter('countries')} site={this.props.site} query={this.props.query} afterFetchData={this.afterFetchData} />+ case "map":+ default:+ return <CountriesMap onClick={this.onCountryFilter('map')} site={this.props.site} query={this.props.query} afterFetchData={this.afterFetchData} />+ }+ }renderPill(name, mode) {- const isActive = this.state.mode === mode-- if (isActive) {- return (- <button- className="inline-block h-5 text-indigo-700 dark:text-indigo-500 font-bold active-prop-heading"- >- {name}- </button>- )- }-- return (- <button- className="hover:text-indigo-600 cursor-pointer"- onClick={this.setMode(mode)}- >- {name}- </button>- )- }+ const isActive = this.state.mode === mode++ if (isActive) {+ return (+ <button+ className="inline-block h-5 text-indigo-700 dark:text-indigo-500 font-bold active-prop-heading"+ >+ {name}+ </button>+ )+ }++ return (+ <button+ className="hover:text-indigo-600 cursor-pointer"+ onClick={this.setMode(mode)}+ >+ {name}+ </button>+ )+ }render() {- return (- <div>- <div className="w-full flex justify-between">- <div className="flex gap-x-1">- <h3 className="font-bold dark:text-gray-100">- {labelFor[this.state.mode] || 'Locations'}- </h3>- <ImportedQueryUnsupportedWarning loading={this.state.loading} query={this.props.query} skipImportedReason={this.state.skipImportedReason} />- </div>- <div className="flex text-xs font-medium text-gray-500 dark:text-gray-400 space-x-2">- { this.renderPill('Map', 'map') }- { this.renderPill('Countries', 'countries') }- { this.renderPill('Regions', 'regions') }- { this.renderPill('Cities', 'cities') }- </div>- </div>- {this.renderContent()}- </div>- )- }+ return (+ <div>+ <div className="w-full flex justify-between">+ <div className="flex gap-x-1">+ <h3 className="font-bold dark:text-gray-100">+ {labelFor[this.state.mode] || 'Locations'}+ </h3>+ <ImportedQueryUnsupportedWarning loading={this.state.loading} query={this.props.query} skipImportedReason={this.state.skipImportedReason} />+ </div>+ <div className="flex text-xs font-medium text-gray-500 dark:text-gray-400 space-x-2">+ {this.renderPill('Map', 'map')}+ {this.renderPill('Countries', 'countries')}+ {this.renderPill('Regions', 'regions')}+ {this.renderPill('Cities', 'cities')}+ </div>+ </div>+ {this.renderContent()}+ </div>+ )+ }}diff --git a/assets/js/dashboard/stats/locations/map.js b/assets/js/dashboard/stats/locations/map.jsindex 4006607c80..2cd09c8a34 100644--- a/assets/js/dashboard/stats/locations/map.js+++ b/assets/js/dashboard/stats/locations/map.js@@ -28,7 +28,7 @@ class Countries extends React.Component {componentDidUpdate(prevProps) {if (this.props.query !== prevProps.query) {// eslint-disable-next-line react/no-did-update-set-state- this.setState({loading: true, countries: null})+ this.setState({ loading: true, countries: null })this.fetchCountries().then(this.drawMap)}}@@ -49,19 +49,19 @@ class Countries extends React.Component {getDataset() {const dataset = {};- var onlyValues = this.state.countries.map(function(obj){ return obj.visitors });+ var onlyValues = this.state.countries.map(function(obj) { return obj.visitors });var maxValue = Math.max.apply(null, onlyValues);// eslint-disable-next-line no-undefconst paletteScale = d3.scale.linear()- .domain([0,maxValue])+ .domain([0, maxValue]).range([this.state.darkTheme ? "#2e3954" : "#f3ebff",this.state.darkTheme ? "#6366f1" : "#a779e9"])- this.state.countries.forEach(function(item){- dataset[item.alpha_3] = {numberOfThings: item.visitors, fillColor: paletteScale(item.visitors)};+ this.state.countries.forEach(function(item) {+ dataset[item.alpha_3] = { numberOfThings: item.visitors, fillColor: paletteScale(item.visitors) };});return dataset@@ -69,18 +69,18 @@ class Countries extends React.Component {updateCountries() {this.fetchCountries().then(() => {- this.map.updateChoropleth(this.getDataset(), {reset: true})+ this.map.updateChoropleth(this.getDataset(), { reset: true })})}fetchCountries() {- return api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/countries`, this.props.query, {limit: 300})+ return api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/countries`, this.props.query, { limit: 300 }).then((response) => {if (this.props.afterFetchData) {this.props.afterFetchData(response)}- this.setState({loading: false, countries: response.results})+ this.setState({ loading: false, countries: response.results })})}@@ -154,9 +154,9 @@ class Countries extends React.Component {if (this.state.countries) {return (<>- <div className="mx-auto mt-4" style={{width: '100%', maxWidth: '475px', height: '335px'}} id="map-container"></div>- <MoreLink site={this.props.site} list={this.state.countries} endpoint="countries" />- { this.geolocationDbNotice() }+ <div className="mx-auto mt-4" style={{ width: '100%', maxWidth: '475px', height: '335px' }} id="map-container"></div>+ <MoreLink list={this.state.countries} endpoint="countries" />+ {this.geolocationDbNotice()}</>)}@@ -167,9 +167,9 @@ class Countries extends React.Component {render() {return (<LazyLoader onVisible={this.onVisible}>- { this.state.loading && <div className="mx-auto my-32 loading"><div></div></div> }+ {this.state.loading && <div className="mx-auto my-32 loading"><div></div></div>}<FadeIn show={!this.state.loading}>- { this.renderBody() }+ {this.renderBody()}</FadeIn></LazyLoader>)diff --git a/assets/js/dashboard/stats/modals/conversions.js b/assets/js/dashboard/stats/modals/conversions.jsindex 1a245918cc..38efbfa7d0 100644--- a/assets/js/dashboard/stats/modals/conversions.js+++ b/assets/js/dashboard/stats/modals/conversions.js@@ -69,7 +69,7 @@ function ConversionsModal(props) {<tr className="text-sm dark:text-gray-200" key={listItem.name}><td className="p-2"><Link- to={{ pathname: url.siteBasePath(site), search: filterSearchLink(listItem) }}+ to={{ pathname: '/', search: filterSearchLink(listItem) }}className="hover:underline block truncate">{listItem.name}</Link>@@ -117,7 +117,7 @@ function ConversionsModal(props) {}return (- <Modal site={site}>+ <Modal>{renderBody()}{loading && renderLoading()}{!loading && moreResultsAvailable && renderLoadMore()}diff --git a/assets/js/dashboard/stats/modals/entry-pages.js b/assets/js/dashboard/stats/modals/entry-pages.jsindex 3c7004f421..04007c6fd6 100644--- a/assets/js/dashboard/stats/modals/entry-pages.js+++ b/assets/js/dashboard/stats/modals/entry-pages.js@@ -81,7 +81,7 @@ class EntryPagesModal extends React.Component {<td className="p-2 truncate"><Linkto={{- pathname: `/${encodeURIComponent(this.props.site.domain)}`,+ pathname: `/`,search: updatedQuery({ filters })}}className="hover:underline"@@ -147,7 +147,7 @@ class EntryPagesModal extends React.Component {render() {return (- <Modal site={this.props.site}>+ <Modal>{this.renderBody()}{this.renderLoading()}</Modal>diff --git a/assets/js/dashboard/stats/modals/exit-pages.js b/assets/js/dashboard/stats/modals/exit-pages.jsindex 8dc82bec08..25be36b3ac 100644--- a/assets/js/dashboard/stats/modals/exit-pages.js+++ b/assets/js/dashboard/stats/modals/exit-pages.js@@ -4,7 +4,7 @@ import { withRouter } from 'react-router-dom'import Modal from './modal'import * as api from '../../api'-import numberFormatter, {percentageFormatter} from '../../util/number-formatter'+import numberFormatter, { percentageFormatter } from '../../util/number-formatter'import { parseQuery } from '../../query'import { trimURL, updatedQuery } from '../../util/url'import { hasGoalFilter, replaceFilterByPrefix } from "../../util/filters";@@ -62,7 +62,7 @@ class ExitPagesModal extends React.Component {<td className="p-2 truncate"><Linkto={{- pathname: `/${encodeURIComponent(this.props.site.domain)}`,+ pathname: `/`,search: updatedQuery({ filters })}}className="hover:underline"@@ -124,7 +124,7 @@ class ExitPagesModal extends React.Component {render() {return (- <Modal site={this.props.site}>+ <Modal>{this.renderBody()}{this.renderLoading()}</Modal>diff --git a/assets/js/dashboard/stats/modals/filter-modal.js b/assets/js/dashboard/stats/modals/filter-modal.jsindex d81c08854b..8d3ccd1758 100644--- a/assets/js/dashboard/stats/modals/filter-modal.js+++ b/assets/js/dashboard/stats/modals/filter-modal.js@@ -2,9 +2,9 @@ import React from "react";import { withRouter } from 'react-router-dom'import Modal from './modal'-import { EVENT_PROPS_PREFIX, FILTER_GROUP_TO_MODAL_TYPE, formatFilterGroup, FILTER_OPERATIONS, getFilterGroup, FILTER_MODAL_TO_FILTER_GROUP} from '../../util/filters'+import { EVENT_PROPS_PREFIX, FILTER_GROUP_TO_MODAL_TYPE, formatFilterGroup, FILTER_OPERATIONS, getFilterGroup, FILTER_MODAL_TO_FILTER_GROUP } from '../../util/filters'import { parseQuery } from '../../query'-import { siteBasePath, updatedQuery } from '../../util/url'+import { updatedQuery } from '../../util/url'import { shouldIgnoreKeypress } from '../../keybinding'import { cleanLabels } from "../../util/filters"import FilterModalGroup from "./filter-modal-group"@@ -83,7 +83,7 @@ class FilterModal extends React.Component {selectFiltersAndCloseModal(filters) {this.props.history.replace({- pathname: siteBasePath(this.props.site),+ pathname: '/',search: updatedQuery({filters: filters,labels: cleanLabels(filters, this.state.labelState)@@ -125,7 +125,7 @@ class FilterModal extends React.Component {onDeleteRow(id) {this.setState(prevState => {- const filterState = {...prevState.filterState}+ const filterState = { ...prevState.filterState }delete filterState[id]return { filterState }})@@ -133,7 +133,7 @@ class FilterModal extends React.Component {render() {return (- <Modal site={this.props.site} maxWidth="460px">+ <Modal maxWidth="460px"><h1 className="text-xl font-bold dark:text-gray-100">Filter by {formatFilterGroup(this.state.modalType)}</h1><div className="mt-4 border-b border-gray-300"></div>diff --git a/assets/js/dashboard/stats/modals/google-keywords.js b/assets/js/dashboard/stats/modals/google-keywords.jsindex 39ba7f3b8f..4dfd459726 100644--- a/assets/js/dashboard/stats/modals/google-keywords.js+++ b/assets/js/dashboard/stats/modals/google-keywords.js@@ -4,7 +4,7 @@ import { Link, withRouter } from 'react-router-dom'import Modal from './modal'import * as api from '../../api'import numberFormatter, { percentageFormatter } from '../../util/number-formatter'-import {parseQuery} from '../../query'+import { parseQuery } from '../../query'import RocketIcon from './rocket-icon'class GoogleKeywordsModal extends React.Component {@@ -17,7 +17,7 @@ class GoogleKeywordsModal extends React.Component {}componentDidMount() {- api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/referrers/Google`, this.state.query, {limit: 100})+ api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/referrers/Google`, this.state.query, { limit: 100 }).then((res) => this.setState({loading: false,searchTerms: res.search_terms,@@ -99,7 +99,7 @@ class GoogleKeywordsModal extends React.Component {<div className="my-4 border-b border-gray-300 dark:border-gray-500"></div><main className="modal__content">- { this.renderKeywords() }+ {this.renderKeywords()}</main></React.Fragment>)@@ -108,8 +108,8 @@ class GoogleKeywordsModal extends React.Component {render() {return (- <Modal site={this.props.site} show={!this.state.loading}>- { this.renderBody() }+ <Modal show={!this.state.loading}>+ {this.renderBody()}</Modal>)}diff --git a/assets/js/dashboard/stats/modals/modal.js b/assets/js/dashboard/stats/modals/modal.jsindex 4b031f3600..a6cbbabded 100644--- a/assets/js/dashboard/stats/modals/modal.js+++ b/assets/js/dashboard/stats/modals/modal.js@@ -57,7 +57,7 @@ class Modal extends React.Component {}close() {- this.props.history.push(`/${encodeURIComponent(this.props.site.domain)}${this.props.location.search}`)+ this.props.history.push(`/${this.props.location.search}`)}/**diff --git a/assets/js/dashboard/stats/modals/pages.js b/assets/js/dashboard/stats/modals/pages.jsindex 643938352f..d564a2689c 100644--- a/assets/js/dashboard/stats/modals/pages.js+++ b/assets/js/dashboard/stats/modals/pages.js@@ -65,7 +65,7 @@ class PagesModal extends React.Component {<td className="p-2"><Linkto={{- pathname: `/${encodeURIComponent(this.props.site.domain)}`,+ pathname: `/`,search: updatedQuery({ filters })}}className="hover:underline block truncate"@@ -113,7 +113,7 @@ class PagesModal extends React.Component {if (this.state.pages) {return (<React.Fragment>- <h1 className="text-xl font-bold dark:text-gray-100">Top Pages</h1>+ <h1 className="text-xl font-bold dark:text-gray-100">Top Pages hi</h1><div className="my-4 border-b border-gray-300"></div><main className="modal__content">@@ -141,7 +141,7 @@ class PagesModal extends React.Component {render() {return (- <Modal site={this.props.site}>+ <Modal>{this.renderBody()}{this.renderLoading()}</Modal>diff --git a/assets/js/dashboard/stats/modals/props.js b/assets/js/dashboard/stats/modals/props.jsindex 0fcd1c04f5..64fe66a97b 100644--- a/assets/js/dashboard/stats/modals/props.js+++ b/assets/js/dashboard/stats/modals/props.js@@ -25,7 +25,8 @@ const Money = maybeRequire().defaultfunction PropsModal(props) {const site = props.siteconst query = parseQuery(props.location.search, site)- const propKey = props.location.pathname.split('/').pop()++ const propKey = props.location.pathname.split('/').filter(i => i).pop()const [loading, setLoading] = useState(true)const [moreResultsAvailable, setMoreResultsAvailable] = useState(false)@@ -71,7 +72,7 @@ function PropsModal(props) {<tr className="text-sm dark:text-gray-200" key={listItem.name}><td className="p-2"><Link- to={{ pathname: url.siteBasePath(site), search: filterSearchLink(listItem) }}+ to={{ pathname: '/', search: filterSearchLink(listItem) }}className="hover:underline block truncate">{url.trimURL(listItem.name, 30)}</Link>@@ -125,7 +126,7 @@ function PropsModal(props) {}return (- <Modal site={site}>+ <Modal>{renderBody()}{loading && renderLoading()}{!loading && moreResultsAvailable && renderLoadMore()}diff --git a/assets/js/dashboard/stats/modals/referrer-drilldown.js b/assets/js/dashboard/stats/modals/referrer-drilldown.jsindex 49d33c5476..ff1e4caf5b 100644--- a/assets/js/dashboard/stats/modals/referrer-drilldown.js+++ b/assets/js/dashboard/stats/modals/referrer-drilldown.js@@ -3,8 +3,8 @@ import { Link, withRouter } from 'react-router-dom'import Modal from './modal'import * as api from '../../api'-import numberFormatter, {durationFormatter} from '../../util/number-formatter'-import {parseQuery} from '../../query'+import numberFormatter, { durationFormatter } from '../../util/number-formatter'+import { parseQuery } from '../../query'import { updatedQuery } from "../../util/url";import { hasGoalFilter, replaceFilterByPrefix } from "../../util/filters";@@ -20,8 +20,8 @@ class ReferrerDrilldownModal extends React.Component {componentDidMount() {const detailed = this.showExtra()- api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/referrers/${this.props.match.params.referrer}`, this.state.query, {limit: 100, detailed})- .then((response) => this.setState({loading: false, referrers: response.results}))+ api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/referrers/${this.props.match.params.referrer}`, this.state.query, { limit: 100, detailed })+ .then((response) => this.setState({ loading: false, referrers: response.results }))}showExtra() {@@ -45,7 +45,7 @@ class ReferrerDrilldownModal extends React.Component {}formatBounceRate(ref) {- if (typeof(ref.bounce_rate) === 'number') {+ if (typeof (ref.bounce_rate) === 'number') {return ref.bounce_rate + '%'} else {return '-'@@ -53,7 +53,7 @@ class ReferrerDrilldownModal extends React.Component {}formatDuration(referrer) {- if (typeof(referrer.visit_duration) === 'number') {+ if (typeof (referrer.visit_duration) === 'number') {return durationFormatter(referrer.visit_duration)} else {return '-'@@ -77,12 +77,12 @@ class ReferrerDrilldownModal extends React.Component {<img src={`/favicon/sources/${referrer.name}`} referrerPolicy="no-referrer" className="h-4 w-4 mr-2 inline" /><LinkclassName="block truncate hover:underline dark:text-gray-200"- to={{search: updatedQuery({ filters }), pathname: '/' + this.props.site.domain}}+ to={{ search: updatedQuery({ filters }), pathname: '/' + this.props.site.domain }}title={referrer.name}>{referrer.name}</Link>- { this.renderExternalLink(referrer.name) }+ {this.renderExternalLink(referrer.name)}</span>)}@@ -91,13 +91,13 @@ class ReferrerDrilldownModal extends React.Component {return (<tr className="text-sm dark:text-gray-200" key={referrer.name}><td className="p-2">- { this.renderReferrerName(referrer) }+ {this.renderReferrerName(referrer)}</td>- {this.showConversionRate() && <td className="p-2 w-32 font-medium" align="right">{numberFormatter(referrer.total_visitors)}</td> }+ {this.showConversionRate() && <td className="p-2 w-32 font-medium" align="right">{numberFormatter(referrer.total_visitors)}</td>}<td className="p-2 w-32 font-medium" align="right">{numberFormatter(referrer.visitors)}</td>- {this.showExtra() && <td className="p-2 w-32 font-medium" align="right">{this.formatBounceRate(referrer)}</td> }- {this.showExtra() && <td className="p-2 w-32 font-medium" align="right">{this.formatDuration(referrer)}</td> }- {this.showConversionRate() && <td className="p-2 w-32 font-medium" align="right">{referrer.conversion_rate}%</td> }+ {this.showExtra() && <td className="p-2 w-32 font-medium" align="right">{this.formatBounceRate(referrer)}</td>}+ {this.showExtra() && <td className="p-2 w-32 font-medium" align="right">{this.formatDuration(referrer)}</td>}+ {this.showConversionRate() && <td className="p-2 w-32 font-medium" align="right">{referrer.conversion_rate}%</td>}</tr>)}@@ -126,7 +126,7 @@ class ReferrerDrilldownModal extends React.Component {</tr></thead><tbody>- { this.state.referrers.map(this.renderReferrer.bind(this)) }+ {this.state.referrers.map(this.renderReferrer.bind(this))}</tbody></table></main>@@ -137,8 +137,8 @@ class ReferrerDrilldownModal extends React.Component {render() {return (- <Modal site={this.props.site}>- { this.renderBody() }+ <Modal>+ {this.renderBody()}</Modal>)}diff --git a/assets/js/dashboard/stats/modals/sources.js b/assets/js/dashboard/stats/modals/sources.jsindex 2f272f19e0..8e9efa068d 100644--- a/assets/js/dashboard/stats/modals/sources.js+++ b/assets/js/dashboard/stats/modals/sources.js@@ -152,7 +152,7 @@ class SourcesModal extends React.Component {render() {return (- <Modal site={this.props.site}>+ <Modal><h1 className="text-xl font-bold dark:text-gray-100">{this.title()}</h1><div className="my-4 border-b border-gray-300 dark:border-gray-500"></div>diff --git a/assets/js/dashboard/stats/modals/table.js b/assets/js/dashboard/stats/modals/table.jsindex 20eea170c3..fc4861776a 100644--- a/assets/js/dashboard/stats/modals/table.js+++ b/assets/js/dashboard/stats/modals/table.js@@ -4,7 +4,7 @@ import { Link, withRouter } from 'react-router-dom'import Modal from './modal'import * as api from '../../api'import numberFormatter from '../../util/number-formatter'-import {parseQuery} from '../../query'+import { parseQuery } from '../../query'import { cleanLabels, hasGoalFilter, replaceFilterByPrefix } from "../../util/filters";import { updatedQuery } from "../../util/url";@@ -18,8 +18,8 @@ class ModalTable extends React.Component {}componentDidMount() {- api.get(this.props.endpoint, this.state.query, {limit: 100})- .then((response) => this.setState({loading: false, list: response.results}))+ api.get(this.props.endpoint, this.state.query, { limit: 100 })+ .then((response) => this.setState({ loading: false, list: response.results }))}showConversionRate() {@@ -56,7 +56,7 @@ class ModalTable extends React.Component {className="hover:underline"to={{search: updatedQuery({ filters, labels }),- pathname: `/${encodeURIComponent(this.props.site.domain)}`+ pathname: `/`}}>{this.props.renderIcon && this.props.renderIcon(tableItem)}@@ -97,7 +97,7 @@ class ModalTable extends React.Component {</tr></thead><tbody>- { this.state.list.map(this.renderTableItem.bind(this)) }+ {this.state.list.map(this.renderTableItem.bind(this))}</tbody></table></main>@@ -110,8 +110,8 @@ class ModalTable extends React.Component {render() {return (- <Modal site={this.props.site} show={!this.state.loading}>- { this.renderBody() }+ <Modal show={!this.state.loading}>+ {this.renderBody()}</Modal>)}diff --git a/assets/js/dashboard/stats/more-link.js b/assets/js/dashboard/stats/more-link.jsindex 95dfdf284e..3940cbbc50 100644--- a/assets/js/dashboard/stats/more-link.js+++ b/assets/js/dashboard/stats/more-link.js@@ -5,7 +5,7 @@ function detailsIcon() {return (<svgclassName="feather mr-1"- style={{marginTop: '-2px'}}+ style={{ marginTop: '-2px' }}xmlns="http://www.w3.org/2000/svg"viewBox="0 0 24 24"fill="none"@@ -20,17 +20,17 @@ function detailsIcon() {)}-export default function MoreLink({url, site, list, endpoint, className, onClick}) {+export default function MoreLink({ url, list, endpoint, className, onClick }) {if (list.length > 0) {return (<div className={`w-full text-center ${className ? className : ''}`}><Link- to={url || `/${encodeURIComponent(site.domain)}/${endpoint}${window.location.search}`}+ to={url || `/${endpoint}${window.location.search}`}// eslint-disable-next-line max-lenclassName="leading-snug font-bold text-sm text-gray-500 dark:text-gray-400 hover:text-red-500 dark:hover:text-red-400 transition tracking-wide"onClick={onClick}>- { detailsIcon() }+ {detailsIcon()}DETAILS</Link></div>diff --git a/assets/js/dashboard/stats/pages/index.js b/assets/js/dashboard/stats/pages/index.jsindex 991605fd4e..ee76a8bdce 100644--- a/assets/js/dashboard/stats/pages/index.js+++ b/assets/js/dashboard/stats/pages/index.js@@ -30,7 +30,7 @@ function EntryPages({ query, site, afterFetchData }) {getFilterFor={getFilterFor}keyLabel="Entry page"metrics={maybeWithCR([{ ...VISITORS_METRIC, label: 'Unique Entrances' }], query)}- detailsLink={url.sitePath(site, '/entry-pages')}+ detailsLink={url.sitePath('entry-pages')}query={query}externalLinkDest={externalLinkDest}color="bg-orange-50"@@ -61,7 +61,7 @@ function ExitPages({ query, site, afterFetchData }) {getFilterFor={getFilterFor}keyLabel="Exit page"metrics={maybeWithCR([{ ...VISITORS_METRIC, label: "Unique Exits" }], query)}- detailsLink={url.sitePath(site, '/exit-pages')}+ detailsLink={url.sitePath('exit-pages')}query={query}externalLinkDest={externalLinkDest}color="bg-orange-50"@@ -92,7 +92,7 @@ function TopPages({ query, site, afterFetchData }) {getFilterFor={getFilterFor}keyLabel="Page"metrics={maybeWithCR([VISITORS_METRIC], query)}- detailsLink={url.sitePath(site, '/pages')}+ detailsLink={url.sitePath('pages')}query={query}externalLinkDest={externalLinkDest}color="bg-orange-50"@@ -107,7 +107,7 @@ const labelFor = {}export default function Pages(props) {- const {site, query} = props+ const { site, query } = propsconst tabKey = `pageTab__${site.domain}`const storedTab = storage.getItem(tabKey)const [mode, setMode] = useState(storedTab || 'pages')diff --git a/assets/js/dashboard/stats/sources/referrer-list.js b/assets/js/dashboard/stats/sources/referrer-list.jsindex f0069e8578..3ebc1af638 100644--- a/assets/js/dashboard/stats/sources/referrer-list.js+++ b/assets/js/dashboard/stats/sources/referrer-list.js@@ -5,14 +5,14 @@ import { VISITORS_METRIC, maybeWithCR } from '../reports/metrics'import ListReport from '../reports/list'import ImportedQueryUnsupportedWarning from '../../stats/imported-query-unsupported-warning'-export default function Referrers({source, site, query}) {+export default function Referrers({ source, site, query }) {const [skipImportedReason, setSkipImportedReason] = useState(null)const [loading, setLoading] = useState(true)useEffect(() => setLoading(true), [query])function fetchReferrers() {- return api.get(url.apiPath(site, `/referrers/${encodeURIComponent(source)}`), query, {limit: 9})+ return api.get(url.apiPath(site, `/referrers/${encodeURIComponent(source)}`), query, { limit: 9 })}function afterFetchReferrers(apiResponse) {@@ -48,7 +48,7 @@ export default function Referrers({source, site, query}) {<div className="flex flex-col flex-grow"><div className="flex gap-x-1"><h3 className="font-bold dark:text-gray-100">Top Referrers</h3>- <ImportedQueryUnsupportedWarning loading={loading} query={query} skipImportedReason={skipImportedReason}/>+ <ImportedQueryUnsupportedWarning loading={loading} query={query} skipImportedReason={skipImportedReason} /></div><ListReportfetchData={fetchReferrers}@@ -56,7 +56,7 @@ export default function Referrers({source, site, query}) {getFilterFor={getFilterFor}keyLabel="Referrer"metrics={maybeWithCR([VISITORS_METRIC], query)}- detailsLink={url.sitePath(site, `/referrers/${encodeURIComponent(source)}`)}+ detailsLink={url.sitePath(`referrers/${encodeURIComponent(source)}`)}query={query}externalLinkDest={externalLinkDest}renderIcon={renderIcon}diff --git a/assets/js/dashboard/stats/sources/search-terms.js b/assets/js/dashboard/stats/sources/search-terms.jsindex 2046e3db59..707c5177f2 100644--- a/assets/js/dashboard/stats/sources/search-terms.js+++ b/assets/js/dashboard/stats/sources/search-terms.js@@ -10,7 +10,7 @@ import LazyLoader from '../../components/lazy-loader'export default class SearchTerms extends React.Component {constructor(props) {super(props)- this.state = {loading: true}+ this.state = { loading: true }this.onVisible = this.onVisible.bind(this)this.fetchSearchTerms = this.fetchSearchTerms.bind(this)}@@ -24,7 +24,7 @@ export default class SearchTerms extends React.Component {componentDidUpdate(prevProps) {if (this.props.query !== prevProps.query) {- this.setState({loading: true, terms: null})+ this.setState({ loading: true, terms: null })this.fetchSearchTerms()}}@@ -41,10 +41,9 @@ export default class SearchTerms extends React.Component {notConfigured: res.not_configured,isAdmin: res.is_admin,unsupportedFilters: res.unsupported_filters- })).catch((error) =>- {- this.setState({ loading: false, searchTerms: [], notConfigured: true, error: true, isAdmin: error.payload.is_admin })- }+ })).catch((error) => {+ this.setState({ loading: false, searchTerms: [], notConfigured: true, error: true, isAdmin: error.payload.is_admin })+ })}@@ -59,7 +58,7 @@ export default class SearchTerms extends React.Component {><span className="flex px-2 py-1.5 dark:text-gray-300 z-9 relative break-all"><span className="md:truncate block">- { term.name }+ {term.name}</span></span></Bar>@@ -69,7 +68,7 @@ export default class SearchTerms extends React.Component {}renderList() {- if (this.state.unsupportedFilters) {+ if (this.state.unsupportedFilters) {return (<div className="text-center text-gray-700 dark:text-gray-300 text-sm mt-20"><RocketIcon />@@ -81,10 +80,10 @@ export default class SearchTerms extends React.Component {<div className="text-center text-gray-700 dark:text-gray-300 text-sm mt-20"><RocketIcon /><div>- This site is not connected to Search Console so we cannot show the search terms- {this.state.isAdmin && this.state.error && <><br/><br/><p>Please click below to connect your Search Console account.</p></>}+ This site is not connected to Search Console so we cannot show the search terms+ {this.state.isAdmin && this.state.error && <><br /><br /><p>Please click below to connect your Search Console account.</p></>}</div>- {this.state.isAdmin && <a href={`/${encodeURIComponent(this.props.site.domain)}/settings/integrations`} className="button mt-4">Connect with Google</a> }+ {this.state.isAdmin && <a href={`/${encodeURIComponent(this.props.site.domain)}/settings/integrations`} className="button mt-4">Connect with Google</a>}</div>)} else if (this.state.searchTerms.length > 0) {@@ -114,8 +113,8 @@ export default class SearchTerms extends React.Component {return (<React.Fragment><h3 className="font-bold dark:text-gray-100">Search Terms</h3>- { this.renderList() }- <MoreLink site={this.props.site} list={this.state.searchTerms} endpoint="referrers/Google" className="w-full pb-4 absolute bottom-0 left-0"/>+ {this.renderList()}+ <MoreLink list={this.state.searchTerms} endpoint="referrers/Google" className="w-full pb-4 absolute bottom-0 left-0" /></React.Fragment>)}@@ -124,10 +123,10 @@ export default class SearchTerms extends React.Component {render() {return (<div>- { this.state.loading && <div className="loading mt-44 mx-auto"><div></div></div> }+ {this.state.loading && <div className="loading mt-44 mx-auto"><div></div></div>}<FadeIn show={!this.state.loading} className="flex-grow"><LazyLoader onVisible={this.onVisible}>- { this.renderContent() }+ {this.renderContent()}</LazyLoader></FadeIn></div>diff --git a/assets/js/dashboard/stats/sources/source-list.js b/assets/js/dashboard/stats/sources/source-list.jsindex 32c6a790be..806dfc8195 100644--- a/assets/js/dashboard/stats/sources/source-list.js+++ b/assets/js/dashboard/stats/sources/source-list.js@@ -48,7 +48,7 @@ function AllSources(props) {getFilterFor={getFilterFor}keyLabel="Source"metrics={maybeWithCR([VISITORS_METRIC], query)}- detailsLink={url.sitePath(site, '/sources')}+ detailsLink={url.sitePath('sources')}renderIcon={renderIcon}query={query}color="bg-blue-50"@@ -78,7 +78,7 @@ function UTMSources(props) {getFilterFor={getFilterFor}keyLabel={utmTag.label}metrics={maybeWithCR([VISITORS_METRIC], query)}- detailsLink={url.sitePath(site, utmTag.endpoint)}+ detailsLink={url.sitePath(utmTag.endpoint)}query={query}color="bg-blue-50"/>@@ -178,7 +178,7 @@ export default function SourceList(props) {<h3 className="font-bold dark:text-gray-100">Top Sources</h3>- <ImportedQueryUnsupportedWarning loading={loading} query={query} skipImportedReason={skipImportedReason}/>+ <ImportedQueryUnsupportedWarning loading={loading} query={query} skipImportedReason={skipImportedReason} /></div>{renderTabs()}</div>diff --git a/assets/js/dashboard/util/url.js b/assets/js/dashboard/util/url.jsindex e9349e0d34..609f116123 100644--- a/assets/js/dashboard/util/url.js+++ b/assets/js/dashboard/util/url.js@@ -1,15 +1,11 @@import JsonURL from '@jsonurl/jsonurl'export function apiPath(site, path = '') {- return `/api/stats/${encodeURIComponent(site.domain)}${path}`+ return `/api/stats/${encodeURIComponent(site.domain)}${path}/`}-export function siteBasePath(site, path = '') {- return `/${encodeURIComponent(site.domain)}${path}`-}--export function sitePath(site, path = '') {- return siteBasePath(site, path) + window.location.search+export function sitePath(path = '') {+ return `/${path}` + window.location.search}export function setQuery(key, value) {