From be82f7046fddb648062435d32ee41ea9d7958159 Mon Sep 17 00:00:00 2001
From: Emily <adharaultimasheireen@gmail.com>
Date: Tue, 11 Mar 2025 13:24:53 +0100
Subject: [PATCH] fix projection UI on chart

---
 .../components/dashboard/ActionableChart.vue  | 10 +++++++---
 dashboard/components/dashboard/TopCards.vue   |  2 +-
 dashboard/server/api/timeline/visits.ts       | 19 +++++++++----------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/dashboard/components/dashboard/ActionableChart.vue b/dashboard/components/dashboard/ActionableChart.vue
index e5ca037..73f4ea3 100644
--- a/dashboard/components/dashboard/ActionableChart.vue
+++ b/dashboard/components/dashboard/ActionableChart.vue
@@ -220,9 +220,14 @@ function transformResponse(input: { _id: string, count: number }[]) {
     const labels = input.map(e => DateService.getChartLabelFromISO(e._id, new Date().getTimezoneOffset(), selectedSlice.value));
     if (input.length > 0) allDatesFull.value = input.map(e => e._id.toString());
 
-    const todayIndex = input.findIndex(e => new Date(e._id).getTime() > (Date.now() - new Date().getTimezoneOffset() * 1000 * 60));
+    const current = (Date.now());
+    //console.log(input.map(e => e._id));
+    //console.log(new Date(current));
 
-    return { data, labels, todayIndex }
+    const todayIndex = input.findIndex(e => new Date(e._id).getTime() >= current);
+
+    //console.log({ todayIndex })
+    return { data, labels, todayIndex: todayIndex + 1 }
 }
 
 function onResponseError(e: any) {
@@ -281,7 +286,6 @@ function onDataReady() {
     chartData.value.datasets[1].backgroundColor = [createGradient('#4abde8')];
     chartData.value.datasets[2].backgroundColor = [createGradient('#fbbf24')];
 
-
     (chartData.value.datasets[1] as any).borderSkipped = sessionsData.data.value.data.map((e, i) => {
         const todayIndex = eventsData.data.value?.todayIndex || 0;
         if (i == todayIndex - 1) return true;
diff --git a/dashboard/components/dashboard/TopCards.vue b/dashboard/components/dashboard/TopCards.vue
index be4f089..31bd662 100644
--- a/dashboard/components/dashboard/TopCards.vue
+++ b/dashboard/components/dashboard/TopCards.vue
@@ -88,7 +88,7 @@ const avgSessionDuration = computed(() => {
 
 const todayIndex = computed(() => {
     if (!visitsData.data.value) return -1;
-    return visitsData.data.value.input.findIndex(e => new Date(e._id).getTime() > (Date.now() - new Date().getTimezoneOffset() * 1000 * 60));
+    return visitsData.data.value.input.findIndex(e => new Date(e._id).getTime() > (Date.now()));
 })
 
 
diff --git a/dashboard/server/api/timeline/visits.ts b/dashboard/server/api/timeline/visits.ts
index c0072db..b460a4b 100644
--- a/dashboard/server/api/timeline/visits.ts
+++ b/dashboard/server/api/timeline/visits.ts
@@ -12,18 +12,17 @@ export default defineEventHandler(async event => {
     const cacheKey = `timeline:visits:${pid}:${slice}:${from}:${to}:${domain}`;
     const cacheExp = 20;
 
-    // return await Redis.useCacheV2(cacheKey, cacheExp, async () => {
-    const timelineData = await executeAdvancedTimelineAggregation({
-        projectId: project_id,
-        model: VisitModel,
-        from, to, slice, timeOffset, domain,
-        debug: true
+    return await Redis.useCacheV2(cacheKey, cacheExp, async () => {
+        const timelineData = await executeAdvancedTimelineAggregation({
+            projectId: project_id,
+            model: VisitModel,
+            from, to, slice, timeOffset, domain
+        });
+
+        return timelineData;
+
     });
 
-    return timelineData;
-
-    // });
-