Merge branch 'dev' into unknown-count

lib/constants.js

@@ -80,7 +80,7 @@ export const POSTGRESQL_DATE_FORMATS = {
   year: 'YYYY-01-01',
 };
 
-export const DOMAIN_REGEX = /localhost(:\d{1,5})?|((?=[a-z0-9-]{1,63}\.)(xn--)?[a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,63}/;
+export const DOMAIN_REGEX = /^localhost(:\d{1,5})?|((?=[a-z0-9-]{1,63}\.)(xn--)?[a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,63}$/;
 
 export const DESKTOP_SCREEN_WIDTH = 1920;
 export const LAPTOP_SCREEN_WIDTH = 1024;

lib/filters.js

@@ -115,6 +115,17 @@ export const refFilter = (data, { domain, domainOnly, raw }) => {
 
 export const browserFilter = data => data.map(({ x, y }) => ({ x: BROWSERS[x] ?? x, y }));
 
+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 }));

lib/lang.js

@@ -118,6 +118,11 @@ export const dateLocales = {
   'it-IT': it,
 };
 
+const timeFormats = {
+  // https://date-fns.org/v2.17.0/docs/format
+  'en-US': 'ha',
+};
+
 export const menuOptions = [
   { label: '中文', value: 'zh-CN', display: 'cn' },
   { label: '中文(繁體)', value: 'zh-TW', display: 'tw' },
@@ -152,3 +157,7 @@ export const menuOptions = [
 export function dateFormat(date, str, locale) {
   return format(date, str, { locale: dateLocales[locale] || enUS });
 }
+
+export function timeFormat(date, locale = 'en-US') {
+  return format(date, timeFormats[locale] || 'p', { locale: dateLocales[locale] });
+}

lib/queries.js

@@ -501,6 +501,41 @@ export function getEventMetrics(
   );
 }
 
+export function getEventTypes(
+  website_id,
+  start_at,
+  end_at,
+  timezone = 'utc',
+  unit = 'day',
+  filters = {},
+) {
+  const params = [website_id, start_at, end_at];
+  const { url } = filters;
+
+  let urlFilter = '';
+
+  if (url) {
+    urlFilter = `and url=$${params.length + 1}`;
+    params.push(decodeURIComponent(url));
+  }
+
+  return rawQuery(
+    `
+    select
+      event_type x,
+      ${getDateQuery('created_at', unit, timezone)} t,
+      count(*) y
+    from event
+    where website_id=$1
+    and created_at between $2 and $3
+    ${urlFilter}
+    group by 1, 2
+    order by 2
+    `,
+    params,
+  );
+}
+
 export async function getRealtimeData(websites, time) {
   const [pageviews, sessions, events] = await Promise.all([
     getPageviews(websites, time),