From b86a2985119b4cd3d78001cbc7b6ee89c6824b97 Mon Sep 17 00:00:00 2001
From: Emily <adharaultimasheireen@gmail.com>
Date: Fri, 21 Jun 2024 19:40:18 +0200
Subject: [PATCH] .

---
 dashboard/composables/useDataService.ts | 11 +++++++++--
 shared/services/DateService.ts          |  7 +++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/dashboard/composables/useDataService.ts b/dashboard/composables/useDataService.ts
index 66f2ffc..862b135 100644
--- a/dashboard/composables/useDataService.ts
+++ b/dashboard/composables/useDataService.ts
@@ -16,8 +16,14 @@ export function useFirstInteractionData() {
     return metricsInfo;
 }
 
-export async function useVisitsTimeline(fromDate: string, toDate: string, slice: Slice) {
-    const { from, to } = DateService.prepareDateRange(fromDate, toDate, slice);
+export async function useVisitsTimeline(slice: Slice, fromDate?: string, toDate?: string) {
+
+    const { from, to } = DateService.prepareDateRange(
+        fromDate || DateService.getDefaultRange(slice).from,
+        toDate || DateService.getDefaultRange(slice).to,
+        slice
+    );
+
     const activeProject = useActiveProject();
     const response = await $fetch(
         `/api/metrics/${activeProject.value?._id}/timeline/visits`, {
@@ -25,6 +31,7 @@ export async function useVisitsTimeline(fromDate: string, toDate: string, slice:
         ...signHeaders({ 'Content-Type': 'application/json' }),
         body: JSON.stringify({ slice, from, to })
     });
+    
     return response;
 
 }
diff --git a/shared/services/DateService.ts b/shared/services/DateService.ts
index 2793d5b..2f76686 100644
--- a/shared/services/DateService.ts
+++ b/shared/services/DateService.ts
@@ -23,8 +23,11 @@ class DateService {
 
     public slicesData = slicesData;
 
-    getDefaultRange(slice: Slice, from?: string, to?: string) {
-
+    getDefaultRange(slice: Slice) {
+        return {
+            from: new Date(Date.now() - slicesData[slice].fromOffset).toISOString(),
+            to: new Date().toISOString()
+        }
     }
 
     getQueryDateRange(slice: Slice) {