mirror of
https://github.com/callumalpass/tasknotes.git
synced 2026-07-22 12:50:26 +00:00
Merge branch 'main' into issue-826-fix
Resolved merge conflict in docs/releases/unreleased.md by keeping both fix entries.
This commit is contained in:
callumalpass
commit
37c8f98c52
5 changed files with 501 additions and 2 deletions
|
|
@ -91,3 +91,9 @@ Example:
|
|||
- Widget now renders correctly on startup without requiring workarounds
|
||||
- Thanks to @nightroman for reporting
|
||||
|
||||
- (#810) Fixed recurring tasks with overdue due dates disappearing from agenda view
|
||||
- Recurring tasks now check both `due` and `scheduled` dates for overdue status
|
||||
- Previously only `scheduled` was checked for recurring tasks, causing tasks with overdue `due` dates to be hidden
|
||||
- Ensures consistent overdue detection logic between recurring and non-recurring tasks
|
||||
- Thanks to @skyrunner15 for reporting
|
||||
|
||||
|
|
|
|||
277
issue-analysis/issue-810.md
Normal file
277
issue-analysis/issue-810.md
Normal file
|
|
@ -0,0 +1,277 @@
|
|||
# Issue #810 Analysis: Agenda View Not Showing Overdue Tasks
|
||||
|
||||
## Problem Understanding
|
||||
|
||||
**Issue Title:** [Bug]: Agenda not showing overdue tasks
|
||||
|
||||
**Reporter:** skyrunner15
|
||||
|
||||
**Description:**
|
||||
When clicking on "today" in the agenda view, it properly filters out prior days but overdue tasks disappear. The user can see the missing task in the Tasks view with a due date of yesterday but not showing in the agenda view. When updating the due date to today, it doesn't show in the agenda view either. The task is a recurring one.
|
||||
|
||||
### Key Observations:
|
||||
1. **Overdue tasks disappear** when viewing "today" in the agenda view
|
||||
2. **Tasks view shows the overdue task correctly** (due date = yesterday)
|
||||
3. **Updating task due date to today** doesn't make it appear
|
||||
4. **The task is recurring**, which may be relevant to the bug
|
||||
|
||||
## Test File Location
|
||||
|
||||
A test file has been created but is currently failing:
|
||||
- **Path:** `tests/unit/issues/issue-810-overdue-tasks-disappear.test.ts`
|
||||
- **Test Framework:** Jest
|
||||
- **Current Status:** ❌ FAILING (missing test helper functions)
|
||||
- **Run Command:** `npm test -- issue-810-overdue-tasks-disappear.test.ts`
|
||||
|
||||
### Test Failure Reason:
|
||||
The test is trying to use `createMockCacheManager()` and `createMockTaskInfo()` helper functions which don't exist in the test helpers. The test needs to be updated to use the existing factory methods from `tests/helpers/mock-factories.ts`:
|
||||
- Use `TaskFactory.createTask()` instead of `createMockTaskInfo()`
|
||||
- Use `PluginFactory.createMockPlugin().cacheManager` instead of `createMockCacheManager()`
|
||||
|
||||
## Relevant Code Locations
|
||||
|
||||
### 1. AgendaView Component
|
||||
**File:** `src/views/AgendaView.ts`
|
||||
|
||||
**Key Lines:**
|
||||
- `AgendaView.ts:731-735` - Calls `getAgendaDataWithOverdue()` method
|
||||
- `AgendaView.ts:843-1018` - Renders overdue section separately
|
||||
- `AgendaView.ts:65` - `showOverdueOnToday` property controls overdue display
|
||||
|
||||
### 2. FilterService - Main Logic
|
||||
**File:** `src/services/FilterService.ts`
|
||||
|
||||
**Key Functions:**
|
||||
|
||||
#### a. `getAgendaDataWithOverdue()`
|
||||
- **Location:** `FilterService.ts:2622-2652`
|
||||
- **Purpose:** Gets agenda data with a separate overdue section
|
||||
- **Parameters:**
|
||||
- `dates: Date[]` - Array of dates to get tasks for
|
||||
- `baseQuery: FilterQuery` - Filter query to apply
|
||||
- `showOverdueSection: boolean` - Whether to show overdue section
|
||||
- **Logic:**
|
||||
```typescript
|
||||
// Line 2630-2642: Gets tasks for each specific date (no overdue mixing)
|
||||
for (const date of dates) {
|
||||
const tasksForDate = await this.getTasksForDate(
|
||||
date,
|
||||
baseQuery,
|
||||
false // Never include overdue in daily sections
|
||||
);
|
||||
dailyData.push({ date: new Date(date), tasks: tasksForDate });
|
||||
}
|
||||
|
||||
// Line 2645-2646: Gets overdue tasks separately if requested
|
||||
const overdueTasks = showOverdueSection ? await this.getOverdueTasks(baseQuery) : [];
|
||||
```
|
||||
|
||||
#### b. `getOverdueTasks()`
|
||||
- **Location:** `FilterService.ts:2573-2617`
|
||||
- **Purpose:** Get overdue tasks for the agenda view
|
||||
- **Logic:**
|
||||
- Line 2579: Filters all tasks to find overdue ones
|
||||
- Line 2584-2591: For recurring tasks, only checks `scheduled` date
|
||||
- Line 2593-2606: For non-recurring tasks, checks both `due` and `scheduled` dates
|
||||
- Line 2588, 2596, 2603: Uses `isOverdueTimeAware()` helper function
|
||||
|
||||
#### c. `isOverdueTimeAware()`
|
||||
- **Location:** `src/utils/dateUtils.ts:1021-1050`
|
||||
- **Purpose:** Check if a date string represents an overdue date
|
||||
- **Parameters:**
|
||||
- `dateString: string` - The date to check
|
||||
- `isCompleted?: boolean` - Whether the task is completed
|
||||
- `hideCompletedFromOverdue?: boolean` - Setting to hide completed tasks from overdue
|
||||
- **Logic:**
|
||||
- Line 1029-1031: If setting enabled and task completed, return false
|
||||
- Line 1037-1044: Uses UTC anchors to compare dates consistently
|
||||
|
||||
## Root Cause Analysis
|
||||
|
||||
Based on the code review, the issue appears to be in how recurring tasks are handled in the `getOverdueTasks()` method:
|
||||
|
||||
### For Recurring Tasks (Line 2584-2591):
|
||||
```typescript
|
||||
if (task.recurrence) {
|
||||
// Only check scheduled date for recurring tasks (this is the current instance date)
|
||||
if (task.scheduled) {
|
||||
return isOverdueTimeAware(task.scheduled, isCompleted, hideCompletedFromOverdue);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
```
|
||||
|
||||
**Problem:** If a recurring task's `scheduled` date has been updated to today (or is missing), it won't appear as overdue even if previous instances were overdue. The comment says "this is the current instance date" which suggests the scheduled date represents the next/current occurrence, not a past overdue occurrence.
|
||||
|
||||
### User's Scenario:
|
||||
1. User has a recurring task with scheduled date = yesterday
|
||||
2. User clicks "Today" in agenda view
|
||||
3. The task's scheduled date (yesterday) is checked by `isOverdueTimeAware()`
|
||||
4. The task is correctly identified as overdue
|
||||
5. **BUT** when the user updates the due date to today, the task still doesn't show because:
|
||||
- The overdue logic only checks `scheduled` for recurring tasks
|
||||
- If the user updated `due` but not `scheduled`, the task won't match either daily or overdue sections
|
||||
|
||||
## Proposed Solutions
|
||||
|
||||
### Solution 1: Fix Recurring Task Overdue Detection (Recommended)
|
||||
**Approach:** Improve the logic in `getOverdueTasks()` to handle recurring tasks more accurately.
|
||||
|
||||
**Changes Required:**
|
||||
- File: `src/services/FilterService.ts:2584-2591`
|
||||
|
||||
**Implementation:**
|
||||
```typescript
|
||||
if (task.recurrence) {
|
||||
// For recurring tasks, check scheduled date (current instance)
|
||||
// Also check due date if it exists (user may set both)
|
||||
if (task.due) {
|
||||
if (isOverdueTimeAware(task.due, isCompleted, hideCompletedFromOverdue)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
if (task.scheduled) {
|
||||
if (isOverdueTimeAware(task.scheduled, isCompleted, hideCompletedFromOverdue)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
```
|
||||
|
||||
**Pros:**
|
||||
- ✅ Handles both `due` and `scheduled` dates for recurring tasks
|
||||
- ✅ Minimal code changes
|
||||
- ✅ Consistent with non-recurring task logic
|
||||
- ✅ Fixes the reported issue
|
||||
|
||||
**Cons:**
|
||||
- ⚠️ May show tasks as overdue that shouldn't be if both dates are set inconsistently
|
||||
- ⚠️ Need to verify this doesn't break existing recurring task behavior
|
||||
|
||||
### Solution 2: Separate Overdue Logic for Recurring vs Non-Recurring
|
||||
**Approach:** Create distinct overdue detection logic based on task type.
|
||||
|
||||
**Changes Required:**
|
||||
- File: `src/services/FilterService.ts:2573-2617`
|
||||
- New method: `isRecurringTaskOverdue(task: TaskInfo): boolean`
|
||||
|
||||
**Implementation:**
|
||||
```typescript
|
||||
private isRecurringTaskOverdue(task: TaskInfo, isCompleted: boolean, hideCompletedFromOverdue: boolean): boolean {
|
||||
// For recurring tasks, we need to check if the current instance is overdue
|
||||
// The scheduled date represents the current/next occurrence
|
||||
|
||||
// Check if there's an uncompleted instance in the past
|
||||
if (task.scheduled) {
|
||||
const scheduledDate = parseDateToUTC(task.scheduled);
|
||||
const today = parseDateToUTC(getTodayString());
|
||||
|
||||
if (isBefore(scheduledDate, today) && !isCompleted) {
|
||||
return !hideCompletedFromOverdue || !isCompleted;
|
||||
}
|
||||
}
|
||||
|
||||
// Also check due date if the recurring task has one set
|
||||
if (task.due) {
|
||||
return isOverdueTimeAware(task.due, isCompleted, hideCompletedFromOverdue);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
// Then use it in getOverdueTasks:
|
||||
if (task.recurrence) {
|
||||
return this.isRecurringTaskOverdue(task, isCompleted, hideCompletedFromOverdue);
|
||||
}
|
||||
```
|
||||
|
||||
**Pros:**
|
||||
- ✅ Clear separation of concerns
|
||||
- ✅ Easier to test and maintain
|
||||
- ✅ Can handle complex recurring task scenarios
|
||||
|
||||
**Cons:**
|
||||
- ⚠️ More code to maintain
|
||||
- ⚠️ Need thorough testing for edge cases
|
||||
- ⚠️ Requires understanding of recurring task lifecycle
|
||||
|
||||
### Solution 3: Add Explicit Overdue Instance Tracking
|
||||
**Approach:** Track overdue instances separately in the task metadata.
|
||||
|
||||
**Changes Required:**
|
||||
- File: `src/types.ts` - Add `overdue_instances?: string[]` field
|
||||
- File: `src/services/FilterService.ts` - Update recurring task logic
|
||||
- File: `src/views/AgendaView.ts` - Display overdue instances
|
||||
|
||||
**Implementation:**
|
||||
```typescript
|
||||
// In types.ts
|
||||
export interface TaskInfo {
|
||||
// ... existing fields
|
||||
complete_instances?: string[];
|
||||
overdue_instances?: string[]; // NEW: Track overdue instances
|
||||
}
|
||||
|
||||
// In getOverdueTasks
|
||||
if (task.recurrence) {
|
||||
// Check if current instance is overdue OR if there are tracked overdue instances
|
||||
const hasOverdueInstances = task.overdue_instances && task.overdue_instances.length > 0;
|
||||
|
||||
if (hasOverdueInstances) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// Check current scheduled date
|
||||
if (task.scheduled) {
|
||||
return isOverdueTimeAware(task.scheduled, isCompleted, hideCompletedFromOverdue);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
```
|
||||
|
||||
**Pros:**
|
||||
- ✅ Most accurate tracking of overdue recurring tasks
|
||||
- ✅ Maintains history of overdue instances
|
||||
- ✅ Future-proof for complex scenarios
|
||||
|
||||
**Cons:**
|
||||
- ❌ Requires schema changes
|
||||
- ❌ Need migration for existing tasks
|
||||
- ❌ More complex implementation
|
||||
- ❌ Higher risk of breaking existing functionality
|
||||
|
||||
## Recommended Approach
|
||||
|
||||
**Solution 1** is recommended for the following reasons:
|
||||
|
||||
1. **Minimal Risk:** Only changes one small section of code
|
||||
2. **Fixes the Reported Issue:** Handles the user's exact scenario (recurring task with due date)
|
||||
3. **Low Complexity:** Easy to understand and maintain
|
||||
4. **Quick to Implement:** Can be done in a single PR
|
||||
5. **Easy to Test:** Can verify with the existing test file (once helper functions are fixed)
|
||||
|
||||
## Next Steps
|
||||
|
||||
1. ✅ **Fix the test file** - Update to use correct factory methods
|
||||
2. ✅ **Verify test fails** - Confirm the test reproduces the bug
|
||||
3. ✅ **Implement Solution 1** - Make the code changes
|
||||
4. ✅ **Verify test passes** - Confirm the fix works
|
||||
5. ✅ **Manual testing** - Test in the actual plugin
|
||||
6. ✅ **Edge case testing** - Test various recurring task scenarios
|
||||
|
||||
## Additional Notes
|
||||
|
||||
- The codebase uses UTC anchors for date comparisons to avoid timezone issues
|
||||
- The `hideCompletedFromOverdue` setting (default: true) hides completed tasks from overdue section
|
||||
- Recurring tasks use the `scheduled` field to track the current instance date
|
||||
- The `complete_instances` array tracks which instances of a recurring task have been completed
|
||||
|
||||
## Related Code Patterns
|
||||
|
||||
The codebase follows these patterns for date handling:
|
||||
- Use `parseDateToUTC()` for internal logic and comparisons
|
||||
- Use `parseDateToLocal()` for UI display
|
||||
- Use `isOverdueTimeAware()`, `isSameDateSafe()`, `isBeforeDateSafe()` for safe date comparisons
|
||||
- Store dates in `YYYY-MM-DD` format using `formatDateForStorage()`
|
||||
|
|
@ -2583,9 +2583,17 @@ export class FilterService extends EventEmitter {
|
|||
|
||||
// For recurring tasks, check if the current scheduled date is overdue
|
||||
if (task.recurrence) {
|
||||
// Only check scheduled date for recurring tasks (this is the current instance date)
|
||||
// For recurring tasks, check scheduled date (current instance)
|
||||
// Also check due date if it exists (user may set both)
|
||||
if (task.due) {
|
||||
if (isOverdueTimeAware(task.due, isCompleted, hideCompletedFromOverdue)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
if (task.scheduled) {
|
||||
return isOverdueTimeAware(task.scheduled, isCompleted, hideCompletedFromOverdue);
|
||||
if (isOverdueTimeAware(task.scheduled, isCompleted, hideCompletedFromOverdue)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -392,7 +392,9 @@ export const PluginFactory = {
|
|||
// Core MinimalNativeCache methods
|
||||
initialize: jest.fn(),
|
||||
getAllTasks: jest.fn().mockResolvedValue([]),
|
||||
getAllTaskPaths: jest.fn().mockReturnValue(new Set()),
|
||||
getTaskInfo: jest.fn().mockResolvedValue(null),
|
||||
getCachedTaskInfo: jest.fn().mockResolvedValue(null),
|
||||
updateTaskInfoInCache: jest.fn(),
|
||||
removeFromCache: jest.fn().mockResolvedValue(undefined),
|
||||
getAllTags: jest.fn().mockReturnValue([]),
|
||||
|
|
|
|||
206
tests/unit/issues/issue-810-overdue-tasks-disappear.test.ts
Normal file
206
tests/unit/issues/issue-810-overdue-tasks-disappear.test.ts
Normal file
|
|
@ -0,0 +1,206 @@
|
|||
import { FilterService } from '../../../src/services/FilterService';
|
||||
import { StatusManager } from '../../../src/services/StatusManager';
|
||||
import { PriorityManager } from '../../../src/services/PriorityManager';
|
||||
import { FilterQuery, TaskInfo } from '../../../src/types';
|
||||
import { TaskFactory, PluginFactory } from '../../helpers/mock-factories';
|
||||
import { createUTCDateFromLocalCalendarDate, formatDateForStorage, getTodayLocal } from '../../../src/utils/dateUtils';
|
||||
|
||||
describe('Issue #810 - Overdue tasks disappear in agenda view when clicking "today"', () => {
|
||||
let filterService: FilterService;
|
||||
let mockCacheManager: any;
|
||||
let statusManager: StatusManager;
|
||||
let priorityManager: PriorityManager;
|
||||
let mockPlugin: any;
|
||||
|
||||
beforeEach(() => {
|
||||
// Setup mock services
|
||||
statusManager = new StatusManager([
|
||||
{ id: 'open', value: ' ', label: 'Open', color: '#000000', isCompleted: false, order: 1 },
|
||||
{ id: 'done', value: 'x', label: 'Done', color: '#00ff00', isCompleted: true, order: 2 }
|
||||
]);
|
||||
priorityManager = new PriorityManager([
|
||||
{ id: 'normal', value: 'normal', label: 'Normal', color: '#000000', weight: 0 }
|
||||
]);
|
||||
mockCacheManager = PluginFactory.createMockPlugin().cacheManager;
|
||||
|
||||
mockPlugin = {
|
||||
settings: {
|
||||
hideCompletedFromOverdue: true,
|
||||
userFields: []
|
||||
},
|
||||
i18n: {
|
||||
translate: (key: string) => key,
|
||||
getCurrentLocale: () => 'en'
|
||||
}
|
||||
};
|
||||
|
||||
filterService = new FilterService(
|
||||
mockCacheManager,
|
||||
statusManager,
|
||||
priorityManager,
|
||||
mockPlugin
|
||||
);
|
||||
});
|
||||
|
||||
it('should show overdue tasks when showOverdueSection is enabled', async () => {
|
||||
// Use explicit dates for testing (UTC dates to match formatDateForStorage)
|
||||
const today = new Date(Date.UTC(2025, 9, 6)); // Oct 6, 2025 UTC
|
||||
const yesterday = new Date(Date.UTC(2025, 9, 5)); // Oct 5, 2025 UTC
|
||||
const tomorrow = new Date(Date.UTC(2025, 9, 7)); // Oct 7, 2025 UTC
|
||||
|
||||
// Create tasks with different dates
|
||||
const overdueTask: TaskInfo = TaskFactory.createTask({
|
||||
path: 'test-overdue.md',
|
||||
content: '- [ ] Overdue task',
|
||||
due: formatDateForStorage(yesterday),
|
||||
status: ' ',
|
||||
});
|
||||
|
||||
const todayTask: TaskInfo = TaskFactory.createTask({
|
||||
path: 'test-today.md',
|
||||
content: '- [ ] Today task',
|
||||
due: formatDateForStorage(today),
|
||||
status: ' ',
|
||||
});
|
||||
|
||||
const recurringOverdueTask: TaskInfo = TaskFactory.createTask({
|
||||
path: 'test-recurring.md',
|
||||
content: '- [ ] Recurring task',
|
||||
scheduled: formatDateForStorage(yesterday),
|
||||
recurrence: 'RRULE:FREQ=DAILY',
|
||||
status: ' ',
|
||||
});
|
||||
|
||||
// Mock the cache to return our test tasks
|
||||
mockCacheManager.getAllTaskPaths.mockReturnValue([
|
||||
overdueTask.path,
|
||||
todayTask.path,
|
||||
recurringOverdueTask.path
|
||||
]);
|
||||
|
||||
mockCacheManager.getCachedTaskInfo.mockImplementation((path: string) => {
|
||||
if (path === overdueTask.path) return Promise.resolve(overdueTask);
|
||||
if (path === todayTask.path) return Promise.resolve(todayTask);
|
||||
if (path === recurringOverdueTask.path) return Promise.resolve(recurringOverdueTask);
|
||||
return Promise.resolve(null);
|
||||
});
|
||||
|
||||
// Create a default filter query (no filters, just sorting)
|
||||
const query: FilterQuery = {
|
||||
type: 'group',
|
||||
id: 'root',
|
||||
conjunction: 'and',
|
||||
children: [],
|
||||
sortKey: 'scheduled',
|
||||
sortDirection: 'asc',
|
||||
groupKey: 'none'
|
||||
};
|
||||
|
||||
// Get agenda data for today with overdue section enabled
|
||||
const todayUTC = createUTCDateFromLocalCalendarDate(today);
|
||||
const { dailyData, overdueTasks } = await filterService.getAgendaDataWithOverdue(
|
||||
[todayUTC],
|
||||
query,
|
||||
true // showOverdueSection = true
|
||||
);
|
||||
|
||||
// EXPECTED BEHAVIOR:
|
||||
// 1. overdueTasks should contain the overdue non-recurring task
|
||||
// 2. dailyData[0] (today) should only contain todayTask
|
||||
// 3. Recurring tasks with past scheduled dates should appear in overdueTasks
|
||||
|
||||
console.log('Daily data:', dailyData);
|
||||
console.log('Overdue tasks:', overdueTasks);
|
||||
|
||||
// Verify overdue section contains overdue tasks
|
||||
expect(overdueTasks.length).toBeGreaterThan(0);
|
||||
expect(overdueTasks.some(t => t.path === overdueTask.path)).toBe(true);
|
||||
|
||||
// Verify recurring overdue task appears in overdue section
|
||||
expect(overdueTasks.some(t => t.path === recurringOverdueTask.path)).toBe(true);
|
||||
|
||||
// Verify today's tasks don't include overdue tasks
|
||||
const todayTasks = dailyData[0].tasks;
|
||||
expect(todayTasks.some(t => t.path === todayTask.path)).toBe(true);
|
||||
|
||||
// Overdue tasks should NOT appear in the daily section (only in overdue section)
|
||||
expect(todayTasks.some(t => t.path === overdueTask.path)).toBe(false);
|
||||
});
|
||||
|
||||
it('should include overdue tasks in overdue section after updating task due date to today', async () => {
|
||||
const today = new Date(Date.UTC(2025, 9, 6)); // Oct 6, 2025 UTC
|
||||
const yesterday = new Date(Date.UTC(2025, 9, 5)); // Oct 5, 2025 UTC
|
||||
|
||||
// Create a task that was overdue but is now updated to today
|
||||
const taskUpdatedToToday: TaskInfo = TaskFactory.createTask({
|
||||
path: 'test-updated.md',
|
||||
content: '- [ ] Task updated to today',
|
||||
due: formatDateForStorage(today),
|
||||
status: ' ',
|
||||
});
|
||||
|
||||
// Mock the cache
|
||||
mockCacheManager.getAllTaskPaths.mockReturnValue([taskUpdatedToToday.path]);
|
||||
mockCacheManager.getCachedTaskInfo.mockResolvedValue(taskUpdatedToToday);
|
||||
|
||||
const query: FilterQuery = {
|
||||
type: 'group',
|
||||
id: 'root',
|
||||
conjunction: 'and',
|
||||
children: [],
|
||||
sortKey: 'scheduled',
|
||||
sortDirection: 'asc',
|
||||
groupKey: 'none'
|
||||
};
|
||||
|
||||
const todayUTC = createUTCDateFromLocalCalendarDate(today);
|
||||
const { dailyData, overdueTasks } = await filterService.getAgendaDataWithOverdue(
|
||||
[todayUTC],
|
||||
query,
|
||||
true
|
||||
);
|
||||
|
||||
// Task due today should appear in today's section, NOT in overdue
|
||||
expect(dailyData[0].tasks.some(t => t.path === taskUpdatedToToday.path)).toBe(true);
|
||||
expect(overdueTasks.some(t => t.path === taskUpdatedToToday.path)).toBe(false);
|
||||
});
|
||||
|
||||
it('should handle recurring tasks correctly - not show as overdue if current instance is today/future', async () => {
|
||||
const today = new Date(Date.UTC(2025, 9, 6)); // Oct 6, 2025 UTC
|
||||
const yesterday = new Date(Date.UTC(2025, 9, 5)); // Oct 5, 2025 UTC
|
||||
|
||||
// Recurring task with scheduled date as yesterday
|
||||
// But the current instance (evaluated for today) should appear on today
|
||||
const recurringTask: TaskInfo = TaskFactory.createTask({
|
||||
path: 'test-recurring-today.md',
|
||||
content: '- [ ] Daily recurring task',
|
||||
scheduled: formatDateForStorage(today), // Current scheduled instance is today
|
||||
recurrence: 'RRULE:FREQ=DAILY',
|
||||
status: ' ',
|
||||
});
|
||||
|
||||
mockCacheManager.getAllTaskPaths.mockReturnValue([recurringTask.path]);
|
||||
mockCacheManager.getCachedTaskInfo.mockResolvedValue(recurringTask);
|
||||
|
||||
const query: FilterQuery = {
|
||||
type: 'group',
|
||||
id: 'root',
|
||||
conjunction: 'and',
|
||||
children: [],
|
||||
sortKey: 'scheduled',
|
||||
sortDirection: 'asc',
|
||||
groupKey: 'none'
|
||||
};
|
||||
|
||||
const todayUTC = createUTCDateFromLocalCalendarDate(today);
|
||||
const { dailyData, overdueTasks } = await filterService.getAgendaDataWithOverdue(
|
||||
[todayUTC],
|
||||
query,
|
||||
true
|
||||
);
|
||||
|
||||
// Recurring task with today's scheduled date should appear on today, not in overdue
|
||||
expect(dailyData[0].tasks.some(t => t.path === recurringTask.path)).toBe(true);
|
||||
expect(overdueTasks.some(t => t.path === recurringTask.path)).toBe(false);
|
||||
});
|
||||
});
|
||||
Loading…
Reference in a new issue