@opencrvs/toolkit 2.0.0-rc.ed6382e → 2.0.0-rc.edc7303
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 +92 -17
- package/dist/commons/application-config/index.d.ts +1 -0
- package/dist/commons/conditionals/conditionals.d.ts +348 -4
- package/dist/commons/conditionals/validate.d.ts +51 -2
- package/dist/commons/events/ActionConfig.d.ts +28 -2
- package/dist/commons/events/ActionDocument.d.ts +6 -0
- package/dist/commons/events/ActionInput.d.ts +6 -0
- package/dist/commons/events/AdvancedSearchConfig.d.ts +342 -0
- package/dist/commons/events/EventDocument.d.ts +3 -0
- package/dist/commons/events/FieldConfig.d.ts +378 -50
- package/dist/commons/events/FieldType.d.ts +1 -0
- package/dist/commons/events/FieldTypeMapping.d.ts +1 -1
- package/dist/commons/events/FieldValue.d.ts +6 -0
- package/dist/commons/events/field.d.ts +53 -1
- package/dist/commons/events/state/flags.d.ts +15 -1
- package/dist/commons/events/state/utils.d.ts +12 -287
- package/dist/commons/events/utils.d.ts +12 -1
- package/dist/conditionals/index.js +48 -1
- package/dist/events/index.js +403 -141
- 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 +248 -39
- package/dist/scopes/index.d.ts +4 -6
- package/dist/scopes/index.js +9 -3
- package/opencrvs-toolkit-2.0.0-rc.edc7303.tgz +0 -0
- package/package.json +1 -1
- package/opencrvs-toolkit-2.0.0-rc.ed6382e.tgz +0 -0
package/dist/events/index.js
CHANGED
|
@@ -75,6 +75,7 @@ __export(events_exports, {
|
|
|
75
75
|
CheckboxFieldValue: () => CheckboxFieldValue,
|
|
76
76
|
Clause: () => Clause,
|
|
77
77
|
ClientSpecificAction: () => ClientSpecificAction,
|
|
78
|
+
ComputedDefaultValue: () => ComputedDefaultValue,
|
|
78
79
|
Conditional: () => Conditional,
|
|
79
80
|
ConditionalType: () => ConditionalType,
|
|
80
81
|
ConfirmableActions: () => ConfirmableActions,
|
|
@@ -150,6 +151,7 @@ __export(events_exports, {
|
|
|
150
151
|
FormPageConfig: () => FormPageConfig,
|
|
151
152
|
Fuzzy: () => Fuzzy,
|
|
152
153
|
GeographicalArea: () => GeographicalArea,
|
|
154
|
+
HiddenFieldTypes: () => HiddenFieldTypes,
|
|
153
155
|
HiddenFieldValue: () => HiddenFieldValue,
|
|
154
156
|
HttpFieldUpdateValue: () => HttpFieldUpdateValue,
|
|
155
157
|
HttpFieldValue: () => HttpFieldValue,
|
|
@@ -200,6 +202,7 @@ __export(events_exports, {
|
|
|
200
202
|
SelectDateRangeValue: () => SelectDateRangeValue,
|
|
201
203
|
SelectOption: () => SelectOption,
|
|
202
204
|
ShowConditional: () => ShowConditional,
|
|
205
|
+
SignatureFieldValue: () => SignatureFieldValue,
|
|
203
206
|
StaticDataEntry: () => StaticDataEntry,
|
|
204
207
|
StreetLevelDetailsUpdateValue: () => StreetLevelDetailsUpdateValue,
|
|
205
208
|
SummaryConfig: () => SummaryConfig,
|
|
@@ -246,10 +249,12 @@ __export(events_exports, {
|
|
|
246
249
|
applyDraftToEventIndex: () => applyDraftToEventIndex,
|
|
247
250
|
areCertificateConditionsMet: () => areCertificateConditionsMet,
|
|
248
251
|
areConditionsMet: () => areConditionsMet,
|
|
252
|
+
buildClientFunctionContext: () => buildClientFunctionContext,
|
|
249
253
|
buildFormState: () => buildFormState,
|
|
250
254
|
canAccessEventWithScope: () => canAccessEventWithScope,
|
|
251
255
|
canAccessOtherUserWithScopes: () => canAccessOtherUserWithScopes,
|
|
252
256
|
canAccessUserWithScope: () => canAccessUserWithScope,
|
|
257
|
+
compileClientFunction: () => compileClientFunction,
|
|
253
258
|
compositeFieldTypes: () => compositeFieldTypes,
|
|
254
259
|
createEmptyDraft: () => createEmptyDraft,
|
|
255
260
|
createFieldConditionals: () => createFieldConditionals,
|
|
@@ -270,6 +275,7 @@ __export(events_exports, {
|
|
|
270
275
|
defineWorkqueuesColumns: () => defineWorkqueuesColumns,
|
|
271
276
|
deserializeQuery: () => deserializeQuery,
|
|
272
277
|
errorMessages: () => errorMessages,
|
|
278
|
+
evaluate: () => evaluate,
|
|
273
279
|
event: () => event,
|
|
274
280
|
eventMetadataLabelMap: () => eventMetadataLabelMap,
|
|
275
281
|
eventPayloadGenerator: () => eventPayloadGenerator,
|
|
@@ -282,6 +288,7 @@ __export(events_exports, {
|
|
|
282
288
|
findActiveDraftForEvent: () => findActiveDraftForEvent,
|
|
283
289
|
findAllFields: () => findAllFields,
|
|
284
290
|
findLastAssignmentAction: () => findLastAssignmentAction,
|
|
291
|
+
findPendingCorrectionAction: () => findPendingCorrectionAction,
|
|
285
292
|
findRecordActionPages: () => findRecordActionPages,
|
|
286
293
|
flag: () => flag,
|
|
287
294
|
flattenFieldReference: () => flattenFieldReference,
|
|
@@ -315,6 +322,7 @@ __export(events_exports, {
|
|
|
315
322
|
getAvailableActionsForEvent: () => getAvailableActionsForEvent,
|
|
316
323
|
getAvailableRolesForUserUpdatePayload: () => getAvailableRolesForUserUpdatePayload,
|
|
317
324
|
getCompleteActionAnnotation: () => getCompleteActionAnnotation,
|
|
325
|
+
getCompleteActionContent: () => getCompleteActionContent,
|
|
318
326
|
getCompleteActionDeclaration: () => getCompleteActionDeclaration,
|
|
319
327
|
getCurrentEventState: () => getCurrentEventState,
|
|
320
328
|
getCustomActionFields: () => getCustomActionFields,
|
|
@@ -346,6 +354,7 @@ __export(events_exports, {
|
|
|
346
354
|
isBulletListFieldType: () => isBulletListFieldType,
|
|
347
355
|
isButtonFieldType: () => isButtonFieldType,
|
|
348
356
|
isCheckboxFieldType: () => isCheckboxFieldType,
|
|
357
|
+
isCodeToEvaluate: () => isCodeToEvaluate,
|
|
349
358
|
isConditionMet: () => isConditionMet,
|
|
350
359
|
isCountryFieldType: () => isCountryFieldType,
|
|
351
360
|
isCustomFieldType: () => isCustomFieldType,
|
|
@@ -422,11 +431,13 @@ __export(events_exports, {
|
|
|
422
431
|
resolveDateOfEvent: () => resolveDateOfEvent,
|
|
423
432
|
resolveEventCustomFlags: () => resolveEventCustomFlags,
|
|
424
433
|
resolvePlaceOfEvent: () => resolvePlaceOfEvent,
|
|
434
|
+
runClientFunction: () => runClientFunction,
|
|
425
435
|
runFieldValidations: () => runFieldValidations,
|
|
426
436
|
runStructuralValidations: () => runStructuralValidations,
|
|
427
437
|
safeUnion: () => safeUnion,
|
|
428
438
|
status: () => status,
|
|
429
439
|
timePeriodToDateRange: () => timePeriodToDateRange,
|
|
440
|
+
todayISO: () => todayISO,
|
|
430
441
|
user: () => user,
|
|
431
442
|
userCanAccessEventWithScopes: () => userCanAccessEventWithScopes,
|
|
432
443
|
validate: () => validate,
|
|
@@ -701,14 +712,20 @@ var unflattenScope = (input) => {
|
|
|
701
712
|
return { type, options };
|
|
702
713
|
};
|
|
703
714
|
var EncodedScope = z2.string().brand("EncodedScope");
|
|
704
|
-
var
|
|
705
|
-
|
|
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, {
|
|
706
721
|
ignoreQueryPrefix: true,
|
|
707
722
|
comma: true,
|
|
708
723
|
allowDots: true
|
|
709
724
|
});
|
|
710
725
|
const unflattenedScope = unflattenScope(scope);
|
|
711
|
-
|
|
726
|
+
const result = Scope.safeParse(unflattenedScope)?.data;
|
|
727
|
+
decodedScopeCache.set(encodedScope, result);
|
|
728
|
+
return result;
|
|
712
729
|
};
|
|
713
730
|
var DEFAULT_SCOPE_OPTIONS = {
|
|
714
731
|
placeOfEvent: JurisdictionFilter.enum.all,
|
|
@@ -1203,6 +1220,11 @@ var FieldTypesToHideInReview = [
|
|
|
1203
1220
|
FieldType.ALPHA_PRINT_BUTTON,
|
|
1204
1221
|
FieldType.ALPHA_HIDDEN
|
|
1205
1222
|
];
|
|
1223
|
+
var HiddenFieldTypes = [
|
|
1224
|
+
FieldType.HTTP,
|
|
1225
|
+
FieldType.QUERY_PARAM_READER,
|
|
1226
|
+
FieldType.ALPHA_HIDDEN
|
|
1227
|
+
];
|
|
1206
1228
|
|
|
1207
1229
|
// ../commons/src/events/FieldValue.ts
|
|
1208
1230
|
var z12 = __toESM(require("zod/v4"));
|
|
@@ -1329,7 +1351,7 @@ function plainDateToLocalDate(date) {
|
|
|
1329
1351
|
// ../commons/src/events/FieldValue.ts
|
|
1330
1352
|
var TextValue = z12.string();
|
|
1331
1353
|
var HiddenFieldValue = z12.string();
|
|
1332
|
-
var NonEmptyTextValue =
|
|
1354
|
+
var NonEmptyTextValue = z12.string().trim().min(1);
|
|
1333
1355
|
var DateValue = z12.iso.date().describe("Date in the format YYYY-MM-DD");
|
|
1334
1356
|
var AgeValue = z12.object({
|
|
1335
1357
|
age: z12.number(),
|
|
@@ -1358,6 +1380,7 @@ var DateRangeFieldValue = z12.object({
|
|
|
1358
1380
|
var EmailValue = z12.email();
|
|
1359
1381
|
var CheckboxFieldValue = z12.boolean();
|
|
1360
1382
|
var NumberFieldValue = z12.number();
|
|
1383
|
+
var SignatureFieldValue = FileFieldValue;
|
|
1361
1384
|
var ButtonFieldValue = z12.number();
|
|
1362
1385
|
var VerificationStatusValue = z12.enum([
|
|
1363
1386
|
"verified",
|
|
@@ -1656,8 +1679,9 @@ var RequestedCorrectionAction = ActionBase.extend(
|
|
|
1656
1679
|
var ApprovedCorrectionAction = ActionBase.extend(
|
|
1657
1680
|
z14.object({
|
|
1658
1681
|
type: z14.literal(ActionType.APPROVE_CORRECTION),
|
|
1659
|
-
requestId: z14.string()
|
|
1682
|
+
requestId: z14.string(),
|
|
1660
1683
|
// TODO move into 'content' property
|
|
1684
|
+
content: z14.object({ immediateCorrection: z14.boolean().optional() }).optional()
|
|
1661
1685
|
}).shape
|
|
1662
1686
|
);
|
|
1663
1687
|
var RejectedCorrectionAction = ActionBase.extend(
|
|
@@ -2188,8 +2212,21 @@ var FieldReference = import_v43.default.object({
|
|
|
2188
2212
|
$$field: FieldId.describe("Id of the field to reference"),
|
|
2189
2213
|
$$subfield: import_v43.default.array(import_v43.default.string()).optional().default([]).describe(
|
|
2190
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."
|
|
2218
|
+
)
|
|
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."
|
|
2191
2228
|
)
|
|
2192
|
-
}).describe("
|
|
2229
|
+
}).describe("A context-only computation used as a field default value.");
|
|
2193
2230
|
var ValidationConfig = import_v43.default.object({
|
|
2194
2231
|
validator: Conditional.describe(
|
|
2195
2232
|
"Conditional expression that must hold for the field value to be considered valid."
|
|
@@ -2230,7 +2267,7 @@ var BaseField = import_v43.default.object({
|
|
|
2230
2267
|
"Indicates whether the field can be modified during record correction."
|
|
2231
2268
|
),
|
|
2232
2269
|
value: FieldReference.or(import_v43.default.array(FieldReference)).optional().describe(
|
|
2233
|
-
"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."
|
|
2234
2271
|
),
|
|
2235
2272
|
analytics: import_v43.default.boolean().default(false).optional().describe(
|
|
2236
2273
|
"Indicates whether the field is included in analytics. When enabled, its value becomes available in the analytics dashboard."
|
|
@@ -2244,7 +2281,7 @@ var Divider = BaseField.extend({
|
|
|
2244
2281
|
});
|
|
2245
2282
|
var TextField = BaseField.extend({
|
|
2246
2283
|
type: import_v43.default.literal(FieldType.TEXT),
|
|
2247
|
-
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField]).optional(),
|
|
2284
|
+
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField, ComputedDefaultValue]).optional(),
|
|
2248
2285
|
configuration: import_v43.default.object({
|
|
2249
2286
|
maxLength: import_v43.default.number().optional().describe("Maximum length of the text"),
|
|
2250
2287
|
type: import_v43.default.enum(["text", "password"]).optional(),
|
|
@@ -2257,10 +2294,11 @@ var TextField = BaseField.extend({
|
|
|
2257
2294
|
});
|
|
2258
2295
|
var NumberField = BaseField.extend({
|
|
2259
2296
|
type: import_v43.default.literal(FieldType.NUMBER),
|
|
2260
|
-
defaultValue: NumberFieldValue.optional(),
|
|
2297
|
+
defaultValue: NumberFieldValue.or(ComputedDefaultValue).optional(),
|
|
2261
2298
|
configuration: import_v43.default.object({
|
|
2262
2299
|
min: import_v43.default.number().optional().describe("Minimum value"),
|
|
2263
2300
|
max: import_v43.default.number().optional().describe("Maximum value"),
|
|
2301
|
+
integer: import_v43.default.boolean().optional().describe("When true, only whole numbers are allowed"),
|
|
2264
2302
|
prefix: TranslationConfig.optional(),
|
|
2265
2303
|
postfix: TranslationConfig.optional()
|
|
2266
2304
|
}).optional()
|
|
@@ -2270,7 +2308,7 @@ var NumberField = BaseField.extend({
|
|
|
2270
2308
|
});
|
|
2271
2309
|
var TextAreaField = BaseField.extend({
|
|
2272
2310
|
type: import_v43.default.literal(FieldType.TEXTAREA),
|
|
2273
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2311
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2274
2312
|
configuration: import_v43.default.object({
|
|
2275
2313
|
maxLength: import_v43.default.number().optional().describe("Maximum length of the text"),
|
|
2276
2314
|
rows: import_v43.default.number().optional().describe("Number of visible text lines"),
|
|
@@ -2304,7 +2342,7 @@ var SignatureField = BaseField.extend({
|
|
|
2304
2342
|
signaturePromptLabel: TranslationConfig.describe(
|
|
2305
2343
|
"Title of the signature modal"
|
|
2306
2344
|
),
|
|
2307
|
-
defaultValue:
|
|
2345
|
+
defaultValue: SignatureFieldValue.or(ComputedDefaultValue).optional(),
|
|
2308
2346
|
configuration: import_v43.default.object({
|
|
2309
2347
|
maxFileSize: import_v43.default.number().describe("Maximum file size in bytes").default(DEFAULT_MAX_FILE_SIZE_BYTES),
|
|
2310
2348
|
acceptedFileTypes: MimeType.array().optional().describe("List of allowed file formats for the signature")
|
|
@@ -2320,14 +2358,14 @@ var EmailField = BaseField.extend({
|
|
|
2320
2358
|
configuration: import_v43.default.object({
|
|
2321
2359
|
maxLength: import_v43.default.number().optional().describe("Maximum length of the text")
|
|
2322
2360
|
}).default({ maxLength: 255 }).optional(),
|
|
2323
|
-
defaultValue: NonEmptyTextValue.optional()
|
|
2361
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional()
|
|
2324
2362
|
}).meta({
|
|
2325
2363
|
description: "An email input field",
|
|
2326
2364
|
id: "EmailField"
|
|
2327
2365
|
});
|
|
2328
2366
|
var DateField = BaseField.extend({
|
|
2329
2367
|
type: import_v43.default.literal(FieldType.DATE),
|
|
2330
|
-
defaultValue: SerializedNowDateTime.or(PlainDate).optional().describe("Default date value(yyyy-MM-dd)"),
|
|
2368
|
+
defaultValue: SerializedNowDateTime.or(PlainDate).or(ComputedDefaultValue).optional().describe("Default date value(yyyy-MM-dd)"),
|
|
2331
2369
|
configuration: import_v43.default.object({
|
|
2332
2370
|
notice: TranslationConfig.describe(
|
|
2333
2371
|
"Text to display above the date input"
|
|
@@ -2339,7 +2377,7 @@ var DateField = BaseField.extend({
|
|
|
2339
2377
|
});
|
|
2340
2378
|
var AgeField = BaseField.extend({
|
|
2341
2379
|
type: import_v43.default.literal(FieldType.AGE),
|
|
2342
|
-
defaultValue: NumberFieldValue.optional(),
|
|
2380
|
+
defaultValue: NumberFieldValue.or(ComputedDefaultValue).optional(),
|
|
2343
2381
|
configuration: import_v43.default.object({
|
|
2344
2382
|
asOfDate: FieldReference,
|
|
2345
2383
|
prefix: TranslationConfig.optional(),
|
|
@@ -2351,7 +2389,7 @@ var AgeField = BaseField.extend({
|
|
|
2351
2389
|
});
|
|
2352
2390
|
var TimeField = BaseField.extend({
|
|
2353
2391
|
type: import_v43.default.literal(FieldType.TIME),
|
|
2354
|
-
defaultValue: SerializedNowDateTime.or(TimeValue).optional().describe("Default time value (HH-mm)"),
|
|
2392
|
+
defaultValue: SerializedNowDateTime.or(TimeValue).or(ComputedDefaultValue).optional().describe("Default time value (HH-mm)"),
|
|
2355
2393
|
configuration: import_v43.default.object({
|
|
2356
2394
|
use12HourFormat: import_v43.default.boolean().optional().describe("Whether to use 12-hour format"),
|
|
2357
2395
|
notice: TranslationConfig.describe(
|
|
@@ -2364,7 +2402,7 @@ var TimeField = BaseField.extend({
|
|
|
2364
2402
|
});
|
|
2365
2403
|
var DateRangeField = BaseField.extend({
|
|
2366
2404
|
type: import_v43.default.literal(FieldType.DATE_RANGE),
|
|
2367
|
-
defaultValue: DateRangeFieldValue.optional(),
|
|
2405
|
+
defaultValue: DateRangeFieldValue.or(ComputedDefaultValue).optional(),
|
|
2368
2406
|
configuration: import_v43.default.object({
|
|
2369
2407
|
notice: TranslationConfig.describe(
|
|
2370
2408
|
"Text to display above the date input"
|
|
@@ -2443,7 +2481,7 @@ var PageHeader = BaseField.extend({
|
|
|
2443
2481
|
});
|
|
2444
2482
|
var File = BaseField.extend({
|
|
2445
2483
|
type: import_v43.default.literal(FieldType.FILE),
|
|
2446
|
-
defaultValue: FileFieldValue.optional(),
|
|
2484
|
+
defaultValue: FileFieldValue.or(ComputedDefaultValue).optional(),
|
|
2447
2485
|
configuration: import_v43.default.object({
|
|
2448
2486
|
maxFileSize: import_v43.default.number().describe("Maximum file size in bytes").default(DEFAULT_MAX_FILE_SIZE_BYTES),
|
|
2449
2487
|
acceptedFileTypes: MimeType.array().optional().describe("List of allowed file formats for the signature"),
|
|
@@ -2470,7 +2508,7 @@ var SelectOption = import_v43.default.object({
|
|
|
2470
2508
|
});
|
|
2471
2509
|
var NumberWithUnitField = BaseField.extend({
|
|
2472
2510
|
type: import_v43.default.literal(FieldType.NUMBER_WITH_UNIT),
|
|
2473
|
-
defaultValue: NumberWithUnitFieldValue.optional(),
|
|
2511
|
+
defaultValue: NumberWithUnitFieldValue.or(ComputedDefaultValue).optional(),
|
|
2474
2512
|
options: import_v43.default.array(SelectOption).describe("A list of options for the unit select"),
|
|
2475
2513
|
configuration: import_v43.default.object({
|
|
2476
2514
|
min: import_v43.default.number().optional().describe("Minimum value of the number field"),
|
|
@@ -2485,7 +2523,7 @@ var NumberWithUnitField = BaseField.extend({
|
|
|
2485
2523
|
});
|
|
2486
2524
|
var RadioGroup = BaseField.extend({
|
|
2487
2525
|
type: import_v43.default.literal(FieldType.RADIO_GROUP),
|
|
2488
|
-
defaultValue: TextValue.optional(),
|
|
2526
|
+
defaultValue: TextValue.or(ComputedDefaultValue).optional(),
|
|
2489
2527
|
options: import_v43.default.array(SelectOption).describe("A list of options"),
|
|
2490
2528
|
configuration: import_v43.default.object({
|
|
2491
2529
|
styles: import_v43.default.object({
|
|
@@ -2510,7 +2548,7 @@ var BulletList = BaseField.extend({
|
|
|
2510
2548
|
});
|
|
2511
2549
|
var Select = BaseField.extend({
|
|
2512
2550
|
type: import_v43.default.literal(FieldType.SELECT),
|
|
2513
|
-
defaultValue: TextValue.optional(),
|
|
2551
|
+
defaultValue: TextValue.or(ComputedDefaultValue).optional(),
|
|
2514
2552
|
options: import_v43.default.array(SelectOption).describe("A list of options"),
|
|
2515
2553
|
noOptionsMessage: TranslationConfig.optional().describe(
|
|
2516
2554
|
`
|
|
@@ -2532,7 +2570,7 @@ var SelectDateRangeOption = import_v43.default.object({
|
|
|
2532
2570
|
});
|
|
2533
2571
|
var SelectDateRangeField = BaseField.extend({
|
|
2534
2572
|
type: import_v43.default.literal(FieldType.SELECT_DATE_RANGE),
|
|
2535
|
-
defaultValue: SelectDateRangeValue.optional(),
|
|
2573
|
+
defaultValue: SelectDateRangeValue.or(ComputedDefaultValue).optional(),
|
|
2536
2574
|
options: import_v43.default.array(SelectDateRangeOption).describe("A list of options")
|
|
2537
2575
|
}).meta({
|
|
2538
2576
|
description: "A date range selection field",
|
|
@@ -2549,7 +2587,7 @@ var NameField = BaseField.extend({
|
|
|
2549
2587
|
firstname: SerializedUserField.or(NonEmptyTextValue).optional(),
|
|
2550
2588
|
middlename: SerializedUserField.or(NonEmptyTextValue).optional(),
|
|
2551
2589
|
surname: SerializedUserField.or(NonEmptyTextValue).optional()
|
|
2552
|
-
}).optional(),
|
|
2590
|
+
}).or(ComputedDefaultValue).optional(),
|
|
2553
2591
|
configuration: import_v43.default.object({
|
|
2554
2592
|
name: NameConfig.default({
|
|
2555
2593
|
firstname: { required: true },
|
|
@@ -2573,14 +2611,14 @@ var NameField = BaseField.extend({
|
|
|
2573
2611
|
id: "NameField"
|
|
2574
2612
|
});
|
|
2575
2613
|
var PhoneField = BaseField.extend({
|
|
2576
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2614
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2577
2615
|
type: import_v43.default.literal(FieldType.PHONE)
|
|
2578
2616
|
}).meta({
|
|
2579
2617
|
description: "A field for entering a phone number",
|
|
2580
2618
|
id: "PhoneField"
|
|
2581
2619
|
});
|
|
2582
2620
|
var IdField = BaseField.extend({
|
|
2583
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2621
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2584
2622
|
type: import_v43.default.literal(FieldType.ID)
|
|
2585
2623
|
}).meta({
|
|
2586
2624
|
description: "A field for entering an ID",
|
|
@@ -2588,14 +2626,14 @@ var IdField = BaseField.extend({
|
|
|
2588
2626
|
});
|
|
2589
2627
|
var Checkbox = BaseField.extend({
|
|
2590
2628
|
type: import_v43.default.literal(FieldType.CHECKBOX),
|
|
2591
|
-
defaultValue: CheckboxFieldValue.default(false)
|
|
2629
|
+
defaultValue: CheckboxFieldValue.or(ComputedDefaultValue).default(false)
|
|
2592
2630
|
}).meta({
|
|
2593
2631
|
description: "A boolean checkbox field",
|
|
2594
2632
|
id: "Checkbox"
|
|
2595
2633
|
});
|
|
2596
2634
|
var Country = BaseField.extend({
|
|
2597
2635
|
type: import_v43.default.literal(FieldType.COUNTRY),
|
|
2598
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2636
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2599
2637
|
optionOverrides: import_v43.default.array(SelectOption.omit({ label: true })).optional().describe(
|
|
2600
2638
|
"Conditionals for specific countries. Countries not listed are always shown and enabled."
|
|
2601
2639
|
)
|
|
@@ -2613,7 +2651,7 @@ var AdministrativeAreas = import_v43.default.enum([
|
|
|
2613
2651
|
]);
|
|
2614
2652
|
var AdministrativeAreaField = BaseField.extend({
|
|
2615
2653
|
type: import_v43.default.literal(FieldType.ADMINISTRATIVE_AREA),
|
|
2616
|
-
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField]).optional(),
|
|
2654
|
+
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField, ComputedDefaultValue]).optional(),
|
|
2617
2655
|
configuration: import_v43.default.object({
|
|
2618
2656
|
partOf: FieldReference.optional().describe("Parent location"),
|
|
2619
2657
|
type: AdministrativeAreas,
|
|
@@ -2625,7 +2663,7 @@ var AdministrativeAreaField = BaseField.extend({
|
|
|
2625
2663
|
});
|
|
2626
2664
|
var LocationInput = BaseField.extend({
|
|
2627
2665
|
type: import_v43.default.literal(FieldType.LOCATION),
|
|
2628
|
-
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField]).optional(),
|
|
2666
|
+
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField, ComputedDefaultValue]).optional(),
|
|
2629
2667
|
configuration: import_v43.default.object({
|
|
2630
2668
|
locationTypes: import_v43.default.array(import_v43.default.string()).optional().describe("Types of the locations that are available for selection."),
|
|
2631
2669
|
allowedLocations: AllowedLocations
|
|
@@ -2637,7 +2675,7 @@ var LocationInput = BaseField.extend({
|
|
|
2637
2675
|
var FileUploadWithOptions = BaseField.extend({
|
|
2638
2676
|
type: import_v43.default.literal(FieldType.FILE_WITH_OPTIONS),
|
|
2639
2677
|
options: import_v43.default.array(SelectOption).describe("A list of options"),
|
|
2640
|
-
defaultValue: FileFieldWithOptionValue.optional(),
|
|
2678
|
+
defaultValue: FileFieldWithOptionValue.or(ComputedDefaultValue).optional(),
|
|
2641
2679
|
configuration: import_v43.default.object({
|
|
2642
2680
|
maxFileSize: import_v43.default.number().describe("Maximum file size in bytes").default(DEFAULT_MAX_FILE_SIZE_BYTES),
|
|
2643
2681
|
maxImageSize: import_v43.default.object({
|
|
@@ -2653,12 +2691,12 @@ var FileUploadWithOptions = BaseField.extend({
|
|
|
2653
2691
|
});
|
|
2654
2692
|
var Facility = BaseField.extend({
|
|
2655
2693
|
type: import_v43.default.literal(FieldType.FACILITY),
|
|
2656
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2694
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2657
2695
|
configuration: import_v43.default.object({ allowedLocations: AllowedLocations }).optional()
|
|
2658
2696
|
}).describe("Input field for a facility");
|
|
2659
2697
|
var Office = BaseField.extend({
|
|
2660
2698
|
type: import_v43.default.literal(FieldType.OFFICE),
|
|
2661
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2699
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2662
2700
|
configuration: import_v43.default.object({ allowedLocations: AllowedLocations }).optional()
|
|
2663
2701
|
}).describe("Input field for an office");
|
|
2664
2702
|
var DefaultAddressFieldValue = DomesticAddressFieldValue.extend({
|
|
@@ -2694,7 +2732,7 @@ var Address = BaseField.extend({
|
|
|
2694
2732
|
).optional(),
|
|
2695
2733
|
allowedLocations: AllowedLocations
|
|
2696
2734
|
}).optional(),
|
|
2697
|
-
defaultValue: DefaultAddressFieldValue.optional()
|
|
2735
|
+
defaultValue: DefaultAddressFieldValue.or(ComputedDefaultValue).optional()
|
|
2698
2736
|
}).meta({
|
|
2699
2737
|
description: "Address input field \u2013 a combination of location and text fields",
|
|
2700
2738
|
id: "Address"
|
|
@@ -2741,7 +2779,7 @@ var ButtonConfiguration = import_v43.default.object({
|
|
|
2741
2779
|
});
|
|
2742
2780
|
var ButtonField = BaseField.extend({
|
|
2743
2781
|
type: import_v43.default.literal(FieldType.BUTTON),
|
|
2744
|
-
defaultValue: ButtonFieldValue.optional(),
|
|
2782
|
+
defaultValue: ButtonFieldValue.or(ComputedDefaultValue).optional(),
|
|
2745
2783
|
configuration: ButtonConfiguration
|
|
2746
2784
|
}).meta({
|
|
2747
2785
|
description: "A generic button that can be used to trigger an action",
|
|
@@ -2769,7 +2807,7 @@ var AlphaPrintButton = BaseField.extend({
|
|
|
2769
2807
|
});
|
|
2770
2808
|
var HttpField = BaseField.extend({
|
|
2771
2809
|
type: import_v43.default.literal(FieldType.HTTP),
|
|
2772
|
-
defaultValue: HttpFieldValue.optional(),
|
|
2810
|
+
defaultValue: HttpFieldValue.or(ComputedDefaultValue).optional(),
|
|
2773
2811
|
configuration: import_v43.default.object({
|
|
2774
2812
|
trigger: FieldReference.optional().describe(
|
|
2775
2813
|
"Reference to the field that triggers the HTTP request when its value changes. If not provided, the HTTP request is triggered once on component mount."
|
|
@@ -2855,7 +2893,7 @@ var LinkButtonField = BaseField.extend({
|
|
|
2855
2893
|
});
|
|
2856
2894
|
var VerificationStatus = BaseField.extend({
|
|
2857
2895
|
type: import_v43.default.literal(FieldType.VERIFICATION_STATUS),
|
|
2858
|
-
defaultValue: VerificationStatusValue.optional(),
|
|
2896
|
+
defaultValue: VerificationStatusValue.or(ComputedDefaultValue).optional(),
|
|
2859
2897
|
configuration: import_v43.default.object({
|
|
2860
2898
|
status: TranslationConfig.describe("Text to display on the status pill."),
|
|
2861
2899
|
description: TranslationConfig.describe(
|
|
@@ -2877,7 +2915,7 @@ var QueryParamReaderField = BaseField.extend({
|
|
|
2877
2915
|
});
|
|
2878
2916
|
var QrReaderField = BaseField.extend({
|
|
2879
2917
|
type: import_v43.default.literal(FieldType.QR_READER),
|
|
2880
|
-
defaultValue: QrReaderFieldValue.optional(),
|
|
2918
|
+
defaultValue: QrReaderFieldValue.or(ComputedDefaultValue).optional(),
|
|
2881
2919
|
configuration: import_v43.default.object({
|
|
2882
2920
|
validator: import_v43.default.any().meta({
|
|
2883
2921
|
description: "JSON Schema to validate the scanned QR code data against before populating the form fields.",
|
|
@@ -2890,7 +2928,7 @@ var QrReaderField = BaseField.extend({
|
|
|
2890
2928
|
});
|
|
2891
2929
|
var IdReaderField = BaseField.extend({
|
|
2892
2930
|
type: import_v43.default.literal(FieldType.ID_READER),
|
|
2893
|
-
defaultValue: IdReaderFieldValue.optional(),
|
|
2931
|
+
defaultValue: IdReaderFieldValue.or(ComputedDefaultValue).optional(),
|
|
2894
2932
|
methods: import_v43.default.array(
|
|
2895
2933
|
import_v43.default.union([QrReaderField, LinkButtonField]).describe("Methods for reading an ID")
|
|
2896
2934
|
)
|
|
@@ -3184,6 +3222,11 @@ var ReadActionConfig = ActionConfigBase.extend(
|
|
|
3184
3222
|
conditionals: z24.never().optional().describe("Read-action can not be disabled or hidden with conditionals.")
|
|
3185
3223
|
}).shape
|
|
3186
3224
|
);
|
|
3225
|
+
var NotifyConfig = ActionConfigBase.extend(
|
|
3226
|
+
z24.object({
|
|
3227
|
+
type: z24.literal(ActionType.NOTIFY)
|
|
3228
|
+
}).shape
|
|
3229
|
+
);
|
|
3187
3230
|
var DeclareConfig = DeclarationActionBase.extend(
|
|
3188
3231
|
z24.object({
|
|
3189
3232
|
type: z24.literal(ActionType.DECLARE),
|
|
@@ -3268,9 +3311,13 @@ var ActionConfig = z24.discriminatedUnion("type", [
|
|
|
3268
3311
|
id: "ReadActionConfig",
|
|
3269
3312
|
description: "Configuration for the read action \u2014 defines the record-tab content displayed on the event overview page."
|
|
3270
3313
|
}),
|
|
3314
|
+
NotifyConfig.meta({
|
|
3315
|
+
id: "NotifyActionConfig",
|
|
3316
|
+
description: "Configuration for the notify action. When present, NOTIFY uses this config independently from DECLARE. When absent, NOTIFY falls back to the DeclareActionConfig."
|
|
3317
|
+
}),
|
|
3271
3318
|
DeclareConfig.meta({
|
|
3272
3319
|
id: "DeclareActionConfig",
|
|
3273
|
-
description: "Configuration for the declare action. Includes review-page fields.
|
|
3320
|
+
description: "Configuration for the declare action. Includes review-page fields. NOTIFY falls back to this config when no dedicated NotifyActionConfig is provided."
|
|
3274
3321
|
}),
|
|
3275
3322
|
RejectConfig.meta({
|
|
3276
3323
|
id: "RejectActionConfig",
|
|
@@ -3449,6 +3496,9 @@ var BaseField3 = z28.object({
|
|
|
3449
3496
|
),
|
|
3450
3497
|
validations: z28.array(ValidationConfig).optional().describe(
|
|
3451
3498
|
`Option for overriding the field validations specifically for advanced search form.`
|
|
3499
|
+
),
|
|
3500
|
+
allowedLocations: JurisdictionReference.optional().describe(
|
|
3501
|
+
`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.`
|
|
3452
3502
|
)
|
|
3453
3503
|
});
|
|
3454
3504
|
var SearchQueryParams = z28.object({
|
|
@@ -3523,9 +3573,11 @@ var z30 = __toESM(require("zod/v4"));
|
|
|
3523
3573
|
var z29 = __toESM(require("zod/v4"));
|
|
3524
3574
|
function getDynamicNameValue(field3) {
|
|
3525
3575
|
const nameConfiguration = field3.configuration?.name;
|
|
3576
|
+
const firstnameRequired = nameConfiguration?.firstname?.required ?? field3.required;
|
|
3577
|
+
const surnameRequired = nameConfiguration?.surname?.required ?? field3.required;
|
|
3526
3578
|
return z29.object({
|
|
3527
|
-
firstname:
|
|
3528
|
-
surname:
|
|
3579
|
+
firstname: firstnameRequired ? NonEmptyTextValue : TextValue,
|
|
3580
|
+
surname: surnameRequired ? NonEmptyTextValue : TextValue,
|
|
3529
3581
|
middlename: nameConfiguration?.middlename?.required ? NonEmptyTextValue : TextValue.optional()
|
|
3530
3582
|
});
|
|
3531
3583
|
}
|
|
@@ -3872,7 +3924,7 @@ var isHiddenFieldType = (field3) => {
|
|
|
3872
3924
|
return field3.config.type === FieldType.ALPHA_HIDDEN;
|
|
3873
3925
|
};
|
|
3874
3926
|
var isNonInteractiveFieldType = (field3) => {
|
|
3875
|
-
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.
|
|
3927
|
+
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;
|
|
3876
3928
|
};
|
|
3877
3929
|
|
|
3878
3930
|
// ../commons/src/conditionals/validate.ts
|
|
@@ -3908,7 +3960,37 @@ function resolveDataPath(rootData, dataPath, instancePath) {
|
|
|
3908
3960
|
}
|
|
3909
3961
|
return current;
|
|
3910
3962
|
}
|
|
3963
|
+
function todayISO() {
|
|
3964
|
+
return (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" });
|
|
3965
|
+
}
|
|
3966
|
+
var compiledFunctionCache = /* @__PURE__ */ new Map();
|
|
3967
|
+
function compileClientFunction(code) {
|
|
3968
|
+
let fn = compiledFunctionCache.get(code);
|
|
3969
|
+
if (!fn) {
|
|
3970
|
+
fn = new Function(`return (${code})`)();
|
|
3971
|
+
compiledFunctionCache.set(code, fn);
|
|
3972
|
+
}
|
|
3973
|
+
return fn;
|
|
3974
|
+
}
|
|
3911
3975
|
(0, import_ajv_formats.default)(ajv);
|
|
3976
|
+
function buildClientFunctionContext(input) {
|
|
3977
|
+
return {
|
|
3978
|
+
$form: input.form,
|
|
3979
|
+
$now: todayISO(),
|
|
3980
|
+
// eslint-disable-next-line @typescript-eslint/no-use-before-define
|
|
3981
|
+
$online: isOnline(),
|
|
3982
|
+
$user: input.validatorContext?.user,
|
|
3983
|
+
$event: input.validatorContext?.event,
|
|
3984
|
+
$leafAdminStructureLocationIds: input.validatorContext?.leafAdminStructureLocationIds ?? [],
|
|
3985
|
+
user: input.systemVariables?.user,
|
|
3986
|
+
$window: input.systemVariables?.$window,
|
|
3987
|
+
locations: input.locations,
|
|
3988
|
+
adminLevelIds: input.adminLevelIds
|
|
3989
|
+
};
|
|
3990
|
+
}
|
|
3991
|
+
function runClientFunction(code, data, context) {
|
|
3992
|
+
return compileClientFunction(code)(data, context);
|
|
3993
|
+
}
|
|
3912
3994
|
ajv.addKeyword({
|
|
3913
3995
|
keyword: "daysFromDate",
|
|
3914
3996
|
type: "string",
|
|
@@ -3953,7 +4035,7 @@ ajv.addKeyword({
|
|
|
3953
4035
|
$data: true,
|
|
3954
4036
|
errors: true,
|
|
3955
4037
|
// @ts-ignore -- Force type. We will move this away from AJV next. Parsing the array will take seconds and is only called by core.
|
|
3956
|
-
validate(
|
|
4038
|
+
validate(_schema, data, _2, dataContext) {
|
|
3957
4039
|
const locationIdInput = data;
|
|
3958
4040
|
const locations = dataContext?.rootData.$leafAdminStructureLocationIds ?? [];
|
|
3959
4041
|
return locations.some((location) => location.id === locationIdInput);
|
|
@@ -3984,6 +4066,23 @@ function isAgeValue(value) {
|
|
|
3984
4066
|
function mergeWithBaseFormState(values, context) {
|
|
3985
4067
|
return { ...context.baseFormState, ...values };
|
|
3986
4068
|
}
|
|
4069
|
+
ajv.addKeyword({
|
|
4070
|
+
keyword: "customClientValidator",
|
|
4071
|
+
schemaType: "object",
|
|
4072
|
+
errors: true,
|
|
4073
|
+
// @ts-expect-error -- AJV's public types don't expose `rootData`. All
|
|
4074
|
+
// `validate()` callers build root data via `buildClientFunctionContext`,
|
|
4075
|
+
// so the cast holds.
|
|
4076
|
+
validate(schema, data, _2, dataContext) {
|
|
4077
|
+
return Boolean(
|
|
4078
|
+
runClientFunction(
|
|
4079
|
+
schema.code,
|
|
4080
|
+
data,
|
|
4081
|
+
dataContext?.rootData ?? buildClientFunctionContext({ form: {} })
|
|
4082
|
+
)
|
|
4083
|
+
);
|
|
4084
|
+
}
|
|
4085
|
+
});
|
|
3987
4086
|
function validate(schema, data) {
|
|
3988
4087
|
const validator = ajv.getSchema(schema.$id) || ajv.compile(schema);
|
|
3989
4088
|
if ("$form" in data) {
|
|
@@ -4020,17 +4119,14 @@ function isOnline() {
|
|
|
4020
4119
|
}
|
|
4021
4120
|
return true;
|
|
4022
4121
|
}
|
|
4023
|
-
function isConditionMet(conditional, values, context
|
|
4024
|
-
return validate(
|
|
4025
|
-
|
|
4026
|
-
|
|
4027
|
-
|
|
4028
|
-
|
|
4029
|
-
|
|
4030
|
-
|
|
4031
|
-
$status: eventIndex?.status,
|
|
4032
|
-
$event: context.event
|
|
4033
|
-
});
|
|
4122
|
+
function isConditionMet(conditional, values, context) {
|
|
4123
|
+
return validate(
|
|
4124
|
+
conditional,
|
|
4125
|
+
buildClientFunctionContext({
|
|
4126
|
+
form: mergeWithBaseFormState(values, context),
|
|
4127
|
+
validatorContext: context
|
|
4128
|
+
})
|
|
4129
|
+
);
|
|
4034
4130
|
}
|
|
4035
4131
|
function getConditionalActionsForField(field3, values) {
|
|
4036
4132
|
if (!field3.conditionals) {
|
|
@@ -4038,9 +4134,9 @@ function getConditionalActionsForField(field3, values) {
|
|
|
4038
4134
|
}
|
|
4039
4135
|
return field3.conditionals.filter((conditional) => validate(conditional.conditional, values)).map((conditional) => conditional.type);
|
|
4040
4136
|
}
|
|
4041
|
-
function areConditionsMet(conditions, values, context,
|
|
4137
|
+
function areConditionsMet(conditions, values, context, _event) {
|
|
4042
4138
|
return conditions.every(
|
|
4043
|
-
(condition) => isConditionMet(condition.conditional, values, context
|
|
4139
|
+
(condition) => isConditionMet(condition.conditional, values, context)
|
|
4044
4140
|
);
|
|
4045
4141
|
}
|
|
4046
4142
|
function isFieldConditionMet(field3, form, conditionalType, context) {
|
|
@@ -4050,14 +4146,13 @@ function isFieldConditionMet(field3, form, conditionalType, context) {
|
|
|
4050
4146
|
if (!hasRule) {
|
|
4051
4147
|
return true;
|
|
4052
4148
|
}
|
|
4053
|
-
const validConditionals = getConditionalActionsForField(
|
|
4054
|
-
|
|
4055
|
-
|
|
4056
|
-
|
|
4057
|
-
|
|
4058
|
-
|
|
4059
|
-
|
|
4060
|
-
});
|
|
4149
|
+
const validConditionals = getConditionalActionsForField(
|
|
4150
|
+
field3,
|
|
4151
|
+
buildClientFunctionContext({
|
|
4152
|
+
form: mergeWithBaseFormState(form, context),
|
|
4153
|
+
validatorContext: context
|
|
4154
|
+
})
|
|
4155
|
+
);
|
|
4061
4156
|
return validConditionals.includes(conditionalType);
|
|
4062
4157
|
}
|
|
4063
4158
|
function isFieldVisible(field3, form, context) {
|
|
@@ -4083,7 +4178,14 @@ function isActionConditionMet(actionConfig, event2, context, conditionalType) {
|
|
|
4083
4178
|
if (!rule) {
|
|
4084
4179
|
return true;
|
|
4085
4180
|
}
|
|
4086
|
-
return
|
|
4181
|
+
return validate(rule.conditional, {
|
|
4182
|
+
...buildClientFunctionContext({
|
|
4183
|
+
form: mergeWithBaseFormState(event2.declaration, context),
|
|
4184
|
+
validatorContext: context
|
|
4185
|
+
}),
|
|
4186
|
+
$flags: event2.flags,
|
|
4187
|
+
$status: event2.status
|
|
4188
|
+
});
|
|
4087
4189
|
}
|
|
4088
4190
|
function isActionEnabled(actionConfig, event2, context) {
|
|
4089
4191
|
return isActionConditionMet(
|
|
@@ -4242,19 +4344,10 @@ function runFieldValidations({
|
|
|
4242
4344
|
if (!isFieldVisible(field3.config, form, context)) {
|
|
4243
4345
|
return [];
|
|
4244
4346
|
}
|
|
4245
|
-
const conditionalParameters = {
|
|
4246
|
-
|
|
4247
|
-
|
|
4248
|
-
|
|
4249
|
-
* In real use cases, there can be hundreds of thousands of locations.
|
|
4250
|
-
* Make sure that the context contains only the locations that are needed for validation.
|
|
4251
|
-
* E.g. if the user is a leaf admin, only the leaf locations under their admin structure are needed.
|
|
4252
|
-
* Loading few megabytes of locations to memory just for validation is not efficient and will choke the application.
|
|
4253
|
-
*/
|
|
4254
|
-
$leafAdminStructureLocationIds: context.leafAdminStructureLocationIds ?? [],
|
|
4255
|
-
$online: isOnline(),
|
|
4256
|
-
$user: context.user
|
|
4257
|
-
};
|
|
4347
|
+
const conditionalParameters = buildClientFunctionContext({
|
|
4348
|
+
form: mergeWithBaseFormState(form, context),
|
|
4349
|
+
validatorContext: context
|
|
4350
|
+
});
|
|
4258
4351
|
if (isFieldGroupFieldType(field3)) {
|
|
4259
4352
|
const subfieldErrors = buildFormState(
|
|
4260
4353
|
field3.config.fields,
|
|
@@ -4393,13 +4486,13 @@ function getActionConfig({
|
|
|
4393
4486
|
actionType,
|
|
4394
4487
|
customActionType
|
|
4395
4488
|
}) {
|
|
4489
|
+
if (actionType === ActionType.NOTIFY) {
|
|
4490
|
+
return eventConfiguration.actions.find((a) => a.type === ActionType.NOTIFY) ?? eventConfiguration.actions.find((a) => a.type === ActionType.DECLARE);
|
|
4491
|
+
}
|
|
4396
4492
|
return eventConfiguration.actions.find((a) => {
|
|
4397
4493
|
if (a.type === ActionType.CUSTOM && customActionType) {
|
|
4398
4494
|
return a.customActionType === customActionType;
|
|
4399
4495
|
}
|
|
4400
|
-
if (actionType === ActionType.NOTIFY) {
|
|
4401
|
-
return a.type === ActionType.DECLARE;
|
|
4402
|
-
}
|
|
4403
4496
|
if (actionType === ActionType.APPROVE_CORRECTION || actionType === ActionType.REJECT_CORRECTION) {
|
|
4404
4497
|
return a.type === ActionType.REQUEST_CORRECTION;
|
|
4405
4498
|
}
|
|
@@ -4436,7 +4529,7 @@ var getActionAnnotationFields = (actionConfig) => {
|
|
|
4436
4529
|
if (actionConfig.type === ActionType.CUSTOM) {
|
|
4437
4530
|
return actionConfig.form;
|
|
4438
4531
|
}
|
|
4439
|
-
if ("review" in actionConfig) {
|
|
4532
|
+
if ("review" in actionConfig && actionConfig.review != null) {
|
|
4440
4533
|
return actionConfig.review.fields;
|
|
4441
4534
|
}
|
|
4442
4535
|
return [];
|
|
@@ -4738,19 +4831,32 @@ function getPendingAction(actions) {
|
|
|
4738
4831
|
}
|
|
4739
4832
|
return pendingActions[0];
|
|
4740
4833
|
}
|
|
4741
|
-
function getCompleteActionAnnotation(
|
|
4834
|
+
function getCompleteActionAnnotation(event2, action) {
|
|
4742
4835
|
if (action.originalActionId) {
|
|
4743
4836
|
const originalAction = event2.actions.find(
|
|
4744
4837
|
({ id }) => id === action.originalActionId
|
|
4745
4838
|
);
|
|
4746
4839
|
if (originalAction?.status === ActionStatus.Requested) {
|
|
4747
|
-
return deepMerge(
|
|
4748
|
-
deepMerge(annotation, originalAction.annotation ?? {}),
|
|
4749
|
-
action.annotation ?? {}
|
|
4750
|
-
);
|
|
4840
|
+
return deepMerge(originalAction.annotation ?? {}, action.annotation ?? {});
|
|
4751
4841
|
}
|
|
4752
4842
|
}
|
|
4753
|
-
return
|
|
4843
|
+
return action.annotation ?? {};
|
|
4844
|
+
}
|
|
4845
|
+
function getCompleteActionContent(event2, action) {
|
|
4846
|
+
const currentContent = "content" in action ? action.content : void 0;
|
|
4847
|
+
if (!action.originalActionId) {
|
|
4848
|
+
return currentContent;
|
|
4849
|
+
}
|
|
4850
|
+
const originalAction = event2.actions.find(
|
|
4851
|
+
({ id }) => id === action.originalActionId
|
|
4852
|
+
);
|
|
4853
|
+
if (originalAction && "content" in originalAction && originalAction.content) {
|
|
4854
|
+
return {
|
|
4855
|
+
...originalAction.content,
|
|
4856
|
+
...currentContent ?? {}
|
|
4857
|
+
};
|
|
4858
|
+
}
|
|
4859
|
+
return currentContent;
|
|
4754
4860
|
}
|
|
4755
4861
|
function getCompleteActionDeclaration(declaration, event2, action) {
|
|
4756
4862
|
if (action.originalActionId) {
|
|
@@ -4770,7 +4876,7 @@ function getAcceptedActions(event2) {
|
|
|
4770
4876
|
return event2.actions.filter(isAcceptedAction).map((action) => ({
|
|
4771
4877
|
...action,
|
|
4772
4878
|
declaration: getCompleteActionDeclaration({}, event2, action),
|
|
4773
|
-
annotation: getCompleteActionAnnotation(
|
|
4879
|
+
annotation: getCompleteActionAnnotation(event2, action)
|
|
4774
4880
|
}));
|
|
4775
4881
|
}
|
|
4776
4882
|
var EXCLUDED_ACTIONS = [
|
|
@@ -5408,7 +5514,54 @@ function createFieldConditionals(fieldId) {
|
|
|
5408
5514
|
}
|
|
5409
5515
|
},
|
|
5410
5516
|
required: [fieldId]
|
|
5411
|
-
})
|
|
5517
|
+
}),
|
|
5518
|
+
/**
|
|
5519
|
+
* Custom client-side validator. The provided function is serialised and executed
|
|
5520
|
+
* just-in-time on the client only. External references (e.g. lodash) are not
|
|
5521
|
+
* available inside the function body — all logic must be self-contained.
|
|
5522
|
+
*
|
|
5523
|
+
* @example
|
|
5524
|
+
* field('nid').customClientValidator((value) => {
|
|
5525
|
+
* // LUHN check — all logic must be inline
|
|
5526
|
+
* const digits = String(value).split('').map(Number)
|
|
5527
|
+
* // ...
|
|
5528
|
+
* return isValid
|
|
5529
|
+
* })
|
|
5530
|
+
*/
|
|
5531
|
+
customClientValidator(validationFn) {
|
|
5532
|
+
const code = validationFn.toString();
|
|
5533
|
+
return defineFormConditional({
|
|
5534
|
+
type: "object",
|
|
5535
|
+
properties: wrapToPath(
|
|
5536
|
+
{ [fieldId]: { customClientValidator: { code } } },
|
|
5537
|
+
this.$$subfield
|
|
5538
|
+
),
|
|
5539
|
+
required: [fieldId]
|
|
5540
|
+
});
|
|
5541
|
+
},
|
|
5542
|
+
/**
|
|
5543
|
+
* Custom client-side evaluation. Returns a {@link FieldReference} descriptor
|
|
5544
|
+
* that can be used as the `value` property or a DATA component entry.
|
|
5545
|
+
* The function receives the referenced field's value as the first argument and
|
|
5546
|
+
* the full form context as the second; its return value replaces the field reference.
|
|
5547
|
+
* The function is serialised and executed just-in-time on the client only.
|
|
5548
|
+
* External references (e.g. lodash) are not available inside the function body.
|
|
5549
|
+
*
|
|
5550
|
+
* For computing a default value without referencing a specific field, use
|
|
5551
|
+
* `evaluate(fn)` in the `defaultValue` property instead.
|
|
5552
|
+
*
|
|
5553
|
+
* @example
|
|
5554
|
+
* field('a').customClientEvaluation((aValue, ctx) =>
|
|
5555
|
+
* Number(aValue) + Number(ctx.$form.b)
|
|
5556
|
+
* )
|
|
5557
|
+
*/
|
|
5558
|
+
customClientEvaluation(computationFn) {
|
|
5559
|
+
return {
|
|
5560
|
+
$$code: computationFn.toString(),
|
|
5561
|
+
$$field: fieldId,
|
|
5562
|
+
$$subfield: this.$$subfield
|
|
5563
|
+
};
|
|
5564
|
+
}
|
|
5412
5565
|
};
|
|
5413
5566
|
}
|
|
5414
5567
|
|
|
@@ -6198,7 +6351,8 @@ var RejectCorrectionActionInput = BaseActionInput.extend(
|
|
|
6198
6351
|
var ApproveCorrectionActionInput = BaseActionInput.extend(
|
|
6199
6352
|
z38.object({
|
|
6200
6353
|
requestId: z38.string(),
|
|
6201
|
-
type: z38.literal(ActionType.APPROVE_CORRECTION).default(ActionType.APPROVE_CORRECTION)
|
|
6354
|
+
type: z38.literal(ActionType.APPROVE_CORRECTION).default(ActionType.APPROVE_CORRECTION),
|
|
6355
|
+
content: z38.object({ immediateCorrection: z38.boolean().optional() }).optional()
|
|
6202
6356
|
}).shape
|
|
6203
6357
|
);
|
|
6204
6358
|
var ReadActionInput = BaseActionInput.extend(
|
|
@@ -6347,6 +6501,8 @@ var updateActions = ActionTypes.extract([
|
|
|
6347
6501
|
ActionType.ARCHIVE,
|
|
6348
6502
|
ActionType.PRINT_CERTIFICATE,
|
|
6349
6503
|
ActionType.REQUEST_CORRECTION,
|
|
6504
|
+
ActionType.APPROVE_CORRECTION,
|
|
6505
|
+
ActionType.REJECT_CORRECTION,
|
|
6350
6506
|
ActionType.CUSTOM
|
|
6351
6507
|
]);
|
|
6352
6508
|
function getActionUpdateMetadata(actions) {
|
|
@@ -6361,7 +6517,7 @@ function getActionUpdateMetadata(actions) {
|
|
|
6361
6517
|
"createdAtLocation",
|
|
6362
6518
|
"createdByRole"
|
|
6363
6519
|
];
|
|
6364
|
-
return actions.filter(({ type }) => updateActions.safeParse(type).success).
|
|
6520
|
+
return actions.filter(({ type }) => updateActions.safeParse(type).success).reduce(
|
|
6365
6521
|
(_2, action) => {
|
|
6366
6522
|
if (action.originalActionId) {
|
|
6367
6523
|
const originalAction = actions.find(({ id }) => id === action.originalActionId) ?? action;
|
|
@@ -6388,28 +6544,19 @@ function getLegalStatuses(actions) {
|
|
|
6388
6544
|
// ../commons/src/events/state/flags.ts
|
|
6389
6545
|
var import_lodash3 = require("lodash");
|
|
6390
6546
|
var import_date_fns3 = require("date-fns");
|
|
6391
|
-
function
|
|
6392
|
-
|
|
6393
|
-
|
|
6394
|
-
|
|
6395
|
-
|
|
6396
|
-
|
|
6397
|
-
return true;
|
|
6398
|
-
}
|
|
6399
|
-
if (type === ActionType.APPROVE_CORRECTION) {
|
|
6400
|
-
return false;
|
|
6547
|
+
function findPendingCorrectionAction(writeActions2) {
|
|
6548
|
+
let correctionRequestAction;
|
|
6549
|
+
for (let i = writeActions2.length - 1; i >= 0; i--) {
|
|
6550
|
+
const action = writeActions2[i];
|
|
6551
|
+
if (action.type === ActionType.APPROVE_CORRECTION || action.type === ActionType.REJECT_CORRECTION) {
|
|
6552
|
+
break;
|
|
6401
6553
|
}
|
|
6402
|
-
if (type === ActionType.
|
|
6403
|
-
|
|
6554
|
+
if (action.type === ActionType.REQUEST_CORRECTION) {
|
|
6555
|
+
correctionRequestAction = action;
|
|
6556
|
+
break;
|
|
6404
6557
|
}
|
|
6405
|
-
|
|
6406
|
-
|
|
6407
|
-
}
|
|
6408
|
-
function isDeclarationIncomplete(actions) {
|
|
6409
|
-
return getStatusFromActions(actions) === EventStatus.enum.NOTIFIED;
|
|
6410
|
-
}
|
|
6411
|
-
function isRejected(actions) {
|
|
6412
|
-
return actions.at(-1)?.type === ActionType.REJECT;
|
|
6558
|
+
}
|
|
6559
|
+
return correctionRequestAction;
|
|
6413
6560
|
}
|
|
6414
6561
|
function isPotentialDuplicate(actions) {
|
|
6415
6562
|
return actions.reduce((prev, { type }) => {
|
|
@@ -6438,6 +6585,88 @@ function isFlagConditionMet(conditional, form, action) {
|
|
|
6438
6585
|
}
|
|
6439
6586
|
});
|
|
6440
6587
|
}
|
|
6588
|
+
function actionConfigRemovesFlag(action, flagId, actionsUpToAndIncluding, event2, eventConfiguration) {
|
|
6589
|
+
if (!isActionConfigType(action.type)) {
|
|
6590
|
+
return false;
|
|
6591
|
+
}
|
|
6592
|
+
const actionConfig = getActionConfig({
|
|
6593
|
+
eventConfiguration,
|
|
6594
|
+
actionType: action.type,
|
|
6595
|
+
customActionType: "customActionType" in action ? action.customActionType : void 0
|
|
6596
|
+
});
|
|
6597
|
+
const removeOperations = (actionConfig?.flags ?? []).filter(
|
|
6598
|
+
({ id, operation }) => id === flagId && operation === "remove"
|
|
6599
|
+
);
|
|
6600
|
+
if (removeOperations.length === 0) {
|
|
6601
|
+
return false;
|
|
6602
|
+
}
|
|
6603
|
+
const eventUpToThisAction = { ...event2, actions: actionsUpToAndIncluding };
|
|
6604
|
+
const declaration = aggregateActionDeclarations(eventUpToThisAction);
|
|
6605
|
+
const annotation = aggregateActionAnnotations(eventUpToThisAction);
|
|
6606
|
+
const form = { ...declaration, ...annotation };
|
|
6607
|
+
return removeOperations.some(
|
|
6608
|
+
({ conditional }) => conditional ? isFlagConditionMet(conditional, form, action) : true
|
|
6609
|
+
);
|
|
6610
|
+
}
|
|
6611
|
+
var INHERENT_FLAG_RULES = [
|
|
6612
|
+
{
|
|
6613
|
+
flag: InherentFlags.CORRECTION_REQUESTED,
|
|
6614
|
+
setOn: [ActionType.REQUEST_CORRECTION],
|
|
6615
|
+
resetOn: [ActionType.APPROVE_CORRECTION, ActionType.REJECT_CORRECTION]
|
|
6616
|
+
},
|
|
6617
|
+
{
|
|
6618
|
+
// INCOMPLETE mirrors the NOTIFIED status: set by NOTIFY, cleared by any
|
|
6619
|
+
// other status-changing action (see getStatusFromActions).
|
|
6620
|
+
flag: InherentFlags.INCOMPLETE,
|
|
6621
|
+
setOn: [ActionType.NOTIFY],
|
|
6622
|
+
resetOn: [
|
|
6623
|
+
ActionType.CREATE,
|
|
6624
|
+
ActionType.DECLARE,
|
|
6625
|
+
ActionType.REGISTER,
|
|
6626
|
+
ActionType.ARCHIVE
|
|
6627
|
+
]
|
|
6628
|
+
},
|
|
6629
|
+
{
|
|
6630
|
+
flag: InherentFlags.REJECTED,
|
|
6631
|
+
setOn: [ActionType.REJECT],
|
|
6632
|
+
resetOn: [
|
|
6633
|
+
ActionType.NOTIFY,
|
|
6634
|
+
ActionType.DECLARE,
|
|
6635
|
+
ActionType.EDIT,
|
|
6636
|
+
ActionType.REGISTER
|
|
6637
|
+
]
|
|
6638
|
+
},
|
|
6639
|
+
{
|
|
6640
|
+
flag: InherentFlags.POTENTIAL_DUPLICATE,
|
|
6641
|
+
setOn: [ActionType.DUPLICATE_DETECTED],
|
|
6642
|
+
resetOn: [ActionType.MARK_AS_DUPLICATE, ActionType.MARK_AS_NOT_DUPLICATE]
|
|
6643
|
+
},
|
|
6644
|
+
{
|
|
6645
|
+
flag: InherentFlags.EDIT_IN_PROGRESS,
|
|
6646
|
+
setOn: [ActionType.EDIT],
|
|
6647
|
+
resetOnAnyOtherAction: true
|
|
6648
|
+
}
|
|
6649
|
+
];
|
|
6650
|
+
function resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration) {
|
|
6651
|
+
return acceptedActions.reduce((present, action, idx) => {
|
|
6652
|
+
if (rule.setOn.includes(action.type)) {
|
|
6653
|
+
return true;
|
|
6654
|
+
}
|
|
6655
|
+
if (rule.resetOnAnyOtherAction || (rule.resetOn ?? []).includes(action.type)) {
|
|
6656
|
+
return false;
|
|
6657
|
+
}
|
|
6658
|
+
if (actionConfigRemovesFlag(
|
|
6659
|
+
action,
|
|
6660
|
+
rule.flag,
|
|
6661
|
+
acceptedActions.slice(0, idx + 1),
|
|
6662
|
+
event2,
|
|
6663
|
+
eventConfiguration
|
|
6664
|
+
)) {
|
|
6665
|
+
return false;
|
|
6666
|
+
}
|
|
6667
|
+
return present;
|
|
6668
|
+
}, false);
|
|
6669
|
+
}
|
|
6441
6670
|
function resolveEventCustomFlags(event2, eventConfiguration) {
|
|
6442
6671
|
const actions = getAcceptedActions(event2).filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6443
6672
|
return actions.reduce((acc, action, idx) => {
|
|
@@ -6473,8 +6702,7 @@ function resolveEventCustomFlags(event2, eventConfiguration) {
|
|
|
6473
6702
|
return (0, import_lodash3.uniq)(flags);
|
|
6474
6703
|
}, []);
|
|
6475
6704
|
}
|
|
6476
|
-
function
|
|
6477
|
-
const sortedActions = event2.actions.filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6705
|
+
function getActionStatusFlags(sortedActions) {
|
|
6478
6706
|
const actionStatus = sortedActions.reduce(
|
|
6479
6707
|
(actionStatuses, { type, status: status2 }) => ({
|
|
6480
6708
|
...actionStatuses,
|
|
@@ -6482,26 +6710,26 @@ function getEventFlags(event2, config) {
|
|
|
6482
6710
|
}),
|
|
6483
6711
|
{}
|
|
6484
6712
|
);
|
|
6485
|
-
|
|
6713
|
+
return Object.entries(actionStatus).filter(([, status2]) => status2 !== ActionStatus.Accepted).map(([type, status2]) => {
|
|
6486
6714
|
const flag2 = joinValues([type, status2], ":").toLowerCase();
|
|
6487
6715
|
return flag2;
|
|
6488
6716
|
});
|
|
6489
|
-
|
|
6490
|
-
|
|
6491
|
-
|
|
6492
|
-
|
|
6493
|
-
|
|
6494
|
-
|
|
6495
|
-
|
|
6496
|
-
|
|
6497
|
-
|
|
6498
|
-
|
|
6499
|
-
|
|
6500
|
-
|
|
6501
|
-
|
|
6502
|
-
|
|
6503
|
-
|
|
6504
|
-
|
|
6717
|
+
}
|
|
6718
|
+
function getInherentFlags(sortedActions, event2, eventConfiguration) {
|
|
6719
|
+
const acceptedActions = sortedActions.filter(
|
|
6720
|
+
({ status: status2 }) => status2 === ActionStatus.Accepted
|
|
6721
|
+
);
|
|
6722
|
+
return INHERENT_FLAG_RULES.filter(
|
|
6723
|
+
(rule) => resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration)
|
|
6724
|
+
).map(({ flag: flag2 }) => flag2);
|
|
6725
|
+
}
|
|
6726
|
+
function getEventFlags(event2, config) {
|
|
6727
|
+
const sortedActions = event2.actions.filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6728
|
+
return [
|
|
6729
|
+
...getActionStatusFlags(sortedActions),
|
|
6730
|
+
...getInherentFlags(sortedActions, event2, config),
|
|
6731
|
+
...resolveEventCustomFlags(event2, config)
|
|
6732
|
+
];
|
|
6505
6733
|
}
|
|
6506
6734
|
|
|
6507
6735
|
// ../commons/src/events/state/index.ts
|
|
@@ -6736,7 +6964,7 @@ function getActionAnnotation({
|
|
|
6736
6964
|
const action = (0, import_lodash4.findLast)(activeActions, (a) => a.type === actionType);
|
|
6737
6965
|
const actionWithCompleteAnnotation = action && {
|
|
6738
6966
|
...action,
|
|
6739
|
-
annotation: getCompleteActionAnnotation(
|
|
6967
|
+
annotation: getCompleteActionAnnotation(event2, action)
|
|
6740
6968
|
};
|
|
6741
6969
|
const matchingDraft = draft?.action.type === actionType ? draft : void 0;
|
|
6742
6970
|
const sortedActions = (0, import_lodash4.orderBy)(
|
|
@@ -6808,6 +7036,9 @@ function createFieldConfig(fieldId, options) {
|
|
|
6808
7036
|
}
|
|
6809
7037
|
|
|
6810
7038
|
// ../commons/src/events/field.ts
|
|
7039
|
+
function evaluate(computationFn) {
|
|
7040
|
+
return { $$code: computationFn.toString() };
|
|
7041
|
+
}
|
|
6811
7042
|
function field(fieldId, options = {}) {
|
|
6812
7043
|
return {
|
|
6813
7044
|
...createFieldConditionals(fieldId),
|
|
@@ -7501,6 +7732,11 @@ var TENNIS_CLUB_DECLARATION_REVIEW = {
|
|
|
7501
7732
|
id: "signature.upload.modal.title",
|
|
7502
7733
|
defaultMessage: "Draw signature",
|
|
7503
7734
|
description: "Title for the modal to draw signature"
|
|
7735
|
+
},
|
|
7736
|
+
// Zod applies the schema default at parse time, but this fixture bypasses
|
|
7737
|
+
// parsing — GeneratedInputField accesses configuration.maxFileSize directly.
|
|
7738
|
+
configuration: {
|
|
7739
|
+
maxFileSize: 5 * 1024 * 1024
|
|
7504
7740
|
}
|
|
7505
7741
|
}
|
|
7506
7742
|
]
|
|
@@ -8057,6 +8293,20 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8057
8293
|
},
|
|
8058
8294
|
review: TENNIS_CLUB_DECLARATION_REVIEW
|
|
8059
8295
|
},
|
|
8296
|
+
{
|
|
8297
|
+
type: ActionType.NOTIFY,
|
|
8298
|
+
label: {
|
|
8299
|
+
defaultMessage: "Notify health worker",
|
|
8300
|
+
description: "This is shown as the action name anywhere the user can trigger the action from",
|
|
8301
|
+
id: "event.tennis-club-membership.action.notify.label"
|
|
8302
|
+
},
|
|
8303
|
+
flags: [
|
|
8304
|
+
{
|
|
8305
|
+
id: "health-worker-notified",
|
|
8306
|
+
operation: "add"
|
|
8307
|
+
}
|
|
8308
|
+
]
|
|
8309
|
+
},
|
|
8060
8310
|
{
|
|
8061
8311
|
type: ActionType.REJECT,
|
|
8062
8312
|
label: {
|
|
@@ -8299,6 +8549,17 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8299
8549
|
}
|
|
8300
8550
|
}
|
|
8301
8551
|
],
|
|
8552
|
+
flags: [
|
|
8553
|
+
{
|
|
8554
|
+
id: "health-worker-notified",
|
|
8555
|
+
requiresAction: false,
|
|
8556
|
+
label: {
|
|
8557
|
+
id: "event.tennis-club-membership.flag.health-worker-notified.label",
|
|
8558
|
+
defaultMessage: "Health worker notified",
|
|
8559
|
+
description: "Label for the health-worker-notified flag"
|
|
8560
|
+
}
|
|
8561
|
+
}
|
|
8562
|
+
],
|
|
8302
8563
|
advancedSearch: [
|
|
8303
8564
|
{
|
|
8304
8565
|
title: {
|
|
@@ -10057,7 +10318,7 @@ function matchesJurisdictionFilter(locationIds, filter, user2) {
|
|
|
10057
10318
|
return locationIds.some((id) => id === user2.primaryOfficeId);
|
|
10058
10319
|
}
|
|
10059
10320
|
if (filter === JurisdictionFilter.enum.administrativeArea) {
|
|
10060
|
-
return user2.administrativeAreaId
|
|
10321
|
+
return !user2.administrativeAreaId || locationIds.some((id) => id === user2.administrativeAreaId);
|
|
10061
10322
|
}
|
|
10062
10323
|
return true;
|
|
10063
10324
|
}
|
|
@@ -10146,7 +10407,7 @@ function canAccessUserWithScope({
|
|
|
10146
10407
|
}
|
|
10147
10408
|
const hasAdministrativeAreaInHierarchy = userToAccess.administrativeHierarchy.some(
|
|
10148
10409
|
(id) => user2.administrativeAreaId === id
|
|
10149
|
-
) || user2.administrativeAreaId
|
|
10410
|
+
) || !user2.administrativeAreaId;
|
|
10150
10411
|
if (opts?.accessLevel === JurisdictionFilter.enum.administrativeArea && !hasAdministrativeAreaInHierarchy) {
|
|
10151
10412
|
return false;
|
|
10152
10413
|
}
|
|
@@ -10452,18 +10713,19 @@ var ACTION_FILTERS = {
|
|
|
10452
10713
|
function filterActionsByFlags(actions, flags) {
|
|
10453
10714
|
return actions.filter((action) => ACTION_FILTERS[action]?.(flags) ?? true);
|
|
10454
10715
|
}
|
|
10716
|
+
var REJECTED_ACTIONS = [
|
|
10717
|
+
ActionType.READ,
|
|
10718
|
+
ActionType.NOTIFY,
|
|
10719
|
+
ActionType.CUSTOM,
|
|
10720
|
+
ActionType.EDIT,
|
|
10721
|
+
ActionType.ARCHIVE
|
|
10722
|
+
];
|
|
10455
10723
|
function getAvailableActionsWithoutFlagFilters(status2, flags) {
|
|
10456
10724
|
if (flags.includes(InherentFlags.EDIT_IN_PROGRESS)) {
|
|
10457
10725
|
return [ActionType.NOTIFY, ActionType.DECLARE, ActionType.REGISTER];
|
|
10458
10726
|
}
|
|
10459
|
-
if (flags.includes(InherentFlags.REJECTED)) {
|
|
10460
|
-
return
|
|
10461
|
-
ActionType.READ,
|
|
10462
|
-
ActionType.NOTIFY,
|
|
10463
|
-
ActionType.CUSTOM,
|
|
10464
|
-
ActionType.EDIT,
|
|
10465
|
-
ActionType.ARCHIVE
|
|
10466
|
-
];
|
|
10727
|
+
if (flags.includes(InherentFlags.REJECTED) && status2 !== EventStatus.enum.ARCHIVED) {
|
|
10728
|
+
return REJECTED_ACTIONS;
|
|
10467
10729
|
}
|
|
10468
10730
|
return AVAILABLE_ACTIONS_BY_EVENT_STATUS[status2];
|
|
10469
10731
|
}
|