@opencrvs/toolkit 2.0.0-rc.ca280e0 → 2.0.0-rc.ca6df93
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/application-config/index.js +53 -34
- package/dist/cli.js +9 -3
- package/dist/commons/api/router.d.ts +92 -17
- package/dist/commons/application-config/index.d.ts +1 -0
- package/dist/commons/conditionals/conditionals.d.ts +348 -4
- package/dist/commons/conditionals/validate.d.ts +51 -2
- package/dist/commons/events/ActionDocument.d.ts +6 -0
- package/dist/commons/events/ActionInput.d.ts +6 -0
- package/dist/commons/events/AdvancedSearchConfig.d.ts +342 -0
- package/dist/commons/events/EventDocument.d.ts +3 -0
- package/dist/commons/events/FieldConfig.d.ts +378 -50
- package/dist/commons/events/FieldType.d.ts +1 -0
- package/dist/commons/events/FieldTypeMapping.d.ts +1 -1
- package/dist/commons/events/FieldValue.d.ts +6 -0
- package/dist/commons/events/field.d.ts +53 -1
- package/dist/commons/events/index.d.ts +1 -0
- package/dist/commons/events/state/flags.d.ts +16 -0
- package/dist/commons/events/state/utils.d.ts +12 -287
- package/dist/commons/events/utils.d.ts +12 -1
- package/dist/conditionals/index.js +48 -1
- package/dist/events/index.js +367 -136
- package/dist/migrations/v2.0/index.js +9 -3
- package/dist/notification/index.js +212 -37
- package/dist/scopes/index.d.ts +4 -6
- package/dist/scopes/index.js +9 -3
- package/opencrvs-toolkit-2.0.0-rc.ca6df93.tgz +0 -0
- package/package.json +1 -1
- package/opencrvs-toolkit-2.0.0-rc.ca280e0.tgz +0 -0
package/dist/events/index.js
CHANGED
|
@@ -75,6 +75,7 @@ __export(events_exports, {
|
|
|
75
75
|
CheckboxFieldValue: () => CheckboxFieldValue,
|
|
76
76
|
Clause: () => Clause,
|
|
77
77
|
ClientSpecificAction: () => ClientSpecificAction,
|
|
78
|
+
ComputedDefaultValue: () => ComputedDefaultValue,
|
|
78
79
|
Conditional: () => Conditional,
|
|
79
80
|
ConditionalType: () => ConditionalType,
|
|
80
81
|
ConfirmableActions: () => ConfirmableActions,
|
|
@@ -150,6 +151,7 @@ __export(events_exports, {
|
|
|
150
151
|
FormPageConfig: () => FormPageConfig,
|
|
151
152
|
Fuzzy: () => Fuzzy,
|
|
152
153
|
GeographicalArea: () => GeographicalArea,
|
|
154
|
+
HiddenFieldTypes: () => HiddenFieldTypes,
|
|
153
155
|
HiddenFieldValue: () => HiddenFieldValue,
|
|
154
156
|
HttpFieldUpdateValue: () => HttpFieldUpdateValue,
|
|
155
157
|
HttpFieldValue: () => HttpFieldValue,
|
|
@@ -200,6 +202,7 @@ __export(events_exports, {
|
|
|
200
202
|
SelectDateRangeValue: () => SelectDateRangeValue,
|
|
201
203
|
SelectOption: () => SelectOption,
|
|
202
204
|
ShowConditional: () => ShowConditional,
|
|
205
|
+
SignatureFieldValue: () => SignatureFieldValue,
|
|
203
206
|
StaticDataEntry: () => StaticDataEntry,
|
|
204
207
|
StreetLevelDetailsUpdateValue: () => StreetLevelDetailsUpdateValue,
|
|
205
208
|
SummaryConfig: () => SummaryConfig,
|
|
@@ -246,10 +249,12 @@ __export(events_exports, {
|
|
|
246
249
|
applyDraftToEventIndex: () => applyDraftToEventIndex,
|
|
247
250
|
areCertificateConditionsMet: () => areCertificateConditionsMet,
|
|
248
251
|
areConditionsMet: () => areConditionsMet,
|
|
252
|
+
buildClientFunctionContext: () => buildClientFunctionContext,
|
|
249
253
|
buildFormState: () => buildFormState,
|
|
250
254
|
canAccessEventWithScope: () => canAccessEventWithScope,
|
|
251
255
|
canAccessOtherUserWithScopes: () => canAccessOtherUserWithScopes,
|
|
252
256
|
canAccessUserWithScope: () => canAccessUserWithScope,
|
|
257
|
+
compileClientFunction: () => compileClientFunction,
|
|
253
258
|
compositeFieldTypes: () => compositeFieldTypes,
|
|
254
259
|
createEmptyDraft: () => createEmptyDraft,
|
|
255
260
|
createFieldConditionals: () => createFieldConditionals,
|
|
@@ -270,6 +275,7 @@ __export(events_exports, {
|
|
|
270
275
|
defineWorkqueuesColumns: () => defineWorkqueuesColumns,
|
|
271
276
|
deserializeQuery: () => deserializeQuery,
|
|
272
277
|
errorMessages: () => errorMessages,
|
|
278
|
+
evaluate: () => evaluate,
|
|
273
279
|
event: () => event,
|
|
274
280
|
eventMetadataLabelMap: () => eventMetadataLabelMap,
|
|
275
281
|
eventPayloadGenerator: () => eventPayloadGenerator,
|
|
@@ -282,6 +288,7 @@ __export(events_exports, {
|
|
|
282
288
|
findActiveDraftForEvent: () => findActiveDraftForEvent,
|
|
283
289
|
findAllFields: () => findAllFields,
|
|
284
290
|
findLastAssignmentAction: () => findLastAssignmentAction,
|
|
291
|
+
findPendingCorrectionAction: () => findPendingCorrectionAction,
|
|
285
292
|
findRecordActionPages: () => findRecordActionPages,
|
|
286
293
|
flag: () => flag,
|
|
287
294
|
flattenFieldReference: () => flattenFieldReference,
|
|
@@ -315,6 +322,7 @@ __export(events_exports, {
|
|
|
315
322
|
getAvailableActionsForEvent: () => getAvailableActionsForEvent,
|
|
316
323
|
getAvailableRolesForUserUpdatePayload: () => getAvailableRolesForUserUpdatePayload,
|
|
317
324
|
getCompleteActionAnnotation: () => getCompleteActionAnnotation,
|
|
325
|
+
getCompleteActionContent: () => getCompleteActionContent,
|
|
318
326
|
getCompleteActionDeclaration: () => getCompleteActionDeclaration,
|
|
319
327
|
getCurrentEventState: () => getCurrentEventState,
|
|
320
328
|
getCustomActionFields: () => getCustomActionFields,
|
|
@@ -323,6 +331,7 @@ __export(events_exports, {
|
|
|
323
331
|
getDeclarationFields: () => getDeclarationFields,
|
|
324
332
|
getDeclarationPages: () => getDeclarationPages,
|
|
325
333
|
getEventConfigById: () => getEventConfigById,
|
|
334
|
+
getEventFlags: () => getEventFlags,
|
|
326
335
|
getFilePathsFromEvent: () => getFilePathsFromEvent,
|
|
327
336
|
getLocationHierarchy: () => getLocationHierarchy,
|
|
328
337
|
getMixedPath: () => getMixedPath,
|
|
@@ -345,6 +354,7 @@ __export(events_exports, {
|
|
|
345
354
|
isBulletListFieldType: () => isBulletListFieldType,
|
|
346
355
|
isButtonFieldType: () => isButtonFieldType,
|
|
347
356
|
isCheckboxFieldType: () => isCheckboxFieldType,
|
|
357
|
+
isCodeToEvaluate: () => isCodeToEvaluate,
|
|
348
358
|
isConditionMet: () => isConditionMet,
|
|
349
359
|
isCountryFieldType: () => isCountryFieldType,
|
|
350
360
|
isCustomFieldType: () => isCustomFieldType,
|
|
@@ -385,6 +395,7 @@ __export(events_exports, {
|
|
|
385
395
|
isPageVisible: () => isPageVisible,
|
|
386
396
|
isParagraphFieldType: () => isParagraphFieldType,
|
|
387
397
|
isPhoneFieldType: () => isPhoneFieldType,
|
|
398
|
+
isPotentialDuplicate: () => isPotentialDuplicate,
|
|
388
399
|
isPrintButtonFieldType: () => isPrintButtonFieldType,
|
|
389
400
|
isQrReaderFieldType: () => isQrReaderFieldType,
|
|
390
401
|
isQueryParamReaderFieldType: () => isQueryParamReaderFieldType,
|
|
@@ -418,12 +429,15 @@ __export(events_exports, {
|
|
|
418
429
|
plainDateToLocalDate: () => plainDateToLocalDate,
|
|
419
430
|
precompileActionSchemas: () => precompileActionSchemas,
|
|
420
431
|
resolveDateOfEvent: () => resolveDateOfEvent,
|
|
432
|
+
resolveEventCustomFlags: () => resolveEventCustomFlags,
|
|
421
433
|
resolvePlaceOfEvent: () => resolvePlaceOfEvent,
|
|
434
|
+
runClientFunction: () => runClientFunction,
|
|
422
435
|
runFieldValidations: () => runFieldValidations,
|
|
423
436
|
runStructuralValidations: () => runStructuralValidations,
|
|
424
437
|
safeUnion: () => safeUnion,
|
|
425
438
|
status: () => status,
|
|
426
439
|
timePeriodToDateRange: () => timePeriodToDateRange,
|
|
440
|
+
todayISO: () => todayISO,
|
|
427
441
|
user: () => user,
|
|
428
442
|
userCanAccessEventWithScopes: () => userCanAccessEventWithScopes,
|
|
429
443
|
validate: () => validate,
|
|
@@ -698,14 +712,20 @@ var unflattenScope = (input) => {
|
|
|
698
712
|
return { type, options };
|
|
699
713
|
};
|
|
700
714
|
var EncodedScope = z2.string().brand("EncodedScope");
|
|
701
|
-
var
|
|
702
|
-
|
|
715
|
+
var decodedScopeCache = /* @__PURE__ */ new Map();
|
|
716
|
+
var decodeScope = (encodedScope) => {
|
|
717
|
+
if (decodedScopeCache.has(encodedScope)) {
|
|
718
|
+
return decodedScopeCache.get(encodedScope);
|
|
719
|
+
}
|
|
720
|
+
const scope = qs.parse(encodedScope, {
|
|
703
721
|
ignoreQueryPrefix: true,
|
|
704
722
|
comma: true,
|
|
705
723
|
allowDots: true
|
|
706
724
|
});
|
|
707
725
|
const unflattenedScope = unflattenScope(scope);
|
|
708
|
-
|
|
726
|
+
const result = Scope.safeParse(unflattenedScope)?.data;
|
|
727
|
+
decodedScopeCache.set(encodedScope, result);
|
|
728
|
+
return result;
|
|
709
729
|
};
|
|
710
730
|
var DEFAULT_SCOPE_OPTIONS = {
|
|
711
731
|
placeOfEvent: JurisdictionFilter.enum.all,
|
|
@@ -1200,6 +1220,11 @@ var FieldTypesToHideInReview = [
|
|
|
1200
1220
|
FieldType.ALPHA_PRINT_BUTTON,
|
|
1201
1221
|
FieldType.ALPHA_HIDDEN
|
|
1202
1222
|
];
|
|
1223
|
+
var HiddenFieldTypes = [
|
|
1224
|
+
FieldType.HTTP,
|
|
1225
|
+
FieldType.QUERY_PARAM_READER,
|
|
1226
|
+
FieldType.ALPHA_HIDDEN
|
|
1227
|
+
];
|
|
1203
1228
|
|
|
1204
1229
|
// ../commons/src/events/FieldValue.ts
|
|
1205
1230
|
var z12 = __toESM(require("zod/v4"));
|
|
@@ -1326,7 +1351,7 @@ function plainDateToLocalDate(date) {
|
|
|
1326
1351
|
// ../commons/src/events/FieldValue.ts
|
|
1327
1352
|
var TextValue = z12.string();
|
|
1328
1353
|
var HiddenFieldValue = z12.string();
|
|
1329
|
-
var NonEmptyTextValue =
|
|
1354
|
+
var NonEmptyTextValue = z12.string().trim().min(1);
|
|
1330
1355
|
var DateValue = z12.iso.date().describe("Date in the format YYYY-MM-DD");
|
|
1331
1356
|
var AgeValue = z12.object({
|
|
1332
1357
|
age: z12.number(),
|
|
@@ -1355,6 +1380,7 @@ var DateRangeFieldValue = z12.object({
|
|
|
1355
1380
|
var EmailValue = z12.email();
|
|
1356
1381
|
var CheckboxFieldValue = z12.boolean();
|
|
1357
1382
|
var NumberFieldValue = z12.number();
|
|
1383
|
+
var SignatureFieldValue = FileFieldValue;
|
|
1358
1384
|
var ButtonFieldValue = z12.number();
|
|
1359
1385
|
var VerificationStatusValue = z12.enum([
|
|
1360
1386
|
"verified",
|
|
@@ -1653,8 +1679,9 @@ var RequestedCorrectionAction = ActionBase.extend(
|
|
|
1653
1679
|
var ApprovedCorrectionAction = ActionBase.extend(
|
|
1654
1680
|
z14.object({
|
|
1655
1681
|
type: z14.literal(ActionType.APPROVE_CORRECTION),
|
|
1656
|
-
requestId: z14.string()
|
|
1682
|
+
requestId: z14.string(),
|
|
1657
1683
|
// TODO move into 'content' property
|
|
1684
|
+
content: z14.object({ immediateCorrection: z14.boolean().optional() }).optional()
|
|
1658
1685
|
}).shape
|
|
1659
1686
|
);
|
|
1660
1687
|
var RejectedCorrectionAction = ActionBase.extend(
|
|
@@ -2185,8 +2212,21 @@ var FieldReference = import_v43.default.object({
|
|
|
2185
2212
|
$$field: FieldId.describe("Id of the field to reference"),
|
|
2186
2213
|
$$subfield: import_v43.default.array(import_v43.default.string()).optional().default([]).describe(
|
|
2187
2214
|
'If the FieldValue is an object, subfield can be used to refer to e.g. `["foo", "bar"]` in `{ foo: { bar: 3 } }`'
|
|
2215
|
+
),
|
|
2216
|
+
$$code: import_v43.default.string().optional().describe(
|
|
2217
|
+
"Serialised client-side function body. When present the expression is evaluated rather than dereferenced."
|
|
2188
2218
|
)
|
|
2189
|
-
}).describe(
|
|
2219
|
+
}).describe(
|
|
2220
|
+
"Reference to a field value, with an optional client-side computation applied."
|
|
2221
|
+
);
|
|
2222
|
+
function isCodeToEvaluate(v) {
|
|
2223
|
+
return !!v && typeof v === "object" && "$$code" in v;
|
|
2224
|
+
}
|
|
2225
|
+
var ComputedDefaultValue = import_v43.default.object({
|
|
2226
|
+
$$code: import_v43.default.string().describe(
|
|
2227
|
+
"Serialised client-side function body. Receives (undefined, context) where context includes $now, $online, and system variables."
|
|
2228
|
+
)
|
|
2229
|
+
}).describe("A context-only computation used as a field default value.");
|
|
2190
2230
|
var ValidationConfig = import_v43.default.object({
|
|
2191
2231
|
validator: Conditional.describe(
|
|
2192
2232
|
"Conditional expression that must hold for the field value to be considered valid."
|
|
@@ -2227,7 +2267,7 @@ var BaseField = import_v43.default.object({
|
|
|
2227
2267
|
"Indicates whether the field can be modified during record correction."
|
|
2228
2268
|
),
|
|
2229
2269
|
value: FieldReference.or(import_v43.default.array(FieldReference)).optional().describe(
|
|
2230
|
-
"Reference to the source field or fields. When a value is defined, it is copied from the parent field when changed. If multiple references are provided, the first truthy value is used."
|
|
2270
|
+
"Reference to the source field or fields. When a value is defined, it is copied from the parent field when changed. If multiple references are provided, the first truthy value is used. A FieldReference with $$code computes the value via a custom client-side function."
|
|
2231
2271
|
),
|
|
2232
2272
|
analytics: import_v43.default.boolean().default(false).optional().describe(
|
|
2233
2273
|
"Indicates whether the field is included in analytics. When enabled, its value becomes available in the analytics dashboard."
|
|
@@ -2241,7 +2281,7 @@ var Divider = BaseField.extend({
|
|
|
2241
2281
|
});
|
|
2242
2282
|
var TextField = BaseField.extend({
|
|
2243
2283
|
type: import_v43.default.literal(FieldType.TEXT),
|
|
2244
|
-
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField]).optional(),
|
|
2284
|
+
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField, ComputedDefaultValue]).optional(),
|
|
2245
2285
|
configuration: import_v43.default.object({
|
|
2246
2286
|
maxLength: import_v43.default.number().optional().describe("Maximum length of the text"),
|
|
2247
2287
|
type: import_v43.default.enum(["text", "password"]).optional(),
|
|
@@ -2254,10 +2294,11 @@ var TextField = BaseField.extend({
|
|
|
2254
2294
|
});
|
|
2255
2295
|
var NumberField = BaseField.extend({
|
|
2256
2296
|
type: import_v43.default.literal(FieldType.NUMBER),
|
|
2257
|
-
defaultValue: NumberFieldValue.optional(),
|
|
2297
|
+
defaultValue: NumberFieldValue.or(ComputedDefaultValue).optional(),
|
|
2258
2298
|
configuration: import_v43.default.object({
|
|
2259
2299
|
min: import_v43.default.number().optional().describe("Minimum value"),
|
|
2260
2300
|
max: import_v43.default.number().optional().describe("Maximum value"),
|
|
2301
|
+
integer: import_v43.default.boolean().optional().describe("When true, only whole numbers are allowed"),
|
|
2261
2302
|
prefix: TranslationConfig.optional(),
|
|
2262
2303
|
postfix: TranslationConfig.optional()
|
|
2263
2304
|
}).optional()
|
|
@@ -2267,7 +2308,7 @@ var NumberField = BaseField.extend({
|
|
|
2267
2308
|
});
|
|
2268
2309
|
var TextAreaField = BaseField.extend({
|
|
2269
2310
|
type: import_v43.default.literal(FieldType.TEXTAREA),
|
|
2270
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2311
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2271
2312
|
configuration: import_v43.default.object({
|
|
2272
2313
|
maxLength: import_v43.default.number().optional().describe("Maximum length of the text"),
|
|
2273
2314
|
rows: import_v43.default.number().optional().describe("Number of visible text lines"),
|
|
@@ -2301,7 +2342,7 @@ var SignatureField = BaseField.extend({
|
|
|
2301
2342
|
signaturePromptLabel: TranslationConfig.describe(
|
|
2302
2343
|
"Title of the signature modal"
|
|
2303
2344
|
),
|
|
2304
|
-
defaultValue:
|
|
2345
|
+
defaultValue: SignatureFieldValue.or(ComputedDefaultValue).optional(),
|
|
2305
2346
|
configuration: import_v43.default.object({
|
|
2306
2347
|
maxFileSize: import_v43.default.number().describe("Maximum file size in bytes").default(DEFAULT_MAX_FILE_SIZE_BYTES),
|
|
2307
2348
|
acceptedFileTypes: MimeType.array().optional().describe("List of allowed file formats for the signature")
|
|
@@ -2317,14 +2358,14 @@ var EmailField = BaseField.extend({
|
|
|
2317
2358
|
configuration: import_v43.default.object({
|
|
2318
2359
|
maxLength: import_v43.default.number().optional().describe("Maximum length of the text")
|
|
2319
2360
|
}).default({ maxLength: 255 }).optional(),
|
|
2320
|
-
defaultValue: NonEmptyTextValue.optional()
|
|
2361
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional()
|
|
2321
2362
|
}).meta({
|
|
2322
2363
|
description: "An email input field",
|
|
2323
2364
|
id: "EmailField"
|
|
2324
2365
|
});
|
|
2325
2366
|
var DateField = BaseField.extend({
|
|
2326
2367
|
type: import_v43.default.literal(FieldType.DATE),
|
|
2327
|
-
defaultValue: SerializedNowDateTime.or(PlainDate).optional().describe("Default date value(yyyy-MM-dd)"),
|
|
2368
|
+
defaultValue: SerializedNowDateTime.or(PlainDate).or(ComputedDefaultValue).optional().describe("Default date value(yyyy-MM-dd)"),
|
|
2328
2369
|
configuration: import_v43.default.object({
|
|
2329
2370
|
notice: TranslationConfig.describe(
|
|
2330
2371
|
"Text to display above the date input"
|
|
@@ -2336,7 +2377,7 @@ var DateField = BaseField.extend({
|
|
|
2336
2377
|
});
|
|
2337
2378
|
var AgeField = BaseField.extend({
|
|
2338
2379
|
type: import_v43.default.literal(FieldType.AGE),
|
|
2339
|
-
defaultValue: NumberFieldValue.optional(),
|
|
2380
|
+
defaultValue: NumberFieldValue.or(ComputedDefaultValue).optional(),
|
|
2340
2381
|
configuration: import_v43.default.object({
|
|
2341
2382
|
asOfDate: FieldReference,
|
|
2342
2383
|
prefix: TranslationConfig.optional(),
|
|
@@ -2348,7 +2389,7 @@ var AgeField = BaseField.extend({
|
|
|
2348
2389
|
});
|
|
2349
2390
|
var TimeField = BaseField.extend({
|
|
2350
2391
|
type: import_v43.default.literal(FieldType.TIME),
|
|
2351
|
-
defaultValue: SerializedNowDateTime.or(TimeValue).optional().describe("Default time value (HH-mm)"),
|
|
2392
|
+
defaultValue: SerializedNowDateTime.or(TimeValue).or(ComputedDefaultValue).optional().describe("Default time value (HH-mm)"),
|
|
2352
2393
|
configuration: import_v43.default.object({
|
|
2353
2394
|
use12HourFormat: import_v43.default.boolean().optional().describe("Whether to use 12-hour format"),
|
|
2354
2395
|
notice: TranslationConfig.describe(
|
|
@@ -2361,7 +2402,7 @@ var TimeField = BaseField.extend({
|
|
|
2361
2402
|
});
|
|
2362
2403
|
var DateRangeField = BaseField.extend({
|
|
2363
2404
|
type: import_v43.default.literal(FieldType.DATE_RANGE),
|
|
2364
|
-
defaultValue: DateRangeFieldValue.optional(),
|
|
2405
|
+
defaultValue: DateRangeFieldValue.or(ComputedDefaultValue).optional(),
|
|
2365
2406
|
configuration: import_v43.default.object({
|
|
2366
2407
|
notice: TranslationConfig.describe(
|
|
2367
2408
|
"Text to display above the date input"
|
|
@@ -2440,7 +2481,7 @@ var PageHeader = BaseField.extend({
|
|
|
2440
2481
|
});
|
|
2441
2482
|
var File = BaseField.extend({
|
|
2442
2483
|
type: import_v43.default.literal(FieldType.FILE),
|
|
2443
|
-
defaultValue: FileFieldValue.optional(),
|
|
2484
|
+
defaultValue: FileFieldValue.or(ComputedDefaultValue).optional(),
|
|
2444
2485
|
configuration: import_v43.default.object({
|
|
2445
2486
|
maxFileSize: import_v43.default.number().describe("Maximum file size in bytes").default(DEFAULT_MAX_FILE_SIZE_BYTES),
|
|
2446
2487
|
acceptedFileTypes: MimeType.array().optional().describe("List of allowed file formats for the signature"),
|
|
@@ -2467,7 +2508,7 @@ var SelectOption = import_v43.default.object({
|
|
|
2467
2508
|
});
|
|
2468
2509
|
var NumberWithUnitField = BaseField.extend({
|
|
2469
2510
|
type: import_v43.default.literal(FieldType.NUMBER_WITH_UNIT),
|
|
2470
|
-
defaultValue: NumberWithUnitFieldValue.optional(),
|
|
2511
|
+
defaultValue: NumberWithUnitFieldValue.or(ComputedDefaultValue).optional(),
|
|
2471
2512
|
options: import_v43.default.array(SelectOption).describe("A list of options for the unit select"),
|
|
2472
2513
|
configuration: import_v43.default.object({
|
|
2473
2514
|
min: import_v43.default.number().optional().describe("Minimum value of the number field"),
|
|
@@ -2482,7 +2523,7 @@ var NumberWithUnitField = BaseField.extend({
|
|
|
2482
2523
|
});
|
|
2483
2524
|
var RadioGroup = BaseField.extend({
|
|
2484
2525
|
type: import_v43.default.literal(FieldType.RADIO_GROUP),
|
|
2485
|
-
defaultValue: TextValue.optional(),
|
|
2526
|
+
defaultValue: TextValue.or(ComputedDefaultValue).optional(),
|
|
2486
2527
|
options: import_v43.default.array(SelectOption).describe("A list of options"),
|
|
2487
2528
|
configuration: import_v43.default.object({
|
|
2488
2529
|
styles: import_v43.default.object({
|
|
@@ -2507,7 +2548,7 @@ var BulletList = BaseField.extend({
|
|
|
2507
2548
|
});
|
|
2508
2549
|
var Select = BaseField.extend({
|
|
2509
2550
|
type: import_v43.default.literal(FieldType.SELECT),
|
|
2510
|
-
defaultValue: TextValue.optional(),
|
|
2551
|
+
defaultValue: TextValue.or(ComputedDefaultValue).optional(),
|
|
2511
2552
|
options: import_v43.default.array(SelectOption).describe("A list of options"),
|
|
2512
2553
|
noOptionsMessage: TranslationConfig.optional().describe(
|
|
2513
2554
|
`
|
|
@@ -2529,7 +2570,7 @@ var SelectDateRangeOption = import_v43.default.object({
|
|
|
2529
2570
|
});
|
|
2530
2571
|
var SelectDateRangeField = BaseField.extend({
|
|
2531
2572
|
type: import_v43.default.literal(FieldType.SELECT_DATE_RANGE),
|
|
2532
|
-
defaultValue: SelectDateRangeValue.optional(),
|
|
2573
|
+
defaultValue: SelectDateRangeValue.or(ComputedDefaultValue).optional(),
|
|
2533
2574
|
options: import_v43.default.array(SelectDateRangeOption).describe("A list of options")
|
|
2534
2575
|
}).meta({
|
|
2535
2576
|
description: "A date range selection field",
|
|
@@ -2546,7 +2587,7 @@ var NameField = BaseField.extend({
|
|
|
2546
2587
|
firstname: SerializedUserField.or(NonEmptyTextValue).optional(),
|
|
2547
2588
|
middlename: SerializedUserField.or(NonEmptyTextValue).optional(),
|
|
2548
2589
|
surname: SerializedUserField.or(NonEmptyTextValue).optional()
|
|
2549
|
-
}).optional(),
|
|
2590
|
+
}).or(ComputedDefaultValue).optional(),
|
|
2550
2591
|
configuration: import_v43.default.object({
|
|
2551
2592
|
name: NameConfig.default({
|
|
2552
2593
|
firstname: { required: true },
|
|
@@ -2570,14 +2611,14 @@ var NameField = BaseField.extend({
|
|
|
2570
2611
|
id: "NameField"
|
|
2571
2612
|
});
|
|
2572
2613
|
var PhoneField = BaseField.extend({
|
|
2573
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2614
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2574
2615
|
type: import_v43.default.literal(FieldType.PHONE)
|
|
2575
2616
|
}).meta({
|
|
2576
2617
|
description: "A field for entering a phone number",
|
|
2577
2618
|
id: "PhoneField"
|
|
2578
2619
|
});
|
|
2579
2620
|
var IdField = BaseField.extend({
|
|
2580
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2621
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2581
2622
|
type: import_v43.default.literal(FieldType.ID)
|
|
2582
2623
|
}).meta({
|
|
2583
2624
|
description: "A field for entering an ID",
|
|
@@ -2585,14 +2626,14 @@ var IdField = BaseField.extend({
|
|
|
2585
2626
|
});
|
|
2586
2627
|
var Checkbox = BaseField.extend({
|
|
2587
2628
|
type: import_v43.default.literal(FieldType.CHECKBOX),
|
|
2588
|
-
defaultValue: CheckboxFieldValue.default(false)
|
|
2629
|
+
defaultValue: CheckboxFieldValue.or(ComputedDefaultValue).default(false)
|
|
2589
2630
|
}).meta({
|
|
2590
2631
|
description: "A boolean checkbox field",
|
|
2591
2632
|
id: "Checkbox"
|
|
2592
2633
|
});
|
|
2593
2634
|
var Country = BaseField.extend({
|
|
2594
2635
|
type: import_v43.default.literal(FieldType.COUNTRY),
|
|
2595
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2636
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2596
2637
|
optionOverrides: import_v43.default.array(SelectOption.omit({ label: true })).optional().describe(
|
|
2597
2638
|
"Conditionals for specific countries. Countries not listed are always shown and enabled."
|
|
2598
2639
|
)
|
|
@@ -2610,7 +2651,7 @@ var AdministrativeAreas = import_v43.default.enum([
|
|
|
2610
2651
|
]);
|
|
2611
2652
|
var AdministrativeAreaField = BaseField.extend({
|
|
2612
2653
|
type: import_v43.default.literal(FieldType.ADMINISTRATIVE_AREA),
|
|
2613
|
-
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField]).optional(),
|
|
2654
|
+
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField, ComputedDefaultValue]).optional(),
|
|
2614
2655
|
configuration: import_v43.default.object({
|
|
2615
2656
|
partOf: FieldReference.optional().describe("Parent location"),
|
|
2616
2657
|
type: AdministrativeAreas,
|
|
@@ -2622,7 +2663,7 @@ var AdministrativeAreaField = BaseField.extend({
|
|
|
2622
2663
|
});
|
|
2623
2664
|
var LocationInput = BaseField.extend({
|
|
2624
2665
|
type: import_v43.default.literal(FieldType.LOCATION),
|
|
2625
|
-
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField]).optional(),
|
|
2666
|
+
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField, ComputedDefaultValue]).optional(),
|
|
2626
2667
|
configuration: import_v43.default.object({
|
|
2627
2668
|
locationTypes: import_v43.default.array(import_v43.default.string()).optional().describe("Types of the locations that are available for selection."),
|
|
2628
2669
|
allowedLocations: AllowedLocations
|
|
@@ -2634,7 +2675,7 @@ var LocationInput = BaseField.extend({
|
|
|
2634
2675
|
var FileUploadWithOptions = BaseField.extend({
|
|
2635
2676
|
type: import_v43.default.literal(FieldType.FILE_WITH_OPTIONS),
|
|
2636
2677
|
options: import_v43.default.array(SelectOption).describe("A list of options"),
|
|
2637
|
-
defaultValue: FileFieldWithOptionValue.optional(),
|
|
2678
|
+
defaultValue: FileFieldWithOptionValue.or(ComputedDefaultValue).optional(),
|
|
2638
2679
|
configuration: import_v43.default.object({
|
|
2639
2680
|
maxFileSize: import_v43.default.number().describe("Maximum file size in bytes").default(DEFAULT_MAX_FILE_SIZE_BYTES),
|
|
2640
2681
|
maxImageSize: import_v43.default.object({
|
|
@@ -2650,12 +2691,12 @@ var FileUploadWithOptions = BaseField.extend({
|
|
|
2650
2691
|
});
|
|
2651
2692
|
var Facility = BaseField.extend({
|
|
2652
2693
|
type: import_v43.default.literal(FieldType.FACILITY),
|
|
2653
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2694
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2654
2695
|
configuration: import_v43.default.object({ allowedLocations: AllowedLocations }).optional()
|
|
2655
2696
|
}).describe("Input field for a facility");
|
|
2656
2697
|
var Office = BaseField.extend({
|
|
2657
2698
|
type: import_v43.default.literal(FieldType.OFFICE),
|
|
2658
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2699
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2659
2700
|
configuration: import_v43.default.object({ allowedLocations: AllowedLocations }).optional()
|
|
2660
2701
|
}).describe("Input field for an office");
|
|
2661
2702
|
var DefaultAddressFieldValue = DomesticAddressFieldValue.extend({
|
|
@@ -2691,7 +2732,7 @@ var Address = BaseField.extend({
|
|
|
2691
2732
|
).optional(),
|
|
2692
2733
|
allowedLocations: AllowedLocations
|
|
2693
2734
|
}).optional(),
|
|
2694
|
-
defaultValue: DefaultAddressFieldValue.optional()
|
|
2735
|
+
defaultValue: DefaultAddressFieldValue.or(ComputedDefaultValue).optional()
|
|
2695
2736
|
}).meta({
|
|
2696
2737
|
description: "Address input field \u2013 a combination of location and text fields",
|
|
2697
2738
|
id: "Address"
|
|
@@ -2738,7 +2779,7 @@ var ButtonConfiguration = import_v43.default.object({
|
|
|
2738
2779
|
});
|
|
2739
2780
|
var ButtonField = BaseField.extend({
|
|
2740
2781
|
type: import_v43.default.literal(FieldType.BUTTON),
|
|
2741
|
-
defaultValue: ButtonFieldValue.optional(),
|
|
2782
|
+
defaultValue: ButtonFieldValue.or(ComputedDefaultValue).optional(),
|
|
2742
2783
|
configuration: ButtonConfiguration
|
|
2743
2784
|
}).meta({
|
|
2744
2785
|
description: "A generic button that can be used to trigger an action",
|
|
@@ -2766,7 +2807,7 @@ var AlphaPrintButton = BaseField.extend({
|
|
|
2766
2807
|
});
|
|
2767
2808
|
var HttpField = BaseField.extend({
|
|
2768
2809
|
type: import_v43.default.literal(FieldType.HTTP),
|
|
2769
|
-
defaultValue: HttpFieldValue.optional(),
|
|
2810
|
+
defaultValue: HttpFieldValue.or(ComputedDefaultValue).optional(),
|
|
2770
2811
|
configuration: import_v43.default.object({
|
|
2771
2812
|
trigger: FieldReference.optional().describe(
|
|
2772
2813
|
"Reference to the field that triggers the HTTP request when its value changes. If not provided, the HTTP request is triggered once on component mount."
|
|
@@ -2852,7 +2893,7 @@ var LinkButtonField = BaseField.extend({
|
|
|
2852
2893
|
});
|
|
2853
2894
|
var VerificationStatus = BaseField.extend({
|
|
2854
2895
|
type: import_v43.default.literal(FieldType.VERIFICATION_STATUS),
|
|
2855
|
-
defaultValue: VerificationStatusValue.optional(),
|
|
2896
|
+
defaultValue: VerificationStatusValue.or(ComputedDefaultValue).optional(),
|
|
2856
2897
|
configuration: import_v43.default.object({
|
|
2857
2898
|
status: TranslationConfig.describe("Text to display on the status pill."),
|
|
2858
2899
|
description: TranslationConfig.describe(
|
|
@@ -2874,7 +2915,7 @@ var QueryParamReaderField = BaseField.extend({
|
|
|
2874
2915
|
});
|
|
2875
2916
|
var QrReaderField = BaseField.extend({
|
|
2876
2917
|
type: import_v43.default.literal(FieldType.QR_READER),
|
|
2877
|
-
defaultValue: QrReaderFieldValue.optional(),
|
|
2918
|
+
defaultValue: QrReaderFieldValue.or(ComputedDefaultValue).optional(),
|
|
2878
2919
|
configuration: import_v43.default.object({
|
|
2879
2920
|
validator: import_v43.default.any().meta({
|
|
2880
2921
|
description: "JSON Schema to validate the scanned QR code data against before populating the form fields.",
|
|
@@ -2887,7 +2928,7 @@ var QrReaderField = BaseField.extend({
|
|
|
2887
2928
|
});
|
|
2888
2929
|
var IdReaderField = BaseField.extend({
|
|
2889
2930
|
type: import_v43.default.literal(FieldType.ID_READER),
|
|
2890
|
-
defaultValue: IdReaderFieldValue.optional(),
|
|
2931
|
+
defaultValue: IdReaderFieldValue.or(ComputedDefaultValue).optional(),
|
|
2891
2932
|
methods: import_v43.default.array(
|
|
2892
2933
|
import_v43.default.union([QrReaderField, LinkButtonField]).describe("Methods for reading an ID")
|
|
2893
2934
|
)
|
|
@@ -3446,6 +3487,9 @@ var BaseField3 = z28.object({
|
|
|
3446
3487
|
),
|
|
3447
3488
|
validations: z28.array(ValidationConfig).optional().describe(
|
|
3448
3489
|
`Option for overriding the field validations specifically for advanced search form.`
|
|
3490
|
+
),
|
|
3491
|
+
allowedLocations: JurisdictionReference.optional().describe(
|
|
3492
|
+
`Override the allowedLocations for a location field in advanced search. Use this when the declaration form's allowedLocations references a scope (e.g. record.create) that search-only users don't have \u2014 specify record.search scope instead.`
|
|
3449
3493
|
)
|
|
3450
3494
|
});
|
|
3451
3495
|
var SearchQueryParams = z28.object({
|
|
@@ -3520,9 +3564,11 @@ var z30 = __toESM(require("zod/v4"));
|
|
|
3520
3564
|
var z29 = __toESM(require("zod/v4"));
|
|
3521
3565
|
function getDynamicNameValue(field3) {
|
|
3522
3566
|
const nameConfiguration = field3.configuration?.name;
|
|
3567
|
+
const firstnameRequired = nameConfiguration?.firstname?.required ?? field3.required;
|
|
3568
|
+
const surnameRequired = nameConfiguration?.surname?.required ?? field3.required;
|
|
3523
3569
|
return z29.object({
|
|
3524
|
-
firstname:
|
|
3525
|
-
surname:
|
|
3570
|
+
firstname: firstnameRequired ? NonEmptyTextValue : TextValue,
|
|
3571
|
+
surname: surnameRequired ? NonEmptyTextValue : TextValue,
|
|
3526
3572
|
middlename: nameConfiguration?.middlename?.required ? NonEmptyTextValue : TextValue.optional()
|
|
3527
3573
|
});
|
|
3528
3574
|
}
|
|
@@ -3869,7 +3915,7 @@ var isHiddenFieldType = (field3) => {
|
|
|
3869
3915
|
return field3.config.type === FieldType.ALPHA_HIDDEN;
|
|
3870
3916
|
};
|
|
3871
3917
|
var isNonInteractiveFieldType = (field3) => {
|
|
3872
|
-
return field3.type === FieldType.DIVIDER || field3.type === FieldType.PAGE_HEADER || field3.type === FieldType.PARAGRAPH || field3.type === FieldType.HEADING || field3.type === FieldType.BULLET_LIST || field3.type === FieldType.DATA || field3.type === FieldType.ALPHA_PRINT_BUTTON || field3.type === FieldType.
|
|
3918
|
+
return field3.type === FieldType.DIVIDER || field3.type === FieldType.PAGE_HEADER || field3.type === FieldType.PARAGRAPH || field3.type === FieldType.HEADING || field3.type === FieldType.BULLET_LIST || field3.type === FieldType.DATA || field3.type === FieldType.ALPHA_PRINT_BUTTON || field3.type === FieldType.LINK_BUTTON || field3.type === FieldType.LOADER;
|
|
3873
3919
|
};
|
|
3874
3920
|
|
|
3875
3921
|
// ../commons/src/conditionals/validate.ts
|
|
@@ -3905,7 +3951,37 @@ function resolveDataPath(rootData, dataPath, instancePath) {
|
|
|
3905
3951
|
}
|
|
3906
3952
|
return current;
|
|
3907
3953
|
}
|
|
3954
|
+
function todayISO() {
|
|
3955
|
+
return (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" });
|
|
3956
|
+
}
|
|
3957
|
+
var compiledFunctionCache = /* @__PURE__ */ new Map();
|
|
3958
|
+
function compileClientFunction(code) {
|
|
3959
|
+
let fn = compiledFunctionCache.get(code);
|
|
3960
|
+
if (!fn) {
|
|
3961
|
+
fn = new Function(`return (${code})`)();
|
|
3962
|
+
compiledFunctionCache.set(code, fn);
|
|
3963
|
+
}
|
|
3964
|
+
return fn;
|
|
3965
|
+
}
|
|
3908
3966
|
(0, import_ajv_formats.default)(ajv);
|
|
3967
|
+
function buildClientFunctionContext(input) {
|
|
3968
|
+
return {
|
|
3969
|
+
$form: input.form,
|
|
3970
|
+
$now: todayISO(),
|
|
3971
|
+
// eslint-disable-next-line @typescript-eslint/no-use-before-define
|
|
3972
|
+
$online: isOnline(),
|
|
3973
|
+
$user: input.validatorContext?.user,
|
|
3974
|
+
$event: input.validatorContext?.event,
|
|
3975
|
+
$leafAdminStructureLocationIds: input.validatorContext?.leafAdminStructureLocationIds ?? [],
|
|
3976
|
+
user: input.systemVariables?.user,
|
|
3977
|
+
$window: input.systemVariables?.$window,
|
|
3978
|
+
locations: input.locations,
|
|
3979
|
+
adminLevelIds: input.adminLevelIds
|
|
3980
|
+
};
|
|
3981
|
+
}
|
|
3982
|
+
function runClientFunction(code, data, context) {
|
|
3983
|
+
return compileClientFunction(code)(data, context);
|
|
3984
|
+
}
|
|
3909
3985
|
ajv.addKeyword({
|
|
3910
3986
|
keyword: "daysFromDate",
|
|
3911
3987
|
type: "string",
|
|
@@ -3950,7 +4026,7 @@ ajv.addKeyword({
|
|
|
3950
4026
|
$data: true,
|
|
3951
4027
|
errors: true,
|
|
3952
4028
|
// @ts-ignore -- Force type. We will move this away from AJV next. Parsing the array will take seconds and is only called by core.
|
|
3953
|
-
validate(
|
|
4029
|
+
validate(_schema, data, _2, dataContext) {
|
|
3954
4030
|
const locationIdInput = data;
|
|
3955
4031
|
const locations = dataContext?.rootData.$leafAdminStructureLocationIds ?? [];
|
|
3956
4032
|
return locations.some((location) => location.id === locationIdInput);
|
|
@@ -3981,6 +4057,23 @@ function isAgeValue(value) {
|
|
|
3981
4057
|
function mergeWithBaseFormState(values, context) {
|
|
3982
4058
|
return { ...context.baseFormState, ...values };
|
|
3983
4059
|
}
|
|
4060
|
+
ajv.addKeyword({
|
|
4061
|
+
keyword: "customClientValidator",
|
|
4062
|
+
schemaType: "object",
|
|
4063
|
+
errors: true,
|
|
4064
|
+
// @ts-expect-error -- AJV's public types don't expose `rootData`. All
|
|
4065
|
+
// `validate()` callers build root data via `buildClientFunctionContext`,
|
|
4066
|
+
// so the cast holds.
|
|
4067
|
+
validate(schema, data, _2, dataContext) {
|
|
4068
|
+
return Boolean(
|
|
4069
|
+
runClientFunction(
|
|
4070
|
+
schema.code,
|
|
4071
|
+
data,
|
|
4072
|
+
dataContext?.rootData ?? buildClientFunctionContext({ form: {} })
|
|
4073
|
+
)
|
|
4074
|
+
);
|
|
4075
|
+
}
|
|
4076
|
+
});
|
|
3984
4077
|
function validate(schema, data) {
|
|
3985
4078
|
const validator = ajv.getSchema(schema.$id) || ajv.compile(schema);
|
|
3986
4079
|
if ("$form" in data) {
|
|
@@ -4017,17 +4110,14 @@ function isOnline() {
|
|
|
4017
4110
|
}
|
|
4018
4111
|
return true;
|
|
4019
4112
|
}
|
|
4020
|
-
function isConditionMet(conditional, values, context
|
|
4021
|
-
return validate(
|
|
4022
|
-
|
|
4023
|
-
|
|
4024
|
-
|
|
4025
|
-
|
|
4026
|
-
|
|
4027
|
-
|
|
4028
|
-
$status: eventIndex?.status,
|
|
4029
|
-
$event: context.event
|
|
4030
|
-
});
|
|
4113
|
+
function isConditionMet(conditional, values, context) {
|
|
4114
|
+
return validate(
|
|
4115
|
+
conditional,
|
|
4116
|
+
buildClientFunctionContext({
|
|
4117
|
+
form: mergeWithBaseFormState(values, context),
|
|
4118
|
+
validatorContext: context
|
|
4119
|
+
})
|
|
4120
|
+
);
|
|
4031
4121
|
}
|
|
4032
4122
|
function getConditionalActionsForField(field3, values) {
|
|
4033
4123
|
if (!field3.conditionals) {
|
|
@@ -4035,9 +4125,9 @@ function getConditionalActionsForField(field3, values) {
|
|
|
4035
4125
|
}
|
|
4036
4126
|
return field3.conditionals.filter((conditional) => validate(conditional.conditional, values)).map((conditional) => conditional.type);
|
|
4037
4127
|
}
|
|
4038
|
-
function areConditionsMet(conditions, values, context,
|
|
4128
|
+
function areConditionsMet(conditions, values, context, _event) {
|
|
4039
4129
|
return conditions.every(
|
|
4040
|
-
(condition) => isConditionMet(condition.conditional, values, context
|
|
4130
|
+
(condition) => isConditionMet(condition.conditional, values, context)
|
|
4041
4131
|
);
|
|
4042
4132
|
}
|
|
4043
4133
|
function isFieldConditionMet(field3, form, conditionalType, context) {
|
|
@@ -4047,14 +4137,13 @@ function isFieldConditionMet(field3, form, conditionalType, context) {
|
|
|
4047
4137
|
if (!hasRule) {
|
|
4048
4138
|
return true;
|
|
4049
4139
|
}
|
|
4050
|
-
const validConditionals = getConditionalActionsForField(
|
|
4051
|
-
|
|
4052
|
-
|
|
4053
|
-
|
|
4054
|
-
|
|
4055
|
-
|
|
4056
|
-
|
|
4057
|
-
});
|
|
4140
|
+
const validConditionals = getConditionalActionsForField(
|
|
4141
|
+
field3,
|
|
4142
|
+
buildClientFunctionContext({
|
|
4143
|
+
form: mergeWithBaseFormState(form, context),
|
|
4144
|
+
validatorContext: context
|
|
4145
|
+
})
|
|
4146
|
+
);
|
|
4058
4147
|
return validConditionals.includes(conditionalType);
|
|
4059
4148
|
}
|
|
4060
4149
|
function isFieldVisible(field3, form, context) {
|
|
@@ -4080,7 +4169,14 @@ function isActionConditionMet(actionConfig, event2, context, conditionalType) {
|
|
|
4080
4169
|
if (!rule) {
|
|
4081
4170
|
return true;
|
|
4082
4171
|
}
|
|
4083
|
-
return
|
|
4172
|
+
return validate(rule.conditional, {
|
|
4173
|
+
...buildClientFunctionContext({
|
|
4174
|
+
form: mergeWithBaseFormState(event2.declaration, context),
|
|
4175
|
+
validatorContext: context
|
|
4176
|
+
}),
|
|
4177
|
+
$flags: event2.flags,
|
|
4178
|
+
$status: event2.status
|
|
4179
|
+
});
|
|
4084
4180
|
}
|
|
4085
4181
|
function isActionEnabled(actionConfig, event2, context) {
|
|
4086
4182
|
return isActionConditionMet(
|
|
@@ -4239,19 +4335,10 @@ function runFieldValidations({
|
|
|
4239
4335
|
if (!isFieldVisible(field3.config, form, context)) {
|
|
4240
4336
|
return [];
|
|
4241
4337
|
}
|
|
4242
|
-
const conditionalParameters = {
|
|
4243
|
-
|
|
4244
|
-
|
|
4245
|
-
|
|
4246
|
-
* In real use cases, there can be hundreds of thousands of locations.
|
|
4247
|
-
* Make sure that the context contains only the locations that are needed for validation.
|
|
4248
|
-
* E.g. if the user is a leaf admin, only the leaf locations under their admin structure are needed.
|
|
4249
|
-
* Loading few megabytes of locations to memory just for validation is not efficient and will choke the application.
|
|
4250
|
-
*/
|
|
4251
|
-
$leafAdminStructureLocationIds: context.leafAdminStructureLocationIds ?? [],
|
|
4252
|
-
$online: isOnline(),
|
|
4253
|
-
$user: context.user
|
|
4254
|
-
};
|
|
4338
|
+
const conditionalParameters = buildClientFunctionContext({
|
|
4339
|
+
form: mergeWithBaseFormState(form, context),
|
|
4340
|
+
validatorContext: context
|
|
4341
|
+
});
|
|
4255
4342
|
if (isFieldGroupFieldType(field3)) {
|
|
4256
4343
|
const subfieldErrors = buildFormState(
|
|
4257
4344
|
field3.config.fields,
|
|
@@ -4735,19 +4822,32 @@ function getPendingAction(actions) {
|
|
|
4735
4822
|
}
|
|
4736
4823
|
return pendingActions[0];
|
|
4737
4824
|
}
|
|
4738
|
-
function getCompleteActionAnnotation(
|
|
4825
|
+
function getCompleteActionAnnotation(event2, action) {
|
|
4739
4826
|
if (action.originalActionId) {
|
|
4740
4827
|
const originalAction = event2.actions.find(
|
|
4741
4828
|
({ id }) => id === action.originalActionId
|
|
4742
4829
|
);
|
|
4743
4830
|
if (originalAction?.status === ActionStatus.Requested) {
|
|
4744
|
-
return deepMerge(
|
|
4745
|
-
deepMerge(annotation, originalAction.annotation ?? {}),
|
|
4746
|
-
action.annotation ?? {}
|
|
4747
|
-
);
|
|
4831
|
+
return deepMerge(originalAction.annotation ?? {}, action.annotation ?? {});
|
|
4748
4832
|
}
|
|
4749
4833
|
}
|
|
4750
|
-
return
|
|
4834
|
+
return action.annotation ?? {};
|
|
4835
|
+
}
|
|
4836
|
+
function getCompleteActionContent(event2, action) {
|
|
4837
|
+
const currentContent = "content" in action ? action.content : void 0;
|
|
4838
|
+
if (!action.originalActionId) {
|
|
4839
|
+
return currentContent;
|
|
4840
|
+
}
|
|
4841
|
+
const originalAction = event2.actions.find(
|
|
4842
|
+
({ id }) => id === action.originalActionId
|
|
4843
|
+
);
|
|
4844
|
+
if (originalAction && "content" in originalAction && originalAction.content) {
|
|
4845
|
+
return {
|
|
4846
|
+
...originalAction.content,
|
|
4847
|
+
...currentContent ?? {}
|
|
4848
|
+
};
|
|
4849
|
+
}
|
|
4850
|
+
return currentContent;
|
|
4751
4851
|
}
|
|
4752
4852
|
function getCompleteActionDeclaration(declaration, event2, action) {
|
|
4753
4853
|
if (action.originalActionId) {
|
|
@@ -4767,7 +4867,7 @@ function getAcceptedActions(event2) {
|
|
|
4767
4867
|
return event2.actions.filter(isAcceptedAction).map((action) => ({
|
|
4768
4868
|
...action,
|
|
4769
4869
|
declaration: getCompleteActionDeclaration({}, event2, action),
|
|
4770
|
-
annotation: getCompleteActionAnnotation(
|
|
4870
|
+
annotation: getCompleteActionAnnotation(event2, action)
|
|
4771
4871
|
}));
|
|
4772
4872
|
}
|
|
4773
4873
|
var EXCLUDED_ACTIONS = [
|
|
@@ -5405,7 +5505,54 @@ function createFieldConditionals(fieldId) {
|
|
|
5405
5505
|
}
|
|
5406
5506
|
},
|
|
5407
5507
|
required: [fieldId]
|
|
5408
|
-
})
|
|
5508
|
+
}),
|
|
5509
|
+
/**
|
|
5510
|
+
* Custom client-side validator. The provided function is serialised and executed
|
|
5511
|
+
* just-in-time on the client only. External references (e.g. lodash) are not
|
|
5512
|
+
* available inside the function body — all logic must be self-contained.
|
|
5513
|
+
*
|
|
5514
|
+
* @example
|
|
5515
|
+
* field('nid').customClientValidator((value) => {
|
|
5516
|
+
* // LUHN check — all logic must be inline
|
|
5517
|
+
* const digits = String(value).split('').map(Number)
|
|
5518
|
+
* // ...
|
|
5519
|
+
* return isValid
|
|
5520
|
+
* })
|
|
5521
|
+
*/
|
|
5522
|
+
customClientValidator(validationFn) {
|
|
5523
|
+
const code = validationFn.toString();
|
|
5524
|
+
return defineFormConditional({
|
|
5525
|
+
type: "object",
|
|
5526
|
+
properties: wrapToPath(
|
|
5527
|
+
{ [fieldId]: { customClientValidator: { code } } },
|
|
5528
|
+
this.$$subfield
|
|
5529
|
+
),
|
|
5530
|
+
required: [fieldId]
|
|
5531
|
+
});
|
|
5532
|
+
},
|
|
5533
|
+
/**
|
|
5534
|
+
* Custom client-side evaluation. Returns a {@link FieldReference} descriptor
|
|
5535
|
+
* that can be used as the `value` property or a DATA component entry.
|
|
5536
|
+
* The function receives the referenced field's value as the first argument and
|
|
5537
|
+
* the full form context as the second; its return value replaces the field reference.
|
|
5538
|
+
* The function is serialised and executed just-in-time on the client only.
|
|
5539
|
+
* External references (e.g. lodash) are not available inside the function body.
|
|
5540
|
+
*
|
|
5541
|
+
* For computing a default value without referencing a specific field, use
|
|
5542
|
+
* `evaluate(fn)` in the `defaultValue` property instead.
|
|
5543
|
+
*
|
|
5544
|
+
* @example
|
|
5545
|
+
* field('a').customClientEvaluation((aValue, ctx) =>
|
|
5546
|
+
* Number(aValue) + Number(ctx.$form.b)
|
|
5547
|
+
* )
|
|
5548
|
+
*/
|
|
5549
|
+
customClientEvaluation(computationFn) {
|
|
5550
|
+
return {
|
|
5551
|
+
$$code: computationFn.toString(),
|
|
5552
|
+
$$field: fieldId,
|
|
5553
|
+
$$subfield: this.$$subfield
|
|
5554
|
+
};
|
|
5555
|
+
}
|
|
5409
5556
|
};
|
|
5410
5557
|
}
|
|
5411
5558
|
|
|
@@ -6195,7 +6342,8 @@ var RejectCorrectionActionInput = BaseActionInput.extend(
|
|
|
6195
6342
|
var ApproveCorrectionActionInput = BaseActionInput.extend(
|
|
6196
6343
|
z38.object({
|
|
6197
6344
|
requestId: z38.string(),
|
|
6198
|
-
type: z38.literal(ActionType.APPROVE_CORRECTION).default(ActionType.APPROVE_CORRECTION)
|
|
6345
|
+
type: z38.literal(ActionType.APPROVE_CORRECTION).default(ActionType.APPROVE_CORRECTION),
|
|
6346
|
+
content: z38.object({ immediateCorrection: z38.boolean().optional() }).optional()
|
|
6199
6347
|
}).shape
|
|
6200
6348
|
);
|
|
6201
6349
|
var ReadActionInput = BaseActionInput.extend(
|
|
@@ -6344,6 +6492,8 @@ var updateActions = ActionTypes.extract([
|
|
|
6344
6492
|
ActionType.ARCHIVE,
|
|
6345
6493
|
ActionType.PRINT_CERTIFICATE,
|
|
6346
6494
|
ActionType.REQUEST_CORRECTION,
|
|
6495
|
+
ActionType.APPROVE_CORRECTION,
|
|
6496
|
+
ActionType.REJECT_CORRECTION,
|
|
6347
6497
|
ActionType.CUSTOM
|
|
6348
6498
|
]);
|
|
6349
6499
|
function getActionUpdateMetadata(actions) {
|
|
@@ -6358,7 +6508,7 @@ function getActionUpdateMetadata(actions) {
|
|
|
6358
6508
|
"createdAtLocation",
|
|
6359
6509
|
"createdByRole"
|
|
6360
6510
|
];
|
|
6361
|
-
return actions.filter(({ type }) => updateActions.safeParse(type).success).
|
|
6511
|
+
return actions.filter(({ type }) => updateActions.safeParse(type).success).reduce(
|
|
6362
6512
|
(_2, action) => {
|
|
6363
6513
|
if (action.originalActionId) {
|
|
6364
6514
|
const originalAction = actions.find(({ id }) => id === action.originalActionId) ?? action;
|
|
@@ -6385,28 +6535,19 @@ function getLegalStatuses(actions) {
|
|
|
6385
6535
|
// ../commons/src/events/state/flags.ts
|
|
6386
6536
|
var import_lodash3 = require("lodash");
|
|
6387
6537
|
var import_date_fns3 = require("date-fns");
|
|
6388
|
-
function
|
|
6389
|
-
|
|
6390
|
-
|
|
6391
|
-
|
|
6392
|
-
|
|
6393
|
-
|
|
6394
|
-
return true;
|
|
6395
|
-
}
|
|
6396
|
-
if (type === ActionType.APPROVE_CORRECTION) {
|
|
6397
|
-
return false;
|
|
6538
|
+
function findPendingCorrectionAction(writeActions2) {
|
|
6539
|
+
let correctionRequestAction;
|
|
6540
|
+
for (let i = writeActions2.length - 1; i >= 0; i--) {
|
|
6541
|
+
const action = writeActions2[i];
|
|
6542
|
+
if (action.type === ActionType.APPROVE_CORRECTION || action.type === ActionType.REJECT_CORRECTION) {
|
|
6543
|
+
break;
|
|
6398
6544
|
}
|
|
6399
|
-
if (type === ActionType.
|
|
6400
|
-
|
|
6545
|
+
if (action.type === ActionType.REQUEST_CORRECTION) {
|
|
6546
|
+
correctionRequestAction = action;
|
|
6547
|
+
break;
|
|
6401
6548
|
}
|
|
6402
|
-
|
|
6403
|
-
|
|
6404
|
-
}
|
|
6405
|
-
function isDeclarationIncomplete(actions) {
|
|
6406
|
-
return getStatusFromActions(actions) === EventStatus.enum.NOTIFIED;
|
|
6407
|
-
}
|
|
6408
|
-
function isRejected(actions) {
|
|
6409
|
-
return actions.at(-1)?.type === ActionType.REJECT;
|
|
6549
|
+
}
|
|
6550
|
+
return correctionRequestAction;
|
|
6410
6551
|
}
|
|
6411
6552
|
function isPotentialDuplicate(actions) {
|
|
6412
6553
|
return actions.reduce((prev, { type }) => {
|
|
@@ -6435,6 +6576,88 @@ function isFlagConditionMet(conditional, form, action) {
|
|
|
6435
6576
|
}
|
|
6436
6577
|
});
|
|
6437
6578
|
}
|
|
6579
|
+
function actionConfigRemovesFlag(action, flagId, actionsUpToAndIncluding, event2, eventConfiguration) {
|
|
6580
|
+
if (!isActionConfigType(action.type)) {
|
|
6581
|
+
return false;
|
|
6582
|
+
}
|
|
6583
|
+
const actionConfig = getActionConfig({
|
|
6584
|
+
eventConfiguration,
|
|
6585
|
+
actionType: action.type,
|
|
6586
|
+
customActionType: "customActionType" in action ? action.customActionType : void 0
|
|
6587
|
+
});
|
|
6588
|
+
const removeOperations = (actionConfig?.flags ?? []).filter(
|
|
6589
|
+
({ id, operation }) => id === flagId && operation === "remove"
|
|
6590
|
+
);
|
|
6591
|
+
if (removeOperations.length === 0) {
|
|
6592
|
+
return false;
|
|
6593
|
+
}
|
|
6594
|
+
const eventUpToThisAction = { ...event2, actions: actionsUpToAndIncluding };
|
|
6595
|
+
const declaration = aggregateActionDeclarations(eventUpToThisAction);
|
|
6596
|
+
const annotation = aggregateActionAnnotations(eventUpToThisAction);
|
|
6597
|
+
const form = { ...declaration, ...annotation };
|
|
6598
|
+
return removeOperations.some(
|
|
6599
|
+
({ conditional }) => conditional ? isFlagConditionMet(conditional, form, action) : true
|
|
6600
|
+
);
|
|
6601
|
+
}
|
|
6602
|
+
var INHERENT_FLAG_RULES = [
|
|
6603
|
+
{
|
|
6604
|
+
flag: InherentFlags.CORRECTION_REQUESTED,
|
|
6605
|
+
setOn: [ActionType.REQUEST_CORRECTION],
|
|
6606
|
+
resetOn: [ActionType.APPROVE_CORRECTION, ActionType.REJECT_CORRECTION]
|
|
6607
|
+
},
|
|
6608
|
+
{
|
|
6609
|
+
// INCOMPLETE mirrors the NOTIFIED status: set by NOTIFY, cleared by any
|
|
6610
|
+
// other status-changing action (see getStatusFromActions).
|
|
6611
|
+
flag: InherentFlags.INCOMPLETE,
|
|
6612
|
+
setOn: [ActionType.NOTIFY],
|
|
6613
|
+
resetOn: [
|
|
6614
|
+
ActionType.CREATE,
|
|
6615
|
+
ActionType.DECLARE,
|
|
6616
|
+
ActionType.REGISTER,
|
|
6617
|
+
ActionType.ARCHIVE
|
|
6618
|
+
]
|
|
6619
|
+
},
|
|
6620
|
+
{
|
|
6621
|
+
flag: InherentFlags.REJECTED,
|
|
6622
|
+
setOn: [ActionType.REJECT],
|
|
6623
|
+
resetOn: [
|
|
6624
|
+
ActionType.NOTIFY,
|
|
6625
|
+
ActionType.DECLARE,
|
|
6626
|
+
ActionType.EDIT,
|
|
6627
|
+
ActionType.REGISTER
|
|
6628
|
+
]
|
|
6629
|
+
},
|
|
6630
|
+
{
|
|
6631
|
+
flag: InherentFlags.POTENTIAL_DUPLICATE,
|
|
6632
|
+
setOn: [ActionType.DUPLICATE_DETECTED],
|
|
6633
|
+
resetOn: [ActionType.MARK_AS_DUPLICATE, ActionType.MARK_AS_NOT_DUPLICATE]
|
|
6634
|
+
},
|
|
6635
|
+
{
|
|
6636
|
+
flag: InherentFlags.EDIT_IN_PROGRESS,
|
|
6637
|
+
setOn: [ActionType.EDIT],
|
|
6638
|
+
resetOnAnyOtherAction: true
|
|
6639
|
+
}
|
|
6640
|
+
];
|
|
6641
|
+
function resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration) {
|
|
6642
|
+
return acceptedActions.reduce((present, action, idx) => {
|
|
6643
|
+
if (rule.setOn.includes(action.type)) {
|
|
6644
|
+
return true;
|
|
6645
|
+
}
|
|
6646
|
+
if (rule.resetOnAnyOtherAction || (rule.resetOn ?? []).includes(action.type)) {
|
|
6647
|
+
return false;
|
|
6648
|
+
}
|
|
6649
|
+
if (actionConfigRemovesFlag(
|
|
6650
|
+
action,
|
|
6651
|
+
rule.flag,
|
|
6652
|
+
acceptedActions.slice(0, idx + 1),
|
|
6653
|
+
event2,
|
|
6654
|
+
eventConfiguration
|
|
6655
|
+
)) {
|
|
6656
|
+
return false;
|
|
6657
|
+
}
|
|
6658
|
+
return present;
|
|
6659
|
+
}, false);
|
|
6660
|
+
}
|
|
6438
6661
|
function resolveEventCustomFlags(event2, eventConfiguration) {
|
|
6439
6662
|
const actions = getAcceptedActions(event2).filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6440
6663
|
return actions.reduce((acc, action, idx) => {
|
|
@@ -6470,8 +6693,7 @@ function resolveEventCustomFlags(event2, eventConfiguration) {
|
|
|
6470
6693
|
return (0, import_lodash3.uniq)(flags);
|
|
6471
6694
|
}, []);
|
|
6472
6695
|
}
|
|
6473
|
-
function
|
|
6474
|
-
const sortedActions = event2.actions.filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6696
|
+
function getActionStatusFlags(sortedActions) {
|
|
6475
6697
|
const actionStatus = sortedActions.reduce(
|
|
6476
6698
|
(actionStatuses, { type, status: status2 }) => ({
|
|
6477
6699
|
...actionStatuses,
|
|
@@ -6479,26 +6701,26 @@ function getEventFlags(event2, config) {
|
|
|
6479
6701
|
}),
|
|
6480
6702
|
{}
|
|
6481
6703
|
);
|
|
6482
|
-
|
|
6704
|
+
return Object.entries(actionStatus).filter(([, status2]) => status2 !== ActionStatus.Accepted).map(([type, status2]) => {
|
|
6483
6705
|
const flag2 = joinValues([type, status2], ":").toLowerCase();
|
|
6484
6706
|
return flag2;
|
|
6485
6707
|
});
|
|
6486
|
-
|
|
6487
|
-
|
|
6488
|
-
|
|
6489
|
-
|
|
6490
|
-
|
|
6491
|
-
|
|
6492
|
-
|
|
6493
|
-
|
|
6494
|
-
|
|
6495
|
-
|
|
6496
|
-
|
|
6497
|
-
|
|
6498
|
-
|
|
6499
|
-
|
|
6500
|
-
|
|
6501
|
-
|
|
6708
|
+
}
|
|
6709
|
+
function getInherentFlags(sortedActions, event2, eventConfiguration) {
|
|
6710
|
+
const acceptedActions = sortedActions.filter(
|
|
6711
|
+
({ status: status2 }) => status2 === ActionStatus.Accepted
|
|
6712
|
+
);
|
|
6713
|
+
return INHERENT_FLAG_RULES.filter(
|
|
6714
|
+
(rule) => resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration)
|
|
6715
|
+
).map(({ flag: flag2 }) => flag2);
|
|
6716
|
+
}
|
|
6717
|
+
function getEventFlags(event2, config) {
|
|
6718
|
+
const sortedActions = event2.actions.filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6719
|
+
return [
|
|
6720
|
+
...getActionStatusFlags(sortedActions),
|
|
6721
|
+
...getInherentFlags(sortedActions, event2, config),
|
|
6722
|
+
...resolveEventCustomFlags(event2, config)
|
|
6723
|
+
];
|
|
6502
6724
|
}
|
|
6503
6725
|
|
|
6504
6726
|
// ../commons/src/events/state/index.ts
|
|
@@ -6733,7 +6955,7 @@ function getActionAnnotation({
|
|
|
6733
6955
|
const action = (0, import_lodash4.findLast)(activeActions, (a) => a.type === actionType);
|
|
6734
6956
|
const actionWithCompleteAnnotation = action && {
|
|
6735
6957
|
...action,
|
|
6736
|
-
annotation: getCompleteActionAnnotation(
|
|
6958
|
+
annotation: getCompleteActionAnnotation(event2, action)
|
|
6737
6959
|
};
|
|
6738
6960
|
const matchingDraft = draft?.action.type === actionType ? draft : void 0;
|
|
6739
6961
|
const sortedActions = (0, import_lodash4.orderBy)(
|
|
@@ -6805,6 +7027,9 @@ function createFieldConfig(fieldId, options) {
|
|
|
6805
7027
|
}
|
|
6806
7028
|
|
|
6807
7029
|
// ../commons/src/events/field.ts
|
|
7030
|
+
function evaluate(computationFn) {
|
|
7031
|
+
return { $$code: computationFn.toString() };
|
|
7032
|
+
}
|
|
6808
7033
|
function field(fieldId, options = {}) {
|
|
6809
7034
|
return {
|
|
6810
7035
|
...createFieldConditionals(fieldId),
|
|
@@ -7498,6 +7723,11 @@ var TENNIS_CLUB_DECLARATION_REVIEW = {
|
|
|
7498
7723
|
id: "signature.upload.modal.title",
|
|
7499
7724
|
defaultMessage: "Draw signature",
|
|
7500
7725
|
description: "Title for the modal to draw signature"
|
|
7726
|
+
},
|
|
7727
|
+
// Zod applies the schema default at parse time, but this fixture bypasses
|
|
7728
|
+
// parsing — GeneratedInputField accesses configuration.maxFileSize directly.
|
|
7729
|
+
configuration: {
|
|
7730
|
+
maxFileSize: 5 * 1024 * 1024
|
|
7501
7731
|
}
|
|
7502
7732
|
}
|
|
7503
7733
|
]
|
|
@@ -10054,7 +10284,7 @@ function matchesJurisdictionFilter(locationIds, filter, user2) {
|
|
|
10054
10284
|
return locationIds.some((id) => id === user2.primaryOfficeId);
|
|
10055
10285
|
}
|
|
10056
10286
|
if (filter === JurisdictionFilter.enum.administrativeArea) {
|
|
10057
|
-
return user2.administrativeAreaId
|
|
10287
|
+
return !user2.administrativeAreaId || locationIds.some((id) => id === user2.administrativeAreaId);
|
|
10058
10288
|
}
|
|
10059
10289
|
return true;
|
|
10060
10290
|
}
|
|
@@ -10143,7 +10373,7 @@ function canAccessUserWithScope({
|
|
|
10143
10373
|
}
|
|
10144
10374
|
const hasAdministrativeAreaInHierarchy = userToAccess.administrativeHierarchy.some(
|
|
10145
10375
|
(id) => user2.administrativeAreaId === id
|
|
10146
|
-
) || user2.administrativeAreaId
|
|
10376
|
+
) || !user2.administrativeAreaId;
|
|
10147
10377
|
if (opts?.accessLevel === JurisdictionFilter.enum.administrativeArea && !hasAdministrativeAreaInHierarchy) {
|
|
10148
10378
|
return false;
|
|
10149
10379
|
}
|
|
@@ -10449,18 +10679,19 @@ var ACTION_FILTERS = {
|
|
|
10449
10679
|
function filterActionsByFlags(actions, flags) {
|
|
10450
10680
|
return actions.filter((action) => ACTION_FILTERS[action]?.(flags) ?? true);
|
|
10451
10681
|
}
|
|
10682
|
+
var REJECTED_ACTIONS = [
|
|
10683
|
+
ActionType.READ,
|
|
10684
|
+
ActionType.NOTIFY,
|
|
10685
|
+
ActionType.CUSTOM,
|
|
10686
|
+
ActionType.EDIT,
|
|
10687
|
+
ActionType.ARCHIVE
|
|
10688
|
+
];
|
|
10452
10689
|
function getAvailableActionsWithoutFlagFilters(status2, flags) {
|
|
10453
10690
|
if (flags.includes(InherentFlags.EDIT_IN_PROGRESS)) {
|
|
10454
10691
|
return [ActionType.NOTIFY, ActionType.DECLARE, ActionType.REGISTER];
|
|
10455
10692
|
}
|
|
10456
|
-
if (flags.includes(InherentFlags.REJECTED)) {
|
|
10457
|
-
return
|
|
10458
|
-
ActionType.READ,
|
|
10459
|
-
ActionType.NOTIFY,
|
|
10460
|
-
ActionType.CUSTOM,
|
|
10461
|
-
ActionType.EDIT,
|
|
10462
|
-
ActionType.ARCHIVE
|
|
10463
|
-
];
|
|
10693
|
+
if (flags.includes(InherentFlags.REJECTED) && status2 !== EventStatus.enum.ARCHIVED) {
|
|
10694
|
+
return REJECTED_ACTIONS;
|
|
10464
10695
|
}
|
|
10465
10696
|
return AVAILABLE_ACTIONS_BY_EVENT_STATUS[status2];
|
|
10466
10697
|
}
|