Skip to content

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

Use generic ListReport for pages (#1505)

Uku Taht47fac2350fa6
diff --git a/assets/js/dashboard/api.js b/assets/js/dashboard/api.js
index 5257eed734..ddbb90f798 100644
--- a/assets/js/dashboard/api.js
+++ b/assets/js/dashboard/api.js
@@ -1,4 +1,4 @@
-import {formatISO} from './date'
+import {formatISO} from './util/date'
let abortController = new AbortController()
let SHARED_LINK_AUTH = null
diff --git a/assets/js/dashboard/lazy-loader.js b/assets/js/dashboard/components/lazy-loader.js
similarity index 100%
rename from assets/js/dashboard/lazy-loader.js
rename to assets/js/dashboard/components/lazy-loader.js
diff --git a/assets/js/dashboard/datepicker.js b/assets/js/dashboard/datepicker.js
index 7168b47787..5c046f9d18 100644
--- a/assets/js/dashboard/datepicker.js
+++ b/assets/js/dashboard/datepicker.js
@@ -18,7 +18,7 @@ import {
parseUTCDate,
isBefore,
isAfter,
-} from "./date";
+} from "./util/date";
import { navigateToQuery, QueryLink, QueryButton } from "./query";
function renderArrow(query, site, period, prevDate, nextDate) {
diff --git a/assets/js/dashboard/query.js b/assets/js/dashboard/query.js
index 6273355866..74ec396c7e 100644
--- a/assets/js/dashboard/query.js
+++ b/assets/js/dashboard/query.js
@@ -1,7 +1,7 @@
import React from 'react'
import { Link, withRouter } from 'react-router-dom'
-import {formatDay, formatMonthYYYY, nowForSite, parseUTCDate} from './date'
-import * as storage from './storage'
+import {formatDay, formatMonthYYYY, nowForSite, parseUTCDate} from './util/date'
+import * as storage from './util/storage'
const PERIODS = ['realtime', 'day', 'month', '7d', '30d', '6mo', '12mo', 'custom']
diff --git a/assets/js/dashboard/stats/conversions/index.js b/assets/js/dashboard/stats/conversions/index.js
index 1aef2cdb75..e63ac2ee84 100644
--- a/assets/js/dashboard/stats/conversions/index.js
+++ b/assets/js/dashboard/stats/conversions/index.js
@@ -3,10 +3,10 @@ import { Link } from 'react-router-dom'
import Bar from '../bar'
import PropBreakdown from './prop-breakdown'
-import numberFormatter from '../../number-formatter'
+import numberFormatter from '../../util/number-formatter'
import * as api from '../../api'
-import * as url from '../../url'
-import LazyLoader from '../../lazy-loader'
+import * as url from '../../util/url'
+import LazyLoader from '../../components/lazy-loader'
const MOBILE_UPPER_WIDTH = 767
const DEFAULT_WIDTH = 1080
diff --git a/assets/js/dashboard/stats/conversions/prop-breakdown.js b/assets/js/dashboard/stats/conversions/prop-breakdown.js
index 50fe54455b..e142c0f339 100644
--- a/assets/js/dashboard/stats/conversions/prop-breakdown.js
+++ b/assets/js/dashboard/stats/conversions/prop-breakdown.js
@@ -1,9 +1,9 @@
import React from 'react';
import { Link } from 'react-router-dom'
-import * as storage from '../../storage'
+import * as storage from '../../util/storage'
import Bar from '../bar'
-import numberFormatter from '../../number-formatter'
+import numberFormatter from '../../util/number-formatter'
import * as api from '../../api'
const MOBILE_UPPER_WIDTH = 767
diff --git a/assets/js/dashboard/stats/current-visitors.js b/assets/js/dashboard/stats/current-visitors.js
index 7f6e6b59f5..b27dfda373 100644
--- a/assets/js/dashboard/stats/current-visitors.js
+++ b/assets/js/dashboard/stats/current-visitors.js
@@ -1,7 +1,7 @@
import React from 'react';
import { Link } from 'react-router-dom'
import * as api from '../api'
-import * as url from '../url'
+import * as url from '../util/url'
import { appliedFilters } from '../query';
export default class CurrentVisitors extends React.Component {
diff --git a/assets/js/dashboard/stats/devices/index.js b/assets/js/dashboard/stats/devices/index.js
index e993ede308..106f5d2a00 100644
--- a/assets/js/dashboard/stats/devices/index.js
+++ b/assets/js/dashboard/stats/devices/index.js
@@ -1,9 +1,9 @@
import React from 'react';
-import * as storage from '../../storage'
+import * as storage from '../../util/storage'
import ListReport from '../reports/list'
import * as api from '../../api'
-import * as url from '../../url'
+import * as url from '../../util/url'
function Browsers({query, site}) {
function fetchData() {
diff --git a/assets/js/dashboard/stats/locations/index.js b/assets/js/dashboard/stats/locations/index.js
index bb69f476fe..ec6c228390 100644
--- a/assets/js/dashboard/stats/locations/index.js
+++ b/assets/js/dashboard/stats/locations/index.js
@@ -1,10 +1,10 @@
import React from 'react';
-import * as storage from '../../storage'
+import * as storage from '../../util/storage'
import CountriesMap from './map'
import * as api from '../../api'
-import {apiPath, sitePath} from '../../url'
+import {apiPath, sitePath} from '../../util/url'
import ListReport from '../reports/list'
function Countries({query, site}) {
diff --git a/assets/js/dashboard/stats/locations/map.js b/assets/js/dashboard/stats/locations/map.js
index 4ec1a0ca11..11bb5ab2b4 100644
--- a/assets/js/dashboard/stats/locations/map.js
+++ b/assets/js/dashboard/stats/locations/map.js
@@ -3,9 +3,9 @@ import Datamap from 'datamaps'
import { withRouter } from 'react-router-dom'
import * as d3 from "d3"
-import numberFormatter from '../../number-formatter'
+import numberFormatter from '../../util/number-formatter'
import FadeIn from '../../fade-in'
-import LazyLoader from '../../lazy-loader'
+import LazyLoader from '../../components/lazy-loader'
import MoreLink from '../more-link'
import * as api from '../../api'
import { navigateToQuery } from '../../query'
diff --git a/assets/js/dashboard/stats/modals/entry-pages.js b/assets/js/dashboard/stats/modals/entry-pages.js
index 198c32f363..22a298119c 100644
--- a/assets/js/dashboard/stats/modals/entry-pages.js
+++ b/assets/js/dashboard/stats/modals/entry-pages.js
@@ -4,7 +4,7 @@ import { Link , withRouter } from 'react-router-dom'
import Modal from './modal'
import * as api from '../../api'
-import numberFormatter, { durationFormatter } from '../../number-formatter'
+import numberFormatter, { durationFormatter } from '../../util/number-formatter'
import {parseQuery} from '../../query'
class EntryPagesModal extends React.Component {
diff --git a/assets/js/dashboard/stats/modals/exit-pages.js b/assets/js/dashboard/stats/modals/exit-pages.js
index 21b8952146..dc09536927 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 from '../../number-formatter'
+import numberFormatter from '../../util/number-formatter'
import {parseQuery} from '../../query'
class ExitPagesModal extends React.Component {
diff --git a/assets/js/dashboard/stats/modals/filter.js b/assets/js/dashboard/stats/modals/filter.js
index 944d6c7241..09ec95ff01 100644
--- a/assets/js/dashboard/stats/modals/filter.js
+++ b/assets/js/dashboard/stats/modals/filter.js
@@ -8,7 +8,7 @@ import SearchSelect from '../../components/search-select'
import Modal from './modal'
import { parseQuery, formattedFilters } from '../../query'
import * as api from '../../api'
-import {apiPath, siteBasePath} from '../../url'
+import {apiPath, siteBasePath} from '../../util/url'
export const FILTER_GROUPS = {
'page': ['page'],
diff --git a/assets/js/dashboard/stats/modals/google-keywords.js b/assets/js/dashboard/stats/modals/google-keywords.js
index b2ac56957c..50c7498220 100644
--- a/assets/js/dashboard/stats/modals/google-keywords.js
+++ b/assets/js/dashboard/stats/modals/google-keywords.js
@@ -3,7 +3,7 @@ import { Link, withRouter } from 'react-router-dom'
import Modal from './modal'
import * as api from '../../api'
-import numberFormatter from '../../number-formatter'
+import numberFormatter from '../../util/number-formatter'
import {parseQuery, toHuman} from '../../query'
import RocketIcon from './rocket-icon'
diff --git a/assets/js/dashboard/stats/modals/pages.js b/assets/js/dashboard/stats/modals/pages.js
index f243298b59..6a0f20fd01 100644
--- a/assets/js/dashboard/stats/modals/pages.js
+++ b/assets/js/dashboard/stats/modals/pages.js
@@ -4,7 +4,7 @@ import { withRouter } from 'react-router-dom'
import Modal from './modal'
import * as api from '../../api'
-import numberFormatter, {durationFormatter} from '../../number-formatter'
+import numberFormatter, {durationFormatter} from '../../util/number-formatter'
import {parseQuery} from '../../query'
class PagesModal extends React.Component {
diff --git a/assets/js/dashboard/stats/modals/referrer-drilldown.js b/assets/js/dashboard/stats/modals/referrer-drilldown.js
index 459d97c1e4..1ecea42cb3 100644
--- a/assets/js/dashboard/stats/modals/referrer-drilldown.js
+++ b/assets/js/dashboard/stats/modals/referrer-drilldown.js
@@ -3,7 +3,7 @@ import { Link, withRouter } from 'react-router-dom'
import Modal from './modal'
import * as api from '../../api'
-import numberFormatter, {durationFormatter} from '../../number-formatter'
+import numberFormatter, {durationFormatter} from '../../util/number-formatter'
import {parseQuery, toHuman} from '../../query'
class ReferrerDrilldownModal extends React.Component {
diff --git a/assets/js/dashboard/stats/modals/sources.js b/assets/js/dashboard/stats/modals/sources.js
index 2005422ca3..334483a31f 100644
--- a/assets/js/dashboard/stats/modals/sources.js
+++ b/assets/js/dashboard/stats/modals/sources.js
@@ -3,7 +3,7 @@ import { Link, withRouter } from 'react-router-dom'
import Modal from './modal'
import * as api from '../../api'
-import numberFormatter, {durationFormatter} from '../../number-formatter'
+import numberFormatter, {durationFormatter} from '../../util/number-formatter'
import {parseQuery} from '../../query'
const TITLES = {
diff --git a/assets/js/dashboard/stats/modals/table.js b/assets/js/dashboard/stats/modals/table.js
index 7f5c4feee3..517234a415 100644
--- a/assets/js/dashboard/stats/modals/table.js
+++ b/assets/js/dashboard/stats/modals/table.js
@@ -3,7 +3,7 @@ import { Link, withRouter } from 'react-router-dom'
import Modal from './modal'
import * as api from '../../api'
-import numberFormatter from '../../number-formatter'
+import numberFormatter from '../../util/number-formatter'
import {parseQuery} from '../../query'
class ModalTable extends React.Component {
diff --git a/assets/js/dashboard/stats/pages/entry-pages.js b/assets/js/dashboard/stats/pages/entry-pages.js
deleted file mode 100644
index 58689fc31b..0000000000
--- a/assets/js/dashboard/stats/pages/entry-pages.js
+++ /dev/null
@@ -1,128 +0,0 @@
-import React from 'react';
-import { Link } from 'react-router-dom'
-import FlipMove from 'react-flip-move';
-
-import FadeIn from '../../fade-in'
-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'
-
-export default class EntryPages extends React.Component {
- constructor(props) {
- super(props)
- this.state = {loading: true}
- this.onVisible = this.onVisible.bind(this)
- }
-
- componentDidUpdate(prevProps) {
- if (this.props.query !== prevProps.query) {
- this.setState({loading: true, pages: null})
- this.fetchPages()
- }
- }
-
- onVisible() {
- this.fetchPages()
- if (this.props.timer) this.props.timer.onTick(this.fetchPages.bind(this))
- }
-
- showConversionRate() {
- return !!this.props.query.filters.goal
- }
-
- fetchPages() {
- api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/entry-pages`, this.props.query)
- .then((res) => this.setState({loading: false, pages: res}))
- }
-
- label() {
- if (this.props.query.period === 'realtime') {
- return 'Current visitors'
- }
-
- if (this.showConversionRate()) {
- return 'Conversions'
- }
-
- return 'Unique Entrances'
- }
-
- renderPage(page) {
- const externalLink = url.externalLinkForPage(this.props.site.domain, page.name)
- const maxWidthDeduction = this.showConversionRate() ? "10rem" : "5rem"
-
- return (
- <div className="flex items-center justify-between my-1 text-sm" key={page.name}>
- <Bar
- count={page.unique_entrances}
- all={this.state.pages}
- plot="unique_entrances"
- bg="bg-orange-50 dark:bg-gray-500 dark:bg-opacity-15"
- maxWidthDeduction={maxWidthDeduction}
- >
- <span className="flex px-2 py-1.5 group dark:text-gray-300 relative break-all z-9">
- <Link
- to={url.setQuery('entry_page', page.name)}
- className="md:truncate block hover:underline"
- >
- {page.name}
- </Link>
- <a
- target="_blank"
- rel="noreferrer"
- 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>
- </a>
- </span>
- </Bar>
- <span className="font-medium dark:text-gray-200 w-20 text-right">{numberFormatter(page.unique_entrances)}</span>
- {this.showConversionRate() && <span className="font-medium dark:text-gray-200 w-20 text-right">{numberFormatter(page.conversion_rate)}%</span>}
- </div>
- )
- }
-
- renderList() {
- if (this.state.pages && this.state.pages.length > 0) {
- return (
- <>
- <div className="flex items-center justify-between mt-3 mb-2 text-xs font-bold tracking-wide text-gray-500 dark:text-gray-400">
- <span>Page url</span>
- <div className="text-right">
- <span className="inline-block w-30">{this.label()}</span>
- {this.showConversionRate() && <span className="inline-block w-20">CR</span>}
- </div>
- </div>
-
- <FlipMove>
- { this.state.pages.map(this.renderPage.bind(this)) }
- </FlipMove>
- </>
- )
- }
- return (
- <div
- className="font-medium text-center text-gray-500 mt-44 dark:text-gray-400"
- >
- No data yet
- </div>
- )
- }
-
- render() {
- const { loading } = this.state;
- return (
- <LazyLoader onVisible={this.onVisible} className="flex flex-col flex-grow">
- { loading && <div className="mx-auto loading mt-44"><div></div></div> }
- <FadeIn show={!loading} className="flex-grow">
- { this.renderList() }
- </FadeIn>
- {!loading && <MoreLink site={this.props.site} list={this.state.pages} endpoint="entry-pages" />}
- </LazyLoader>
- )
- }
-}
diff --git a/assets/js/dashboard/stats/pages/exit-pages.js b/assets/js/dashboard/stats/pages/exit-pages.js
deleted file mode 100644
index b7d2e3aafa..0000000000
--- a/assets/js/dashboard/stats/pages/exit-pages.js
+++ /dev/null
@@ -1,123 +0,0 @@
-import React from 'react';
-import { Link } from 'react-router-dom'
-import FlipMove from 'react-flip-move';
-
-import FadeIn from '../../fade-in'
-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'
-
-export default class ExitPages extends React.Component {
- constructor(props) {
- super(props)
- this.state = {loading: true}
- this.onVisible = this.onVisible.bind(this)
- }
-
- componentDidUpdate(prevProps) {
- if (this.props.query !== prevProps.query) {
- this.setState({loading: true, pages: null})
- this.fetchPages()
- }
- }
-
- onVisible() {
- this.fetchPages()
- if (this.props.timer) this.props.timer.onTick(this.fetchPages.bind(this))
- }
-
- showConversionRate() {
- return !!this.props.query.filters.goal
- }
-
- label() {
- if (this.props.query.period === 'realtime') {
- return 'Current visitors'
- }
-
- if (this.showConversionRate()) {
- return 'Conversions'
- }
-
- return 'Unique Exits'
- }
-
- fetchPages() {
- api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/exit-pages`, this.props.query)
- .then((res) => this.setState({loading: false, pages: res}))
- }
-
- renderPage(page) {
- const externalLink = url.externalLinkForPage(this.props.site.domain, page.name)
- const maxWidthDeduction = this.showConversionRate() ? "10rem" : "5rem"
-
- return (
- <div className="flex items-center justify-between my-1 text-sm" key={page.name}>
- <Bar
- count={page.unique_exits}
- all={this.state.pages}
- plot="unique_exits"
- bg="bg-orange-50 dark:bg-gray-500 dark:bg-opacity-15"
- maxWidthDeduction={maxWidthDeduction}
- >
- <span className="flex px-2 py-1.5 group dark:text-gray-300 z-9 relative break-all">
- <Link
- to={url.setQuery('exit_page', page.name)}
- className="md:truncate block hover:underline"
- >
- {page.name}
- </Link>
- <a
- target="_blank"
- rel="noreferrer"
- 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>
- </a>
- </span>
- </Bar>
- <span className="font-medium dark:text-gray-200 w-20 text-right">{numberFormatter(page.unique_exits)}</span>
- {this.showConversionRate() && <span className="font-medium dark:text-gray-200 w-20 text-right">{numberFormatter(page.conversion_rate)}%</span>}
- </div>
- )
- }
-
- renderList() {
- if (this.state.pages && this.state.pages.length > 0) {
- return (
- <>
- <div className="flex items-center justify-between mt-3 mb-2 text-xs font-bold tracking-wide text-gray-500 dark:text-gray-400">
- <span>Page url</span>
- <div className="text-right">
- <span className="inline-block w-20">{this.label()}</span>
- {this.showConversionRate() && <span className="inline-block w-20">CR</span>}
- </div>
- </div>
-
- <FlipMove>
- { this.state.pages.map(this.renderPage.bind(this)) }
- </FlipMove>
- </>
- )
- }
-
- return <div className="font-medium text-center text-gray-500 mt-44 dark:text-gray-400">No data yet</div>
- }
-
- render() {
- const { loading } = this.state;
- return (
- <LazyLoader onVisible={this.onVisible} className="flex flex-col flex-grow">
- { loading && <div className="mx-auto loading mt-44"><div></div></div> }
- <FadeIn show={!loading} className="flex-grow">
- { this.renderList() }
- </FadeIn>
- {!loading && <MoreLink site={this.props.site} list={this.state.pages} endpoint="exit-pages" />}
- </LazyLoader>
- )
- }
-}
diff --git a/assets/js/dashboard/stats/pages/index.js b/assets/js/dashboard/stats/pages/index.js
index ac1ee2cff3..a8c7232c91 100644
--- a/assets/js/dashboard/stats/pages/index.js
+++ b/assets/js/dashboard/stats/pages/index.js
@@ -1,9 +1,79 @@
import React from 'react';
-import * as storage from '../../storage'
-import Visits from './pages'
-import EntryPages from './entry-pages'
-import ExitPages from './exit-pages'
+import * as storage from '../../util/storage'
+import * as url from '../../util/url'
+import * as api from '../../api'
+import ListReport from './../reports/list'
+
+function EntryPages({query, site}) {
+ function fetchData() {
+ return api.get(url.apiPath(site, '/entry-pages'), query, {limit: 9})
+ }
+
+ function externalLinkDest(page) {
+ return url.externalLinkForPage(site.domain, page.name)
+ }
+
+ return (
+ <ListReport
+ fetchData={fetchData}
+ filter={{entry_page: 'entry_page'}}
+ keyLabel="Entry page"
+ valueLabel="Unique Entrances"
+ valueKey="unique_entrances"
+ detailsLink={url.sitePath(site, '/entry-pages')}
+ query={query}
+ externalLinkDest={externalLinkDest}
+ color="bg-orange-50"
+ />
+ )
+}
+
+function ExitPages({query, site}) {
+ function fetchData() {
+ return api.get(url.apiPath(site, '/exit-pages'), query, {limit: 9})
+ }
+
+ function externalLinkDest(page) {
+ return url.externalLinkForPage(site.domain, page.name)
+ }
+
+ return (
+ <ListReport
+ fetchData={fetchData}
+ filter={{exit_page: 'exit_page'}}
+ keyLabel="Exit page"
+ valueLabel="Unique Exits"
+ valueKey="unique_exits"
+ detailsLink={url.sitePath(site, '/exit-pages')}
+ query={query}
+ externalLinkDest={externalLinkDest}
+ color="bg-orange-50"
+ />
+ )
+}
+
+function TopPages({query, site}) {
+ function fetchData() {
+ return api.get(url.apiPath(site, '/pages'), query, {limit: 9})
+ }
+
+ function externalLinkDest(page) {
+ return url.externalLinkForPage(site.domain, page.name)
+ }
+
+ return (
+ <ListReport
+ fetchData={fetchData}
+ filter={{page: 'page'}}
+ keyLabel="Page"
+ detailsLink={url.sitePath(site, '/pages')}
+ query={query}
+ externalLinkDest={externalLinkDest}
+ color="bg-orange-50"
+ />
+ )
+}
const labelFor = {
'pages': 'Top Pages',
@@ -36,7 +106,7 @@ export default class Pages extends React.Component {
return <ExitPages site={this.props.site} query={this.props.query} timer={this.props.timer} />
case "pages":
default:
- return <Visits site={this.props.site} query={this.props.query} timer={this.props.timer} />
+ return <TopPages site={this.props.site} query={this.props.query} timer={this.props.timer} />
}
}
diff --git a/assets/js/dashboard/stats/pages/pages.js b/assets/js/dashboard/stats/pages/pages.js
deleted file mode 100644
index 438dfdd0b3..0000000000
--- a/assets/js/dashboard/stats/pages/pages.js
+++ /dev/null
@@ -1,127 +0,0 @@
-import React from 'react';
-import { Link } from 'react-router-dom'
-import FlipMove from 'react-flip-move';
-
-import FadeIn from '../../fade-in'
-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'
-
-export default class Visits extends React.Component {
- constructor(props) {
- super(props)
- this.state = {loading: true}
- this.onVisible = this.onVisible.bind(this)
- }
-
- componentDidUpdate(prevProps) {
- if (this.props.query !== prevProps.query) {
- this.setState({loading: true, pages: null})
- this.fetchPages()
- }
- }
-
- onVisible() {
- this.fetchPages()
- if (this.props.timer) this.props.timer.onTick(this.fetchPages.bind(this))
- }
-
- showConversionRate() {
- return !!this.props.query.filters.goal
- }
-
- fetchPages() {
- api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/pages`, this.props.query)
- .then((res) => this.setState({loading: false, pages: res}))
- }
-
- label() {
- if (this.props.query.period === 'realtime') {
- return 'Current visitors'
- }
-
- if (this.showConversionRate()) {
- return 'Conversions'
- }
-
- return 'Visitors'
- }
-
- renderPage(page) {
- const externalLink = url.externalLinkForPage(this.props.site.domain, page.name)
- const maxWidthDeduction = this.showConversionRate() ? "10rem" : "5rem"
-
- return (
- <div
- className="flex items-center justify-between my-1 text-sm"
- key={page.name}
- >
- <Bar
- count={page.visitors}
- all={this.state.pages}
- bg="bg-orange-50 dark:bg-gray-500 dark:bg-opacity-15"
- maxWidthDeduction={maxWidthDeduction}
- >
- <span
- className="flex px-2 py-1.5 group dark:text-gray-300 relative z-9 break-all"
- >
- <Link
- to={url.setQuery('page', page.name)}
- className="md:truncate block hover:underline"
- >
- {page.name}
- </Link>
- <a
- target="_blank"
- rel="noreferrer"
- 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>
- </a>
- </span>
- </Bar>
- <span className="font-medium dark:text-gray-200 w-20 text-right">{numberFormatter(page.visitors)}</span>
- {this.showConversionRate() && <span className="font-medium dark:text-gray-200 w-20 text-right">{numberFormatter(page.conversion_rate)}%</span>}
- </div>
- )
- }
-
- renderList() {
- if (this.state.pages && this.state.pages.length > 0) {
- return (
- <>
- <div className="flex items-center justify-between mt-3 mb-2 text-xs font-bold tracking-wide text-gray-500 dark:text-gray-400">
- <span>Page url</span>
- <div className="text-right">
- <span className="inline-block w-20">{ this.label() }</span>
- {this.showConversionRate() && <span className="inline-block w-20">CR</span>}
- </div>
- </div>
-
- <FlipMove>
- { this.state.pages.map(this.renderPage.bind(this)) }
- </FlipMove>
- </>
- )
- }
-
- return <div className="font-medium text-center text-gray-500 mt-44 dark:text-gray-400">No data yet</div>
- }
-
- render() {
- const { loading } = this.state;
- return (
- <LazyLoader onVisible={this.onVisible} className="flex flex-col flex-grow">
- { loading && <div className="mx-auto loading mt-44"><div></div></div> }
- <FadeIn show={!loading} className="flex-grow">
- { this.renderList() }
- </FadeIn>
- {!loading && <MoreLink site={this.props.site} list={this.state.pages} endpoint="pages" />}
- </LazyLoader>
- )
- }
-}
diff --git a/assets/js/dashboard/stats/reports/list.js b/assets/js/dashboard/stats/reports/list.js
index f757231767..c7e1ad0a50 100644
--- a/assets/js/dashboard/stats/reports/list.js
+++ b/assets/js/dashboard/stats/reports/list.js
@@ -3,9 +3,9 @@ import { Link } from 'react-router-dom'
import FadeIn from '../../fade-in'
import MoreLink from '../more-link'
-import numberFormatter from '../../number-formatter'
+import numberFormatter from '../../util/number-formatter'
import Bar from '../bar'
-import LazyLoader from '../../lazy-loader'
+import LazyLoader from '../../components/lazy-loader'
export default class ListReport extends React.Component {
constructor(props) {
@@ -40,13 +40,38 @@ export default class ListReport extends React.Component {
return 'Conversions'
}
- return 'Visitors'
+ return this.valueLabel()
}
showConversionRate() {
return !!this.props.query.filters.goal
}
+ valueKey() {
+ return this.props.valueKey || 'visitors'
+ }
+
+ valueLabel() {
+ return this.props.valueLabel || 'Visitors'
+ }
+
+ renderExternalLink(item) {
+ if (this.props.externalLinkDest) {
+ const dest = this.props.externalLinkDest(item)
+
+ return (
+ <a
+ target="_blank"
+ rel="noreferrer"
+ href={dest}
+ 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>
+ </a>
+ )
+ }
+ }
+
renderListItem(listItem) {
const query = new URLSearchParams(window.location.search)
@@ -60,21 +85,23 @@ export default class ListReport extends React.Component {
return (
<div className="flex items-center justify-between my-1 text-sm" key={listItem.name}>
<Bar
- count={listItem.visitors}
+ count={listItem[this.valueKey()]}
all={this.state.list}
bg={`${lightBackground} dark:bg-gray-500 dark:bg-opacity-15`}
maxWidthDeduction={maxWidthDeduction}
+ plot={this.valueKey()}
>
- <span className="flex px-2 py-1.5 dark:text-gray-300 relative z-9 break-all" tooltip={this.props.tooltipText && this.props.tooltipText(listItem)}>
+ <span className="flex px-2 py-1.5 group dark:text-gray-300 relative z-9 break-all" tooltip={this.props.tooltipText && this.props.tooltipText(listItem)}>
<Link className="md:truncate block hover:underline" to={{search: query.toString()}}>
{this.props.renderIcon && this.props.renderIcon(listItem)}
{this.props.renderIcon && ' '}
{listItem.name}
</Link>
+ { this.renderExternalLink(listItem) }
</span>
</Bar>
<span className="font-medium dark:text-gray-200 w-20 text-right">
- {numberFormatter(listItem.visitors)}
+ {numberFormatter(listItem[this.valueKey()])}
{
listItem.percentage >= 0
? <span className="inline-block w-8 text-xs text-right">({listItem.percentage}%)</span>
@@ -93,7 +120,7 @@ export default class ListReport extends React.Component {
<div className="flex items-center justify-between mt-3 mb-2 text-xs font-bold tracking-wide text-gray-500 dark:text-gray-400">
<span>{ this.props.keyLabel }</span>
<span className="text-right">
- <span className="inline-block w-20">{this.label()}</span>
+ <span className="inline-block w-30">{this.label()}</span>
{this.showConversionRate() && <span className="inline-block w-20">CR</span>}
</span>
</div>
diff --git a/assets/js/dashboard/stats/sources/referrer-list.js b/assets/js/dashboard/stats/sources/referrer-list.js
index f4bc65c846..bf2147a29d 100644
--- a/assets/js/dashboard/stats/sources/referrer-list.js
+++ b/assets/js/dashboard/stats/sources/referrer-list.js
@@ -5,9 +5,9 @@ import FlipMove from 'react-flip-move';
import FadeIn from '../../fade-in'
import Bar from '../bar'
import MoreLink from '../more-link'
-import numberFormatter from '../../number-formatter'
+import numberFormatter from '../../util/number-formatter'
import * as api from '../../api'
-import LazyLoader from '../../lazy-loader'
+import LazyLoader from '../../components/lazy-loader'
function LinkOption(props) {
if (props.disabled) {
diff --git a/assets/js/dashboard/stats/sources/search-terms.js b/assets/js/dashboard/stats/sources/search-terms.js
index 5d5f899549..5ed68300ef 100644
--- a/assets/js/dashboard/stats/sources/search-terms.js
+++ b/assets/js/dashboard/stats/sources/search-terms.js
@@ -2,7 +2,7 @@ import React from 'react';
import FadeIn from '../../fade-in'
import Bar from '../bar'
import MoreLink from '../more-link'
-import numberFormatter from '../../number-formatter'
+import numberFormatter from '../../util/number-formatter'
import RocketIcon from '../modals/rocket-icon'
import * as api from '../../api'
diff --git a/assets/js/dashboard/stats/sources/source-list.js b/assets/js/dashboard/stats/sources/source-list.js
index 9c6f3668b6..c19bf2fa83 100644
--- a/assets/js/dashboard/stats/sources/source-list.js
+++ b/assets/js/dashboard/stats/sources/source-list.js
@@ -2,14 +2,14 @@ import React from 'react';
import { Link } from 'react-router-dom'
import FlipMove from 'react-flip-move';
-import * as storage from '../../storage'
+import * as storage from '../../util/storage'
import FadeIn from '../../fade-in'
import Bar from '../bar'
import MoreLink from '../more-link'
-import numberFormatter from '../../number-formatter'
+import numberFormatter from '../../util/number-formatter'
import * as api from '../../api'
-import * as url from '../../url'
-import LazyLoader from '../../lazy-loader'
+import * as url from '../../util/url'
+import LazyLoader from '../../components/lazy-loader'
class AllSources extends React.Component {
constructor(props) {
diff --git a/assets/js/dashboard/stats/visitor-graph.js b/assets/js/dashboard/stats/visitor-graph.js
index 24090042cb..fda5453592 100644
--- a/assets/js/dashboard/stats/visitor-graph.js
+++ b/assets/js/dashboard/stats/visitor-graph.js
@@ -2,9 +2,9 @@ import React from 'react';
import { withRouter } from 'react-router-dom'
import Chart from 'chart.js/auto';
import { navigateToQuery } from '../query'
-import numberFormatter, {durationFormatter} from '../number-formatter'
+import numberFormatter, {durationFormatter} from '../util/number-formatter'
import * as api from '../api'
-import LazyLoader from '../lazy-loader'
+import LazyLoader from '../components/lazy-loader'
function buildDataSet(plot, present_index, ctx, label) {
var gradient = ctx.createLinearGradient(0, 0, 0, 300);
diff --git a/assets/js/dashboard/date.js b/assets/js/dashboard/util/date.js
similarity index 100%
rename from assets/js/dashboard/date.js
rename to assets/js/dashboard/util/date.js
diff --git a/assets/js/dashboard/number-formatter.js b/assets/js/dashboard/util/number-formatter.js
similarity index 100%
rename from assets/js/dashboard/number-formatter.js
rename to assets/js/dashboard/util/number-formatter.js
diff --git a/assets/js/dashboard/storage.js b/assets/js/dashboard/util/storage.js
similarity index 100%
rename from assets/js/dashboard/storage.js
rename to assets/js/dashboard/util/storage.js
diff --git a/assets/js/dashboard/url.js b/assets/js/dashboard/util/url.js
similarity index 100%
rename from assets/js/dashboard/url.js
rename to assets/js/dashboard/util/url.js