From b592695a49cbe8a36e710d9f38ac0fa656eca7a5 Mon Sep 17 00:00:00 2001
From: Emily <adharaultimasheireen@gmail.com>
Date: Wed, 5 Feb 2025 16:02:32 +0100
Subject: [PATCH] add domain filter on events

---
 .../components/selector/DomainSelector.vue    |  2 +-
 .../composables/snapshots/BaseSnapshots.ts    |  2 +-
 dashboard/pages/events.vue                    | 30 ++++++++++++-------
 dashboard/server/api/data/count.ts            | 12 ++++----
 dashboard/server/api/data/events.ts           | 12 ++++----
 dashboard/server/api/timeline/events.ts       |  2 +-
 .../server/api/timeline/events_stacked.ts     |  9 +++---
 dashboard/server/api/timeline/visits.ts       |  5 ++--
 shared_global/schema/metrics/EventSchema.ts   |  2 ++
 shared_global/schema/metrics/SessionSchema.ts |  2 ++
 10 files changed, 47 insertions(+), 31 deletions(-)

diff --git a/dashboard/components/selector/DomainSelector.vue b/dashboard/components/selector/DomainSelector.vue
index 292a3e6..847196c 100644
--- a/dashboard/components/selector/DomainSelector.vue
+++ b/dashboard/components/selector/DomainSelector.vue
@@ -16,7 +16,7 @@ function onChange(e: string) {
             base: 'z-[999] hover:!bg-lyx-lightmode-widget-light dark:hover:!bg-lyx-widget-lighter cursor-pointer',
             active: '!bg-lyx-lightmode-widget-light dark:!bg-lyx-widget-lighter'
         }
-    }" class="w-full" v-if="domainList" @change="onChange" :value="domain" :options="domainList">
+    }" class="w-full" searchable v-if="domainList" @change="onChange" :value="domain" :options="domainList">
 
         <template #option="{ option, active, selected }">
             <div class="flex items-center gap-2">
diff --git a/dashboard/composables/snapshots/BaseSnapshots.ts b/dashboard/composables/snapshots/BaseSnapshots.ts
index 5a50d34..939e2e2 100644
--- a/dashboard/composables/snapshots/BaseSnapshots.ts
+++ b/dashboard/composables/snapshots/BaseSnapshots.ts
@@ -76,7 +76,7 @@ export function getDefaultSnapshots(project_id: TProjectSnapshot['project_id'],
         project_id,
         _id: '___allTime' as any,
         name: 'All Time',
-        from: fns.addMinutes(fns.startOfMonth(new Date(project_created_at.toString())), -new Date().getTimezoneOffset()),
+        from: fns.addMinutes(fns.startOfMonth(new Date(project_created_at.toString())), 0),
         to: new Date(Date.now()),
         color: '#9362FF',
         default: true
diff --git a/dashboard/pages/events.vue b/dashboard/pages/events.vue
index fcfa340..d8be4c4 100644
--- a/dashboard/pages/events.vue
+++ b/dashboard/pages/events.vue
@@ -1,14 +1,25 @@
 <script lang="ts" setup>
 import EventsFunnelChart from '~/components/events/EventsFunnelChart.vue';
-
+import DateService, { type Slice } from '@services/DateService';
 
 definePageMeta({ layout: 'dashboard' });
 
-const selectLabelsEvents = [
+
+const { snapshotDuration } = useSnapshot();
+
+const selectedLabelIndex = ref<number>(0);
+
+const selectLabels: { label: string, value: Slice }[] = [
+    { label: 'Hour', value: 'hour' },
     { label: 'Day', value: 'day' },
     { label: 'Month', value: 'month' },
 ];
-const eventsStackedSelectIndex = ref<number>(0);
+
+const selectLabelsAvailable = computed<{ label: string, value: Slice, disabled: boolean }[]>(() => {
+    return selectLabels.map(e => {
+        return { ...e, disabled: !DateService.canUseSliceFromDays(snapshotDuration.value, e.value)[0] }
+    });
+})
 
 const eventsData = await useFetch(`/api/data/count`, { headers: useComputedHeaders({ custom: { 'x-schema': 'events' } }), lazy: true });
 
@@ -24,9 +35,6 @@ const eventsData = await useFetch(`/api/data/count`, { headers: useComputedHeade
                 <div>
                     Total events: {{ eventsData.data.value?.[0]?.count || '0' }}
                 </div>
-                <div v-if="(eventsData.data.value?.[0]?.count || 0) === 0">
-                    Waiting for your first event...
-                </div>
             </div>
             <div>
                 <LyxUiButton type="secondary" target="_blank" to="https://docs.litlyx.com/custom-events">
@@ -45,12 +53,14 @@ const eventsData = await useFetch(`/api/data/count`, { headers: useComputedHeade
             <CardTitled :key="refreshKey" class="p-4 xl:flex-[4] w-full h-full" title="Events"
                 sub="Events stacked bar chart.">
                 <template #header>
-                    <SelectButton @changeIndex="eventsStackedSelectIndex = $event"
-                        :currentIndex="eventsStackedSelectIndex" :options="selectLabelsEvents">
-                    </SelectButton>
+
+                    <SelectButton class="w-fit" @changeIndex="selectedLabelIndex = $event" :currentIndex="selectedLabelIndex"
+                :options="selectLabelsAvailable">
+            </SelectButton>
+
                 </template>
                 <div class="h-full">
-                    <EventsStackedBarChart :slice="(selectLabelsEvents[eventsStackedSelectIndex].value as any)">
+                    <EventsStackedBarChart :slice="(selectLabelsAvailable[selectedLabelIndex].value as any)">
                     </EventsStackedBarChart>
                 </div>
             </CardTitled>
diff --git a/dashboard/server/api/data/count.ts b/dashboard/server/api/data/count.ts
index b9dbdab..e7209da 100644
--- a/dashboard/server/api/data/count.ts
+++ b/dashboard/server/api/data/count.ts
@@ -1,17 +1,16 @@
 
 import { Redis } from "~/server/services/CacheService";
-import { getRequestDataOld } from "~/server/utils/getRequestData";
 
 export default defineEventHandler(async event => {
 
 
-    const data = await getRequestDataOld(event, { requireSchema: true });
+    const data = await getRequestData(event, ['GUEST', 'DOMAIN', 'RANGE', 'SCHEMA']);
     if (!data) return;
 
-    const { schemaName, pid, from, to, model, project_id } = data;
+    const { schemaName, pid, from, to, model, project_id, domain } = data;
 
-    const cacheKey = `count:${schemaName}:${pid}:${from}:${to}`;
-    const cacheExp = 60;
+    const cacheKey = `count:${schemaName}:${pid}:${from}:${to}:${domain}`;
+    const cacheExp = 20;
 
     return await Redis.useCacheV2(cacheKey, cacheExp, async () => {
 
@@ -19,7 +18,8 @@ export default defineEventHandler(async event => {
             {
                 $match: {
                     project_id,
-                    created_at: { $gte: new Date(from), $lte: new Date(to) }
+                    created_at: { $gte: new Date(from), $lte: new Date(to) },
+                    website: domain
                 }
             },
             { $count: 'count' },
diff --git a/dashboard/server/api/data/events.ts b/dashboard/server/api/data/events.ts
index a2175d1..81e4800 100644
--- a/dashboard/server/api/data/events.ts
+++ b/dashboard/server/api/data/events.ts
@@ -1,17 +1,16 @@
 
 import { EventModel } from "@schema/metrics/EventSchema";
 import { Redis } from "~/server/services/CacheService";
-import { getRequestDataOld } from "~/server/utils/getRequestData";
 
 export default defineEventHandler(async event => {
 
-    const data = await getRequestDataOld(event, { requireSchema: false });
+    const data = await getRequestData(event, ['GUEST', 'DOMAIN', 'RANGE']);
     if (!data) return;
 
-    const { pid, from, to, project_id, limit } = data;
+    const { pid, from, to, project_id, limit, domain } = data;
 
-    const cacheKey = `events:${pid}:${limit}:${from}:${to}`;
-    const cacheExp = 60;
+    const cacheKey = `events:${pid}:${limit}:${from}:${to}:${domain}`;
+    const cacheExp = 20;
 
     return await Redis.useCacheV2(cacheKey, cacheExp, async () => {
 
@@ -19,7 +18,8 @@ export default defineEventHandler(async event => {
             {
                 $match: {
                     project_id,
-                    created_at: { $gte: new Date(from), $lte: new Date(to) }
+                    created_at: { $gte: new Date(from), $lte: new Date(to) },
+                    website: domain
                 }
             },
             { $group: { _id: "$name", count: { $sum: 1, } } },
diff --git a/dashboard/server/api/timeline/events.ts b/dashboard/server/api/timeline/events.ts
index 6df2dab..8d716ff 100644
--- a/dashboard/server/api/timeline/events.ts
+++ b/dashboard/server/api/timeline/events.ts
@@ -16,7 +16,7 @@ export default defineEventHandler(async event => {
         const timelineData = await executeTimelineAggregation({
             projectId: project_id,
             model: EventModel,
-            from, to, slice, timeOffset, domain, debug: true
+            from, to, slice, timeOffset, domain
         });
         return timelineData;
     });
diff --git a/dashboard/server/api/timeline/events_stacked.ts b/dashboard/server/api/timeline/events_stacked.ts
index 102ce59..7ea3197 100644
--- a/dashboard/server/api/timeline/events_stacked.ts
+++ b/dashboard/server/api/timeline/events_stacked.ts
@@ -4,12 +4,12 @@ import { executeAdvancedTimelineAggregation } from "~/server/services/TimelineSe
 
 export default defineEventHandler(async event => {
 
-    const data = await getRequestDataOld(event, { requireSchema: false, requireSlice: true });
+    const data = await getRequestData(event, ['GUEST', 'RANGE', 'SLICE', 'DOMAIN']);
     if (!data) return;
 
-    const { from, to, slice, project_id, timeOffset } = data;
+    const { from, to, slice, project_id, timeOffset, domain } = data;
 
-    return await Redis.useCache({ key: `timeline:events_stacked:${project_id}:${slice}:${from || 'none'}:${to || 'none'}`, exp: TIMELINE_EXPIRE_TIME }, async () => {
+    return await Redis.useCache({ key: `timeline:events_stacked:${project_id}:${slice}:${from || 'none'}:${to || 'none'}:${domain}`, exp: TIMELINE_EXPIRE_TIME }, async () => {
 
         const timelineStackedEvents = await executeAdvancedTimelineAggregation<{ name: String }>({
             model: EventModel,
@@ -17,7 +17,8 @@ export default defineEventHandler(async event => {
             from, to, slice,
             customProjection: { name: "$_id.name" },
             customIdGroup: { name: '$name' },
-            timeOffset
+            timeOffset,
+            domain
         })
 
         return timelineStackedEvents;
diff --git a/dashboard/server/api/timeline/visits.ts b/dashboard/server/api/timeline/visits.ts
index 48655a8..ce65d71 100644
--- a/dashboard/server/api/timeline/visits.ts
+++ b/dashboard/server/api/timeline/visits.ts
@@ -10,13 +10,14 @@ export default defineEventHandler(async event => {
     const { pid, from, to, slice, project_id, timeOffset, domain } = data;
 
     const cacheKey = `timeline:visits:${pid}:${slice}:${from}:${to}:${domain}`;
-    const cacheExp = 60;
+    const cacheExp = 20;
 
     return await Redis.useCacheV2(cacheKey, cacheExp, async () => {
         const timelineData = await executeAdvancedTimelineAggregation({
             projectId: project_id,
             model: VisitModel,
-            from, to, slice, timeOffset, domain
+            from, to, slice, timeOffset, domain,
+            debug: true
         });
         return timelineData;
     });
diff --git a/shared_global/schema/metrics/EventSchema.ts b/shared_global/schema/metrics/EventSchema.ts
index 17ffc2b..68489c3 100644
--- a/shared_global/schema/metrics/EventSchema.ts
+++ b/shared_global/schema/metrics/EventSchema.ts
@@ -6,6 +6,7 @@ export type TEvent = {
     metadata: Record<string, string>,
     session: string,
     flowHash: string,
+    website: string,
     created_at: Date
 }
 
@@ -15,6 +16,7 @@ const EventSchema = new Schema<TEvent>({
     metadata: Schema.Types.Mixed,
     session: { type: String, index: 1 },
     flowHash: { type: String },
+    website: { type: String, index: 1 },
     created_at: { type: Date, default: () => Date.now(), index: true },
 })
 
diff --git a/shared_global/schema/metrics/SessionSchema.ts b/shared_global/schema/metrics/SessionSchema.ts
index 152e534..5979bf6 100644
--- a/shared_global/schema/metrics/SessionSchema.ts
+++ b/shared_global/schema/metrics/SessionSchema.ts
@@ -6,6 +6,7 @@ export type TSession = {
     session: string,
     flowHash: string,
     duration: number,
+    website: string,
     updated_at: Date,
     created_at: Date,
 }
@@ -14,6 +15,7 @@ const SessionSchema = new Schema<TSession>({
     project_id: { type: Types.ObjectId, index: 1 },
     session: { type: String, required: true, index: 1 },
     flowHash: { type: String },
+    website: { type: String },
     duration: { type: Number, required: true, default: 0 },
     updated_at: { type: Date, default: () => Date.now() },
     created_at: { type: Date, default: () => Date.now(), index: true },