@opencrvs/toolkit 2.0.0-rc.cb67c16 → 2.0.0-rc.cbd6475
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 +10 -4
- package/dist/commons/api/router.d.ts +28 -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/ActionConfig.d.ts +28 -2
- package/dist/commons/events/AdvancedSearchConfig.d.ts +342 -0
- package/dist/commons/events/CountryConfigQueryInput.d.ts +42 -0
- package/dist/commons/events/EventIndex.d.ts +14 -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/WorkqueueConfig.d.ts +39 -0
- package/dist/commons/events/field.d.ts +53 -1
- package/dist/commons/events/state/utils.d.ts +12 -290
- package/dist/commons/events/utils.d.ts +1 -1
- package/dist/conditionals/index.js +48 -1
- package/dist/events/index.js +355 -144
- package/dist/migrations/v2.0/checkout-upstream-files.d.ts +1 -1
- package/dist/migrations/v2.0/checkout-upstream-files.d.ts.map +1 -1
- package/dist/migrations/v2.0/checkout-upstream-files.js +1 -1
- package/dist/migrations/v2.0/index.js +10 -4
- package/dist/notification/index.js +246 -38
- package/dist/scopes/index.d.ts +4 -6
- package/dist/scopes/index.js +9 -3
- package/opencrvs-toolkit-2.0.0-rc.cbd6475.tgz +0 -0
- package/package.json +1 -1
- package/opencrvs-toolkit-2.0.0-rc.cb67c16.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,
|
|
@@ -348,6 +354,7 @@ __export(events_exports, {
|
|
|
348
354
|
isBulletListFieldType: () => isBulletListFieldType,
|
|
349
355
|
isButtonFieldType: () => isButtonFieldType,
|
|
350
356
|
isCheckboxFieldType: () => isCheckboxFieldType,
|
|
357
|
+
isCodeToEvaluate: () => isCodeToEvaluate,
|
|
351
358
|
isConditionMet: () => isConditionMet,
|
|
352
359
|
isCountryFieldType: () => isCountryFieldType,
|
|
353
360
|
isCustomFieldType: () => isCustomFieldType,
|
|
@@ -424,11 +431,13 @@ __export(events_exports, {
|
|
|
424
431
|
resolveDateOfEvent: () => resolveDateOfEvent,
|
|
425
432
|
resolveEventCustomFlags: () => resolveEventCustomFlags,
|
|
426
433
|
resolvePlaceOfEvent: () => resolvePlaceOfEvent,
|
|
434
|
+
runClientFunction: () => runClientFunction,
|
|
427
435
|
runFieldValidations: () => runFieldValidations,
|
|
428
436
|
runStructuralValidations: () => runStructuralValidations,
|
|
429
437
|
safeUnion: () => safeUnion,
|
|
430
438
|
status: () => status,
|
|
431
439
|
timePeriodToDateRange: () => timePeriodToDateRange,
|
|
440
|
+
todayISO: () => todayISO,
|
|
432
441
|
user: () => user,
|
|
433
442
|
userCanAccessEventWithScopes: () => userCanAccessEventWithScopes,
|
|
434
443
|
validate: () => validate,
|
|
@@ -703,14 +712,20 @@ var unflattenScope = (input) => {
|
|
|
703
712
|
return { type, options };
|
|
704
713
|
};
|
|
705
714
|
var EncodedScope = z2.string().brand("EncodedScope");
|
|
706
|
-
var
|
|
707
|
-
|
|
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, {
|
|
708
721
|
ignoreQueryPrefix: true,
|
|
709
722
|
comma: true,
|
|
710
723
|
allowDots: true
|
|
711
724
|
});
|
|
712
725
|
const unflattenedScope = unflattenScope(scope);
|
|
713
|
-
|
|
726
|
+
const result = Scope.safeParse(unflattenedScope)?.data;
|
|
727
|
+
decodedScopeCache.set(encodedScope, result);
|
|
728
|
+
return result;
|
|
714
729
|
};
|
|
715
730
|
var DEFAULT_SCOPE_OPTIONS = {
|
|
716
731
|
placeOfEvent: JurisdictionFilter.enum.all,
|
|
@@ -1205,6 +1220,11 @@ var FieldTypesToHideInReview = [
|
|
|
1205
1220
|
FieldType.ALPHA_PRINT_BUTTON,
|
|
1206
1221
|
FieldType.ALPHA_HIDDEN
|
|
1207
1222
|
];
|
|
1223
|
+
var HiddenFieldTypes = [
|
|
1224
|
+
FieldType.HTTP,
|
|
1225
|
+
FieldType.QUERY_PARAM_READER,
|
|
1226
|
+
FieldType.ALPHA_HIDDEN
|
|
1227
|
+
];
|
|
1208
1228
|
|
|
1209
1229
|
// ../commons/src/events/FieldValue.ts
|
|
1210
1230
|
var z12 = __toESM(require("zod/v4"));
|
|
@@ -1331,7 +1351,7 @@ function plainDateToLocalDate(date) {
|
|
|
1331
1351
|
// ../commons/src/events/FieldValue.ts
|
|
1332
1352
|
var TextValue = z12.string();
|
|
1333
1353
|
var HiddenFieldValue = z12.string();
|
|
1334
|
-
var NonEmptyTextValue =
|
|
1354
|
+
var NonEmptyTextValue = z12.string().trim().min(1);
|
|
1335
1355
|
var DateValue = z12.iso.date().describe("Date in the format YYYY-MM-DD");
|
|
1336
1356
|
var AgeValue = z12.object({
|
|
1337
1357
|
age: z12.number(),
|
|
@@ -1360,6 +1380,7 @@ var DateRangeFieldValue = z12.object({
|
|
|
1360
1380
|
var EmailValue = z12.email();
|
|
1361
1381
|
var CheckboxFieldValue = z12.boolean();
|
|
1362
1382
|
var NumberFieldValue = z12.number();
|
|
1383
|
+
var SignatureFieldValue = FileFieldValue;
|
|
1363
1384
|
var ButtonFieldValue = z12.number();
|
|
1364
1385
|
var VerificationStatusValue = z12.enum([
|
|
1365
1386
|
"verified",
|
|
@@ -2002,7 +2023,8 @@ var Range = import_v4.z.object({
|
|
|
2002
2023
|
});
|
|
2003
2024
|
var ContainsFlags = import_v4.z.object({
|
|
2004
2025
|
anyOf: import_v4.z.array(Flag).optional(),
|
|
2005
|
-
noneOf: import_v4.z.array(Flag).optional()
|
|
2026
|
+
noneOf: import_v4.z.array(Flag).optional(),
|
|
2027
|
+
allOf: import_v4.z.array(Flag).optional()
|
|
2006
2028
|
}).meta({
|
|
2007
2029
|
id: "ContainsFlags"
|
|
2008
2030
|
});
|
|
@@ -2191,8 +2213,21 @@ var FieldReference = import_v43.default.object({
|
|
|
2191
2213
|
$$field: FieldId.describe("Id of the field to reference"),
|
|
2192
2214
|
$$subfield: import_v43.default.array(import_v43.default.string()).optional().default([]).describe(
|
|
2193
2215
|
'If the FieldValue is an object, subfield can be used to refer to e.g. `["foo", "bar"]` in `{ foo: { bar: 3 } }`'
|
|
2216
|
+
),
|
|
2217
|
+
$$code: import_v43.default.string().optional().describe(
|
|
2218
|
+
"Serialised client-side function body. When present the expression is evaluated rather than dereferenced."
|
|
2219
|
+
)
|
|
2220
|
+
}).describe(
|
|
2221
|
+
"Reference to a field value, with an optional client-side computation applied."
|
|
2222
|
+
);
|
|
2223
|
+
function isCodeToEvaluate(v) {
|
|
2224
|
+
return !!v && typeof v === "object" && "$$code" in v;
|
|
2225
|
+
}
|
|
2226
|
+
var ComputedDefaultValue = import_v43.default.object({
|
|
2227
|
+
$$code: import_v43.default.string().describe(
|
|
2228
|
+
"Serialised client-side function body. Receives (undefined, context) where context includes $now, $online, and system variables."
|
|
2194
2229
|
)
|
|
2195
|
-
}).describe("
|
|
2230
|
+
}).describe("A context-only computation used as a field default value.");
|
|
2196
2231
|
var ValidationConfig = import_v43.default.object({
|
|
2197
2232
|
validator: Conditional.describe(
|
|
2198
2233
|
"Conditional expression that must hold for the field value to be considered valid."
|
|
@@ -2233,7 +2268,7 @@ var BaseField = import_v43.default.object({
|
|
|
2233
2268
|
"Indicates whether the field can be modified during record correction."
|
|
2234
2269
|
),
|
|
2235
2270
|
value: FieldReference.or(import_v43.default.array(FieldReference)).optional().describe(
|
|
2236
|
-
"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."
|
|
2271
|
+
"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."
|
|
2237
2272
|
),
|
|
2238
2273
|
analytics: import_v43.default.boolean().default(false).optional().describe(
|
|
2239
2274
|
"Indicates whether the field is included in analytics. When enabled, its value becomes available in the analytics dashboard."
|
|
@@ -2247,7 +2282,7 @@ var Divider = BaseField.extend({
|
|
|
2247
2282
|
});
|
|
2248
2283
|
var TextField = BaseField.extend({
|
|
2249
2284
|
type: import_v43.default.literal(FieldType.TEXT),
|
|
2250
|
-
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField]).optional(),
|
|
2285
|
+
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField, ComputedDefaultValue]).optional(),
|
|
2251
2286
|
configuration: import_v43.default.object({
|
|
2252
2287
|
maxLength: import_v43.default.number().optional().describe("Maximum length of the text"),
|
|
2253
2288
|
type: import_v43.default.enum(["text", "password"]).optional(),
|
|
@@ -2260,10 +2295,11 @@ var TextField = BaseField.extend({
|
|
|
2260
2295
|
});
|
|
2261
2296
|
var NumberField = BaseField.extend({
|
|
2262
2297
|
type: import_v43.default.literal(FieldType.NUMBER),
|
|
2263
|
-
defaultValue: NumberFieldValue.optional(),
|
|
2298
|
+
defaultValue: NumberFieldValue.or(ComputedDefaultValue).optional(),
|
|
2264
2299
|
configuration: import_v43.default.object({
|
|
2265
2300
|
min: import_v43.default.number().optional().describe("Minimum value"),
|
|
2266
2301
|
max: import_v43.default.number().optional().describe("Maximum value"),
|
|
2302
|
+
integer: import_v43.default.boolean().optional().describe("When true, only whole numbers are allowed"),
|
|
2267
2303
|
prefix: TranslationConfig.optional(),
|
|
2268
2304
|
postfix: TranslationConfig.optional()
|
|
2269
2305
|
}).optional()
|
|
@@ -2273,7 +2309,7 @@ var NumberField = BaseField.extend({
|
|
|
2273
2309
|
});
|
|
2274
2310
|
var TextAreaField = BaseField.extend({
|
|
2275
2311
|
type: import_v43.default.literal(FieldType.TEXTAREA),
|
|
2276
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2312
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2277
2313
|
configuration: import_v43.default.object({
|
|
2278
2314
|
maxLength: import_v43.default.number().optional().describe("Maximum length of the text"),
|
|
2279
2315
|
rows: import_v43.default.number().optional().describe("Number of visible text lines"),
|
|
@@ -2307,7 +2343,7 @@ var SignatureField = BaseField.extend({
|
|
|
2307
2343
|
signaturePromptLabel: TranslationConfig.describe(
|
|
2308
2344
|
"Title of the signature modal"
|
|
2309
2345
|
),
|
|
2310
|
-
defaultValue:
|
|
2346
|
+
defaultValue: SignatureFieldValue.or(ComputedDefaultValue).optional(),
|
|
2311
2347
|
configuration: import_v43.default.object({
|
|
2312
2348
|
maxFileSize: import_v43.default.number().describe("Maximum file size in bytes").default(DEFAULT_MAX_FILE_SIZE_BYTES),
|
|
2313
2349
|
acceptedFileTypes: MimeType.array().optional().describe("List of allowed file formats for the signature")
|
|
@@ -2323,14 +2359,14 @@ var EmailField = BaseField.extend({
|
|
|
2323
2359
|
configuration: import_v43.default.object({
|
|
2324
2360
|
maxLength: import_v43.default.number().optional().describe("Maximum length of the text")
|
|
2325
2361
|
}).default({ maxLength: 255 }).optional(),
|
|
2326
|
-
defaultValue: NonEmptyTextValue.optional()
|
|
2362
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional()
|
|
2327
2363
|
}).meta({
|
|
2328
2364
|
description: "An email input field",
|
|
2329
2365
|
id: "EmailField"
|
|
2330
2366
|
});
|
|
2331
2367
|
var DateField = BaseField.extend({
|
|
2332
2368
|
type: import_v43.default.literal(FieldType.DATE),
|
|
2333
|
-
defaultValue: SerializedNowDateTime.or(PlainDate).optional().describe("Default date value(yyyy-MM-dd)"),
|
|
2369
|
+
defaultValue: SerializedNowDateTime.or(PlainDate).or(ComputedDefaultValue).optional().describe("Default date value(yyyy-MM-dd)"),
|
|
2334
2370
|
configuration: import_v43.default.object({
|
|
2335
2371
|
notice: TranslationConfig.describe(
|
|
2336
2372
|
"Text to display above the date input"
|
|
@@ -2342,7 +2378,7 @@ var DateField = BaseField.extend({
|
|
|
2342
2378
|
});
|
|
2343
2379
|
var AgeField = BaseField.extend({
|
|
2344
2380
|
type: import_v43.default.literal(FieldType.AGE),
|
|
2345
|
-
defaultValue: NumberFieldValue.optional(),
|
|
2381
|
+
defaultValue: NumberFieldValue.or(ComputedDefaultValue).optional(),
|
|
2346
2382
|
configuration: import_v43.default.object({
|
|
2347
2383
|
asOfDate: FieldReference,
|
|
2348
2384
|
prefix: TranslationConfig.optional(),
|
|
@@ -2354,7 +2390,7 @@ var AgeField = BaseField.extend({
|
|
|
2354
2390
|
});
|
|
2355
2391
|
var TimeField = BaseField.extend({
|
|
2356
2392
|
type: import_v43.default.literal(FieldType.TIME),
|
|
2357
|
-
defaultValue: SerializedNowDateTime.or(TimeValue).optional().describe("Default time value (HH-mm)"),
|
|
2393
|
+
defaultValue: SerializedNowDateTime.or(TimeValue).or(ComputedDefaultValue).optional().describe("Default time value (HH-mm)"),
|
|
2358
2394
|
configuration: import_v43.default.object({
|
|
2359
2395
|
use12HourFormat: import_v43.default.boolean().optional().describe("Whether to use 12-hour format"),
|
|
2360
2396
|
notice: TranslationConfig.describe(
|
|
@@ -2367,7 +2403,7 @@ var TimeField = BaseField.extend({
|
|
|
2367
2403
|
});
|
|
2368
2404
|
var DateRangeField = BaseField.extend({
|
|
2369
2405
|
type: import_v43.default.literal(FieldType.DATE_RANGE),
|
|
2370
|
-
defaultValue: DateRangeFieldValue.optional(),
|
|
2406
|
+
defaultValue: DateRangeFieldValue.or(ComputedDefaultValue).optional(),
|
|
2371
2407
|
configuration: import_v43.default.object({
|
|
2372
2408
|
notice: TranslationConfig.describe(
|
|
2373
2409
|
"Text to display above the date input"
|
|
@@ -2446,7 +2482,7 @@ var PageHeader = BaseField.extend({
|
|
|
2446
2482
|
});
|
|
2447
2483
|
var File = BaseField.extend({
|
|
2448
2484
|
type: import_v43.default.literal(FieldType.FILE),
|
|
2449
|
-
defaultValue: FileFieldValue.optional(),
|
|
2485
|
+
defaultValue: FileFieldValue.or(ComputedDefaultValue).optional(),
|
|
2450
2486
|
configuration: import_v43.default.object({
|
|
2451
2487
|
maxFileSize: import_v43.default.number().describe("Maximum file size in bytes").default(DEFAULT_MAX_FILE_SIZE_BYTES),
|
|
2452
2488
|
acceptedFileTypes: MimeType.array().optional().describe("List of allowed file formats for the signature"),
|
|
@@ -2473,7 +2509,7 @@ var SelectOption = import_v43.default.object({
|
|
|
2473
2509
|
});
|
|
2474
2510
|
var NumberWithUnitField = BaseField.extend({
|
|
2475
2511
|
type: import_v43.default.literal(FieldType.NUMBER_WITH_UNIT),
|
|
2476
|
-
defaultValue: NumberWithUnitFieldValue.optional(),
|
|
2512
|
+
defaultValue: NumberWithUnitFieldValue.or(ComputedDefaultValue).optional(),
|
|
2477
2513
|
options: import_v43.default.array(SelectOption).describe("A list of options for the unit select"),
|
|
2478
2514
|
configuration: import_v43.default.object({
|
|
2479
2515
|
min: import_v43.default.number().optional().describe("Minimum value of the number field"),
|
|
@@ -2488,7 +2524,7 @@ var NumberWithUnitField = BaseField.extend({
|
|
|
2488
2524
|
});
|
|
2489
2525
|
var RadioGroup = BaseField.extend({
|
|
2490
2526
|
type: import_v43.default.literal(FieldType.RADIO_GROUP),
|
|
2491
|
-
defaultValue: TextValue.optional(),
|
|
2527
|
+
defaultValue: TextValue.or(ComputedDefaultValue).optional(),
|
|
2492
2528
|
options: import_v43.default.array(SelectOption).describe("A list of options"),
|
|
2493
2529
|
configuration: import_v43.default.object({
|
|
2494
2530
|
styles: import_v43.default.object({
|
|
@@ -2513,7 +2549,7 @@ var BulletList = BaseField.extend({
|
|
|
2513
2549
|
});
|
|
2514
2550
|
var Select = BaseField.extend({
|
|
2515
2551
|
type: import_v43.default.literal(FieldType.SELECT),
|
|
2516
|
-
defaultValue: TextValue.optional(),
|
|
2552
|
+
defaultValue: TextValue.or(ComputedDefaultValue).optional(),
|
|
2517
2553
|
options: import_v43.default.array(SelectOption).describe("A list of options"),
|
|
2518
2554
|
noOptionsMessage: TranslationConfig.optional().describe(
|
|
2519
2555
|
`
|
|
@@ -2535,7 +2571,7 @@ var SelectDateRangeOption = import_v43.default.object({
|
|
|
2535
2571
|
});
|
|
2536
2572
|
var SelectDateRangeField = BaseField.extend({
|
|
2537
2573
|
type: import_v43.default.literal(FieldType.SELECT_DATE_RANGE),
|
|
2538
|
-
defaultValue: SelectDateRangeValue.optional(),
|
|
2574
|
+
defaultValue: SelectDateRangeValue.or(ComputedDefaultValue).optional(),
|
|
2539
2575
|
options: import_v43.default.array(SelectDateRangeOption).describe("A list of options")
|
|
2540
2576
|
}).meta({
|
|
2541
2577
|
description: "A date range selection field",
|
|
@@ -2552,7 +2588,7 @@ var NameField = BaseField.extend({
|
|
|
2552
2588
|
firstname: SerializedUserField.or(NonEmptyTextValue).optional(),
|
|
2553
2589
|
middlename: SerializedUserField.or(NonEmptyTextValue).optional(),
|
|
2554
2590
|
surname: SerializedUserField.or(NonEmptyTextValue).optional()
|
|
2555
|
-
}).optional(),
|
|
2591
|
+
}).or(ComputedDefaultValue).optional(),
|
|
2556
2592
|
configuration: import_v43.default.object({
|
|
2557
2593
|
name: NameConfig.default({
|
|
2558
2594
|
firstname: { required: true },
|
|
@@ -2576,14 +2612,14 @@ var NameField = BaseField.extend({
|
|
|
2576
2612
|
id: "NameField"
|
|
2577
2613
|
});
|
|
2578
2614
|
var PhoneField = BaseField.extend({
|
|
2579
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2615
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2580
2616
|
type: import_v43.default.literal(FieldType.PHONE)
|
|
2581
2617
|
}).meta({
|
|
2582
2618
|
description: "A field for entering a phone number",
|
|
2583
2619
|
id: "PhoneField"
|
|
2584
2620
|
});
|
|
2585
2621
|
var IdField = BaseField.extend({
|
|
2586
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2622
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2587
2623
|
type: import_v43.default.literal(FieldType.ID)
|
|
2588
2624
|
}).meta({
|
|
2589
2625
|
description: "A field for entering an ID",
|
|
@@ -2591,14 +2627,14 @@ var IdField = BaseField.extend({
|
|
|
2591
2627
|
});
|
|
2592
2628
|
var Checkbox = BaseField.extend({
|
|
2593
2629
|
type: import_v43.default.literal(FieldType.CHECKBOX),
|
|
2594
|
-
defaultValue: CheckboxFieldValue.default(false)
|
|
2630
|
+
defaultValue: CheckboxFieldValue.or(ComputedDefaultValue).default(false)
|
|
2595
2631
|
}).meta({
|
|
2596
2632
|
description: "A boolean checkbox field",
|
|
2597
2633
|
id: "Checkbox"
|
|
2598
2634
|
});
|
|
2599
2635
|
var Country = BaseField.extend({
|
|
2600
2636
|
type: import_v43.default.literal(FieldType.COUNTRY),
|
|
2601
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2637
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2602
2638
|
optionOverrides: import_v43.default.array(SelectOption.omit({ label: true })).optional().describe(
|
|
2603
2639
|
"Conditionals for specific countries. Countries not listed are always shown and enabled."
|
|
2604
2640
|
)
|
|
@@ -2616,7 +2652,7 @@ var AdministrativeAreas = import_v43.default.enum([
|
|
|
2616
2652
|
]);
|
|
2617
2653
|
var AdministrativeAreaField = BaseField.extend({
|
|
2618
2654
|
type: import_v43.default.literal(FieldType.ADMINISTRATIVE_AREA),
|
|
2619
|
-
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField]).optional(),
|
|
2655
|
+
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField, ComputedDefaultValue]).optional(),
|
|
2620
2656
|
configuration: import_v43.default.object({
|
|
2621
2657
|
partOf: FieldReference.optional().describe("Parent location"),
|
|
2622
2658
|
type: AdministrativeAreas,
|
|
@@ -2628,7 +2664,7 @@ var AdministrativeAreaField = BaseField.extend({
|
|
|
2628
2664
|
});
|
|
2629
2665
|
var LocationInput = BaseField.extend({
|
|
2630
2666
|
type: import_v43.default.literal(FieldType.LOCATION),
|
|
2631
|
-
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField]).optional(),
|
|
2667
|
+
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField, ComputedDefaultValue]).optional(),
|
|
2632
2668
|
configuration: import_v43.default.object({
|
|
2633
2669
|
locationTypes: import_v43.default.array(import_v43.default.string()).optional().describe("Types of the locations that are available for selection."),
|
|
2634
2670
|
allowedLocations: AllowedLocations
|
|
@@ -2640,7 +2676,7 @@ var LocationInput = BaseField.extend({
|
|
|
2640
2676
|
var FileUploadWithOptions = BaseField.extend({
|
|
2641
2677
|
type: import_v43.default.literal(FieldType.FILE_WITH_OPTIONS),
|
|
2642
2678
|
options: import_v43.default.array(SelectOption).describe("A list of options"),
|
|
2643
|
-
defaultValue: FileFieldWithOptionValue.optional(),
|
|
2679
|
+
defaultValue: FileFieldWithOptionValue.or(ComputedDefaultValue).optional(),
|
|
2644
2680
|
configuration: import_v43.default.object({
|
|
2645
2681
|
maxFileSize: import_v43.default.number().describe("Maximum file size in bytes").default(DEFAULT_MAX_FILE_SIZE_BYTES),
|
|
2646
2682
|
maxImageSize: import_v43.default.object({
|
|
@@ -2656,12 +2692,12 @@ var FileUploadWithOptions = BaseField.extend({
|
|
|
2656
2692
|
});
|
|
2657
2693
|
var Facility = BaseField.extend({
|
|
2658
2694
|
type: import_v43.default.literal(FieldType.FACILITY),
|
|
2659
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2695
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2660
2696
|
configuration: import_v43.default.object({ allowedLocations: AllowedLocations }).optional()
|
|
2661
2697
|
}).describe("Input field for a facility");
|
|
2662
2698
|
var Office = BaseField.extend({
|
|
2663
2699
|
type: import_v43.default.literal(FieldType.OFFICE),
|
|
2664
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2700
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2665
2701
|
configuration: import_v43.default.object({ allowedLocations: AllowedLocations }).optional()
|
|
2666
2702
|
}).describe("Input field for an office");
|
|
2667
2703
|
var DefaultAddressFieldValue = DomesticAddressFieldValue.extend({
|
|
@@ -2697,7 +2733,7 @@ var Address = BaseField.extend({
|
|
|
2697
2733
|
).optional(),
|
|
2698
2734
|
allowedLocations: AllowedLocations
|
|
2699
2735
|
}).optional(),
|
|
2700
|
-
defaultValue: DefaultAddressFieldValue.optional()
|
|
2736
|
+
defaultValue: DefaultAddressFieldValue.or(ComputedDefaultValue).optional()
|
|
2701
2737
|
}).meta({
|
|
2702
2738
|
description: "Address input field \u2013 a combination of location and text fields",
|
|
2703
2739
|
id: "Address"
|
|
@@ -2744,7 +2780,7 @@ var ButtonConfiguration = import_v43.default.object({
|
|
|
2744
2780
|
});
|
|
2745
2781
|
var ButtonField = BaseField.extend({
|
|
2746
2782
|
type: import_v43.default.literal(FieldType.BUTTON),
|
|
2747
|
-
defaultValue: ButtonFieldValue.optional(),
|
|
2783
|
+
defaultValue: ButtonFieldValue.or(ComputedDefaultValue).optional(),
|
|
2748
2784
|
configuration: ButtonConfiguration
|
|
2749
2785
|
}).meta({
|
|
2750
2786
|
description: "A generic button that can be used to trigger an action",
|
|
@@ -2772,7 +2808,7 @@ var AlphaPrintButton = BaseField.extend({
|
|
|
2772
2808
|
});
|
|
2773
2809
|
var HttpField = BaseField.extend({
|
|
2774
2810
|
type: import_v43.default.literal(FieldType.HTTP),
|
|
2775
|
-
defaultValue: HttpFieldValue.optional(),
|
|
2811
|
+
defaultValue: HttpFieldValue.or(ComputedDefaultValue).optional(),
|
|
2776
2812
|
configuration: import_v43.default.object({
|
|
2777
2813
|
trigger: FieldReference.optional().describe(
|
|
2778
2814
|
"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."
|
|
@@ -2858,7 +2894,7 @@ var LinkButtonField = BaseField.extend({
|
|
|
2858
2894
|
});
|
|
2859
2895
|
var VerificationStatus = BaseField.extend({
|
|
2860
2896
|
type: import_v43.default.literal(FieldType.VERIFICATION_STATUS),
|
|
2861
|
-
defaultValue: VerificationStatusValue.optional(),
|
|
2897
|
+
defaultValue: VerificationStatusValue.or(ComputedDefaultValue).optional(),
|
|
2862
2898
|
configuration: import_v43.default.object({
|
|
2863
2899
|
status: TranslationConfig.describe("Text to display on the status pill."),
|
|
2864
2900
|
description: TranslationConfig.describe(
|
|
@@ -2880,7 +2916,7 @@ var QueryParamReaderField = BaseField.extend({
|
|
|
2880
2916
|
});
|
|
2881
2917
|
var QrReaderField = BaseField.extend({
|
|
2882
2918
|
type: import_v43.default.literal(FieldType.QR_READER),
|
|
2883
|
-
defaultValue: QrReaderFieldValue.optional(),
|
|
2919
|
+
defaultValue: QrReaderFieldValue.or(ComputedDefaultValue).optional(),
|
|
2884
2920
|
configuration: import_v43.default.object({
|
|
2885
2921
|
validator: import_v43.default.any().meta({
|
|
2886
2922
|
description: "JSON Schema to validate the scanned QR code data against before populating the form fields.",
|
|
@@ -2893,7 +2929,7 @@ var QrReaderField = BaseField.extend({
|
|
|
2893
2929
|
});
|
|
2894
2930
|
var IdReaderField = BaseField.extend({
|
|
2895
2931
|
type: import_v43.default.literal(FieldType.ID_READER),
|
|
2896
|
-
defaultValue: IdReaderFieldValue.optional(),
|
|
2932
|
+
defaultValue: IdReaderFieldValue.or(ComputedDefaultValue).optional(),
|
|
2897
2933
|
methods: import_v43.default.array(
|
|
2898
2934
|
import_v43.default.union([QrReaderField, LinkButtonField]).describe("Methods for reading an ID")
|
|
2899
2935
|
)
|
|
@@ -3187,6 +3223,11 @@ var ReadActionConfig = ActionConfigBase.extend(
|
|
|
3187
3223
|
conditionals: z24.never().optional().describe("Read-action can not be disabled or hidden with conditionals.")
|
|
3188
3224
|
}).shape
|
|
3189
3225
|
);
|
|
3226
|
+
var NotifyConfig = ActionConfigBase.extend(
|
|
3227
|
+
z24.object({
|
|
3228
|
+
type: z24.literal(ActionType.NOTIFY)
|
|
3229
|
+
}).shape
|
|
3230
|
+
);
|
|
3190
3231
|
var DeclareConfig = DeclarationActionBase.extend(
|
|
3191
3232
|
z24.object({
|
|
3192
3233
|
type: z24.literal(ActionType.DECLARE),
|
|
@@ -3271,9 +3312,13 @@ var ActionConfig = z24.discriminatedUnion("type", [
|
|
|
3271
3312
|
id: "ReadActionConfig",
|
|
3272
3313
|
description: "Configuration for the read action \u2014 defines the record-tab content displayed on the event overview page."
|
|
3273
3314
|
}),
|
|
3315
|
+
NotifyConfig.meta({
|
|
3316
|
+
id: "NotifyActionConfig",
|
|
3317
|
+
description: "Configuration for the notify action. When present, NOTIFY uses this config independently from DECLARE. When absent, NOTIFY falls back to the DeclareActionConfig."
|
|
3318
|
+
}),
|
|
3274
3319
|
DeclareConfig.meta({
|
|
3275
3320
|
id: "DeclareActionConfig",
|
|
3276
|
-
description: "Configuration for the declare action. Includes review-page fields.
|
|
3321
|
+
description: "Configuration for the declare action. Includes review-page fields. NOTIFY falls back to this config when no dedicated NotifyActionConfig is provided."
|
|
3277
3322
|
}),
|
|
3278
3323
|
RejectConfig.meta({
|
|
3279
3324
|
id: "RejectActionConfig",
|
|
@@ -3452,6 +3497,9 @@ var BaseField3 = z28.object({
|
|
|
3452
3497
|
),
|
|
3453
3498
|
validations: z28.array(ValidationConfig).optional().describe(
|
|
3454
3499
|
`Option for overriding the field validations specifically for advanced search form.`
|
|
3500
|
+
),
|
|
3501
|
+
allowedLocations: JurisdictionReference.optional().describe(
|
|
3502
|
+
`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.`
|
|
3455
3503
|
)
|
|
3456
3504
|
});
|
|
3457
3505
|
var SearchQueryParams = z28.object({
|
|
@@ -3877,7 +3925,7 @@ var isHiddenFieldType = (field3) => {
|
|
|
3877
3925
|
return field3.config.type === FieldType.ALPHA_HIDDEN;
|
|
3878
3926
|
};
|
|
3879
3927
|
var isNonInteractiveFieldType = (field3) => {
|
|
3880
|
-
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.
|
|
3928
|
+
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;
|
|
3881
3929
|
};
|
|
3882
3930
|
|
|
3883
3931
|
// ../commons/src/conditionals/validate.ts
|
|
@@ -3913,7 +3961,37 @@ function resolveDataPath(rootData, dataPath, instancePath) {
|
|
|
3913
3961
|
}
|
|
3914
3962
|
return current;
|
|
3915
3963
|
}
|
|
3964
|
+
function todayISO() {
|
|
3965
|
+
return (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" });
|
|
3966
|
+
}
|
|
3967
|
+
var compiledFunctionCache = /* @__PURE__ */ new Map();
|
|
3968
|
+
function compileClientFunction(code) {
|
|
3969
|
+
let fn = compiledFunctionCache.get(code);
|
|
3970
|
+
if (!fn) {
|
|
3971
|
+
fn = new Function(`return (${code})`)();
|
|
3972
|
+
compiledFunctionCache.set(code, fn);
|
|
3973
|
+
}
|
|
3974
|
+
return fn;
|
|
3975
|
+
}
|
|
3916
3976
|
(0, import_ajv_formats.default)(ajv);
|
|
3977
|
+
function buildClientFunctionContext(input) {
|
|
3978
|
+
return {
|
|
3979
|
+
$form: input.form,
|
|
3980
|
+
$now: todayISO(),
|
|
3981
|
+
// eslint-disable-next-line @typescript-eslint/no-use-before-define
|
|
3982
|
+
$online: isOnline(),
|
|
3983
|
+
$user: input.validatorContext?.user,
|
|
3984
|
+
$event: input.validatorContext?.event,
|
|
3985
|
+
$leafAdminStructureLocationIds: input.validatorContext?.leafAdminStructureLocationIds ?? [],
|
|
3986
|
+
user: input.systemVariables?.user,
|
|
3987
|
+
$window: input.systemVariables?.$window,
|
|
3988
|
+
locations: input.locations,
|
|
3989
|
+
adminLevelIds: input.adminLevelIds
|
|
3990
|
+
};
|
|
3991
|
+
}
|
|
3992
|
+
function runClientFunction(code, data, context) {
|
|
3993
|
+
return compileClientFunction(code)(data, context);
|
|
3994
|
+
}
|
|
3917
3995
|
ajv.addKeyword({
|
|
3918
3996
|
keyword: "daysFromDate",
|
|
3919
3997
|
type: "string",
|
|
@@ -3958,7 +4036,7 @@ ajv.addKeyword({
|
|
|
3958
4036
|
$data: true,
|
|
3959
4037
|
errors: true,
|
|
3960
4038
|
// @ts-ignore -- Force type. We will move this away from AJV next. Parsing the array will take seconds and is only called by core.
|
|
3961
|
-
validate(
|
|
4039
|
+
validate(_schema, data, _2, dataContext) {
|
|
3962
4040
|
const locationIdInput = data;
|
|
3963
4041
|
const locations = dataContext?.rootData.$leafAdminStructureLocationIds ?? [];
|
|
3964
4042
|
return locations.some((location) => location.id === locationIdInput);
|
|
@@ -3989,6 +4067,23 @@ function isAgeValue(value) {
|
|
|
3989
4067
|
function mergeWithBaseFormState(values, context) {
|
|
3990
4068
|
return { ...context.baseFormState, ...values };
|
|
3991
4069
|
}
|
|
4070
|
+
ajv.addKeyword({
|
|
4071
|
+
keyword: "customClientValidator",
|
|
4072
|
+
schemaType: "object",
|
|
4073
|
+
errors: true,
|
|
4074
|
+
// @ts-expect-error -- AJV's public types don't expose `rootData`. All
|
|
4075
|
+
// `validate()` callers build root data via `buildClientFunctionContext`,
|
|
4076
|
+
// so the cast holds.
|
|
4077
|
+
validate(schema, data, _2, dataContext) {
|
|
4078
|
+
return Boolean(
|
|
4079
|
+
runClientFunction(
|
|
4080
|
+
schema.code,
|
|
4081
|
+
data,
|
|
4082
|
+
dataContext?.rootData ?? buildClientFunctionContext({ form: {} })
|
|
4083
|
+
)
|
|
4084
|
+
);
|
|
4085
|
+
}
|
|
4086
|
+
});
|
|
3992
4087
|
function validate(schema, data) {
|
|
3993
4088
|
const validator = ajv.getSchema(schema.$id) || ajv.compile(schema);
|
|
3994
4089
|
if ("$form" in data) {
|
|
@@ -4025,17 +4120,14 @@ function isOnline() {
|
|
|
4025
4120
|
}
|
|
4026
4121
|
return true;
|
|
4027
4122
|
}
|
|
4028
|
-
function isConditionMet(conditional, values, context
|
|
4029
|
-
return validate(
|
|
4030
|
-
|
|
4031
|
-
|
|
4032
|
-
|
|
4033
|
-
|
|
4034
|
-
|
|
4035
|
-
|
|
4036
|
-
$status: eventIndex?.status,
|
|
4037
|
-
$event: context.event
|
|
4038
|
-
});
|
|
4123
|
+
function isConditionMet(conditional, values, context) {
|
|
4124
|
+
return validate(
|
|
4125
|
+
conditional,
|
|
4126
|
+
buildClientFunctionContext({
|
|
4127
|
+
form: mergeWithBaseFormState(values, context),
|
|
4128
|
+
validatorContext: context
|
|
4129
|
+
})
|
|
4130
|
+
);
|
|
4039
4131
|
}
|
|
4040
4132
|
function getConditionalActionsForField(field3, values) {
|
|
4041
4133
|
if (!field3.conditionals) {
|
|
@@ -4043,9 +4135,9 @@ function getConditionalActionsForField(field3, values) {
|
|
|
4043
4135
|
}
|
|
4044
4136
|
return field3.conditionals.filter((conditional) => validate(conditional.conditional, values)).map((conditional) => conditional.type);
|
|
4045
4137
|
}
|
|
4046
|
-
function areConditionsMet(conditions, values, context,
|
|
4138
|
+
function areConditionsMet(conditions, values, context, _event) {
|
|
4047
4139
|
return conditions.every(
|
|
4048
|
-
(condition) => isConditionMet(condition.conditional, values, context
|
|
4140
|
+
(condition) => isConditionMet(condition.conditional, values, context)
|
|
4049
4141
|
);
|
|
4050
4142
|
}
|
|
4051
4143
|
function isFieldConditionMet(field3, form, conditionalType, context) {
|
|
@@ -4055,14 +4147,13 @@ function isFieldConditionMet(field3, form, conditionalType, context) {
|
|
|
4055
4147
|
if (!hasRule) {
|
|
4056
4148
|
return true;
|
|
4057
4149
|
}
|
|
4058
|
-
const validConditionals = getConditionalActionsForField(
|
|
4059
|
-
|
|
4060
|
-
|
|
4061
|
-
|
|
4062
|
-
|
|
4063
|
-
|
|
4064
|
-
|
|
4065
|
-
});
|
|
4150
|
+
const validConditionals = getConditionalActionsForField(
|
|
4151
|
+
field3,
|
|
4152
|
+
buildClientFunctionContext({
|
|
4153
|
+
form: mergeWithBaseFormState(form, context),
|
|
4154
|
+
validatorContext: context
|
|
4155
|
+
})
|
|
4156
|
+
);
|
|
4066
4157
|
return validConditionals.includes(conditionalType);
|
|
4067
4158
|
}
|
|
4068
4159
|
function isFieldVisible(field3, form, context) {
|
|
@@ -4088,7 +4179,14 @@ function isActionConditionMet(actionConfig, event2, context, conditionalType) {
|
|
|
4088
4179
|
if (!rule) {
|
|
4089
4180
|
return true;
|
|
4090
4181
|
}
|
|
4091
|
-
return
|
|
4182
|
+
return validate(rule.conditional, {
|
|
4183
|
+
...buildClientFunctionContext({
|
|
4184
|
+
form: mergeWithBaseFormState(event2.declaration, context),
|
|
4185
|
+
validatorContext: context
|
|
4186
|
+
}),
|
|
4187
|
+
$flags: event2.flags,
|
|
4188
|
+
$status: event2.status
|
|
4189
|
+
});
|
|
4092
4190
|
}
|
|
4093
4191
|
function isActionEnabled(actionConfig, event2, context) {
|
|
4094
4192
|
return isActionConditionMet(
|
|
@@ -4247,19 +4345,10 @@ function runFieldValidations({
|
|
|
4247
4345
|
if (!isFieldVisible(field3.config, form, context)) {
|
|
4248
4346
|
return [];
|
|
4249
4347
|
}
|
|
4250
|
-
const conditionalParameters = {
|
|
4251
|
-
|
|
4252
|
-
|
|
4253
|
-
|
|
4254
|
-
* In real use cases, there can be hundreds of thousands of locations.
|
|
4255
|
-
* Make sure that the context contains only the locations that are needed for validation.
|
|
4256
|
-
* E.g. if the user is a leaf admin, only the leaf locations under their admin structure are needed.
|
|
4257
|
-
* Loading few megabytes of locations to memory just for validation is not efficient and will choke the application.
|
|
4258
|
-
*/
|
|
4259
|
-
$leafAdminStructureLocationIds: context.leafAdminStructureLocationIds ?? [],
|
|
4260
|
-
$online: isOnline(),
|
|
4261
|
-
$user: context.user
|
|
4262
|
-
};
|
|
4348
|
+
const conditionalParameters = buildClientFunctionContext({
|
|
4349
|
+
form: mergeWithBaseFormState(form, context),
|
|
4350
|
+
validatorContext: context
|
|
4351
|
+
});
|
|
4263
4352
|
if (isFieldGroupFieldType(field3)) {
|
|
4264
4353
|
const subfieldErrors = buildFormState(
|
|
4265
4354
|
field3.config.fields,
|
|
@@ -4398,13 +4487,13 @@ function getActionConfig({
|
|
|
4398
4487
|
actionType,
|
|
4399
4488
|
customActionType
|
|
4400
4489
|
}) {
|
|
4490
|
+
if (actionType === ActionType.NOTIFY) {
|
|
4491
|
+
return eventConfiguration.actions.find((a) => a.type === ActionType.NOTIFY) ?? eventConfiguration.actions.find((a) => a.type === ActionType.DECLARE);
|
|
4492
|
+
}
|
|
4401
4493
|
return eventConfiguration.actions.find((a) => {
|
|
4402
4494
|
if (a.type === ActionType.CUSTOM && customActionType) {
|
|
4403
4495
|
return a.customActionType === customActionType;
|
|
4404
4496
|
}
|
|
4405
|
-
if (actionType === ActionType.NOTIFY) {
|
|
4406
|
-
return a.type === ActionType.DECLARE;
|
|
4407
|
-
}
|
|
4408
4497
|
if (actionType === ActionType.APPROVE_CORRECTION || actionType === ActionType.REJECT_CORRECTION) {
|
|
4409
4498
|
return a.type === ActionType.REQUEST_CORRECTION;
|
|
4410
4499
|
}
|
|
@@ -4441,7 +4530,7 @@ var getActionAnnotationFields = (actionConfig) => {
|
|
|
4441
4530
|
if (actionConfig.type === ActionType.CUSTOM) {
|
|
4442
4531
|
return actionConfig.form;
|
|
4443
4532
|
}
|
|
4444
|
-
if ("review" in actionConfig) {
|
|
4533
|
+
if ("review" in actionConfig && actionConfig.review != null) {
|
|
4445
4534
|
return actionConfig.review.fields;
|
|
4446
4535
|
}
|
|
4447
4536
|
return [];
|
|
@@ -4743,19 +4832,16 @@ function getPendingAction(actions) {
|
|
|
4743
4832
|
}
|
|
4744
4833
|
return pendingActions[0];
|
|
4745
4834
|
}
|
|
4746
|
-
function getCompleteActionAnnotation(
|
|
4835
|
+
function getCompleteActionAnnotation(event2, action) {
|
|
4747
4836
|
if (action.originalActionId) {
|
|
4748
4837
|
const originalAction = event2.actions.find(
|
|
4749
4838
|
({ id }) => id === action.originalActionId
|
|
4750
4839
|
);
|
|
4751
4840
|
if (originalAction?.status === ActionStatus.Requested) {
|
|
4752
|
-
return deepMerge(
|
|
4753
|
-
deepMerge(annotation, originalAction.annotation ?? {}),
|
|
4754
|
-
action.annotation ?? {}
|
|
4755
|
-
);
|
|
4841
|
+
return deepMerge(originalAction.annotation ?? {}, action.annotation ?? {});
|
|
4756
4842
|
}
|
|
4757
4843
|
}
|
|
4758
|
-
return
|
|
4844
|
+
return action.annotation ?? {};
|
|
4759
4845
|
}
|
|
4760
4846
|
function getCompleteActionContent(event2, action) {
|
|
4761
4847
|
const currentContent = "content" in action ? action.content : void 0;
|
|
@@ -4791,7 +4877,7 @@ function getAcceptedActions(event2) {
|
|
|
4791
4877
|
return event2.actions.filter(isAcceptedAction).map((action) => ({
|
|
4792
4878
|
...action,
|
|
4793
4879
|
declaration: getCompleteActionDeclaration({}, event2, action),
|
|
4794
|
-
annotation: getCompleteActionAnnotation(
|
|
4880
|
+
annotation: getCompleteActionAnnotation(event2, action)
|
|
4795
4881
|
}));
|
|
4796
4882
|
}
|
|
4797
4883
|
var EXCLUDED_ACTIONS = [
|
|
@@ -5429,7 +5515,54 @@ function createFieldConditionals(fieldId) {
|
|
|
5429
5515
|
}
|
|
5430
5516
|
},
|
|
5431
5517
|
required: [fieldId]
|
|
5432
|
-
})
|
|
5518
|
+
}),
|
|
5519
|
+
/**
|
|
5520
|
+
* Custom client-side validator. The provided function is serialised and executed
|
|
5521
|
+
* just-in-time on the client only. External references (e.g. lodash) are not
|
|
5522
|
+
* available inside the function body — all logic must be self-contained.
|
|
5523
|
+
*
|
|
5524
|
+
* @example
|
|
5525
|
+
* field('nid').customClientValidator((value) => {
|
|
5526
|
+
* // LUHN check — all logic must be inline
|
|
5527
|
+
* const digits = String(value).split('').map(Number)
|
|
5528
|
+
* // ...
|
|
5529
|
+
* return isValid
|
|
5530
|
+
* })
|
|
5531
|
+
*/
|
|
5532
|
+
customClientValidator(validationFn) {
|
|
5533
|
+
const code = validationFn.toString();
|
|
5534
|
+
return defineFormConditional({
|
|
5535
|
+
type: "object",
|
|
5536
|
+
properties: wrapToPath(
|
|
5537
|
+
{ [fieldId]: { customClientValidator: { code } } },
|
|
5538
|
+
this.$$subfield
|
|
5539
|
+
),
|
|
5540
|
+
required: [fieldId]
|
|
5541
|
+
});
|
|
5542
|
+
},
|
|
5543
|
+
/**
|
|
5544
|
+
* Custom client-side evaluation. Returns a {@link FieldReference} descriptor
|
|
5545
|
+
* that can be used as the `value` property or a DATA component entry.
|
|
5546
|
+
* The function receives the referenced field's value as the first argument and
|
|
5547
|
+
* the full form context as the second; its return value replaces the field reference.
|
|
5548
|
+
* The function is serialised and executed just-in-time on the client only.
|
|
5549
|
+
* External references (e.g. lodash) are not available inside the function body.
|
|
5550
|
+
*
|
|
5551
|
+
* For computing a default value without referencing a specific field, use
|
|
5552
|
+
* `evaluate(fn)` in the `defaultValue` property instead.
|
|
5553
|
+
*
|
|
5554
|
+
* @example
|
|
5555
|
+
* field('a').customClientEvaluation((aValue, ctx) =>
|
|
5556
|
+
* Number(aValue) + Number(ctx.$form.b)
|
|
5557
|
+
* )
|
|
5558
|
+
*/
|
|
5559
|
+
customClientEvaluation(computationFn) {
|
|
5560
|
+
return {
|
|
5561
|
+
$$code: computationFn.toString(),
|
|
5562
|
+
$$field: fieldId,
|
|
5563
|
+
$$subfield: this.$$subfield
|
|
5564
|
+
};
|
|
5565
|
+
}
|
|
5433
5566
|
};
|
|
5434
5567
|
}
|
|
5435
5568
|
|
|
@@ -6369,6 +6502,8 @@ var updateActions = ActionTypes.extract([
|
|
|
6369
6502
|
ActionType.ARCHIVE,
|
|
6370
6503
|
ActionType.PRINT_CERTIFICATE,
|
|
6371
6504
|
ActionType.REQUEST_CORRECTION,
|
|
6505
|
+
ActionType.APPROVE_CORRECTION,
|
|
6506
|
+
ActionType.REJECT_CORRECTION,
|
|
6372
6507
|
ActionType.CUSTOM
|
|
6373
6508
|
]);
|
|
6374
6509
|
function getActionUpdateMetadata(actions) {
|
|
@@ -6383,7 +6518,7 @@ function getActionUpdateMetadata(actions) {
|
|
|
6383
6518
|
"createdAtLocation",
|
|
6384
6519
|
"createdByRole"
|
|
6385
6520
|
];
|
|
6386
|
-
return actions.filter(({ type }) => updateActions.safeParse(type).success).
|
|
6521
|
+
return actions.filter(({ type }) => updateActions.safeParse(type).success).reduce(
|
|
6387
6522
|
(_2, action) => {
|
|
6388
6523
|
if (action.originalActionId) {
|
|
6389
6524
|
const originalAction = actions.find(({ id }) => id === action.originalActionId) ?? action;
|
|
@@ -6410,9 +6545,6 @@ function getLegalStatuses(actions) {
|
|
|
6410
6545
|
// ../commons/src/events/state/flags.ts
|
|
6411
6546
|
var import_lodash3 = require("lodash");
|
|
6412
6547
|
var import_date_fns3 = require("date-fns");
|
|
6413
|
-
function isEditInProgress(actions) {
|
|
6414
|
-
return actions.at(-1)?.type === ActionType.EDIT;
|
|
6415
|
-
}
|
|
6416
6548
|
function findPendingCorrectionAction(writeActions2) {
|
|
6417
6549
|
let correctionRequestAction;
|
|
6418
6550
|
for (let i = writeActions2.length - 1; i >= 0; i--) {
|
|
@@ -6427,29 +6559,6 @@ function findPendingCorrectionAction(writeActions2) {
|
|
|
6427
6559
|
}
|
|
6428
6560
|
return correctionRequestAction;
|
|
6429
6561
|
}
|
|
6430
|
-
function isCorrectionRequested(actions) {
|
|
6431
|
-
return findPendingCorrectionAction(actions) !== void 0;
|
|
6432
|
-
}
|
|
6433
|
-
function isDeclarationIncomplete(actions) {
|
|
6434
|
-
return getStatusFromActions(actions) === EventStatus.enum.NOTIFIED;
|
|
6435
|
-
}
|
|
6436
|
-
function isRejected(actions) {
|
|
6437
|
-
const resettingActionTypes = [
|
|
6438
|
-
ActionType.NOTIFY,
|
|
6439
|
-
ActionType.DECLARE,
|
|
6440
|
-
ActionType.EDIT,
|
|
6441
|
-
ActionType.REGISTER
|
|
6442
|
-
];
|
|
6443
|
-
return actions.reduce((prev, { type }) => {
|
|
6444
|
-
if (type === ActionType.REJECT) {
|
|
6445
|
-
return true;
|
|
6446
|
-
}
|
|
6447
|
-
if (resettingActionTypes.includes(type)) {
|
|
6448
|
-
return false;
|
|
6449
|
-
}
|
|
6450
|
-
return prev;
|
|
6451
|
-
}, false);
|
|
6452
|
-
}
|
|
6453
6562
|
function isPotentialDuplicate(actions) {
|
|
6454
6563
|
return actions.reduce((prev, { type }) => {
|
|
6455
6564
|
if (type === ActionType.DUPLICATE_DETECTED) {
|
|
@@ -6477,6 +6586,88 @@ function isFlagConditionMet(conditional, form, action) {
|
|
|
6477
6586
|
}
|
|
6478
6587
|
});
|
|
6479
6588
|
}
|
|
6589
|
+
function actionConfigRemovesFlag(action, flagId, actionsUpToAndIncluding, event2, eventConfiguration) {
|
|
6590
|
+
if (!isActionConfigType(action.type)) {
|
|
6591
|
+
return false;
|
|
6592
|
+
}
|
|
6593
|
+
const actionConfig = getActionConfig({
|
|
6594
|
+
eventConfiguration,
|
|
6595
|
+
actionType: action.type,
|
|
6596
|
+
customActionType: "customActionType" in action ? action.customActionType : void 0
|
|
6597
|
+
});
|
|
6598
|
+
const removeOperations = (actionConfig?.flags ?? []).filter(
|
|
6599
|
+
({ id, operation }) => id === flagId && operation === "remove"
|
|
6600
|
+
);
|
|
6601
|
+
if (removeOperations.length === 0) {
|
|
6602
|
+
return false;
|
|
6603
|
+
}
|
|
6604
|
+
const eventUpToThisAction = { ...event2, actions: actionsUpToAndIncluding };
|
|
6605
|
+
const declaration = aggregateActionDeclarations(eventUpToThisAction);
|
|
6606
|
+
const annotation = aggregateActionAnnotations(eventUpToThisAction);
|
|
6607
|
+
const form = { ...declaration, ...annotation };
|
|
6608
|
+
return removeOperations.some(
|
|
6609
|
+
({ conditional }) => conditional ? isFlagConditionMet(conditional, form, action) : true
|
|
6610
|
+
);
|
|
6611
|
+
}
|
|
6612
|
+
var INHERENT_FLAG_RULES = [
|
|
6613
|
+
{
|
|
6614
|
+
flag: InherentFlags.CORRECTION_REQUESTED,
|
|
6615
|
+
setOn: [ActionType.REQUEST_CORRECTION],
|
|
6616
|
+
resetOn: [ActionType.APPROVE_CORRECTION, ActionType.REJECT_CORRECTION]
|
|
6617
|
+
},
|
|
6618
|
+
{
|
|
6619
|
+
// INCOMPLETE mirrors the NOTIFIED status: set by NOTIFY, cleared by any
|
|
6620
|
+
// other status-changing action (see getStatusFromActions).
|
|
6621
|
+
flag: InherentFlags.INCOMPLETE,
|
|
6622
|
+
setOn: [ActionType.NOTIFY],
|
|
6623
|
+
resetOn: [
|
|
6624
|
+
ActionType.CREATE,
|
|
6625
|
+
ActionType.DECLARE,
|
|
6626
|
+
ActionType.REGISTER,
|
|
6627
|
+
ActionType.ARCHIVE
|
|
6628
|
+
]
|
|
6629
|
+
},
|
|
6630
|
+
{
|
|
6631
|
+
flag: InherentFlags.REJECTED,
|
|
6632
|
+
setOn: [ActionType.REJECT],
|
|
6633
|
+
resetOn: [
|
|
6634
|
+
ActionType.NOTIFY,
|
|
6635
|
+
ActionType.DECLARE,
|
|
6636
|
+
ActionType.EDIT,
|
|
6637
|
+
ActionType.REGISTER
|
|
6638
|
+
]
|
|
6639
|
+
},
|
|
6640
|
+
{
|
|
6641
|
+
flag: InherentFlags.POTENTIAL_DUPLICATE,
|
|
6642
|
+
setOn: [ActionType.DUPLICATE_DETECTED],
|
|
6643
|
+
resetOn: [ActionType.MARK_AS_DUPLICATE, ActionType.MARK_AS_NOT_DUPLICATE]
|
|
6644
|
+
},
|
|
6645
|
+
{
|
|
6646
|
+
flag: InherentFlags.EDIT_IN_PROGRESS,
|
|
6647
|
+
setOn: [ActionType.EDIT],
|
|
6648
|
+
resetOnAnyOtherAction: true
|
|
6649
|
+
}
|
|
6650
|
+
];
|
|
6651
|
+
function resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration) {
|
|
6652
|
+
return acceptedActions.reduce((present, action, idx) => {
|
|
6653
|
+
if (rule.setOn.includes(action.type)) {
|
|
6654
|
+
return true;
|
|
6655
|
+
}
|
|
6656
|
+
if (rule.resetOnAnyOtherAction || (rule.resetOn ?? []).includes(action.type)) {
|
|
6657
|
+
return false;
|
|
6658
|
+
}
|
|
6659
|
+
if (actionConfigRemovesFlag(
|
|
6660
|
+
action,
|
|
6661
|
+
rule.flag,
|
|
6662
|
+
acceptedActions.slice(0, idx + 1),
|
|
6663
|
+
event2,
|
|
6664
|
+
eventConfiguration
|
|
6665
|
+
)) {
|
|
6666
|
+
return false;
|
|
6667
|
+
}
|
|
6668
|
+
return present;
|
|
6669
|
+
}, false);
|
|
6670
|
+
}
|
|
6480
6671
|
function resolveEventCustomFlags(event2, eventConfiguration) {
|
|
6481
6672
|
const actions = getAcceptedActions(event2).filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6482
6673
|
return actions.reduce((acc, action, idx) => {
|
|
@@ -6525,33 +6716,19 @@ function getActionStatusFlags(sortedActions) {
|
|
|
6525
6716
|
return flag2;
|
|
6526
6717
|
});
|
|
6527
6718
|
}
|
|
6528
|
-
function getInherentFlags(sortedActions) {
|
|
6719
|
+
function getInherentFlags(sortedActions, event2, eventConfiguration) {
|
|
6529
6720
|
const acceptedActions = sortedActions.filter(
|
|
6530
6721
|
({ status: status2 }) => status2 === ActionStatus.Accepted
|
|
6531
6722
|
);
|
|
6532
|
-
|
|
6533
|
-
|
|
6534
|
-
|
|
6535
|
-
}
|
|
6536
|
-
if (isDeclarationIncomplete(acceptedActions)) {
|
|
6537
|
-
inherentFlags.push(InherentFlags.INCOMPLETE);
|
|
6538
|
-
}
|
|
6539
|
-
if (isRejected(acceptedActions)) {
|
|
6540
|
-
inherentFlags.push(InherentFlags.REJECTED);
|
|
6541
|
-
}
|
|
6542
|
-
if (isPotentialDuplicate(acceptedActions)) {
|
|
6543
|
-
inherentFlags.push(InherentFlags.POTENTIAL_DUPLICATE);
|
|
6544
|
-
}
|
|
6545
|
-
if (isEditInProgress(acceptedActions)) {
|
|
6546
|
-
inherentFlags.push(InherentFlags.EDIT_IN_PROGRESS);
|
|
6547
|
-
}
|
|
6548
|
-
return inherentFlags;
|
|
6723
|
+
return INHERENT_FLAG_RULES.filter(
|
|
6724
|
+
(rule) => resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration)
|
|
6725
|
+
).map(({ flag: flag2 }) => flag2);
|
|
6549
6726
|
}
|
|
6550
6727
|
function getEventFlags(event2, config) {
|
|
6551
6728
|
const sortedActions = event2.actions.filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6552
6729
|
return [
|
|
6553
6730
|
...getActionStatusFlags(sortedActions),
|
|
6554
|
-
...getInherentFlags(sortedActions),
|
|
6731
|
+
...getInherentFlags(sortedActions, event2, config),
|
|
6555
6732
|
...resolveEventCustomFlags(event2, config)
|
|
6556
6733
|
];
|
|
6557
6734
|
}
|
|
@@ -6788,7 +6965,7 @@ function getActionAnnotation({
|
|
|
6788
6965
|
const action = (0, import_lodash4.findLast)(activeActions, (a) => a.type === actionType);
|
|
6789
6966
|
const actionWithCompleteAnnotation = action && {
|
|
6790
6967
|
...action,
|
|
6791
|
-
annotation: getCompleteActionAnnotation(
|
|
6968
|
+
annotation: getCompleteActionAnnotation(event2, action)
|
|
6792
6969
|
};
|
|
6793
6970
|
const matchingDraft = draft?.action.type === actionType ? draft : void 0;
|
|
6794
6971
|
const sortedActions = (0, import_lodash4.orderBy)(
|
|
@@ -6860,6 +7037,9 @@ function createFieldConfig(fieldId, options) {
|
|
|
6860
7037
|
}
|
|
6861
7038
|
|
|
6862
7039
|
// ../commons/src/events/field.ts
|
|
7040
|
+
function evaluate(computationFn) {
|
|
7041
|
+
return { $$code: computationFn.toString() };
|
|
7042
|
+
}
|
|
6863
7043
|
function field(fieldId, options = {}) {
|
|
6864
7044
|
return {
|
|
6865
7045
|
...createFieldConditionals(fieldId),
|
|
@@ -7553,6 +7733,11 @@ var TENNIS_CLUB_DECLARATION_REVIEW = {
|
|
|
7553
7733
|
id: "signature.upload.modal.title",
|
|
7554
7734
|
defaultMessage: "Draw signature",
|
|
7555
7735
|
description: "Title for the modal to draw signature"
|
|
7736
|
+
},
|
|
7737
|
+
// Zod applies the schema default at parse time, but this fixture bypasses
|
|
7738
|
+
// parsing — GeneratedInputField accesses configuration.maxFileSize directly.
|
|
7739
|
+
configuration: {
|
|
7740
|
+
maxFileSize: 5 * 1024 * 1024
|
|
7556
7741
|
}
|
|
7557
7742
|
}
|
|
7558
7743
|
]
|
|
@@ -8109,6 +8294,20 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8109
8294
|
},
|
|
8110
8295
|
review: TENNIS_CLUB_DECLARATION_REVIEW
|
|
8111
8296
|
},
|
|
8297
|
+
{
|
|
8298
|
+
type: ActionType.NOTIFY,
|
|
8299
|
+
label: {
|
|
8300
|
+
defaultMessage: "Notify health worker",
|
|
8301
|
+
description: "This is shown as the action name anywhere the user can trigger the action from",
|
|
8302
|
+
id: "event.tennis-club-membership.action.notify.label"
|
|
8303
|
+
},
|
|
8304
|
+
flags: [
|
|
8305
|
+
{
|
|
8306
|
+
id: "health-worker-notified",
|
|
8307
|
+
operation: "add"
|
|
8308
|
+
}
|
|
8309
|
+
]
|
|
8310
|
+
},
|
|
8112
8311
|
{
|
|
8113
8312
|
type: ActionType.REJECT,
|
|
8114
8313
|
label: {
|
|
@@ -8351,6 +8550,17 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8351
8550
|
}
|
|
8352
8551
|
}
|
|
8353
8552
|
],
|
|
8553
|
+
flags: [
|
|
8554
|
+
{
|
|
8555
|
+
id: "health-worker-notified",
|
|
8556
|
+
requiresAction: false,
|
|
8557
|
+
label: {
|
|
8558
|
+
id: "event.tennis-club-membership.flag.health-worker-notified.label",
|
|
8559
|
+
defaultMessage: "Health worker notified",
|
|
8560
|
+
description: "Label for the health-worker-notified flag"
|
|
8561
|
+
}
|
|
8562
|
+
}
|
|
8563
|
+
],
|
|
8354
8564
|
advancedSearch: [
|
|
8355
8565
|
{
|
|
8356
8566
|
title: {
|
|
@@ -10109,7 +10319,7 @@ function matchesJurisdictionFilter(locationIds, filter, user2) {
|
|
|
10109
10319
|
return locationIds.some((id) => id === user2.primaryOfficeId);
|
|
10110
10320
|
}
|
|
10111
10321
|
if (filter === JurisdictionFilter.enum.administrativeArea) {
|
|
10112
|
-
return user2.administrativeAreaId
|
|
10322
|
+
return !user2.administrativeAreaId || locationIds.some((id) => id === user2.administrativeAreaId);
|
|
10113
10323
|
}
|
|
10114
10324
|
return true;
|
|
10115
10325
|
}
|
|
@@ -10198,7 +10408,7 @@ function canAccessUserWithScope({
|
|
|
10198
10408
|
}
|
|
10199
10409
|
const hasAdministrativeAreaInHierarchy = userToAccess.administrativeHierarchy.some(
|
|
10200
10410
|
(id) => user2.administrativeAreaId === id
|
|
10201
|
-
) || user2.administrativeAreaId
|
|
10411
|
+
) || !user2.administrativeAreaId;
|
|
10202
10412
|
if (opts?.accessLevel === JurisdictionFilter.enum.administrativeArea && !hasAdministrativeAreaInHierarchy) {
|
|
10203
10413
|
return false;
|
|
10204
10414
|
}
|
|
@@ -10504,18 +10714,19 @@ var ACTION_FILTERS = {
|
|
|
10504
10714
|
function filterActionsByFlags(actions, flags) {
|
|
10505
10715
|
return actions.filter((action) => ACTION_FILTERS[action]?.(flags) ?? true);
|
|
10506
10716
|
}
|
|
10717
|
+
var REJECTED_ACTIONS = [
|
|
10718
|
+
ActionType.READ,
|
|
10719
|
+
ActionType.NOTIFY,
|
|
10720
|
+
ActionType.CUSTOM,
|
|
10721
|
+
ActionType.EDIT,
|
|
10722
|
+
ActionType.ARCHIVE
|
|
10723
|
+
];
|
|
10507
10724
|
function getAvailableActionsWithoutFlagFilters(status2, flags) {
|
|
10508
10725
|
if (flags.includes(InherentFlags.EDIT_IN_PROGRESS)) {
|
|
10509
10726
|
return [ActionType.NOTIFY, ActionType.DECLARE, ActionType.REGISTER];
|
|
10510
10727
|
}
|
|
10511
|
-
if (flags.includes(InherentFlags.REJECTED)) {
|
|
10512
|
-
return
|
|
10513
|
-
ActionType.READ,
|
|
10514
|
-
ActionType.NOTIFY,
|
|
10515
|
-
ActionType.CUSTOM,
|
|
10516
|
-
ActionType.EDIT,
|
|
10517
|
-
ActionType.ARCHIVE
|
|
10518
|
-
];
|
|
10728
|
+
if (flags.includes(InherentFlags.REJECTED) && status2 !== EventStatus.enum.ARCHIVED) {
|
|
10729
|
+
return REJECTED_ACTIONS;
|
|
10519
10730
|
}
|
|
10520
10731
|
return AVAILABLE_ACTIONS_BY_EVENT_STATUS[status2];
|
|
10521
10732
|
}
|