patch new time entries into existing store when stores are refreshed …

…on focus
solidtime-io · Nov 12, 2024 · df0f3b2 · df0f3b2
1 parent 4b0cb2e
commit df0f3b2
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/resources/js/utils/init.ts b/resources/js/utils/init.ts
@@ -9,14 +9,14 @@ import { canViewClients, canViewMembers } from '@/utils/permissions';
 
 export function initializeStores() {
     refreshStores();
-    useTimeEntriesStore().fetchTimeEntries();
 }
 
 export function refreshStores() {
     useProjectsStore().fetchProjects();
     useTasksStore().fetchTasks();
     useTagsStore().fetchTags();
     useCurrentTimeEntryStore().fetchCurrentTimeEntry();
+    useTimeEntriesStore().patchTimeEntries();
     if (canViewMembers()) {
         useMembersStore().fetchMembers();
     }

diff --git a/resources/js/utils/useTimeEntries.ts b/resources/js/utils/useTimeEntries.ts
@@ -21,6 +21,39 @@ export const useTimeEntriesStore = defineStore('timeEntries', () => {
     const allTimeEntriesLoaded = ref(false);
     const { handleApiRequestNotifications } = useNotificationsStore();
 
+    async function patchTimeEntries(
+        queryParams: TimeEntriesQueryParams = {
+            only_full_dates: 'true',
+            member_id: getCurrentMembershipId(),
+        }
+    ) {
+        const organizationId = getCurrentOrganizationId();
+
+        if (organizationId) {
+            const timeEntriesResponse = await handleApiRequestNotifications(
+                () =>
+                    api.getTimeEntries({
+                        params: {
+                            organization: organizationId,
+                        },
+                        queries: queryParams,
+                    }),
+                undefined,
+                'Failed to fetch time entries'
+            );
+            if (timeEntriesResponse?.data) {
+                // insert missing time entries
+                const missingTimeEntries = timeEntriesResponse.data.filter(
+                    (entry) => !timeEntries.value.find((e) => e.id === entry.id)
+                );
+                timeEntries.value = [
+                    ...missingTimeEntries,
+                    ...timeEntries.value,
+                ];
+            }
+        }
+    }
+
     async function fetchTimeEntries(
         queryParams: TimeEntriesQueryParams = {
             only_full_dates: 'true',
@@ -200,5 +233,6 @@ export const useTimeEntriesStore = defineStore('timeEntries', () => {
         allTimeEntriesLoaded,
         updateTimeEntries,
         deleteTimeEntries,
+        patchTimeEntries,
     };
 });