Fixed event search. Removed session time from profile.

src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.tsx

@@ -10,22 +10,24 @@ export function SessionData({ websiteId, sessionId }: { websiteId: string; sessi
   const { data, ...query } = useSessionData(websiteId, sessionId);
 
   return (
-    <LoadingPanel className={styles.data} {...query} data={data}>
+    <>
       <div className={styles.header}>{formatMessage(labels.properties)}</div>
-      {!data?.length && <Empty className={styles.empty} />}
+      <LoadingPanel className={styles.data} {...query} data={data}>
-      {data?.map(({ dataKey, dataType, stringValue }) => {
+        {!data?.length && <Empty className={styles.empty} />}
-        return (
+        {data?.map(({ dataKey, dataType, stringValue }) => {
-          <div key={dataKey}>
+          return (
-            <div className={styles.label}>
+            <div key={dataKey}>
-              <div className={styles.name}>
+              <div className={styles.label}>
-                <TextOverflow>{dataKey}</TextOverflow>
+                <div className={styles.name}>
+                  <TextOverflow>{dataKey}</TextOverflow>
+                </div>
+                <div className={styles.type}>{DATA_TYPES[dataType]}</div>
               </div>
-              <div className={styles.type}>{DATA_TYPES[dataType]}</div>
+              <div className={styles.value}>{stringValue}</div>
             </div>
-            <div className={styles.value}>{stringValue}</div>
+          );
-          </div>
+        })}
-        );
+      </LoadingPanel>
-      })}
+    </>
-    </LoadingPanel>
   );
 }

src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionStats.tsx

@@ -1,31 +1,15 @@
 import { useMessages } from 'components/hooks';
 import MetricCard from 'components/metrics/MetricCard';
 import MetricsBar from 'components/metrics/MetricsBar';
-import { formatShortTime } from 'lib/format';
 
 export function SessionStats({ data }) {
   const { formatMessage, labels } = useMessages();
-  const duration = (new Date(data?.lastAt).getTime() - new Date(data?.firstAt).getTime()) / 1000;
-  let dateFormat;
-
-  if (duration > 86400) {
-    dateFormat = ['d', 'm'];
-  } else if (duration > 3600) {
-    dateFormat = ['h', 'm'];
-  } else {
-    dateFormat = ['m', 's'];
-  }
 
   return (
     <MetricsBar isFetched={true}>
       <MetricCard label={formatMessage(labels.visits)} value={data?.visits} />
       <MetricCard label={formatMessage(labels.views)} value={data?.views} />
       <MetricCard label={formatMessage(labels.events)} value={data?.events} />
-      <MetricCard
-        label={formatMessage(labels.sessionDuration)}
-        value={duration}
-        formatValue={n => `${+n < 0 ? '-' : ''}${formatShortTime(Math.abs(~~n), dateFormat, ' ')}`}
-      />
     </MetricsBar>
   );
 }

src/components/messages.ts

@@ -141,7 +141,6 @@ export const labels = defineMessages({
   bounceRate: { id: 'label.bounce-rate', defaultMessage: 'Bounce rate' },
   viewsPerVisit: { id: 'label.views-per-visit', defaultMessage: 'Views per visit' },
   visitDuration: { id: 'label.visit-duration', defaultMessage: 'Visit duration' },
-  sessionDuration: { id: 'label.session-duration', defaultMessage: 'Session duration' },
   desktop: { id: 'label.desktop', defaultMessage: 'Desktop' },
   laptop: { id: 'label.laptop', defaultMessage: 'Laptop' },
   tablet: { id: 'label.tablet', defaultMessage: 'Tablet' },

src/queries/analytics/events/getWebsiteEvents.ts

@@ -14,10 +14,12 @@ export function getWebsiteEvents(
 
 async function relationalQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
   const { pagedQuery } = prisma;
+  const { query } = pageParams;
 
   const where = {
     ...filters,
     id: websiteId,
+    ...prisma.getSearchParameters(query, [{ eventName: 'contains' }, { urlPath: 'contains' }]),
   };
 
   return pagedQuery('website_event', { where }, pageParams);
@@ -47,7 +49,12 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
     where website_id = {websiteId:UUID}
     ${dateQuery}
     ${filterQuery}
-    ${query ? `and (positionCaseInsensitive(event_name, {query:String}) > 0)` : ''}
+    ${
+      query
+        ? `and (positionCaseInsensitive(event_name, {query:String}) > 0
+           or positionCaseInsensitive(url_path, {query:String}) > 0)`
+        : ''
+    }
     order by created_at desc
     `,
     { ...params, query },

src/queries/analytics/sessions/getWebsiteSessions.ts

@@ -14,12 +14,10 @@ export async function getWebsiteSessions(
 
 async function relationalQuery(websiteId: string, filters: QueryFilters, pageParams: PageParams) {
   const { pagedQuery } = prisma;
-  const { query } = pageParams;
 
   const where = {
     ...filters,
     id: websiteId,
-    ...prisma.getSearchParameters(query, [{ eventName: 'contains' }, { urlPath: 'contains' }]),
   };
 
   return pagedQuery('session', { where }, pageParams);
@@ -28,7 +26,6 @@ async function relationalQuery(websiteId: string, filters: QueryFilters, pagePar
 async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
   const { pagedQuery, parseFilters } = clickhouse;
   const { params, dateQuery, filterQuery } = await parseFilters(websiteId, filters);
-  const { query } = pageParams;
 
   return pagedQuery(
     `
@@ -52,14 +49,22 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
     where website_id = {websiteId:UUID}
     ${dateQuery}
     ${filterQuery}
-    ${query ? `and (positionCaseInsensitive(event_name, {query:String}) > 0)` : ''}
     group by session_id, website_id, hostname, browser, os, device, screen, language, country, subdivision1, city
     order by lastAt desc
     `,
     params,
     pageParams,
-  ).then((result: any) => ({
+  ).then((result: any) => {
-    ...result,
+    return {
-    visits: Number(result.visits),
+      ...result,
-  }));
+      data: result.data.map((row: any) => {
+        return {
+          ...row,
+          createdAt: row.firstAt,
+          visits: Number(row.visits),
+          views: Number(row.views),
+        };
+      }),
+    };
+  });
 }