Skip to content

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

Fix external URLs for entry and exit pages

Uku Taht3315b8cce530
diff --git a/assets/js/dashboard/stats/pages/entry-pages.js b/assets/js/dashboard/stats/pages/entry-pages.js
index 10bb5252ee..4c851dc7f2 100644
--- a/assets/js/dashboard/stats/pages/entry-pages.js
+++ b/assets/js/dashboard/stats/pages/entry-pages.js
@@ -40,6 +40,7 @@ export default class EntryPages extends React.Component {
}
renderPage(page) {
+ const externalLink = url.externalLinkForPage(this.props.site.domain, page.name)
const maxWidthDeduction = this.showConversionRate() ? "10rem" : "5rem"
return (
@@ -59,7 +60,7 @@ export default class EntryPages extends React.Component {
</Link>
<a
target="_blank"
- href={`http://${ this.props.site.domain }${page.name}`}
+ href={externalLink}
className="hidden group-hover:block"
>
<svg className="inline w-4 h-4 ml-1 -mt-1 text-gray-600 dark:text-gray-400" fill="currentColor" viewBox="0 0 20 20"><path d="M11 3a1 1 0 100 2h2.586l-6.293 6.293a1 1 0 101.414 1.414L15 6.414V9a1 1 0 102 0V4a1 1 0 00-1-1h-5z"></path><path d="M5 5a2 2 0 00-2 2v8a2 2 0 002 2h8a2 2 0 002-2v-3a1 1 0 10-2 0v3H5V7h3a1 1 0 000-2H5z"></path></svg>
diff --git a/assets/js/dashboard/stats/pages/exit-pages.js b/assets/js/dashboard/stats/pages/exit-pages.js
index 43611f215b..1adeceae46 100644
--- a/assets/js/dashboard/stats/pages/exit-pages.js
+++ b/assets/js/dashboard/stats/pages/exit-pages.js
@@ -40,6 +40,7 @@ export default class ExitPages extends React.Component {
}
renderPage(page) {
+ const externalLink = url.externalLinkForPage(this.props.site.domain, page.name)
const maxWidthDeduction = this.showConversionRate() ? "10rem" : "5rem"
return (
@@ -59,7 +60,7 @@ export default class ExitPages extends React.Component {
</Link>
<a
target="_blank"
- href={'http://' + this.props.site.domain + page.name}
+ href={externalLink}
className="hidden group-hover:block"
>
<svg className="inline w-4 h-4 ml-1 -mt-1 text-gray-600 dark:text-gray-400" fill="currentColor" viewBox="0 0 20 20"><path d="M11 3a1 1 0 100 2h2.586l-6.293 6.293a1 1 0 101.414 1.414L15 6.414V9a1 1 0 102 0V4a1 1 0 00-1-1h-5z"></path><path d="M5 5a2 2 0 00-2 2v8a2 2 0 002 2h8a2 2 0 002-2v-3a1 1 0 10-2 0v3H5V7h3a1 1 0 000-2H5z"></path></svg>
diff --git a/assets/js/dashboard/stats/pages/pages.js b/assets/js/dashboard/stats/pages/pages.js
index 32e85764b5..63d905d3e6 100644
--- a/assets/js/dashboard/stats/pages/pages.js
+++ b/assets/js/dashboard/stats/pages/pages.js
@@ -40,8 +40,7 @@ export default class Visits extends React.Component {
}
renderPage(page) {
- const domain = new URL('https://' + this.props.site.domain)
- const externalLink = 'https://' + domain.host + page.name
+ const externalLink = url.externalLinkForPage(this.props.site.domain, page.name)
const maxWidthDeduction = this.showConversionRate() ? "10rem" : "5rem"
return (
diff --git a/assets/js/dashboard/url.js b/assets/js/dashboard/url.js
index 2d551f77bc..4ec2b13986 100644
--- a/assets/js/dashboard/url.js
+++ b/assets/js/dashboard/url.js
@@ -11,3 +11,8 @@ export function setQuery(key, value) {
query.set(key, value)
return window.location.pathname + '?' + query.toString();
}
+
+export function externalLinkForPage(domain, page) {
+ const domainURL = new URL(`https://${domain}`)
+ return `https://${domainURL.host}${page}`
+}