Merge branch 'dev' of https://github.com/umami-software/umami into francis/uc-24-kafka-test

lib/constants.js

@@ -9,6 +9,7 @@ export const SHARE_TOKEN_HEADER = 'x-umami-share-token';
 export const HOMEPAGE_URL = 'https://umami.is';
 export const REPO_URL = 'https://github.com/umami-software/umami';
 export const UPDATES_URL = 'https://api.umami.is/v1/updates';
+export const TELEMETRY_PIXEL = 'https://i.umami.is/a.png';
 
 export const DEFAULT_LOCALE = 'en-US';
 export const DEFAULT_THEME = 'light';

lib/db.js

@@ -217,7 +217,7 @@ export function getFilterQuery(table, column, filters = {}, params = []) {
         }
         break;
 
-      case 'event_type':
+      case 'event_name':
         if (table === 'event') {
           arr.push(`and ${table}.${key}=$${params.length + 1}`);
           params.push(decodeURIComponent(filter));
@@ -247,17 +247,17 @@ 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_type } = filters;
+  const { domain, url, event_url, referrer, os, browser, device, country, event_name } = filters;
 
   const pageviewFilters = { domain, url, referrer };
   const sessionFilters = { os, browser, device, country };
-  const eventFilters = { url: event_url, event_type };
+  const eventFilters = { url: event_url, event_name };
 
   return {
     pageviewFilters,
     sessionFilters,
     eventFilters,
-    event: { event_type },
+    event: { event_name },
     joinSession:
       os || browser || device || country
         ? `inner join session on ${table}.${sessionKey} = session.${sessionKey}`

lib/format.js

@@ -78,3 +78,14 @@ export function stringToColor(str) {
   }
   return color;
 }
+
+export function orderByWebsiteMap(websites, orderMap) {
+  if (!websites) return [];
+
+  let ordered = [...websites];
+  for (let website of websites) {
+    ordered[orderMap[website.website_uuid]] = website;
+  }
+
+  return ordered;
+}

lib/lang.js

@@ -1,5 +1,6 @@
 import {
   arSA,
+  bn,
   cs,
   sk,
   da,
@@ -30,6 +31,7 @@ import {
   sl,
   sv,
   ta,
+  th,
   tr,
   uk,
   zhCN,
@@ -41,6 +43,7 @@ import {
 
 export const languages = {
   'ar-SA': { label: 'العربية', dateLocale: arSA, dir: 'rtl' },
+  'bn-BD': { label: 'বাংলা', dateLocale: bn },
   'zh-CN': { label: '中文', dateLocale: zhCN },
   'zh-TW': { label: '中文(繁體)', dateLocale: zhTW },
   'ca-ES': { label: 'Català', dateLocale: ca },
@@ -77,6 +80,7 @@ export const languages = {
   'fi-FI': { label: 'Suomi', dateLocale: fi },
   'sv-SE': { label: 'Svenska', dateLocale: sv },
   'ta-IN': { label: 'தமிழ்', dateLocale: ta },
+  'th-TH': { label: 'ภาษาไทย', dateLocale: th },
   'tr-TR': { label: 'Türkçe', dateLocale: tr },
   'uk-UA': { label: 'українська', dateLocale: uk },
   'ur-PK': { label: 'Urdu (Pakistan)', dateLocale: uk, dir: 'rtl' },

lib/request.js

@@ -68,7 +68,7 @@ export async function getCountry(req, ip) {
 
   // Database lookup
   if (!lookup) {
-    lookup = await maxmind.open(path.resolve('./public/geo/GeoLite2-Country.mmdb'));
+    lookup = await maxmind.open(path.resolve('node_modules/.geo/GeoLite2-Country.mmdb'));
   }
 
   const result = lookup.get(ip);

lib/web.js

@@ -61,10 +61,17 @@ export const setItem = (key, data, session) => {
   }
 };
 
-export const getItem = (key, session) =>
-  typeof window !== 'undefined'
-    ? JSON.parse((session ? sessionStorage : localStorage).getItem(key) || null)
-    : null;
+export const getItem = (key, session) => {
+  if (typeof window !== 'undefined') {
+    const value = (session ? sessionStorage : localStorage).getItem(key);
+
+    if (value !== 'undefined') {
+      return JSON.parse(value);
+    }
+  }
+
+  return null;
+};
 
 export const removeItem = (key, session) => {
   if (typeof window !== 'undefined') {