@aneuhold/core-ts-db-lib 2.0.76 → 2.0.77
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/documents/common/User.d.ts.map +1 -1
- package/lib/documents/common/User.js.map +1 -1
- package/lib/documents/common/User.ts +1 -4
- package/lib/documents/dashboard/NonogramKatanaItem.d.ts.map +1 -1
- package/lib/documents/dashboard/NonogramKatanaItem.js.map +1 -1
- package/lib/documents/dashboard/NonogramKatanaItem.ts +4 -7
- package/lib/documents/dashboard/NonogramKatanaUpgrade.d.ts.map +1 -1
- package/lib/documents/dashboard/NonogramKatanaUpgrade.js.map +1 -1
- package/lib/documents/dashboard/NonogramKatanaUpgrade.ts +4 -7
- package/lib/documents/dashboard/Task.d.ts.map +1 -1
- package/lib/documents/dashboard/Task.js.map +1 -1
- package/lib/documents/dashboard/Task.ts +2 -7
- package/lib/documents/dashboard/UserConfig.d.ts.map +1 -1
- package/lib/documents/dashboard/UserConfig.js.map +1 -1
- package/lib/documents/dashboard/UserConfig.ts +4 -7
- package/lib/embedded-types/dashboard/task/FilterSettings.d.ts.map +1 -1
- package/lib/embedded-types/dashboard/task/FilterSettings.js.map +1 -1
- package/lib/embedded-types/dashboard/task/FilterSettings.ts +7 -26
- package/lib/embedded-types/dashboard/task/RecurrenceInfo.d.ts.map +1 -1
- package/lib/embedded-types/dashboard/task/RecurrenceInfo.js.map +1 -1
- package/lib/embedded-types/dashboard/task/RecurrenceInfo.ts +1 -4
- package/lib/embedded-types/dashboard/task/SortSettings.d.ts.map +1 -1
- package/lib/embedded-types/dashboard/task/SortSettings.js.map +1 -1
- package/lib/embedded-types/dashboard/task/SortSettings.ts +5 -18
- package/lib/schemas/type-guards/commonTypeGuards.d.ts.map +1 -1
- package/lib/schemas/type-guards/commonTypeGuards.js +1 -1
- package/lib/schemas/type-guards/commonTypeGuards.js.map +1 -1
- package/lib/schemas/type-guards/commonTypeGuards.ts +5 -15
- package/lib/schemas/validators/DocumentValidator.d.ts.map +1 -1
- package/lib/schemas/validators/DocumentValidator.ts +4 -3
- package/lib/schemas/validators/ValidateUtil.d.ts.map +1 -1
- package/lib/schemas/validators/ValidateUtil.js +10 -20
- package/lib/schemas/validators/ValidateUtil.js.map +1 -1
- package/lib/schemas/validators/ValidateUtil.ts +10 -38
- package/lib/services/dashboard/Task/TaskFilterService.d.ts.map +1 -1
- package/lib/services/dashboard/Task/TaskFilterService.js +1 -3
- package/lib/services/dashboard/Task/TaskFilterService.js.map +1 -1
- package/lib/services/dashboard/Task/TaskFilterService.ts +1 -5
- package/lib/services/dashboard/Task/TaskRecurrenceService.d.ts.map +1 -1
- package/lib/services/dashboard/Task/TaskRecurrenceService.js +3 -7
- package/lib/services/dashboard/Task/TaskRecurrenceService.js.map +1 -1
- package/lib/services/dashboard/Task/TaskRecurrenceService.ts +8 -28
- package/lib/services/dashboard/Task/TaskService.d.ts.map +1 -1
- package/lib/services/dashboard/Task/TaskService.js.map +1 -1
- package/lib/services/dashboard/Task/TaskService.ts +5 -17
- package/lib/services/dashboard/Task/TaskSortService.d.ts.map +1 -1
- package/lib/services/dashboard/Task/TaskSortService.js.map +1 -1
- package/lib/services/dashboard/Task/TaskSortService.ts +5 -27
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"User.d.ts","sourceRoot":"","sources":["../../../src/documents/common/User.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAElF,OAAO,YAAY,MAAM,oBAAoB,CAAC;AAE9C;;;GAGG;AACH,MAAM,MAAM,OAAO,GAAG;IACpB,GAAG,EAAE,QAAQ,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,YAAY,EAAE,iBAAiB,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"User.d.ts","sourceRoot":"","sources":["../../../src/documents/common/User.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAElF,OAAO,YAAY,MAAM,oBAAoB,CAAC;AAE9C;;;GAGG;AACH,MAAM,MAAM,OAAO,GAAG;IACpB,GAAG,EAAE,QAAQ,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,YAAY,EAAE,iBAAiB,CAAC,IAAI,CAehD,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IAC5C,QAAQ,EAAE,MAAM,CAAC;IAEjB,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,IAAI,EAAE;QACJ,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,CAAM;IAEP,aAAa;;MAEX;IAEF;;;;OAIG;gBACS,QAAQ,EAAE,MAAM;CAI7B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"User.js","sourceRoot":"","sources":["../../../src/documents/common/User.ts"],"names":[],"mappings":"AAEA,OAAO,QAAQ,MAAM,0CAA0C,CAAC;AAChE,OAAO,YAAY,MAAM,oBAAoB,CAAC;AAW9C;;;;;GAKG;AACH,MAAM,CAAC,MAAM,YAAY,GAA4B,CAAC,IAAI,EAAE,EAAE;IAC5D,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC5C,MAAM,WAAW,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;IAExC,QAAQ,CAAC,MAAM,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;IAC/C,QAAQ,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IACpC,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IACjC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;IAC1C,QAAQ,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;IACzC,QAAQ,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;IACzC,QAAQ,CAAC,MAAM,CAAC,eAAe,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;IAC5D,QAAQ,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"User.js","sourceRoot":"","sources":["../../../src/documents/common/User.ts"],"names":[],"mappings":"AAEA,OAAO,QAAQ,MAAM,0CAA0C,CAAC;AAChE,OAAO,YAAY,MAAM,oBAAoB,CAAC;AAW9C;;;;;GAKG;AACH,MAAM,CAAC,MAAM,YAAY,GAA4B,CAAC,IAAI,EAAE,EAAE;IAC5D,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC5C,MAAM,WAAW,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;IAExC,QAAQ,CAAC,MAAM,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;IAC/C,QAAQ,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IACpC,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IACjC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;IAC1C,QAAQ,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;IACzC,QAAQ,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;IACzC,QAAQ,CAAC,MAAM,CAAC,eAAe,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;IAC5D,QAAQ,CAAC,OAAO,CAAC,yBAAyB,EAAE,WAAW,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAEjF,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;AACtC,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IAC5C,QAAQ,CAAS;IAEjB,KAAK,CAAU;IAEf,IAAI,GAGA,EAAE,CAAC;IAEP,aAAa,GAAG;QACd,SAAS,EAAE,IAAI;KAChB,CAAC;IAEF;;;;OAIG;IACH,YAAY,QAAgB;QAC1B,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;CACF"}
|
|
@@ -30,10 +30,7 @@ export const validateUser: DocumentValidator<User> = (user) => {
|
|
|
30
30
|
validate.optionalString('auth.password');
|
|
31
31
|
validate.optionalString('auth.googleId');
|
|
32
32
|
validate.object('projectAccess', exampleUser.projectAccess);
|
|
33
|
-
validate.boolean(
|
|
34
|
-
'projectAccess.dashboard',
|
|
35
|
-
exampleUser.projectAccess.dashboard
|
|
36
|
-
);
|
|
33
|
+
validate.boolean('projectAccess.dashboard', exampleUser.projectAccess.dashboard);
|
|
37
34
|
|
|
38
35
|
return { updatedDoc: user, errors };
|
|
39
36
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NonogramKatanaItem.d.ts","sourceRoot":"","sources":["../../../src/documents/dashboard/NonogramKatanaItem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,sBAAsB,MAAM,+DAA+D,CAAC;AACnG,OAAO,cAAc,MAAM,+CAA+C,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,oBAAoB,MAAM,4BAA4B,CAAC;AAE9D;;;;;GAKG;AACH,eAAO,MAAM,0BAA0B,EAAE,iBAAiB,
|
|
1
|
+
{"version":3,"file":"NonogramKatanaItem.d.ts","sourceRoot":"","sources":["../../../src/documents/dashboard/NonogramKatanaItem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,sBAAsB,MAAM,+DAA+D,CAAC;AACnG,OAAO,cAAc,MAAM,+CAA+C,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,oBAAoB,MAAM,4BAA4B,CAAC;AAE9D;;;;;GAKG;AACH,eAAO,MAAM,0BAA0B,EAAE,iBAAiB,CAAC,kBAAkB,CAQ5E,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,oBAAqB,YAAW,cAAc;IAC5F,MAAM,CAAC,OAAO,SAAwB;IAEtC,OAAO,SAA8B;IAErC;;OAEG;IACH,MAAM,EAAE,QAAQ,CAAC;IAEjB,QAAQ,EAAE,sBAAsB,CAAC;IAEjC,aAAa,EAAE,MAAM,CAAK;IAE1B,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAK;gBAET,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,sBAAsB;CAKhE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NonogramKatanaItem.js","sourceRoot":"","sources":["../../../src/documents/dashboard/NonogramKatanaItem.ts"],"names":[],"mappings":"AAIA,OAAO,oBAAoB,MAAM,4BAA4B,CAAC;AAE9D;;;;;GAKG;AACH,MAAM,CAAC,MAAM,0BAA0B,
|
|
1
|
+
{"version":3,"file":"NonogramKatanaItem.js","sourceRoot":"","sources":["../../../src/documents/dashboard/NonogramKatanaItem.ts"],"names":[],"mappings":"AAIA,OAAO,oBAAoB,MAAM,4BAA4B,CAAC;AAE9D;;;;;GAKG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAA0C,CAC/E,IAAwB,EACxB,EAAE;IACF,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,+BAA+B;IAE/B,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;AACtC,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,oBAAoB;IAClE,MAAM,CAAC,OAAO,GAAG,oBAAoB,CAAC;IAEtC,OAAO,GAAG,kBAAkB,CAAC,OAAO,CAAC;IAErC;;OAEG;IACH,MAAM,CAAW;IAEjB,QAAQ,CAAyB;IAEjC,aAAa,GAAW,CAAC,CAAC;IAE1B,UAAU,CAAU;IAEpB,UAAU,CAAU;IAEpB,UAAU,CAAU;IAEpB;;OAEG;IACH,QAAQ,GAAW,CAAC,CAAC;IAErB,YAAY,OAAiB,EAAE,QAAgC;QAC7D,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC;QACtB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC"}
|
|
@@ -10,9 +10,9 @@ import BaseDocumentWithType from '../BaseDocumentWithType.js';
|
|
|
10
10
|
* @param item - The {@link NonogramKatanaItem} to validate.
|
|
11
11
|
* @returns An object containing the updated document and any validation errors.
|
|
12
12
|
*/
|
|
13
|
-
export const validateNonogramKatanaItem: DocumentValidator<
|
|
14
|
-
NonogramKatanaItem
|
|
15
|
-
|
|
13
|
+
export const validateNonogramKatanaItem: DocumentValidator<NonogramKatanaItem> = (
|
|
14
|
+
item: NonogramKatanaItem
|
|
15
|
+
) => {
|
|
16
16
|
const errors: string[] = [];
|
|
17
17
|
|
|
18
18
|
// No validation at the moment.
|
|
@@ -23,10 +23,7 @@ export const validateNonogramKatanaItem: DocumentValidator<
|
|
|
23
23
|
/**
|
|
24
24
|
* An item in the Nonogram Katana game.
|
|
25
25
|
*/
|
|
26
|
-
export default class NonogramKatanaItem
|
|
27
|
-
extends BaseDocumentWithType
|
|
28
|
-
implements RequiredUserId
|
|
29
|
-
{
|
|
26
|
+
export default class NonogramKatanaItem extends BaseDocumentWithType implements RequiredUserId {
|
|
30
27
|
static docType = 'nonogramKatanaItem';
|
|
31
28
|
|
|
32
29
|
docType = NonogramKatanaItem.docType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NonogramKatanaUpgrade.d.ts","sourceRoot":"","sources":["../../../src/documents/dashboard/NonogramKatanaUpgrade.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,sBAAsB,MAAM,+DAA+D,CAAC;AACnG,OAAO,yBAAyB,MAAM,qEAAqE,CAAC;AAC5G,OAAO,cAAc,MAAM,+CAA+C,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,oBAAoB,MAAM,4BAA4B,CAAC;AAE9D;;;;;GAKG;AACH,eAAO,MAAM,6BAA6B,EAAE,iBAAiB,
|
|
1
|
+
{"version":3,"file":"NonogramKatanaUpgrade.d.ts","sourceRoot":"","sources":["../../../src/documents/dashboard/NonogramKatanaUpgrade.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,sBAAsB,MAAM,+DAA+D,CAAC;AACnG,OAAO,yBAAyB,MAAM,qEAAqE,CAAC;AAC5G,OAAO,cAAc,MAAM,+CAA+C,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,oBAAoB,MAAM,4BAA4B,CAAC;AAE9D;;;;;GAKG;AACH,eAAO,MAAM,6BAA6B,EAAE,iBAAiB,CAAC,qBAAqB,CAQlF,CAAC;AAEF;;;;;;;;;GASG;AACH,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,oBAAqB,YAAW,cAAc;IAC/F,MAAM,CAAC,OAAO,SAA2B;IAEzC,OAAO,SAAiC;IAExC;;OAEG;IACH,MAAM,EAAE,QAAQ,CAAC;IAEjB,WAAW,EAAE,yBAAyB,CAAC;IAEvC,SAAS,EAAE,OAAO,CAAS;IAE3B,kBAAkB,EAAE;SAAG,GAAG,IAAI,sBAAsB,CAAC,CAAC,EAAE,MAAM;KAAE,CAAM;IAEtE;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAK;IAErB;;;;;OAKG;gBACS,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,yBAAyB;CAKtE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NonogramKatanaUpgrade.js","sourceRoot":"","sources":["../../../src/documents/dashboard/NonogramKatanaUpgrade.ts"],"names":[],"mappings":"AAKA,OAAO,oBAAoB,MAAM,4BAA4B,CAAC;AAE9D;;;;;GAKG;AACH,MAAM,CAAC,MAAM,6BAA6B,
|
|
1
|
+
{"version":3,"file":"NonogramKatanaUpgrade.js","sourceRoot":"","sources":["../../../src/documents/dashboard/NonogramKatanaUpgrade.ts"],"names":[],"mappings":"AAKA,OAAO,oBAAoB,MAAM,4BAA4B,CAAC;AAE9D;;;;;GAKG;AACH,MAAM,CAAC,MAAM,6BAA6B,GAA6C,CACrF,OAA8B,EAC9B,EAAE;IACF,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,+BAA+B;IAE/B,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;AACzC,CAAC,CAAC;AAEF;;;;;;;;;GASG;AACH,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,oBAAoB;IACrE,MAAM,CAAC,OAAO,GAAG,uBAAuB,CAAC;IAEzC,OAAO,GAAG,qBAAqB,CAAC,OAAO,CAAC;IAExC;;OAEG;IACH,MAAM,CAAW;IAEjB,WAAW,CAA4B;IAEvC,SAAS,GAAY,KAAK,CAAC;IAE3B,kBAAkB,GAAiD,EAAE,CAAC;IAEtE;;OAEG;IACH,QAAQ,GAAW,CAAC,CAAC;IAErB;;;;;OAKG;IACH,YAAY,OAAiB,EAAE,WAAsC;QACnE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC;QACtB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC"}
|
|
@@ -11,9 +11,9 @@ import BaseDocumentWithType from '../BaseDocumentWithType.js';
|
|
|
11
11
|
* @param upgrade The {@link NonogramKatanaUpgrade} document to validate.
|
|
12
12
|
* @returns An object containing the updated document and any validation errors.
|
|
13
13
|
*/
|
|
14
|
-
export const validateNonogramKatanaUpgrade: DocumentValidator<
|
|
15
|
-
NonogramKatanaUpgrade
|
|
16
|
-
|
|
14
|
+
export const validateNonogramKatanaUpgrade: DocumentValidator<NonogramKatanaUpgrade> = (
|
|
15
|
+
upgrade: NonogramKatanaUpgrade
|
|
16
|
+
) => {
|
|
17
17
|
const errors: string[] = [];
|
|
18
18
|
|
|
19
19
|
// No validation at the moment.
|
|
@@ -31,10 +31,7 @@ export const validateNonogramKatanaUpgrade: DocumentValidator<
|
|
|
31
31
|
* upgrade.priority = 5;
|
|
32
32
|
* ```
|
|
33
33
|
*/
|
|
34
|
-
export default class NonogramKatanaUpgrade
|
|
35
|
-
extends BaseDocumentWithType
|
|
36
|
-
implements RequiredUserId
|
|
37
|
-
{
|
|
34
|
+
export default class NonogramKatanaUpgrade extends BaseDocumentWithType implements RequiredUserId {
|
|
38
35
|
static docType = 'nonogramKatanaUpgrade';
|
|
39
36
|
|
|
40
37
|
docType = NonogramKatanaUpgrade.docType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Task.d.ts","sourceRoot":"","sources":["../../../src/documents/dashboard/Task.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AACpG,OAAO,EACL,uBAAuB,EACvB,cAAc,EAEf,MAAM,uDAAuD,CAAC;AAC/D,OAAO,EAAE,yBAAyB,EAAE,MAAM,qDAAqD,CAAC;AAChG,OAAO,cAAc,MAAM,+CAA+C,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAElF,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAChE,OAAO,oBAAoB,MAAM,4BAA4B,CAAC;AAE9D;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,EAAE,iBAAiB,CAAC,aAAa,
|
|
1
|
+
{"version":3,"file":"Task.d.ts","sourceRoot":"","sources":["../../../src/documents/dashboard/Task.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AACpG,OAAO,EACL,uBAAuB,EACvB,cAAc,EAEf,MAAM,uDAAuD,CAAC;AAC/D,OAAO,EAAE,yBAAyB,EAAE,MAAM,qDAAqD,CAAC;AAChG,OAAO,cAAc,MAAM,+CAA+C,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAElF,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAChE,OAAO,oBAAoB,MAAM,4BAA4B,CAAC;AAE9D;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,EAAE,iBAAiB,CAAC,aAAa,CAsBlE,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,WAAW,CAAC,aAAa,CAAC,CAAC;AAE1D;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,oBAAqB,YAAW,cAAc;IACvF,MAAM,CAAC,OAAO,SAAU;IAExB,OAAO,SAAyB;IAEhC;;OAEG;IACH,MAAM,EAAE,QAAQ,CAAC;IAEjB;;;;;;;;;;;OAWG;IACH,UAAU,EAAE,QAAQ,EAAE,CAAM;IAE5B;;OAEG;IACH,UAAU,CAAC,EAAE,QAAQ,CAAC;IAEtB;;OAEG;IACH,cAAc,CAAC,EAAE,cAAc,CAAC;IAEhC;;;;;OAKG;IACH,uBAAuB,CAAC,EAAE,uBAAuB,CAAC;IAElD;;OAEG;IACH,KAAK,SAAM;IAEX,SAAS,UAAS;IAElB;;OAEG;IACH,YAAY,CAAC,EAAE,QAAQ,CAAC;IAExB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,WAAW,EAAE,IAAI,CAAc;IAE/B;;OAEG;IACH,eAAe,EAAE,IAAI,CAAc;IAEnC,SAAS,CAAC,EAAE,IAAI,CAAC;IAEjB,OAAO,CAAC,EAAE,IAAI,CAAC;IAEf;;OAEG;IACH,IAAI,EAAE;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAA;KAAE,CAAM;IAEtD;;;OAGG;IACH,QAAQ,EAAE,MAAM,CAAa;IAE7B;;;OAGG;IACH,cAAc,EAAE,2BAA2B,CAAM;IAEjD;;;OAGG;IACH,YAAY,EAAE,yBAAyB,CAAM;gBAEjC,OAAO,EAAE,QAAQ;CAO9B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Task.js","sourceRoot":"","sources":["../../../src/documents/dashboard/Task.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAEhC,OAAO,EAGL,sBAAsB,EACvB,MAAM,uDAAuD,CAAC;AAI/D,OAAO,QAAQ,MAAM,0CAA0C,CAAC;AAEhE,OAAO,oBAAoB,MAAM,4BAA4B,CAAC;AAE9D;;;;;GAKG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAqC,
|
|
1
|
+
{"version":3,"file":"Task.js","sourceRoot":"","sources":["../../../src/documents/dashboard/Task.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,9 +18,7 @@ import BaseDocumentWithType from '../BaseDocumentWithType.js';
|
|
|
18
18
|
* @param task - The {@link DashboardTask} object to validate.
|
|
19
19
|
* @returns An object containing the updated document and any validation errors.
|
|
20
20
|
*/
|
|
21
|
-
export const validateDashboardTask: DocumentValidator<DashboardTask> = (
|
|
22
|
-
task: DashboardTask
|
|
23
|
-
) => {
|
|
21
|
+
export const validateDashboardTask: DocumentValidator<DashboardTask> = (task: DashboardTask) => {
|
|
24
22
|
const errors: string[] = [];
|
|
25
23
|
const validate = new Validate(task, errors);
|
|
26
24
|
const exampleTask = new DashboardTask(new ObjectId());
|
|
@@ -70,10 +68,7 @@ export type DashboardTaskMap = DocumentMap<DashboardTask>;
|
|
|
70
68
|
* - The user sets a task as recurring with a frequency? Only that task is marked, because when the recurrence comes up, the frontend will update that task and all sub tasks.
|
|
71
69
|
* - The date + time for the recurrence happens? If the users browser is open, the frontend will trigger the update ideally. This needs to be checked if this can be done in a performant way.
|
|
72
70
|
*/
|
|
73
|
-
export default class DashboardTask
|
|
74
|
-
extends BaseDocumentWithType
|
|
75
|
-
implements RequiredUserId
|
|
76
|
-
{
|
|
71
|
+
export default class DashboardTask extends BaseDocumentWithType implements RequiredUserId {
|
|
77
72
|
static docType = 'task';
|
|
78
73
|
|
|
79
74
|
docType = DashboardTask.docType;
|
|
@@ -1 +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,EACL,qCAAqC,EAEtC,MAAM,uDAAuD,CAAC;AAC/D,OAAO,EACL,mCAAmC,EAEpC,MAAM,qDAAqD,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mDAAmD,CAAC;AACzF,OAAO,cAAc,MAAM,+CAA+C,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAElF,OAAO,oBAAoB,MAAM,4BAA4B,CAAC;AAE9D;;;;;GAKG;AACH,eAAO,MAAM,2BAA2B,EAAE,iBAAiB,
|
|
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,EACL,qCAAqC,EAEtC,MAAM,uDAAuD,CAAC;AAC/D,OAAO,EACL,mCAAmC,EAEpC,MAAM,qDAAqD,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mDAAmD,CAAC;AACzF,OAAO,cAAc,MAAM,+CAA+C,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAElF,OAAO,oBAAoB,MAAM,4BAA4B,CAAC;AAE9D;;;;;GAKG;AACH,eAAO,MAAM,2BAA2B,EAAE,iBAAiB,CAAC,mBAAmB,CAwB9E,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,oBAAqB,YAAW,cAAc;IAC7F,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,iBAAiB,EAAE,OAAO,CAAC;QAC3B,aAAa,EAAE,OAAO,CAAC;QACvB,mBAAmB,EAAE,OAAO,CAAC;QAC7B,kBAAkB,EAAE,OAAO,CAAC;KAC7B,CAOC;IAEF;;;;;;;;;OASG;IACH,oBAAoB,EAAE,MAAM,CAAM;IAElC;;OAEG;IACH,WAAW,EAAE,oBAAoB,CAAM;IAEvC;;OAEG;IACH,oBAAoB,EAAE,mCAAmC,CAAM;IAE/D;;OAEG;IACH,sBAAsB,EAAE,qCAAqC,CAAM;IAEnE;;;;OAIG;gBACS,OAAO,EAAE,QAAQ;CAI9B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserConfig.js","sourceRoot":"","sources":["../../../src/documents/dashboard/UserConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,EAEL,sBAAsB,EACvB,MAAM,uDAAuD,CAAC;AAC/D,OAAO,EAEL,oBAAoB,EACrB,MAAM,qDAAqD,CAAC;AAI7D,OAAO,QAAQ,MAAM,0CAA0C,CAAC;AAChE,OAAO,oBAAoB,MAAM,4BAA4B,CAAC;AAE9D;;;;;GAKG;AACH,MAAM,CAAC,MAAM,2BAA2B,
|
|
1
|
+
{"version":3,"file":"UserConfig.js","sourceRoot":"","sources":["../../../src/documents/dashboard/UserConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,EAEL,sBAAsB,EACvB,MAAM,uDAAuD,CAAC;AAC/D,OAAO,EAEL,oBAAoB,EACrB,MAAM,qDAAqD,CAAC;AAI7D,OAAO,QAAQ,MAAM,0CAA0C,CAAC;AAChE,OAAO,oBAAoB,MAAM,4BAA4B,CAAC;AAE9D;;;;;GAKG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAA2C,CACjF,MAA2B,EAC3B,EAAE;IACF,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9C,MAAM,aAAa,GAAG,IAAI,mBAAmB,CAAC,IAAI,QAAQ,EAAE,CAAC,CAAC;IAE9D,QAAQ,CAAC,OAAO,CAAC,eAAe,EAAE,aAAa,CAAC,aAAa,CAAC,CAAC;IAC/D,QAAQ,CAAC,KAAK,CAAC,eAAe,EAAE,aAAa,CAAC,aAAa,CAAC,CAAC;IAC7D,QAAQ,CAAC,MAAM,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;IACnC,QAAQ,CAAC,MAAM,CAAC,iBAAiB,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;IAClE,QAAQ,CAAC,OAAO,CACd,mCAAmC,EACnC,aAAa,CAAC,eAAe,CAAC,iBAAiB,CAChD,CAAC;IACF,QAAQ,CAAC,OAAO,CACd,oCAAoC,EACpC,aAAa,CAAC,eAAe,CAAC,kBAAkB,CACjD,CAAC;IACF,QAAQ,CAAC,MAAM,CAAC,sBAAsB,EAAE,aAAa,CAAC,oBAAoB,CAAC,CAAC;IAC5E,oBAAoB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACvC,sBAAsB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAEzC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AACxC,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,oBAAoB;IACnE,MAAM,CAAC,OAAO,GAAG,YAAY,CAAC;IAE9B,OAAO,GAAG,mBAAmB,CAAC,OAAO,CAAC;IAEtC;;OAEG;IACH,MAAM,CAAW;IAEjB;;;OAGG;IACH,aAAa,GAAe,EAAE,CAAC;IAE/B;;OAEG;IACH,aAAa,GAAG,KAAK,CAAC;IAEtB;;OAEG;IACH,eAAe,GAOX;QACF,WAAW,EAAE,KAAK;QAClB,cAAc,EAAE,KAAK;QACrB,iBAAiB,EAAE,KAAK;QACxB,aAAa,EAAE,KAAK;QACpB,mBAAmB,EAAE,KAAK;QAC1B,kBAAkB,EAAE,KAAK;KAC1B,CAAC;IAEF;;;;;;;;;OASG;IACH,oBAAoB,GAAW,EAAE,CAAC;IAElC;;OAEG;IACH,WAAW,GAAyB,EAAE,CAAC;IAEvC;;OAEG;IACH,oBAAoB,GAAwC,EAAE,CAAC;IAE/D;;OAEG;IACH,sBAAsB,GAA0C,EAAE,CAAC;IAEnE;;;;OAIG;IACH,YAAY,OAAiB;QAC3B,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC;IACxB,CAAC"}
|
|
@@ -19,9 +19,9 @@ import BaseDocumentWithType from '../BaseDocumentWithType.js';
|
|
|
19
19
|
* @param config - The {@link DashboardUserConfig} to validate.
|
|
20
20
|
* @returns An object containing the updated document and any validation errors.
|
|
21
21
|
*/
|
|
22
|
-
export const validateDashboardUserConfig: DocumentValidator<
|
|
23
|
-
DashboardUserConfig
|
|
24
|
-
|
|
22
|
+
export const validateDashboardUserConfig: DocumentValidator<DashboardUserConfig> = (
|
|
23
|
+
config: DashboardUserConfig
|
|
24
|
+
) => {
|
|
25
25
|
const errors: string[] = [];
|
|
26
26
|
const validate = new Validate(config, errors);
|
|
27
27
|
const exampleConfig = new DashboardUserConfig(new ObjectId());
|
|
@@ -48,10 +48,7 @@ export const validateDashboardUserConfig: DocumentValidator<
|
|
|
48
48
|
/**
|
|
49
49
|
* Represents the user configuration for the dashboard.
|
|
50
50
|
*/
|
|
51
|
-
export default class DashboardUserConfig
|
|
52
|
-
extends BaseDocumentWithType
|
|
53
|
-
implements RequiredUserId
|
|
54
|
-
{
|
|
51
|
+
export default class DashboardUserConfig extends BaseDocumentWithType implements RequiredUserId {
|
|
55
52
|
static docType = 'userConfig';
|
|
56
53
|
|
|
57
54
|
docType = DashboardUserConfig.docType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FilterSettings.d.ts","sourceRoot":"","sources":["../../../../src/embedded-types/dashboard/task/FilterSettings.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,4CAA4C,CAAC;AAC7E,OAAO,QAAQ,MAAM,6CAA6C,CAAC;AAEnE;;;;;GAKG;AACH,wBAAgB,gCAAgC,
|
|
1
|
+
{"version":3,"file":"FilterSettings.d.ts","sourceRoot":"","sources":["../../../../src/embedded-types/dashboard/task/FilterSettings.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,4CAA4C,CAAC;AAC7E,OAAO,QAAQ,MAAM,6CAA6C,CAAC;AAEnE;;;;;GAKG;AACH,wBAAgB,gCAAgC,CAAC,MAAM,EAAE,MAAM,GAAG,+BAA+B,CAQhG;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,mBAAmB,QA4BrF;AAED;;;GAGG;AACH,MAAM,MAAM,qCAAqC,GAAG;IAClD,CAAC,QAAQ,EAAE,MAAM,GAAG,+BAA+B,CAAC;CACrD,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,2BAA2B,GAAG;IACxC,CAAC,MAAM,EAAE,MAAM,GAAG,+BAA+B,CAAC;CACnD,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,+BAA+B,GAAG;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,qBAAqB,CAAC;IACjC,kBAAkB,EAAE,qBAAqB,CAAC;IAC1C,SAAS,EAAE;QACT,eAAe,EAAE,OAAO,CAAC;KAC1B,CAAC;IACF;;OAEG;IACH,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAC;CAChD,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,EAAE,OAAO,CAAC;CACf,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FilterSettings.js","sourceRoot":"","sources":["../../../../src/embedded-types/dashboard/task/FilterSettings.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,MAAM,UAAU,gCAAgC,
|
|
1
|
+
{"version":3,"file":"FilterSettings.js","sourceRoot":"","sources":["../../../../src/embedded-types/dashboard/task/FilterSettings.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,MAAM,UAAU,gCAAgC,CAAC,MAAc;IAC7D,OAAO;QACL,MAAM;QACN,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;QACzB,kBAAkB,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;QACnC,SAAS,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE;QACpC,IAAI,EAAE,EAAE;KACT,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,sBAAsB,CAAC,QAAkB,EAAE,MAA2B;IACpF,QAAQ,CAAC,MAAM,CAAC,wBAAwB,EAAE,EAAE,CAAC,CAAC;IAC9C,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;IAC9D,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1B,MAAM,eAAe,GAAG,gCAAgC,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QACnF,UAAU,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC9B,QAAQ,CAAC,MAAM,CAAC,0BAA0B,QAAQ,SAAS,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;YACrF,QAAQ,CAAC,MAAM,CAAC,0BAA0B,QAAQ,YAAY,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC;YAC3F,QAAQ,CAAC,OAAO,CACd,0BAA0B,QAAQ,iBAAiB,EACnD,eAAe,CAAC,SAAS,CAAC,IAAI,CAC/B,CAAC;YACF,QAAQ,CAAC,MAAM,CACb,0BAA0B,QAAQ,qBAAqB,EACvD,eAAe,CAAC,kBAAkB,CACnC,CAAC;YACF,QAAQ,CAAC,OAAO,CACd,0BAA0B,QAAQ,0BAA0B,EAC5D,eAAe,CAAC,kBAAkB,CAAC,IAAI,CACxC,CAAC;YACF,QAAQ,CAAC,MAAM,CAAC,0BAA0B,QAAQ,YAAY,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC;YAC3F,QAAQ,CAAC,OAAO,CACd,0BAA0B,QAAQ,4BAA4B,EAC9D,eAAe,CAAC,SAAS,CAAC,eAAe,CAC1C,CAAC;YACF,QAAQ,CAAC,MAAM,CAAC,0BAA0B,QAAQ,OAAO,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;QACnF,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
|
|
@@ -7,9 +7,7 @@ import Validate from '../../../schemas/validators/ValidateUtil.js';
|
|
|
7
7
|
* @param userId - The ID of the user.
|
|
8
8
|
* @returns The default filter settings for the user's task list.
|
|
9
9
|
*/
|
|
10
|
-
export function getDefaultTaskListFilterSettings(
|
|
11
|
-
userId: string
|
|
12
|
-
): DashboardTaskListFilterSettings {
|
|
10
|
+
export function getDefaultTaskListFilterSettings(userId: string): DashboardTaskListFilterSettings {
|
|
13
11
|
return {
|
|
14
12
|
userId,
|
|
15
13
|
completed: { show: true },
|
|
@@ -25,25 +23,14 @@ export function getDefaultTaskListFilterSettings(
|
|
|
25
23
|
* @param validate - The validation utility.
|
|
26
24
|
* @param config - The user configuration containing the filter settings.
|
|
27
25
|
*/
|
|
28
|
-
export function validateFilterSettings(
|
|
29
|
-
validate: Validate,
|
|
30
|
-
config: DashboardUserConfig
|
|
31
|
-
) {
|
|
26
|
+
export function validateFilterSettings(validate: Validate, config: DashboardUserConfig) {
|
|
32
27
|
validate.object('taskListFilterSettings', {});
|
|
33
28
|
const categories = Object.keys(config.taskListFilterSettings);
|
|
34
29
|
if (categories.length > 0) {
|
|
35
|
-
const defaultSettings = getDefaultTaskListFilterSettings(
|
|
36
|
-
config.userId.toString()
|
|
37
|
-
);
|
|
30
|
+
const defaultSettings = getDefaultTaskListFilterSettings(config.userId.toString());
|
|
38
31
|
categories.forEach((category) => {
|
|
39
|
-
validate.string(
|
|
40
|
-
|
|
41
|
-
defaultSettings.userId
|
|
42
|
-
);
|
|
43
|
-
validate.object(
|
|
44
|
-
`taskListFilterSettings.${category}.completed`,
|
|
45
|
-
defaultSettings.completed
|
|
46
|
-
);
|
|
32
|
+
validate.string(`taskListFilterSettings.${category}.userId`, defaultSettings.userId);
|
|
33
|
+
validate.object(`taskListFilterSettings.${category}.completed`, defaultSettings.completed);
|
|
47
34
|
validate.boolean(
|
|
48
35
|
`taskListFilterSettings.${category}.completed.show`,
|
|
49
36
|
defaultSettings.completed.show
|
|
@@ -56,18 +43,12 @@ export function validateFilterSettings(
|
|
|
56
43
|
`taskListFilterSettings.${category}.grandChildrenTasks.show`,
|
|
57
44
|
defaultSettings.grandChildrenTasks.show
|
|
58
45
|
);
|
|
59
|
-
validate.object(
|
|
60
|
-
`taskListFilterSettings.${category}.startDate`,
|
|
61
|
-
defaultSettings.startDate
|
|
62
|
-
);
|
|
46
|
+
validate.object(`taskListFilterSettings.${category}.startDate`, defaultSettings.startDate);
|
|
63
47
|
validate.boolean(
|
|
64
48
|
`taskListFilterSettings.${category}.startDate.showFutureTasks`,
|
|
65
49
|
defaultSettings.startDate.showFutureTasks
|
|
66
50
|
);
|
|
67
|
-
validate.object(
|
|
68
|
-
`taskListFilterSettings.${category}.tags`,
|
|
69
|
-
defaultSettings.tags
|
|
70
|
-
);
|
|
51
|
+
validate.object(`taskListFilterSettings.${category}.tags`, defaultSettings.tags);
|
|
71
52
|
});
|
|
72
53
|
}
|
|
73
54
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RecurrenceInfo.d.ts","sourceRoot":"","sources":["../../../../src/embedded-types/dashboard/task/RecurrenceInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,aAAa,MAAM,sCAAsC,CAAC;AAEjE;;;;;GAKG;AACH,wBAAgB,sBAAsB,
|
|
1
|
+
{"version":3,"file":"RecurrenceInfo.d.ts","sourceRoot":"","sources":["../../../../src/embedded-types/dashboard/task/RecurrenceInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,aAAa,MAAM,sCAAsC,CAAC;AAEjE;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAuBlF;AAED;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,EAAE,mBAAmB,CAAC;IAC/B,eAAe,EAAE,eAAe,CAAC;IACjC,gBAAgB,EAAE,gBAAgB,CAAC;CACpC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,uBAAuB,CAAC;IAC9B,cAAc,CAAC,EAAE;QACf,QAAQ,EAAE,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;QAC5C;;WAEG;QACH,CAAC,EAAE,MAAM,CAAC;KACX,CAAC;IACF;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,oBAAoB,CAAC,EAAE;QACrB,OAAO,EAAE,MAAM,CAAC;QAChB;;;;WAIG;QACH,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;KAC9B,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,oBAAY,uBAAuB;IACjC,cAAc,mBAAmB;IACjC,UAAU,eAAe;IACzB,oBAAoB,yBAAyB;IAC7C,cAAc,mBAAmB;CAClC;AAED;;GAEG;AACH,oBAAY,eAAe;IACzB,SAAS,cAAc;IACvB,OAAO,YAAY;CACpB;AAED;;GAEG;AACH,oBAAY,gBAAgB;IAC1B;;OAEG;IACH,WAAW,gBAAgB;IAC3B;;;OAGG;IACH,gBAAgB,qBAAqB;IACrC;;;;OAIG;IACH,KAAK,UAAU;CAChB;AAED;;;;;GAKG;AACH,MAAM,MAAM,uBAAuB,GAAG;IACpC,MAAM,EAAE,QAAQ,CAAC;IACjB,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,OAAO,CAAC,EAAE,IAAI,CAAC;CAChB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RecurrenceInfo.js","sourceRoot":"","sources":["../../../../src/embedded-types/dashboard/task/RecurrenceInfo.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,MAAM,UAAU,sBAAsB,
|
|
1
|
+
{"version":3,"file":"RecurrenceInfo.js","sourceRoot":"","sources":["../../../../src/embedded-types/dashboard/task/RecurrenceInfo.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,MAAM,UAAU,sBAAsB,CAAC,IAAmB,EAAE,MAAgB;IAC1E,MAAM,gBAAgB,GAAa,EAAE,CAAC;IACtC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;QACzB,OAAO;IACT,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,CAAC;QACnC,gBAAgB,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;IACjE,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC;QACzC,gBAAgB,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;IACvE,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,gBAAgB,EAAE,CAAC;QAC1C,gBAAgB,CAAC,IAAI,CAAC,8CAA8C,CAAC,CAAC;IACxE,CAAC;IAED,4EAA4E;IAC5E,8BAA8B;IAE9B,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChC,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;IAClC,CAAC;IACD,MAAM,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,CAAC;AACnC,CAAC;AA0CD;;GAEG;AACH,MAAM,CAAN,IAAY,uBAKX;AALD,WAAY,uBAAuB;IACjC,4DAAiC,CAAA;IACjC,oDAAyB,CAAA;IACzB,wEAA6C,CAAA;IAC7C,4DAAiC,CAAA;AACnC,CAAC,EALW,uBAAuB,KAAvB,uBAAuB,QAKlC;AAED;;GAEG;AACH,MAAM,CAAN,IAAY,eAGX;AAHD,WAAY,eAAe;IACzB,0CAAuB,CAAA;IACvB,sCAAmB,CAAA;AACrB,CAAC,EAHW,eAAe,KAAf,eAAe,QAG1B;AAED;;GAEG;AACH,MAAM,CAAN,IAAY,gBAgBX;AAhBD,WAAY,gBAAgB;IAC1B;;OAEG;IACH,+CAA2B,CAAA;IAC3B;;;OAGG;IACH,yDAAqC,CAAA;IACrC;;;;OAIG;IACH,mCAAe,CAAA;AACjB,CAAC,EAhBW,gBAAgB,KAAhB,gBAAgB,QAgB3B"}
|
|
@@ -7,10 +7,7 @@ import DashboardTask from '../../../documents/dashboard/Task.js';
|
|
|
7
7
|
* @param task - The dashboard task to validate.
|
|
8
8
|
* @param errors - An array to collect validation error messages.
|
|
9
9
|
*/
|
|
10
|
-
export function validateRecurrenceInfo(
|
|
11
|
-
task: DashboardTask,
|
|
12
|
-
errors: string[]
|
|
13
|
-
): void {
|
|
10
|
+
export function validateRecurrenceInfo(task: DashboardTask, errors: string[]): void {
|
|
14
11
|
const recurrenceErrors: string[] = [];
|
|
15
12
|
if (!task.recurrenceInfo) {
|
|
16
13
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SortSettings.d.ts","sourceRoot":"","sources":["../../../../src/embedded-types/dashboard/task/SortSettings.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,4CAA4C,CAAC;AAC7E,OAAO,QAAQ,MAAM,6CAA6C,CAAC;AAEnE;;;;;GAKG;AACH,wBAAgB,8BAA8B,
|
|
1
|
+
{"version":3,"file":"SortSettings.d.ts","sourceRoot":"","sources":["../../../../src/embedded-types/dashboard/task/SortSettings.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,4CAA4C,CAAC;AAC7E,OAAO,QAAQ,MAAM,6CAA6C,CAAC;AAEnE;;;;;GAKG;AACH,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,MAAM,GAAG,6BAA6B,CAK5F;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,mBAAmB,QAUnF;AAED;;GAEG;AACH,MAAM,MAAM,mCAAmC,GAAG;IAChD,CAAC,QAAQ,EAAE,MAAM,GAAG,6BAA6B,CAAC;CACnD,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,yBAAyB,GAAG;IACtC,CAAC,MAAM,EAAE,MAAM,GAAG,6BAA6B,CAAC;CACjD,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,6BAA6B,GAAG;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,KAAK,CAAC,wBAAwB,CAAC,CAAC;CAC3C,CAAC;AAEF;;GAEG;AACH,oBAAY,mBAAmB;IAC7B;;OAEG;IACH,IAAI,SAAS;IACb,KAAK,UAAU;IACf,OAAO,YAAY;IACnB,SAAS,cAAc;IACvB,WAAW,gBAAgB;IAC3B,eAAe,oBAAoB;CACpC;AAED;;GAEG;AACH,MAAM,MAAM,wBAAwB,GAAG;IACrC,MAAM,EAAE,mBAAmB,CAAC;IAC5B,aAAa,EAAE,0BAA0B,CAAC;CAC3C,CAAC;AAEF;;;GAGG;AACH,oBAAY,0BAA0B;IACpC;;OAEG;IACH,SAAS,IAAI;IACb;;OAEG;IACH,UAAU,KAAK;CAChB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SortSettings.js","sourceRoot":"","sources":["../../../../src/embedded-types/dashboard/task/SortSettings.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,MAAM,UAAU,8BAA8B,
|
|
1
|
+
{"version":3,"file":"SortSettings.js","sourceRoot":"","sources":["../../../../src/embedded-types/dashboard/task/SortSettings.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,MAAM,UAAU,8BAA8B,CAAC,MAAc;IAC3D,OAAO;QACL,MAAM;QACN,QAAQ,EAAE,EAAE;KACb,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB,CAAC,QAAkB,EAAE,MAA2B;IAClF,QAAQ,CAAC,MAAM,CAAC,sBAAsB,EAAE,EAAE,CAAC,CAAC;IAC5C,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;IAC5D,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1B,MAAM,eAAe,GAAG,8BAA8B,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QACjF,UAAU,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC9B,QAAQ,CAAC,MAAM,CAAC,wBAAwB,QAAQ,SAAS,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;YACnF,QAAQ,CAAC,KAAK,CAAC,wBAAwB,QAAQ,WAAW,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAC;QACxF,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAyBD;;GAEG;AACH,MAAM,CAAN,IAAY,mBAUX;AAVD,WAAY,mBAAmB;IAC7B;;OAEG;IACH,oCAAa,CAAA;IACb,sCAAe,CAAA;IACf,0CAAmB,CAAA;IACnB,8CAAuB,CAAA;IACvB,kDAA2B,CAAA;IAC3B,0DAAmC,CAAA;AACrC,CAAC,EAVW,mBAAmB,KAAnB,mBAAmB,QAU9B;AAUD;;;GAGG;AACH,MAAM,CAAN,IAAY,0BASX;AATD,WAAY,0BAA0B;IACpC;;OAEG;IACH,qFAAa,CAAA;IACb;;OAEG;IACH,wFAAe,CAAA;AACjB,CAAC,EATW,0BAA0B,KAA1B,0BAA0B,QASrC"}
|
|
@@ -7,9 +7,7 @@ import Validate from '../../../schemas/validators/ValidateUtil.js';
|
|
|
7
7
|
* @param userId - The ID of the user.
|
|
8
8
|
* @returns The default task list sort settings for the user.
|
|
9
9
|
*/
|
|
10
|
-
export function getDefaultTaskListSortSettings(
|
|
11
|
-
userId: string
|
|
12
|
-
): DashboardTaskListSortSettings {
|
|
10
|
+
export function getDefaultTaskListSortSettings(userId: string): DashboardTaskListSortSettings {
|
|
13
11
|
return {
|
|
14
12
|
userId,
|
|
15
13
|
sortList: []
|
|
@@ -22,25 +20,14 @@ export function getDefaultTaskListSortSettings(
|
|
|
22
20
|
* @param validate - The validation utility.
|
|
23
21
|
* @param config - The user configuration for the dashboard.
|
|
24
22
|
*/
|
|
25
|
-
export function validateSortSettings(
|
|
26
|
-
validate: Validate,
|
|
27
|
-
config: DashboardUserConfig
|
|
28
|
-
) {
|
|
23
|
+
export function validateSortSettings(validate: Validate, config: DashboardUserConfig) {
|
|
29
24
|
validate.object('taskListSortSettings', {});
|
|
30
25
|
const categories = Object.keys(config.taskListSortSettings);
|
|
31
26
|
if (categories.length > 0) {
|
|
32
|
-
const defaultSettings = getDefaultTaskListSortSettings(
|
|
33
|
-
config.userId.toString()
|
|
34
|
-
);
|
|
27
|
+
const defaultSettings = getDefaultTaskListSortSettings(config.userId.toString());
|
|
35
28
|
categories.forEach((category) => {
|
|
36
|
-
validate.string(
|
|
37
|
-
|
|
38
|
-
defaultSettings.userId
|
|
39
|
-
);
|
|
40
|
-
validate.array(
|
|
41
|
-
`taskListSortSettings.${category}.sortList`,
|
|
42
|
-
defaultSettings.sortList
|
|
43
|
-
);
|
|
29
|
+
validate.string(`taskListSortSettings.${category}.userId`, defaultSettings.userId);
|
|
30
|
+
validate.array(`taskListSortSettings.${category}.sortList`, defaultSettings.sortList);
|
|
44
31
|
});
|
|
45
32
|
}
|
|
46
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commonTypeGuards.d.ts","sourceRoot":"","sources":["../../../src/schemas/type-guards/commonTypeGuards.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,SAAS,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"commonTypeGuards.d.ts","sourceRoot":"","sources":["../../../src/schemas/type-guards/commonTypeGuards.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,SAAS,GAAG,MAAM,CAE5E;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,IAAI,CAE1F;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,SAAS,GAAG,MAAM,GAAG,IAAI,CAEnF;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,SAAS,GAAG,IAAI,GAAG,MAAM,CAEnF;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,SAAS,GAAG,IAAI,GAAG,OAAO,CAErF"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* @returns True if the value is undefined or an object, false otherwise.
|
|
6
6
|
*/
|
|
7
7
|
export function isOptionalObject(value) {
|
|
8
|
-
return
|
|
8
|
+
return value === undefined || (typeof value === 'object' && !Array.isArray(value));
|
|
9
9
|
}
|
|
10
10
|
/**
|
|
11
11
|
* Checks if the value is either undefined, null, or an array.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commonTypeGuards.js","sourceRoot":"","sources":["../../../src/schemas/type-guards/commonTypeGuards.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,UAAU,gBAAgB,CAAC,KAAc;IAC7C,OAAO,
|
|
1
|
+
{"version":3,"file":"commonTypeGuards.js","sourceRoot":"","sources":["../../../src/schemas/type-guards/commonTypeGuards.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,UAAU,gBAAgB,CAAC,KAAc;IAC7C,OAAO,KAAK,KAAK,SAAS,IAAI,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;AACrF,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAAC,KAAc;IAC5C,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AACvE,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,gBAAgB,CAAC,KAAc;IAC7C,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC;AAC5E,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,gBAAgB,CAAC,KAAc;IAC7C,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC;AAC5E,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAAC,KAAc;IAC9C,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,SAAS,CAAC;AAC7E,CAAC"}
|
|
@@ -5,9 +5,7 @@
|
|
|
5
5
|
* @returns True if the value is undefined or an object, false otherwise.
|
|
6
6
|
*/
|
|
7
7
|
export function isOptionalObject(value: unknown): value is undefined | object {
|
|
8
|
-
return (
|
|
9
|
-
value === undefined || (typeof value === 'object' && !Array.isArray(value))
|
|
10
|
-
);
|
|
8
|
+
return value === undefined || (typeof value === 'object' && !Array.isArray(value));
|
|
11
9
|
}
|
|
12
10
|
|
|
13
11
|
/**
|
|
@@ -16,9 +14,7 @@ export function isOptionalObject(value: unknown): value is undefined | object {
|
|
|
16
14
|
* @param value - The value to check.
|
|
17
15
|
* @returns True if the value is undefined, null, or an array, false otherwise.
|
|
18
16
|
*/
|
|
19
|
-
export function isOptionalArray(
|
|
20
|
-
value: unknown
|
|
21
|
-
): value is undefined | Array<unknown> | null {
|
|
17
|
+
export function isOptionalArray(value: unknown): value is undefined | Array<unknown> | null {
|
|
22
18
|
return value === undefined || value === null || Array.isArray(value);
|
|
23
19
|
}
|
|
24
20
|
|
|
@@ -28,9 +24,7 @@ export function isOptionalArray(
|
|
|
28
24
|
* @param value - The value to check.
|
|
29
25
|
* @returns True if the value is undefined, null, or a string, false otherwise.
|
|
30
26
|
*/
|
|
31
|
-
export function isOptionalString(
|
|
32
|
-
value: unknown
|
|
33
|
-
): value is undefined | string | null {
|
|
27
|
+
export function isOptionalString(value: unknown): value is undefined | string | null {
|
|
34
28
|
return value === undefined || value === null || typeof value === 'string';
|
|
35
29
|
}
|
|
36
30
|
|
|
@@ -40,9 +34,7 @@ export function isOptionalString(
|
|
|
40
34
|
* @param value - The value to check.
|
|
41
35
|
* @returns True if the value is undefined, null, or a number, false otherwise.
|
|
42
36
|
*/
|
|
43
|
-
export function isOptionalNumber(
|
|
44
|
-
value: unknown
|
|
45
|
-
): value is undefined | null | number {
|
|
37
|
+
export function isOptionalNumber(value: unknown): value is undefined | null | number {
|
|
46
38
|
return value === undefined || value === null || typeof value === 'number';
|
|
47
39
|
}
|
|
48
40
|
|
|
@@ -52,8 +44,6 @@ export function isOptionalNumber(
|
|
|
52
44
|
* @param value - The value to check.
|
|
53
45
|
* @returns True if the value is undefined, null, or a boolean, false otherwise.
|
|
54
46
|
*/
|
|
55
|
-
export function isOptionalBoolean(
|
|
56
|
-
value: unknown
|
|
57
|
-
): value is undefined | null | boolean {
|
|
47
|
+
export function isOptionalBoolean(value: unknown): value is undefined | null | boolean {
|
|
58
48
|
return value === undefined || value === null || typeof value === 'boolean';
|
|
59
49
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DocumentValidator.d.ts","sourceRoot":"","sources":["../../../src/schemas/validators/DocumentValidator.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,iCAAiC,CAAC;AAE3D;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAAC,QAAQ,SAAS,YAAY,IAAI,
|
|
1
|
+
{"version":3,"file":"DocumentValidator.d.ts","sourceRoot":"","sources":["../../../src/schemas/validators/DocumentValidator.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,iCAAiC,CAAC;AAE3D;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAAC,QAAQ,SAAS,YAAY,IAAI,CAAC,GAAG,EAAE,QAAQ,KAAK;IAChF,UAAU,EAAE,QAAQ,CAAC;IACrB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC"}
|
|
@@ -3,6 +3,7 @@ import BaseDocument from '../../documents/BaseDocument.js';
|
|
|
3
3
|
/**
|
|
4
4
|
* A validator for a document.
|
|
5
5
|
*/
|
|
6
|
-
export type DocumentValidator<TDocType extends BaseDocument> = (
|
|
7
|
-
|
|
8
|
-
|
|
6
|
+
export type DocumentValidator<TDocType extends BaseDocument> = (doc: TDocType) => {
|
|
7
|
+
updatedDoc: TDocType;
|
|
8
|
+
errors: string[];
|
|
9
|
+
};
|
|
@@ -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;;;;OAIG;IACH,cAAc,CAAC,SAAS,EAAE,MAAM;
|
|
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;;;;OAIG;IACH,cAAc,CAAC,SAAS,EAAE,MAAM;IAOhC;;;;OAIG;IACH,cAAc,CAAC,SAAS,EAAE,MAAM;IAOhC;;;;OAIG;IACH,eAAe,CAAC,SAAS,EAAE,MAAM;IAOjC;;;;OAIG;IACH,aAAa,CAAC,SAAS,EAAE,MAAM;IAO/B;;;;OAIG;IACH,cAAc,CAAC,SAAS,EAAE,MAAM;IAOhC;;;;;OAKG;IACH,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IAO9C;;;;;OAKG;IACH,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IAU9C;;;;;OAKG;IACH,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IAO9C;;;;;OAKG;IACH,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO;IAOhD;;;;;OAKG;IACH,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE;IAOhD;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,gBAAgB;IAexB;;;;;OAKG;IACH,OAAO,CAAC,WAAW;IAYnB;;;;;OAKG;IACH,OAAO,CAAC,QAAQ;IAShB;;;;OAIG;IACH,OAAO,CAAC,WAAW;CAYpB"}
|
|
@@ -25,8 +25,7 @@ export default class Validate {
|
|
|
25
25
|
* @param fieldName - The name of the field to validate.
|
|
26
26
|
*/
|
|
27
27
|
optionalString(fieldName) {
|
|
28
|
-
if (this.fieldPathIsValid(fieldName) &&
|
|
29
|
-
!isOptionalString(this.getField(fieldName))) {
|
|
28
|
+
if (this.fieldPathIsValid(fieldName) && !isOptionalString(this.getField(fieldName))) {
|
|
30
29
|
this.errorsArray.push(`${fieldName} must be a string or undefined`);
|
|
31
30
|
this.deleteField(fieldName);
|
|
32
31
|
}
|
|
@@ -37,8 +36,7 @@ export default class Validate {
|
|
|
37
36
|
* @param fieldName - The name of the field to validate.
|
|
38
37
|
*/
|
|
39
38
|
optionalNumber(fieldName) {
|
|
40
|
-
if (this.fieldPathIsValid(fieldName) &&
|
|
41
|
-
!isOptionalNumber(this.getField(fieldName))) {
|
|
39
|
+
if (this.fieldPathIsValid(fieldName) && !isOptionalNumber(this.getField(fieldName))) {
|
|
42
40
|
this.errorsArray.push(`${fieldName} must be a number or undefined`);
|
|
43
41
|
this.deleteField(fieldName);
|
|
44
42
|
}
|
|
@@ -49,8 +47,7 @@ export default class Validate {
|
|
|
49
47
|
* @param fieldName - The name of the field to validate.
|
|
50
48
|
*/
|
|
51
49
|
optionalBoolean(fieldName) {
|
|
52
|
-
if (this.fieldPathIsValid(fieldName) &&
|
|
53
|
-
!isOptionalBoolean(this.getField(fieldName))) {
|
|
50
|
+
if (this.fieldPathIsValid(fieldName) && !isOptionalBoolean(this.getField(fieldName))) {
|
|
54
51
|
this.errorsArray.push(`${fieldName} must be a boolean or undefined`);
|
|
55
52
|
this.deleteField(fieldName);
|
|
56
53
|
}
|
|
@@ -61,8 +58,7 @@ export default class Validate {
|
|
|
61
58
|
* @param fieldName - The name of the field to validate.
|
|
62
59
|
*/
|
|
63
60
|
optionalArray(fieldName) {
|
|
64
|
-
if (this.fieldPathIsValid(fieldName) &&
|
|
65
|
-
!isOptionalArray(this.getField(fieldName))) {
|
|
61
|
+
if (this.fieldPathIsValid(fieldName) && !isOptionalArray(this.getField(fieldName))) {
|
|
66
62
|
this.errorsArray.push(`${fieldName} must be an array or undefined`);
|
|
67
63
|
this.deleteField(fieldName);
|
|
68
64
|
}
|
|
@@ -73,8 +69,7 @@ export default class Validate {
|
|
|
73
69
|
* @param fieldName - The name of the field to validate.
|
|
74
70
|
*/
|
|
75
71
|
optionalObject(fieldName) {
|
|
76
|
-
if (this.fieldPathIsValid(fieldName) &&
|
|
77
|
-
!isOptionalObject(this.getField(fieldName))) {
|
|
72
|
+
if (this.fieldPathIsValid(fieldName) && !isOptionalObject(this.getField(fieldName))) {
|
|
78
73
|
this.errorsArray.push(`${fieldName} must be an object or undefined`);
|
|
79
74
|
this.deleteField(fieldName);
|
|
80
75
|
}
|
|
@@ -86,8 +81,7 @@ export default class Validate {
|
|
|
86
81
|
* @param defaultValue - The default value to set if validation fails.
|
|
87
82
|
*/
|
|
88
83
|
string(fieldName, defaultValue) {
|
|
89
|
-
if (this.fieldPathIsValid(fieldName) &&
|
|
90
|
-
typeof this.getField(fieldName) !== 'string') {
|
|
84
|
+
if (this.fieldPathIsValid(fieldName) && typeof this.getField(fieldName) !== 'string') {
|
|
91
85
|
this.errorsArray.push(`${fieldName} must be a string`);
|
|
92
86
|
this.updateField(fieldName, defaultValue);
|
|
93
87
|
}
|
|
@@ -100,8 +94,7 @@ export default class Validate {
|
|
|
100
94
|
*/
|
|
101
95
|
object(fieldName, defaultValue) {
|
|
102
96
|
if (this.fieldPathIsValid(fieldName) &&
|
|
103
|
-
(Array.isArray(this.getField(fieldName)) ||
|
|
104
|
-
typeof this.getField(fieldName) !== 'object')) {
|
|
97
|
+
(Array.isArray(this.getField(fieldName)) || typeof this.getField(fieldName) !== 'object')) {
|
|
105
98
|
this.errorsArray.push(`${fieldName} must be an object`);
|
|
106
99
|
this.updateField(fieldName, defaultValue);
|
|
107
100
|
}
|
|
@@ -113,8 +106,7 @@ export default class Validate {
|
|
|
113
106
|
* @param defaultValue - The default value to set if validation fails.
|
|
114
107
|
*/
|
|
115
108
|
number(fieldName, defaultValue) {
|
|
116
|
-
if (this.fieldPathIsValid(fieldName) &&
|
|
117
|
-
typeof this.getField(fieldName) !== 'number') {
|
|
109
|
+
if (this.fieldPathIsValid(fieldName) && typeof this.getField(fieldName) !== 'number') {
|
|
118
110
|
this.errorsArray.push(`${fieldName} must be a number`);
|
|
119
111
|
this.updateField(fieldName, defaultValue);
|
|
120
112
|
}
|
|
@@ -126,8 +118,7 @@ export default class Validate {
|
|
|
126
118
|
* @param defaultValue - The default value to set if validation fails.
|
|
127
119
|
*/
|
|
128
120
|
boolean(fieldName, defaultValue) {
|
|
129
|
-
if (this.fieldPathIsValid(fieldName) &&
|
|
130
|
-
typeof this.getField(fieldName) !== 'boolean') {
|
|
121
|
+
if (this.fieldPathIsValid(fieldName) && typeof this.getField(fieldName) !== 'boolean') {
|
|
131
122
|
this.errorsArray.push(`${fieldName} must be a boolean`);
|
|
132
123
|
this.updateField(fieldName, defaultValue);
|
|
133
124
|
}
|
|
@@ -139,8 +130,7 @@ export default class Validate {
|
|
|
139
130
|
* @param defaultValue - The default value to set if validation fails.
|
|
140
131
|
*/
|
|
141
132
|
array(fieldName, defaultValue) {
|
|
142
|
-
if (this.fieldPathIsValid(fieldName) &&
|
|
143
|
-
!Array.isArray(this.getField(fieldName))) {
|
|
133
|
+
if (this.fieldPathIsValid(fieldName) && !Array.isArray(this.getField(fieldName))) {
|
|
144
134
|
this.errorsArray.push(`${fieldName} must be an array`);
|
|
145
135
|
this.updateField(fieldName, defaultValue);
|
|
146
136
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValidateUtil.js","sourceRoot":"","sources":["../../../src/schemas/validators/ValidateUtil.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,oCAAoC,CAAC;AAI5C;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,OAAO,OAAO,QAAQ;IAKjB;IAJV,YAAY,CAAkB;IAE9B,YACE,YAAoB,EACZ,WAAqB;QAArB,gBAAW,GAAX,WAAW,CAAU;QAE7B,IAAI,CAAC,YAAY,GAAG,YAA+B,CAAC;IACtD,CAAC;IAED;;;;OAIG;IACH,cAAc,CAAC,SAAiB;QAC9B,
|
|
1
|
+
{"version":3,"file":"ValidateUtil.js","sourceRoot":"","sources":["../../../src/schemas/validators/ValidateUtil.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,10 +37,7 @@ export default class Validate {
|
|
|
37
37
|
* @param fieldName - The name of the field to validate.
|
|
38
38
|
*/
|
|
39
39
|
optionalString(fieldName: string) {
|
|
40
|
-
if (
|
|
41
|
-
this.fieldPathIsValid(fieldName) &&
|
|
42
|
-
!isOptionalString(this.getField(fieldName))
|
|
43
|
-
) {
|
|
40
|
+
if (this.fieldPathIsValid(fieldName) && !isOptionalString(this.getField(fieldName))) {
|
|
44
41
|
this.errorsArray.push(`${fieldName} must be a string or undefined`);
|
|
45
42
|
this.deleteField(fieldName);
|
|
46
43
|
}
|
|
@@ -52,10 +49,7 @@ export default class Validate {
|
|
|
52
49
|
* @param fieldName - The name of the field to validate.
|
|
53
50
|
*/
|
|
54
51
|
optionalNumber(fieldName: string) {
|
|
55
|
-
if (
|
|
56
|
-
this.fieldPathIsValid(fieldName) &&
|
|
57
|
-
!isOptionalNumber(this.getField(fieldName))
|
|
58
|
-
) {
|
|
52
|
+
if (this.fieldPathIsValid(fieldName) && !isOptionalNumber(this.getField(fieldName))) {
|
|
59
53
|
this.errorsArray.push(`${fieldName} must be a number or undefined`);
|
|
60
54
|
this.deleteField(fieldName);
|
|
61
55
|
}
|
|
@@ -67,10 +61,7 @@ export default class Validate {
|
|
|
67
61
|
* @param fieldName - The name of the field to validate.
|
|
68
62
|
*/
|
|
69
63
|
optionalBoolean(fieldName: string) {
|
|
70
|
-
if (
|
|
71
|
-
this.fieldPathIsValid(fieldName) &&
|
|
72
|
-
!isOptionalBoolean(this.getField(fieldName))
|
|
73
|
-
) {
|
|
64
|
+
if (this.fieldPathIsValid(fieldName) && !isOptionalBoolean(this.getField(fieldName))) {
|
|
74
65
|
this.errorsArray.push(`${fieldName} must be a boolean or undefined`);
|
|
75
66
|
this.deleteField(fieldName);
|
|
76
67
|
}
|
|
@@ -82,10 +73,7 @@ export default class Validate {
|
|
|
82
73
|
* @param fieldName - The name of the field to validate.
|
|
83
74
|
*/
|
|
84
75
|
optionalArray(fieldName: string) {
|
|
85
|
-
if (
|
|
86
|
-
this.fieldPathIsValid(fieldName) &&
|
|
87
|
-
!isOptionalArray(this.getField(fieldName))
|
|
88
|
-
) {
|
|
76
|
+
if (this.fieldPathIsValid(fieldName) && !isOptionalArray(this.getField(fieldName))) {
|
|
89
77
|
this.errorsArray.push(`${fieldName} must be an array or undefined`);
|
|
90
78
|
this.deleteField(fieldName);
|
|
91
79
|
}
|
|
@@ -97,10 +85,7 @@ export default class Validate {
|
|
|
97
85
|
* @param fieldName - The name of the field to validate.
|
|
98
86
|
*/
|
|
99
87
|
optionalObject(fieldName: string) {
|
|
100
|
-
if (
|
|
101
|
-
this.fieldPathIsValid(fieldName) &&
|
|
102
|
-
!isOptionalObject(this.getField(fieldName))
|
|
103
|
-
) {
|
|
88
|
+
if (this.fieldPathIsValid(fieldName) && !isOptionalObject(this.getField(fieldName))) {
|
|
104
89
|
this.errorsArray.push(`${fieldName} must be an object or undefined`);
|
|
105
90
|
this.deleteField(fieldName);
|
|
106
91
|
}
|
|
@@ -113,10 +98,7 @@ export default class Validate {
|
|
|
113
98
|
* @param defaultValue - The default value to set if validation fails.
|
|
114
99
|
*/
|
|
115
100
|
string(fieldName: string, defaultValue: string) {
|
|
116
|
-
if (
|
|
117
|
-
this.fieldPathIsValid(fieldName) &&
|
|
118
|
-
typeof this.getField(fieldName) !== 'string'
|
|
119
|
-
) {
|
|
101
|
+
if (this.fieldPathIsValid(fieldName) && typeof this.getField(fieldName) !== 'string') {
|
|
120
102
|
this.errorsArray.push(`${fieldName} must be a string`);
|
|
121
103
|
this.updateField(fieldName, defaultValue);
|
|
122
104
|
}
|
|
@@ -131,8 +113,7 @@ export default class Validate {
|
|
|
131
113
|
object(fieldName: string, defaultValue: object) {
|
|
132
114
|
if (
|
|
133
115
|
this.fieldPathIsValid(fieldName) &&
|
|
134
|
-
(Array.isArray(this.getField(fieldName)) ||
|
|
135
|
-
typeof this.getField(fieldName) !== 'object')
|
|
116
|
+
(Array.isArray(this.getField(fieldName)) || typeof this.getField(fieldName) !== 'object')
|
|
136
117
|
) {
|
|
137
118
|
this.errorsArray.push(`${fieldName} must be an object`);
|
|
138
119
|
this.updateField(fieldName, defaultValue);
|
|
@@ -146,10 +127,7 @@ export default class Validate {
|
|
|
146
127
|
* @param defaultValue - The default value to set if validation fails.
|
|
147
128
|
*/
|
|
148
129
|
number(fieldName: string, defaultValue: number) {
|
|
149
|
-
if (
|
|
150
|
-
this.fieldPathIsValid(fieldName) &&
|
|
151
|
-
typeof this.getField(fieldName) !== 'number'
|
|
152
|
-
) {
|
|
130
|
+
if (this.fieldPathIsValid(fieldName) && typeof this.getField(fieldName) !== 'number') {
|
|
153
131
|
this.errorsArray.push(`${fieldName} must be a number`);
|
|
154
132
|
this.updateField(fieldName, defaultValue);
|
|
155
133
|
}
|
|
@@ -162,10 +140,7 @@ export default class Validate {
|
|
|
162
140
|
* @param defaultValue - The default value to set if validation fails.
|
|
163
141
|
*/
|
|
164
142
|
boolean(fieldName: string, defaultValue: boolean) {
|
|
165
|
-
if (
|
|
166
|
-
this.fieldPathIsValid(fieldName) &&
|
|
167
|
-
typeof this.getField(fieldName) !== 'boolean'
|
|
168
|
-
) {
|
|
143
|
+
if (this.fieldPathIsValid(fieldName) && typeof this.getField(fieldName) !== 'boolean') {
|
|
169
144
|
this.errorsArray.push(`${fieldName} must be a boolean`);
|
|
170
145
|
this.updateField(fieldName, defaultValue);
|
|
171
146
|
}
|
|
@@ -178,10 +153,7 @@ export default class Validate {
|
|
|
178
153
|
* @param defaultValue - The default value to set if validation fails.
|
|
179
154
|
*/
|
|
180
155
|
array(fieldName: string, defaultValue: unknown[]) {
|
|
181
|
-
if (
|
|
182
|
-
this.fieldPathIsValid(fieldName) &&
|
|
183
|
-
!Array.isArray(this.getField(fieldName))
|
|
184
|
-
) {
|
|
156
|
+
if (this.fieldPathIsValid(fieldName) && !Array.isArray(this.getField(fieldName))) {
|
|
185
157
|
this.errorsArray.push(`${fieldName} must be an array`);
|
|
186
158
|
this.updateField(fieldName, defaultValue);
|
|
187
159
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaskFilterService.d.ts","sourceRoot":"","sources":["../../../../src/services/dashboard/Task/TaskFilterService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAE,+BAA+B,EAAE,MAAM,0DAA0D,CAAC;AAE3G,MAAM,MAAM,yBAAyB,GAAG;IACtC;;OAEG;IACH,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB;;;;OAIG;IACH,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,0BAA0B;IAC7C;;;;;;;;;;;;;;;;;OAiBG;IACH,MAAM,CAAC,MAAM,CACX,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,MAAM,EAAE,EACjB,QAAQ,EAAE,+BAA+B,EACzC,QAAQ,EAAE,MAAM,EAChB,YAAY,CAAC,EAAE,MAAM,GACpB,yBAAyB;
|
|
1
|
+
{"version":3,"file":"TaskFilterService.d.ts","sourceRoot":"","sources":["../../../../src/services/dashboard/Task/TaskFilterService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAE,+BAA+B,EAAE,MAAM,0DAA0D,CAAC;AAE3G,MAAM,MAAM,yBAAyB,GAAG;IACtC;;OAEG;IACH,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB;;;;OAIG;IACH,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,0BAA0B;IAC7C;;;;;;;;;;;;;;;;;OAiBG;IACH,MAAM,CAAC,MAAM,CACX,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,MAAM,EAAE,EACjB,QAAQ,EAAE,+BAA+B,EACzC,QAAQ,EAAE,MAAM,EAChB,YAAY,CAAC,EAAE,MAAM,GACpB,yBAAyB;CA8D7B"}
|
|
@@ -49,9 +49,7 @@ export default class DashboardTaskFilterService {
|
|
|
49
49
|
return false;
|
|
50
50
|
}
|
|
51
51
|
// Start date
|
|
52
|
-
if (!settings.startDate.showFutureTasks &&
|
|
53
|
-
task.startDate &&
|
|
54
|
-
task.startDate > new Date()) {
|
|
52
|
+
if (!settings.startDate.showFutureTasks && task.startDate && task.startDate > new Date()) {
|
|
55
53
|
removedIds.push(taskId);
|
|
56
54
|
return false;
|
|
57
55
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaskFilterService.js","sourceRoot":"","sources":["../../../../src/services/dashboard/Task/TaskFilterService.ts"],"names":[],"mappings":"AAgBA;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,0BAA0B;IAC7C;;;;;;;;;;;;;;;;;OAiBG;IACH,MAAM,CAAC,MAAM,CACX,OAAyB,EACzB,OAAiB,EACjB,QAAyC,EACzC,QAAgB,EAChB,YAAqB;QAErB,wEAAwE;QACxE,SAAS;QACT,MAAM,UAAU,GAAa,EAAE,CAAC;QAChC,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE;YAC1C,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;YAE7B,WAAW;YACX,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,KAAK,QAAQ;gBAAE,OAAO,KAAK,CAAC;YAEtD,cAAc;YACd,4CAA4C;YAC5C,IAAI,YAAY,EAAE,CAAC;gBACjB,IACE,CAAC,QAAQ,CAAC,kBAAkB,CAAC,IAAI;oBACjC,IAAI,CAAC,YAAY;oBACjB,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,KAAK,YAAY,EAC7C,CAAC;oBACD,OAAO,KAAK,CAAC;gBACf,CAAC;gBACD,0EAA0E;YAC5E,CAAC;iBAAM,IACL,CAAC,QAAQ,CAAC,kBAAkB,CAAC,IAAI;gBACjC,IAAI,CAAC,YAAY;gBACjB,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,EACrC,CAAC;gBACD,OAAO,KAAK,CAAC;YACf,CAAC;YAED,YAAY;YACZ,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBAC/C,OAAO,KAAK,CAAC;YACf,CAAC;YAED,aAAa;YACb,
|
|
1
|
+
{"version":3,"file":"TaskFilterService.js","sourceRoot":"","sources":["../../../../src/services/dashboard/Task/TaskFilterService.ts"],"names":[],"mappings":"AAgBA;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,0BAA0B;IAC7C;;;;;;;;;;;;;;;;;OAiBG;IACH,MAAM,CAAC,MAAM,CACX,OAAyB,EACzB,OAAiB,EACjB,QAAyC,EACzC,QAAgB,EAChB,YAAqB;QAErB,wEAAwE;QACxE,SAAS;QACT,MAAM,UAAU,GAAa,EAAE,CAAC;QAChC,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE;YAC1C,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;YAE7B,WAAW;YACX,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,KAAK,QAAQ;gBAAE,OAAO,KAAK,CAAC;YAEtD,cAAc;YACd,4CAA4C;YAC5C,IAAI,YAAY,EAAE,CAAC;gBACjB,IACE,CAAC,QAAQ,CAAC,kBAAkB,CAAC,IAAI;oBACjC,IAAI,CAAC,YAAY;oBACjB,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,KAAK,YAAY,EAC7C,CAAC;oBACD,OAAO,KAAK,CAAC;gBACf,CAAC;gBACD,0EAA0E;YAC5E,CAAC;iBAAM,IACL,CAAC,QAAQ,CAAC,kBAAkB,CAAC,IAAI;gBACjC,IAAI,CAAC,YAAY;gBACjB,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,EACrC,CAAC;gBACD,OAAO,KAAK,CAAC;YACf,CAAC;YAED,YAAY;YACZ,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBAC/C,OAAO,KAAK,CAAC;YACf,CAAC;YAED,aAAa;YACb,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,eAAe,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,EAAE,CAAC;gBACzF,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACxB,OAAO,KAAK,CAAC;YACf,CAAC;YAED,OAAO;YACP,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACxC,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC5B,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;oBACnC,IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;wBACnD,OAAO,IAAI,CAAC;oBACd,CAAC;oBACD,OAAO,KAAK,CAAC;gBACf,CAAC,CAAC,CAAC;gBACH,IAAI,UAAU,EAAE,CAAC;oBACf,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;oBACxB,OAAO,KAAK,CAAC;gBACf,CAAC;YACH,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QACH,OAAO;YACL,SAAS;YACT,UAAU;SACX,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -77,11 +77,7 @@ export default class DashboardTaskFilterService {
|
|
|
77
77
|
}
|
|
78
78
|
|
|
79
79
|
// Start date
|
|
80
|
-
if (
|
|
81
|
-
!settings.startDate.showFutureTasks &&
|
|
82
|
-
task.startDate &&
|
|
83
|
-
task.startDate > new Date()
|
|
84
|
-
) {
|
|
80
|
+
if (!settings.startDate.showFutureTasks && task.startDate && task.startDate > new Date()) {
|
|
85
81
|
removedIds.push(taskId);
|
|
86
82
|
return false;
|
|
87
83
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaskRecurrenceService.d.ts","sourceRoot":"","sources":["../../../../src/services/dashboard/Task/TaskRecurrenceService.ts"],"names":[],"mappings":"AACA,OAAO,aAAa,MAAM,sCAAsC,CAAC;AACjE,OAAO,EAEL,mBAAmB,EAEpB,MAAM,0DAA0D,CAAC;AAElE,MAAM,CAAC,OAAO,OAAO,8BAA8B;IACjD;;;;;;OAMG;IACH,MAAM,CAAC,oBAAoB,
|
|
1
|
+
{"version":3,"file":"TaskRecurrenceService.d.ts","sourceRoot":"","sources":["../../../../src/services/dashboard/Task/TaskRecurrenceService.ts"],"names":[],"mappings":"AACA,OAAO,aAAa,MAAM,sCAAsC,CAAC;AACjE,OAAO,EAEL,mBAAmB,EAEpB,MAAM,0DAA0D,CAAC;AAElE,MAAM,CAAC,OAAO,OAAO,8BAA8B;IACjD;;;;;;OAMG;IACH,MAAM,CAAC,oBAAoB,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,mBAAmB,GAAG,IAAI,GAAG,IAAI;IAkEzF;;;;;;;;;;OAUG;IACH,MAAM,CAAC,wBAAwB,CAAC,IAAI,EAAE,aAAa,GAAG,IAAI;IAwD1D;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,oBAAoB;CAUpC"}
|
|
@@ -54,9 +54,7 @@ export default class DashboardTaskRecurrenceService {
|
|
|
54
54
|
// Start by adding one day
|
|
55
55
|
let newDate = DateService.getWeekDayOfXWeekOfMonth(DateService.addDays(basisDate, 1), frequency.everyXWeekdayOfMonth.weekDay, frequency.everyXWeekdayOfMonth.weekOfMonth);
|
|
56
56
|
let monthsPassed = 0;
|
|
57
|
-
while (!newDate ||
|
|
58
|
-
newDate < basisDate ||
|
|
59
|
-
newDate.getTime() === basisDate.getTime()) {
|
|
57
|
+
while (!newDate || newDate < basisDate || newDate.getTime() === basisDate.getTime()) {
|
|
60
58
|
monthsPassed += 1;
|
|
61
59
|
newDate = DateService.getWeekDayOfXWeekOfMonth(DateService.addMonths(basisDate, monthsPassed), frequency.everyXWeekdayOfMonth.weekDay, frequency.everyXWeekdayOfMonth.weekOfMonth);
|
|
62
60
|
if (monthsPassed > 11) {
|
|
@@ -99,10 +97,8 @@ export default class DashboardTaskRecurrenceService {
|
|
|
99
97
|
// Validation for moving dates based on their own recurrence
|
|
100
98
|
}
|
|
101
99
|
else if (!task.recurrenceInfo ||
|
|
102
|
-
(task.recurrenceInfo.recurrenceBasis === RecurrenceBasis.startDate &&
|
|
103
|
-
|
|
104
|
-
(task.recurrenceInfo.recurrenceBasis === RecurrenceBasis.dueDate &&
|
|
105
|
-
!task.dueDate)) {
|
|
100
|
+
(task.recurrenceInfo.recurrenceBasis === RecurrenceBasis.startDate && !task.startDate) ||
|
|
101
|
+
(task.recurrenceInfo.recurrenceBasis === RecurrenceBasis.dueDate && !task.dueDate)) {
|
|
106
102
|
return;
|
|
107
103
|
}
|
|
108
104
|
let diff = 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaskRecurrenceService.js","sourceRoot":"","sources":["../../../../src/services/dashboard/Task/TaskRecurrenceService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EACL,eAAe,EAEf,uBAAuB,EACxB,MAAM,0DAA0D,CAAC;AAElE,MAAM,CAAC,OAAO,OAAO,8BAA8B;IACjD;;;;;;OAMG;IACH,MAAM,CAAC,oBAAoB,
|
|
1
|
+
{"version":3,"file":"TaskRecurrenceService.js","sourceRoot":"","sources":["../../../../src/services/dashboard/Task/TaskRecurrenceService.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,10 +14,7 @@ export default class DashboardTaskRecurrenceService {
|
|
|
14
14
|
* @param frequency - The recurrence frequency details.
|
|
15
15
|
* @returns The next frequency date or null if the frequency is in an invalid state.
|
|
16
16
|
*/
|
|
17
|
-
static getNextFrequencyDate(
|
|
18
|
-
basisDate: Date,
|
|
19
|
-
frequency: RecurrenceFrequency
|
|
20
|
-
): Date | null {
|
|
17
|
+
static getNextFrequencyDate(basisDate: Date, frequency: RecurrenceFrequency): Date | null {
|
|
21
18
|
// Last day of month
|
|
22
19
|
if (frequency.type === RecurrenceFrequencyType.lastDayOfMonth) {
|
|
23
20
|
return DateService.getLastDayOfGivenMonth(basisDate);
|
|
@@ -67,11 +64,7 @@ export default class DashboardTaskRecurrenceService {
|
|
|
67
64
|
frequency.everyXWeekdayOfMonth.weekOfMonth
|
|
68
65
|
);
|
|
69
66
|
let monthsPassed = 0;
|
|
70
|
-
while (
|
|
71
|
-
!newDate ||
|
|
72
|
-
newDate < basisDate ||
|
|
73
|
-
newDate.getTime() === basisDate.getTime()
|
|
74
|
-
) {
|
|
67
|
+
while (!newDate || newDate < basisDate || newDate.getTime() === basisDate.getTime()) {
|
|
75
68
|
monthsPassed += 1;
|
|
76
69
|
newDate = DateService.getWeekDayOfXWeekOfMonth(
|
|
77
70
|
DateService.addMonths(basisDate, monthsPassed),
|
|
@@ -120,10 +113,8 @@ export default class DashboardTaskRecurrenceService {
|
|
|
120
113
|
// Validation for moving dates based on their own recurrence
|
|
121
114
|
} else if (
|
|
122
115
|
!task.recurrenceInfo ||
|
|
123
|
-
(task.recurrenceInfo.recurrenceBasis === RecurrenceBasis.startDate &&
|
|
124
|
-
|
|
125
|
-
(task.recurrenceInfo.recurrenceBasis === RecurrenceBasis.dueDate &&
|
|
126
|
-
!task.dueDate)
|
|
116
|
+
(task.recurrenceInfo.recurrenceBasis === RecurrenceBasis.startDate && !task.startDate) ||
|
|
117
|
+
(task.recurrenceInfo.recurrenceBasis === RecurrenceBasis.dueDate && !task.dueDate)
|
|
127
118
|
) {
|
|
128
119
|
return;
|
|
129
120
|
}
|
|
@@ -142,18 +133,10 @@ export default class DashboardTaskRecurrenceService {
|
|
|
142
133
|
task.recurrenceInfo.frequency
|
|
143
134
|
);
|
|
144
135
|
}
|
|
145
|
-
} else if (
|
|
146
|
-
task.recurrenceInfo.
|
|
147
|
-
) {
|
|
148
|
-
diff = this.getDiffForDateUpdate(
|
|
149
|
-
task.startDate,
|
|
150
|
-
task.recurrenceInfo.frequency
|
|
151
|
-
);
|
|
136
|
+
} else if (task.recurrenceInfo.recurrenceBasis === RecurrenceBasis.startDate) {
|
|
137
|
+
diff = this.getDiffForDateUpdate(task.startDate, task.recurrenceInfo.frequency);
|
|
152
138
|
} else {
|
|
153
|
-
diff = this.getDiffForDateUpdate(
|
|
154
|
-
task.dueDate,
|
|
155
|
-
task.recurrenceInfo.frequency
|
|
156
|
-
);
|
|
139
|
+
diff = this.getDiffForDateUpdate(task.dueDate, task.recurrenceInfo.frequency);
|
|
157
140
|
}
|
|
158
141
|
|
|
159
142
|
if (task.startDate) {
|
|
@@ -171,10 +154,7 @@ export default class DashboardTaskRecurrenceService {
|
|
|
171
154
|
* @param frequency - The recurrence frequency details.
|
|
172
155
|
* @returns The difference in time in milliseconds.
|
|
173
156
|
*/
|
|
174
|
-
private static getDiffForDateUpdate(
|
|
175
|
-
basisDate: Date | undefined,
|
|
176
|
-
frequency: RecurrenceFrequency
|
|
177
|
-
) {
|
|
157
|
+
private static getDiffForDateUpdate(basisDate: Date | undefined, frequency: RecurrenceFrequency) {
|
|
178
158
|
if (!basisDate) {
|
|
179
159
|
return 0;
|
|
180
160
|
}
|
|
@@ -1 +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,
|
|
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,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACvF,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;AAK5F;;GAEG;AACH,MAAM,MAAM,2BAA2B,GAAG;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,gCAAgC,GAAG;IAC7C,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B;;;;OAIG;IACH,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,oBAAoB;IACvC;;;;;;OAMG;IACH,MAAM,CAAC,cAAc,GACnB,cAAc,aAAa,EAAE,EAC7B,eAAe,QAAQ,EAAE,KACxB,QAAQ,EAAE,CAyBX;IAEF;;;;;;;OAOG;IACH,MAAM,CAAC,oBAAoB,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,mBAAmB,GAAG,IAAI,GAAG,IAAI;IAIzF;;;;;;;;;;OAUG;IACH,MAAM,CAAC,wBAAwB,CAAC,IAAI,EAAE,aAAa,GAAG,IAAI;IAI1D;;;;;;;;;;OAUG;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;;;;;;;;;;;;OAYG;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;;;;;;;OAOG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB;CAsBlC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaskService.js","sourceRoot":"","sources":["../../../../src/services/dashboard/Task/TaskService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"TaskService.js","sourceRoot":"","sources":["../../../../src/services/dashboard/Task/TaskService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
import { ObjectId } from 'bson';
|
|
2
|
-
import DashboardTask, {
|
|
3
|
-
DashboardTaskMap
|
|
4
|
-
} from '../../../documents/dashboard/Task.js';
|
|
2
|
+
import DashboardTask, { DashboardTaskMap } from '../../../documents/dashboard/Task.js';
|
|
5
3
|
import { DashboardTaskListFilterSettings } from '../../../embedded-types/dashboard/task/FilterSettings.js';
|
|
6
4
|
import { RecurrenceFrequency } from '../../../embedded-types/dashboard/task/RecurrenceInfo.js';
|
|
7
5
|
import {
|
|
@@ -9,9 +7,7 @@ import {
|
|
|
9
7
|
DashboardTaskSortDirection
|
|
10
8
|
} from '../../../embedded-types/dashboard/task/SortSettings.js';
|
|
11
9
|
import { DashboardTagSettings } from '../../../embedded-types/dashboard/userConfig/Tags.js';
|
|
12
|
-
import DashboardTaskFilterService, {
|
|
13
|
-
DashboardTaskFilterResult
|
|
14
|
-
} from './TaskFilterService.js';
|
|
10
|
+
import DashboardTaskFilterService, { DashboardTaskFilterResult } from './TaskFilterService.js';
|
|
15
11
|
import DashboardTaskRecurrenceService from './TaskRecurrenceService.js';
|
|
16
12
|
import DashboardTaskSortService from './TaskSortService.js';
|
|
17
13
|
|
|
@@ -59,9 +55,7 @@ export default class DashboardTaskService {
|
|
|
59
55
|
if (!parentToTaskIdsDict[task.parentTaskId.toString()]) {
|
|
60
56
|
parentToTaskIdsDict[task.parentTaskId.toString()] = [];
|
|
61
57
|
}
|
|
62
|
-
parentToTaskIdsDict[task.parentTaskId.toString()].push(
|
|
63
|
-
task._id.toString()
|
|
64
|
-
);
|
|
58
|
+
parentToTaskIdsDict[task.parentTaskId.toString()].push(task._id.toString());
|
|
65
59
|
}
|
|
66
60
|
});
|
|
67
61
|
const childrenIds: ObjectId[] = [];
|
|
@@ -87,14 +81,8 @@ export default class DashboardTaskService {
|
|
|
87
81
|
* @param frequency - The recurrence frequency.
|
|
88
82
|
* @returns The next frequency date or null if the frequency is invalid.
|
|
89
83
|
*/
|
|
90
|
-
static getNextFrequencyDate(
|
|
91
|
-
basisDate
|
|
92
|
-
frequency: RecurrenceFrequency
|
|
93
|
-
): Date | null {
|
|
94
|
-
return DashboardTaskRecurrenceService.getNextFrequencyDate(
|
|
95
|
-
basisDate,
|
|
96
|
-
frequency
|
|
97
|
-
);
|
|
84
|
+
static getNextFrequencyDate(basisDate: Date, frequency: RecurrenceFrequency): Date | null {
|
|
85
|
+
return DashboardTaskRecurrenceService.getNextFrequencyDate(basisDate, frequency);
|
|
98
86
|
}
|
|
99
87
|
|
|
100
88
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaskSortService.d.ts","sourceRoot":"","sources":["../../../../src/services/dashboard/Task/TaskSortService.ts"],"names":[],"mappings":"AAAA,OAAsB,
|
|
1
|
+
{"version":3,"file":"TaskSortService.d.ts","sourceRoot":"","sources":["../../../../src/services/dashboard/Task/TaskSortService.ts"],"names":[],"mappings":"AAAA,OAAsB,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACvF,OAAO,EACL,6BAA6B,EAE7B,0BAA0B,EAC3B,MAAM,wDAAwD,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sDAAsD,CAAC;AAE5F;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,wBAAwB;IAC3C;;;;;;;;OAQG;IACH,MAAM,CAAC,IAAI,CACT,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,MAAM,EAAE,EACjB,YAAY,EAAE,6BAA6B,EAC3C,WAAW,EAAE,oBAAoB,GAChC,MAAM,EAAE;IAyBX;;;;;;;;;;;;OAYG;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;IAwBzB;;;;;;;;OAQG;IACH,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAkElC;;;;;;;;;OASG;IACH,OAAO,CAAC,MAAM,CAAC,qBAAqB;IAUpC;;;;;;;;OAQG;IACH,OAAO,CAAC,MAAM,CAAC,0BAA0B;IAUzC;;;;;;;;OAQG;IACH,OAAO,CAAC,MAAM,CAAC,qBAAqB;CAgCrC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaskSortService.js","sourceRoot":"","sources":["../../../../src/services/dashboard/Task/TaskSortService.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"TaskSortService.js","sourceRoot":"","sources":["../../../../src/services/dashboard/Task/TaskSortService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
import DashboardTask, {
|
|
2
|
-
DashboardTaskMap
|
|
3
|
-
} from '../../../documents/dashboard/Task.js';
|
|
1
|
+
import DashboardTask, { DashboardTaskMap } from '../../../documents/dashboard/Task.js';
|
|
4
2
|
import {
|
|
5
3
|
DashboardTaskListSortSettings,
|
|
6
4
|
DashboardTaskSortBy,
|
|
@@ -76,12 +74,7 @@ export default class DashboardTaskSortService {
|
|
|
76
74
|
if (taskIds.length === 0 || taskIds.length === 1) return tagHeaderMap;
|
|
77
75
|
const firstTask = taskMap[taskIds[0]];
|
|
78
76
|
if (!firstTask) return tagHeaderMap;
|
|
79
|
-
let tag = this.getHighestPriorityTag(
|
|
80
|
-
firstTask,
|
|
81
|
-
userId,
|
|
82
|
-
tagSettings,
|
|
83
|
-
sortDirection
|
|
84
|
-
);
|
|
77
|
+
let tag = this.getHighestPriorityTag(firstTask, userId, tagSettings, sortDirection);
|
|
85
78
|
if (!tag) {
|
|
86
79
|
tagHeaderMap[taskIds[0]] = noPriorityTagsIndicator;
|
|
87
80
|
} else {
|
|
@@ -90,12 +83,7 @@ export default class DashboardTaskSortService {
|
|
|
90
83
|
for (let i = 1; i < taskIds.length; i += 1) {
|
|
91
84
|
const task = taskMap[taskIds[i]];
|
|
92
85
|
if (task) {
|
|
93
|
-
const taskTag = this.getHighestPriorityTag(
|
|
94
|
-
task,
|
|
95
|
-
userId,
|
|
96
|
-
tagSettings,
|
|
97
|
-
sortDirection
|
|
98
|
-
);
|
|
86
|
+
const taskTag = this.getHighestPriorityTag(task, userId, tagSettings, sortDirection);
|
|
99
87
|
if (taskTag !== tag && tag !== noPriorityTagsIndicator) {
|
|
100
88
|
tag = taskTag || noPriorityTagsIndicator;
|
|
101
89
|
tagHeaderMap[taskIds[i]] = tag;
|
|
@@ -196,12 +184,7 @@ export default class DashboardTaskSortService {
|
|
|
196
184
|
tagSettings: DashboardTagSettings,
|
|
197
185
|
sortDirection: DashboardTaskSortDirection
|
|
198
186
|
): string | null {
|
|
199
|
-
const priorityTag = this.getPriorityTagForTask(
|
|
200
|
-
task,
|
|
201
|
-
userId,
|
|
202
|
-
tagSettings,
|
|
203
|
-
sortDirection
|
|
204
|
-
);
|
|
187
|
+
const priorityTag = this.getPriorityTagForTask(task, userId, tagSettings, sortDirection);
|
|
205
188
|
return priorityTag ? priorityTag.tag : null;
|
|
206
189
|
}
|
|
207
190
|
|
|
@@ -220,12 +203,7 @@ export default class DashboardTaskSortService {
|
|
|
220
203
|
tagSettings: DashboardTagSettings,
|
|
221
204
|
sortDirection: DashboardTaskSortDirection
|
|
222
205
|
): number {
|
|
223
|
-
const priorityTag = this.getPriorityTagForTask(
|
|
224
|
-
task,
|
|
225
|
-
userId,
|
|
226
|
-
tagSettings,
|
|
227
|
-
sortDirection
|
|
228
|
-
);
|
|
206
|
+
const priorityTag = this.getPriorityTagForTask(task, userId, tagSettings, sortDirection);
|
|
229
207
|
return priorityTag ? priorityTag.priority : 0;
|
|
230
208
|
}
|
|
231
209
|
|
package/package.json
CHANGED