Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Fix links in new tab (#1348)

Uku Tahtf5a7fd28193d
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 236f1d8983..37fcfd2abf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@ All notable changes to this project will be documented in this file.
- Turn off autocomplete for name and password inputs in the _New shared link_ form.
- Details modals are now responsive and take up less horizontal space on smaller screens to make it easier to scroll.
- Fix reading config from file
+- Fix some links not opening correctly in new tab
### Removed
- Removes AppSignal monitoring package
diff --git a/assets/js/dashboard/stats/conversions/index.js b/assets/js/dashboard/stats/conversions/index.js
index d0d252d115..663c562178 100644
--- a/assets/js/dashboard/stats/conversions/index.js
+++ b/assets/js/dashboard/stats/conversions/index.js
@@ -2,10 +2,10 @@ import React from 'react';
import { Link } from 'react-router-dom'
import Bar from '../bar'
-import MoreLink from '../more-link'
import PropBreakdown from './prop-breakdown'
import numberFormatter from '../../number-formatter'
import * as api from '../../api'
+import * as url from '../../url'
import LazyLoader from '../../lazy-loader'
const MOBILE_UPPER_WIDTH = 767
@@ -61,18 +61,15 @@ export default class Conversions extends React.Component {
if (this.props.query.period === 'realtime') {
return <span className="block px-2 py-1.5 relative z-9 md:truncate break-all dark:text-gray-200">{goalName}</span>
} else {
- const query = new URLSearchParams(window.location.search)
- query.set('goal', goalName)
-
return (
- <Link to={{pathname: window.location.pathname, search: query.toString()}} className="block px-2 py-1.5 hover:underline relative z-9 break-all lg:truncate dark:text-gray-200">
+ <Link to={url.setQuery('goal', goalName)} className="block px-2 py-1.5 hover:underline relative z-9 break-all lg:truncate dark:text-gray-200">
{goalName}
</Link>
)
}
}
-
+
renderGoal(goal) {
const { viewport } = this.state;
diff --git a/assets/js/dashboard/stats/current-visitors.js b/assets/js/dashboard/stats/current-visitors.js
index 5cc4979767..7f6e6b59f5 100644
--- a/assets/js/dashboard/stats/current-visitors.js
+++ b/assets/js/dashboard/stats/current-visitors.js
@@ -1,6 +1,7 @@
import React from 'react';
import { Link } from 'react-router-dom'
import * as api from '../api'
+import * as url from '../url'
import { appliedFilters } from '../query';
export default class CurrentVisitors extends React.Component {
@@ -21,14 +22,11 @@ export default class CurrentVisitors extends React.Component {
render() {
if (appliedFilters(this.props.query).length >= 1) { return null }
-
- const query = new URLSearchParams(window.location.search)
- query.set('period', 'realtime')
-
const { currentVisitors } = this.state;
+
if (currentVisitors !== null) {
return (
- <Link to={{search: query.toString()}} className="block ml-1 md:ml-2 mr-auto text-xs md:text-sm font-bold text-gray-500 dark:text-gray-300">
+ <Link to={url.setQuery('period', 'realtime')} className="block ml-1 md:ml-2 mr-auto text-xs md:text-sm font-bold text-gray-500 dark:text-gray-300">
<svg className="inline w-2 mr-1 md:mr-2 text-green-500 fill-current" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
<circle cx="8" cy="8" r="8" />
</svg>
diff --git a/assets/js/dashboard/stats/devices/browsers.js b/assets/js/dashboard/stats/devices/browsers.js
index 9411e20619..38d3c665f7 100644
--- a/assets/js/dashboard/stats/devices/browsers.js
+++ b/assets/js/dashboard/stats/devices/browsers.js
@@ -5,6 +5,7 @@ import FadeIn from '../../fade-in'
import numberFormatter from '../../number-formatter'
import Bar from '../bar'
import * as api from '../../api'
+import * as url from '../../url'
import LazyLoader from '../../lazy-loader'
export default class Browsers extends React.Component {
@@ -45,10 +46,10 @@ export default class Browsers extends React.Component {
return this.props.query.period === 'realtime' ? 'Current visitors' : 'Visitors'
}
- renderBrowserContent(browser, query) {
+ renderBrowserContent(browser, link) {
return (
<span className="flex px-2 py-1.5 dark:text-gray-300 relative z-9 break-all">
- <Link className="md:truncate block hover:underline" to={{search: query.toString()}}>
+ <Link className="md:truncate block hover:underline" to={link}>
{browser.name}
</Link>
</span>
@@ -56,11 +57,11 @@ export default class Browsers extends React.Component {
}
renderBrowser(browser) {
- const query = new URLSearchParams(window.location.search)
+ let link;
if (this.props.query.filters.browser) {
- query.set('browser_version', browser.name)
+ link = url.setQuery('browser_version', browser.name)
} else {
- query.set('browser', browser.name)
+ link = url.setQuery('browser', browser.name)
}
const maxWidthDeduction = this.showConversionRate() ? "10rem" : "5rem"
@@ -72,7 +73,7 @@ export default class Browsers extends React.Component {
bg="bg-green-50 dark:bg-gray-500 dark:bg-opacity-15"
maxWidthDeduction={maxWidthDeduction}
>
- {this.renderBrowserContent(browser, query)}
+ {this.renderBrowserContent(browser, link)}
</Bar>
<span className="font-medium dark:text-gray-200 text-right w-20">
{numberFormatter(browser.count)} <span className="inline-block w-8 text-xs"> ({browser.percentage}%)</span>
diff --git a/assets/js/dashboard/stats/devices/index.js b/assets/js/dashboard/stats/devices/index.js
index 1bcdd21e67..bc55d756fd 100644
--- a/assets/js/dashboard/stats/devices/index.js
+++ b/assets/js/dashboard/stats/devices/index.js
@@ -9,6 +9,7 @@ import FadeIn from '../../fade-in'
import numberFormatter from '../../number-formatter'
import Bar from '../bar'
import * as api from '../../api'
+import * as url from '../../url'
const EXPLANATION = {
@@ -91,7 +92,7 @@ class ScreenSizes extends React.Component {
tooltip={EXPLANATION[size.name]}
className="flex px-2 py-1.5 dark:text-gray-300"
>
- <Link className="md:truncate block hover:underline" to={{search: query.toString()}}>
+ <Link className="md:truncate block hover:underline" to={url.setQuery('screen', size.name)}>
{iconFor(size.name)} {size.name}
</Link>
</span>
diff --git a/assets/js/dashboard/stats/devices/operating-systems.js b/assets/js/dashboard/stats/devices/operating-systems.js
index f0ea1f4b03..594f1fa504 100644
--- a/assets/js/dashboard/stats/devices/operating-systems.js
+++ b/assets/js/dashboard/stats/devices/operating-systems.js
@@ -5,6 +5,7 @@ import FadeIn from '../../fade-in'
import numberFormatter from '../../number-formatter'
import Bar from '../bar'
import * as api from '../../api'
+import * as url from '../../url'
import LazyLoader from '../../lazy-loader'
export default class OperatingSystems extends React.Component {
@@ -41,11 +42,11 @@ export default class OperatingSystems extends React.Component {
}
renderOperatingSystem(os) {
- const query = new URLSearchParams(window.location.search)
+ let link;
if (this.props.query.filters.os) {
- query.set('os_version', os.name)
+ link = url.setQuery('os_version', os.name)
} else {
- query.set('os', os.name)
+ link = url.setQuery('os', os.name)
}
const maxWidthDeduction = this.showConversionRate() ? "10rem" : "5rem"
@@ -61,7 +62,7 @@ export default class OperatingSystems extends React.Component {
maxWidthDeduction={maxWidthDeduction}
>
<span className="flex px-2 py-1.5 dark:text-gray-300 relative z-9 break-all">
- <Link className="md:truncate block hover:underline" to={{search: query.toString()}}>
+ <Link className="md:truncate block hover:underline" to={link}>
{os.name}
</Link>
</span>
diff --git a/assets/js/dashboard/stats/pages/entry-pages.js b/assets/js/dashboard/stats/pages/entry-pages.js
index 9ca28bc39e..10bb5252ee 100644
--- a/assets/js/dashboard/stats/pages/entry-pages.js
+++ b/assets/js/dashboard/stats/pages/entry-pages.js
@@ -8,6 +8,7 @@ import MoreLink from '../more-link'
import numberFormatter from '../../number-formatter'
import { eventName } from '../../query'
import * as api from '../../api'
+import * as url from '../../url'
import LazyLoader from '../../lazy-loader'
export default class EntryPages extends React.Component {
@@ -39,8 +40,6 @@ export default class EntryPages extends React.Component {
}
renderPage(page) {
- const query = new URLSearchParams(window.location.search)
- query.set('entry_page', page.name)
const maxWidthDeduction = this.showConversionRate() ? "10rem" : "5rem"
return (
@@ -53,7 +52,7 @@ export default class EntryPages extends React.Component {
>
<span className="flex px-2 py-1.5 group dark:text-gray-300 relative break-all z-9">
<Link
- to={{pathname: window.location.pathname, search: query.toString()}}
+ to={url.setQuery('entry_page', page.name)}
className="md:truncate block hover:underline"
>
{page.name}
diff --git a/assets/js/dashboard/stats/pages/exit-pages.js b/assets/js/dashboard/stats/pages/exit-pages.js
index a3cd295e10..43611f215b 100644
--- a/assets/js/dashboard/stats/pages/exit-pages.js
+++ b/assets/js/dashboard/stats/pages/exit-pages.js
@@ -8,6 +8,7 @@ import MoreLink from '../more-link'
import numberFormatter from '../../number-formatter'
import { eventName } from '../../query'
import * as api from '../../api'
+import * as url from '../../url'
import LazyLoader from '../../lazy-loader'
export default class ExitPages extends React.Component {
@@ -39,8 +40,6 @@ export default class ExitPages extends React.Component {
}
renderPage(page) {
- const query = new URLSearchParams(window.location.search)
- query.set('exit_page', page.name)
const maxWidthDeduction = this.showConversionRate() ? "10rem" : "5rem"
return (
@@ -53,7 +52,7 @@ export default class ExitPages extends React.Component {
>
<span className="flex px-2 py-1.5 group dark:text-gray-300 z-9 relative break-all">
<Link
- to={{pathname: window.location.pathname, search: query.toString()}}
+ to={url.setQuery('exit_page', page.name)}
className="md:truncate block hover:underline"
>
{page.name}
diff --git a/assets/js/dashboard/stats/pages/pages.js b/assets/js/dashboard/stats/pages/pages.js
index d8e350ba7d..32e85764b5 100644
--- a/assets/js/dashboard/stats/pages/pages.js
+++ b/assets/js/dashboard/stats/pages/pages.js
@@ -8,6 +8,7 @@ import MoreLink from '../more-link'
import numberFormatter from '../../number-formatter'
import { eventName } from '../../query'
import * as api from '../../api'
+import * as url from '../../url'
import LazyLoader from '../../lazy-loader'
export default class Visits extends React.Component {
@@ -39,8 +40,6 @@ export default class Visits extends React.Component {
}
renderPage(page) {
- const query = new URLSearchParams(window.location.search)
- query.set('page', page.name)
const domain = new URL('https://' + this.props.site.domain)
const externalLink = 'https://' + domain.host + page.name
const maxWidthDeduction = this.showConversionRate() ? "10rem" : "5rem"
@@ -60,7 +59,7 @@ export default class Visits extends React.Component {
className="flex px-2 py-1.5 group dark:text-gray-300 relative z-9 break-all"
>
<Link
- to={{pathname: window.location.pathname, search: query.toString()}}
+ to={url.setQuery('page', page.name)}
className="md:truncate block hover:underline"
>
{page.name}
diff --git a/assets/js/dashboard/stats/sources/source-list.js b/assets/js/dashboard/stats/sources/source-list.js
index e7b8c544ea..d75a88ec93 100644
--- a/assets/js/dashboard/stats/sources/source-list.js
+++ b/assets/js/dashboard/stats/sources/source-list.js
@@ -8,6 +8,7 @@ import Bar from '../bar'
import MoreLink from '../more-link'
import numberFormatter from '../../number-formatter'
import * as api from '../../api'
+import * as url from '../../url'
import LazyLoader from '../../lazy-loader'
class AllSources extends React.Component {
@@ -43,9 +44,6 @@ class AllSources extends React.Component {
}
renderReferrer(referrer) {
- const query = new URLSearchParams(window.location.search)
- query.set('source', referrer.name)
-
const maxWidthDeduction = this.showConversionRate() ? "10rem" : "5rem"
return (
@@ -62,7 +60,7 @@ class AllSources extends React.Component {
<span className="flex px-2 py-1.5 dark:text-gray-300 relative z-9 break-all">
<Link
className="md:truncate block hover:underline"
- to={{search: query.toString()}}
+ to={url.setQuery('source', referrer.name)}
>
<img
src={`/favicon/sources/${encodeURIComponent(referrer.name)}`}
@@ -170,8 +168,6 @@ class UTMSources extends React.Component {
}
renderReferrer(referrer) {
- const query = new URLSearchParams(window.location.search)
- query.set(this.props.tab, referrer.name)
const maxWidthDeduction = this.showConversionRate() ? "10rem" : "5rem"
return (
@@ -189,7 +185,7 @@ class UTMSources extends React.Component {
<span className="flex px-2 py-1.5 dark:text-gray-300 relative z-9 break-all">
<Link
className="md:truncate block hover:underline"
- to={{search: query.toString()}}
+ to={url.setQuery(this.props.tab, referrer.name)}
>
{ referrer.name }
</Link>
diff --git a/assets/js/dashboard/url.js b/assets/js/dashboard/url.js
index f9e2b0f149..2d551f77bc 100644
--- a/assets/js/dashboard/url.js
+++ b/assets/js/dashboard/url.js
@@ -5,3 +5,9 @@ export function apiPath(site, path = '') {
export function sitePath(site, path = '') {
return `/${encodeURIComponent(site.domain)}${path}`
}
+
+export function setQuery(key, value) {
+ const query = new URLSearchParams(window.location.search)
+ query.set(key, value)
+ return window.location.pathname + '?' + query.toString();
+}