feat(commands): #13 sort by due date by default

ISSUES CLOSED: #13
moranje · Feb 16, 2020 · 32044b0 · 32044b0
1 parent 962b556
commit 32044b0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/lib/commands/read.ts b/src/lib/commands/read.ts
@@ -19,9 +19,9 @@ import {
   zhTW,
 } from 'date-fns/locale';
 import parseISO from 'date-fns/parseISO';
+import sort from 'fast-sort';
 import { TodoistTask } from 'todoist-rest-api';
 
-import { getApi, requestError } from '../todoist';
 import { createCall } from '@/lib/cli-args';
 import {
   listLabels,
@@ -36,6 +36,8 @@ import { parser } from '@/lib/todoist/parser';
 import { Item, List, workflowList } from '@/lib/workflow';
 import readTasksView from '@/lib/workflow/views/read-tasks';
 
+import { getApi, requestError } from '../todoist';
+
 const LOCALES = {
   da,
   de,
@@ -263,7 +265,9 @@ export async function read(query: string): Promise<void> {
     sectionId: parsed.section?.id,
   });
   const list = await mapTasks(
-    filteredTasks.slice(0, settingsStore().get('max_items'))
+    sort(filteredTasks)
+      .asc(task => task?.due?.datetime ?? task?.due?.date)
+      .slice(0, settingsStore().get('max_items'))
   );
   list.push(listRefreshItem('task'));
 

diff --git a/src/tests/read-remote.ts b/src/tests/read-remote.ts
@@ -30,11 +30,11 @@ describe('integration: Read()', () => {
     await command({ name: 'read', args: '' });
 
     expect(stdoutSpy.mock.calls[0][0]).toContainAllAlfredItemsWith('title', [
+      'COMPLETE: Project review',
+      'COMPLETE: Sign up for dance class',
       'COMPLETE: Get milk',
       'COMPLETE: Plan a thing',
       'COMPLETE: Buy the thing',
-      'COMPLETE: Sign up for dance class',
-      'COMPLETE: Project review',
       'REFRESH CACHE',
     ]);
   });

diff --git a/src/tests/read.ts b/src/tests/read.ts
@@ -27,11 +27,11 @@ describe('integration: Read()', () => {
     await command({ name: 'read', args: '' });
 
     expect(stdoutSpy.mock.calls[0][0]).toContainAllAlfredItemsWith('title', [
+      'COMPLETE: Project review (local)',
+      'COMPLETE: Sign up for dance class (local)',
       'COMPLETE: Get milk (local)',
       'COMPLETE: Plan a thing (local)',
       'COMPLETE: Buy the thing (local)',
-      'COMPLETE: Sign up for dance class (local)',
-      'COMPLETE: Project review (local)',
       'REFRESH CACHE',
     ]);
   });