Merge remote-tracking branch 'origin/dev' into dev

src/components/hooks/useFormat.js

@@ -2,6 +2,7 @@ import useMessages from './useMessages';
 import { BROWSERS } from 'lib/constants';
 import useLocale from './useLocale';
 import useCountryNames from './useCountryNames';
+import regions from 'public/iso-3166-2.json';
 
 export function useFormat() {
   const { formatMessage, labels } = useMessages();
@@ -16,6 +17,10 @@ export function useFormat() {
     return countryNames[value] || value;
   };
 
+  const formatRegion = value => {
+    return regions[value] ? regions[value] : value;
+  };
+
   const formatDevice = value => {
     return formatMessage(labels[value] || labels.unknown);
   };
@@ -26,6 +31,8 @@ export function useFormat() {
         return formatBrowser(value);
       case 'country':
         return formatCountry(value);
+      case 'region':
+        return formatRegion(value);
       case 'device':
         return formatDevice(value);
       default:
@@ -33,7 +40,7 @@ export function useFormat() {
     }
   };
 
-  return { formatBrowser, formatCountry, formatDevice, formatValue };
+  return { formatBrowser, formatCountry, formatRegion, formatDevice, formatValue };
 }
 
 export default useFormat;

src/lib/clickhouse.ts

@@ -112,7 +112,7 @@ async function parseFilters(websiteId: string, filters: QueryFilters = {}, optio
     params: {
       ...normalizeFilters(filters),
       websiteId,
-      startDate: maxDate(filters.startDate, website.resetAt),
+      startDate: maxDate(filters.startDate, new Date(website.resetAt)),
       websiteDomain: website.domain,
     },
   };

src/pages/api/websites/[id]/values.ts

@@ -6,7 +6,7 @@ import { badRequest, methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { EVENT_COLUMNS, FILTER_COLUMNS, SESSION_COLUMNS } from 'lib/constants';
 import { getValues } from 'queries';
 
-export interface WebsiteResetRequestQuery {
+export interface ValuesRequestQuery {
   id: string;
 }
 
@@ -17,10 +17,7 @@ const schema = {
   }),
 };
 
-export default async (
+export default async (req: NextApiRequestQueryBody<ValuesRequestQuery>, res: NextApiResponse) => {
-  req: NextApiRequestQueryBody<WebsiteResetRequestQuery>,
-  res: NextApiResponse,
-) => {
   await useCors(req, res);
   await useAuth(req, res);
 

src/queries/admin/website.ts

@@ -297,7 +297,7 @@ export async function resetWebsite(
     }),
   ]).then(async data => {
     if (cache.enabled) {
-      await cache.storeWebsite(data[2]);
+      await cache.storeWebsite(data[3]);
     }
 
     return data;