@opencrvs/toolkit 1.8.1-rc.e23b224 → 1.8.1-rc.e59d03c
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/dist/commons/api/router.d.ts +433 -410
- package/dist/commons/conditionals/validate.d.ts +11 -2
- package/dist/commons/events/ActionConfig.d.ts +2004 -366
- package/dist/commons/events/ActionDocument.d.ts +795 -759
- package/dist/commons/events/ActionInput.d.ts +650 -614
- package/dist/commons/events/AdvancedSearchConfig.d.ts +83 -65
- package/dist/commons/events/CompositeFieldValue.d.ts +6 -6
- package/dist/commons/events/CountryConfigQueryInput.d.ts +88 -88
- package/dist/commons/events/Draft.d.ts +48 -48
- package/dist/commons/events/EventConfig.d.ts +695 -168
- package/dist/commons/events/EventDocument.d.ts +471 -445
- package/dist/commons/events/EventIndex.d.ts +184 -62
- package/dist/commons/events/EventMetadata.d.ts +9 -9
- package/dist/commons/events/FieldConfig.d.ts +254 -43
- package/dist/commons/events/FieldTypeMapping.d.ts +16 -16
- package/dist/commons/events/FieldValue.d.ts +12 -12
- package/dist/commons/events/FormConfig.d.ts +1032 -246
- package/dist/commons/events/PageConfig.d.ts +264 -46
- package/dist/commons/events/WorkqueueConfig.d.ts +288 -164
- package/dist/commons/events/defineConfig.d.ts +129 -30
- package/dist/commons/events/event.d.ts +68 -6
- package/dist/commons/events/field.d.ts +14 -0
- package/dist/commons/events/test.utils.d.ts +17 -13
- package/dist/commons/events/utils.d.ts +236 -60
- package/dist/conditionals/index.js +3 -2
- package/dist/events/index.js +260 -99
- package/package.json +1 -1
- package/tsconfig.json +1 -1
- package/dist/commons/conditionals/conditionals.test.d.ts +0 -2
- package/dist/commons/conditionals/validate-address.test.d.ts +0 -2
- package/dist/commons/conditionals/validate.test.d.ts +0 -2
- package/dist/commons/events/utils.test.d.ts +0 -2
package/dist/events/index.js
CHANGED
@@ -40,6 +40,7 @@ __export(events_exports, {
|
|
40
40
|
ActionConfigBase: () => ActionConfigBase,
|
41
41
|
ActionCreationMetadata: () => ActionCreationMetadata,
|
42
42
|
ActionDocument: () => ActionDocument,
|
43
|
+
ActionFlag: () => ActionFlag,
|
43
44
|
ActionFormConfig: () => ActionFormConfig,
|
44
45
|
ActionInput: () => ActionInput,
|
45
46
|
ActionStatus: () => ActionStatus,
|
@@ -95,6 +96,7 @@ __export(events_exports, {
|
|
95
96
|
EventDocument: () => EventDocument,
|
96
97
|
EventFieldConfigSchema: () => EventFieldConfigSchema,
|
97
98
|
EventFieldId: () => EventFieldId,
|
99
|
+
EventFieldIdInput: () => EventFieldIdInput,
|
98
100
|
EventIndex: () => EventIndex,
|
99
101
|
EventInput: () => EventInput,
|
100
102
|
EventMetadata: () => EventMetadata,
|
@@ -129,8 +131,10 @@ __export(events_exports, {
|
|
129
131
|
InherentFlags: () => InherentFlags,
|
130
132
|
LanguageConfig: () => LanguageConfig,
|
131
133
|
LegalStatuses: () => LegalStatuses,
|
134
|
+
METADATA_FIELD_PREFIX: () => METADATA_FIELD_PREFIX,
|
132
135
|
MarkedAsDuplicateActionInput: () => MarkedAsDuplicateActionInput,
|
133
136
|
MimeType: () => MimeType,
|
137
|
+
NameConfig: () => NameConfig,
|
134
138
|
NameFieldUpdateValue: () => NameFieldUpdateValue,
|
135
139
|
NameFieldValue: () => NameFieldValue,
|
136
140
|
NonEmptyTextValue: () => NonEmptyTextValue,
|
@@ -139,7 +143,7 @@ __export(events_exports, {
|
|
139
143
|
PageConfig: () => PageConfig,
|
140
144
|
PageTypes: () => PageTypes,
|
141
145
|
PrintCertificateActionInput: () => PrintCertificateActionInput,
|
142
|
-
|
146
|
+
PrintContent: () => PrintContent,
|
143
147
|
QueryExpression: () => QueryExpression,
|
144
148
|
QueryInput: () => QueryInput,
|
145
149
|
QueryType: () => QueryType,
|
@@ -168,6 +172,7 @@ __export(events_exports, {
|
|
168
172
|
TENNIS_CLUB_MEMBERSHIP: () => TENNIS_CLUB_MEMBERSHIP,
|
169
173
|
TEST_SYSTEM_IANA_TIMEZONE: () => TEST_SYSTEM_IANA_TIMEZONE,
|
170
174
|
TestUserRole: () => TestUserRole,
|
175
|
+
TextField: () => TextField,
|
171
176
|
TextValue: () => TextValue,
|
172
177
|
TimeValue: () => TimeValue,
|
173
178
|
TranslationConfig: () => TranslationConfig,
|
@@ -179,7 +184,6 @@ __export(events_exports, {
|
|
179
184
|
ValidationConfig: () => ValidationConfig,
|
180
185
|
VerificationActionConfig: () => VerificationActionConfig,
|
181
186
|
VerificationPageConfig: () => VerificationPageConfig,
|
182
|
-
VisibleStatus: () => VisibleStatus,
|
183
187
|
WRITE_ACTION_SCOPES: () => WRITE_ACTION_SCOPES,
|
184
188
|
Within: () => Within,
|
185
189
|
WorkqueueActionsWithDefault: () => WorkqueueActionsWithDefault,
|
@@ -198,6 +202,7 @@ __export(events_exports, {
|
|
198
202
|
annotationActions: () => annotationActions,
|
199
203
|
applyDeclarationToEventIndex: () => applyDeclarationToEventIndex,
|
200
204
|
applyDraftsToEventIndex: () => applyDraftsToEventIndex,
|
205
|
+
areCertificateConditionsMet: () => areCertificateConditionsMet,
|
201
206
|
areConditionsMet: () => areConditionsMet,
|
202
207
|
compositeFieldTypes: () => compositeFieldTypes,
|
203
208
|
createEmptyDraft: () => createEmptyDraft,
|
@@ -321,6 +326,7 @@ __export(events_exports, {
|
|
321
326
|
or: () => or,
|
322
327
|
resolveDateOfEvent: () => resolveDateOfEvent,
|
323
328
|
runFieldValidations: () => runFieldValidations,
|
329
|
+
runStructuralValidations: () => runStructuralValidations,
|
324
330
|
timePeriodToDateRange: () => timePeriodToDateRange,
|
325
331
|
user: () => user,
|
326
332
|
validate: () => validate,
|
@@ -555,7 +561,7 @@ var import_zod6 = require("zod");
|
|
555
561
|
var import_zod4 = require("zod");
|
556
562
|
var import_zod_openapi3 = require("zod-openapi");
|
557
563
|
(0, import_zod_openapi3.extendZodWithOpenApi)(import_zod4.z);
|
558
|
-
var
|
564
|
+
var FullDocumentUrl = import_zod4.z.string().brand("FullDocumentUrl").describe(
|
559
565
|
"A full url with protocol, host, bucket name, starting from the root of the S3 server, https://minio/bucket-name/document-id.jpg"
|
560
566
|
);
|
561
567
|
var FullDocumentPath = import_zod4.z.string().transform((val) => val.startsWith("/") ? val : `/${val}`).openapi({ effectType: "input", type: "string" }).describe(
|
@@ -612,8 +618,8 @@ var NameFieldValue = import_zod5.z.object({
|
|
612
618
|
middlename: import_zod5.z.string().optional()
|
613
619
|
});
|
614
620
|
var NameFieldUpdateValue = import_zod5.z.object({
|
615
|
-
firstname: import_zod5.z.string()
|
616
|
-
surname: import_zod5.z.string()
|
621
|
+
firstname: import_zod5.z.string(),
|
622
|
+
surname: import_zod5.z.string(),
|
617
623
|
middlename: import_zod5.z.string().nullish()
|
618
624
|
}).or(import_zod5.z.null()).or(import_zod5.z.undefined());
|
619
625
|
var RuralAddressUpdateValue = AdminStructure.extend({
|
@@ -910,18 +916,32 @@ var SelectDateRangeField = BaseField.extend({
|
|
910
916
|
defaultValue: SelectDateRangeValue.optional(),
|
911
917
|
options: import_zod7.z.array(SelectDateRangeOption).describe("A list of options")
|
912
918
|
}).describe("Select input with date range options");
|
919
|
+
var NameConfig = import_zod7.z.object({
|
920
|
+
firstname: import_zod7.z.object({ required: import_zod7.z.boolean() }).optional(),
|
921
|
+
middlename: import_zod7.z.object({ required: import_zod7.z.boolean() }).optional(),
|
922
|
+
surname: import_zod7.z.object({ required: import_zod7.z.boolean() }).optional()
|
923
|
+
});
|
913
924
|
var NameField = BaseField.extend({
|
914
925
|
type: import_zod7.z.literal(FieldType.NAME),
|
915
926
|
defaultValue: import_zod7.z.object({
|
916
|
-
firstname: NonEmptyTextValue,
|
917
|
-
|
927
|
+
firstname: NonEmptyTextValue.optional(),
|
928
|
+
middlename: NonEmptyTextValue.optional(),
|
929
|
+
surname: NonEmptyTextValue.optional()
|
918
930
|
}).optional(),
|
919
931
|
configuration: import_zod7.z.object({
|
932
|
+
name: NameConfig.default({
|
933
|
+
firstname: { required: true },
|
934
|
+
surname: { required: true }
|
935
|
+
}).optional(),
|
920
936
|
maxLength: import_zod7.z.number().optional().describe("Maximum length of the text"),
|
921
937
|
prefix: TranslationConfig.optional(),
|
922
938
|
postfix: TranslationConfig.optional(),
|
923
|
-
includeMiddlename: import_zod7.z.boolean().default(false).optional().describe("To make middle name visible in Name form field"),
|
924
939
|
searchMode: import_zod7.z.boolean().optional()
|
940
|
+
}).default({
|
941
|
+
name: {
|
942
|
+
firstname: { required: true },
|
943
|
+
surname: { required: true }
|
944
|
+
}
|
925
945
|
}).optional()
|
926
946
|
}).describe("Name input field");
|
927
947
|
var PhoneField = BaseField.extend({
|
@@ -1223,7 +1243,8 @@ var CertificateConfig = import_zod11.z.object({
|
|
1223
1243
|
delayed: import_zod11.z.number()
|
1224
1244
|
}),
|
1225
1245
|
svgUrl: import_zod11.z.string(),
|
1226
|
-
fonts: import_zod11.z.record(FontFamily).optional()
|
1246
|
+
fonts: import_zod11.z.record(FontFamily).optional(),
|
1247
|
+
conditionals: import_zod11.z.array(ShowConditional).optional()
|
1227
1248
|
});
|
1228
1249
|
var CertificateTemplateConfig = CertificateConfig.extend({
|
1229
1250
|
hash: import_zod11.z.string().optional(),
|
@@ -1341,7 +1362,7 @@ var SummaryConfig = import_zod14.z.object({
|
|
1341
1362
|
|
1342
1363
|
// ../commons/src/events/AdvancedSearchConfig.ts
|
1343
1364
|
var import_zod15 = require("zod");
|
1344
|
-
var MatchType = import_zod15.z.enum(["fuzzy", "exact", "range"]);
|
1365
|
+
var MatchType = import_zod15.z.enum(["fuzzy", "exact", "range", "within"]);
|
1345
1366
|
var BaseField3 = import_zod15.z.object({
|
1346
1367
|
config: import_zod15.z.object({
|
1347
1368
|
type: MatchType.describe("Determines the type of field")
|
@@ -1395,22 +1416,30 @@ var FieldConfigSchema = BaseField3.extend({
|
|
1395
1416
|
fieldType: import_zod15.z.literal("field"),
|
1396
1417
|
alternateFieldIds: import_zod15.z.array(import_zod15.z.string()).optional().describe(
|
1397
1418
|
`Sometimes there might be need to search a value against multiple field of same FormField type. For example
|
1398
|
-
search Country, Province, District against child.address.private and child.address.other. In such case, we
|
1419
|
+
search Country, Province, District against child.address.private and child.address.other. In such case, we
|
1399
1420
|
add a one field as fieldId, and accomodate others in alternateFieldIds`
|
1400
1421
|
),
|
1401
|
-
excludeInSearchQuery: import_zod15.z.boolean().default(false).optional().describe(`Sometimes there will be search fields which are used to
|
1402
|
-
conditionally display another search field, but its not needed in search query. For example, child.placeOfBirth
|
1422
|
+
excludeInSearchQuery: import_zod15.z.boolean().default(false).optional().describe(`Sometimes there will be search fields which are used to
|
1423
|
+
conditionally display another search field, but its not needed in search query. For example, child.placeOfBirth
|
1403
1424
|
is select field, which has 3 options, FACILITY, PRIVATE_HOME, OTHER. Upon selecting any of the option, pops up another field
|
1404
1425
|
related to the selected option, whose value is required in the search query. But child.placeOfBirth itself is not needed in the query.
|
1405
1426
|
In such case, populate this field (excludeInSearchQuery) with boolean true`)
|
1406
1427
|
});
|
1407
|
-
var
|
1428
|
+
var EventFieldIdInput = import_zod15.z.enum([
|
1408
1429
|
"trackingId",
|
1409
1430
|
"status",
|
1410
1431
|
"legalStatuses.REGISTERED.acceptedAt",
|
1411
1432
|
"legalStatuses.REGISTERED.createdAtLocation",
|
1412
1433
|
"updatedAt"
|
1413
1434
|
]);
|
1435
|
+
var METADATA_FIELD_PREFIX = "event.";
|
1436
|
+
var EventFieldId = import_zod15.z.enum([
|
1437
|
+
`${METADATA_FIELD_PREFIX}trackingId`,
|
1438
|
+
`${METADATA_FIELD_PREFIX}status`,
|
1439
|
+
`${METADATA_FIELD_PREFIX}legalStatuses.REGISTERED.acceptedAt`,
|
1440
|
+
`${METADATA_FIELD_PREFIX}legalStatuses.REGISTERED.createdAtLocation`,
|
1441
|
+
`${METADATA_FIELD_PREFIX}updatedAt`
|
1442
|
+
]);
|
1414
1443
|
var EventFieldConfigSchema = BaseField3.extend({
|
1415
1444
|
fieldId: EventFieldId,
|
1416
1445
|
fieldType: import_zod15.z.literal("event")
|
@@ -1903,14 +1932,15 @@ var ActionBase = import_zod19.z.object({
|
|
1903
1932
|
originalActionId: UUID.optional().nullable().describe(
|
1904
1933
|
"Reference to the original action that was asynchronously rejected or accepted by 3rd party integration."
|
1905
1934
|
)
|
1906
|
-
// '
|
1907
|
-
// Each action can define its own
|
1935
|
+
// 'content' field reserved for additional data
|
1936
|
+
// Each action can define its own content specifc to the action
|
1908
1937
|
// See PrintCertificateAction
|
1909
1938
|
});
|
1910
1939
|
var AssignedAction = ActionBase.merge(
|
1911
1940
|
import_zod19.z.object({
|
1912
1941
|
type: import_zod19.z.literal(ActionType.ASSIGN),
|
1913
1942
|
assignedTo: import_zod19.z.string()
|
1943
|
+
// TODO move into 'content' property
|
1914
1944
|
})
|
1915
1945
|
);
|
1916
1946
|
var UnassignedAction = ActionBase.merge(
|
@@ -1922,6 +1952,7 @@ var RegisterAction = ActionBase.merge(
|
|
1922
1952
|
import_zod19.z.object({
|
1923
1953
|
type: import_zod19.z.literal(ActionType.REGISTER),
|
1924
1954
|
registrationNumber: import_zod19.z.string().optional()
|
1955
|
+
// TODO move into 'content' property
|
1925
1956
|
})
|
1926
1957
|
);
|
1927
1958
|
var DeclareAction = ActionBase.merge(
|
@@ -1942,6 +1973,7 @@ var RejectAction = ActionBase.merge(
|
|
1942
1973
|
import_zod19.z.object({
|
1943
1974
|
type: import_zod19.z.literal(ActionType.REJECT),
|
1944
1975
|
reason: RejectionReason
|
1976
|
+
// TODO move into 'content' property
|
1945
1977
|
})
|
1946
1978
|
);
|
1947
1979
|
var MarkAsDuplicateAction = ActionBase.merge(
|
@@ -1953,6 +1985,7 @@ var ArchiveAction = ActionBase.merge(
|
|
1953
1985
|
import_zod19.z.object({
|
1954
1986
|
type: import_zod19.z.literal(ActionType.ARCHIVE),
|
1955
1987
|
reason: RejectionReason
|
1988
|
+
// TODO move into 'content' property
|
1956
1989
|
})
|
1957
1990
|
);
|
1958
1991
|
var CreatedAction = ActionBase.merge(
|
@@ -1965,13 +1998,13 @@ var NotifiedAction = ActionBase.merge(
|
|
1965
1998
|
type: import_zod19.z.literal(ActionType.NOTIFY)
|
1966
1999
|
})
|
1967
2000
|
);
|
1968
|
-
var
|
2001
|
+
var PrintContent = import_zod19.z.object({
|
1969
2002
|
templateId: import_zod19.z.string().optional()
|
1970
2003
|
});
|
1971
2004
|
var PrintCertificateAction = ActionBase.merge(
|
1972
2005
|
import_zod19.z.object({
|
1973
2006
|
type: import_zod19.z.literal(ActionType.PRINT_CERTIFICATE),
|
1974
|
-
|
2007
|
+
content: PrintContent.optional().nullable()
|
1975
2008
|
})
|
1976
2009
|
);
|
1977
2010
|
var RequestedCorrectionAction = ActionBase.merge(
|
@@ -1983,12 +2016,15 @@ var ApprovedCorrectionAction = ActionBase.merge(
|
|
1983
2016
|
import_zod19.z.object({
|
1984
2017
|
type: import_zod19.z.literal(ActionType.APPROVE_CORRECTION),
|
1985
2018
|
requestId: import_zod19.z.string()
|
2019
|
+
// TODO move into 'content' property
|
1986
2020
|
})
|
1987
2021
|
);
|
1988
2022
|
var RejectedCorrectionAction = ActionBase.merge(
|
1989
2023
|
import_zod19.z.object({
|
1990
2024
|
type: import_zod19.z.literal(ActionType.REJECT_CORRECTION),
|
1991
|
-
requestId: import_zod19.z.string()
|
2025
|
+
requestId: import_zod19.z.string(),
|
2026
|
+
// TODO move into 'content' property
|
2027
|
+
reason: RejectionReason
|
1992
2028
|
})
|
1993
2029
|
);
|
1994
2030
|
var ReadAction = ActionBase.merge(
|
@@ -2038,7 +2074,7 @@ var ResolvedUser = import_zod19.z.object({
|
|
2038
2074
|
});
|
2039
2075
|
|
2040
2076
|
// ../commons/src/conditionals/validate.ts
|
2041
|
-
var
|
2077
|
+
var import__ = __toESM(require("ajv/dist/2019"));
|
2042
2078
|
var import_ajv_formats = __toESM(require("ajv-formats"));
|
2043
2079
|
var import_date_fns = require("date-fns");
|
2044
2080
|
|
@@ -2252,9 +2288,11 @@ var isNonInteractiveFieldType = (field2) => {
|
|
2252
2288
|
};
|
2253
2289
|
|
2254
2290
|
// ../commons/src/conditionals/validate.ts
|
2255
|
-
var ajv = new
|
2291
|
+
var ajv = new import__.default({
|
2256
2292
|
$data: true,
|
2257
|
-
allowUnionTypes: true
|
2293
|
+
allowUnionTypes: true,
|
2294
|
+
strict: false
|
2295
|
+
// Allow minContains and other newer features
|
2258
2296
|
});
|
2259
2297
|
(0, import_ajv_formats.default)(ajv);
|
2260
2298
|
ajv.addKeyword({
|
@@ -2427,6 +2465,23 @@ function validateFieldInput({
|
|
2427
2465
|
const rawError = zodType.safeParse(value, { errorMap: zodToIntlErrorMap });
|
2428
2466
|
return rawError.error?.issues.map((issue) => issue.message) ?? [];
|
2429
2467
|
}
|
2468
|
+
function runStructuralValidations({
|
2469
|
+
field: field2,
|
2470
|
+
values
|
2471
|
+
}) {
|
2472
|
+
if (!isFieldVisible(field2, values) || isFieldEmptyAndNotRequired(field2, values)) {
|
2473
|
+
return {
|
2474
|
+
errors: []
|
2475
|
+
};
|
2476
|
+
}
|
2477
|
+
const fieldValidationResult = validateFieldInput({
|
2478
|
+
field: field2,
|
2479
|
+
value: values[field2.id]
|
2480
|
+
});
|
2481
|
+
return {
|
2482
|
+
errors: fieldValidationResult
|
2483
|
+
};
|
2484
|
+
}
|
2430
2485
|
function runFieldValidations({
|
2431
2486
|
field: field2,
|
2432
2487
|
values
|
@@ -2492,6 +2547,11 @@ function getValidatorsForField(fieldId, validations) {
|
|
2492
2547
|
};
|
2493
2548
|
}).filter((x) => x !== null);
|
2494
2549
|
}
|
2550
|
+
function areCertificateConditionsMet(conditions, values) {
|
2551
|
+
return conditions.every((condition) => {
|
2552
|
+
return ajv.validate(condition.conditional, values);
|
2553
|
+
});
|
2554
|
+
}
|
2495
2555
|
|
2496
2556
|
// ../commons/src/utils.ts
|
2497
2557
|
function getOrThrow(x, message) {
|
@@ -2712,16 +2772,16 @@ function timePeriodToDateRange(value) {
|
|
2712
2772
|
let startDate;
|
2713
2773
|
switch (value) {
|
2714
2774
|
case "last7Days":
|
2715
|
-
startDate = (0, import_date_fns2.subDays)(/* @__PURE__ */ new Date(),
|
2775
|
+
startDate = (0, import_date_fns2.subDays)(/* @__PURE__ */ new Date(), 7);
|
2716
2776
|
break;
|
2717
2777
|
case "last30Days":
|
2718
|
-
startDate = (0, import_date_fns2.subDays)(/* @__PURE__ */ new Date(),
|
2778
|
+
startDate = (0, import_date_fns2.subDays)(/* @__PURE__ */ new Date(), 30);
|
2719
2779
|
break;
|
2720
2780
|
case "last90Days":
|
2721
|
-
startDate = (0, import_date_fns2.subDays)(/* @__PURE__ */ new Date(),
|
2781
|
+
startDate = (0, import_date_fns2.subDays)(/* @__PURE__ */ new Date(), 90);
|
2722
2782
|
break;
|
2723
2783
|
case "last365Days":
|
2724
|
-
startDate = (0, import_date_fns2.subDays)(/* @__PURE__ */ new Date(),
|
2784
|
+
startDate = (0, import_date_fns2.subDays)(/* @__PURE__ */ new Date(), 365);
|
2725
2785
|
break;
|
2726
2786
|
}
|
2727
2787
|
return {
|
@@ -3088,8 +3148,9 @@ function createFieldConditionals(fieldId) {
|
|
3088
3148
|
properties: {
|
3089
3149
|
[fieldId]: {
|
3090
3150
|
type: "string",
|
3091
|
-
|
3092
|
-
|
3151
|
+
minLength: 1,
|
3152
|
+
pattern: "^[\\p{Script=Latin}0-9'.-]*(\\([\\p{Script=Latin}0-9'.-]+\\))?[\\p{Script=Latin}0-9'.-]*( [\\p{Script=Latin}0-9'.-]*(\\([\\p{Script=Latin}0-9'.-]+\\))?[\\p{Script=Latin}0-9'.-]*)*$",
|
3153
|
+
description: "Name must contain only letters, numbers, and allowed special characters ('.-). No double spaces."
|
3093
3154
|
}
|
3094
3155
|
}
|
3095
3156
|
}),
|
@@ -3182,6 +3243,19 @@ function createSearchConfig(baseField) {
|
|
3182
3243
|
fuzzy: () => ({
|
3183
3244
|
...baseField,
|
3184
3245
|
config: { type: "fuzzy" }
|
3246
|
+
}),
|
3247
|
+
/**
|
3248
|
+
* Creates a configuration for matching locations and the child locations
|
3249
|
+
* @returns An object containing the field ID and a configuration object with a type of 'within'.
|
3250
|
+
* @example field('createdAtLocation').within()
|
3251
|
+
* // {
|
3252
|
+
* // ...
|
3253
|
+
* // config: { type: 'within' }
|
3254
|
+
* // }
|
3255
|
+
*/
|
3256
|
+
within: () => ({
|
3257
|
+
...baseField,
|
3258
|
+
config: { type: "within" }
|
3185
3259
|
})
|
3186
3260
|
};
|
3187
3261
|
}
|
@@ -3189,7 +3263,7 @@ function createSearchConfig(baseField) {
|
|
3189
3263
|
// ../commons/src/event-config/event-configuration.ts
|
3190
3264
|
function createEventFieldConfig(fieldId) {
|
3191
3265
|
const baseField = {
|
3192
|
-
fieldId
|
3266
|
+
fieldId: `${METADATA_FIELD_PREFIX}${fieldId}`,
|
3193
3267
|
fieldType: "event"
|
3194
3268
|
};
|
3195
3269
|
return createSearchConfig(baseField);
|
@@ -3202,32 +3276,107 @@ function eventFn(fieldId) {
|
|
3202
3276
|
var event = Object.assign(eventFn, {
|
3203
3277
|
/**
|
3204
3278
|
* Checks if the event contains a specific action type.
|
3279
|
+
* Can be used directly as a conditional or chained with additional methods.
|
3205
3280
|
* @param action - The action type to check for.
|
3206
3281
|
*/
|
3207
|
-
hasAction: (action) =>
|
3208
|
-
|
3209
|
-
|
3210
|
-
|
3282
|
+
hasAction: (action) => {
|
3283
|
+
const basicConditional = defineConditional({
|
3284
|
+
type: "object",
|
3285
|
+
properties: {
|
3286
|
+
$event: {
|
3287
|
+
type: "object",
|
3288
|
+
properties: {
|
3289
|
+
actions: {
|
3290
|
+
type: "array",
|
3291
|
+
contains: {
|
3292
|
+
type: "object",
|
3293
|
+
properties: {
|
3294
|
+
type: {
|
3295
|
+
const: action
|
3296
|
+
}
|
3297
|
+
},
|
3298
|
+
required: ["type"]
|
3299
|
+
}
|
3300
|
+
}
|
3301
|
+
},
|
3302
|
+
required: ["actions"]
|
3303
|
+
}
|
3304
|
+
},
|
3305
|
+
required: ["$event"]
|
3306
|
+
});
|
3307
|
+
const buildActionConstraints = (additionalFields) => {
|
3308
|
+
const actionProperties = {
|
3309
|
+
type: { const: action }
|
3310
|
+
};
|
3311
|
+
const requiredFields = ["type"];
|
3312
|
+
if (additionalFields) {
|
3313
|
+
Object.entries(additionalFields).forEach(([key, value]) => {
|
3314
|
+
actionProperties[key] = { const: value };
|
3315
|
+
requiredFields.push(key);
|
3316
|
+
});
|
3317
|
+
}
|
3318
|
+
return { actionProperties, requiredFields };
|
3319
|
+
};
|
3320
|
+
const createCountConditional = (countType, count, additionalFields) => {
|
3321
|
+
const { actionProperties, requiredFields } = buildActionConstraints(additionalFields);
|
3322
|
+
return defineConditional({
|
3211
3323
|
type: "object",
|
3212
3324
|
properties: {
|
3213
|
-
|
3214
|
-
type: "
|
3215
|
-
|
3216
|
-
|
3217
|
-
|
3218
|
-
|
3219
|
-
|
3220
|
-
|
3221
|
-
|
3222
|
-
|
3223
|
-
|
3325
|
+
$event: {
|
3326
|
+
type: "object",
|
3327
|
+
properties: {
|
3328
|
+
actions: {
|
3329
|
+
type: "array",
|
3330
|
+
contains: {
|
3331
|
+
type: "object",
|
3332
|
+
properties: actionProperties,
|
3333
|
+
required: requiredFields
|
3334
|
+
},
|
3335
|
+
[countType]: count
|
3336
|
+
}
|
3337
|
+
},
|
3338
|
+
required: ["actions"]
|
3224
3339
|
}
|
3225
3340
|
},
|
3226
|
-
required: ["
|
3227
|
-
}
|
3228
|
-
}
|
3229
|
-
|
3230
|
-
|
3341
|
+
required: ["$event"]
|
3342
|
+
});
|
3343
|
+
};
|
3344
|
+
const withMinMax = (additionalFields) => {
|
3345
|
+
return {
|
3346
|
+
/**
|
3347
|
+
* Creates a conditional that checks if the event contains a specific action type
|
3348
|
+
* with a minimum count of occurrences.
|
3349
|
+
*
|
3350
|
+
* @param minCount - The minimum number of actions required.
|
3351
|
+
*/
|
3352
|
+
minCount: (minCount) => createCountConditional("minContains", minCount, additionalFields),
|
3353
|
+
/**
|
3354
|
+
* Builds a conditional that sets a maximum count for the number of actions.
|
3355
|
+
* This is useful for limiting the number of actions of a specific type in a single event.
|
3356
|
+
*/
|
3357
|
+
maxCount: (maxCount) => createCountConditional("maxContains", maxCount, additionalFields)
|
3358
|
+
};
|
3359
|
+
};
|
3360
|
+
const chainableMethods = {
|
3361
|
+
/**
|
3362
|
+
* Adds additional field constraints to the action matching.
|
3363
|
+
*
|
3364
|
+
* @param fields - Object containing additional fields to match on the action.
|
3365
|
+
*/
|
3366
|
+
withFields: (fields) => withMinMax(fields),
|
3367
|
+
/**
|
3368
|
+
* Adds template ID constraint to the action matching.
|
3369
|
+
* This is a convenience method that adds content.templateId to the fields.
|
3370
|
+
*
|
3371
|
+
* @param id - The template ID to match against.
|
3372
|
+
*/
|
3373
|
+
withTemplate: (id) => withMinMax({
|
3374
|
+
content: { templateId: id }
|
3375
|
+
}),
|
3376
|
+
...withMinMax()
|
3377
|
+
};
|
3378
|
+
return { ...basicConditional, ...chainableMethods };
|
3379
|
+
},
|
3231
3380
|
field(field2) {
|
3232
3381
|
return {
|
3233
3382
|
$event: field2
|
@@ -3246,24 +3395,23 @@ var EventStatus = import_zod23.z.enum([
|
|
3246
3395
|
"DECLARED",
|
3247
3396
|
"VALIDATED",
|
3248
3397
|
"REGISTERED",
|
3249
|
-
"CERTIFIED",
|
3250
3398
|
"ARCHIVED"
|
3251
3399
|
]);
|
3252
|
-
var VisibleStatus = import_zod23.z.enum([...EventStatus.options, "REJECTED"]);
|
3253
3400
|
var InherentFlags = {
|
3254
|
-
|
3401
|
+
PENDING_CERTIFICATION: "pending-certification",
|
3255
3402
|
INCOMPLETE: "incomplete",
|
3256
3403
|
REJECTED: "rejected",
|
3257
3404
|
CORRECTION_REQUESTED: "correction-requested"
|
3258
3405
|
};
|
3259
|
-
var
|
3406
|
+
var ActionFlag = import_zod23.z.string().regex(
|
3260
3407
|
new RegExp(
|
3261
3408
|
`^(${Object.values(ActionType).join("|").toLowerCase()}):(${Object.values(
|
3262
3409
|
ActionStatus
|
3263
3410
|
).join("|").toLowerCase()})$`
|
3264
3411
|
),
|
3265
3412
|
"Flag must be in the format ActionType:ActionStatus (lowerCase)"
|
3266
|
-
)
|
3413
|
+
);
|
3414
|
+
var Flag = ActionFlag.or(import_zod23.z.nativeEnum(InherentFlags));
|
3267
3415
|
var ZodDate = import_zod23.z.string().date();
|
3268
3416
|
var ActionCreationMetadata = import_zod23.z.object({
|
3269
3417
|
createdAt: import_zod23.z.string().datetime().describe("The timestamp when the action request was created."),
|
@@ -3531,6 +3679,9 @@ var QueryExpression = import_zod25.z.object({
|
|
3531
3679
|
createdAt: import_zod25.z.optional(DateCondition),
|
3532
3680
|
updatedAt: import_zod25.z.optional(DateCondition),
|
3533
3681
|
"legalStatuses.REGISTERED.acceptedAt": import_zod25.z.optional(DateCondition),
|
3682
|
+
"legalStatuses.DECLARED.createdAtLocation": import_zod25.z.optional(
|
3683
|
+
import_zod25.z.union([Within, Exact])
|
3684
|
+
),
|
3534
3685
|
"legalStatuses.REGISTERED.createdAtLocation": import_zod25.z.optional(
|
3535
3686
|
import_zod25.z.union([Within, Exact])
|
3536
3687
|
),
|
@@ -3776,7 +3927,8 @@ var WorkqueueConfig = import_zod28.z.object({
|
|
3776
3927
|
})
|
3777
3928
|
),
|
3778
3929
|
columns: import_zod28.z.array(WorkqueueColumn).default(mandatoryColumns),
|
3779
|
-
icon: AvailableIcons
|
3930
|
+
icon: AvailableIcons,
|
3931
|
+
emptyMessage: TranslationConfig.optional()
|
3780
3932
|
}).describe("Configuration for workqueue.");
|
3781
3933
|
var WorkqueueConfigWithoutQuery = WorkqueueConfig.omit({
|
3782
3934
|
query: true,
|
@@ -3795,7 +3947,8 @@ var WorkqueueConfigInput = import_zod28.z.object({
|
|
3795
3947
|
})
|
3796
3948
|
),
|
3797
3949
|
columns: import_zod28.z.array(WorkqueueColumn).default(mandatoryColumns),
|
3798
|
-
icon: AvailableIcons
|
3950
|
+
icon: AvailableIcons,
|
3951
|
+
emptyMessage: TranslationConfig.optional()
|
3799
3952
|
});
|
3800
3953
|
function defineWorkqueue(workqueueInput) {
|
3801
3954
|
const queryInput = workqueueInput.query;
|
@@ -3885,7 +4038,7 @@ var DeclareActionInput = BaseActionInput.merge(
|
|
3885
4038
|
var PrintCertificateActionInput = BaseActionInput.merge(
|
3886
4039
|
import_zod29.z.object({
|
3887
4040
|
type: import_zod29.z.literal(ActionType.PRINT_CERTIFICATE).default(ActionType.PRINT_CERTIFICATE),
|
3888
|
-
|
4041
|
+
content: PrintContent.optional()
|
3889
4042
|
})
|
3890
4043
|
);
|
3891
4044
|
var RejectDeclarationActionInput = BaseActionInput.merge(
|
@@ -3925,7 +4078,8 @@ var RequestCorrectionActionInput = BaseActionInput.merge(
|
|
3925
4078
|
var RejectCorrectionActionInput = BaseActionInput.merge(
|
3926
4079
|
import_zod29.z.object({
|
3927
4080
|
requestId: import_zod29.z.string(),
|
3928
|
-
type: import_zod29.z.literal(ActionType.REJECT_CORRECTION).default(ActionType.REJECT_CORRECTION)
|
4081
|
+
type: import_zod29.z.literal(ActionType.REJECT_CORRECTION).default(ActionType.REJECT_CORRECTION),
|
4082
|
+
reason: RejectionReason
|
3929
4083
|
})
|
3930
4084
|
);
|
3931
4085
|
var ApproveCorrectionActionInput = BaseActionInput.merge(
|
@@ -4096,16 +4250,19 @@ function getLegalStatuses(actions) {
|
|
4096
4250
|
}
|
4097
4251
|
|
4098
4252
|
// ../commons/src/events/state/flags.ts
|
4099
|
-
function
|
4253
|
+
function isPendingCertification(actions) {
|
4254
|
+
if (getStatusFromActions(actions) !== EventStatus.enum.REGISTERED) {
|
4255
|
+
return false;
|
4256
|
+
}
|
4100
4257
|
return actions.reduce((prev, { type }) => {
|
4101
4258
|
if (type === ActionType.PRINT_CERTIFICATE) {
|
4102
|
-
return
|
4259
|
+
return false;
|
4103
4260
|
}
|
4104
4261
|
if (type === ActionType.APPROVE_CORRECTION) {
|
4105
|
-
return
|
4262
|
+
return true;
|
4106
4263
|
}
|
4107
4264
|
return prev;
|
4108
|
-
},
|
4265
|
+
}, true);
|
4109
4266
|
}
|
4110
4267
|
function isCorrectionRequested(actions) {
|
4111
4268
|
return actions.reduce((prev, { type }) => {
|
@@ -4140,8 +4297,8 @@ function getFlagsFromActions(actions) {
|
|
4140
4297
|
const flag = joinValues([type, status], ":").toLowerCase();
|
4141
4298
|
return flag;
|
4142
4299
|
});
|
4143
|
-
if (
|
4144
|
-
flags.push(InherentFlags.
|
4300
|
+
if (isPendingCertification(sortedActions)) {
|
4301
|
+
flags.push(InherentFlags.PENDING_CERTIFICATION);
|
4145
4302
|
}
|
4146
4303
|
if (isCorrectionRequested(sortedActions)) {
|
4147
4304
|
flags.push(InherentFlags.CORRECTION_REQUESTED);
|
@@ -4172,7 +4329,6 @@ function getStatusFromActions(actions) {
|
|
4172
4329
|
case ActionType.NOTIFY:
|
4173
4330
|
return EventStatus.enum.NOTIFIED;
|
4174
4331
|
case ActionType.PRINT_CERTIFICATE:
|
4175
|
-
return EventStatus.enum.CERTIFIED;
|
4176
4332
|
case ActionType.ASSIGN:
|
4177
4333
|
case ActionType.UNASSIGN:
|
4178
4334
|
case ActionType.REJECT:
|
@@ -5137,7 +5293,27 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
|
|
5137
5293
|
defaultMessage: "Applicant's name",
|
5138
5294
|
description: "This is the label for the field",
|
5139
5295
|
id: "v2.event.tennis-club-membership.action.declare.form.section.who.field.firstname.label"
|
5140
|
-
}
|
5296
|
+
},
|
5297
|
+
configuration: {
|
5298
|
+
name: {
|
5299
|
+
firstname: { required: true },
|
5300
|
+
middlename: { required: false },
|
5301
|
+
surname: { required: true }
|
5302
|
+
}
|
5303
|
+
},
|
5304
|
+
validation: [
|
5305
|
+
{
|
5306
|
+
validator: field("applicant.name").object({
|
5307
|
+
firstname: field("firstname").isValidEnglishName(),
|
5308
|
+
surname: field("surname").isValidEnglishName()
|
5309
|
+
}),
|
5310
|
+
message: {
|
5311
|
+
defaultMessage: "Input contains invalid characters. Please use only letters (a-z, A-Z), numbers (0-9), hyphens (-), apostrophes(') and underscores (_)",
|
5312
|
+
description: "This is the error message for invalid name",
|
5313
|
+
id: "v2.error.invalidName"
|
5314
|
+
}
|
5315
|
+
}
|
5316
|
+
]
|
5141
5317
|
},
|
5142
5318
|
{
|
5143
5319
|
id: "applicant.email",
|
@@ -5359,22 +5535,6 @@ var statusOptions = [
|
|
5359
5535
|
id: "v2.advancedSearch.form.recordStatusRegistered"
|
5360
5536
|
}
|
5361
5537
|
},
|
5362
|
-
{
|
5363
|
-
value: EventStatus.enum.CERTIFIED,
|
5364
|
-
label: {
|
5365
|
-
defaultMessage: "Certified",
|
5366
|
-
description: "Option for form field: status of record",
|
5367
|
-
id: "v2.advancedSearch.form.recordStatusCertified"
|
5368
|
-
}
|
5369
|
-
},
|
5370
|
-
{
|
5371
|
-
value: VisibleStatus.enum.REJECTED,
|
5372
|
-
label: {
|
5373
|
-
defaultMessage: "Rejected",
|
5374
|
-
description: "Option for form field: status of record",
|
5375
|
-
id: "v2.advancedSearch.form.recordStatusRejected"
|
5376
|
-
}
|
5377
|
-
},
|
5378
5538
|
{
|
5379
5539
|
value: EventStatus.enum.ARCHIVED,
|
5380
5540
|
label: {
|
@@ -6764,7 +6924,7 @@ function eventPayloadGenerator(rng) {
|
|
6764
6924
|
requestId,
|
6765
6925
|
keepAssignment: input.keepAssignment
|
6766
6926
|
}),
|
6767
|
-
reject: (eventId, requestId, input
|
6927
|
+
reject: (eventId, requestId, input) => ({
|
6768
6928
|
type: ActionType.REJECT_CORRECTION,
|
6769
6929
|
transactionId: input.transactionId ?? getUUID(),
|
6770
6930
|
declaration: {},
|
@@ -6775,7 +6935,8 @@ function eventPayloadGenerator(rng) {
|
|
6775
6935
|
),
|
6776
6936
|
eventId,
|
6777
6937
|
requestId,
|
6778
|
-
keepAssignment: input.keepAssignment
|
6938
|
+
keepAssignment: input.keepAssignment,
|
6939
|
+
reason: input.reason ?? { message: "" }
|
6779
6940
|
})
|
6780
6941
|
}
|
6781
6942
|
}
|
@@ -6825,7 +6986,11 @@ function generateActionDocument({
|
|
6825
6986
|
case ActionType.NOTIFY:
|
6826
6987
|
return { ...actionBase, type: action };
|
6827
6988
|
case ActionType.PRINT_CERTIFICATE:
|
6828
|
-
return {
|
6989
|
+
return {
|
6990
|
+
...actionBase,
|
6991
|
+
type: action,
|
6992
|
+
content: defaults.content
|
6993
|
+
};
|
6829
6994
|
case ActionType.REQUEST_CORRECTION:
|
6830
6995
|
return { ...actionBase, type: action };
|
6831
6996
|
case ActionType.APPROVE_CORRECTION:
|
@@ -6834,7 +6999,8 @@ function generateActionDocument({
|
|
6834
6999
|
return {
|
6835
7000
|
...actionBase,
|
6836
7001
|
requestId: getUUID(),
|
6837
|
-
type: action
|
7002
|
+
type: action,
|
7003
|
+
reason: { message: "Correction rejection" }
|
6838
7004
|
};
|
6839
7005
|
case ActionType.REGISTER:
|
6840
7006
|
return {
|
@@ -7224,14 +7390,6 @@ var AVAILABLE_ACTIONS_BY_EVENT_STATUS = {
|
|
7224
7390
|
ActionType.REJECT_CORRECTION,
|
7225
7391
|
ExclusiveActions.REVIEW_CORRECTION_REQUEST
|
7226
7392
|
],
|
7227
|
-
[EventStatus.enum.CERTIFIED]: [
|
7228
|
-
ActionType.READ,
|
7229
|
-
ActionType.PRINT_CERTIFICATE,
|
7230
|
-
ActionType.REQUEST_CORRECTION,
|
7231
|
-
ActionType.APPROVE_CORRECTION,
|
7232
|
-
ActionType.REJECT_CORRECTION,
|
7233
|
-
ExclusiveActions.REVIEW_CORRECTION_REQUEST
|
7234
|
-
],
|
7235
7393
|
[EventStatus.enum.ARCHIVED]: [
|
7236
7394
|
ActionType.READ,
|
7237
7395
|
ActionType.ASSIGN,
|
@@ -7239,9 +7397,12 @@ var AVAILABLE_ACTIONS_BY_EVENT_STATUS = {
|
|
7239
7397
|
]
|
7240
7398
|
};
|
7241
7399
|
var getAvailableActionsForEvent = (event2) => {
|
7242
|
-
|
7243
|
-
|
7244
|
-
|
7245
|
-
|
7246
|
-
|
7400
|
+
if (event2.flags.includes(InherentFlags.REJECTED)) {
|
7401
|
+
return [
|
7402
|
+
ActionType.READ,
|
7403
|
+
event2.status === EventStatus.Enum.VALIDATED ? ActionType.VALIDATE : ActionType.DECLARE,
|
7404
|
+
ActionType.ARCHIVE
|
7405
|
+
];
|
7406
|
+
}
|
7407
|
+
return AVAILABLE_ACTIONS_BY_EVENT_STATUS[event2.status];
|
7247
7408
|
};
|