@opencrvs/toolkit 2.0.0-rc.33d4a6b → 2.0.0-rc.33e3164
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 +52 -34
- package/dist/cli.js +9 -3
- package/dist/commons/api/router.d.ts +87 -17
- package/dist/commons/application-config/index.d.ts +1 -0
- package/dist/commons/conditionals/conditionals.d.ts +354 -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 +377 -50
- package/dist/commons/events/FieldType.d.ts +1 -0
- 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 +52 -1
- package/dist/events/index.js +304 -119
- package/dist/migrations/v2.0/index.js +9 -3
- package/dist/notification/index.js +165 -37
- package/dist/scopes/index.d.ts +4 -6
- package/dist/scopes/index.js +9 -3
- package/opencrvs-toolkit-2.0.0-rc.33e3164.tgz +0 -0
- package/package.json +1 -1
- package/opencrvs-toolkit-2.0.0-rc.33d4a6b.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,
|
|
@@ -238,6 +241,7 @@ __export(events_exports, {
|
|
|
238
241
|
ageToDate: () => ageToDate,
|
|
239
242
|
aggregateActionAnnotations: () => aggregateActionAnnotations,
|
|
240
243
|
aggregateActionDeclarations: () => aggregateActionDeclarations,
|
|
244
|
+
always: () => always,
|
|
241
245
|
alwaysTrue: () => alwaysTrue,
|
|
242
246
|
and: () => and,
|
|
243
247
|
annotationActions: () => annotationActions,
|
|
@@ -245,10 +249,12 @@ __export(events_exports, {
|
|
|
245
249
|
applyDraftToEventIndex: () => applyDraftToEventIndex,
|
|
246
250
|
areCertificateConditionsMet: () => areCertificateConditionsMet,
|
|
247
251
|
areConditionsMet: () => areConditionsMet,
|
|
252
|
+
buildClientFunctionContext: () => buildClientFunctionContext,
|
|
248
253
|
buildFormState: () => buildFormState,
|
|
249
254
|
canAccessEventWithScope: () => canAccessEventWithScope,
|
|
250
255
|
canAccessOtherUserWithScopes: () => canAccessOtherUserWithScopes,
|
|
251
256
|
canAccessUserWithScope: () => canAccessUserWithScope,
|
|
257
|
+
compileClientFunction: () => compileClientFunction,
|
|
252
258
|
compositeFieldTypes: () => compositeFieldTypes,
|
|
253
259
|
createEmptyDraft: () => createEmptyDraft,
|
|
254
260
|
createFieldConditionals: () => createFieldConditionals,
|
|
@@ -269,6 +275,7 @@ __export(events_exports, {
|
|
|
269
275
|
defineWorkqueuesColumns: () => defineWorkqueuesColumns,
|
|
270
276
|
deserializeQuery: () => deserializeQuery,
|
|
271
277
|
errorMessages: () => errorMessages,
|
|
278
|
+
evaluate: () => evaluate,
|
|
272
279
|
event: () => event,
|
|
273
280
|
eventMetadataLabelMap: () => eventMetadataLabelMap,
|
|
274
281
|
eventPayloadGenerator: () => eventPayloadGenerator,
|
|
@@ -281,6 +288,7 @@ __export(events_exports, {
|
|
|
281
288
|
findActiveDraftForEvent: () => findActiveDraftForEvent,
|
|
282
289
|
findAllFields: () => findAllFields,
|
|
283
290
|
findLastAssignmentAction: () => findLastAssignmentAction,
|
|
291
|
+
findPendingCorrectionAction: () => findPendingCorrectionAction,
|
|
284
292
|
findRecordActionPages: () => findRecordActionPages,
|
|
285
293
|
flag: () => flag,
|
|
286
294
|
flattenFieldReference: () => flattenFieldReference,
|
|
@@ -314,6 +322,7 @@ __export(events_exports, {
|
|
|
314
322
|
getAvailableActionsForEvent: () => getAvailableActionsForEvent,
|
|
315
323
|
getAvailableRolesForUserUpdatePayload: () => getAvailableRolesForUserUpdatePayload,
|
|
316
324
|
getCompleteActionAnnotation: () => getCompleteActionAnnotation,
|
|
325
|
+
getCompleteActionContent: () => getCompleteActionContent,
|
|
317
326
|
getCompleteActionDeclaration: () => getCompleteActionDeclaration,
|
|
318
327
|
getCurrentEventState: () => getCurrentEventState,
|
|
319
328
|
getCustomActionFields: () => getCustomActionFields,
|
|
@@ -322,6 +331,7 @@ __export(events_exports, {
|
|
|
322
331
|
getDeclarationFields: () => getDeclarationFields,
|
|
323
332
|
getDeclarationPages: () => getDeclarationPages,
|
|
324
333
|
getEventConfigById: () => getEventConfigById,
|
|
334
|
+
getEventFlags: () => getEventFlags,
|
|
325
335
|
getFilePathsFromEvent: () => getFilePathsFromEvent,
|
|
326
336
|
getLocationHierarchy: () => getLocationHierarchy,
|
|
327
337
|
getMixedPath: () => getMixedPath,
|
|
@@ -344,6 +354,7 @@ __export(events_exports, {
|
|
|
344
354
|
isBulletListFieldType: () => isBulletListFieldType,
|
|
345
355
|
isButtonFieldType: () => isButtonFieldType,
|
|
346
356
|
isCheckboxFieldType: () => isCheckboxFieldType,
|
|
357
|
+
isCodeToEvaluate: () => isCodeToEvaluate,
|
|
347
358
|
isConditionMet: () => isConditionMet,
|
|
348
359
|
isCountryFieldType: () => isCountryFieldType,
|
|
349
360
|
isCustomFieldType: () => isCustomFieldType,
|
|
@@ -384,6 +395,7 @@ __export(events_exports, {
|
|
|
384
395
|
isPageVisible: () => isPageVisible,
|
|
385
396
|
isParagraphFieldType: () => isParagraphFieldType,
|
|
386
397
|
isPhoneFieldType: () => isPhoneFieldType,
|
|
398
|
+
isPotentialDuplicate: () => isPotentialDuplicate,
|
|
387
399
|
isPrintButtonFieldType: () => isPrintButtonFieldType,
|
|
388
400
|
isQrReaderFieldType: () => isQrReaderFieldType,
|
|
389
401
|
isQueryParamReaderFieldType: () => isQueryParamReaderFieldType,
|
|
@@ -417,12 +429,15 @@ __export(events_exports, {
|
|
|
417
429
|
plainDateToLocalDate: () => plainDateToLocalDate,
|
|
418
430
|
precompileActionSchemas: () => precompileActionSchemas,
|
|
419
431
|
resolveDateOfEvent: () => resolveDateOfEvent,
|
|
432
|
+
resolveEventCustomFlags: () => resolveEventCustomFlags,
|
|
420
433
|
resolvePlaceOfEvent: () => resolvePlaceOfEvent,
|
|
434
|
+
runClientFunction: () => runClientFunction,
|
|
421
435
|
runFieldValidations: () => runFieldValidations,
|
|
422
436
|
runStructuralValidations: () => runStructuralValidations,
|
|
423
437
|
safeUnion: () => safeUnion,
|
|
424
438
|
status: () => status,
|
|
425
439
|
timePeriodToDateRange: () => timePeriodToDateRange,
|
|
440
|
+
todayISO: () => todayISO,
|
|
426
441
|
user: () => user,
|
|
427
442
|
userCanAccessEventWithScopes: () => userCanAccessEventWithScopes,
|
|
428
443
|
validate: () => validate,
|
|
@@ -697,14 +712,20 @@ var unflattenScope = (input) => {
|
|
|
697
712
|
return { type, options };
|
|
698
713
|
};
|
|
699
714
|
var EncodedScope = z2.string().brand("EncodedScope");
|
|
700
|
-
var
|
|
701
|
-
|
|
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, {
|
|
702
721
|
ignoreQueryPrefix: true,
|
|
703
722
|
comma: true,
|
|
704
723
|
allowDots: true
|
|
705
724
|
});
|
|
706
725
|
const unflattenedScope = unflattenScope(scope);
|
|
707
|
-
|
|
726
|
+
const result = Scope.safeParse(unflattenedScope)?.data;
|
|
727
|
+
decodedScopeCache.set(encodedScope, result);
|
|
728
|
+
return result;
|
|
708
729
|
};
|
|
709
730
|
var DEFAULT_SCOPE_OPTIONS = {
|
|
710
731
|
placeOfEvent: JurisdictionFilter.enum.all,
|
|
@@ -1199,6 +1220,11 @@ var FieldTypesToHideInReview = [
|
|
|
1199
1220
|
FieldType.ALPHA_PRINT_BUTTON,
|
|
1200
1221
|
FieldType.ALPHA_HIDDEN
|
|
1201
1222
|
];
|
|
1223
|
+
var HiddenFieldTypes = [
|
|
1224
|
+
FieldType.HTTP,
|
|
1225
|
+
FieldType.QUERY_PARAM_READER,
|
|
1226
|
+
FieldType.ALPHA_HIDDEN
|
|
1227
|
+
];
|
|
1202
1228
|
|
|
1203
1229
|
// ../commons/src/events/FieldValue.ts
|
|
1204
1230
|
var z12 = __toESM(require("zod/v4"));
|
|
@@ -1325,7 +1351,7 @@ function plainDateToLocalDate(date) {
|
|
|
1325
1351
|
// ../commons/src/events/FieldValue.ts
|
|
1326
1352
|
var TextValue = z12.string();
|
|
1327
1353
|
var HiddenFieldValue = z12.string();
|
|
1328
|
-
var NonEmptyTextValue =
|
|
1354
|
+
var NonEmptyTextValue = z12.string().trim().min(1);
|
|
1329
1355
|
var DateValue = z12.iso.date().describe("Date in the format YYYY-MM-DD");
|
|
1330
1356
|
var AgeValue = z12.object({
|
|
1331
1357
|
age: z12.number(),
|
|
@@ -1354,6 +1380,7 @@ var DateRangeFieldValue = z12.object({
|
|
|
1354
1380
|
var EmailValue = z12.email();
|
|
1355
1381
|
var CheckboxFieldValue = z12.boolean();
|
|
1356
1382
|
var NumberFieldValue = z12.number();
|
|
1383
|
+
var SignatureFieldValue = FileFieldValue;
|
|
1357
1384
|
var ButtonFieldValue = z12.number();
|
|
1358
1385
|
var VerificationStatusValue = z12.enum([
|
|
1359
1386
|
"verified",
|
|
@@ -1652,8 +1679,9 @@ var RequestedCorrectionAction = ActionBase.extend(
|
|
|
1652
1679
|
var ApprovedCorrectionAction = ActionBase.extend(
|
|
1653
1680
|
z14.object({
|
|
1654
1681
|
type: z14.literal(ActionType.APPROVE_CORRECTION),
|
|
1655
|
-
requestId: z14.string()
|
|
1682
|
+
requestId: z14.string(),
|
|
1656
1683
|
// TODO move into 'content' property
|
|
1684
|
+
content: z14.object({ immediateCorrection: z14.boolean().optional() }).optional()
|
|
1657
1685
|
}).shape
|
|
1658
1686
|
);
|
|
1659
1687
|
var RejectedCorrectionAction = ActionBase.extend(
|
|
@@ -2184,8 +2212,21 @@ var FieldReference = import_v43.default.object({
|
|
|
2184
2212
|
$$field: FieldId.describe("Id of the field to reference"),
|
|
2185
2213
|
$$subfield: import_v43.default.array(import_v43.default.string()).optional().default([]).describe(
|
|
2186
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."
|
|
2187
2218
|
)
|
|
2188
|
-
}).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.");
|
|
2189
2230
|
var ValidationConfig = import_v43.default.object({
|
|
2190
2231
|
validator: Conditional.describe(
|
|
2191
2232
|
"Conditional expression that must hold for the field value to be considered valid."
|
|
@@ -2226,7 +2267,7 @@ var BaseField = import_v43.default.object({
|
|
|
2226
2267
|
"Indicates whether the field can be modified during record correction."
|
|
2227
2268
|
),
|
|
2228
2269
|
value: FieldReference.or(import_v43.default.array(FieldReference)).optional().describe(
|
|
2229
|
-
"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."
|
|
2230
2271
|
),
|
|
2231
2272
|
analytics: import_v43.default.boolean().default(false).optional().describe(
|
|
2232
2273
|
"Indicates whether the field is included in analytics. When enabled, its value becomes available in the analytics dashboard."
|
|
@@ -2240,7 +2281,7 @@ var Divider = BaseField.extend({
|
|
|
2240
2281
|
});
|
|
2241
2282
|
var TextField = BaseField.extend({
|
|
2242
2283
|
type: import_v43.default.literal(FieldType.TEXT),
|
|
2243
|
-
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField]).optional(),
|
|
2284
|
+
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField, ComputedDefaultValue]).optional(),
|
|
2244
2285
|
configuration: import_v43.default.object({
|
|
2245
2286
|
maxLength: import_v43.default.number().optional().describe("Maximum length of the text"),
|
|
2246
2287
|
type: import_v43.default.enum(["text", "password"]).optional(),
|
|
@@ -2253,7 +2294,7 @@ var TextField = BaseField.extend({
|
|
|
2253
2294
|
});
|
|
2254
2295
|
var NumberField = BaseField.extend({
|
|
2255
2296
|
type: import_v43.default.literal(FieldType.NUMBER),
|
|
2256
|
-
defaultValue: NumberFieldValue.optional(),
|
|
2297
|
+
defaultValue: NumberFieldValue.or(ComputedDefaultValue).optional(),
|
|
2257
2298
|
configuration: import_v43.default.object({
|
|
2258
2299
|
min: import_v43.default.number().optional().describe("Minimum value"),
|
|
2259
2300
|
max: import_v43.default.number().optional().describe("Maximum value"),
|
|
@@ -2266,7 +2307,7 @@ var NumberField = BaseField.extend({
|
|
|
2266
2307
|
});
|
|
2267
2308
|
var TextAreaField = BaseField.extend({
|
|
2268
2309
|
type: import_v43.default.literal(FieldType.TEXTAREA),
|
|
2269
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2310
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2270
2311
|
configuration: import_v43.default.object({
|
|
2271
2312
|
maxLength: import_v43.default.number().optional().describe("Maximum length of the text"),
|
|
2272
2313
|
rows: import_v43.default.number().optional().describe("Number of visible text lines"),
|
|
@@ -2300,7 +2341,7 @@ var SignatureField = BaseField.extend({
|
|
|
2300
2341
|
signaturePromptLabel: TranslationConfig.describe(
|
|
2301
2342
|
"Title of the signature modal"
|
|
2302
2343
|
),
|
|
2303
|
-
defaultValue:
|
|
2344
|
+
defaultValue: SignatureFieldValue.or(ComputedDefaultValue).optional(),
|
|
2304
2345
|
configuration: import_v43.default.object({
|
|
2305
2346
|
maxFileSize: import_v43.default.number().describe("Maximum file size in bytes").default(DEFAULT_MAX_FILE_SIZE_BYTES),
|
|
2306
2347
|
acceptedFileTypes: MimeType.array().optional().describe("List of allowed file formats for the signature")
|
|
@@ -2316,14 +2357,14 @@ var EmailField = BaseField.extend({
|
|
|
2316
2357
|
configuration: import_v43.default.object({
|
|
2317
2358
|
maxLength: import_v43.default.number().optional().describe("Maximum length of the text")
|
|
2318
2359
|
}).default({ maxLength: 255 }).optional(),
|
|
2319
|
-
defaultValue: NonEmptyTextValue.optional()
|
|
2360
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional()
|
|
2320
2361
|
}).meta({
|
|
2321
2362
|
description: "An email input field",
|
|
2322
2363
|
id: "EmailField"
|
|
2323
2364
|
});
|
|
2324
2365
|
var DateField = BaseField.extend({
|
|
2325
2366
|
type: import_v43.default.literal(FieldType.DATE),
|
|
2326
|
-
defaultValue: SerializedNowDateTime.or(PlainDate).optional().describe("Default date value(yyyy-MM-dd)"),
|
|
2367
|
+
defaultValue: SerializedNowDateTime.or(PlainDate).or(ComputedDefaultValue).optional().describe("Default date value(yyyy-MM-dd)"),
|
|
2327
2368
|
configuration: import_v43.default.object({
|
|
2328
2369
|
notice: TranslationConfig.describe(
|
|
2329
2370
|
"Text to display above the date input"
|
|
@@ -2335,7 +2376,7 @@ var DateField = BaseField.extend({
|
|
|
2335
2376
|
});
|
|
2336
2377
|
var AgeField = BaseField.extend({
|
|
2337
2378
|
type: import_v43.default.literal(FieldType.AGE),
|
|
2338
|
-
defaultValue: NumberFieldValue.optional(),
|
|
2379
|
+
defaultValue: NumberFieldValue.or(ComputedDefaultValue).optional(),
|
|
2339
2380
|
configuration: import_v43.default.object({
|
|
2340
2381
|
asOfDate: FieldReference,
|
|
2341
2382
|
prefix: TranslationConfig.optional(),
|
|
@@ -2347,7 +2388,7 @@ var AgeField = BaseField.extend({
|
|
|
2347
2388
|
});
|
|
2348
2389
|
var TimeField = BaseField.extend({
|
|
2349
2390
|
type: import_v43.default.literal(FieldType.TIME),
|
|
2350
|
-
defaultValue: SerializedNowDateTime.or(TimeValue).optional().describe("Default time value (HH-mm)"),
|
|
2391
|
+
defaultValue: SerializedNowDateTime.or(TimeValue).or(ComputedDefaultValue).optional().describe("Default time value (HH-mm)"),
|
|
2351
2392
|
configuration: import_v43.default.object({
|
|
2352
2393
|
use12HourFormat: import_v43.default.boolean().optional().describe("Whether to use 12-hour format"),
|
|
2353
2394
|
notice: TranslationConfig.describe(
|
|
@@ -2360,7 +2401,7 @@ var TimeField = BaseField.extend({
|
|
|
2360
2401
|
});
|
|
2361
2402
|
var DateRangeField = BaseField.extend({
|
|
2362
2403
|
type: import_v43.default.literal(FieldType.DATE_RANGE),
|
|
2363
|
-
defaultValue: DateRangeFieldValue.optional(),
|
|
2404
|
+
defaultValue: DateRangeFieldValue.or(ComputedDefaultValue).optional(),
|
|
2364
2405
|
configuration: import_v43.default.object({
|
|
2365
2406
|
notice: TranslationConfig.describe(
|
|
2366
2407
|
"Text to display above the date input"
|
|
@@ -2439,7 +2480,7 @@ var PageHeader = BaseField.extend({
|
|
|
2439
2480
|
});
|
|
2440
2481
|
var File = BaseField.extend({
|
|
2441
2482
|
type: import_v43.default.literal(FieldType.FILE),
|
|
2442
|
-
defaultValue: FileFieldValue.optional(),
|
|
2483
|
+
defaultValue: FileFieldValue.or(ComputedDefaultValue).optional(),
|
|
2443
2484
|
configuration: import_v43.default.object({
|
|
2444
2485
|
maxFileSize: import_v43.default.number().describe("Maximum file size in bytes").default(DEFAULT_MAX_FILE_SIZE_BYTES),
|
|
2445
2486
|
acceptedFileTypes: MimeType.array().optional().describe("List of allowed file formats for the signature"),
|
|
@@ -2466,7 +2507,7 @@ var SelectOption = import_v43.default.object({
|
|
|
2466
2507
|
});
|
|
2467
2508
|
var NumberWithUnitField = BaseField.extend({
|
|
2468
2509
|
type: import_v43.default.literal(FieldType.NUMBER_WITH_UNIT),
|
|
2469
|
-
defaultValue: NumberWithUnitFieldValue.optional(),
|
|
2510
|
+
defaultValue: NumberWithUnitFieldValue.or(ComputedDefaultValue).optional(),
|
|
2470
2511
|
options: import_v43.default.array(SelectOption).describe("A list of options for the unit select"),
|
|
2471
2512
|
configuration: import_v43.default.object({
|
|
2472
2513
|
min: import_v43.default.number().optional().describe("Minimum value of the number field"),
|
|
@@ -2481,7 +2522,7 @@ var NumberWithUnitField = BaseField.extend({
|
|
|
2481
2522
|
});
|
|
2482
2523
|
var RadioGroup = BaseField.extend({
|
|
2483
2524
|
type: import_v43.default.literal(FieldType.RADIO_GROUP),
|
|
2484
|
-
defaultValue: TextValue.optional(),
|
|
2525
|
+
defaultValue: TextValue.or(ComputedDefaultValue).optional(),
|
|
2485
2526
|
options: import_v43.default.array(SelectOption).describe("A list of options"),
|
|
2486
2527
|
configuration: import_v43.default.object({
|
|
2487
2528
|
styles: import_v43.default.object({
|
|
@@ -2506,7 +2547,7 @@ var BulletList = BaseField.extend({
|
|
|
2506
2547
|
});
|
|
2507
2548
|
var Select = BaseField.extend({
|
|
2508
2549
|
type: import_v43.default.literal(FieldType.SELECT),
|
|
2509
|
-
defaultValue: TextValue.optional(),
|
|
2550
|
+
defaultValue: TextValue.or(ComputedDefaultValue).optional(),
|
|
2510
2551
|
options: import_v43.default.array(SelectOption).describe("A list of options"),
|
|
2511
2552
|
noOptionsMessage: TranslationConfig.optional().describe(
|
|
2512
2553
|
`
|
|
@@ -2528,7 +2569,7 @@ var SelectDateRangeOption = import_v43.default.object({
|
|
|
2528
2569
|
});
|
|
2529
2570
|
var SelectDateRangeField = BaseField.extend({
|
|
2530
2571
|
type: import_v43.default.literal(FieldType.SELECT_DATE_RANGE),
|
|
2531
|
-
defaultValue: SelectDateRangeValue.optional(),
|
|
2572
|
+
defaultValue: SelectDateRangeValue.or(ComputedDefaultValue).optional(),
|
|
2532
2573
|
options: import_v43.default.array(SelectDateRangeOption).describe("A list of options")
|
|
2533
2574
|
}).meta({
|
|
2534
2575
|
description: "A date range selection field",
|
|
@@ -2545,7 +2586,7 @@ var NameField = BaseField.extend({
|
|
|
2545
2586
|
firstname: SerializedUserField.or(NonEmptyTextValue).optional(),
|
|
2546
2587
|
middlename: SerializedUserField.or(NonEmptyTextValue).optional(),
|
|
2547
2588
|
surname: SerializedUserField.or(NonEmptyTextValue).optional()
|
|
2548
|
-
}).optional(),
|
|
2589
|
+
}).or(ComputedDefaultValue).optional(),
|
|
2549
2590
|
configuration: import_v43.default.object({
|
|
2550
2591
|
name: NameConfig.default({
|
|
2551
2592
|
firstname: { required: true },
|
|
@@ -2569,14 +2610,14 @@ var NameField = BaseField.extend({
|
|
|
2569
2610
|
id: "NameField"
|
|
2570
2611
|
});
|
|
2571
2612
|
var PhoneField = BaseField.extend({
|
|
2572
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2613
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2573
2614
|
type: import_v43.default.literal(FieldType.PHONE)
|
|
2574
2615
|
}).meta({
|
|
2575
2616
|
description: "A field for entering a phone number",
|
|
2576
2617
|
id: "PhoneField"
|
|
2577
2618
|
});
|
|
2578
2619
|
var IdField = BaseField.extend({
|
|
2579
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2620
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2580
2621
|
type: import_v43.default.literal(FieldType.ID)
|
|
2581
2622
|
}).meta({
|
|
2582
2623
|
description: "A field for entering an ID",
|
|
@@ -2584,14 +2625,14 @@ var IdField = BaseField.extend({
|
|
|
2584
2625
|
});
|
|
2585
2626
|
var Checkbox = BaseField.extend({
|
|
2586
2627
|
type: import_v43.default.literal(FieldType.CHECKBOX),
|
|
2587
|
-
defaultValue: CheckboxFieldValue.default(false)
|
|
2628
|
+
defaultValue: CheckboxFieldValue.or(ComputedDefaultValue).default(false)
|
|
2588
2629
|
}).meta({
|
|
2589
2630
|
description: "A boolean checkbox field",
|
|
2590
2631
|
id: "Checkbox"
|
|
2591
2632
|
});
|
|
2592
2633
|
var Country = BaseField.extend({
|
|
2593
2634
|
type: import_v43.default.literal(FieldType.COUNTRY),
|
|
2594
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2635
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2595
2636
|
optionOverrides: import_v43.default.array(SelectOption.omit({ label: true })).optional().describe(
|
|
2596
2637
|
"Conditionals for specific countries. Countries not listed are always shown and enabled."
|
|
2597
2638
|
)
|
|
@@ -2609,7 +2650,7 @@ var AdministrativeAreas = import_v43.default.enum([
|
|
|
2609
2650
|
]);
|
|
2610
2651
|
var AdministrativeAreaField = BaseField.extend({
|
|
2611
2652
|
type: import_v43.default.literal(FieldType.ADMINISTRATIVE_AREA),
|
|
2612
|
-
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField]).optional(),
|
|
2653
|
+
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField, ComputedDefaultValue]).optional(),
|
|
2613
2654
|
configuration: import_v43.default.object({
|
|
2614
2655
|
partOf: FieldReference.optional().describe("Parent location"),
|
|
2615
2656
|
type: AdministrativeAreas,
|
|
@@ -2621,7 +2662,7 @@ var AdministrativeAreaField = BaseField.extend({
|
|
|
2621
2662
|
});
|
|
2622
2663
|
var LocationInput = BaseField.extend({
|
|
2623
2664
|
type: import_v43.default.literal(FieldType.LOCATION),
|
|
2624
|
-
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField]).optional(),
|
|
2665
|
+
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField, ComputedDefaultValue]).optional(),
|
|
2625
2666
|
configuration: import_v43.default.object({
|
|
2626
2667
|
locationTypes: import_v43.default.array(import_v43.default.string()).optional().describe("Types of the locations that are available for selection."),
|
|
2627
2668
|
allowedLocations: AllowedLocations
|
|
@@ -2633,7 +2674,7 @@ var LocationInput = BaseField.extend({
|
|
|
2633
2674
|
var FileUploadWithOptions = BaseField.extend({
|
|
2634
2675
|
type: import_v43.default.literal(FieldType.FILE_WITH_OPTIONS),
|
|
2635
2676
|
options: import_v43.default.array(SelectOption).describe("A list of options"),
|
|
2636
|
-
defaultValue: FileFieldWithOptionValue.optional(),
|
|
2677
|
+
defaultValue: FileFieldWithOptionValue.or(ComputedDefaultValue).optional(),
|
|
2637
2678
|
configuration: import_v43.default.object({
|
|
2638
2679
|
maxFileSize: import_v43.default.number().describe("Maximum file size in bytes").default(DEFAULT_MAX_FILE_SIZE_BYTES),
|
|
2639
2680
|
maxImageSize: import_v43.default.object({
|
|
@@ -2649,12 +2690,12 @@ var FileUploadWithOptions = BaseField.extend({
|
|
|
2649
2690
|
});
|
|
2650
2691
|
var Facility = BaseField.extend({
|
|
2651
2692
|
type: import_v43.default.literal(FieldType.FACILITY),
|
|
2652
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2693
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2653
2694
|
configuration: import_v43.default.object({ allowedLocations: AllowedLocations }).optional()
|
|
2654
2695
|
}).describe("Input field for a facility");
|
|
2655
2696
|
var Office = BaseField.extend({
|
|
2656
2697
|
type: import_v43.default.literal(FieldType.OFFICE),
|
|
2657
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2698
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2658
2699
|
configuration: import_v43.default.object({ allowedLocations: AllowedLocations }).optional()
|
|
2659
2700
|
}).describe("Input field for an office");
|
|
2660
2701
|
var DefaultAddressFieldValue = DomesticAddressFieldValue.extend({
|
|
@@ -2690,7 +2731,7 @@ var Address = BaseField.extend({
|
|
|
2690
2731
|
).optional(),
|
|
2691
2732
|
allowedLocations: AllowedLocations
|
|
2692
2733
|
}).optional(),
|
|
2693
|
-
defaultValue: DefaultAddressFieldValue.optional()
|
|
2734
|
+
defaultValue: DefaultAddressFieldValue.or(ComputedDefaultValue).optional()
|
|
2694
2735
|
}).meta({
|
|
2695
2736
|
description: "Address input field \u2013 a combination of location and text fields",
|
|
2696
2737
|
id: "Address"
|
|
@@ -2737,7 +2778,7 @@ var ButtonConfiguration = import_v43.default.object({
|
|
|
2737
2778
|
});
|
|
2738
2779
|
var ButtonField = BaseField.extend({
|
|
2739
2780
|
type: import_v43.default.literal(FieldType.BUTTON),
|
|
2740
|
-
defaultValue: ButtonFieldValue.optional(),
|
|
2781
|
+
defaultValue: ButtonFieldValue.or(ComputedDefaultValue).optional(),
|
|
2741
2782
|
configuration: ButtonConfiguration
|
|
2742
2783
|
}).meta({
|
|
2743
2784
|
description: "A generic button that can be used to trigger an action",
|
|
@@ -2765,7 +2806,7 @@ var AlphaPrintButton = BaseField.extend({
|
|
|
2765
2806
|
});
|
|
2766
2807
|
var HttpField = BaseField.extend({
|
|
2767
2808
|
type: import_v43.default.literal(FieldType.HTTP),
|
|
2768
|
-
defaultValue: HttpFieldValue.optional(),
|
|
2809
|
+
defaultValue: HttpFieldValue.or(ComputedDefaultValue).optional(),
|
|
2769
2810
|
configuration: import_v43.default.object({
|
|
2770
2811
|
trigger: FieldReference.optional().describe(
|
|
2771
2812
|
"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."
|
|
@@ -2851,7 +2892,7 @@ var LinkButtonField = BaseField.extend({
|
|
|
2851
2892
|
});
|
|
2852
2893
|
var VerificationStatus = BaseField.extend({
|
|
2853
2894
|
type: import_v43.default.literal(FieldType.VERIFICATION_STATUS),
|
|
2854
|
-
defaultValue: VerificationStatusValue.optional(),
|
|
2895
|
+
defaultValue: VerificationStatusValue.or(ComputedDefaultValue).optional(),
|
|
2855
2896
|
configuration: import_v43.default.object({
|
|
2856
2897
|
status: TranslationConfig.describe("Text to display on the status pill."),
|
|
2857
2898
|
description: TranslationConfig.describe(
|
|
@@ -2873,7 +2914,7 @@ var QueryParamReaderField = BaseField.extend({
|
|
|
2873
2914
|
});
|
|
2874
2915
|
var QrReaderField = BaseField.extend({
|
|
2875
2916
|
type: import_v43.default.literal(FieldType.QR_READER),
|
|
2876
|
-
defaultValue: QrReaderFieldValue.optional(),
|
|
2917
|
+
defaultValue: QrReaderFieldValue.or(ComputedDefaultValue).optional(),
|
|
2877
2918
|
configuration: import_v43.default.object({
|
|
2878
2919
|
validator: import_v43.default.any().meta({
|
|
2879
2920
|
description: "JSON Schema to validate the scanned QR code data against before populating the form fields.",
|
|
@@ -2886,7 +2927,7 @@ var QrReaderField = BaseField.extend({
|
|
|
2886
2927
|
});
|
|
2887
2928
|
var IdReaderField = BaseField.extend({
|
|
2888
2929
|
type: import_v43.default.literal(FieldType.ID_READER),
|
|
2889
|
-
defaultValue: IdReaderFieldValue.optional(),
|
|
2930
|
+
defaultValue: IdReaderFieldValue.or(ComputedDefaultValue).optional(),
|
|
2890
2931
|
methods: import_v43.default.array(
|
|
2891
2932
|
import_v43.default.union([QrReaderField, LinkButtonField]).describe("Methods for reading an ID")
|
|
2892
2933
|
)
|
|
@@ -3445,6 +3486,9 @@ var BaseField3 = z28.object({
|
|
|
3445
3486
|
),
|
|
3446
3487
|
validations: z28.array(ValidationConfig).optional().describe(
|
|
3447
3488
|
`Option for overriding the field validations specifically for advanced search form.`
|
|
3489
|
+
),
|
|
3490
|
+
allowedLocations: JurisdictionReference.optional().describe(
|
|
3491
|
+
`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.`
|
|
3448
3492
|
)
|
|
3449
3493
|
});
|
|
3450
3494
|
var SearchQueryParams = z28.object({
|
|
@@ -3519,9 +3563,11 @@ var z30 = __toESM(require("zod/v4"));
|
|
|
3519
3563
|
var z29 = __toESM(require("zod/v4"));
|
|
3520
3564
|
function getDynamicNameValue(field3) {
|
|
3521
3565
|
const nameConfiguration = field3.configuration?.name;
|
|
3566
|
+
const firstnameRequired = nameConfiguration?.firstname?.required ?? field3.required;
|
|
3567
|
+
const surnameRequired = nameConfiguration?.surname?.required ?? field3.required;
|
|
3522
3568
|
return z29.object({
|
|
3523
|
-
firstname:
|
|
3524
|
-
surname:
|
|
3569
|
+
firstname: firstnameRequired ? NonEmptyTextValue : TextValue,
|
|
3570
|
+
surname: surnameRequired ? NonEmptyTextValue : TextValue,
|
|
3525
3571
|
middlename: nameConfiguration?.middlename?.required ? NonEmptyTextValue : TextValue.optional()
|
|
3526
3572
|
});
|
|
3527
3573
|
}
|
|
@@ -3904,7 +3950,37 @@ function resolveDataPath(rootData, dataPath, instancePath) {
|
|
|
3904
3950
|
}
|
|
3905
3951
|
return current;
|
|
3906
3952
|
}
|
|
3953
|
+
function todayISO() {
|
|
3954
|
+
return (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" });
|
|
3955
|
+
}
|
|
3956
|
+
var compiledFunctionCache = /* @__PURE__ */ new Map();
|
|
3957
|
+
function compileClientFunction(code) {
|
|
3958
|
+
let fn = compiledFunctionCache.get(code);
|
|
3959
|
+
if (!fn) {
|
|
3960
|
+
fn = new Function(`return (${code})`)();
|
|
3961
|
+
compiledFunctionCache.set(code, fn);
|
|
3962
|
+
}
|
|
3963
|
+
return fn;
|
|
3964
|
+
}
|
|
3907
3965
|
(0, import_ajv_formats.default)(ajv);
|
|
3966
|
+
function buildClientFunctionContext(input) {
|
|
3967
|
+
return {
|
|
3968
|
+
$form: input.form,
|
|
3969
|
+
$now: todayISO(),
|
|
3970
|
+
// eslint-disable-next-line @typescript-eslint/no-use-before-define
|
|
3971
|
+
$online: isOnline(),
|
|
3972
|
+
$user: input.validatorContext?.user,
|
|
3973
|
+
$event: input.validatorContext?.event,
|
|
3974
|
+
$leafAdminStructureLocationIds: input.validatorContext?.leafAdminStructureLocationIds ?? [],
|
|
3975
|
+
user: input.systemVariables?.user,
|
|
3976
|
+
$window: input.systemVariables?.$window,
|
|
3977
|
+
locations: input.locations,
|
|
3978
|
+
adminLevelIds: input.adminLevelIds
|
|
3979
|
+
};
|
|
3980
|
+
}
|
|
3981
|
+
function runClientFunction(code, data, context) {
|
|
3982
|
+
return compileClientFunction(code)(data, context);
|
|
3983
|
+
}
|
|
3908
3984
|
ajv.addKeyword({
|
|
3909
3985
|
keyword: "daysFromDate",
|
|
3910
3986
|
type: "string",
|
|
@@ -3949,7 +4025,7 @@ ajv.addKeyword({
|
|
|
3949
4025
|
$data: true,
|
|
3950
4026
|
errors: true,
|
|
3951
4027
|
// @ts-ignore -- Force type. We will move this away from AJV next. Parsing the array will take seconds and is only called by core.
|
|
3952
|
-
validate(
|
|
4028
|
+
validate(_schema, data, _2, dataContext) {
|
|
3953
4029
|
const locationIdInput = data;
|
|
3954
4030
|
const locations = dataContext?.rootData.$leafAdminStructureLocationIds ?? [];
|
|
3955
4031
|
return locations.some((location) => location.id === locationIdInput);
|
|
@@ -3980,6 +4056,23 @@ function isAgeValue(value) {
|
|
|
3980
4056
|
function mergeWithBaseFormState(values, context) {
|
|
3981
4057
|
return { ...context.baseFormState, ...values };
|
|
3982
4058
|
}
|
|
4059
|
+
ajv.addKeyword({
|
|
4060
|
+
keyword: "customClientValidator",
|
|
4061
|
+
schemaType: "object",
|
|
4062
|
+
errors: true,
|
|
4063
|
+
// @ts-expect-error -- AJV's public types don't expose `rootData`. All
|
|
4064
|
+
// `validate()` callers build root data via `buildClientFunctionContext`,
|
|
4065
|
+
// so the cast holds.
|
|
4066
|
+
validate(schema, data, _2, dataContext) {
|
|
4067
|
+
return Boolean(
|
|
4068
|
+
runClientFunction(
|
|
4069
|
+
schema.code,
|
|
4070
|
+
data,
|
|
4071
|
+
dataContext?.rootData ?? buildClientFunctionContext({ form: {} })
|
|
4072
|
+
)
|
|
4073
|
+
);
|
|
4074
|
+
}
|
|
4075
|
+
});
|
|
3983
4076
|
function validate(schema, data) {
|
|
3984
4077
|
const validator = ajv.getSchema(schema.$id) || ajv.compile(schema);
|
|
3985
4078
|
if ("$form" in data) {
|
|
@@ -4016,17 +4109,14 @@ function isOnline() {
|
|
|
4016
4109
|
}
|
|
4017
4110
|
return true;
|
|
4018
4111
|
}
|
|
4019
|
-
function isConditionMet(conditional, values, context
|
|
4020
|
-
return validate(
|
|
4021
|
-
|
|
4022
|
-
|
|
4023
|
-
|
|
4024
|
-
|
|
4025
|
-
|
|
4026
|
-
|
|
4027
|
-
$status: eventIndex?.status,
|
|
4028
|
-
$event: context.event
|
|
4029
|
-
});
|
|
4112
|
+
function isConditionMet(conditional, values, context) {
|
|
4113
|
+
return validate(
|
|
4114
|
+
conditional,
|
|
4115
|
+
buildClientFunctionContext({
|
|
4116
|
+
form: mergeWithBaseFormState(values, context),
|
|
4117
|
+
validatorContext: context
|
|
4118
|
+
})
|
|
4119
|
+
);
|
|
4030
4120
|
}
|
|
4031
4121
|
function getConditionalActionsForField(field3, values) {
|
|
4032
4122
|
if (!field3.conditionals) {
|
|
@@ -4034,9 +4124,9 @@ function getConditionalActionsForField(field3, values) {
|
|
|
4034
4124
|
}
|
|
4035
4125
|
return field3.conditionals.filter((conditional) => validate(conditional.conditional, values)).map((conditional) => conditional.type);
|
|
4036
4126
|
}
|
|
4037
|
-
function areConditionsMet(conditions, values, context,
|
|
4127
|
+
function areConditionsMet(conditions, values, context, _event) {
|
|
4038
4128
|
return conditions.every(
|
|
4039
|
-
(condition) => isConditionMet(condition.conditional, values, context
|
|
4129
|
+
(condition) => isConditionMet(condition.conditional, values, context)
|
|
4040
4130
|
);
|
|
4041
4131
|
}
|
|
4042
4132
|
function isFieldConditionMet(field3, form, conditionalType, context) {
|
|
@@ -4046,14 +4136,13 @@ function isFieldConditionMet(field3, form, conditionalType, context) {
|
|
|
4046
4136
|
if (!hasRule) {
|
|
4047
4137
|
return true;
|
|
4048
4138
|
}
|
|
4049
|
-
const validConditionals = getConditionalActionsForField(
|
|
4050
|
-
|
|
4051
|
-
|
|
4052
|
-
|
|
4053
|
-
|
|
4054
|
-
|
|
4055
|
-
|
|
4056
|
-
});
|
|
4139
|
+
const validConditionals = getConditionalActionsForField(
|
|
4140
|
+
field3,
|
|
4141
|
+
buildClientFunctionContext({
|
|
4142
|
+
form: mergeWithBaseFormState(form, context),
|
|
4143
|
+
validatorContext: context
|
|
4144
|
+
})
|
|
4145
|
+
);
|
|
4057
4146
|
return validConditionals.includes(conditionalType);
|
|
4058
4147
|
}
|
|
4059
4148
|
function isFieldVisible(field3, form, context) {
|
|
@@ -4079,7 +4168,14 @@ function isActionConditionMet(actionConfig, event2, context, conditionalType) {
|
|
|
4079
4168
|
if (!rule) {
|
|
4080
4169
|
return true;
|
|
4081
4170
|
}
|
|
4082
|
-
return
|
|
4171
|
+
return validate(rule.conditional, {
|
|
4172
|
+
...buildClientFunctionContext({
|
|
4173
|
+
form: mergeWithBaseFormState(event2.declaration, context),
|
|
4174
|
+
validatorContext: context
|
|
4175
|
+
}),
|
|
4176
|
+
$flags: event2.flags,
|
|
4177
|
+
$status: event2.status
|
|
4178
|
+
});
|
|
4083
4179
|
}
|
|
4084
4180
|
function isActionEnabled(actionConfig, event2, context) {
|
|
4085
4181
|
return isActionConditionMet(
|
|
@@ -4238,19 +4334,10 @@ function runFieldValidations({
|
|
|
4238
4334
|
if (!isFieldVisible(field3.config, form, context)) {
|
|
4239
4335
|
return [];
|
|
4240
4336
|
}
|
|
4241
|
-
const conditionalParameters = {
|
|
4242
|
-
|
|
4243
|
-
|
|
4244
|
-
|
|
4245
|
-
* In real use cases, there can be hundreds of thousands of locations.
|
|
4246
|
-
* Make sure that the context contains only the locations that are needed for validation.
|
|
4247
|
-
* E.g. if the user is a leaf admin, only the leaf locations under their admin structure are needed.
|
|
4248
|
-
* Loading few megabytes of locations to memory just for validation is not efficient and will choke the application.
|
|
4249
|
-
*/
|
|
4250
|
-
$leafAdminStructureLocationIds: context.leafAdminStructureLocationIds ?? [],
|
|
4251
|
-
$online: isOnline(),
|
|
4252
|
-
$user: context.user
|
|
4253
|
-
};
|
|
4337
|
+
const conditionalParameters = buildClientFunctionContext({
|
|
4338
|
+
form: mergeWithBaseFormState(form, context),
|
|
4339
|
+
validatorContext: context
|
|
4340
|
+
});
|
|
4254
4341
|
if (isFieldGroupFieldType(field3)) {
|
|
4255
4342
|
const subfieldErrors = buildFormState(
|
|
4256
4343
|
field3.config.fields,
|
|
@@ -4734,19 +4821,32 @@ function getPendingAction(actions) {
|
|
|
4734
4821
|
}
|
|
4735
4822
|
return pendingActions[0];
|
|
4736
4823
|
}
|
|
4737
|
-
function getCompleteActionAnnotation(
|
|
4824
|
+
function getCompleteActionAnnotation(event2, action) {
|
|
4738
4825
|
if (action.originalActionId) {
|
|
4739
4826
|
const originalAction = event2.actions.find(
|
|
4740
4827
|
({ id }) => id === action.originalActionId
|
|
4741
4828
|
);
|
|
4742
4829
|
if (originalAction?.status === ActionStatus.Requested) {
|
|
4743
|
-
return deepMerge(
|
|
4744
|
-
deepMerge(annotation, originalAction.annotation ?? {}),
|
|
4745
|
-
action.annotation ?? {}
|
|
4746
|
-
);
|
|
4830
|
+
return deepMerge(originalAction.annotation ?? {}, action.annotation ?? {});
|
|
4747
4831
|
}
|
|
4748
4832
|
}
|
|
4749
|
-
return
|
|
4833
|
+
return action.annotation ?? {};
|
|
4834
|
+
}
|
|
4835
|
+
function getCompleteActionContent(event2, action) {
|
|
4836
|
+
const currentContent = "content" in action ? action.content : void 0;
|
|
4837
|
+
if (!action.originalActionId) {
|
|
4838
|
+
return currentContent;
|
|
4839
|
+
}
|
|
4840
|
+
const originalAction = event2.actions.find(
|
|
4841
|
+
({ id }) => id === action.originalActionId
|
|
4842
|
+
);
|
|
4843
|
+
if (originalAction && "content" in originalAction && originalAction.content) {
|
|
4844
|
+
return {
|
|
4845
|
+
...originalAction.content,
|
|
4846
|
+
...currentContent ?? {}
|
|
4847
|
+
};
|
|
4848
|
+
}
|
|
4849
|
+
return currentContent;
|
|
4750
4850
|
}
|
|
4751
4851
|
function getCompleteActionDeclaration(declaration, event2, action) {
|
|
4752
4852
|
if (action.originalActionId) {
|
|
@@ -4766,7 +4866,7 @@ function getAcceptedActions(event2) {
|
|
|
4766
4866
|
return event2.actions.filter(isAcceptedAction).map((action) => ({
|
|
4767
4867
|
...action,
|
|
4768
4868
|
declaration: getCompleteActionDeclaration({}, event2, action),
|
|
4769
|
-
annotation: getCompleteActionAnnotation(
|
|
4869
|
+
annotation: getCompleteActionAnnotation(event2, action)
|
|
4770
4870
|
}));
|
|
4771
4871
|
}
|
|
4772
4872
|
var EXCLUDED_ACTIONS = [
|
|
@@ -4854,6 +4954,9 @@ function not(condition) {
|
|
|
4854
4954
|
function never2() {
|
|
4855
4955
|
return not(alwaysTrue());
|
|
4856
4956
|
}
|
|
4957
|
+
function always() {
|
|
4958
|
+
return defineConditional(alwaysTrue());
|
|
4959
|
+
}
|
|
4857
4960
|
function jsonFieldPath(field3) {
|
|
4858
4961
|
return [field3.$$field, ...field3.$$subfield].join("/");
|
|
4859
4962
|
}
|
|
@@ -5401,7 +5504,54 @@ function createFieldConditionals(fieldId) {
|
|
|
5401
5504
|
}
|
|
5402
5505
|
},
|
|
5403
5506
|
required: [fieldId]
|
|
5404
|
-
})
|
|
5507
|
+
}),
|
|
5508
|
+
/**
|
|
5509
|
+
* Custom client-side validator. The provided function is serialised and executed
|
|
5510
|
+
* just-in-time on the client only. External references (e.g. lodash) are not
|
|
5511
|
+
* available inside the function body — all logic must be self-contained.
|
|
5512
|
+
*
|
|
5513
|
+
* @example
|
|
5514
|
+
* field('nid').customClientValidator((value) => {
|
|
5515
|
+
* // LUHN check — all logic must be inline
|
|
5516
|
+
* const digits = String(value).split('').map(Number)
|
|
5517
|
+
* // ...
|
|
5518
|
+
* return isValid
|
|
5519
|
+
* })
|
|
5520
|
+
*/
|
|
5521
|
+
customClientValidator(validationFn) {
|
|
5522
|
+
const code = validationFn.toString();
|
|
5523
|
+
return defineFormConditional({
|
|
5524
|
+
type: "object",
|
|
5525
|
+
properties: wrapToPath(
|
|
5526
|
+
{ [fieldId]: { customClientValidator: { code } } },
|
|
5527
|
+
this.$$subfield
|
|
5528
|
+
),
|
|
5529
|
+
required: [fieldId]
|
|
5530
|
+
});
|
|
5531
|
+
},
|
|
5532
|
+
/**
|
|
5533
|
+
* Custom client-side evaluation. Returns a {@link FieldReference} descriptor
|
|
5534
|
+
* that can be used as the `value` property or a DATA component entry.
|
|
5535
|
+
* The function receives the referenced field's value as the first argument and
|
|
5536
|
+
* the full form context as the second; its return value replaces the field reference.
|
|
5537
|
+
* The function is serialised and executed just-in-time on the client only.
|
|
5538
|
+
* External references (e.g. lodash) are not available inside the function body.
|
|
5539
|
+
*
|
|
5540
|
+
* For computing a default value without referencing a specific field, use
|
|
5541
|
+
* `evaluate(fn)` in the `defaultValue` property instead.
|
|
5542
|
+
*
|
|
5543
|
+
* @example
|
|
5544
|
+
* field('a').customClientEvaluation((aValue, ctx) =>
|
|
5545
|
+
* Number(aValue) + Number(ctx.$form.b)
|
|
5546
|
+
* )
|
|
5547
|
+
*/
|
|
5548
|
+
customClientEvaluation(computationFn) {
|
|
5549
|
+
return {
|
|
5550
|
+
$$code: computationFn.toString(),
|
|
5551
|
+
$$field: fieldId,
|
|
5552
|
+
$$subfield: this.$$subfield
|
|
5553
|
+
};
|
|
5554
|
+
}
|
|
5405
5555
|
};
|
|
5406
5556
|
}
|
|
5407
5557
|
|
|
@@ -6191,7 +6341,8 @@ var RejectCorrectionActionInput = BaseActionInput.extend(
|
|
|
6191
6341
|
var ApproveCorrectionActionInput = BaseActionInput.extend(
|
|
6192
6342
|
z38.object({
|
|
6193
6343
|
requestId: z38.string(),
|
|
6194
|
-
type: z38.literal(ActionType.APPROVE_CORRECTION).default(ActionType.APPROVE_CORRECTION)
|
|
6344
|
+
type: z38.literal(ActionType.APPROVE_CORRECTION).default(ActionType.APPROVE_CORRECTION),
|
|
6345
|
+
content: z38.object({ immediateCorrection: z38.boolean().optional() }).optional()
|
|
6195
6346
|
}).shape
|
|
6196
6347
|
);
|
|
6197
6348
|
var ReadActionInput = BaseActionInput.extend(
|
|
@@ -6354,7 +6505,7 @@ function getActionUpdateMetadata(actions) {
|
|
|
6354
6505
|
"createdAtLocation",
|
|
6355
6506
|
"createdByRole"
|
|
6356
6507
|
];
|
|
6357
|
-
return actions.filter(({ type }) => updateActions.safeParse(type).success).
|
|
6508
|
+
return actions.filter(({ type }) => updateActions.safeParse(type).success).reduce(
|
|
6358
6509
|
(_2, action) => {
|
|
6359
6510
|
if (action.originalActionId) {
|
|
6360
6511
|
const originalAction = actions.find(({ id }) => id === action.originalActionId) ?? action;
|
|
@@ -6384,26 +6535,43 @@ var import_date_fns3 = require("date-fns");
|
|
|
6384
6535
|
function isEditInProgress(actions) {
|
|
6385
6536
|
return actions.at(-1)?.type === ActionType.EDIT;
|
|
6386
6537
|
}
|
|
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;
|
|
6544
|
+
}
|
|
6545
|
+
if (action.type === ActionType.REQUEST_CORRECTION) {
|
|
6546
|
+
correctionRequestAction = action;
|
|
6547
|
+
break;
|
|
6548
|
+
}
|
|
6549
|
+
}
|
|
6550
|
+
return correctionRequestAction;
|
|
6551
|
+
}
|
|
6387
6552
|
function isCorrectionRequested(actions) {
|
|
6553
|
+
return findPendingCorrectionAction(actions) !== void 0;
|
|
6554
|
+
}
|
|
6555
|
+
function isDeclarationIncomplete(actions) {
|
|
6556
|
+
return getStatusFromActions(actions) === EventStatus.enum.NOTIFIED;
|
|
6557
|
+
}
|
|
6558
|
+
function isRejected(actions) {
|
|
6559
|
+
const resettingActionTypes = [
|
|
6560
|
+
ActionType.NOTIFY,
|
|
6561
|
+
ActionType.DECLARE,
|
|
6562
|
+
ActionType.EDIT,
|
|
6563
|
+
ActionType.REGISTER
|
|
6564
|
+
];
|
|
6388
6565
|
return actions.reduce((prev, { type }) => {
|
|
6389
|
-
if (type === ActionType.
|
|
6566
|
+
if (type === ActionType.REJECT) {
|
|
6390
6567
|
return true;
|
|
6391
6568
|
}
|
|
6392
|
-
if (type
|
|
6393
|
-
return false;
|
|
6394
|
-
}
|
|
6395
|
-
if (type === ActionType.REJECT_CORRECTION) {
|
|
6569
|
+
if (resettingActionTypes.includes(type)) {
|
|
6396
6570
|
return false;
|
|
6397
6571
|
}
|
|
6398
6572
|
return prev;
|
|
6399
6573
|
}, false);
|
|
6400
6574
|
}
|
|
6401
|
-
function isDeclarationIncomplete(actions) {
|
|
6402
|
-
return getStatusFromActions(actions) === EventStatus.enum.NOTIFIED;
|
|
6403
|
-
}
|
|
6404
|
-
function isRejected(actions) {
|
|
6405
|
-
return actions.at(-1)?.type === ActionType.REJECT;
|
|
6406
|
-
}
|
|
6407
6575
|
function isPotentialDuplicate(actions) {
|
|
6408
6576
|
return actions.reduce((prev, { type }) => {
|
|
6409
6577
|
if (type === ActionType.DUPLICATE_DETECTED) {
|
|
@@ -6466,8 +6634,7 @@ function resolveEventCustomFlags(event2, eventConfiguration) {
|
|
|
6466
6634
|
return (0, import_lodash3.uniq)(flags);
|
|
6467
6635
|
}, []);
|
|
6468
6636
|
}
|
|
6469
|
-
function
|
|
6470
|
-
const sortedActions = event2.actions.filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6637
|
+
function getActionStatusFlags(sortedActions) {
|
|
6471
6638
|
const actionStatus = sortedActions.reduce(
|
|
6472
6639
|
(actionStatuses, { type, status: status2 }) => ({
|
|
6473
6640
|
...actionStatuses,
|
|
@@ -6475,26 +6642,40 @@ function getEventFlags(event2, config) {
|
|
|
6475
6642
|
}),
|
|
6476
6643
|
{}
|
|
6477
6644
|
);
|
|
6478
|
-
|
|
6645
|
+
return Object.entries(actionStatus).filter(([, status2]) => status2 !== ActionStatus.Accepted).map(([type, status2]) => {
|
|
6479
6646
|
const flag2 = joinValues([type, status2], ":").toLowerCase();
|
|
6480
6647
|
return flag2;
|
|
6481
6648
|
});
|
|
6482
|
-
|
|
6483
|
-
|
|
6649
|
+
}
|
|
6650
|
+
function getInherentFlags(sortedActions) {
|
|
6651
|
+
const acceptedActions = sortedActions.filter(
|
|
6652
|
+
({ status: status2 }) => status2 === ActionStatus.Accepted
|
|
6653
|
+
);
|
|
6654
|
+
const inherentFlags = [];
|
|
6655
|
+
if (isCorrectionRequested(acceptedActions)) {
|
|
6656
|
+
inherentFlags.push(InherentFlags.CORRECTION_REQUESTED);
|
|
6484
6657
|
}
|
|
6485
|
-
if (isDeclarationIncomplete(
|
|
6486
|
-
|
|
6658
|
+
if (isDeclarationIncomplete(acceptedActions)) {
|
|
6659
|
+
inherentFlags.push(InherentFlags.INCOMPLETE);
|
|
6487
6660
|
}
|
|
6488
|
-
if (isRejected(
|
|
6489
|
-
|
|
6661
|
+
if (isRejected(acceptedActions)) {
|
|
6662
|
+
inherentFlags.push(InherentFlags.REJECTED);
|
|
6490
6663
|
}
|
|
6491
|
-
if (isPotentialDuplicate(
|
|
6492
|
-
|
|
6664
|
+
if (isPotentialDuplicate(acceptedActions)) {
|
|
6665
|
+
inherentFlags.push(InherentFlags.POTENTIAL_DUPLICATE);
|
|
6493
6666
|
}
|
|
6494
|
-
if (isEditInProgress(
|
|
6495
|
-
|
|
6667
|
+
if (isEditInProgress(acceptedActions)) {
|
|
6668
|
+
inherentFlags.push(InherentFlags.EDIT_IN_PROGRESS);
|
|
6496
6669
|
}
|
|
6497
|
-
return
|
|
6670
|
+
return inherentFlags;
|
|
6671
|
+
}
|
|
6672
|
+
function getEventFlags(event2, config) {
|
|
6673
|
+
const sortedActions = event2.actions.filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6674
|
+
return [
|
|
6675
|
+
...getActionStatusFlags(sortedActions),
|
|
6676
|
+
...getInherentFlags(sortedActions),
|
|
6677
|
+
...resolveEventCustomFlags(event2, config)
|
|
6678
|
+
];
|
|
6498
6679
|
}
|
|
6499
6680
|
|
|
6500
6681
|
// ../commons/src/events/state/index.ts
|
|
@@ -6729,7 +6910,7 @@ function getActionAnnotation({
|
|
|
6729
6910
|
const action = (0, import_lodash4.findLast)(activeActions, (a) => a.type === actionType);
|
|
6730
6911
|
const actionWithCompleteAnnotation = action && {
|
|
6731
6912
|
...action,
|
|
6732
|
-
annotation: getCompleteActionAnnotation(
|
|
6913
|
+
annotation: getCompleteActionAnnotation(event2, action)
|
|
6733
6914
|
};
|
|
6734
6915
|
const matchingDraft = draft?.action.type === actionType ? draft : void 0;
|
|
6735
6916
|
const sortedActions = (0, import_lodash4.orderBy)(
|
|
@@ -6801,6 +6982,9 @@ function createFieldConfig(fieldId, options) {
|
|
|
6801
6982
|
}
|
|
6802
6983
|
|
|
6803
6984
|
// ../commons/src/events/field.ts
|
|
6985
|
+
function evaluate(computationFn) {
|
|
6986
|
+
return { $$code: computationFn.toString() };
|
|
6987
|
+
}
|
|
6804
6988
|
function field(fieldId, options = {}) {
|
|
6805
6989
|
return {
|
|
6806
6990
|
...createFieldConditionals(fieldId),
|
|
@@ -10445,18 +10629,19 @@ var ACTION_FILTERS = {
|
|
|
10445
10629
|
function filterActionsByFlags(actions, flags) {
|
|
10446
10630
|
return actions.filter((action) => ACTION_FILTERS[action]?.(flags) ?? true);
|
|
10447
10631
|
}
|
|
10632
|
+
var REJECTED_ACTIONS = [
|
|
10633
|
+
ActionType.READ,
|
|
10634
|
+
ActionType.NOTIFY,
|
|
10635
|
+
ActionType.CUSTOM,
|
|
10636
|
+
ActionType.EDIT,
|
|
10637
|
+
ActionType.ARCHIVE
|
|
10638
|
+
];
|
|
10448
10639
|
function getAvailableActionsWithoutFlagFilters(status2, flags) {
|
|
10449
10640
|
if (flags.includes(InherentFlags.EDIT_IN_PROGRESS)) {
|
|
10450
10641
|
return [ActionType.NOTIFY, ActionType.DECLARE, ActionType.REGISTER];
|
|
10451
10642
|
}
|
|
10452
|
-
if (flags.includes(InherentFlags.REJECTED)) {
|
|
10453
|
-
return
|
|
10454
|
-
ActionType.READ,
|
|
10455
|
-
ActionType.NOTIFY,
|
|
10456
|
-
ActionType.CUSTOM,
|
|
10457
|
-
ActionType.EDIT,
|
|
10458
|
-
ActionType.ARCHIVE
|
|
10459
|
-
];
|
|
10643
|
+
if (flags.includes(InherentFlags.REJECTED) && status2 !== EventStatus.enum.ARCHIVED) {
|
|
10644
|
+
return REJECTED_ACTIONS;
|
|
10460
10645
|
}
|
|
10461
10646
|
return AVAILABLE_ACTIONS_BY_EVENT_STATUS[status2];
|
|
10462
10647
|
}
|