From e5825c29dccd16a806039556df6b455543919069 Mon Sep 17 00:00:00 2001
From: Vyacheslav Tumanov <me@slavatumanov.me>
Date: Tue, 18 Apr 2023 17:42:41 +0500
Subject: [PATCH] TSK-1248: fix dueDate sorting order (#3013)

Signed-off-by: Vyacheslav Tumanov <me@slavatumanov.me>
---
 models/lead/src/index.ts               | 2 +-
 models/recruit/src/index.ts            | 2 +-
 models/tracker/src/index.ts            | 6 +++---
 plugins/tracker-resources/src/utils.ts | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/models/lead/src/index.ts b/models/lead/src/index.ts
index 8539eb3915..dbf0c8f44d 100644
--- a/models/lead/src/index.ts
+++ b/models/lead/src/index.ts
@@ -262,7 +262,7 @@ export function createModel (builder: Builder): void {
     orderBy: [
       ['state', SortingOrder.Ascending],
       ['modifiedOn', SortingOrder.Descending],
-      ['dueDate', SortingOrder.Descending],
+      ['dueDate', SortingOrder.Ascending],
       ['rank', SortingOrder.Ascending]
     ],
     other: [
diff --git a/models/recruit/src/index.ts b/models/recruit/src/index.ts
index 8dd9898e99..20394405c4 100644
--- a/models/recruit/src/index.ts
+++ b/models/recruit/src/index.ts
@@ -625,7 +625,7 @@ export function createModel (builder: Builder): void {
     orderBy: [
       ['state', SortingOrder.Ascending],
       ['modifiedOn', SortingOrder.Descending],
-      ['dueDate', SortingOrder.Descending],
+      ['dueDate', SortingOrder.Ascending],
       ['rank', SortingOrder.Ascending]
     ],
     other: [
diff --git a/models/tracker/src/index.ts b/models/tracker/src/index.ts
index 552ee21349..116a69cb8a 100644
--- a/models/tracker/src/index.ts
+++ b/models/tracker/src/index.ts
@@ -490,7 +490,7 @@ export function createModel (builder: Builder): void {
       ['status', SortingOrder.Ascending],
       ['priority', SortingOrder.Ascending],
       ['modifiedOn', SortingOrder.Descending],
-      ['dueDate', SortingOrder.Descending],
+      ['dueDate', SortingOrder.Ascending],
       ['rank', SortingOrder.Ascending]
     ],
     other: [
@@ -607,7 +607,7 @@ export function createModel (builder: Builder): void {
       ['status', SortingOrder.Ascending],
       ['priority', SortingOrder.Ascending],
       ['modifiedOn', SortingOrder.Descending],
-      ['dueDate', SortingOrder.Descending]
+      ['dueDate', SortingOrder.Ascending]
     ],
     groupDepth: 1,
     other: []
@@ -686,7 +686,7 @@ export function createModel (builder: Builder): void {
         orderBy: [
           ['priority', SortingOrder.Ascending],
           ['modifiedOn', SortingOrder.Descending],
-          ['dueDate', SortingOrder.Descending],
+          ['dueDate', SortingOrder.Ascending],
           ['rank', SortingOrder.Ascending]
         ],
         other: []
diff --git a/plugins/tracker-resources/src/utils.ts b/plugins/tracker-resources/src/utils.ts
index bcc20dc93b..af23f6cff5 100644
--- a/plugins/tracker-resources/src/utils.ts
+++ b/plugins/tracker-resources/src/utils.ts
@@ -102,7 +102,7 @@ export const issuesSortOrderMap: Record<IssuesOrderByKeys, SortingOrder> = {
   status: SortingOrder.Ascending,
   priority: SortingOrder.Ascending,
   modifiedOn: SortingOrder.Descending,
-  dueDate: SortingOrder.Descending,
+  dueDate: SortingOrder.Ascending,
   rank: SortingOrder.Ascending
 }