@aneuhold/core-ts-db-lib 1.0.43 → 1.0.44

package/lib/services/dashboard/Task/TaskService.spec.js

@@ -356,7 +356,7 @@ describe('DashboardTaskService', () => {
             const task4 = tasksList[2];
             const task5 = tasksList[3];
             task1.tags = {
-                [sortSettings.userId]: ['tagWithoutPriority']
+                [sortSettings.userId]: ['tagWithoutPriority', 'tag3']
             };
             task2.tags = {
                 [sortSettings.userId]: ['tag3', 'tag4', 'tag1']

package/lib/services/dashboard/Task/TaskSortService.d.ts

@@ -1,4 +1,4 @@
-import DashboardTask, { DashboardTaskMap } from '../../../documents/dashboard/Task';
+import { DashboardTaskMap } from '../../../documents/dashboard/Task';
 import { DashboardTaskListSortSettings, DashboardTaskSortDirection } from '../../../embedded-types/dashboard/task/SortSettings';
 import { DashboardTagSettings } from '../../../embedded-types/dashboard/userConfig/Tags';
 /**
@@ -24,6 +24,7 @@ export default class DashboardTaskSortService {
     /**
      * Gets the highest priority tag value for the provided task.
      */
-    static getHighestPriorityTagValue(task: DashboardTask, userId: string, tagSettings: DashboardTagSettings, sortDirection: DashboardTaskSortDirection): number;
+    private static getHighestPriorityTagValue;
+    private static getPriorityTagForTask;
 }
 //# sourceMappingURL=TaskSortService.d.ts.map

package/lib/services/dashboard/Task/TaskSortService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TaskSortService.d.ts","sourceRoot":"","sources":["../../../../src/services/dashboard/Task/TaskSortService.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,EAAE,EACpB,gBAAgB,EACjB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACL,6BAA6B,EAE7B,0BAA0B,EAC3B,MAAM,qDAAqD,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mDAAmD,CAAC;AAEzF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,wBAAwB;IAC3C;;OAEG;IACH,MAAM,CAAC,IAAI,CACT,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,MAAM,EAAE,EACjB,YAAY,EAAE,6BAA6B,EAC3C,WAAW,EAAE,oBAAoB;IA0BnC;;;;OAIG;IACH,MAAM,CAAC,eAAe,CACpB,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,MAAM,EAAE,EACjB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,oBAAoB,EACjC,uBAAuB,EAAE,MAAM,EAC/B,aAAa,EAAE,0BAA0B,GACxC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAkCzB,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAkElC;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,qBAAqB;IAgCpC;;OAEG;IACH,MAAM,CAAC,0BAA0B,CAC/B,IAAI,EAAE,aAAa,EACnB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,oBAAoB,EACjC,aAAa,EAAE,0BAA0B;CAoB5C"}
+{"version":3,"file":"TaskSortService.d.ts","sourceRoot":"","sources":["../../../../src/services/dashboard/Task/TaskSortService.ts"],"names":[],"mappings":"AAAA,OAAsB,EACpB,gBAAgB,EACjB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACL,6BAA6B,EAE7B,0BAA0B,EAC3B,MAAM,qDAAqD,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mDAAmD,CAAC;AAEzF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,wBAAwB;IAC3C;;OAEG;IACH,MAAM,CAAC,IAAI,CACT,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,MAAM,EAAE,EACjB,YAAY,EAAE,6BAA6B,EAC3C,WAAW,EAAE,oBAAoB;IA0BnC;;;;OAIG;IACH,MAAM,CAAC,eAAe,CACpB,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,MAAM,EAAE,EACjB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,oBAAoB,EACjC,uBAAuB,EAAE,MAAM,EAC/B,aAAa,EAAE,0BAA0B,GACxC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAkCzB,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAkElC;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,qBAAqB;IAepC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,0BAA0B;IAezC,OAAO,CAAC,MAAM,CAAC,qBAAqB;CAgCrC"}

package/lib/services/dashboard/Task/TaskSortService.js

@@ -114,44 +114,40 @@ class DashboardTaskSortService {
      * or if there are no tags with a priority, then this will return null.
      */
     static getHighestPriorityTag(task, userId, tagSettings, sortDirection) {
-        const tags = task.tags[userId];
-        if (!tags || tags.length === 0)
-            return null;
-        let highestPriorityTag = null;
-        let highestPriority = 0;
-        const sortDirectionIsAscending = sortDirection === SortSettings_1.DashboardTaskSortDirection.ascending;
-        // If the sort direction is descending, then we want to start with the
-        // lowest priority number.
-        if (sortDirectionIsAscending) {
-            highestPriority = Number.MAX_SAFE_INTEGER;
-        }
-        tags.forEach((tag) => {
-            const priority = tagSettings[tag]?.priority;
-            if (priority &&
-                ((sortDirectionIsAscending && priority < highestPriority) ||
-                    (!sortDirectionIsAscending && priority > highestPriority))) {
-                highestPriorityTag = tag;
-                highestPriority = priority;
-            }
-        });
-        return highestPriorityTag;
+        const priorityTag = this.getPriorityTagForTask(task, userId, tagSettings, sortDirection);
+        return priorityTag ? priorityTag.tag : null;
     }
     /**
      * Gets the highest priority tag value for the provided task.
      */
     static getHighestPriorityTagValue(task, userId, tagSettings, sortDirection) {
+        const priorityTag = this.getPriorityTagForTask(task, userId, tagSettings, sortDirection);
+        return priorityTag ? priorityTag.priority : 0;
+    }
+    static getPriorityTagForTask(task, userId, tagSettings, sortDirection) {
+        let priorityTag = null;
         const tags = task.tags[userId];
         if (!tags || tags.length === 0)
-            return 0;
+            return priorityTag;
+        let highestPriority = 0;
         const isAscending = sortDirection === SortSettings_1.DashboardTaskSortDirection.ascending;
-        return tags.reduce((highestPriority, tag) => {
+        // If the sort direction is descending, then we want to start with the
+        // lowest priority number.
+        if (isAscending) {
+            highestPriority = Number.MAX_SAFE_INTEGER;
+        }
+        tags.forEach((tag) => {
             const priority = tagSettings[tag]?.priority ?? 0;
             if ((isAscending && priority < highestPriority) ||
                 (!isAscending && priority > highestPriority)) {
-                return priority;
+                highestPriority = priority;
+                priorityTag = { tag, priority };
             }
-            return highestPriority;
-        }, isAscending ? Number.MAX_SAFE_INTEGER : 0);
+        });
+        if (highestPriority === 0) {
+            return null;
+        }
+        return priorityTag;
     }
 }
 exports.default = DashboardTaskSortService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aneuhold/core-ts-db-lib",
-  "version": "1.0.43",
+  "version": "1.0.44",
   "description": "A core database library used for personal projects",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",