ghost 5.116.0 → 5.116.2

package/core/built/admin/assets/{vendor-72026232b36d97babc6320917c16c321.js → vendor-8e3ee8261528bb429cfe78ce79a4a82a.js}

@@ -8470,10 +8470,10 @@ if("object"==typeof t[n]){if(!e(t[n],r[n]))return!1}else if(t[n]!==r[n])return!1
 function r(e){return"object"==typeof e&&Boolean(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
 class n extends t.default{getStyles(e,t){return[].concat(...[...e.filter(r),t].map((e=>Object.entries(e).map((([e,t])=>[Ember.String.dasherize(e),t])))))}setStyles(e,t){const r=this._oldStyles||new Set
 t.forEach((([t,n])=>{let i=""
-n&&n.includes("!important")&&(i="important",n=n.replace("!important","")),t=Ember.String.dasherize(t),e.style.setProperty(t,n,i),r.delete(t)})),r.forEach((t=>e.style.removeProperty(t))),this._oldStyles=new Set(t.map((e=>e[0])))}modify(e,t,r){this.setStyles(e,this.getStyles(t,r))}}e.default=n})),define("ember-svg-jar/helpers/svg-jar",["exports","ember-svg-jar/utils/make-svg"],(function(e,t){"use strict"
-function r(e){let t=null
-try{t=require(`ember-svg-jar/inlined/${e}`).default}catch(r){}try{t={}[e].default}catch(r){}return t}function n(e,n){return(0,t.default)(e,n,r)}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0,e.svgJar=n
-e.default=Ember.Helper.helper((function([e],t){return n(e,t)}))})),define("ember-svg-jar/inlined/activity-placeholder",["exports"],(function(e){"use strict"
+n&&n.includes("!important")&&(i="important",n=n.replace("!important","")),t=Ember.String.dasherize(t),e.style.setProperty(t,n,i),r.delete(t)})),r.forEach((t=>e.style.removeProperty(t))),this._oldStyles=new Set(t.map((e=>e[0])))}modify(e,t,r){this.setStyles(e,this.getStyles(t,r))}}e.default=n})),define("ember-svg-jar/helpers/svg-jar",["exports","ember-svg-jar/utils/make-svg","@embroider/macros/es-compat2"],(function(e,t,r){"use strict"
+function n(e){let t=null
+try{t=require(`ember-svg-jar/inlined/${e}`).default}catch(n){}try{t=(0,r.default)(require(`../inlined/${e}`)).default}catch(n){}return t}function i(e,r){return(0,t.default)(e,r,n)}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0,e.svgJar=i
+e.default=Ember.Helper.helper((function([e],t){return i(e,t)}))})),define("ember-svg-jar/inlined/activity-placeholder",["exports"],(function(e){"use strict"
 Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
 e.default={content:'<path clip-rule="evenodd" d="M9.295.422a11 11 0 0112.924 11.614.5.5 0 11-.998-.072 10 10 0 10-9.257 9.257.5.5 0 11.072.998A11 11 0 019.295.422zm.288 4.546a6.5 6.5 0 017.961 4.657.5.5 0 11-.968.25 5.499 5.499 0 10-6.7 6.7.5.5 0 01-.251.97 6.5 6.5 0 01-.042-12.577zm1.388 5.02a1.21 1.21 0 01.725.087h.002l11.4 5.21a1.19 1.19 0 01-.163 2.187L18.92 18.94l-1.449 3.987v.002a1.18 1.18 0 01-2.117.223.5.5 0 01-.029-.054l-5.217-11.394a1.21 1.21 0 01.863-1.716zm.312.997a.21.21 0 00-.274.284l.006.013 5.203 11.363a.18.18 0 00.31-.052l.002-.004 1.53-4.21a.5.5 0 01.298-.299l4.24-1.55.017-.005a.19.19 0 00.11-.27.19.19 0 00-.066-.07l-11.375-5.2z"/>',attrs:{fill:"none",viewBox:"0 0 24 24"}}})),define("ember-svg-jar/inlined/add-view",["exports"],(function(e){"use strict"
 Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
@@ -9522,4 +9522,4 @@ e.default=class{constructor(e){if(this._data=new t.default,e)for(let t=0;t<e.len
 return this}get(e){let t=this._data[e]
 return t===r.UNDEFINED_KEY?void 0:t}set(e,t){return this._data[e]=t,this}delete(e){return this._data[e]=r.UNDEFINED_KEY,!0}}}))
 
-//# sourceMappingURL=vendor-cd719f773d30a657813d1167126edfeb.map
+//# sourceMappingURL=vendor-ae0ef37383c371db894ddba69e9dfe7c.map

package/core/built/admin/index.html

@@ -8,7 +8,7 @@
     <title>Ghost Admin</title>
 
     
-<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22cdnUrl%22%3A%22%22%2C%22editorUrl%22%3A%22%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%225.116%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%2C%22editorFilename%22%3A%22koenig-lexical.umd.js%22%2C%22editorHash%22%3A%2270b6e1c5ab%22%2C%22adminXDemoFilename%22%3A%22admin-x-demo.js%22%2C%22adminXDemoHash%22%3A%22ba6e7c2c75%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%221f15c97ca4%22%2C%22adminXActivitypubFilename%22%3A%22admin-x-activitypub.js%22%2C%22adminXActivitypubHash%22%3A%227fa3fe34af%22%2C%22postsFilename%22%3A%22posts.js%22%2C%22postsHash%22%3A%227ad9127d68%22%2C%22statsFilename%22%3A%22stats.js%22%2C%22statsHash%22%3A%22745f9f9556%22%2C%22adminXActivitypubCustomUrl%22%3A%22https%3A%2F%2Fcdn.jsdelivr.net%2Fghost%2Fadmin-x-activitypub%400%2Fdist%2Fadmin-x-activitypub.js%22%7D" />
+<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22cdnUrl%22%3A%22%22%2C%22editorUrl%22%3A%22%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%225.116%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%2C%22editorFilename%22%3A%22koenig-lexical.umd.js%22%2C%22editorHash%22%3A%2270b6e1c5ab%22%2C%22adminXDemoFilename%22%3A%22admin-x-demo.js%22%2C%22adminXDemoHash%22%3A%22fd54878445%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%22f374d17369%22%2C%22adminXActivitypubFilename%22%3A%22admin-x-activitypub.js%22%2C%22adminXActivitypubHash%22%3A%22bff4438287%22%2C%22postsFilename%22%3A%22posts.js%22%2C%22postsHash%22%3A%222c1461dad3%22%2C%22statsFilename%22%3A%22stats.js%22%2C%22statsHash%22%3A%22ffcc9f090c%22%2C%22adminXActivitypubCustomUrl%22%3A%22https%3A%2F%2Fcdn.jsdelivr.net%2Fghost%2Fadmin-x-activitypub%400%2Fdist%2Fadmin-x-activitypub.js%22%7D" />
 
     <meta name="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -56,9 +56,9 @@
 
     <div id="ember-basic-dropdown-wormhole"></div>
 
-    <script src="assets/vendor-72026232b36d97babc6320917c16c321.js"></script>
-<script src="assets/chunk.713.e9027c0cc3c56110f5da.js"></script>
-<script src="assets/chunk.524.8371443ef8f60db429d0.js"></script>
-    <script src="assets/ghost-03b64c086f3c60cabc85fe7a7e2b640a.js"></script>
+    <script src="assets/vendor-8e3ee8261528bb429cfe78ce79a4a82a.js"></script>
+<script src="assets/chunk.713.761d11035fe0bf3e557c.js"></script>
+<script src="assets/chunk.524.578de86e5014b911b05a.js"></script>
+    <script src="assets/ghost-868c537d5c02ca65323d0122596a67ec.js"></script>
 </body>
 </html>

package/core/frontend/helpers/ghost_head.js

@@ -156,11 +156,15 @@ function getTinybirdTrackerScript(dataRoot) {
         return '';
     }
 
-    const src = getAssetUrl('public/ghost-stats.js');
+    const src = getAssetUrl('public/ghost-stats.js', false);
 
-    const endpoint = config.get('tinybird:tracker:endpoint');
-    const token = config.get('tinybird:tracker:token');
-    const datasource = config.get('tinybird:tracker:datasource');
+    const statsConfig = config.get('tinybird:tracker');
+    const localConfig = config.get('tinybird:tracker:local');
+    const localEnabled = localConfig?.enabled ?? false;
+
+    const endpoint = localEnabled ? localConfig.endpoint : statsConfig.endpoint;
+    const token = localEnabled ? localConfig.token : statsConfig.token;
+    const datasource = localEnabled ? localConfig.datasource : statsConfig.datasource;
 
     const tbParams = _.map({
         site_uuid: config.get('tinybird:tracker:id'),
@@ -360,7 +364,7 @@ module.exports = async function ghost_head(options) { // eslint-disable-line cam
                 head.push(tagCodeInjection);
             }
 
-            if (config.get('tinybird') && config.get('tinybird:tracker') && config.get('tinybird:tracker:scriptUrl')) {
+            if (config.get('tinybird') && config.get('tinybird:tracker')) {
                 head.push(getTinybirdTrackerScript(dataRoot));
             }
 

package/core/frontend/public/ghost-stats.js

@@ -3,11 +3,10 @@
   const STORAGE_KEY = 'session-id'
   let DATASOURCE = 'analytics_events'
   const storageMethods = {
-    cookie: 'cookie',
     localStorage: 'localStorage',
     sessionStorage: 'sessionStorage',
   }
-  let STORAGE_METHOD = storageMethods.cookie
+  let STORAGE_METHOD = storageMethods.localStorage
   let globalAttributes = {}
   let stringifyPayload = true
 
@@ -40,64 +39,37 @@
     )
   }
 
-  function _getSessionIdFromCookie() {
-    let cookie = {}
-    document.cookie.split(';').forEach(function (el) {
-      let [key, value] = el.split('=')
-      cookie[key.trim()] = value
-    })
-    return cookie[STORAGE_KEY]
-  }
-
   function _getSessionId() {
-    if (
-      [storageMethods.localStorage, storageMethods.sessionStorage].includes(
-        STORAGE_METHOD
-      )
-    ) {
-      const storage =
-        STORAGE_METHOD === storageMethods.localStorage
-          ? localStorage
-          : sessionStorage
-      const serializedItem = storage.getItem(STORAGE_KEY)
-
-      if (!serializedItem) {
-        return null
-      }
-
-      let item = null;
-
-      try {
-        item = JSON.parse(serializedItem)
-      } catch (error) {
-        return null
-      }
-
-      if(typeof item !== 'object' || item === null) {
-        return null
-      }
-
-      const now = new Date()
+    const storage =
+      STORAGE_METHOD === storageMethods.localStorage
+        ? localStorage
+        : sessionStorage
+    const serializedItem = storage.getItem(STORAGE_KEY)
+
+    if (!serializedItem) {
+      return null
+    }
 
-      if (now.getTime() > item.expiry) {
-        storage.removeItem(STORAGE_KEY)
-        return null
-      }
+    let item = null;
 
-      return item.value
+    try {
+      item = JSON.parse(serializedItem)
+    } catch (error) {
+      return null
     }
 
-    return _getSessionIdFromCookie()
-  }
+    if(typeof item !== 'object' || item === null) {
+      return null
+    }
 
-  function _setSessionIdFromCookie(sessionId) {
-    let cookieValue = `${STORAGE_KEY}=${sessionId}; Max-Age=1800; path=/; secure`
+    const now = new Date()
 
-    if (domain) {
-      cookieValue += `; domain=${domain}`
+    if (now.getTime() > item.expiry) {
+      storage.removeItem(STORAGE_KEY)
+      return null
     }
 
-    document.cookie = cookieValue
+    return item.value
   }
 
   function _setSessionId() {
@@ -108,25 +80,17 @@
      */
 
     const sessionId = _getSessionId() || _uuidv4()
-    if (
-      [storageMethods.localStorage, storageMethods.sessionStorage].includes(
-        STORAGE_METHOD
-      )
-    ) {
-      const now = new Date()
-      const item = {
-        value: sessionId,
-        expiry: now.getTime() + 14400 * 1000, // 4 hours
-      }
-      const value = JSON.stringify(item)
-      const storage =
-        STORAGE_METHOD === storageMethods.localStorage
-          ? localStorage
-          : sessionStorage
-      return STORAGE_METHOD === storage.setItem(STORAGE_KEY, value)
+    const now = new Date()
+    const item = {
+      value: sessionId,
+      expiry: now.getTime() + 14400 * 1000, // 4 hours
     }
-
-    return _setSessionIdFromCookie(sessionId)
+    const value = JSON.stringify(item)
+    const storage =
+      STORAGE_METHOD === storageMethods.localStorage
+        ? localStorage
+        : sessionStorage
+    storage.setItem(STORAGE_KEY, value)
   }
 
   /**
@@ -176,11 +140,11 @@
    *
    * @param  { string } name Event name
    * @param  { object } payload Event payload
-   * @return { object } request response
+   * @return { Promise<any> } request response
    */
   async function _sendEvent(name, payload) {
     _setSessionId()
-    const url = `https://e.ghost.org/tb/web_analytics?name=${DATASOURCE}&token=${token}`
+    const url = `${host}?name=${DATASOURCE}&token=${token}`
 
     let processedPayload
     if (stringifyPayload) {
@@ -240,14 +204,14 @@
         'user-agent': window.navigator.userAgent,
         locale,
         location: country,
-        referrer: getReferrer(),
+        referrer: _getReferrer(),
         pathname: window.location.pathname,
         href: window.location.href,
       })
     }, 300)
   }
 
-  function getReferrer() {
+  function _getReferrer() {
     // Fetch referrer data from query params - priority is the following order: ref, source, utm_source, utm_medium, referrer
     let refParam;
     let sourceParam;
@@ -301,7 +265,10 @@
   }
 
   // Client
-  window.Tinybird = { trackEvent: _sendEvent }
+  window.Tinybird = { 
+    trackEvent: _sendEvent,
+    _trackPageHit: _trackPageHit
+  }
 
   // Event listener
   window.addEventListener('hashchange', _trackPageHit)

package/core/server/data/tinybird/datasources/_mv_hits.datasource

@@ -0,0 +1,23 @@
+
+
+SCHEMA >
+    `site_uuid` LowCardinality(String),
+    `timestamp` DateTime,
+    `action` LowCardinality(String),
+    `version` LowCardinality(String),
+    `session_id` String,
+    `member_uuid` String,
+    `member_status` String,
+    `post_uuid` String,
+    `post_type` String,
+    `location` String,
+    `source` String,
+    `pathname` String,
+    `href` String,
+    `device` String,
+    `os` String,
+    `browser` String
+
+ENGINE "MergeTree"
+ENGINE_PARTITION_KEY "toYYYYMM(timestamp)"
+ENGINE_SORTING_KEY "site_uuid, timestamp, session_id"

package/core/server/data/tinybird/datasources/analytics_events.datasource

@@ -0,0 +1,14 @@
+TOKEN "tracker" APPEND
+
+
+SCHEMA >
+    `timestamp` DateTime `json:$.timestamp`,
+    `session_id` String `json:$.session_id`,
+    `action` LowCardinality(String) `json:$.action`,
+    `version` LowCardinality(String) `json:$.version`,
+    `payload` JSON(max_dynamic_types=4, max_dynamic_paths=32) `json:$.payload`,
+    `site_uuid` LowCardinality(String) `json:$.payload.site_uuid`
+
+ENGINE "MergeTree"
+ENGINE_PARTITION_KEY "toYYYYMM(timestamp)"
+ENGINE_SORTING_KEY "site_uuid, timestamp"

package/core/server/data/tinybird/endpoints/api_kpis.pipe

@@ -0,0 +1,161 @@
+TOKEN "stats_page" READ
+
+NODE timeseries
+SQL >
+
+    %
+        {% set _single_day = defined(date_from) and day_diff(date_from, date_to) == 0 %}
+        with
+            {% if defined(date_from) %}
+                toStartOfDay(
+                    toDate(
+                        {{
+                            Date(
+                                date_from,
+                                description="Starting day for filtering a date range",
+                                required=False,
+                            )
+                        }}
+                    )
+                ) as start,
+            {% else %} toStartOfDay(timestampAdd(today(), interval -7 day)) as start,
+            {% end %}
+            {% if defined(date_to) %}
+                toStartOfDay(
+                    toDate(
+                        {{
+                            Date(
+                                date_to,
+                                description="Finishing day for filtering a date range",
+                                required=False,
+                            )
+                        }}
+                    )
+                ) as end
+            {% else %} toStartOfDay(today()) as end
+            {% end %}
+        {% if _single_day %}
+            select
+                arrayJoin(
+                    arrayMap(
+                        x -> toDateTime(toString(toDateTime(x)), {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}}),
+                        range(
+                            toUInt32(toDateTime(start)), toUInt32(timestampAdd(end, interval 1 day)), 3600
+                        )
+                    )
+                ) as date
+        {% else %}
+            select
+                arrayJoin(
+                    arrayMap(
+                        x -> toDate(x),
+                        range(toUInt32(start), toUInt32(timestampAdd(end, interval 1 day)), 24 * 3600)
+                    )
+                ) as date
+        {% end %}
+
+
+NODE session_metrics
+DESCRIPTION >
+    Calculate session-level metrics (visits, pageviews, bounce rate, avg session duration)
+
+SQL >
+
+    %
+        select
+            site_uuid,
+            {% if defined(date_from) and day_diff(date_from, date_to) == 0 %}
+                toStartOfHour(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) as date,
+            {% else %}
+                toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) as date,
+            {% end %}
+            session_id,
+            pageviews,
+            is_bounce,
+            duration as session_sec
+        from mv_session_data sd
+            inner join filtered_sessions fs
+                on fs.session_id = sd.session_id
+        where
+            site_uuid = {{ String(site_uuid, 'mock_site_uuid', description="Tenant ID", required=True) }}
+            {% if defined(date_from) and day_diff(date_from, date_to) == 0 %}
+                and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) = {{ Date(date_from) }}
+            {% else %}
+                {% if defined(date_from) %} and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) >= {{ Date(date_from) }} {% else %} and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) >= timestampAdd(today(), interval -7 day) {% end %}
+                {% if defined(date_to) %} and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) <= {{ Date(date_to) }} {% else %} and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) <= today() {% end %}
+            {% end %}
+
+
+NODE data
+DESCRIPTION >
+    Calculate KPIs per time period
+
+SQL >
+
+    select
+        a.date,
+        uniq(distinct s.session_id) as visits,
+        sum(s.pageviews) as pageviews,
+        truncate(avg(s.is_bounce), 2) as bounce_rate,
+        truncate(avg(s.session_sec), 2) as avg_session_sec
+    from timeseries a
+    inner join session_metrics s on a.date = s.date
+    group by a.date
+    order by a.date
+
+
+NODE pathname_pageviews
+DESCRIPTION >
+    Calculate pageviews for specific pathname with time granularity handling
+
+SQL >
+
+    %
+            select
+                {% if defined(date_from) and day_diff(date_from, date_to) == 0 %}
+                    toStartOfHour(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) as date,
+                {% else %}
+                    toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) as date,
+                {% end %}
+                count() pageviews
+            from timeseries a
+            inner join _mv_hits h on
+                {% if defined(date_from) and day_diff(date_from, date_to) == 0 %}
+                    a.date = toStartOfHour(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}}))
+                {% else %}
+                    a.date = toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}}))
+                {% end %}
+            where
+                site_uuid = {{ String(site_uuid, 'mock_site_uuid', description="Tenant ID", required=True) }}
+                {% if defined(date_from) and day_diff(date_from, date_to) == 0 %}
+                    and toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) = {{ Date(date_from) }}
+                {% else %}
+                    {% if defined(date_from) %} and toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) >= {{ Date(date_from) }} {% else %} and toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) >= timestampAdd(today(), interval -7 day) {% end %}
+                    {% if defined(date_to) %} and toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) <= {{ Date(date_to) }} {% else %} and toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) <= today() {% end %}
+                {% end %}
+                {% if defined(member_status) %} and member_status IN {{ Array(member_status, "'undefined', 'free', 'paid'", description="Member status to filter on", required=False) }} {% end %}
+                {% if defined(device) %} and device = {{ String(device, description="Device to filter on", required=False) }} {% end %}
+                {% if defined(browser) %} and browser = {{ String(browser, description="Browser to filter on", required=False) }} {% end %}
+                {% if defined(os) %} and os = {{ String(os, description="Operating system to filter on", required=False) }} {% end %}
+                {% if defined(source) %} and source = {{ String(source, description="Source to filter on", required=False) }} {% end %}
+                {% if defined(location) %} and location = {{ String(location, description="Location to filter on", required=False) }} {% end %}
+                {% if defined(pathname) %} and pathname = {{ String(pathname, description="Pathname to filter on", required=False) }} {% end %}
+            group by date
+            order by date
+
+
+NODE finished_data
+SQL >
+
+    %
+            select
+                a.date as date,
+                coalesce(b.visits, 0) as visits,
+                {% if defined(pathname) %}coalesce(c.pageviews, 0){% else %}coalesce(b.pageviews, 0){% end %} as pageviews,
+                coalesce(b.bounce_rate, 0) as bounce_rate,
+                coalesce(b.avg_session_sec, 0) as avg_session_sec
+            from timeseries a
+            left join data b on a.date = b.date
+            {% if defined(pathname) %}left join pathname_pageviews c on a.date = c.date{% end %}
+
+TYPE ENDPOINT

package/core/server/data/tinybird/endpoints/api_top_browsers.pipe

@@ -0,0 +1,52 @@
+TOKEN "stats_page" READ
+
+NODE _top_browsers_0
+SQL >
+
+    %
+        select
+            browser,
+            uniqExact(session_id) as visits
+        from _mv_hits h
+        inner join filtered_sessions fs
+            on fs.session_id = h.session_id
+        where
+            site_uuid = {{String(site_uuid, 'mock_site_uuid', description="Tenant ID", required=True)}}
+            {% if defined(date_from) %}
+                and toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}}))
+                >=
+                {{ Date(date_from, description="Starting day for filtering a date range", required=False) }}
+            {% else %}
+                and toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}}))
+                >=
+                timestampAdd(today(), interval -7 day)
+            {% end %}
+            {% if defined(date_to) %}
+                and toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}}))
+                <=
+                {{ Date(date_to, description="Finishing day for filtering a date range", required=False) }}
+            {% else %}
+                and toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}}))
+                <=
+                today()
+            {% end %}
+            {% if defined(member_status) %}
+                and member_status IN (
+                    select arrayJoin(
+                        {{ Array(member_status, "'undefined', 'free', 'paid'", description="Member status to filter on", required=False) }}
+                        || if('paid' IN {{ Array(member_status) }}, ['comped'], [])
+                    )
+                )
+            {% end %}
+            {% if defined(device) %} and device = {{ String(device, description="Device to filter on", required=False) }} {% end %}
+            {% if defined(browser) %} and browser = {{ String(browser, description="Browser to filter on", required=False) }} {% end %}
+            {% if defined(os) %} and os = {{ String(os, description="Operating system to filter on", required=False) }} {% end %}
+            -- added source filter back
+            {% if defined(source) %} and source = {{ String(source, description="Source to filter on", required=False) }} {% end %}
+            {% if defined(location) %} and location = {{ String(location, description="Location to filter on", required=False) }} {% end %}
+            {% if defined(pathname) %} and pathname = {{ String(pathname, description="Pathname to filter on", required=False) }} {% end %}
+        group by browser
+        order by visits desc
+        limit {{ Int32(skip, 0) }},{{ Int32(limit, 50) }}
+
+TYPE ENDPOINT

package/core/server/data/tinybird/endpoints/api_top_devices.pipe

@@ -0,0 +1,51 @@
+TOKEN "stats_page" READ
+
+NODE _top_devices_0
+SQL >
+
+    %
+        select
+            device,
+            uniqExact(session_id) as visits
+        from _mv_hits h
+        inner join filtered_sessions fs
+            on fs.session_id = h.session_id
+        where
+            site_uuid = {{String(site_uuid, 'mock_site_uuid', description="Tenant ID", required=True)}}
+            {% if defined(date_from) %}
+                and toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}}))
+                >=
+                {{ Date(date_from, description="Starting day for filtering a date range", required=False) }}
+            {% else %}
+                and toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}}))
+                >=
+                timestampAdd(today(), interval -7 day)
+            {% end %}
+            {% if defined(date_to) %}
+                and toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}}))
+                <=
+                {{ Date(date_to, description="Finishing day for filtering a date range", required=False) }}
+            {% else %}
+                and toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}}))
+                <=
+                today()
+            {% end %}
+            {% if defined(member_status) %}
+                and member_status IN (
+                    select arrayJoin(
+                        {{ Array(member_status, "'undefined', 'free', 'paid'", description="Member status to filter on", required=False) }}
+                        || if('paid' IN {{ Array(member_status) }}, ['comped'], [])
+                    )
+                )
+            {% end %}
+            {% if defined(device) %} and device = {{ String(device, description="Device to filter on", required=False) }} {% end %}
+            {% if defined(browser) %} and browser = {{ String(browser, description="Browser to filter on", required=False) }} {% end %}
+            {% if defined(os) %} and os = {{ String(os, description="Operating system to filter on", required=False) }} {% end %}
+            {% if defined(source) %} and source = {{ String(source, description="Source to filter on", required=False) }} {% end %}
+            {% if defined(location) %} and location = {{ String(location, description="Location to filter on", required=False) }} {% end %}
+            {% if defined(pathname) %} and pathname = {{ String(pathname, description="Pathname to filter on", required=False) }} {% end %}
+        group by device
+        order by visits desc
+        limit {{ Int32(skip, 0) }},{{ Int32(limit, 50) }}
+
+TYPE ENDPOINT

package/core/server/data/tinybird/endpoints/api_top_locations.pipe

@@ -0,0 +1,51 @@
+TOKEN "stats_page" READ
+
+NODE _top_locations_0
+SQL >
+
+    %
+        select
+            location,
+            uniqExact(session_id) as visits
+        from _mv_hits h
+        inner join filtered_sessions fs
+            on fs.session_id = h.session_id
+        where
+            site_uuid = {{String(site_uuid, 'mock_site_uuid', description="Tenant ID", required=True)}}
+            {% if defined(date_from) %}
+                and toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}}))
+                >=
+                {{ Date(date_from, description="Starting day for filtering a date range", required=False) }}
+            {% else %}
+                and toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}}))
+                >=
+                timestampAdd(today(), interval -7 day)
+            {% end %}
+            {% if defined(date_to) %}
+                and toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}}))
+                <=
+                {{ Date(date_to, description="Finishing day for filtering a date range", required=False) }}
+            {% else %}
+                and toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}}))
+                <=
+                today()
+            {% end %}
+            {% if defined(member_status) %}
+                and member_status IN (
+                    select arrayJoin(
+                        {{ Array(member_status, "'undefined', 'free', 'paid'", description="Member status to filter on", required=False) }}
+                        || if('paid' IN {{ Array(member_status) }}, ['comped'], [])
+                    )
+                )
+            {% end %}
+            {% if defined(device) %} and device = {{ String(device, description="Device to filter on", required=False) }} {% end %}
+            {% if defined(browser) %} and browser = {{ String(browser, description="Browser to filter on", required=False) }} {% end %}
+            {% if defined(os) %} and os = {{ String(os, description="Operating system to filter on", required=False) }} {% end %}
+            {% if defined(source) %} and source = {{ String(source, description="Source to filter on", required=False) }} {% end %}
+            {% if defined(location) %} and location = {{ String(location, description="Location to filter on", required=False) }} {% end %}
+            {% if defined(pathname) %} and pathname = {{ String(pathname, description="Pathname to filter on", required=False) }} {% end %}
+        group by location
+        order by visits desc
+        limit {{ Int32(skip, 0) }},{{ Int32(limit, 50) }}
+
+TYPE ENDPOINT