Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Refactored query parameters.
Mike Cao89781d484731
diff --git a/components/metrics/EventsTable.js b/components/metrics/EventsTable.jsindex ace390100..6986388e9 100644--- a/components/metrics/EventsTable.js+++ b/components/metrics/EventsTable.js@@ -1,6 +1,5 @@import { defineMessages, useIntl } from 'react-intl';import MetricsTable from './MetricsTable';-import { eventTypeFilter } from 'lib/filters';const messages = defineMessages({events: { id: 'metrics.events', defaultMessage: 'Events' },@@ -21,7 +20,6 @@ export default function EventsTable({ websiteId, ...props }) {type="event"metric={formatMessage(messages.actions)}websiteId={websiteId}- dataFilter={eventTypeFilter}onDataLoad={handleDataLoad}/>);diff --git a/components/metrics/MetricsTable.js b/components/metrics/MetricsTable.jsindex df4beb085..90171ff82 100644--- a/components/metrics/MetricsTable.js+++ b/components/metrics/MetricsTable.js@@ -54,9 +54,12 @@ export default function MetricsTable({const filteredData = useMemo(() => {if (data) {- const items = percentFilter(dataFilter ? dataFilter(data, filterOptions) : data);+ let items = percentFilter(dataFilter ? dataFilter(data, filterOptions) : data);if (limit) {- return items.filter((e, i) => i < limit).sort(firstBy('y', -1).thenBy('x'));+ items = items.filter((e, i) => i < limit);+ }+ if (filterOptions?.sort === false) {+ return items;}return items.sort(firstBy('y', -1).thenBy('x'));}diff --git a/components/metrics/QueryParametersTable.js b/components/metrics/QueryParametersTable.jsnew file mode 100644index 000000000..2d92ad925--- /dev/null+++ b/components/metrics/QueryParametersTable.js@@ -0,0 +1,56 @@+import { useState } from 'react';+import { useIntl, defineMessages } from 'react-intl';+import MetricsTable from './MetricsTable';+import Tag from 'components/common/Tag';+import { paramFilter } from 'lib/filters';+import { safeDecodeURI } from 'lib/url';+import FilterButtons from '../common/FilterButtons';++const FILTER_COMBINED = 0;+const FILTER_RAW = 1;++const messages = defineMessages({+ combined: { id: 'metrics.filter.combined', defaultMessage: 'Combined' },+ raw: { id: 'metrics.filter.raw', defaultMessage: 'Raw' },+ views: { id: 'metrics.views', defaultMessage: 'Views' },+ none: { id: 'label.none', defaultMessage: 'None' },+ query: { id: 'metrics.query-parameters', defaultMessage: 'Query parameters' },+});++export default function QueryParametersTable({ websiteId, showFilters, ...props }) {+ const [filter, setFilter] = useState(FILTER_COMBINED);+ const { formatMessage } = useIntl();++ const buttons = [+ {+ label: formatMessage(messages.combined),+ value: FILTER_COMBINED,+ },+ { label: formatMessage(messages.raw), value: FILTER_RAW },+ ];++ return (+ <>+ {showFilters && <FilterButtons buttons={buttons} selected={filter} onClick={setFilter} />}+ <MetricsTable+ {...props}+ title={formatMessage(messages.query)}+ type="query"+ metric={formatMessage(messages.views)}+ websiteId={websiteId}+ dataFilter={filter !== FILTER_RAW ? paramFilter : null}+ renderLabel={({ x, p, v }) =>+ filter === FILTER_RAW ? (+ x+ ) : (+ <>+ <Tag>{safeDecodeURI(p)}</Tag>+ {safeDecodeURI(v)}+ </>+ )+ }+ delay={0}+ />+ </>+ );+}diff --git a/components/metrics/RealtimeLog.js b/components/metrics/RealtimeLog.jsindex 278f64a4e..b6d3dad7b 100644--- a/components/metrics/RealtimeLog.js+++ b/components/metrics/RealtimeLog.js@@ -3,7 +3,6 @@ import { FormattedMessage, useIntl } from 'react-intl';import { FixedSizeList } from 'react-window';import firstBy from 'thenby';import Icon from 'components/common/Icon';-import Tag from 'components/common/Tag';import Dot from 'components/common/Dot';import FilterButtons from 'components/common/FilterButtons';import NoData from 'components/common/NoData';@@ -103,11 +102,7 @@ export default function RealtimeLog({ data, websites, websiteId }) {website_id,}) {if (event_name) {- return (- <div>- <Tag>{event_name}</Tag>- </div>- );+ return <div>{event_name}</div>;}if (view_id) {const domain = getWebsite({ website_id })?.domain;diff --git a/components/metrics/ReferrersTable.js b/components/metrics/ReferrersTable.jsindex e41fe53b9..f611626d9 100644--- a/components/metrics/ReferrersTable.js+++ b/components/metrics/ReferrersTable.js@@ -5,8 +5,8 @@ import FilterButtons from 'components/common/FilterButtons';import FilterLink from 'components/common/FilterLink';import { refFilter } from 'lib/filters';-export const FILTER_COMBINED = 0;-export const FILTER_RAW = 1;+const FILTER_COMBINED = 0;+const FILTER_RAW = 1;const messages = defineMessages({combined: { id: 'metrics.filter.combined', defaultMessage: 'Combined' },diff --git a/components/metrics/ScreenTable.js b/components/metrics/ScreenTable.jsindex 5ad3b43aa..fcaf88240 100644--- a/components/metrics/ScreenTable.js+++ b/components/metrics/ScreenTable.js@@ -6,7 +6,7 @@ export default function ScreenTable({ websiteId, ...props }) {return (<MetricsTable{...props}- title={<FormattedMessage id="metrics.screens" defaultMessage="Screen" />}+ title={<FormattedMessage id="metrics.screens" defaultMessage="Screens" />}type="screen"metric={<FormattedMessage id="metrics.visitors" defaultMessage="Visitors" />}websiteId={websiteId}diff --git a/components/metrics/UTMTable.js b/components/metrics/UTMTable.jsdeleted file mode 100644index ba16f2f6b..000000000--- a/components/metrics/UTMTable.js+++ /dev/null@@ -1,47 +0,0 @@-import React, { useState } from 'react';-import { useIntl, defineMessages } from 'react-intl';-import MetricsTable from './MetricsTable';-import FilterButtons from 'components/common/FilterButtons';--export const UTM_SOURCE = 'utm_source';-export const UTM_MEDIUM = 'utm_medium';-export const UTM_CAMPAIGN = 'utm_campaign';-export const UTM_CONTENT = 'utm_content';-export const UTM_TERM = 'utm_term';--const messages = defineMessages({- utm_source: { id: 'metrics.utm_source', defaultMessage: 'UTM Source' },- utm_medium: { id: 'metrics.utm_medium', defaultMessage: 'UTM Medium' },- utm_campaign: { id: 'metrics.utm_campaign', defaultMessage: 'UTM Campaign' },- utm_content: { id: 'metrics.utm_content', defaultMessage: 'UTM Content' },- utm_term: { id: 'metrics.utm_term', defaultMessage: 'UTM Term' },- views: { id: 'metrics.views', defaultMessage: 'Views' },- none: { id: 'label.none', defaultMessage: 'None' },-});--export default function UTMTable({ websiteId, showFilters, ...props }) {- const [type, setType] = useState(UTM_SOURCE);- const { formatMessage } = useIntl();-- const buttons = [- { label: formatMessage(messages.utm_source), value: UTM_SOURCE },- { label: formatMessage(messages.utm_medium), value: UTM_MEDIUM },- { label: formatMessage(messages.utm_campaign), value: UTM_CAMPAIGN },- { label: formatMessage(messages.utm_content), value: UTM_CONTENT },- { label: formatMessage(messages.utm_term), value: UTM_TERM },- ];-- return (- <>- {showFilters && <FilterButtons buttons={buttons} selected={type} onClick={setType} />}- <MetricsTable- {...props}- title={formatMessage(messages[type])}- type={type}- metric={formatMessage(messages.views)}- websiteId={websiteId}- delay={0}- />- </>- );-}diff --git a/components/pages/WebsiteDetails.js b/components/pages/WebsiteDetails.jsindex d8720dc18..78c5f7520 100644--- a/components/pages/WebsiteDetails.js+++ b/components/pages/WebsiteDetails.js@@ -19,23 +19,23 @@ import LanguagesTable from 'components/metrics/LanguagesTable';import EventsTable from 'components/metrics/EventsTable';import EventsChart from 'components/metrics/EventsChart';import ScreenTable from 'components/metrics/ScreenTable';-import UTMTable from 'components/metrics/UTMTable';+import QueryParametersTable from 'components/metrics/QueryParametersTable';import useFetch from 'hooks/useFetch';import usePageQuery from 'hooks/usePageQuery';import { DEFAULT_ANIMATION_DURATION } from 'lib/constants';import styles from './WebsiteDetails.module.css';const messages = defineMessages({- pages: { id: 'pages', defaultMessage: 'Pages' },+ pages: { id: 'metrics.pages', defaultMessage: 'Pages' },referrers: { id: 'metrics.referrers', defaultMessage: 'Referrers' },screens: { id: 'metrics.screens', defaultMessage: 'Screens' },browsers: { id: 'metrics.browsers', defaultMessage: 'Browsers' },- os: { id: 'metrics.os', defaultMessage: 'Operating system' },- devices: { id: 'metrics.device', defaultMessage: 'Devices' },- countries: { id: 'metrics.screens', defaultMessage: 'Screens' },+ os: { id: 'metrics.operating-systems', defaultMessage: 'Operating system' },+ devices: { id: 'metrics.devices', defaultMessage: 'Devices' },+ countries: { id: 'metrics.countries', defaultMessage: 'Countries' },languages: { id: 'metrics.languages', defaultMessage: 'Languages' },- events: { id: 'metrics.screens', defaultMessage: 'Screens' },- utm: { id: 'metrics.utm', defaultMessage: 'UTM' },+ events: { id: 'metrics.events', defaultMessage: 'Events' },+ query: { id: 'metrics.query-parameters', defaultMessage: 'Query parameters' },});const views = {@@ -48,7 +48,7 @@ const views = {country: CountriesTable,language: LanguagesTable,event: EventsTable,- utm: UTMTable,+ query: QueryParametersTable,};export default function WebsiteDetails({ websiteId }) {@@ -82,10 +82,6 @@ export default function WebsiteDetails({ websiteId }) {label: formatMessage(messages.referrers),value: resolve({ view: 'referrer' }),},- {- label: formatMessage(messages.screens),- value: resolve({ view: 'screen' }),- },{label: formatMessage(messages.browsers),value: resolve({ view: 'browser' }),@@ -106,13 +102,17 @@ export default function WebsiteDetails({ websiteId }) {label: formatMessage(messages.languages),value: resolve({ view: 'language' }),},+ {+ label: formatMessage(messages.screens),+ value: resolve({ view: 'screen' }),+ },{label: formatMessage(messages.events),value: resolve({ view: 'event' }),},{- label: formatMessage(messages.utm),- value: resolve({ view: 'utm' }),+ label: formatMessage(messages.query),+ value: resolve({ view: 'query' }),},];diff --git a/lang/ar-SA.json b/lang/ar-SA.jsonindex a970e5e1f..a0014f52a 100644--- a/lang/ar-SA.json+++ b/lang/ar-SA.json@@ -4,7 +4,6 @@"label.add-website": "إضافة موقع","label.administrator": "مدير عام؟","label.all": "الكل",- "label.all-events": "كافة الأحداث","label.all-time": "All time","label.all-websites": "كافة المواقع","label.back": "للخلف",@@ -104,15 +103,10 @@"metrics.operating-systems": "نظام التشغيل","metrics.page-views": "مشاهدات الصفحة","metrics.pages": "الصفحات",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "التحويلات","metrics.screens": "Screens","metrics.unique-visitors": "زائرون فريدون",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "مشاهدات","metrics.visitors": "زوار"}diff --git a/lang/bn-BD.json b/lang/bn-BD.jsonindex 98199a040..823095cb9 100644--- a/lang/bn-BD.json+++ b/lang/bn-BD.json@@ -4,7 +4,6 @@"label.add-website": "ওয়েবসাইট যুক্ত করুন","label.administrator": "অ্যাডমিন","label.all": "সবগুলো",- "label.all-events": "সবগুলো ঘটনা","label.all-time": "সব সময়","label.all-websites": "সবগুলো ওয়েবসাইট","label.back": "পেছনে",@@ -104,15 +103,10 @@"metrics.operating-systems": "অপারেটিং সিস্টেম গুলো","metrics.page-views": "পৃষ্ঠা পরিদর্শন গুলো","metrics.pages": "পৃষ্ঠাগুলি",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "রেফারার্স","metrics.screens": "স্ক্রিনগুলি","metrics.unique-visitors": "অনন্য ভিজিটর",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM প্রচার",- "metrics.utm_content": "UTM সামগ্রী",- "metrics.utm_medium": "UTM মিডিয়াম",- "metrics.utm_source": "UTM উৎস",- "metrics.utm_term": "UTM শব্দ","metrics.views": "ভিউস","metrics.visitors": "পরিদর্শনার্থী"}diff --git a/lang/ca-ES.json b/lang/ca-ES.jsonindex db83685b4..8ab41de3f 100644--- a/lang/ca-ES.json+++ b/lang/ca-ES.json@@ -4,7 +4,6 @@"label.add-website": "Afegeix lloc web","label.administrator": "Administrador","label.all": "Tots",- "label.all-events": "Tots els esdeveniments","label.all-time": "Sempre","label.all-websites": "Tots els llocs web","label.back": "Enrere",@@ -104,15 +103,10 @@"metrics.operating-systems": "Sistemes operatius","metrics.page-views": "Pàgines vistes","metrics.pages": "Pàgines",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "Referents","metrics.screens": "Screens","metrics.unique-visitors": "Visitants únics",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "Vistes","metrics.visitors": "Visitants"}diff --git a/lang/cs-CZ.json b/lang/cs-CZ.jsonindex 345d25b6f..2b4b1bd11 100644--- a/lang/cs-CZ.json+++ b/lang/cs-CZ.json@@ -4,7 +4,6 @@"label.add-website": "Přidat web","label.administrator": "Administrátor","label.all": "Vše",- "label.all-events": "All events","label.all-time": "All time","label.all-websites": "Všechny weby","label.back": "Zpět",@@ -104,15 +103,10 @@"metrics.operating-systems": "Operační systém","metrics.page-views": "Zobrazení stránek","metrics.pages": "Stránky",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "Odkazy","metrics.screens": "Screens","metrics.unique-visitors": "Jedinečné návštěvy",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "Zobrazení","metrics.visitors": "Návštěvy"}diff --git a/lang/da-DK.json b/lang/da-DK.jsonindex 75507b0be..90ef2c272 100644--- a/lang/da-DK.json+++ b/lang/da-DK.json@@ -4,7 +4,6 @@"label.add-website": "Tilføj hjemmeside","label.administrator": "Administrator","label.all": "Alle",- "label.all-events": "Alle hændelser","label.all-time": "Altid","label.all-websites": "Alle hjemmesider","label.back": "Tilbage",@@ -104,15 +103,10 @@"metrics.operating-systems": "Operativsystemer","metrics.page-views": "Sidevisninger","metrics.pages": "Sider",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "Henvisninger","metrics.screens": "Screens","metrics.unique-visitors": "Unikke besøgende",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "Visninger","metrics.visitors": "Besøgende"}diff --git a/lang/de-DE.json b/lang/de-DE.jsonindex 90b7d6a7a..d03464179 100644--- a/lang/de-DE.json+++ b/lang/de-DE.json@@ -4,7 +4,6 @@"label.add-website": "Webseite hinzufügen","label.administrator": "Administrator","label.all": "Alle",- "label.all-events": "Alle Ereignisse","label.all-time": "Gesamter Zeitraum","label.all-websites": "Alle Webseiten","label.back": "Zurück",@@ -104,15 +103,10 @@"metrics.operating-systems": "Betriebssysteme","metrics.page-views": "Seitenaufrufe","metrics.pages": "Seiten",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "Referrer","metrics.screens": "Bildschirmauflösungen","metrics.unique-visitors": "Eindeutige Besucher",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Kampagne",- "metrics.utm_content": "UTM Inhalt",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Quelle",- "metrics.utm_term": "UTM Begriff","metrics.views": "Aufrufe","metrics.visitors": "Besucher"}diff --git a/lang/el-GR.json b/lang/el-GR.jsonindex 6719a215d..bf5e9e4ab 100644--- a/lang/el-GR.json+++ b/lang/el-GR.json@@ -4,7 +4,6 @@"label.add-website": "Προσθήκη ιστότοπου","label.administrator": "Διαχειριστής","label.all": "All",- "label.all-events": "All events","label.all-time": "All time","label.all-websites": "All websites","label.back": "Πίσω",@@ -104,15 +103,10 @@"metrics.operating-systems": "Λειτουργικά συστήματα","metrics.page-views": "Προβολές σελίδας","metrics.pages": "Σελίδες",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "Παραπομπές","metrics.screens": "Screens","metrics.unique-visitors": "Μοναδικοί επισκέπτες",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "Προβολές","metrics.visitors": "Επισκέπτες"}diff --git a/lang/en-GB.json b/lang/en-GB.jsonindex aede59bdc..bc253a60a 100644--- a/lang/en-GB.json+++ b/lang/en-GB.json@@ -4,7 +4,6 @@"label.add-website": "Add website","label.administrator": "Administrator","label.all": "All",- "label.all-events": "All events","label.all-time": "All time","label.all-websites": "All websites","label.back": "Back",@@ -104,15 +103,10 @@"metrics.operating-systems": "Operating systems","metrics.page-views": "Page views","metrics.pages": "Pages",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "Referrers","metrics.screens": "Screens","metrics.unique-visitors": "Unique visitors",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "Views","metrics.visitors": "Visitors"}diff --git a/lang/en-US.json b/lang/en-US.jsonindex aede59bdc..bc253a60a 100644--- a/lang/en-US.json+++ b/lang/en-US.json@@ -4,7 +4,6 @@"label.add-website": "Add website","label.administrator": "Administrator","label.all": "All",- "label.all-events": "All events","label.all-time": "All time","label.all-websites": "All websites","label.back": "Back",@@ -104,15 +103,10 @@"metrics.operating-systems": "Operating systems","metrics.page-views": "Page views","metrics.pages": "Pages",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "Referrers","metrics.screens": "Screens","metrics.unique-visitors": "Unique visitors",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "Views","metrics.visitors": "Visitors"}diff --git a/lang/es-MX.json b/lang/es-MX.jsonindex a8babd663..e9b02c1d0 100644--- a/lang/es-MX.json+++ b/lang/es-MX.json@@ -4,7 +4,6 @@"label.add-website": "Agregar sitio","label.administrator": "Administrador","label.all": "Todos",- "label.all-events": "Todos los eventos","label.all-time": "Todos los tiempos","label.all-websites": "Todos los sitios","label.back": "Atrás",@@ -104,15 +103,10 @@"metrics.operating-systems": "Sistemas operativos","metrics.page-views": "Vistas","metrics.pages": "Páginas",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "Referentes","metrics.screens": "Screens","metrics.unique-visitors": "Visitantes únicos",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "Vistas","metrics.visitors": "Visitantes"}diff --git a/lang/fa-IR.json b/lang/fa-IR.jsonindex e6c6eb36d..40121d453 100644--- a/lang/fa-IR.json+++ b/lang/fa-IR.json@@ -4,7 +4,6 @@"label.add-website": "افزودن وبسایت","label.administrator": "مدیر","label.all": "همه",- "label.all-events": "همهی رویدادها","label.all-time": "همه زمان","label.all-websites": "همهی وبسایتها","label.back": "برگشت",@@ -104,15 +103,10 @@"metrics.operating-systems": "سیستمعاملها","metrics.page-views": "بازدید صفحه","metrics.pages": "صفحهها",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "ارجاع دهندگان","metrics.screens": "Screens","metrics.unique-visitors": "بازدیدکنندههای یکتا",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "بازدید","metrics.visitors": "بازدیدکننده"}diff --git a/lang/fi-FI.json b/lang/fi-FI.jsonindex 4d987fe53..886ae3cdb 100644--- a/lang/fi-FI.json+++ b/lang/fi-FI.json@@ -4,7 +4,6 @@"label.add-website": "Lisää verkkosivu","label.administrator": "Järjestelmänvalvoja","label.all": "Kaikki",- "label.all-events": "Kaikki tapahtumat","label.all-time": "Alusta lähtien","label.all-websites": "Kaikki verkkosivut","label.back": "Takaisin",@@ -104,15 +103,10 @@"metrics.operating-systems": "Käyttöjärjestelmät","metrics.page-views": "Sivun näyttökerrat","metrics.pages": "Sivut",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "Viittaajat","metrics.screens": "Screens","metrics.unique-visitors": "Yksittäiset kävijät",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "Näyttökerrat","metrics.visitors": "Vierailijat"}diff --git a/lang/fo-FO.json b/lang/fo-FO.jsonindex 040b0c563..08763ce90 100644--- a/lang/fo-FO.json+++ b/lang/fo-FO.json@@ -4,7 +4,6 @@"label.add-website": "Legg heimasíðu afturat","label.administrator": "Fyrisitari","label.all": "Alt",- "label.all-events": "All events","label.all-time": "All time","label.all-websites": "Allar heimasíður","label.back": "Aftur",@@ -104,15 +103,10 @@"metrics.operating-systems": "Stýrikervir","metrics.page-views": "Opnaðar síðir","metrics.pages": "Síðir",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "Framsendingar","metrics.screens": "Screens","metrics.unique-visitors": "Einsýna vitjanir",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "Sýningar","metrics.visitors": "Vitjandi"}diff --git a/lang/fr-FR.json b/lang/fr-FR.jsonindex b35a2c90e..72ca575ed 100644--- a/lang/fr-FR.json+++ b/lang/fr-FR.json@@ -4,7 +4,6 @@"label.add-website": "Ajouter un site","label.administrator": "Administrateur","label.all": "Tout",- "label.all-events": "Tous les événements","label.all-time": "Toutes les données","label.all-websites": "Tous les sites web","label.back": "Retour",@@ -104,15 +103,10 @@"metrics.operating-systems": "Systèmes d'exploitation","metrics.page-views": "Pages vues","metrics.pages": "Pages",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "Sources","metrics.screens": "Tailles d'écran","metrics.unique-visitors": "Visiteurs uniques",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "Vues","metrics.visitors": "Visiteurs"}diff --git a/lang/ga-ES.json b/lang/ga-ES.jsonindex bb54572f2..0ed607e0a 100644--- a/lang/ga-ES.json+++ b/lang/ga-ES.json@@ -4,7 +4,6 @@"label.add-website": "Engadir sitio web","label.administrator": "Administradora","label.all": "Todo",- "label.all-events": "Tódolos eventos","label.all-time": "Sempre","label.all-websites": "Tódolos sitios web","label.back": "Atrás",@@ -104,15 +103,10 @@"metrics.operating-systems": "Sistemas operativos","metrics.page-views": "Vistas de páxinas","metrics.pages": "Páxinas",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "Orixes","metrics.screens": "Screens","metrics.unique-visitors": "Visitas únicas",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "Visualizacións","metrics.visitors": "Visitantes"}diff --git a/lang/he-IL.json b/lang/he-IL.jsonindex 64f3880ba..6cde97683 100644--- a/lang/he-IL.json+++ b/lang/he-IL.json@@ -4,7 +4,6 @@"label.add-website": "הוספת אתר","label.administrator": "מנהל","label.all": "הכל",- "label.all-events": "All events","label.all-time": "All time","label.all-websites": "כל האתרים","label.back": "חזרה",@@ -104,15 +103,10 @@"metrics.operating-systems": "מערכות הפעלה","metrics.page-views": "צפיות בדפים","metrics.pages": "דפים",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "מפנים","metrics.screens": "Screens","metrics.unique-visitors": "מבקרים ייחודיים",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "צפיות","metrics.visitors": "מבקרים"}diff --git a/lang/hi-IN.json b/lang/hi-IN.jsonindex b9837c9b4..608f3fb40 100644--- a/lang/hi-IN.json+++ b/lang/hi-IN.json@@ -4,7 +4,6 @@"label.add-website": "वेबसाइट","label.administrator": "प्रशासक","label.all": "सब",- "label.all-events": "All events","label.all-time": "All time","label.all-websites": "सभी वेबसाइटें","label.back": "पीछे",@@ -104,15 +103,10 @@"metrics.operating-systems": "ऑपरेटिंग सिस्टम","metrics.page-views": "पृष्ठ दृश्य","metrics.pages": "पृष्ठों",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "सन्दर्भदाता","metrics.screens": "Screens","metrics.unique-visitors": "अद्वितीय आगंतुकों",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "दृश्य","metrics.visitors": "आगंतुकों"}diff --git a/lang/hu-HU.json b/lang/hu-HU.jsonindex 1a0b376d1..6f5283735 100644--- a/lang/hu-HU.json+++ b/lang/hu-HU.json@@ -4,7 +4,6 @@"label.add-website": "Weboldal hozzáadása","label.administrator": "Adminisztrátor","label.all": "Összes",- "label.all-events": "Összes esemény","label.all-time": "All time","label.all-websites": "Összes weboldal","label.back": "Vissza",@@ -104,15 +103,10 @@"metrics.operating-systems": "Operációs rendszerek","metrics.page-views": "Oldalmegtekintések","metrics.pages": "Oldalak",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "Hivatkozók","metrics.screens": "Screens","metrics.unique-visitors": "Egyedi látogatók",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "Megtekintések","metrics.visitors": "Látogatók"}diff --git a/lang/id-ID.json b/lang/id-ID.jsonindex 3a47dacb7..1072c113d 100644--- a/lang/id-ID.json+++ b/lang/id-ID.json@@ -4,7 +4,6 @@"label.add-website": "Tambah situs web","label.administrator": "Pengelola","label.all": "Semua",- "label.all-events": "Semua peristiwa","label.all-time": "Semua waktu","label.all-websites": "Semua website","label.back": "Kembali",@@ -104,15 +103,10 @@"metrics.operating-systems": "Sistem Operasi","metrics.page-views": "Tampilan halaman","metrics.pages": "Halaman",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "Perujuk","metrics.screens": "Layar","metrics.unique-visitors": "Pengunjung unik",- "metrics.utm": "UTM",- "metrics.utm_campaign": "Kampanye UTM",- "metrics.utm_content": "Konten UTM",- "metrics.utm_medium": "Media UTM",- "metrics.utm_source": "Sumber UTM",- "metrics.utm_term": "Tampilan UTM","metrics.views": "Tampilan","metrics.visitors": "Pengunjung"}diff --git a/lang/it-IT.json b/lang/it-IT.jsonindex dbc9f8366..4069bb9c4 100644--- a/lang/it-IT.json+++ b/lang/it-IT.json@@ -4,7 +4,6 @@"label.add-website": "Aggiungi sito","label.administrator": "Amministratore","label.all": "Tutto",- "label.all-events": "Tutti gli eventi","label.all-time": "Sempre","label.all-websites": "Tutti i siti web","label.back": "Indietro",@@ -104,15 +103,10 @@"metrics.operating-systems": "Sistemi operativi","metrics.page-views": "Visualizzazioni di pagina","metrics.pages": "Pagine",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "Referrers","metrics.screens": "Screens","metrics.unique-visitors": "Visitatori unici",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "Visualizzazioni","metrics.visitors": "Visitatori"}diff --git a/lang/ja-JP.json b/lang/ja-JP.jsonindex 8aa072535..85366e426 100644--- a/lang/ja-JP.json+++ b/lang/ja-JP.json@@ -4,7 +4,6 @@"label.add-website": "Webサイトの追加","label.administrator": "管理者","label.all": "すべて表示",- "label.all-events": "All events","label.all-time": "All time","label.all-websites": "すべてのWebサイト","label.back": "戻る",@@ -104,15 +103,10 @@"metrics.operating-systems": "OS","metrics.page-views": "閲覧数","metrics.pages": "ページ",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "リファラー","metrics.screens": "Screens","metrics.unique-visitors": "ユニーク訪問者数",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "閲覧数","metrics.visitors": "訪問者数"}diff --git a/lang/ko-KR.json b/lang/ko-KR.jsonindex 2ee113356..8631acef1 100644--- a/lang/ko-KR.json+++ b/lang/ko-KR.json@@ -4,7 +4,6 @@"label.add-website": "웹사이트 추가","label.administrator": "관리자","label.all": "전체",- "label.all-events": "모든 이벤트","label.all-time": "All time","label.all-websites": "모든 웹사이트","label.back": "뒤로",@@ -104,15 +103,10 @@"metrics.operating-systems": "운영체제","metrics.page-views": "페이지 뷰(PV)","metrics.pages": "페이지",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "리퍼러","metrics.screens": "Screens","metrics.unique-visitors": "순방문자(UV)",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "조회수","metrics.visitors": "방문객"}diff --git a/lang/lt-LT.json b/lang/lt-LT.jsonindex 69e708944..3b804fa2e 100644--- a/lang/lt-LT.json+++ b/lang/lt-LT.json@@ -4,7 +4,6 @@"label.add-website": "Pridėti svetainę","label.administrator": "Administratorius","label.all": "Visi",- "label.all-events": "Visi įvykiai","label.all-time": "Visas laikotarpis","label.all-websites": "Visos svetainės","label.back": "Atgal",@@ -104,15 +103,10 @@"metrics.operating-systems": "Operacinės sistemos","metrics.page-views": "Puslapių peržiūros","metrics.pages": "Puslapiai",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "Referrers","metrics.screens": "Screens","metrics.unique-visitors": "Unikalūs lankytojai",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "Peržiūros","metrics.visitors": "Lankytojai"}diff --git a/lang/mn-MN.json b/lang/mn-MN.jsonindex 5a88db57a..52af8fb53 100644--- a/lang/mn-MN.json+++ b/lang/mn-MN.json@@ -4,7 +4,6 @@"label.add-website": "Веб нэмэх","label.administrator": "Админ","label.all": "Бүх",- "label.all-events": "Бүх үйл явдал","label.all-time": "Бүх цаг үеийн","label.all-websites": "Бүх вебүүд","label.back": "Буцах",@@ -104,15 +103,10 @@"metrics.operating-systems": "Үйлдлийн систем","metrics.page-views": "Хуудас үзсэн","metrics.pages": "Хуудас",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "Чиглүүлэгч","metrics.screens": "Screens","metrics.unique-visitors": "Зочин",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "Үзсэн","metrics.visitors": "Зочин"}diff --git a/lang/ms-MY.json b/lang/ms-MY.jsonindex 36776d234..c94e0c69f 100644--- a/lang/ms-MY.json+++ b/lang/ms-MY.json@@ -4,7 +4,6 @@"label.add-website": "Tambah laman web","label.administrator": "Pentadbir","label.all": "Semua",- "label.all-events": "Semua peristiwa","label.all-time": "All time","label.all-websites": "Semua laman web","label.back": "Kembali",@@ -104,15 +103,10 @@"metrics.operating-systems": "Sistem operasi","metrics.page-views": "Paparan halaman","metrics.pages": "Halaman",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "Perujuk","metrics.screens": "Screens","metrics.unique-visitors": "Pelawat unik",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "Lawatan","metrics.visitors": "Pelawat"}diff --git a/lang/nb-NO.json b/lang/nb-NO.jsonindex 346859c3f..0627491e5 100644--- a/lang/nb-NO.json+++ b/lang/nb-NO.json@@ -4,7 +4,6 @@"label.add-website": "Legg til nettsted","label.administrator": "Administrator","label.all": "Alle",- "label.all-events": "Alle hendelser","label.all-time": "Noensinne","label.all-websites": "Alle nettsteder","label.back": "Tilbake",@@ -104,15 +103,10 @@"metrics.operating-systems": "Operativsystemer","metrics.page-views": "Sidevisninger","metrics.pages": "Sider",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "Referanser","metrics.screens": "Screens","metrics.unique-visitors": "Unike besøkende",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "Visninger","metrics.visitors": "Besøkende"}diff --git a/lang/nl-NL.json b/lang/nl-NL.jsonindex 27cc1bec2..4c11f4e1a 100644--- a/lang/nl-NL.json+++ b/lang/nl-NL.json@@ -4,7 +4,6 @@"label.add-website": "Website toevoegen","label.administrator": "Administrator","label.all": "Alles",- "label.all-events": "Alle gebeurtenissen","label.all-time": "Onbeperkt","label.all-websites": "Alle websites","label.back": "Terug",@@ -104,15 +103,10 @@"metrics.operating-systems": "Besturingssystemen","metrics.page-views": "Paginaweergaven","metrics.pages": "Pagina's",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "Verwijzers","metrics.screens": "Schermen","metrics.unique-visitors": "Unieke bezoekers",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "Weergaven","metrics.visitors": "Bezoekers"}diff --git a/lang/pl-PL.json b/lang/pl-PL.jsonindex e80609f0a..00dc97536 100644--- a/lang/pl-PL.json+++ b/lang/pl-PL.json@@ -4,7 +4,6 @@"label.add-website": "Dodaj witrynę","label.administrator": "Administrator","label.all": "Wszystkie",- "label.all-events": "Wszystkie wydarzenia","label.all-time": "Cały czas","label.all-websites": "Wszystkie witryny","label.back": "Powrót",@@ -104,15 +103,10 @@"metrics.operating-systems": "System operacyjny","metrics.page-views": "Wyświetlenia strony","metrics.pages": "Strony",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "Źródła odsyłające","metrics.screens": "Ekrany","metrics.unique-visitors": "Unikalni odwiedzający",- "metrics.utm": "Kampanie UTM",- "metrics.utm_campaign": "Kampania",- "metrics.utm_content": "Treść",- "metrics.utm_medium": "Medium",- "metrics.utm_source": "Źródło",- "metrics.utm_term": "Słowa kluczowe","metrics.views": "Wyświetlenia","metrics.visitors": "Odwiedzający"}diff --git a/lang/pt-BR.json b/lang/pt-BR.jsonindex bb3a7e57b..4d080115e 100644--- a/lang/pt-BR.json+++ b/lang/pt-BR.json@@ -4,7 +4,6 @@"label.add-website": "Adicionar site","label.administrator": "Administrador","label.all": "Todos",- "label.all-events": "Todos os eventos","label.all-time": "Todo o período","label.all-websites": "Todos os sites","label.back": "Voltar",@@ -104,15 +103,10 @@"metrics.operating-systems": "Sistemas operacionais","metrics.page-views": "Visualizações de página","metrics.pages": "Páginas",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "Referências","metrics.screens": "Screens","metrics.unique-visitors": "Visitantes únicos",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "Visualizações","metrics.visitors": "Visitantes"}diff --git a/lang/pt-PT.json b/lang/pt-PT.jsonindex 33dd3060c..cf3d9aa7a 100644--- a/lang/pt-PT.json+++ b/lang/pt-PT.json@@ -4,7 +4,6 @@"label.add-website": "Adicionar website","label.administrator": "Administrador","label.all": "Todos",- "label.all-events": "Todos os eventos","label.all-time": "Todo o tempo","label.all-websites": "Todos os websites","label.back": "Voltar",@@ -104,15 +103,10 @@"metrics.operating-systems": "Sistemas operativos","metrics.page-views": "Visualizações da página","metrics.pages": "Páginas",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "Referenciadores","metrics.screens": "Screens","metrics.unique-visitors": "Visitantes únicos",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "Visualizações","metrics.visitors": "Visitantes"}diff --git a/lang/ro-RO.json b/lang/ro-RO.jsonindex 7d2179b90..9d594eb19 100644--- a/lang/ro-RO.json+++ b/lang/ro-RO.json@@ -4,7 +4,6 @@"label.add-website": "Adăugare site web","label.administrator": "Administrator","label.all": "Toate",- "label.all-events": "Toate evenimentele","label.all-time": "All time","label.all-websites": "Toate site-urile web","label.back": "Înapoi",@@ -104,15 +103,10 @@"metrics.operating-systems": "Sisteme de operare","metrics.page-views": "Vizualizări de pagină","metrics.pages": "Pagini",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "Site-uri de proveniență","metrics.screens": "Screens","metrics.unique-visitors": "Vizitatori unici",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "Vizualizări","metrics.visitors": "Vizitatori"}diff --git a/lang/ru-RU.json b/lang/ru-RU.jsonindex 80d53783a..da08b4480 100644--- a/lang/ru-RU.json+++ b/lang/ru-RU.json@@ -4,7 +4,6 @@"label.add-website": "Добавить сайт","label.administrator": "Администратор","label.all": "Все",- "label.all-events": "Все события","label.all-time": "Все время","label.all-websites": "Все сайты","label.back": "Назад",@@ -104,15 +103,10 @@"metrics.operating-systems": "Операционные системы","metrics.page-views": "Просмотры страниц","metrics.pages": "Страницы",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "Источники","metrics.screens": "Screens","metrics.unique-visitors": "Уникальные посетители",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "Просмотры","metrics.visitors": "Посетители"}diff --git a/lang/sk-SK.json b/lang/sk-SK.jsonindex 8a49a3fb0..fdd49155e 100644--- a/lang/sk-SK.json+++ b/lang/sk-SK.json@@ -4,7 +4,6 @@"label.add-website": "Pridať web","label.administrator": "Administrátor","label.all": "Všetko",- "label.all-events": "All events","label.all-time": "All time","label.all-websites": "Všetky weby","label.back": "Späť",@@ -104,15 +103,10 @@"metrics.operating-systems": "Operačný systém","metrics.page-views": "Zobrazenie stánok","metrics.pages": "Stránky",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "Odkazy","metrics.screens": "Screens","metrics.unique-visitors": "Jedinečné návštevy",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "Zobrazení","metrics.visitors": "Návštevy"}diff --git a/lang/sl-SI.json b/lang/sl-SI.jsonindex a6b3d4870..edb69df0f 100644--- a/lang/sl-SI.json+++ b/lang/sl-SI.json@@ -4,7 +4,6 @@"label.add-website": "Dodaj spletno mesto","label.administrator": "Administrator","label.all": "Vse",- "label.all-events": "Vsi dogodki","label.all-time": "All time","label.all-websites": "Vsa spletna mesta","label.back": "Nazaj",@@ -104,15 +103,10 @@"metrics.operating-systems": "Operacijski sistemi","metrics.page-views": "Ogledi strani","metrics.pages": "Strani",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "Viri","metrics.screens": "Screens","metrics.unique-visitors": "Unikatni obiskovalci",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "Ogledi","metrics.visitors": "Obiskovalci"}diff --git a/lang/sv-SE.json b/lang/sv-SE.jsonindex 64e4b02de..8cc34ece8 100644--- a/lang/sv-SE.json+++ b/lang/sv-SE.json@@ -4,7 +4,6 @@"label.add-website": "Lägg till webbsajt","label.administrator": "Administratör","label.all": "Alla",- "label.all-events": "Alla händelser","label.all-time": "Sedan början","label.all-websites": "Alla sajter","label.back": "Tillbaka",@@ -104,15 +103,10 @@"metrics.operating-systems": "Operativsystem","metrics.page-views": "Sidvisningar","metrics.pages": "Sidor",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "Hänvisare","metrics.screens": "Screens","metrics.unique-visitors": "Unika besökare",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "Visningar","metrics.visitors": "Besökare"}diff --git a/lang/ta-IN.json b/lang/ta-IN.jsonindex 5b5606a3a..bae950b56 100644--- a/lang/ta-IN.json+++ b/lang/ta-IN.json@@ -4,7 +4,6 @@"label.add-website": "வலைத்தளத்தைச் சேர்க்க","label.administrator": "நிர்வாகியைச் சேர்க்க","label.all": "எல்லாம்",- "label.all-events": "அனைத்து நிகழ்வுகளும்","label.all-time": "All time","label.all-websites": "அனைத்து வலைத்தளங்களும்","label.back": "பின்னால்",@@ -104,15 +103,10 @@"metrics.operating-systems": "இயக்க முறைமைகள்","metrics.page-views": "பக்க காட்சிகள்","metrics.pages": "பக்கங்கள்",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "குறிப்பிடுவோர்","metrics.screens": "Screens","metrics.unique-visitors": "தனிப்பட்ட பார்வையாளர்கள்",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "பார்வைகள்","metrics.visitors": "பார்வையாளர்கள்"}diff --git a/lang/th-TH.json b/lang/th-TH.jsonindex e4c1ed4b5..9586d18ca 100644--- a/lang/th-TH.json+++ b/lang/th-TH.json@@ -4,7 +4,6 @@"label.add-website": "เพิ่มเว็บไซต์","label.administrator": "ผู้ดูแลระบบ","label.all": "ทั้งหมด",- "label.all-events": "เหตุการณ์ทั้งหมด","label.all-time": "ทุกช่วงเวลา","label.all-websites": "เว็บไซต์ทั้งหมด","label.back": "ย้อนกลับ",@@ -104,15 +103,10 @@"metrics.operating-systems": "ระบบปฏิบัติการ","metrics.page-views": "การเข้าชม","metrics.pages": "หน้าเพจ",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "แหล่งที่มา","metrics.screens": "ขนาดหน้าจอ","metrics.unique-visitors": "ผู้เข้าชม",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "การเข้าชม","metrics.visitors": "ผู้เข้าชม"}diff --git a/lang/tr-TR.json b/lang/tr-TR.jsonindex d630cb0ba..e1211fd6d 100644--- a/lang/tr-TR.json+++ b/lang/tr-TR.json@@ -4,7 +4,6 @@"label.add-website": "Web sitesi ekle","label.administrator": "Yönetici","label.all": "Tümü",- "label.all-events": "All events","label.all-time": "All time","label.all-websites": "Tüm web siteleri","label.back": "Geri",@@ -104,15 +103,10 @@"metrics.operating-systems": "İşletim sistemi","metrics.page-views": "Sayfa görünümü","metrics.pages": "Sayfalar",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "Yönlendirenler","metrics.screens": "Ekranlar","metrics.unique-visitors": "Tekil kullanıcı",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "Görüntüleme","metrics.visitors": "Ziyaretçi"}diff --git a/lang/uk-UA.json b/lang/uk-UA.jsonindex 7debaa97d..290865cba 100644--- a/lang/uk-UA.json+++ b/lang/uk-UA.json@@ -4,7 +4,6 @@"label.add-website": "Додати сайт","label.administrator": "Адміністратор","label.all": "Всі",- "label.all-events": "Всі події","label.all-time": "Весь час","label.all-websites": "Всі сайти","label.back": "Назад",@@ -104,15 +103,10 @@"metrics.operating-systems": "Операційні системи","metrics.page-views": "Перегляди сторінок","metrics.pages": "Сторінки",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "Джерела","metrics.screens": "Screens","metrics.unique-visitors": "Унікальні відвідувачі",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "Перегляди","metrics.visitors": "Відвідувачі"}diff --git a/lang/ur-PK.json b/lang/ur-PK.jsonindex aadd39376..ae2c1385a 100644--- a/lang/ur-PK.json+++ b/lang/ur-PK.json@@ -4,7 +4,6 @@"label.add-website": "ویب سائٹ کا اضافہ کریں","label.administrator": "منتظم","label.all": "تمام",- "label.all-events": "تمام واقعات","label.all-time": "تمام وقت","label.all-websites": "تمام ویب سائٹس","label.back": "پیچھے",@@ -104,15 +103,10 @@"metrics.operating-systems": "آپریٹنگ سسٹمز","metrics.page-views": "صفحہ کے نظارے","metrics.pages": "صفحات",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "بھیجنے والے","metrics.screens": "Screens","metrics.unique-visitors": "منفرد زائرین",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "مناظر","metrics.visitors": "زائرین"}diff --git a/lang/vi-VN.json b/lang/vi-VN.jsonindex 2717bcc53..201d25817 100644--- a/lang/vi-VN.json+++ b/lang/vi-VN.json@@ -4,7 +4,6 @@"label.add-website": "Thêm website","label.administrator": "Quản trị","label.all": "Tất cả",- "label.all-events": "Tất cả sự kiện","label.all-time": "Toàn thời gian","label.all-websites": "Tất cả website","label.back": "Quay về",@@ -104,15 +103,10 @@"metrics.operating-systems": "Hệ điều hành","metrics.page-views": "Lượt xem","metrics.pages": "Trang",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "Liên kết giới thiệu","metrics.screens": "Screens","metrics.unique-visitors": "Khách truy cập một lần",- "metrics.utm": "UTM",- "metrics.utm_campaign": "UTM Campaign",- "metrics.utm_content": "UTM Content",- "metrics.utm_medium": "UTM Medium",- "metrics.utm_source": "UTM Source",- "metrics.utm_term": "UTM Term","metrics.views": "Xem","metrics.visitors": "Khách"}diff --git a/lang/zh-CN.json b/lang/zh-CN.jsonindex 5700c9e69..8d5a9fd75 100644--- a/lang/zh-CN.json+++ b/lang/zh-CN.json@@ -4,7 +4,6 @@"label.add-website": "添加网站","label.administrator": "管理员","label.all": "所有",- "label.all-events": "所有事件","label.all-time": "所有时间段","label.all-websites": "全部网站","label.back": "返回",@@ -104,15 +103,10 @@"metrics.operating-systems": "操作系统","metrics.page-views": "页面浏览量","metrics.pages": "网页",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "来源域名","metrics.screens": "屏幕尺寸","metrics.unique-visitors": "独立访客",- "metrics.utm": "流量渠道标记(UTM)",- "metrics.utm_campaign": "流量标识",- "metrics.utm_content": "搜索关键字",- "metrics.utm_medium": "流量来源类型",- "metrics.utm_source": "流量来源",- "metrics.utm_term": "流量搜索关键字","metrics.views": "浏览量","metrics.visitors": "访客"}diff --git a/lang/zh-TW.json b/lang/zh-TW.jsonindex ed66f53f9..fe3dfadcf 100644--- a/lang/zh-TW.json+++ b/lang/zh-TW.json@@ -4,7 +4,6 @@"label.add-website": "增加網站","label.administrator": "管理員","label.all": "所有",- "label.all-events": "所有事件","label.all-time": "所有時間段","label.all-websites": "全部網站","label.back": "返回",@@ -104,15 +103,10 @@"metrics.operating-systems": "操作系統","metrics.page-views": "網頁流量","metrics.pages": "網頁",+ "metrics.query-parameters": "Query parameters","metrics.referrers": "指入域名","metrics.screens": "屏幕尺寸","metrics.unique-visitors": "獨立訪客",- "metrics.utm": "流量渠道標記",- "metrics.utm_campaign": "流量標識",- "metrics.utm_content": "流量搜索內容",- "metrics.utm_medium": "流量來源類型",- "metrics.utm_source": "流量來源",- "metrics.utm_term": "流量搜索關鍵字","metrics.views": "頁面流量","metrics.visitors": "獨立訪客"}diff --git a/lib/db.js b/lib/db.jsindex 1a5f8b2ca..4c04e8cf7 100644--- a/lib/db.js+++ b/lib/db.js@@ -168,7 +168,6 @@ export function getFilterQuery(table, column, filters = {}, params = []) {if (table === 'pageview' || table === 'event') {arr.push(`and ${table}.${key}=$${params.length + 1}`);params.push(decodeURIComponent(filter));- console.log(params);}break;@@ -203,6 +202,11 @@ export function getFilterQuery(table, column, filters = {}, params = []) {params.push(`%://${filter}/%`);}break;++ case 'query':+ if (table === 'pageview') {+ arr.push(`and ${table}.url like '%?%'`);+ }}return arr;@@ -212,9 +216,12 @@ export function getFilterQuery(table, column, filters = {}, params = []) {}export function parseFilters(table, column, filters = {}, params = [], sessionKey = 'session_id') {- const { domain, url, event_url, referrer, os, browser, device, country, event_name } = filters;+ const { domain, url, event_url, referrer, os, browser, device, country, event_name, query } =+ filters;++ console.log({ table, column, filters, params });- const pageviewFilters = { domain, url, referrer };+ const pageviewFilters = { domain, url, referrer, query };const sessionFilters = { os, browser, device, country };const eventFilters = { url: event_url, event_name };diff --git a/lib/filters.js b/lib/filters.jsindex 86e9ae414..27b88e20e 100644--- a/lib/filters.js+++ b/lib/filters.js@@ -68,18 +68,37 @@ export const refFilter = data => {return Object.keys(map).map(key => ({ x: key, y: map[key], w: links[key] }));};-export const eventTypeFilter = (data, types) => {- if (!types || types.length === 0) {- return data;- }-- return data.filter(({ x }) => {- const [event] = x.split('\t');- return types.some(type => type === event);- });-};-export const percentFilter = data => {const total = data.reduce((n, { y }) => n + y, 0);return data.map(({ x, y, ...props }) => ({ x, y, z: total ? (y / total) * 100 : 0, ...props }));};++export const paramFilter = data => {+ const map = data.reduce((obj, { x, y }) => {+ try {+ const searchParams = new URLSearchParams(x.split('?')[1]);++ for (const [key, value] of searchParams) {+ if (!obj[key]) {+ obj[key] = { [value]: y };+ } else if (!obj[key][value]) {+ obj[key][value] = y;+ } else {+ obj[key][value] += y;+ }+ }+ } catch {+ // Ignore+ }++ return obj;+ }, {});++ const d = Object.keys(map).flatMap(key =>+ Object.keys(map[key]).map(n => ({ x: `${key}=${n}`, p: key, v: n, y: map[key][n] })),+ );++ console.log({ map, d });++ return d;+};diff --git a/package.json b/package.jsonindex 086ff44d2..61ae3acd1 100644--- a/package.json+++ b/package.json@@ -13,7 +13,7 @@"dev": "next dev","build": "npm-run-all build-tracker build-geo build-db build-app","start": "npm-run-all check-db start-next",- "start-docker": "npm-run-all check-db start-server",+ "start-docker": "npm-run-all check-db build-tracker start-server","start-env": "node scripts/start-env.js","start-server": "node server.js","start-next": "next start",diff --git a/pages/api/website/[id]/metrics.js b/pages/api/website/[id]/metrics.jsindex 78c8a0661..b6e701e7c 100644--- a/pages/api/website/[id]/metrics.js+++ b/pages/api/website/[id]/metrics.js@@ -1,12 +1,11 @@-import { getPageviewMetrics, getSessionMetrics, getWebsiteById, getPageviewParams } from 'queries';+import { getPageviewMetrics, getSessionMetrics, getWebsiteById } from 'queries';import { ok, methodNotAllowed, unauthorized, badRequest } from 'lib/response';import { allowQuery } from 'lib/auth';import { useCors } from 'lib/middleware';import { FILTER_IGNORED } from 'lib/constants';const sessionColumns = ['browser', 'os', 'device', 'screen', 'country', 'language'];-const pageviewColumns = ['url', 'referrer'];-const paramTypes = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_content', 'utm_term', 'ref'];+const pageviewColumns = ['url', 'referrer', 'query'];function getTable(type) {if (type === 'event') {@@ -17,12 +16,19 @@ function getTable(type) {return 'session';}- return 'pageview';+ if (pageviewColumns.includes(type)) {+ return 'pageview';+ }++ throw new Error('Invalid type');}function getColumn(type) {if (type === 'event') {- return `event_name`;+ return 'event_name';+ }+ if (type === 'query') {+ return 'url';}return type;}@@ -41,52 +47,6 @@ export default async (req, res) => {const startDate = new Date(+start_at);const endDate = new Date(+end_at);- if (paramTypes.includes(type)) {- const column = 'url';- const table = getTable(type);-- let domain;- if (type === 'referrer') {- const website = await getWebsiteById(websiteId);-- if (!website) {- return badRequest(res);- }-- domain = website.domain;- }-- const filters = {- domain,- url: type !== 'url' && table !== 'event' ? url : undefined,- referrer: type !== 'referrer' ? referrer : true,- os: type !== 'os' ? os : undefined,- browser: type !== 'browser' ? browser : undefined,- device: type !== 'device' ? device : undefined,- country: type !== 'country' ? country : undefined,- event_url: type !== 'url' && table === 'event' ? url : undefined,- };-- let data = await getPageviewParams(- type,- websiteId,- startDate,- endDate,- column,- table,- filters,- );-- let terms = {};- new Set(data.map(i => i.param)).forEach(term => (terms[term] = null));- for (let { param } of data) terms[param] += 1;-- return ok(- res,- Object.keys(terms).map(i => ({ x: i, y: terms[i] })),- );- }-if (sessionColumns.includes(type)) {let data = await getSessionMetrics(websiteId, startDate, endDate, type, {os,@@ -116,6 +76,7 @@ export default async (req, res) => {if (pageviewColumns.includes(type) || type === 'event') {let domain;+if (type === 'referrer') {const website = await getWebsiteById(websiteId);@@ -137,6 +98,7 @@ export default async (req, res) => {device: type !== 'device' ? device : undefined,country: type !== 'country' ? country : undefined,event_url: type !== 'url' && table === 'event' ? url : undefined,+ query: type === 'query' && table !== 'event' ? true : undefined,};const data = await getPageviewMetrics(websiteId, startDate, endDate, column, table, filters);diff --git a/public/intl/messages/ar-SA.json b/public/intl/messages/ar-SA.jsonindex 81d1da960..3a876155e 100644--- a/public/intl/messages/ar-SA.json+++ b/public/intl/messages/ar-SA.json@@ -29,12 +29,6 @@"value": "الكل"}],- "label.all-events": [- {- "type": 0,- "value": "كافة الأحداث"- }- ],"label.all-time": [{"type": 0,@@ -773,6 +767,12 @@"value": "الصفحات"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -791,42 +791,6 @@"value": "زائرون فريدون"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/bn-BD.json b/public/intl/messages/bn-BD.jsonindex 846e60cdb..6f381c9fb 100644--- a/public/intl/messages/bn-BD.json+++ b/public/intl/messages/bn-BD.json@@ -29,12 +29,6 @@"value": "সবগুলো"}],- "label.all-events": [- {- "type": 0,- "value": "সবগুলো ঘটনা"- }- ],"label.all-time": [{"type": 0,@@ -769,6 +763,12 @@"value": "পৃষ্ঠাগুলি"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -787,42 +787,6 @@"value": "অনন্য ভিজিটর"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM প্রচার"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM সামগ্রী"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM মিডিয়াম"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM উৎস"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM শব্দ"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/ca-ES.json b/public/intl/messages/ca-ES.jsonindex 19bfab409..af1fbd6d4 100644--- a/public/intl/messages/ca-ES.json+++ b/public/intl/messages/ca-ES.json@@ -29,12 +29,6 @@"value": "Tots"}],- "label.all-events": [- {- "type": 0,- "value": "Tots els esdeveniments"- }- ],"label.all-time": [{"type": 0,@@ -773,6 +767,12 @@"value": "Pàgines"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -791,42 +791,6 @@"value": "Visitants únics"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/cs-CZ.json b/public/intl/messages/cs-CZ.jsonindex f3bc624d9..98f22d0b9 100644--- a/public/intl/messages/cs-CZ.json+++ b/public/intl/messages/cs-CZ.json@@ -29,12 +29,6 @@"value": "Vše"}],- "label.all-events": [- {- "type": 0,- "value": "All events"- }- ],"label.all-time": [{"type": 0,@@ -773,6 +767,12 @@"value": "Stránky"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -791,42 +791,6 @@"value": "Jedinečné návštěvy"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/da-DK.json b/public/intl/messages/da-DK.jsonindex 6fa6e176e..93fefdcc5 100644--- a/public/intl/messages/da-DK.json+++ b/public/intl/messages/da-DK.json@@ -29,12 +29,6 @@"value": "Alle"}],- "label.all-events": [- {- "type": 0,- "value": "Alle hændelser"- }- ],"label.all-time": [{"type": 0,@@ -773,6 +767,12 @@"value": "Sider"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -791,42 +791,6 @@"value": "Unikke besøgende"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/de-DE.json b/public/intl/messages/de-DE.jsonindex 9ad2fe0cd..0bc273b68 100644--- a/public/intl/messages/de-DE.json+++ b/public/intl/messages/de-DE.json@@ -29,12 +29,6 @@"value": "Alle"}],- "label.all-events": [- {- "type": 0,- "value": "Alle Ereignisse"- }- ],"label.all-time": [{"type": 0,@@ -773,6 +767,12 @@"value": "Seiten"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -791,42 +791,6 @@"value": "Eindeutige Besucher"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Kampagne"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Inhalt"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Quelle"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Begriff"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/el-GR.json b/public/intl/messages/el-GR.jsonindex 3e0a7040a..0709a3a82 100644--- a/public/intl/messages/el-GR.json+++ b/public/intl/messages/el-GR.json@@ -29,12 +29,6 @@"value": "All"}],- "label.all-events": [- {- "type": 0,- "value": "All events"- }- ],"label.all-time": [{"type": 0,@@ -773,6 +767,12 @@"value": "Σελίδες"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -791,42 +791,6 @@"value": "Μοναδικοί επισκέπτες"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/en-GB.json b/public/intl/messages/en-GB.jsonindex 590d5f46e..721c765aa 100644--- a/public/intl/messages/en-GB.json+++ b/public/intl/messages/en-GB.json@@ -29,12 +29,6 @@"value": "All"}],- "label.all-events": [- {- "type": 0,- "value": "All events"- }- ],"label.all-time": [{"type": 0,@@ -773,6 +767,12 @@"value": "Pages"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -791,42 +791,6 @@"value": "Unique visitors"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/en-US.json b/public/intl/messages/en-US.jsonindex 590d5f46e..721c765aa 100644--- a/public/intl/messages/en-US.json+++ b/public/intl/messages/en-US.json@@ -29,12 +29,6 @@"value": "All"}],- "label.all-events": [- {- "type": 0,- "value": "All events"- }- ],"label.all-time": [{"type": 0,@@ -773,6 +767,12 @@"value": "Pages"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -791,42 +791,6 @@"value": "Unique visitors"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/es-MX.json b/public/intl/messages/es-MX.jsonindex d31ba6cf2..761018ba7 100644--- a/public/intl/messages/es-MX.json+++ b/public/intl/messages/es-MX.json@@ -29,12 +29,6 @@"value": "Todos"}],- "label.all-events": [- {- "type": 0,- "value": "Todos los eventos"- }- ],"label.all-time": [{"type": 0,@@ -773,6 +767,12 @@"value": "Páginas"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -791,42 +791,6 @@"value": "Visitantes únicos"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/fa-IR.json b/public/intl/messages/fa-IR.jsonindex b765275b5..23eb688a3 100644--- a/public/intl/messages/fa-IR.json+++ b/public/intl/messages/fa-IR.json@@ -29,12 +29,6 @@"value": "همه"}],- "label.all-events": [- {- "type": 0,- "value": "همهی رویدادها"- }- ],"label.all-time": [{"type": 0,@@ -757,6 +751,12 @@"value": "صفحهها"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -775,42 +775,6 @@"value": "بازدیدکنندههای یکتا"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/fi-FI.json b/public/intl/messages/fi-FI.jsonindex 6293ad9a8..0cbf08776 100644--- a/public/intl/messages/fi-FI.json+++ b/public/intl/messages/fi-FI.json@@ -29,12 +29,6 @@"value": "Kaikki"}],- "label.all-events": [- {- "type": 0,- "value": "Kaikki tapahtumat"- }- ],"label.all-time": [{"type": 0,@@ -773,6 +767,12 @@"value": "Sivut"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -791,42 +791,6 @@"value": "Yksittäiset kävijät"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/fo-FO.json b/public/intl/messages/fo-FO.jsonindex 02205bae3..d5d138844 100644--- a/public/intl/messages/fo-FO.json+++ b/public/intl/messages/fo-FO.json@@ -29,12 +29,6 @@"value": "Alt"}],- "label.all-events": [- {- "type": 0,- "value": "All events"- }- ],"label.all-time": [{"type": 0,@@ -773,6 +767,12 @@"value": "Síðir"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -791,42 +791,6 @@"value": "Einsýna vitjanir"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/fr-FR.json b/public/intl/messages/fr-FR.jsonindex ddec676a2..6ea8623b5 100644--- a/public/intl/messages/fr-FR.json+++ b/public/intl/messages/fr-FR.json@@ -29,12 +29,6 @@"value": "Tout"}],- "label.all-events": [- {- "type": 0,- "value": "Tous les événements"- }- ],"label.all-time": [{"type": 0,@@ -769,6 +763,12 @@"value": "Pages"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -787,42 +787,6 @@"value": "Visiteurs uniques"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/ga-ES.json b/public/intl/messages/ga-ES.jsonindex af959205b..ef7261098 100644--- a/public/intl/messages/ga-ES.json+++ b/public/intl/messages/ga-ES.json@@ -29,12 +29,6 @@"value": "Todo"}],- "label.all-events": [- {- "type": 0,- "value": "Tódolos eventos"- }- ],"label.all-time": [{"type": 0,@@ -773,6 +767,12 @@"value": "Páxinas"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -791,42 +791,6 @@"value": "Visitas únicas"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/he-IL.json b/public/intl/messages/he-IL.jsonindex d6dd900fe..a0146f88d 100644--- a/public/intl/messages/he-IL.json+++ b/public/intl/messages/he-IL.json@@ -29,12 +29,6 @@"value": "הכל"}],- "label.all-events": [- {- "type": 0,- "value": "All events"- }- ],"label.all-time": [{"type": 0,@@ -753,6 +747,12 @@"value": "דפים"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -771,42 +771,6 @@"value": "מבקרים ייחודיים"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/hi-IN.json b/public/intl/messages/hi-IN.jsonindex ff76fdb93..fc0da365b 100644--- a/public/intl/messages/hi-IN.json+++ b/public/intl/messages/hi-IN.json@@ -29,12 +29,6 @@"value": "सब"}],- "label.all-events": [- {- "type": 0,- "value": "All events"- }- ],"label.all-time": [{"type": 0,@@ -761,6 +755,12 @@"value": "पृष्ठों"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -779,42 +779,6 @@"value": "अद्वितीय आगंतुकों"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/hu-HU.json b/public/intl/messages/hu-HU.jsonindex 238a6301f..ea81fc4b3 100644--- a/public/intl/messages/hu-HU.json+++ b/public/intl/messages/hu-HU.json@@ -29,12 +29,6 @@"value": "Összes"}],- "label.all-events": [- {- "type": 0,- "value": "Összes esemény"- }- ],"label.all-time": [{"type": 0,@@ -773,6 +767,12 @@"value": "Oldalak"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -791,42 +791,6 @@"value": "Egyedi látogatók"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/id-ID.json b/public/intl/messages/id-ID.jsonindex cc049e2c5..da55b45f0 100644--- a/public/intl/messages/id-ID.json+++ b/public/intl/messages/id-ID.json@@ -29,12 +29,6 @@"value": "Semua"}],- "label.all-events": [- {- "type": 0,- "value": "Semua peristiwa"- }- ],"label.all-time": [{"type": 0,@@ -741,6 +735,12 @@"value": "Halaman"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -759,42 +759,6 @@"value": "Pengunjung unik"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "Kampanye UTM"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "Konten UTM"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "Media UTM"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "Sumber UTM"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "Tampilan UTM"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/it-IT.json b/public/intl/messages/it-IT.jsonindex 419ca42e7..5ff6beee0 100644--- a/public/intl/messages/it-IT.json+++ b/public/intl/messages/it-IT.json@@ -29,12 +29,6 @@"value": "Tutto"}],- "label.all-events": [- {- "type": 0,- "value": "Tutti gli eventi"- }- ],"label.all-time": [{"type": 0,@@ -777,6 +771,12 @@"value": "Pagine"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -795,42 +795,6 @@"value": "Visitatori unici"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/ja-JP.json b/public/intl/messages/ja-JP.jsonindex 0c52a7371..3809e1fc8 100644--- a/public/intl/messages/ja-JP.json+++ b/public/intl/messages/ja-JP.json@@ -29,12 +29,6 @@"value": "すべて表示"}],- "label.all-events": [- {- "type": 0,- "value": "All events"- }- ],"label.all-time": [{"type": 0,@@ -745,6 +739,12 @@"value": "ページ"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -763,42 +763,6 @@"value": "ユニーク訪問者数"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/ko-KR.json b/public/intl/messages/ko-KR.jsonindex 54c9d5917..15a76daf3 100644--- a/public/intl/messages/ko-KR.json+++ b/public/intl/messages/ko-KR.json@@ -29,12 +29,6 @@"value": "전체"}],- "label.all-events": [- {- "type": 0,- "value": "모든 이벤트"- }- ],"label.all-time": [{"type": 0,@@ -745,6 +739,12 @@"value": "페이지"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -763,42 +763,6 @@"value": "순방문자(UV)"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/lt-LT.json b/public/intl/messages/lt-LT.jsonindex d9459fbcd..c37ca7777 100644--- a/public/intl/messages/lt-LT.json+++ b/public/intl/messages/lt-LT.json@@ -29,12 +29,6 @@"value": "Visi"}],- "label.all-events": [- {- "type": 0,- "value": "Visi įvykiai"- }- ],"label.all-time": [{"type": 0,@@ -898,6 +892,12 @@"value": "Puslapiai"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -916,42 +916,6 @@"value": "Unikalūs lankytojai"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/mn-MN.json b/public/intl/messages/mn-MN.jsonindex c3bf54678..6430e55eb 100644--- a/public/intl/messages/mn-MN.json+++ b/public/intl/messages/mn-MN.json@@ -29,12 +29,6 @@"value": "Бүх"}],- "label.all-events": [- {- "type": 0,- "value": "Бүх үйл явдал"- }- ],"label.all-time": [{"type": 0,@@ -773,6 +767,12 @@"value": "Хуудас"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -791,42 +791,6 @@"value": "Зочин"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/ms-MY.json b/public/intl/messages/ms-MY.jsonindex d025341ed..a78bf8c41 100644--- a/public/intl/messages/ms-MY.json+++ b/public/intl/messages/ms-MY.json@@ -29,12 +29,6 @@"value": "Semua"}],- "label.all-events": [- {- "type": 0,- "value": "Semua peristiwa"- }- ],"label.all-time": [{"type": 0,@@ -765,6 +759,12 @@"value": "Halaman"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -783,42 +783,6 @@"value": "Pelawat unik"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/nb-NO.json b/public/intl/messages/nb-NO.jsonindex dc0512eff..3d6e09f23 100644--- a/public/intl/messages/nb-NO.json+++ b/public/intl/messages/nb-NO.json@@ -29,12 +29,6 @@"value": "Alle"}],- "label.all-events": [- {- "type": 0,- "value": "Alle hendelser"- }- ],"label.all-time": [{"type": 0,@@ -777,6 +771,12 @@"value": "Sider"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -795,42 +795,6 @@"value": "Unike besøkende"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/nl-NL.json b/public/intl/messages/nl-NL.jsonindex 8e88fe862..6f1956990 100644--- a/public/intl/messages/nl-NL.json+++ b/public/intl/messages/nl-NL.json@@ -29,12 +29,6 @@"value": "Alles"}],- "label.all-events": [- {- "type": 0,- "value": "Alle gebeurtenissen"- }- ],"label.all-time": [{"type": 0,@@ -773,6 +767,12 @@"value": "Pagina's"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -791,42 +791,6 @@"value": "Unieke bezoekers"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/pl-PL.json b/public/intl/messages/pl-PL.jsonindex 43702359e..565b79b16 100644--- a/public/intl/messages/pl-PL.json+++ b/public/intl/messages/pl-PL.json@@ -29,12 +29,6 @@"value": "Wszystkie"}],- "label.all-events": [- {- "type": 0,- "value": "Wszystkie wydarzenia"- }- ],"label.all-time": [{"type": 0,@@ -773,6 +767,12 @@"value": "Strony"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -791,42 +791,6 @@"value": "Unikalni odwiedzający"}],- "metrics.utm": [- {- "type": 0,- "value": "Kampanie UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "Kampania"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "Treść"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "Źródło"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "Słowa kluczowe"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/pt-BR.json b/public/intl/messages/pt-BR.jsonindex db16460ce..b797c50b5 100644--- a/public/intl/messages/pt-BR.json+++ b/public/intl/messages/pt-BR.json@@ -29,12 +29,6 @@"value": "Todos"}],- "label.all-events": [- {- "type": 0,- "value": "Todos os eventos"- }- ],"label.all-time": [{"type": 0,@@ -777,6 +771,12 @@"value": "Páginas"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -795,42 +795,6 @@"value": "Visitantes únicos"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/pt-PT.json b/public/intl/messages/pt-PT.jsonindex ec2b480f9..445baa225 100644--- a/public/intl/messages/pt-PT.json+++ b/public/intl/messages/pt-PT.json@@ -29,12 +29,6 @@"value": "Todos"}],- "label.all-events": [- {- "type": 0,- "value": "Todos os eventos"- }- ],"label.all-time": [{"type": 0,@@ -777,6 +771,12 @@"value": "Páginas"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -795,42 +795,6 @@"value": "Visitantes únicos"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/ro-RO.json b/public/intl/messages/ro-RO.jsonindex 544a173e4..2daa11911 100644--- a/public/intl/messages/ro-RO.json+++ b/public/intl/messages/ro-RO.json@@ -29,12 +29,6 @@"value": "Toate"}],- "label.all-events": [- {- "type": 0,- "value": "Toate evenimentele"- }- ],"label.all-time": [{"type": 0,@@ -773,6 +767,12 @@"value": "Pagini"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -791,42 +791,6 @@"value": "Vizitatori unici"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/ru-RU.json b/public/intl/messages/ru-RU.jsonindex a5bbdd666..cfef7bb89 100644--- a/public/intl/messages/ru-RU.json+++ b/public/intl/messages/ru-RU.json@@ -29,12 +29,6 @@"value": "Все"}],- "label.all-events": [- {- "type": 0,- "value": "Все события"- }- ],"label.all-time": [{"type": 0,@@ -745,6 +739,12 @@"value": "Страницы"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -763,42 +763,6 @@"value": "Уникальные посетители"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/sk-SK.json b/public/intl/messages/sk-SK.jsonindex 8bdc39281..ff7157f88 100644--- a/public/intl/messages/sk-SK.json+++ b/public/intl/messages/sk-SK.json@@ -29,12 +29,6 @@"value": "Všetko"}],- "label.all-events": [- {- "type": 0,- "value": "All events"- }- ],"label.all-time": [{"type": 0,@@ -773,6 +767,12 @@"value": "Stránky"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -791,42 +791,6 @@"value": "Jedinečné návštevy"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/sl-SI.json b/public/intl/messages/sl-SI.jsonindex 103baa028..529493dd8 100644--- a/public/intl/messages/sl-SI.json+++ b/public/intl/messages/sl-SI.json@@ -29,12 +29,6 @@"value": "Vse"}],- "label.all-events": [- {- "type": 0,- "value": "Vsi dogodki"- }- ],"label.all-time": [{"type": 0,@@ -773,6 +767,12 @@"value": "Strani"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -791,42 +791,6 @@"value": "Unikatni obiskovalci"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/sv-SE.json b/public/intl/messages/sv-SE.jsonindex 055d4700f..e83eb07c7 100644--- a/public/intl/messages/sv-SE.json+++ b/public/intl/messages/sv-SE.json@@ -29,12 +29,6 @@"value": "Alla"}],- "label.all-events": [- {- "type": 0,- "value": "Alla händelser"- }- ],"label.all-time": [{"type": 0,@@ -777,6 +771,12 @@"value": "Sidor"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -795,42 +795,6 @@"value": "Unika besökare"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/ta-IN.json b/public/intl/messages/ta-IN.jsonindex 4c013afbe..cf6eb2523 100644--- a/public/intl/messages/ta-IN.json+++ b/public/intl/messages/ta-IN.json@@ -29,12 +29,6 @@"value": "எல்லாம்"}],- "label.all-events": [- {- "type": 0,- "value": "அனைத்து நிகழ்வுகளும்"- }- ],"label.all-time": [{"type": 0,@@ -765,6 +759,12 @@"value": "பக்கங்கள்"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -783,42 +783,6 @@"value": "தனிப்பட்ட பார்வையாளர்கள்"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/th-TH.json b/public/intl/messages/th-TH.jsonindex aec1499e3..0d1bd0ec4 100644--- a/public/intl/messages/th-TH.json+++ b/public/intl/messages/th-TH.json@@ -29,12 +29,6 @@"value": "ทั้งหมด"}],- "label.all-events": [- {- "type": 0,- "value": "เหตุการณ์ทั้งหมด"- }- ],"label.all-time": [{"type": 0,@@ -769,6 +763,12 @@"value": "หน้าเพจ"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -787,42 +787,6 @@"value": "ผู้เข้าชม"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/tr-TR.json b/public/intl/messages/tr-TR.jsonindex a21af75d8..33069dceb 100644--- a/public/intl/messages/tr-TR.json+++ b/public/intl/messages/tr-TR.json@@ -29,12 +29,6 @@"value": "Tümü"}],- "label.all-events": [- {- "type": 0,- "value": "All events"- }- ],"label.all-time": [{"type": 0,@@ -737,6 +731,12 @@"value": "Sayfalar"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -755,42 +755,6 @@"value": "Tekil kullanıcı"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/uk-UA.json b/public/intl/messages/uk-UA.jsonindex a2765209a..810068a40 100644--- a/public/intl/messages/uk-UA.json+++ b/public/intl/messages/uk-UA.json@@ -29,12 +29,6 @@"value": "Всі"}],- "label.all-events": [- {- "type": 0,- "value": "Всі події"- }- ],"label.all-time": [{"type": 0,@@ -749,6 +743,12 @@"value": "Сторінки"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -767,42 +767,6 @@"value": "Унікальні відвідувачі"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/ur-PK.json b/public/intl/messages/ur-PK.jsonindex c09106e5e..4b384a25b 100644--- a/public/intl/messages/ur-PK.json+++ b/public/intl/messages/ur-PK.json@@ -29,12 +29,6 @@"value": "تمام"}],- "label.all-events": [- {- "type": 0,- "value": "تمام واقعات"- }- ],"label.all-time": [{"type": 0,@@ -773,6 +767,12 @@"value": "صفحات"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -791,42 +791,6 @@"value": "منفرد زائرین"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/vi-VN.json b/public/intl/messages/vi-VN.jsonindex b4dc3da00..6552f1d28 100644--- a/public/intl/messages/vi-VN.json+++ b/public/intl/messages/vi-VN.json@@ -29,12 +29,6 @@"value": "Tất cả"}],- "label.all-events": [- {- "type": 0,- "value": "Tất cả sự kiện"- }- ],"label.all-time": [{"type": 0,@@ -757,6 +751,12 @@"value": "Trang"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -775,42 +775,6 @@"value": "Khách truy cập một lần"}],- "metrics.utm": [- {- "type": 0,- "value": "UTM"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "UTM Campaign"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "UTM Content"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "UTM Medium"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "UTM Source"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "UTM Term"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/zh-CN.json b/public/intl/messages/zh-CN.jsonindex 67826feaf..0ad13b3bd 100644--- a/public/intl/messages/zh-CN.json+++ b/public/intl/messages/zh-CN.json@@ -29,12 +29,6 @@"value": "所有"}],- "label.all-events": [- {- "type": 0,- "value": "所有事件"- }- ],"label.all-time": [{"type": 0,@@ -761,6 +755,12 @@"value": "网页"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -779,42 +779,6 @@"value": "独立访客"}],- "metrics.utm": [- {- "type": 0,- "value": "流量渠道标记(UTM)"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "流量标识"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "搜索关键字"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "流量来源类型"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "流量来源"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "流量搜索关键字"- }- ],"metrics.views": [{"type": 0,diff --git a/public/intl/messages/zh-TW.json b/public/intl/messages/zh-TW.jsonindex 5c78a29dc..019829eaf 100644--- a/public/intl/messages/zh-TW.json+++ b/public/intl/messages/zh-TW.json@@ -29,12 +29,6 @@"value": "所有"}],- "label.all-events": [- {- "type": 0,- "value": "所有事件"- }- ],"label.all-time": [{"type": 0,@@ -757,6 +751,12 @@"value": "網頁"}],+ "metrics.query-parameters": [+ {+ "type": 0,+ "value": "Query parameters"+ }+ ],"metrics.referrers": [{"type": 0,@@ -775,42 +775,6 @@"value": "獨立訪客"}],- "metrics.utm": [- {- "type": 0,- "value": "流量渠道標記"- }- ],- "metrics.utm_campaign": [- {- "type": 0,- "value": "流量標識"- }- ],- "metrics.utm_content": [- {- "type": 0,- "value": "流量搜索內容"- }- ],- "metrics.utm_medium": [- {- "type": 0,- "value": "流量來源類型"- }- ],- "metrics.utm_source": [- {- "type": 0,- "value": "流量來源"- }- ],- "metrics.utm_term": [- {- "type": 0,- "value": "流量搜索關鍵字"- }- ],"metrics.views": [{"type": 0,diff --git a/queries/analytics/pageview/getPageviewParams.js b/queries/analytics/pageview/getPageviewParams.jsindex c6e7082f2..549ff11c5 100644--- a/queries/analytics/pageview/getPageviewParams.js+++ b/queries/analytics/pageview/getPageviewParams.js@@ -1,5 +1,5 @@-import { getDatabase, parseFilters, rawQuery, runAnalyticsQuery } from 'lib/db';-import { MYSQL, POSTGRESQL, CLICKHOUSE, RELATIONAL } from 'lib/constants';+import { parseFilters, rawQuery, runAnalyticsQuery } from 'lib/db';+import { CLICKHOUSE, RELATIONAL } from 'lib/constants';export async function getPageviewParams(...args) {return runAnalyticsQuery({@@ -8,8 +8,8 @@ export async function getPageviewParams(...args) {});}-function relationalQuery(param, website_id, start_at, end_at, column, table, filters = {}) {- const params = [param, param, website_id, start_at, end_at];+async function relationalQuery(website_id, start_at, end_at, column, table, filters = {}) {+ const params = [website_id, start_at, end_at];const { pageviewQuery, sessionQuery, eventQuery, joinSession } = parseFilters(table,column,@@ -17,29 +17,21 @@ function relationalQuery(param, website_id, start_at, end_at, column, table, filparams,);- let splitFn;- let db = getDatabase();- if (db === MYSQL) splitFn = 'substring_index';- if (db === POSTGRESQL) splitFn = 'split_part';- if (!splitFn) return Promise.reject(new Error('Unknown database.'));-return rawQuery(- `select * from (- select- url,- IF( LENGTH(url) - LENGTH(${splitFn}(url, concat($1, '='), -1)) > 1, ${splitFn}(${splitFn}(url, concat($2, '='), -1), '&', 1), null ) param- from- pageview- ${joinSession}- where- ${table}.website_id=$3 and ${table}.created_at between $4 and $5- ${pageviewQuery}- ${joinSession && sessionQuery}- ${eventQuery}- group by 1, 2- order by 2 desc- ) q- where q.param <> ''`,+ `+ select url x,+ count(*) y+ from ${table}+ ${joinSession}+ where ${table}.website_id=$1+ and ${table}.created_at between $2 and $3+ and ${table}.url like '%?%'+ ${pageviewQuery}+ ${joinSession && sessionQuery}+ ${eventQuery}+ group by 1+ order by 2 desc+ `,params,);}