Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 28 additions & 2 deletions src/modules/workingTime/WorkingTime.reminder.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 }),
}));
Expand All @@ -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', () => ({
Expand Down Expand Up @@ -60,6 +64,7 @@ vi.mock('./DraftsBoard', () => ({ default: () => null }));
vi.mock('./WeeklyHoursBar', () => ({ default: () => null }));

afterEach(() => {
demo.isDemo = false;
vi.useRealTimers();
localStorage.clear();
vi.clearAllMocks();
Expand All @@ -86,3 +91,24 @@ 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, 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(now);
demo.isDemo = isDemo;

render(
<UnitWorkspaceProvider>
<WorkingTime />
</UnitWorkspaceProvider>,
);

expect(useUnitsQuery).toHaveBeenCalledWith(
expect.objectContaining({ dateFrom, ...(isDemo && { dateTo }), state: 'Draft' }),
expect.objectContaining({ enabled: true }),
);
});
6 changes: 5 additions & 1 deletion src/modules/workingTime/WorkingTime.tsx
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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';
Expand Down Expand Up @@ -60,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: 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,
};
Expand Down
Loading