From 464094a2426e6ef09844ae5ffe34a245d34169cd Mon Sep 17 00:00:00 2001 From: Bartosz Kozikowski Date: Thu, 5 Nov 2026 15:01:51 +0100 Subject: [PATCH 1/2] Bound demo draft loading to the supported date range --- .../workingTime/WorkingTime.reminder.test.tsx | 29 +++++++++++++++++-- src/modules/workingTime/WorkingTime.tsx | 4 ++- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/src/modules/workingTime/WorkingTime.reminder.test.tsx b/src/modules/workingTime/WorkingTime.reminder.test.tsx index 7b200df..8dcafb4 100644 --- a/src/modules/workingTime/WorkingTime.reminder.test.tsx +++ b/src/modules/workingTime/WorkingTime.reminder.test.tsx @@ -2,12 +2,16 @@ import { act, fireEvent, render, screen } from '@testing-library/react'; import { UnitWorkspaceProvider } from './UnitWorkspaceProviderComponent'; import WorkingTime from './WorkingTime'; -const { fetchClients, fetchProjects, hasAccess } = vi.hoisted(() => ({ +const { fetchClients, fetchProjects, hasAccess, demo, useUnitsQuery } = vi.hoisted(() => ({ fetchClients: vi.fn(), fetchProjects: vi.fn(), hasAccess: vi.fn(() => true), + demo: { isDemo: false }, + useUnitsQuery: vi.fn(() => ({ data: { draftIds: ['draft-1'] }, isLoading: false, isError: false })), })); +vi.mock('@/core/config/demo', () => demo); + vi.mock('@/modules/auth/AuthProvider', () => ({ useAuth: () => ({ loggedInUser: { id: 'user-1' }, hasAccess }), })); @@ -26,7 +30,7 @@ vi.mock('@/modules/workingTime/hooks/useDeleteUnitMutation', () => ({ useDeleteUnitMutation: () => ({ mutate: vi.fn() }), })); vi.mock('@/modules/workingTime/hooks/useUnitsQuery', () => ({ - useUnitsQuery: () => ({ data: { draftIds: ['draft-1'] }, isLoading: false, isError: false }), + useUnitsQuery, selectModeledUnits: () => [], })); vi.mock('./Calendar/UnitForm/useWorkUnitSubmission', () => ({ @@ -60,6 +64,7 @@ vi.mock('./DraftsBoard', () => ({ default: () => null })); vi.mock('./WeeklyHoursBar', () => ({ default: () => null })); afterEach(() => { + demo.isDemo = false; vi.useRealTimers(); localStorage.clear(); vi.clearAllMocks(); @@ -86,3 +91,23 @@ it('dismisses the unreported-drafts warning for 24 hours, then shows it again', act(() => void vi.advanceTimersByTime(1)); expect(screen.getByRole('button', { name: later })).toBeInTheDocument(); }); + +it.each([ + { isDemo: true, dateFrom: '2025-11-05' }, + { isDemo: false, dateFrom: '2017-01-01' }, +])('uses the supported draft range when demo=$isDemo', ({ isDemo, dateFrom }) => { + vi.useFakeTimers(); + vi.setSystemTime(new Date('2026-11-05T12:00:00.000Z')); + demo.isDemo = isDemo; + + render( + + + , + ); + + expect(useUnitsQuery).toHaveBeenCalledWith( + expect.objectContaining({ dateFrom, state: 'Draft' }), + expect.objectContaining({ enabled: true }), + ); +}); diff --git a/src/modules/workingTime/WorkingTime.tsx b/src/modules/workingTime/WorkingTime.tsx index bdfed0b..6bf76ad 100644 --- a/src/modules/workingTime/WorkingTime.tsx +++ b/src/modules/workingTime/WorkingTime.tsx @@ -1,4 +1,5 @@ import { ROLE_PERMISSIONS } from '@/app/routing/rolePermissions'; +import { isDemo } from '@/core/config/demo'; import Confirmation, { ConfirmationAction } from '@/core/theme/confirmation'; import LoadingArea from '@/core/theme/loadingArea'; import Modal from '@/core/theme/modal'; @@ -13,6 +14,7 @@ import { useWorkspace } from '@/modules/organizations/WorkspaceProvider'; import { useProjects } from '@/modules/projects/ProjectsProvider'; import { getReportedUnits } from '@/modules/reports/hooks/useReportedUnits'; import { selectModeledUnits, useUnitsQuery } from '@/modules/workingTime/hooks/useUnitsQuery'; +import dayjs from 'dayjs'; import { useCallback, useEffect, useRef, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { bootstrapWorkingTime } from './bootstrapWorkingTime'; @@ -61,7 +63,7 @@ function WorkingTime(): JSX.Element { const unitsQuery = useUnitsQuery(mainUnitsDto, { enabled: Boolean(loggedInUser) }); const draftsDto = { - dateFrom: MAX_DATA_FETCH_DATE, + dateFrom: isDemo ? dayjs().subtract(1, 'year').format('YYYY-MM-DD') : MAX_DATA_FETCH_DATE, userId: loggedInUser ? [loggedInUser.id] : [], state: UnitState.Draft, }; From 58d45587379fbf068fd4748d68c570ddd2c97201 Mon Sep 17 00:00:00 2001 From: Bartosz Kozikowski Date: Thu, 5 Nov 2026 15:05:55 +0100 Subject: [PATCH 2/2] Use one local date anchor for both demo query bounds --- src/modules/workingTime/WorkingTime.reminder.test.tsx | 11 ++++++----- src/modules/workingTime/WorkingTime.tsx | 4 +++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/modules/workingTime/WorkingTime.reminder.test.tsx b/src/modules/workingTime/WorkingTime.reminder.test.tsx index 8dcafb4..806181d 100644 --- a/src/modules/workingTime/WorkingTime.reminder.test.tsx +++ b/src/modules/workingTime/WorkingTime.reminder.test.tsx @@ -93,11 +93,12 @@ it('dismisses the unreported-drafts warning for 24 hours, then shows it again', }); it.each([ - { isDemo: true, dateFrom: '2025-11-05' }, - { isDemo: false, dateFrom: '2017-01-01' }, -])('uses the supported draft range when demo=$isDemo', ({ isDemo, dateFrom }) => { + { isDemo: true, now: new Date(2026, 10, 5, 0, 30), dateFrom: '2025-11-05', dateTo: '2026-11-05' }, + { isDemo: true, now: new Date(2025, 1, 28, 16, 30), dateFrom: '2024-02-28', dateTo: '2025-02-28' }, + { isDemo: false, now: new Date(2026, 10, 5, 12), dateFrom: '2017-01-01', dateTo: undefined }, +])('uses the supported draft range when demo=$isDemo', ({ isDemo, now, dateFrom, dateTo }) => { vi.useFakeTimers(); - vi.setSystemTime(new Date('2026-11-05T12:00:00.000Z')); + vi.setSystemTime(now); demo.isDemo = isDemo; render( @@ -107,7 +108,7 @@ it.each([ ); expect(useUnitsQuery).toHaveBeenCalledWith( - expect.objectContaining({ dateFrom, state: 'Draft' }), + expect.objectContaining({ dateFrom, ...(isDemo && { dateTo }), state: 'Draft' }), expect.objectContaining({ enabled: true }), ); }); diff --git a/src/modules/workingTime/WorkingTime.tsx b/src/modules/workingTime/WorkingTime.tsx index 6bf76ad..721452d 100644 --- a/src/modules/workingTime/WorkingTime.tsx +++ b/src/modules/workingTime/WorkingTime.tsx @@ -62,8 +62,10 @@ function WorkingTime(): JSX.Element { const mainUnitsDto = buildMainUnitsDto(weekStart, weekEnd, loggedInUser ? [loggedInUser.id] : []); const unitsQuery = useUnitsQuery(mainUnitsDto, { enabled: Boolean(loggedInUser) }); + const today = dayjs(); const draftsDto = { - dateFrom: isDemo ? dayjs().subtract(1, 'year').format('YYYY-MM-DD') : MAX_DATA_FETCH_DATE, + dateFrom: isDemo ? today.subtract(1, 'year').format('YYYY-MM-DD') : MAX_DATA_FETCH_DATE, + ...(isDemo && { dateTo: today.format('YYYY-MM-DD') }), userId: loggedInUser ? [loggedInUser.id] : [], state: UnitState.Draft, };