From 0b90407303e81034502de21bd650572582d153f4 Mon Sep 17 00:00:00 2001 From: Gregor Vostrak Date: Wed, 17 Apr 2024 00:15:34 +0200 Subject: [PATCH] change time entries requests to always filter on user_id --- resources/js/utils/useCurrentTimeEntry.ts | 1 + resources/js/utils/useTimeEntries.ts | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/js/utils/useCurrentTimeEntry.ts b/resources/js/utils/useCurrentTimeEntry.ts index e30f7622..0d2c2172 100644 --- a/resources/js/utils/useCurrentTimeEntry.ts +++ b/resources/js/utils/useCurrentTimeEntry.ts @@ -60,6 +60,7 @@ export const useCurrentTimeEntryStore = defineStore('currentTimeEntry', () => { api.getTimeEntries({ queries: { active: 'true', + user_id: getCurrentUserId(), }, params: { organization: organizationId, diff --git a/resources/js/utils/useTimeEntries.ts b/resources/js/utils/useTimeEntries.ts index 56809e28..a7fd7dae 100644 --- a/resources/js/utils/useTimeEntries.ts +++ b/resources/js/utils/useTimeEntries.ts @@ -1,5 +1,5 @@ import { defineStore } from 'pinia'; -import { getCurrentOrganizationId } from '@/utils/useUser'; +import { getCurrentOrganizationId, getCurrentUserId } from '@/utils/useUser'; import { api } from '../../../openapi.json.client'; import { reactive, ref } from 'vue'; import type { TimeEntry } from '@/utils/api'; @@ -21,6 +21,7 @@ export const useTimeEntriesStore = defineStore('timeEntries', () => { }, queries: { only_full_dates: 'true', + user_id: getCurrentUserId(), }, }), undefined, @@ -46,6 +47,7 @@ export const useTimeEntriesStore = defineStore('timeEntries', () => { }, queries: { only_full_dates: 'true', + user_id: getCurrentUserId(), before: dayjs(latestTimeEntry.start).utc().format(), }, }),