@aneuhold/core-ts-db-lib 1.0.62 → 1.0.63
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/schemas/validators/ValidateUtil.d.ts.map +1 -1
- package/lib/schemas/validators/ValidateUtil.js +1 -0
- package/lib/schemas/validators/ValidateUtil.spec.js +0 -1
- package/lib/services/dashboard/Task/TaskRecurrenceService.d.ts.map +1 -1
- package/lib/services/dashboard/Task/TaskRecurrenceService.js +7 -6
- package/lib/services/dashboard/Task/TaskService.js +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValidateUtil.d.ts","sourceRoot":"","sources":["../../../src/schemas/validators/ValidateUtil.ts"],"names":[],"mappings":"AAQA,KAAK,eAAe,GAAG;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,CAAC;AAEtD;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,OAAO,OAAO,QAAQ;IAKzB,OAAO,CAAC,WAAW;IAJrB,YAAY,EAAE,eAAe,CAAC;gBAG5B,YAAY,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EAAE;IAK/B,cAAc,CAAC,SAAS,EAAE,MAAM;IAUhC,cAAc,CAAC,SAAS,EAAE,MAAM;IAUhC,eAAe,CAAC,SAAS,EAAE,MAAM;IAUjC,aAAa,CAAC,SAAS,EAAE,MAAM;IAU/B,cAAc,CAAC,SAAS,EAAE,MAAM;IAUhC,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IAU9C,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IAW9C,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IAU9C,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO;IAUhD,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE;IAUhD;;;;;;;;;OASG;IACH,OAAO,CAAC,gBAAgB;IAexB,OAAO,CAAC,WAAW;IAYnB,OAAO,CAAC,QAAQ;IAShB,OAAO,CAAC,WAAW;
|
|
1
|
+
{"version":3,"file":"ValidateUtil.d.ts","sourceRoot":"","sources":["../../../src/schemas/validators/ValidateUtil.ts"],"names":[],"mappings":"AAQA,KAAK,eAAe,GAAG;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,CAAC;AAEtD;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,OAAO,OAAO,QAAQ;IAKzB,OAAO,CAAC,WAAW;IAJrB,YAAY,EAAE,eAAe,CAAC;gBAG5B,YAAY,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EAAE;IAK/B,cAAc,CAAC,SAAS,EAAE,MAAM;IAUhC,cAAc,CAAC,SAAS,EAAE,MAAM;IAUhC,eAAe,CAAC,SAAS,EAAE,MAAM;IAUjC,aAAa,CAAC,SAAS,EAAE,MAAM;IAU/B,cAAc,CAAC,SAAS,EAAE,MAAM;IAUhC,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IAU9C,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IAW9C,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IAU9C,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO;IAUhD,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE;IAUhD;;;;;;;;;OASG;IACH,OAAO,CAAC,gBAAgB;IAexB,OAAO,CAAC,WAAW;IAYnB,OAAO,CAAC,QAAQ;IAShB,OAAO,CAAC,WAAW;CAYpB"}
|
|
@@ -141,6 +141,7 @@ class Validate {
|
|
|
141
141
|
let currentObject = this.parentObject;
|
|
142
142
|
fieldPath.forEach((field, index) => {
|
|
143
143
|
if (index === fieldPath.length - 1) {
|
|
144
|
+
// eslint-disable-next-line @typescript-eslint/no-dynamic-delete
|
|
144
145
|
delete currentObject[field];
|
|
145
146
|
}
|
|
146
147
|
else {
|
|
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const ValidateUtil_1 = __importDefault(require("./ValidateUtil"));
|
|
7
7
|
describe('Validate', () => {
|
|
8
8
|
let errorsArray;
|
|
9
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
10
9
|
let parentObject;
|
|
11
10
|
beforeEach(() => {
|
|
12
11
|
errorsArray = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaskRecurrenceService.d.ts","sourceRoot":"","sources":["../../../../src/services/dashboard/Task/TaskRecurrenceService.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"TaskRecurrenceService.d.ts","sourceRoot":"","sources":["../../../../src/services/dashboard/Task/TaskRecurrenceService.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,mBAAmB,EAEpB,MAAM,uDAAuD,CAAC;AAC/D,OAAO,aAAa,MAAM,mCAAmC,CAAC;AAE9D,MAAM,CAAC,OAAO,OAAO,8BAA8B;IACjD;;;OAGG;IACH,MAAM,CAAC,oBAAoB,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,mBAAmB;IAsE3E;;;;;;;;OAQG;IACH,MAAM,CAAC,wBAAwB,CAAC,IAAI,EAAE,aAAa,GAAG,IAAI;IAkE1D,OAAO,CAAC,MAAM,CAAC,oBAAoB;CAapC"}
|
|
@@ -86,31 +86,32 @@ class DashboardTaskRecurrenceService {
|
|
|
86
86
|
// No dates to move forward
|
|
87
87
|
(!task.dueDate && !task.startDate) ||
|
|
88
88
|
// Invalid start date recurrence basis
|
|
89
|
-
(task.recurrenceInfo.recurrenceBasis ===
|
|
89
|
+
(task.recurrenceInfo.recurrenceBasis === RecurrenceInfo_1.RecurrenceBasis.startDate &&
|
|
90
90
|
!task.parentRecurringTaskInfo.startDate) ||
|
|
91
91
|
// Invalid due date recurrence basis
|
|
92
|
-
(task.recurrenceInfo.recurrenceBasis ===
|
|
92
|
+
(task.recurrenceInfo.recurrenceBasis === RecurrenceInfo_1.RecurrenceBasis.dueDate &&
|
|
93
93
|
!task.parentRecurringTaskInfo.dueDate)) {
|
|
94
94
|
return;
|
|
95
95
|
}
|
|
96
96
|
// Validation for moving dates based on their own recurrence
|
|
97
97
|
}
|
|
98
98
|
else if (!task.recurrenceInfo ||
|
|
99
|
-
(task.recurrenceInfo.recurrenceBasis ===
|
|
99
|
+
(task.recurrenceInfo.recurrenceBasis === RecurrenceInfo_1.RecurrenceBasis.startDate &&
|
|
100
100
|
!task.startDate) ||
|
|
101
|
-
(task.recurrenceInfo.recurrenceBasis ===
|
|
101
|
+
(task.recurrenceInfo.recurrenceBasis === RecurrenceInfo_1.RecurrenceBasis.dueDate &&
|
|
102
|
+
!task.dueDate)) {
|
|
102
103
|
return;
|
|
103
104
|
}
|
|
104
105
|
let diff = 0;
|
|
105
106
|
if (task.parentRecurringTaskInfo) {
|
|
106
|
-
if (task.recurrenceInfo.recurrenceBasis ===
|
|
107
|
+
if (task.recurrenceInfo.recurrenceBasis === RecurrenceInfo_1.RecurrenceBasis.startDate) {
|
|
107
108
|
diff = this.getDiffForDateUpdate(task.parentRecurringTaskInfo.startDate, task.recurrenceInfo.frequency);
|
|
108
109
|
}
|
|
109
110
|
else {
|
|
110
111
|
diff = this.getDiffForDateUpdate(task.parentRecurringTaskInfo.dueDate, task.recurrenceInfo.frequency);
|
|
111
112
|
}
|
|
112
113
|
}
|
|
113
|
-
else if (task.recurrenceInfo.recurrenceBasis ===
|
|
114
|
+
else if (task.recurrenceInfo.recurrenceBasis === RecurrenceInfo_1.RecurrenceBasis.startDate) {
|
|
114
115
|
diff = this.getDiffForDateUpdate(task.startDate, task.recurrenceInfo.frequency);
|
|
115
116
|
}
|
|
116
117
|
else {
|
|
@@ -50,7 +50,7 @@ class DashboardTaskService {
|
|
|
50
50
|
* there isn't recurrence info.
|
|
51
51
|
*/
|
|
52
52
|
static updateDatesForRecurrence(task) {
|
|
53
|
-
|
|
53
|
+
TaskRecurrenceService_1.default.updateDatesForRecurrence(task);
|
|
54
54
|
}
|
|
55
55
|
/**
|
|
56
56
|
* Gets the filtered and sorted set of task ids for a particular category.
|