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

package/lib/documents/dashboard/UserConfig.d.ts

@@ -30,6 +30,17 @@ export default class DashboardUserConfig extends BaseDocumentWithType implements
         automationPage: boolean;
         homePageLinks: boolean;
     };
+    /**
+     * The number of days after which a task is automatically deleted. The
+     * requirement is that this number is at least 5 days, and at most 90 days.
+     *
+     * Tasks are only deleted if:
+     *
+     * - They are not recurring
+     * - They are not completed
+     * - They have not been updated in the number listed by this setting
+     */
+    autoTaskDeletionDays: number;
     /**
      * The user's tag settings for the dashboard.
      */

package/lib/documents/dashboard/UserConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UserConfig.d.ts","sourceRoot":"","sources":["../../../src/documents/dashboard/UserConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,oBAAoB,MAAM,yBAAyB,CAAC;AAC3D,OAAO,cAAc,MAAM,4CAA4C,CAAC;AAExE,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,EAAE,oBAAoB,EAAE,MAAM,gDAAgD,CAAC;AACtF,OAAO,EACL,mCAAmC,EAEpC,MAAM,kDAAkD,CAAC;AAC1D,OAAO,EACL,qCAAqC,EAEtC,MAAM,oDAAoD,CAAC;AAE5D,eAAO,MAAM,2BAA2B,EAAE,iBAAiB,CACzD,mBAAmB,CAcpB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,mBACnB,SAAQ,oBACR,YAAW,cAAc;IAEzB,MAAM,CAAC,OAAO,SAAgB;IAE9B,OAAO,SAA+B;IAEtC;;OAEG;IACH,MAAM,EAAE,QAAQ,CAAC;IAEjB;;;OAGG;IACH,aAAa,EAAE,QAAQ,EAAE,CAAM;IAE/B;;OAEG;IACH,aAAa,UAAS;IAEtB;;OAEG;IACH,eAAe,EAAE;QACf,WAAW,EAAE,OAAO,CAAC;QACrB,cAAc,EAAE,OAAO,CAAC;QACxB,aAAa,EAAE,OAAO,CAAC;KACxB,CAIC;IAEF;;OAEG;IACH,WAAW,EAAE,oBAAoB,CAAM;IAEvC,oBAAoB,EAAE,mCAAmC,CAAM;IAE/D,sBAAsB,EAAE,qCAAqC,CAAM;gBAEvD,OAAO,EAAE,QAAQ;CAI9B"}
+{"version":3,"file":"UserConfig.d.ts","sourceRoot":"","sources":["../../../src/documents/dashboard/UserConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,oBAAoB,MAAM,yBAAyB,CAAC;AAC3D,OAAO,cAAc,MAAM,4CAA4C,CAAC;AAExE,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,EAAE,oBAAoB,EAAE,MAAM,gDAAgD,CAAC;AACtF,OAAO,EACL,mCAAmC,EAEpC,MAAM,kDAAkD,CAAC;AAC1D,OAAO,EACL,qCAAqC,EAEtC,MAAM,oDAAoD,CAAC;AAE5D,eAAO,MAAM,2BAA2B,EAAE,iBAAiB,CACzD,mBAAmB,CAepB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,mBACnB,SAAQ,oBACR,YAAW,cAAc;IAEzB,MAAM,CAAC,OAAO,SAAgB;IAE9B,OAAO,SAA+B;IAEtC;;OAEG;IACH,MAAM,EAAE,QAAQ,CAAC;IAEjB;;;OAGG;IACH,aAAa,EAAE,QAAQ,EAAE,CAAM;IAE/B;;OAEG;IACH,aAAa,UAAS;IAEtB;;OAEG;IACH,eAAe,EAAE;QACf,WAAW,EAAE,OAAO,CAAC;QACrB,cAAc,EAAE,OAAO,CAAC;QACxB,aAAa,EAAE,OAAO,CAAC;KACxB,CAIC;IAEF;;;;;;;;;OASG;IACH,oBAAoB,EAAE,MAAM,CAAM;IAElC;;OAEG;IACH,WAAW,EAAE,oBAAoB,CAAM;IAEvC,oBAAoB,EAAE,mCAAmC,CAAM;IAE/D,sBAAsB,EAAE,qCAAqC,CAAM;gBAEvD,OAAO,EAAE,QAAQ;CAI9B"}

package/lib/documents/dashboard/UserConfig.js

@@ -17,6 +17,7 @@ const validateDashboardUserConfig = (config) => {
     validate.array('collaborators', exampleConfig.collaborators);
     validate.object('tagSettings', {});
     validate.object('enabledFeatures', exampleConfig.enabledFeatures);
+    validate.number('autoTaskDeletionDays', exampleConfig.autoTaskDeletionDays);
     (0, SortSettings_1.validateSortSettings)(validate, config);
     (0, FilterSettings_1.validateFilterSettings)(validate, config);
     return { updatedDoc: config, errors };
@@ -46,6 +47,17 @@ class DashboardUserConfig extends BaseDocumentWithType_1.default {
         automationPage: false,
         homePageLinks: false
     };
+    /**
+     * The number of days after which a task is automatically deleted. The
+     * requirement is that this number is at least 5 days, and at most 90 days.
+     *
+     * Tasks are only deleted if:
+     *
+     * - They are not recurring
+     * - They are not completed
+     * - They have not been updated in the number listed by this setting
+     */
+    autoTaskDeletionDays = 30;
     /**
      * The user's tag settings for the dashboard.
      */

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.45",
   "description": "A core database library used for personal projects",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",