@aneuhold/core-ts-db-lib 1.0.37 → 1.0.38

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

@@ -1,10 +1,9 @@
 import { ObjectId } from 'bson';
 import DashboardTask, { DashboardTaskMap } from '../../../documents/dashboard/Task';
-import DashboardTaskRecurrenceService from './TaskRecurrenceService';
 import { DashboardTaskListFilterSettings } from '../../../embedded-types/dashboard/task/FilterSettings';
 import { DashboardTaskListSortSettings } from '../../../embedded-types/dashboard/task/SortSettings';
-import DashboardTaskSortService from './TaskSortService';
 import { DashboardTagSettings } from '../../../embedded-types/dashboard/userConfig/Tags';
+import { RecurrenceFrequency } from '../../../embedded-types/dashboard/task/RecurrenceInfo';
 /**
  * A type for the task filter settings for a particular task.
  */
@@ -21,7 +20,7 @@ export default class DashboardTaskService {
      * Gets the next frequency date from the provided basis date. Returns null
      * if the provided frequency is in an invalid state.
      */
-    static getNextFrequencyDate: typeof DashboardTaskRecurrenceService.getNextFrequencyDate;
+    static getNextFrequencyDate(basisDate: Date, frequency: RecurrenceFrequency): Date | null;
     /**
      * Moves the start and due date forward by one frequency.
      *
@@ -31,7 +30,7 @@ export default class DashboardTaskService {
      * Makes no changes if the state of the task is invalid for recurrence or
      * there isn't recurrence info.
      */
-    static updateDatesForRecurrence: typeof DashboardTaskRecurrenceService.updateDatesForRecurrence;
+    static updateDatesForRecurrence(task: DashboardTask): void;
     /**
      * Gets the filtered and sorted set of task ids for a particular category.
      *
@@ -42,9 +41,11 @@ export default class DashboardTaskService {
      */
     static getFilteredAndSortedTaskIds(taskMap: DashboardTaskMap, category: string, filterSettings: DashboardTaskListFilterSettings, sortSettings: DashboardTaskListSortSettings, tagSettings: DashboardTagSettings, taskInfo?: DashboardTaskFilterTaskInfo): string[];
     /**
-     * Gets the highest priority tag value for the provided task.
+     * Gets a map of task IDs to tag header names. Used only for when sorting by
+     * tags. If the first task in the list has no high-priority tags, then
+     * noPriorityTagsIndicator will be used as the header name.
      */
-    static getHighestPriorityTagValue: typeof DashboardTaskSortService.getHighestPriorityTagValue;
+    static getTagHeaderMap(taskMap: DashboardTaskMap, taskIds: string[], userId: string, tagSettings: DashboardTagSettings, noPriorityTagsIndicator: string): Record<string, string>;
     private static getChildrenTaskIds;
 }
 //# sourceMappingURL=TaskService.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"TaskService.d.ts","sourceRoot":"","sources":["../../../../src/services/dashboard/Task/TaskService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,aAAa,EAAE,EACpB,gBAAgB,EACjB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,8BAA8B,MAAM,yBAAyB,CAAC;AACrE,OAAO,EAAE,+BAA+B,EAAE,MAAM,uDAAuD,CAAC;AACxG,OAAO,EAAE,6BAA6B,EAAE,MAAM,qDAAqD,CAAC;AAEpG,OAAO,wBAAwB,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mDAAmD,CAAC;AAEzF;;GAEG;AACH,MAAM,MAAM,2BAA2B,GAAG;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,oBAAoB;IACvC;;OAEG;IACH,MAAM,CAAC,cAAc,iBACL,aAAa,EAAE,iBACd,QAAQ,EAAE,KACxB,QAAQ,EAAE,CA2BX;IAEF;;;OAGG;IACH,MAAM,CAAC,oBAAoB,6DAC2B;IAEtD;;;;;;;;OAQG;IACH,MAAM,CAAC,wBAAwB,iEAC2B;IAE1D;;;;;;;OAOG;IACH,MAAM,CAAC,2BAA2B,CAChC,OAAO,EAAE,gBAAgB,EACzB,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,+BAA+B,EAC/C,YAAY,EAAE,6BAA6B,EAC3C,WAAW,EAAE,oBAAoB,EACjC,QAAQ,CAAC,EAAE,2BAA2B,GACrC,MAAM,EAAE;IA2BX;;OAEG;IACH,MAAM,CAAC,0BAA0B,6DACqB;IAEtD,OAAO,CAAC,MAAM,CAAC,kBAAkB;CAsBlC"}
+{"version":3,"file":"TaskService.d.ts","sourceRoot":"","sources":["../../../../src/services/dashboard/Task/TaskService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,aAAa,EAAE,EACpB,gBAAgB,EACjB,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EAAE,+BAA+B,EAAE,MAAM,uDAAuD,CAAC;AACxG,OAAO,EAAE,6BAA6B,EAAE,MAAM,qDAAqD,CAAC;AAGpG,OAAO,EAAE,oBAAoB,EAAE,MAAM,mDAAmD,CAAC;AACzF,OAAO,EAAE,mBAAmB,EAAE,MAAM,uDAAuD,CAAC;AAE5F;;GAEG;AACH,MAAM,MAAM,2BAA2B,GAAG;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,oBAAoB;IACvC;;OAEG;IACH,MAAM,CAAC,cAAc,iBACL,aAAa,EAAE,iBACd,QAAQ,EAAE,KACxB,QAAQ,EAAE,CA2BX;IAEF;;;OAGG;IACH,MAAM,CAAC,oBAAoB,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,mBAAmB;IAO3E;;;;;;;;OAQG;IACH,MAAM,CAAC,wBAAwB,CAAC,IAAI,EAAE,aAAa;IAInD;;;;;;;OAOG;IACH,MAAM,CAAC,2BAA2B,CAChC,OAAO,EAAE,gBAAgB,EACzB,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,+BAA+B,EAC/C,YAAY,EAAE,6BAA6B,EAC3C,WAAW,EAAE,oBAAoB,EACjC,QAAQ,CAAC,EAAE,2BAA2B,GACrC,MAAM,EAAE;IA2BX;;;;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;IAWjC,OAAO,CAAC,MAAM,CAAC,kBAAkB;CAsBlC"}

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

@@ -37,7 +37,9 @@ class DashboardTaskService {
      * Gets the next frequency date from the provided basis date. Returns null
      * if the provided frequency is in an invalid state.
      */
-    static getNextFrequencyDate = TaskRecurrenceService_1.default.getNextFrequencyDate;
+    static getNextFrequencyDate(basisDate, frequency) {
+        return TaskRecurrenceService_1.default.getNextFrequencyDate(basisDate, frequency);
+    }
     /**
      * Moves the start and due date forward by one frequency.
      *
@@ -47,7 +49,9 @@ class DashboardTaskService {
      * Makes no changes if the state of the task is invalid for recurrence or
      * there isn't recurrence info.
      */
-    static updateDatesForRecurrence = TaskRecurrenceService_1.default.updateDatesForRecurrence;
+    static updateDatesForRecurrence(task) {
+        return TaskRecurrenceService_1.default.updateDatesForRecurrence(task);
+    }
     /**
      * Gets the filtered and sorted set of task ids for a particular category.
      *
@@ -67,9 +71,13 @@ class DashboardTaskService {
         return TaskSortService_1.default.sort(taskMap, filterResult, sortSettings, tagSettings);
     }
     /**
-     * Gets the highest priority tag value for the provided task.
+     * Gets a map of task IDs to tag header names. Used only for when sorting by
+     * tags. If the first task in the list has no high-priority tags, then
+     * noPriorityTagsIndicator will be used as the header name.
      */
-    static getHighestPriorityTagValue = TaskSortService_1.default.getHighestPriorityTagValue;
+    static getTagHeaderMap(taskMap, taskIds, userId, tagSettings, noPriorityTagsIndicator) {
+        return TaskSortService_1.default.getTagHeaderMap(taskMap, taskIds, userId, tagSettings, noPriorityTagsIndicator);
+    }
     static getChildrenTaskIds(taskIdToTaskDict, parentToTaskIdsDict, taskId) {
         const childrenIds = parentToTaskIdsDict[taskId];
         if (!childrenIds) {

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

@@ -273,6 +273,65 @@ describe('DashboardTaskService', () => {
             ]);
             expect(taskMap[result[2]].tags[sortSettings.userId]).toEqual(['tag1']);
         });
+        it('should return a correct tag header map when sorting tags descending', () => {
+            const { tasksList, taskMap, filterSettings, sortSettings, tagSettings } = setupSortAndFilterTest(10);
+            sortSettings.sortList.push({
+                sortBy: SortSettings_1.DashboardTaskSortBy.tags,
+                sortDirection: SortSettings_1.DashboardTaskSortDirection.descending
+            });
+            sortSettings.sortList.push({
+                sortBy: SortSettings_1.DashboardTaskSortBy.title,
+                sortDirection: SortSettings_1.DashboardTaskSortDirection.ascending
+            });
+            tagSettings.tag1 = {
+                priority: 1
+            };
+            tagSettings.tag2 = {
+                priority: 2
+            };
+            tagSettings.tag3 = {
+                priority: 3
+            };
+            const task1 = tasksList[4];
+            const task2 = tasksList[0];
+            const task3 = tasksList[1];
+            const task4 = tasksList[2];
+            const task5 = tasksList[3];
+            const task6 = tasksList[5];
+            task1.tags = {
+                [sortSettings.userId]: ['tag1', 'tag3']
+            };
+            task1.title = 'a';
+            task2.tags = {
+                [sortSettings.userId]: ['tag3']
+            };
+            task2.title = 'b';
+            task3.tags = {
+                [sortSettings.userId]: ['tag2', 'tag1']
+            };
+            task4.tags = {
+                [sortSettings.userId]: ['tag1']
+            };
+            task5.tags = {
+                [sortSettings.userId]: ['tagWithoutPriority']
+            };
+            task6.tags = {
+                [sortSettings.userId]: ['tagWithoutPriority']
+            };
+            const sortedTaskIds = TaskService_1.default.getFilteredAndSortedTaskIds(taskMap, 'default', filterSettings, sortSettings, tagSettings);
+            expect(sortedTaskIds.length).toBe(10);
+            expect(sortedTaskIds[0]).toBe(task1._id.toString());
+            expect(sortedTaskIds[1]).toBe(task2._id.toString());
+            expect(sortedTaskIds[2]).toBe(task3._id.toString());
+            expect(sortedTaskIds[3]).toBe(task4._id.toString());
+            expect(sortedTaskIds[4]).toBe(task5._id.toString());
+            const result = TaskService_1.default.getTagHeaderMap(taskMap, sortedTaskIds, sortSettings.userId, tagSettings, 'No Priority');
+            expect(Object.keys(result).length).toBe(4);
+            expect(result[task1._id.toString()]).toBe('tag3');
+            expect(result[task3._id.toString()]).toBe('tag2');
+            expect(result[task4._id.toString()]).toBe('tag1');
+            expect(result[task5._id.toString()]).toBe('No Priority');
+        });
         it('should return a sorted list of tasks by tags, start date, and title', () => {
             const { tasksList, taskMap, filterSettings, sortSettings, tagSettings } = setupSortAndFilterTest(10);
             sortSettings.sortList.push({

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

@@ -9,10 +9,21 @@ export default class DashboardTaskSortService {
      * Sorts the provided task IDs based on the provided sort settings.
      */
     static sort(taskMap: DashboardTaskMap, taskIds: string[], sortSettings: DashboardTaskListSortSettings, tagSettings: DashboardTagSettings): string[];
+    /**
+     * Gets a map of task IDs to tag header names. Used only for when sorting by
+     * tags. If the first task in the list has no high-priority tags, then
+     * noPriorityTagsIndicator will be used as the header name.
+     */
+    static getTagHeaderMap(taskMap: DashboardTaskMap, taskIds: string[], userId: string, tagSettings: DashboardTagSettings, noPriorityTagsIndicator: string): Record<string, string>;
+    private static getTaskSortFunction;
+    /**
+     * Gets the highest priority tag for the provided task. If there are no tags,
+     * or if there are no tags with a priority, then this will return null.
+     */
+    private static getHighestPriorityTag;
     /**
      * Gets the highest priority tag value for the provided task.
      */
     static getHighestPriorityTagValue(task: DashboardTask, userId: string, tagSettings: DashboardTagSettings): number;
-    private static getTaskSortFunction;
 }
 //# 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,EAG9B,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;;OAEG;IACH,MAAM,CAAC,0BAA0B,CAC/B,IAAI,EAAE,aAAa,EACnB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,oBAAoB;IAcnC,OAAO,CAAC,MAAM,CAAC,mBAAmB;CA+DnC"}
+{"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,EAG9B,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,GAC9B,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAwBzB,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAgElC;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,qBAAqB;IAoBpC;;OAEG;IACH,MAAM,CAAC,0BAA0B,CAC/B,IAAI,EAAE,aAAa,EACnB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,oBAAoB;CAapC"}

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

@@ -26,19 +26,35 @@ class DashboardTaskSortService {
         });
     }
     /**
-     * Gets the highest priority tag value for the provided task.
+     * Gets a map of task IDs to tag header names. Used only for when sorting by
+     * tags. If the first task in the list has no high-priority tags, then
+     * noPriorityTagsIndicator will be used as the header name.
      */
-    static getHighestPriorityTagValue(task, userId, tagSettings) {
-        const tags = task.tags[userId];
-        if (!tags || tags.length === 0)
-            return 0;
-        return tags.reduce((highestPriority, tag) => {
-            const priority = tagSettings[tag]?.priority;
-            if (priority && priority > highestPriority) {
-                return priority;
+    static getTagHeaderMap(taskMap, taskIds, userId, tagSettings, noPriorityTagsIndicator) {
+        const tagHeaderMap = {};
+        if (taskIds.length === 0 || taskIds.length === 1)
+            return tagHeaderMap;
+        const firstTask = taskMap[taskIds[0]];
+        if (!firstTask)
+            return tagHeaderMap;
+        let tag = this.getHighestPriorityTag(firstTask, userId, tagSettings);
+        if (!tag) {
+            tagHeaderMap[taskIds[0]] = noPriorityTagsIndicator;
+        }
+        else {
+            tagHeaderMap[taskIds[0]] = tag;
+        }
+        for (let i = 1; i < taskIds.length; i += 1) {
+            const task = taskMap[taskIds[i]];
+            if (task) {
+                const taskTag = this.getHighestPriorityTag(task, userId, tagSettings);
+                if (taskTag !== tag && tag !== noPriorityTagsIndicator) {
+                    tag = taskTag || noPriorityTagsIndicator;
+                    tagHeaderMap[taskIds[i]] = tag;
+                }
             }
-            return highestPriority;
-        }, 0);
+        }
+        return tagHeaderMap;
     }
     static getTaskSortFunction(sortBy, sortDirection, tagSettings, userId) {
         switch (sortBy) {
@@ -93,5 +109,39 @@ class DashboardTaskSortService {
                 };
         }
     }
+    /**
+     * Gets the highest priority tag for the provided task. If there are no tags,
+     * or if there are no tags with a priority, then this will return null.
+     */
+    static getHighestPriorityTag(task, userId, tagSettings) {
+        const tags = task.tags[userId];
+        if (!tags || tags.length === 0)
+            return null;
+        let highestPriorityTag = null;
+        let highestPriority = 0;
+        tags.forEach((tag) => {
+            const priority = tagSettings[tag]?.priority;
+            if (priority && priority > highestPriority) {
+                highestPriorityTag = tag;
+                highestPriority = priority;
+            }
+        });
+        return highestPriorityTag;
+    }
+    /**
+     * Gets the highest priority tag value for the provided task.
+     */
+    static getHighestPriorityTagValue(task, userId, tagSettings) {
+        const tags = task.tags[userId];
+        if (!tags || tags.length === 0)
+            return 0;
+        return tags.reduce((highestPriority, tag) => {
+            const priority = tagSettings[tag]?.priority;
+            if (priority && priority > highestPriority) {
+                return priority;
+            }
+            return highestPriority;
+        }, 0);
+    }
 }
 exports.default = DashboardTaskSortService;

package/package.json

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