From a60ffa56bf5494946f86fc9630eb93d8d34da328 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Thu, 26 Mar 2026 01:10:29 +0100
Subject: [PATCH] fix page and query invalidation

---
 src/renderer/src/App.vue                  | 3 +--
 src/renderer/src/pages/CalendarPage.vue   | 7 ++++++-
 src/renderer/src/pages/StatisticsPage.vue | 9 +++++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/renderer/src/App.vue b/src/renderer/src/App.vue
index 2df0226..40c6a07 100644
--- a/src/renderer/src/App.vue
+++ b/src/renderer/src/App.vue
@@ -164,8 +164,7 @@ whenever(cmdComma, () => {
                 <div class="flex-1 flex overflow-hidden">
                     <SidebarNavigation />
                     <router-view v-slot="{ Component }">
-                        <!-- full-calendar has an issue with keep-alive https://github.com/fullcalendar/fullcalendar/issues/7886 -->
-                        <keep-alive exclude="CalendarPage">
+                        <keep-alive>
                             <component :is="Component" />
                         </keep-alive>
                     </router-view>
diff --git a/src/renderer/src/pages/CalendarPage.vue b/src/renderer/src/pages/CalendarPage.vue
index 6c7ae4c..bcc9ffa 100644
--- a/src/renderer/src/pages/CalendarPage.vue
+++ b/src/renderer/src/pages/CalendarPage.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { useQuery, useQueryClient } from '@tanstack/vue-query'
-import { computed, ref } from 'vue'
+import { computed, onActivated, ref } from 'vue'
 import { TimeEntryCalendar, LoadingSpinner } from '@solidtime/ui'
 import { getAllProjects, useProjectCreateMutation } from '../utils/projects.ts'
 import { getAllTasks } from '../utils/tasks.ts'
@@ -119,6 +119,10 @@ const clients = computed(() => clientsResponse.value?.data ?? [])
 
 const queryClient = useQueryClient()
 
+onActivated(() => {
+    queryClient.invalidateQueries({ queryKey: ['timeEntry', 'calendar'] })
+})
+
 async function createTimeEntry(entry: Omit<TimeEntry, 'id' | 'organization_id' | 'user_id'>) {
     if (!currentOrganizationId.value || !currentMembershipId.value) {
         throw new Error('No organization or member selected')
@@ -217,6 +221,7 @@ const { data: activityPeriodsData } = useQuery<ActivityPeriod[]>({
             end: expandedDateRange.value.end,
         },
     ]),
+    staleTime: 0,
     enabled: enableCalendarQuery,
     placeholderData: (previousData) => previousData,
     queryFn: async () => {
diff --git a/src/renderer/src/pages/StatisticsPage.vue b/src/renderer/src/pages/StatisticsPage.vue
index 248096a..8bb5808 100644
--- a/src/renderer/src/pages/StatisticsPage.vue
+++ b/src/renderer/src/pages/StatisticsPage.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { useQuery } from '@tanstack/vue-query'
-import { computed, ref } from 'vue'
+import { computed, onActivated, ref } from 'vue'
 import {
     Button,
     LoadingSpinner,
@@ -75,6 +75,7 @@ const {
             end: dateRange.value.end,
         },
     ]),
+    staleTime: 0,
     enabled: computed(() => currentOrganizationLoaded.value && activityTrackingEnabled.value),
     placeholderData: (previousData) => previousData,
     queryFn: async () => {
@@ -87,6 +88,10 @@ const {
     },
 })
 
+onActivated(() => {
+    refetch()
+})
+
 const windowActivityStats = computed(() => {
     return windowActivityStatsData.value || []
 })
@@ -217,7 +222,7 @@ const totalTime = computed(() => {
             </div>
         </div>
         <template v-else>
-            <div class="flex-1 overflow-y-auto">
+            <div class="flex-1 overflow-y-scroll">
                 <div class="max-w-7xl mx-auto px-4 py-4">
                     <!-- Header -->
                     <div class="mb-4">