@aneuhold/core-ts-db-lib 1.0.120 → 2.0.0

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

@@ -1,37 +1,35 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const core_ts_lib_1 = require("@aneuhold/core-ts-lib");
-const RecurrenceInfo_1 = require("../../../embedded-types/dashboard/task/RecurrenceInfo");
-class DashboardTaskRecurrenceService {
+import { DateService } from '@aneuhold/core-ts-lib';
+import { RecurrenceBasis, RecurrenceFrequencyType } from '../../../embedded-types/dashboard/task/RecurrenceInfo.js';
+export default class DashboardTaskRecurrenceService {
     /**
      * Gets the next frequency date from the provided basis date. Returns null
      * if the provided frequency is in an invalid state.
      */
     static getNextFrequencyDate(basisDate, frequency) {
         // Last day of month
-        if (frequency.type === RecurrenceInfo_1.RecurrenceFrequencyType.lastDayOfMonth) {
-            return core_ts_lib_1.DateService.getLastDayOfGivenMonth(basisDate);
+        if (frequency.type === RecurrenceFrequencyType.lastDayOfMonth) {
+            return DateService.getLastDayOfGivenMonth(basisDate);
         }
         // Every X Time Unit
-        if (frequency.type === RecurrenceInfo_1.RecurrenceFrequencyType.everyXTimeUnit) {
+        if (frequency.type === RecurrenceFrequencyType.everyXTimeUnit) {
             if (!frequency.everyXTimeUnit) {
                 return null;
             }
             if (frequency.everyXTimeUnit.timeUnit === 'day') {
-                return core_ts_lib_1.DateService.addDays(basisDate, frequency.everyXTimeUnit.x);
+                return DateService.addDays(basisDate, frequency.everyXTimeUnit.x);
             }
             if (frequency.everyXTimeUnit.timeUnit === 'week') {
-                return core_ts_lib_1.DateService.addDays(basisDate, frequency.everyXTimeUnit.x * 7);
+                return DateService.addDays(basisDate, frequency.everyXTimeUnit.x * 7);
             }
             if (frequency.everyXTimeUnit.timeUnit === 'month') {
-                return core_ts_lib_1.DateService.addMonths(basisDate, frequency.everyXTimeUnit.x);
+                return DateService.addMonths(basisDate, frequency.everyXTimeUnit.x);
             }
             if (frequency.everyXTimeUnit.timeUnit === 'year') {
-                return core_ts_lib_1.DateService.addYears(basisDate, frequency.everyXTimeUnit.x);
+                return DateService.addYears(basisDate, frequency.everyXTimeUnit.x);
             }
         }
         // Week Day Set
-        if (frequency.type === RecurrenceInfo_1.RecurrenceFrequencyType.weekDaySet) {
+        if (frequency.type === RecurrenceFrequencyType.weekDaySet) {
             if (!frequency.weekDaySet) {
                 return null;
             }
@@ -46,18 +44,18 @@ class DashboardTaskRecurrenceService {
             }
         }
         // Every X Weekday of Month
-        if (frequency.type === RecurrenceInfo_1.RecurrenceFrequencyType.everyXWeekdayOfMonth) {
+        if (frequency.type === RecurrenceFrequencyType.everyXWeekdayOfMonth) {
             if (!frequency.everyXWeekdayOfMonth) {
                 return null;
             }
             // Start by adding one day
-            let newDate = core_ts_lib_1.DateService.getWeekDayOfXWeekOfMonth(core_ts_lib_1.DateService.addDays(basisDate, 1), frequency.everyXWeekdayOfMonth.weekDay, frequency.everyXWeekdayOfMonth.weekOfMonth);
+            let newDate = DateService.getWeekDayOfXWeekOfMonth(DateService.addDays(basisDate, 1), frequency.everyXWeekdayOfMonth.weekDay, frequency.everyXWeekdayOfMonth.weekOfMonth);
             let monthsPassed = 0;
             while (!newDate ||
                 newDate < basisDate ||
                 newDate.getTime() === basisDate.getTime()) {
                 monthsPassed += 1;
-                newDate = core_ts_lib_1.DateService.getWeekDayOfXWeekOfMonth(core_ts_lib_1.DateService.addMonths(basisDate, monthsPassed), frequency.everyXWeekdayOfMonth.weekDay, frequency.everyXWeekdayOfMonth.weekOfMonth);
+                newDate = DateService.getWeekDayOfXWeekOfMonth(DateService.addMonths(basisDate, monthsPassed), frequency.everyXWeekdayOfMonth.weekDay, frequency.everyXWeekdayOfMonth.weekOfMonth);
                 if (monthsPassed > 11) {
                     return null;
                 }
@@ -86,32 +84,32 @@ class DashboardTaskRecurrenceService {
             // No dates to move forward
             (!task.dueDate && !task.startDate) ||
                 // Invalid start date recurrence basis
-                (task.recurrenceInfo.recurrenceBasis === RecurrenceInfo_1.RecurrenceBasis.startDate &&
+                (task.recurrenceInfo.recurrenceBasis === RecurrenceBasis.startDate &&
                     !task.parentRecurringTaskInfo.startDate) ||
                 // Invalid due date recurrence basis
-                (task.recurrenceInfo.recurrenceBasis === RecurrenceInfo_1.RecurrenceBasis.dueDate &&
+                (task.recurrenceInfo.recurrenceBasis === RecurrenceBasis.dueDate &&
                     !task.parentRecurringTaskInfo.dueDate)) {
                 return;
             }
             // Validation for moving dates based on their own recurrence
         }
         else if (!task.recurrenceInfo ||
-            (task.recurrenceInfo.recurrenceBasis === RecurrenceInfo_1.RecurrenceBasis.startDate &&
+            (task.recurrenceInfo.recurrenceBasis === RecurrenceBasis.startDate &&
                 !task.startDate) ||
-            (task.recurrenceInfo.recurrenceBasis === RecurrenceInfo_1.RecurrenceBasis.dueDate &&
+            (task.recurrenceInfo.recurrenceBasis === RecurrenceBasis.dueDate &&
                 !task.dueDate)) {
             return;
         }
         let diff = 0;
         if (task.parentRecurringTaskInfo) {
-            if (task.recurrenceInfo.recurrenceBasis === RecurrenceInfo_1.RecurrenceBasis.startDate) {
+            if (task.recurrenceInfo.recurrenceBasis === RecurrenceBasis.startDate) {
                 diff = this.getDiffForDateUpdate(task.parentRecurringTaskInfo.startDate, task.recurrenceInfo.frequency);
             }
             else {
                 diff = this.getDiffForDateUpdate(task.parentRecurringTaskInfo.dueDate, task.recurrenceInfo.frequency);
             }
         }
-        else if (task.recurrenceInfo.recurrenceBasis === RecurrenceInfo_1.RecurrenceBasis.startDate) {
+        else if (task.recurrenceInfo.recurrenceBasis === RecurrenceBasis.startDate) {
             diff = this.getDiffForDateUpdate(task.startDate, task.recurrenceInfo.frequency);
         }
         else {
@@ -135,4 +133,4 @@ class DashboardTaskRecurrenceService {
         return nextFrequencyDate.getTime() - basisDate.getTime();
     }
 }
-exports.default = DashboardTaskRecurrenceService;
+//# sourceMappingURL=TaskRecurrenceService.js.map

package/lib/services/dashboard/Task/TaskRecurrenceService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TaskRecurrenceService.js","sourceRoot":"./src/","sources":["services/dashboard/Task/TaskRecurrenceService.ts"],"names":[],"mappings":"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"}

package/lib/services/dashboard/Task/TaskRecurrenceService.ts

@@ -0,0 +1,172 @@
+import { DateService } from '@aneuhold/core-ts-lib';
+import DashboardTask from '../../../documents/dashboard/Task.js';
+import {
+  RecurrenceBasis,
+  RecurrenceFrequency,
+  RecurrenceFrequencyType
+} from '../../../embedded-types/dashboard/task/RecurrenceInfo.js';
+
+export default class DashboardTaskRecurrenceService {
+  /**
+   * Gets the next frequency date from the provided basis date. Returns null
+   * if the provided frequency is in an invalid state.
+   */
+  static getNextFrequencyDate(basisDate: Date, frequency: RecurrenceFrequency) {
+    // Last day of month
+    if (frequency.type === RecurrenceFrequencyType.lastDayOfMonth) {
+      return DateService.getLastDayOfGivenMonth(basisDate);
+    }
+    // Every X Time Unit
+    if (frequency.type === RecurrenceFrequencyType.everyXTimeUnit) {
+      if (!frequency.everyXTimeUnit) {
+        return null;
+      }
+      if (frequency.everyXTimeUnit.timeUnit === 'day') {
+        return DateService.addDays(basisDate, frequency.everyXTimeUnit.x);
+      }
+      if (frequency.everyXTimeUnit.timeUnit === 'week') {
+        return DateService.addDays(basisDate, frequency.everyXTimeUnit.x * 7);
+      }
+      if (frequency.everyXTimeUnit.timeUnit === 'month') {
+        return DateService.addMonths(basisDate, frequency.everyXTimeUnit.x);
+      }
+      if (frequency.everyXTimeUnit.timeUnit === 'year') {
+        return DateService.addYears(basisDate, frequency.everyXTimeUnit.x);
+      }
+    }
+    // Week Day Set
+    if (frequency.type === RecurrenceFrequencyType.weekDaySet) {
+      if (!frequency.weekDaySet) {
+        return null;
+      }
+      const newDate = new Date(basisDate);
+      let daysToAdd = 0;
+      while (daysToAdd < 7) {
+        newDate.setDate(newDate.getDate() + 1);
+        if (frequency.weekDaySet.includes(newDate.getDay())) {
+          return newDate;
+        }
+        daysToAdd += 1;
+      }
+    }
+    // Every X Weekday of Month
+    if (frequency.type === RecurrenceFrequencyType.everyXWeekdayOfMonth) {
+      if (!frequency.everyXWeekdayOfMonth) {
+        return null;
+      }
+      // Start by adding one day
+      let newDate = DateService.getWeekDayOfXWeekOfMonth(
+        DateService.addDays(basisDate, 1),
+        frequency.everyXWeekdayOfMonth.weekDay,
+        frequency.everyXWeekdayOfMonth.weekOfMonth
+      );
+      let monthsPassed = 0;
+      while (
+        !newDate ||
+        newDate < basisDate ||
+        newDate.getTime() === basisDate.getTime()
+      ) {
+        monthsPassed += 1;
+        newDate = DateService.getWeekDayOfXWeekOfMonth(
+          DateService.addMonths(basisDate, monthsPassed),
+          frequency.everyXWeekdayOfMonth.weekDay,
+          frequency.everyXWeekdayOfMonth.weekOfMonth
+        );
+        if (monthsPassed > 11) {
+          return null;
+        }
+      }
+      return newDate;
+    }
+    return null;
+  }
+
+  /**
+   * Moves the start and due date forward by one frequency.
+   *
+   * This does not take into account the recurrence effect. That should be
+   * handled on the frontend.
+   *
+   * Makes no changes if the state of the task is invalid for recurrence or
+   * there isn't recurrence info.
+   */
+  static updateDatesForRecurrence(task: DashboardTask): void {
+    // Initial basic validation
+    if (!task.recurrenceInfo) {
+      return;
+    }
+    // Validation for dates based on parent
+    if (task.parentRecurringTaskInfo) {
+      if (
+        // No dates to move forward
+        (!task.dueDate && !task.startDate) ||
+        // Invalid start date recurrence basis
+        (task.recurrenceInfo.recurrenceBasis === RecurrenceBasis.startDate &&
+          !task.parentRecurringTaskInfo.startDate) ||
+        // Invalid due date recurrence basis
+        (task.recurrenceInfo.recurrenceBasis === RecurrenceBasis.dueDate &&
+          !task.parentRecurringTaskInfo.dueDate)
+      ) {
+        return;
+      }
+      // Validation for moving dates based on their own recurrence
+    } else if (
+      !task.recurrenceInfo ||
+      (task.recurrenceInfo.recurrenceBasis === RecurrenceBasis.startDate &&
+        !task.startDate) ||
+      (task.recurrenceInfo.recurrenceBasis === RecurrenceBasis.dueDate &&
+        !task.dueDate)
+    ) {
+      return;
+    }
+
+    let diff = 0;
+
+    if (task.parentRecurringTaskInfo) {
+      if (task.recurrenceInfo.recurrenceBasis === RecurrenceBasis.startDate) {
+        diff = this.getDiffForDateUpdate(
+          task.parentRecurringTaskInfo.startDate,
+          task.recurrenceInfo.frequency
+        );
+      } else {
+        diff = this.getDiffForDateUpdate(
+          task.parentRecurringTaskInfo.dueDate,
+          task.recurrenceInfo.frequency
+        );
+      }
+    } else if (
+      task.recurrenceInfo.recurrenceBasis === RecurrenceBasis.startDate
+    ) {
+      diff = this.getDiffForDateUpdate(
+        task.startDate,
+        task.recurrenceInfo.frequency
+      );
+    } else {
+      diff = this.getDiffForDateUpdate(
+        task.dueDate,
+        task.recurrenceInfo.frequency
+      );
+    }
+
+    if (task.startDate) {
+      task.startDate = new Date(task.startDate.getTime() + diff);
+    }
+    if (task.dueDate) {
+      task.dueDate = new Date(task.dueDate.getTime() + diff);
+    }
+  }
+
+  private static getDiffForDateUpdate(
+    basisDate: Date | undefined,
+    frequency: RecurrenceFrequency
+  ) {
+    if (!basisDate) {
+      return 0;
+    }
+    const nextFrequencyDate = this.getNextFrequencyDate(basisDate, frequency);
+    if (!nextFrequencyDate) {
+      return 0;
+    }
+    return nextFrequencyDate.getTime() - basisDate.getTime();
+  }
+}

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

@@ -1,9 +1,9 @@
 import { ObjectId } from 'bson';
-import DashboardTask, { DashboardTaskMap } from '../../../documents/dashboard/Task';
-import { DashboardTaskListFilterSettings } from '../../../embedded-types/dashboard/task/FilterSettings';
-import { DashboardTaskListSortSettings, DashboardTaskSortDirection } from '../../../embedded-types/dashboard/task/SortSettings';
-import { DashboardTagSettings } from '../../../embedded-types/dashboard/userConfig/Tags';
-import { RecurrenceFrequency } from '../../../embedded-types/dashboard/task/RecurrenceInfo';
+import DashboardTask, { DashboardTaskMap } from '../../../documents/dashboard/Task.js';
+import { DashboardTaskListFilterSettings } from '../../../embedded-types/dashboard/task/FilterSettings.js';
+import { RecurrenceFrequency } from '../../../embedded-types/dashboard/task/RecurrenceInfo.js';
+import { DashboardTaskListSortSettings, DashboardTaskSortDirection } from '../../../embedded-types/dashboard/task/SortSettings.js';
+import { DashboardTagSettings } from '../../../embedded-types/dashboard/userConfig/Tags.js';
 /**
  * A type for the task filter settings for a particular task.
  */

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;AAE3C,OAAO,EAAE,+BAA+B,EAAE,MAAM,uDAAuD,CAAC;AACxG,OAAO,EACL,6BAA6B,EAC7B,0BAA0B,EAC3B,MAAM,qDAAqD,CAAC;AAK7D,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,MAAM,gCAAgC,GAAG;IAC7C,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B;;;;OAIG;IACH,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,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,gCAAgC;IA8BnC;;;;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;IAY3C,OAAO,CAAC,MAAM,CAAC,kBAAkB;CAsBlC"}
+{"version":3,"file":"TaskService.d.ts","sourceRoot":"./src/","sources":["services/dashboard/Task/TaskService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,aAAa,EAAE,EACpB,gBAAgB,EACjB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,+BAA+B,EAAE,MAAM,0DAA0D,CAAC;AAC3G,OAAO,EAAE,mBAAmB,EAAE,MAAM,0DAA0D,CAAC;AAC/F,OAAO,EACL,6BAA6B,EAC7B,0BAA0B,EAC3B,MAAM,wDAAwD,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sDAAsD,CAAC;AAO5F;;GAEG;AACH,MAAM,MAAM,2BAA2B,GAAG;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,gCAAgC,GAAG;IAC7C,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B;;;;OAIG;IACH,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,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,CACzB,SAAS,EAAE,IAAI,EACf,SAAS,EAAE,mBAAmB,GAC7B,IAAI,GAAG,IAAI;IAOd;;;;;;;;OAQG;IACH,MAAM,CAAC,wBAAwB,CAAC,IAAI,EAAE,aAAa,GAAG,IAAI;IAI1D;;;;;;;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,gCAAgC;IA8BnC;;;;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;IAWzB,OAAO,CAAC,MAAM,CAAC,kBAAkB;CAsBlC"}

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

@@ -1,13 +1,8 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const bson_1 = require("bson");
-const TaskRecurrenceService_1 = __importDefault(require("./TaskRecurrenceService"));
-const TaskFilterService_1 = __importDefault(require("./TaskFilterService"));
-const TaskSortService_1 = __importDefault(require("./TaskSortService"));
-class DashboardTaskService {
+import { ObjectId } from 'bson';
+import DashboardTaskFilterService from './TaskFilterService.js';
+import DashboardTaskRecurrenceService from './TaskRecurrenceService.js';
+import DashboardTaskSortService from './TaskSortService.js';
+export default class DashboardTaskService {
     /**
      * Gets all the children task IDs for the given parent task IDs.
      */
@@ -28,7 +23,7 @@ class DashboardTaskService {
             const task = taskIdToTaskDict[taskId.toString()];
             if (task) {
                 const childrenTaskIds = this.getChildrenTaskIds(taskIdToTaskDict, parentToTaskIdsDict, taskId.toString());
-                childrenIds.push(...childrenTaskIds.map((id) => new bson_1.ObjectId(id)));
+                childrenIds.push(...childrenTaskIds.map((id) => new ObjectId(id)));
             }
         });
         return childrenIds;
@@ -38,7 +33,7 @@ class DashboardTaskService {
      * if the provided frequency is in an invalid state.
      */
     static getNextFrequencyDate(basisDate, frequency) {
-        return TaskRecurrenceService_1.default.getNextFrequencyDate(basisDate, frequency);
+        return DashboardTaskRecurrenceService.getNextFrequencyDate(basisDate, frequency);
     }
     /**
      * Moves the start and due date forward by one frequency.
@@ -50,7 +45,7 @@ class DashboardTaskService {
      * there isn't recurrence info.
      */
     static updateDatesForRecurrence(task) {
-        TaskRecurrenceService_1.default.updateDatesForRecurrence(task);
+        DashboardTaskRecurrenceService.updateDatesForRecurrence(task);
     }
     /**
      * Gets the filtered and sorted set of task ids for a particular category.
@@ -63,13 +58,13 @@ class DashboardTaskService {
     static getFilteredAndSortedTaskIds(taskMap, category, filterSettings, sortSettings, tagSettings, taskInfo) {
         let filterResult;
         if (!taskInfo) {
-            filterResult = TaskFilterService_1.default.filter(taskMap, Object.keys(taskMap), filterSettings, category);
+            filterResult = DashboardTaskFilterService.filter(taskMap, Object.keys(taskMap), filterSettings, category);
         }
         else {
-            filterResult = TaskFilterService_1.default.filter(taskMap, taskInfo.allChildrenIds, filterSettings, category, taskInfo.taskId);
+            filterResult = DashboardTaskFilterService.filter(taskMap, taskInfo.allChildrenIds, filterSettings, category, taskInfo.taskId);
         }
         return {
-            filteredAndSortedIds: TaskSortService_1.default.sort(taskMap, filterResult.resultIds, sortSettings, tagSettings),
+            filteredAndSortedIds: DashboardTaskSortService.sort(taskMap, filterResult.resultIds, sortSettings, tagSettings),
             removedIds: filterResult.removedIds
         };
     }
@@ -79,7 +74,7 @@ class DashboardTaskService {
      * noPriorityTagsIndicator will be used as the header name.
      */
     static getTagHeaderMap(taskMap, taskIds, userId, tagSettings, noPriorityTagsIndicator, sortDirection) {
-        return TaskSortService_1.default.getTagHeaderMap(taskMap, taskIds, userId, tagSettings, noPriorityTagsIndicator, sortDirection);
+        return DashboardTaskSortService.getTagHeaderMap(taskMap, taskIds, userId, tagSettings, noPriorityTagsIndicator, sortDirection);
     }
     static getChildrenTaskIds(taskIdToTaskDict, parentToTaskIdsDict, taskId) {
         const childrenIds = parentToTaskIdsDict[taskId];
@@ -96,4 +91,4 @@ class DashboardTaskService {
         return childrenIds;
     }
 }
-exports.default = DashboardTaskService;
+//# sourceMappingURL=TaskService.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"TaskService.js","sourceRoot":"./src/","sources":["services/dashboard/Task/TaskService.ts"],"names":[],"mappings":"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"}