Merge pull request #371 from nextcloud/fix-sort

Fix the task sorting

package.json

@@ -73,6 +73,7 @@
 		"jsdom": "^15.0.0",
 		"jsdom-global": "^3.0.2",
 		"node-sass": "^4.11.0",
+		"moment": "^2.24.0",
 		"prettier-eslint": "^8.8.2",
 		"raw-loader": "^2.0.0",
 		"sass-loader": "^7.1.0",

src/components/SortorderDropdown.vue

@@ -70,7 +70,7 @@ export default {
 					id: 'default',
 					icon: 'icon-list',
 					text: t('tasks', 'Default'),
-					hint: t('tasks', 'Sort by completed state, priority, start date and summary.')
+					hint: t('tasks', 'Sort by completed state, due date, priority, start date and summary.')
 				},
 				{
 					id: 'due',

src/store/storeHelper.js

@@ -153,7 +153,7 @@ function sort(tasks, sortOrder, sortDirection) {
 		break
 	}
 	default:
-		comparators = [sortByCompleted, sortByPriority, sortByStart, sortAlphabetically]
+		comparators = [sortByCompleted, sortByDue, sortByPriority, sortByStart, sortAlphabetically]
 	}
 	var sortedTasks = tasks.sort((taskA, taskB) => {
 		var compIndex = 0
@@ -272,11 +272,11 @@ function sortByCreated(taskA, taskB) {
  */
 function sortByDate(taskA, taskB, date) {
 	if (taskA[date] === null && taskB[date] !== null) {
-		return -1
+		return 1
 	}
 
 	if (taskA[date] !== null && taskB[date] === null) {
-		return 1
+		return -1
 	}
 
 	if (taskA[date] === null && taskB[date] === null) {

tests/store/storeHelper.spec.js

@@ -0,0 +1,41 @@
+import moment from 'moment'
+import { sort } from '@/store/storeHelper'
+
+global.moment = moment
+
+const tasks = [
+	{
+		id: 1,
+		due: '20191119T183901'
+	},
+	{
+		id: 2,
+		due: '20181119T183901'
+	},
+	{
+		id: 3,
+		due: null
+	},
+	{
+		id: 4,
+		due: '20151119T183901'
+	},
+]
+
+describe('storeHelper', () => {
+	'use strict'
+
+	it('Tests descending sort by due date.', () => {
+		const clonedTasks = tasks.slice(0)
+		const expectedTasks = [tasks[3], tasks[1], tasks[0], tasks[2]]
+		const receivedTasks = sort(clonedTasks, 'due', 0)
+		expect(receivedTasks).toEqual(expectedTasks)
+	})
+
+	it('Tests ascending sort by due date.', () => {
+		const clonedTasks = tasks.slice(0)
+		const expectedTasks = [tasks[2], tasks[0], tasks[1], tasks[3]]
+		const receivedTasks = sort(clonedTasks, 'due', 1)
+		expect(receivedTasks).toEqual(expectedTasks)
+	})
+})