@opencrvs/toolkit 2.0.0-rc.fd7ac44 → 2.0.0-rc.fda1121
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 +55 -35
- package/dist/cli.js +10 -4
- package/dist/commons/api/router.d.ts +94 -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/CountryConfigQueryInput.d.ts +42 -0
- package/dist/commons/events/EventDocument.d.ts +3 -0
- package/dist/commons/events/EventIndex.d.ts +14 -0
- package/dist/commons/events/FieldConfig.d.ts +378 -50
- package/dist/commons/events/FieldType.d.ts +1 -0
- package/dist/commons/events/FieldTypeMapping.d.ts +1 -1
- package/dist/commons/events/FieldValue.d.ts +6 -0
- package/dist/commons/events/WorkqueueConfig.d.ts +39 -0
- package/dist/commons/events/field.d.ts +53 -1
- package/dist/commons/events/state/utils.d.ts +12 -287
- package/dist/commons/events/utils.d.ts +12 -1
- package/dist/conditionals/index.js +48 -1
- package/dist/events/index.js +380 -148
- 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 +250 -40
- package/dist/scopes/index.d.ts +4 -6
- package/dist/scopes/index.js +9 -3
- package/opencrvs-toolkit-2.0.0-rc.fda1121.tgz +0 -0
- package/package.json +1 -1
- package/opencrvs-toolkit-2.0.0-rc.fd7ac44.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,
|
|
@@ -316,6 +322,7 @@ __export(events_exports, {
|
|
|
316
322
|
getAvailableActionsForEvent: () => getAvailableActionsForEvent,
|
|
317
323
|
getAvailableRolesForUserUpdatePayload: () => getAvailableRolesForUserUpdatePayload,
|
|
318
324
|
getCompleteActionAnnotation: () => getCompleteActionAnnotation,
|
|
325
|
+
getCompleteActionContent: () => getCompleteActionContent,
|
|
319
326
|
getCompleteActionDeclaration: () => getCompleteActionDeclaration,
|
|
320
327
|
getCurrentEventState: () => getCurrentEventState,
|
|
321
328
|
getCustomActionFields: () => getCustomActionFields,
|
|
@@ -347,6 +354,7 @@ __export(events_exports, {
|
|
|
347
354
|
isBulletListFieldType: () => isBulletListFieldType,
|
|
348
355
|
isButtonFieldType: () => isButtonFieldType,
|
|
349
356
|
isCheckboxFieldType: () => isCheckboxFieldType,
|
|
357
|
+
isCodeToEvaluate: () => isCodeToEvaluate,
|
|
350
358
|
isConditionMet: () => isConditionMet,
|
|
351
359
|
isCountryFieldType: () => isCountryFieldType,
|
|
352
360
|
isCustomFieldType: () => isCustomFieldType,
|
|
@@ -423,11 +431,13 @@ __export(events_exports, {
|
|
|
423
431
|
resolveDateOfEvent: () => resolveDateOfEvent,
|
|
424
432
|
resolveEventCustomFlags: () => resolveEventCustomFlags,
|
|
425
433
|
resolvePlaceOfEvent: () => resolvePlaceOfEvent,
|
|
434
|
+
runClientFunction: () => runClientFunction,
|
|
426
435
|
runFieldValidations: () => runFieldValidations,
|
|
427
436
|
runStructuralValidations: () => runStructuralValidations,
|
|
428
437
|
safeUnion: () => safeUnion,
|
|
429
438
|
status: () => status,
|
|
430
439
|
timePeriodToDateRange: () => timePeriodToDateRange,
|
|
440
|
+
todayISO: () => todayISO,
|
|
431
441
|
user: () => user,
|
|
432
442
|
userCanAccessEventWithScopes: () => userCanAccessEventWithScopes,
|
|
433
443
|
validate: () => validate,
|
|
@@ -702,14 +712,20 @@ var unflattenScope = (input) => {
|
|
|
702
712
|
return { type, options };
|
|
703
713
|
};
|
|
704
714
|
var EncodedScope = z2.string().brand("EncodedScope");
|
|
705
|
-
var
|
|
706
|
-
|
|
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, {
|
|
707
721
|
ignoreQueryPrefix: true,
|
|
708
722
|
comma: true,
|
|
709
723
|
allowDots: true
|
|
710
724
|
});
|
|
711
725
|
const unflattenedScope = unflattenScope(scope);
|
|
712
|
-
|
|
726
|
+
const result = Scope.safeParse(unflattenedScope)?.data;
|
|
727
|
+
decodedScopeCache.set(encodedScope, result);
|
|
728
|
+
return result;
|
|
713
729
|
};
|
|
714
730
|
var DEFAULT_SCOPE_OPTIONS = {
|
|
715
731
|
placeOfEvent: JurisdictionFilter.enum.all,
|
|
@@ -1204,6 +1220,11 @@ var FieldTypesToHideInReview = [
|
|
|
1204
1220
|
FieldType.ALPHA_PRINT_BUTTON,
|
|
1205
1221
|
FieldType.ALPHA_HIDDEN
|
|
1206
1222
|
];
|
|
1223
|
+
var HiddenFieldTypes = [
|
|
1224
|
+
FieldType.HTTP,
|
|
1225
|
+
FieldType.QUERY_PARAM_READER,
|
|
1226
|
+
FieldType.ALPHA_HIDDEN
|
|
1227
|
+
];
|
|
1207
1228
|
|
|
1208
1229
|
// ../commons/src/events/FieldValue.ts
|
|
1209
1230
|
var z12 = __toESM(require("zod/v4"));
|
|
@@ -1330,7 +1351,7 @@ function plainDateToLocalDate(date) {
|
|
|
1330
1351
|
// ../commons/src/events/FieldValue.ts
|
|
1331
1352
|
var TextValue = z12.string();
|
|
1332
1353
|
var HiddenFieldValue = z12.string();
|
|
1333
|
-
var NonEmptyTextValue =
|
|
1354
|
+
var NonEmptyTextValue = z12.string().trim().min(1);
|
|
1334
1355
|
var DateValue = z12.iso.date().describe("Date in the format YYYY-MM-DD");
|
|
1335
1356
|
var AgeValue = z12.object({
|
|
1336
1357
|
age: z12.number(),
|
|
@@ -1359,6 +1380,7 @@ var DateRangeFieldValue = z12.object({
|
|
|
1359
1380
|
var EmailValue = z12.email();
|
|
1360
1381
|
var CheckboxFieldValue = z12.boolean();
|
|
1361
1382
|
var NumberFieldValue = z12.number();
|
|
1383
|
+
var SignatureFieldValue = FileFieldValue;
|
|
1362
1384
|
var ButtonFieldValue = z12.number();
|
|
1363
1385
|
var VerificationStatusValue = z12.enum([
|
|
1364
1386
|
"verified",
|
|
@@ -1657,8 +1679,9 @@ var RequestedCorrectionAction = ActionBase.extend(
|
|
|
1657
1679
|
var ApprovedCorrectionAction = ActionBase.extend(
|
|
1658
1680
|
z14.object({
|
|
1659
1681
|
type: z14.literal(ActionType.APPROVE_CORRECTION),
|
|
1660
|
-
requestId: z14.string()
|
|
1682
|
+
requestId: z14.string(),
|
|
1661
1683
|
// TODO move into 'content' property
|
|
1684
|
+
content: z14.object({ immediateCorrection: z14.boolean().optional() }).optional()
|
|
1662
1685
|
}).shape
|
|
1663
1686
|
);
|
|
1664
1687
|
var RejectedCorrectionAction = ActionBase.extend(
|
|
@@ -2000,7 +2023,8 @@ var Range = import_v4.z.object({
|
|
|
2000
2023
|
});
|
|
2001
2024
|
var ContainsFlags = import_v4.z.object({
|
|
2002
2025
|
anyOf: import_v4.z.array(Flag).optional(),
|
|
2003
|
-
noneOf: import_v4.z.array(Flag).optional()
|
|
2026
|
+
noneOf: import_v4.z.array(Flag).optional(),
|
|
2027
|
+
allOf: import_v4.z.array(Flag).optional()
|
|
2004
2028
|
}).meta({
|
|
2005
2029
|
id: "ContainsFlags"
|
|
2006
2030
|
});
|
|
@@ -2189,8 +2213,21 @@ var FieldReference = import_v43.default.object({
|
|
|
2189
2213
|
$$field: FieldId.describe("Id of the field to reference"),
|
|
2190
2214
|
$$subfield: import_v43.default.array(import_v43.default.string()).optional().default([]).describe(
|
|
2191
2215
|
'If the FieldValue is an object, subfield can be used to refer to e.g. `["foo", "bar"]` in `{ foo: { bar: 3 } }`'
|
|
2216
|
+
),
|
|
2217
|
+
$$code: import_v43.default.string().optional().describe(
|
|
2218
|
+
"Serialised client-side function body. When present the expression is evaluated rather than dereferenced."
|
|
2219
|
+
)
|
|
2220
|
+
}).describe(
|
|
2221
|
+
"Reference to a field value, with an optional client-side computation applied."
|
|
2222
|
+
);
|
|
2223
|
+
function isCodeToEvaluate(v) {
|
|
2224
|
+
return !!v && typeof v === "object" && "$$code" in v;
|
|
2225
|
+
}
|
|
2226
|
+
var ComputedDefaultValue = import_v43.default.object({
|
|
2227
|
+
$$code: import_v43.default.string().describe(
|
|
2228
|
+
"Serialised client-side function body. Receives (undefined, context) where context includes $now, $online, and system variables."
|
|
2192
2229
|
)
|
|
2193
|
-
}).describe("
|
|
2230
|
+
}).describe("A context-only computation used as a field default value.");
|
|
2194
2231
|
var ValidationConfig = import_v43.default.object({
|
|
2195
2232
|
validator: Conditional.describe(
|
|
2196
2233
|
"Conditional expression that must hold for the field value to be considered valid."
|
|
@@ -2231,7 +2268,7 @@ var BaseField = import_v43.default.object({
|
|
|
2231
2268
|
"Indicates whether the field can be modified during record correction."
|
|
2232
2269
|
),
|
|
2233
2270
|
value: FieldReference.or(import_v43.default.array(FieldReference)).optional().describe(
|
|
2234
|
-
"Reference to the source field or fields. When a value is defined, it is copied from the parent field when changed. If multiple references are provided, the first truthy value is used."
|
|
2271
|
+
"Reference to the source field or fields. When a value is defined, it is copied from the parent field when changed. If multiple references are provided, the first truthy value is used. A FieldReference with $$code computes the value via a custom client-side function."
|
|
2235
2272
|
),
|
|
2236
2273
|
analytics: import_v43.default.boolean().default(false).optional().describe(
|
|
2237
2274
|
"Indicates whether the field is included in analytics. When enabled, its value becomes available in the analytics dashboard."
|
|
@@ -2245,7 +2282,7 @@ var Divider = BaseField.extend({
|
|
|
2245
2282
|
});
|
|
2246
2283
|
var TextField = BaseField.extend({
|
|
2247
2284
|
type: import_v43.default.literal(FieldType.TEXT),
|
|
2248
|
-
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField]).optional(),
|
|
2285
|
+
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField, ComputedDefaultValue]).optional(),
|
|
2249
2286
|
configuration: import_v43.default.object({
|
|
2250
2287
|
maxLength: import_v43.default.number().optional().describe("Maximum length of the text"),
|
|
2251
2288
|
type: import_v43.default.enum(["text", "password"]).optional(),
|
|
@@ -2258,10 +2295,11 @@ var TextField = BaseField.extend({
|
|
|
2258
2295
|
});
|
|
2259
2296
|
var NumberField = BaseField.extend({
|
|
2260
2297
|
type: import_v43.default.literal(FieldType.NUMBER),
|
|
2261
|
-
defaultValue: NumberFieldValue.optional(),
|
|
2298
|
+
defaultValue: NumberFieldValue.or(ComputedDefaultValue).optional(),
|
|
2262
2299
|
configuration: import_v43.default.object({
|
|
2263
2300
|
min: import_v43.default.number().optional().describe("Minimum value"),
|
|
2264
2301
|
max: import_v43.default.number().optional().describe("Maximum value"),
|
|
2302
|
+
integer: import_v43.default.boolean().optional().describe("When true, only whole numbers are allowed"),
|
|
2265
2303
|
prefix: TranslationConfig.optional(),
|
|
2266
2304
|
postfix: TranslationConfig.optional()
|
|
2267
2305
|
}).optional()
|
|
@@ -2271,7 +2309,7 @@ var NumberField = BaseField.extend({
|
|
|
2271
2309
|
});
|
|
2272
2310
|
var TextAreaField = BaseField.extend({
|
|
2273
2311
|
type: import_v43.default.literal(FieldType.TEXTAREA),
|
|
2274
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2312
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2275
2313
|
configuration: import_v43.default.object({
|
|
2276
2314
|
maxLength: import_v43.default.number().optional().describe("Maximum length of the text"),
|
|
2277
2315
|
rows: import_v43.default.number().optional().describe("Number of visible text lines"),
|
|
@@ -2305,7 +2343,7 @@ var SignatureField = BaseField.extend({
|
|
|
2305
2343
|
signaturePromptLabel: TranslationConfig.describe(
|
|
2306
2344
|
"Title of the signature modal"
|
|
2307
2345
|
),
|
|
2308
|
-
defaultValue:
|
|
2346
|
+
defaultValue: SignatureFieldValue.or(ComputedDefaultValue).optional(),
|
|
2309
2347
|
configuration: import_v43.default.object({
|
|
2310
2348
|
maxFileSize: import_v43.default.number().describe("Maximum file size in bytes").default(DEFAULT_MAX_FILE_SIZE_BYTES),
|
|
2311
2349
|
acceptedFileTypes: MimeType.array().optional().describe("List of allowed file formats for the signature")
|
|
@@ -2321,14 +2359,14 @@ var EmailField = BaseField.extend({
|
|
|
2321
2359
|
configuration: import_v43.default.object({
|
|
2322
2360
|
maxLength: import_v43.default.number().optional().describe("Maximum length of the text")
|
|
2323
2361
|
}).default({ maxLength: 255 }).optional(),
|
|
2324
|
-
defaultValue: NonEmptyTextValue.optional()
|
|
2362
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional()
|
|
2325
2363
|
}).meta({
|
|
2326
2364
|
description: "An email input field",
|
|
2327
2365
|
id: "EmailField"
|
|
2328
2366
|
});
|
|
2329
2367
|
var DateField = BaseField.extend({
|
|
2330
2368
|
type: import_v43.default.literal(FieldType.DATE),
|
|
2331
|
-
defaultValue: SerializedNowDateTime.or(PlainDate).optional().describe("Default date value(yyyy-MM-dd)"),
|
|
2369
|
+
defaultValue: SerializedNowDateTime.or(PlainDate).or(ComputedDefaultValue).optional().describe("Default date value(yyyy-MM-dd)"),
|
|
2332
2370
|
configuration: import_v43.default.object({
|
|
2333
2371
|
notice: TranslationConfig.describe(
|
|
2334
2372
|
"Text to display above the date input"
|
|
@@ -2340,7 +2378,7 @@ var DateField = BaseField.extend({
|
|
|
2340
2378
|
});
|
|
2341
2379
|
var AgeField = BaseField.extend({
|
|
2342
2380
|
type: import_v43.default.literal(FieldType.AGE),
|
|
2343
|
-
defaultValue: NumberFieldValue.optional(),
|
|
2381
|
+
defaultValue: NumberFieldValue.or(ComputedDefaultValue).optional(),
|
|
2344
2382
|
configuration: import_v43.default.object({
|
|
2345
2383
|
asOfDate: FieldReference,
|
|
2346
2384
|
prefix: TranslationConfig.optional(),
|
|
@@ -2352,7 +2390,7 @@ var AgeField = BaseField.extend({
|
|
|
2352
2390
|
});
|
|
2353
2391
|
var TimeField = BaseField.extend({
|
|
2354
2392
|
type: import_v43.default.literal(FieldType.TIME),
|
|
2355
|
-
defaultValue: SerializedNowDateTime.or(TimeValue).optional().describe("Default time value (HH-mm)"),
|
|
2393
|
+
defaultValue: SerializedNowDateTime.or(TimeValue).or(ComputedDefaultValue).optional().describe("Default time value (HH-mm)"),
|
|
2356
2394
|
configuration: import_v43.default.object({
|
|
2357
2395
|
use12HourFormat: import_v43.default.boolean().optional().describe("Whether to use 12-hour format"),
|
|
2358
2396
|
notice: TranslationConfig.describe(
|
|
@@ -2365,7 +2403,7 @@ var TimeField = BaseField.extend({
|
|
|
2365
2403
|
});
|
|
2366
2404
|
var DateRangeField = BaseField.extend({
|
|
2367
2405
|
type: import_v43.default.literal(FieldType.DATE_RANGE),
|
|
2368
|
-
defaultValue: DateRangeFieldValue.optional(),
|
|
2406
|
+
defaultValue: DateRangeFieldValue.or(ComputedDefaultValue).optional(),
|
|
2369
2407
|
configuration: import_v43.default.object({
|
|
2370
2408
|
notice: TranslationConfig.describe(
|
|
2371
2409
|
"Text to display above the date input"
|
|
@@ -2444,7 +2482,7 @@ var PageHeader = BaseField.extend({
|
|
|
2444
2482
|
});
|
|
2445
2483
|
var File = BaseField.extend({
|
|
2446
2484
|
type: import_v43.default.literal(FieldType.FILE),
|
|
2447
|
-
defaultValue: FileFieldValue.optional(),
|
|
2485
|
+
defaultValue: FileFieldValue.or(ComputedDefaultValue).optional(),
|
|
2448
2486
|
configuration: import_v43.default.object({
|
|
2449
2487
|
maxFileSize: import_v43.default.number().describe("Maximum file size in bytes").default(DEFAULT_MAX_FILE_SIZE_BYTES),
|
|
2450
2488
|
acceptedFileTypes: MimeType.array().optional().describe("List of allowed file formats for the signature"),
|
|
@@ -2471,7 +2509,7 @@ var SelectOption = import_v43.default.object({
|
|
|
2471
2509
|
});
|
|
2472
2510
|
var NumberWithUnitField = BaseField.extend({
|
|
2473
2511
|
type: import_v43.default.literal(FieldType.NUMBER_WITH_UNIT),
|
|
2474
|
-
defaultValue: NumberWithUnitFieldValue.optional(),
|
|
2512
|
+
defaultValue: NumberWithUnitFieldValue.or(ComputedDefaultValue).optional(),
|
|
2475
2513
|
options: import_v43.default.array(SelectOption).describe("A list of options for the unit select"),
|
|
2476
2514
|
configuration: import_v43.default.object({
|
|
2477
2515
|
min: import_v43.default.number().optional().describe("Minimum value of the number field"),
|
|
@@ -2486,7 +2524,7 @@ var NumberWithUnitField = BaseField.extend({
|
|
|
2486
2524
|
});
|
|
2487
2525
|
var RadioGroup = BaseField.extend({
|
|
2488
2526
|
type: import_v43.default.literal(FieldType.RADIO_GROUP),
|
|
2489
|
-
defaultValue: TextValue.optional(),
|
|
2527
|
+
defaultValue: TextValue.or(ComputedDefaultValue).optional(),
|
|
2490
2528
|
options: import_v43.default.array(SelectOption).describe("A list of options"),
|
|
2491
2529
|
configuration: import_v43.default.object({
|
|
2492
2530
|
styles: import_v43.default.object({
|
|
@@ -2511,7 +2549,7 @@ var BulletList = BaseField.extend({
|
|
|
2511
2549
|
});
|
|
2512
2550
|
var Select = BaseField.extend({
|
|
2513
2551
|
type: import_v43.default.literal(FieldType.SELECT),
|
|
2514
|
-
defaultValue: TextValue.optional(),
|
|
2552
|
+
defaultValue: TextValue.or(ComputedDefaultValue).optional(),
|
|
2515
2553
|
options: import_v43.default.array(SelectOption).describe("A list of options"),
|
|
2516
2554
|
noOptionsMessage: TranslationConfig.optional().describe(
|
|
2517
2555
|
`
|
|
@@ -2533,7 +2571,7 @@ var SelectDateRangeOption = import_v43.default.object({
|
|
|
2533
2571
|
});
|
|
2534
2572
|
var SelectDateRangeField = BaseField.extend({
|
|
2535
2573
|
type: import_v43.default.literal(FieldType.SELECT_DATE_RANGE),
|
|
2536
|
-
defaultValue: SelectDateRangeValue.optional(),
|
|
2574
|
+
defaultValue: SelectDateRangeValue.or(ComputedDefaultValue).optional(),
|
|
2537
2575
|
options: import_v43.default.array(SelectDateRangeOption).describe("A list of options")
|
|
2538
2576
|
}).meta({
|
|
2539
2577
|
description: "A date range selection field",
|
|
@@ -2550,7 +2588,7 @@ var NameField = BaseField.extend({
|
|
|
2550
2588
|
firstname: SerializedUserField.or(NonEmptyTextValue).optional(),
|
|
2551
2589
|
middlename: SerializedUserField.or(NonEmptyTextValue).optional(),
|
|
2552
2590
|
surname: SerializedUserField.or(NonEmptyTextValue).optional()
|
|
2553
|
-
}).optional(),
|
|
2591
|
+
}).or(ComputedDefaultValue).optional(),
|
|
2554
2592
|
configuration: import_v43.default.object({
|
|
2555
2593
|
name: NameConfig.default({
|
|
2556
2594
|
firstname: { required: true },
|
|
@@ -2574,14 +2612,14 @@ var NameField = BaseField.extend({
|
|
|
2574
2612
|
id: "NameField"
|
|
2575
2613
|
});
|
|
2576
2614
|
var PhoneField = BaseField.extend({
|
|
2577
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2615
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2578
2616
|
type: import_v43.default.literal(FieldType.PHONE)
|
|
2579
2617
|
}).meta({
|
|
2580
2618
|
description: "A field for entering a phone number",
|
|
2581
2619
|
id: "PhoneField"
|
|
2582
2620
|
});
|
|
2583
2621
|
var IdField = BaseField.extend({
|
|
2584
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2622
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2585
2623
|
type: import_v43.default.literal(FieldType.ID)
|
|
2586
2624
|
}).meta({
|
|
2587
2625
|
description: "A field for entering an ID",
|
|
@@ -2589,14 +2627,14 @@ var IdField = BaseField.extend({
|
|
|
2589
2627
|
});
|
|
2590
2628
|
var Checkbox = BaseField.extend({
|
|
2591
2629
|
type: import_v43.default.literal(FieldType.CHECKBOX),
|
|
2592
|
-
defaultValue: CheckboxFieldValue.default(false)
|
|
2630
|
+
defaultValue: CheckboxFieldValue.or(ComputedDefaultValue).default(false)
|
|
2593
2631
|
}).meta({
|
|
2594
2632
|
description: "A boolean checkbox field",
|
|
2595
2633
|
id: "Checkbox"
|
|
2596
2634
|
});
|
|
2597
2635
|
var Country = BaseField.extend({
|
|
2598
2636
|
type: import_v43.default.literal(FieldType.COUNTRY),
|
|
2599
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2637
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2600
2638
|
optionOverrides: import_v43.default.array(SelectOption.omit({ label: true })).optional().describe(
|
|
2601
2639
|
"Conditionals for specific countries. Countries not listed are always shown and enabled."
|
|
2602
2640
|
)
|
|
@@ -2614,7 +2652,7 @@ var AdministrativeAreas = import_v43.default.enum([
|
|
|
2614
2652
|
]);
|
|
2615
2653
|
var AdministrativeAreaField = BaseField.extend({
|
|
2616
2654
|
type: import_v43.default.literal(FieldType.ADMINISTRATIVE_AREA),
|
|
2617
|
-
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField]).optional(),
|
|
2655
|
+
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField, ComputedDefaultValue]).optional(),
|
|
2618
2656
|
configuration: import_v43.default.object({
|
|
2619
2657
|
partOf: FieldReference.optional().describe("Parent location"),
|
|
2620
2658
|
type: AdministrativeAreas,
|
|
@@ -2626,7 +2664,7 @@ var AdministrativeAreaField = BaseField.extend({
|
|
|
2626
2664
|
});
|
|
2627
2665
|
var LocationInput = BaseField.extend({
|
|
2628
2666
|
type: import_v43.default.literal(FieldType.LOCATION),
|
|
2629
|
-
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField]).optional(),
|
|
2667
|
+
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField, ComputedDefaultValue]).optional(),
|
|
2630
2668
|
configuration: import_v43.default.object({
|
|
2631
2669
|
locationTypes: import_v43.default.array(import_v43.default.string()).optional().describe("Types of the locations that are available for selection."),
|
|
2632
2670
|
allowedLocations: AllowedLocations
|
|
@@ -2638,7 +2676,7 @@ var LocationInput = BaseField.extend({
|
|
|
2638
2676
|
var FileUploadWithOptions = BaseField.extend({
|
|
2639
2677
|
type: import_v43.default.literal(FieldType.FILE_WITH_OPTIONS),
|
|
2640
2678
|
options: import_v43.default.array(SelectOption).describe("A list of options"),
|
|
2641
|
-
defaultValue: FileFieldWithOptionValue.optional(),
|
|
2679
|
+
defaultValue: FileFieldWithOptionValue.or(ComputedDefaultValue).optional(),
|
|
2642
2680
|
configuration: import_v43.default.object({
|
|
2643
2681
|
maxFileSize: import_v43.default.number().describe("Maximum file size in bytes").default(DEFAULT_MAX_FILE_SIZE_BYTES),
|
|
2644
2682
|
maxImageSize: import_v43.default.object({
|
|
@@ -2654,12 +2692,12 @@ var FileUploadWithOptions = BaseField.extend({
|
|
|
2654
2692
|
});
|
|
2655
2693
|
var Facility = BaseField.extend({
|
|
2656
2694
|
type: import_v43.default.literal(FieldType.FACILITY),
|
|
2657
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2695
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2658
2696
|
configuration: import_v43.default.object({ allowedLocations: AllowedLocations }).optional()
|
|
2659
2697
|
}).describe("Input field for a facility");
|
|
2660
2698
|
var Office = BaseField.extend({
|
|
2661
2699
|
type: import_v43.default.literal(FieldType.OFFICE),
|
|
2662
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2700
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2663
2701
|
configuration: import_v43.default.object({ allowedLocations: AllowedLocations }).optional()
|
|
2664
2702
|
}).describe("Input field for an office");
|
|
2665
2703
|
var DefaultAddressFieldValue = DomesticAddressFieldValue.extend({
|
|
@@ -2695,7 +2733,7 @@ var Address = BaseField.extend({
|
|
|
2695
2733
|
).optional(),
|
|
2696
2734
|
allowedLocations: AllowedLocations
|
|
2697
2735
|
}).optional(),
|
|
2698
|
-
defaultValue: DefaultAddressFieldValue.optional()
|
|
2736
|
+
defaultValue: DefaultAddressFieldValue.or(ComputedDefaultValue).optional()
|
|
2699
2737
|
}).meta({
|
|
2700
2738
|
description: "Address input field \u2013 a combination of location and text fields",
|
|
2701
2739
|
id: "Address"
|
|
@@ -2742,7 +2780,7 @@ var ButtonConfiguration = import_v43.default.object({
|
|
|
2742
2780
|
});
|
|
2743
2781
|
var ButtonField = BaseField.extend({
|
|
2744
2782
|
type: import_v43.default.literal(FieldType.BUTTON),
|
|
2745
|
-
defaultValue: ButtonFieldValue.optional(),
|
|
2783
|
+
defaultValue: ButtonFieldValue.or(ComputedDefaultValue).optional(),
|
|
2746
2784
|
configuration: ButtonConfiguration
|
|
2747
2785
|
}).meta({
|
|
2748
2786
|
description: "A generic button that can be used to trigger an action",
|
|
@@ -2770,7 +2808,7 @@ var AlphaPrintButton = BaseField.extend({
|
|
|
2770
2808
|
});
|
|
2771
2809
|
var HttpField = BaseField.extend({
|
|
2772
2810
|
type: import_v43.default.literal(FieldType.HTTP),
|
|
2773
|
-
defaultValue: HttpFieldValue.optional(),
|
|
2811
|
+
defaultValue: HttpFieldValue.or(ComputedDefaultValue).optional(),
|
|
2774
2812
|
configuration: import_v43.default.object({
|
|
2775
2813
|
trigger: FieldReference.optional().describe(
|
|
2776
2814
|
"Reference to the field that triggers the HTTP request when its value changes. If not provided, the HTTP request is triggered once on component mount."
|
|
@@ -2856,7 +2894,7 @@ var LinkButtonField = BaseField.extend({
|
|
|
2856
2894
|
});
|
|
2857
2895
|
var VerificationStatus = BaseField.extend({
|
|
2858
2896
|
type: import_v43.default.literal(FieldType.VERIFICATION_STATUS),
|
|
2859
|
-
defaultValue: VerificationStatusValue.optional(),
|
|
2897
|
+
defaultValue: VerificationStatusValue.or(ComputedDefaultValue).optional(),
|
|
2860
2898
|
configuration: import_v43.default.object({
|
|
2861
2899
|
status: TranslationConfig.describe("Text to display on the status pill."),
|
|
2862
2900
|
description: TranslationConfig.describe(
|
|
@@ -2878,7 +2916,7 @@ var QueryParamReaderField = BaseField.extend({
|
|
|
2878
2916
|
});
|
|
2879
2917
|
var QrReaderField = BaseField.extend({
|
|
2880
2918
|
type: import_v43.default.literal(FieldType.QR_READER),
|
|
2881
|
-
defaultValue: QrReaderFieldValue.optional(),
|
|
2919
|
+
defaultValue: QrReaderFieldValue.or(ComputedDefaultValue).optional(),
|
|
2882
2920
|
configuration: import_v43.default.object({
|
|
2883
2921
|
validator: import_v43.default.any().meta({
|
|
2884
2922
|
description: "JSON Schema to validate the scanned QR code data against before populating the form fields.",
|
|
@@ -2891,7 +2929,7 @@ var QrReaderField = BaseField.extend({
|
|
|
2891
2929
|
});
|
|
2892
2930
|
var IdReaderField = BaseField.extend({
|
|
2893
2931
|
type: import_v43.default.literal(FieldType.ID_READER),
|
|
2894
|
-
defaultValue: IdReaderFieldValue.optional(),
|
|
2932
|
+
defaultValue: IdReaderFieldValue.or(ComputedDefaultValue).optional(),
|
|
2895
2933
|
methods: import_v43.default.array(
|
|
2896
2934
|
import_v43.default.union([QrReaderField, LinkButtonField]).describe("Methods for reading an ID")
|
|
2897
2935
|
)
|
|
@@ -3185,6 +3223,11 @@ var ReadActionConfig = ActionConfigBase.extend(
|
|
|
3185
3223
|
conditionals: z24.never().optional().describe("Read-action can not be disabled or hidden with conditionals.")
|
|
3186
3224
|
}).shape
|
|
3187
3225
|
);
|
|
3226
|
+
var NotifyConfig = ActionConfigBase.extend(
|
|
3227
|
+
z24.object({
|
|
3228
|
+
type: z24.literal(ActionType.NOTIFY)
|
|
3229
|
+
}).shape
|
|
3230
|
+
);
|
|
3188
3231
|
var DeclareConfig = DeclarationActionBase.extend(
|
|
3189
3232
|
z24.object({
|
|
3190
3233
|
type: z24.literal(ActionType.DECLARE),
|
|
@@ -3269,9 +3312,13 @@ var ActionConfig = z24.discriminatedUnion("type", [
|
|
|
3269
3312
|
id: "ReadActionConfig",
|
|
3270
3313
|
description: "Configuration for the read action \u2014 defines the record-tab content displayed on the event overview page."
|
|
3271
3314
|
}),
|
|
3315
|
+
NotifyConfig.meta({
|
|
3316
|
+
id: "NotifyActionConfig",
|
|
3317
|
+
description: "Configuration for the notify action. When present, NOTIFY uses this config independently from DECLARE. When absent, NOTIFY falls back to the DeclareActionConfig."
|
|
3318
|
+
}),
|
|
3272
3319
|
DeclareConfig.meta({
|
|
3273
3320
|
id: "DeclareActionConfig",
|
|
3274
|
-
description: "Configuration for the declare action. Includes review-page fields.
|
|
3321
|
+
description: "Configuration for the declare action. Includes review-page fields. NOTIFY falls back to this config when no dedicated NotifyActionConfig is provided."
|
|
3275
3322
|
}),
|
|
3276
3323
|
RejectConfig.meta({
|
|
3277
3324
|
id: "RejectActionConfig",
|
|
@@ -3450,6 +3497,9 @@ var BaseField3 = z28.object({
|
|
|
3450
3497
|
),
|
|
3451
3498
|
validations: z28.array(ValidationConfig).optional().describe(
|
|
3452
3499
|
`Option for overriding the field validations specifically for advanced search form.`
|
|
3500
|
+
),
|
|
3501
|
+
allowedLocations: JurisdictionReference.optional().describe(
|
|
3502
|
+
`Override the allowedLocations for a location field in advanced search. Use this when the declaration form's allowedLocations references a scope (e.g. record.create) that search-only users don't have \u2014 specify record.search scope instead.`
|
|
3453
3503
|
)
|
|
3454
3504
|
});
|
|
3455
3505
|
var SearchQueryParams = z28.object({
|
|
@@ -3524,9 +3574,11 @@ var z30 = __toESM(require("zod/v4"));
|
|
|
3524
3574
|
var z29 = __toESM(require("zod/v4"));
|
|
3525
3575
|
function getDynamicNameValue(field3) {
|
|
3526
3576
|
const nameConfiguration = field3.configuration?.name;
|
|
3577
|
+
const firstnameRequired = nameConfiguration?.firstname?.required ?? field3.required;
|
|
3578
|
+
const surnameRequired = nameConfiguration?.surname?.required ?? field3.required;
|
|
3527
3579
|
return z29.object({
|
|
3528
|
-
firstname:
|
|
3529
|
-
surname:
|
|
3580
|
+
firstname: firstnameRequired ? NonEmptyTextValue : TextValue,
|
|
3581
|
+
surname: surnameRequired ? NonEmptyTextValue : TextValue,
|
|
3530
3582
|
middlename: nameConfiguration?.middlename?.required ? NonEmptyTextValue : TextValue.optional()
|
|
3531
3583
|
});
|
|
3532
3584
|
}
|
|
@@ -3873,7 +3925,7 @@ var isHiddenFieldType = (field3) => {
|
|
|
3873
3925
|
return field3.config.type === FieldType.ALPHA_HIDDEN;
|
|
3874
3926
|
};
|
|
3875
3927
|
var isNonInteractiveFieldType = (field3) => {
|
|
3876
|
-
return field3.type === FieldType.DIVIDER || field3.type === FieldType.PAGE_HEADER || field3.type === FieldType.PARAGRAPH || field3.type === FieldType.HEADING || field3.type === FieldType.BULLET_LIST || field3.type === FieldType.DATA || field3.type === FieldType.ALPHA_PRINT_BUTTON || field3.type === FieldType.
|
|
3928
|
+
return field3.type === FieldType.DIVIDER || field3.type === FieldType.PAGE_HEADER || field3.type === FieldType.PARAGRAPH || field3.type === FieldType.HEADING || field3.type === FieldType.BULLET_LIST || field3.type === FieldType.DATA || field3.type === FieldType.ALPHA_PRINT_BUTTON || field3.type === FieldType.LINK_BUTTON || field3.type === FieldType.LOADER;
|
|
3877
3929
|
};
|
|
3878
3930
|
|
|
3879
3931
|
// ../commons/src/conditionals/validate.ts
|
|
@@ -3909,7 +3961,37 @@ function resolveDataPath(rootData, dataPath, instancePath) {
|
|
|
3909
3961
|
}
|
|
3910
3962
|
return current;
|
|
3911
3963
|
}
|
|
3964
|
+
function todayISO() {
|
|
3965
|
+
return (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" });
|
|
3966
|
+
}
|
|
3967
|
+
var compiledFunctionCache = /* @__PURE__ */ new Map();
|
|
3968
|
+
function compileClientFunction(code) {
|
|
3969
|
+
let fn = compiledFunctionCache.get(code);
|
|
3970
|
+
if (!fn) {
|
|
3971
|
+
fn = new Function(`return (${code})`)();
|
|
3972
|
+
compiledFunctionCache.set(code, fn);
|
|
3973
|
+
}
|
|
3974
|
+
return fn;
|
|
3975
|
+
}
|
|
3912
3976
|
(0, import_ajv_formats.default)(ajv);
|
|
3977
|
+
function buildClientFunctionContext(input) {
|
|
3978
|
+
return {
|
|
3979
|
+
$form: input.form,
|
|
3980
|
+
$now: todayISO(),
|
|
3981
|
+
// eslint-disable-next-line @typescript-eslint/no-use-before-define
|
|
3982
|
+
$online: isOnline(),
|
|
3983
|
+
$user: input.validatorContext?.user,
|
|
3984
|
+
$event: input.validatorContext?.event,
|
|
3985
|
+
$leafAdminStructureLocationIds: input.validatorContext?.leafAdminStructureLocationIds ?? [],
|
|
3986
|
+
user: input.systemVariables?.user,
|
|
3987
|
+
$window: input.systemVariables?.$window,
|
|
3988
|
+
locations: input.locations,
|
|
3989
|
+
adminLevelIds: input.adminLevelIds
|
|
3990
|
+
};
|
|
3991
|
+
}
|
|
3992
|
+
function runClientFunction(code, data, context) {
|
|
3993
|
+
return compileClientFunction(code)(data, context);
|
|
3994
|
+
}
|
|
3913
3995
|
ajv.addKeyword({
|
|
3914
3996
|
keyword: "daysFromDate",
|
|
3915
3997
|
type: "string",
|
|
@@ -3954,7 +4036,7 @@ ajv.addKeyword({
|
|
|
3954
4036
|
$data: true,
|
|
3955
4037
|
errors: true,
|
|
3956
4038
|
// @ts-ignore -- Force type. We will move this away from AJV next. Parsing the array will take seconds and is only called by core.
|
|
3957
|
-
validate(
|
|
4039
|
+
validate(_schema, data, _2, dataContext) {
|
|
3958
4040
|
const locationIdInput = data;
|
|
3959
4041
|
const locations = dataContext?.rootData.$leafAdminStructureLocationIds ?? [];
|
|
3960
4042
|
return locations.some((location) => location.id === locationIdInput);
|
|
@@ -3985,6 +4067,23 @@ function isAgeValue(value) {
|
|
|
3985
4067
|
function mergeWithBaseFormState(values, context) {
|
|
3986
4068
|
return { ...context.baseFormState, ...values };
|
|
3987
4069
|
}
|
|
4070
|
+
ajv.addKeyword({
|
|
4071
|
+
keyword: "customClientValidator",
|
|
4072
|
+
schemaType: "object",
|
|
4073
|
+
errors: true,
|
|
4074
|
+
// @ts-expect-error -- AJV's public types don't expose `rootData`. All
|
|
4075
|
+
// `validate()` callers build root data via `buildClientFunctionContext`,
|
|
4076
|
+
// so the cast holds.
|
|
4077
|
+
validate(schema, data, _2, dataContext) {
|
|
4078
|
+
return Boolean(
|
|
4079
|
+
runClientFunction(
|
|
4080
|
+
schema.code,
|
|
4081
|
+
data,
|
|
4082
|
+
dataContext?.rootData ?? buildClientFunctionContext({ form: {} })
|
|
4083
|
+
)
|
|
4084
|
+
);
|
|
4085
|
+
}
|
|
4086
|
+
});
|
|
3988
4087
|
function validate(schema, data) {
|
|
3989
4088
|
const validator = ajv.getSchema(schema.$id) || ajv.compile(schema);
|
|
3990
4089
|
if ("$form" in data) {
|
|
@@ -4021,17 +4120,14 @@ function isOnline() {
|
|
|
4021
4120
|
}
|
|
4022
4121
|
return true;
|
|
4023
4122
|
}
|
|
4024
|
-
function isConditionMet(conditional, values, context
|
|
4025
|
-
return validate(
|
|
4026
|
-
|
|
4027
|
-
|
|
4028
|
-
|
|
4029
|
-
|
|
4030
|
-
|
|
4031
|
-
|
|
4032
|
-
$status: eventIndex?.status,
|
|
4033
|
-
$event: context.event
|
|
4034
|
-
});
|
|
4123
|
+
function isConditionMet(conditional, values, context) {
|
|
4124
|
+
return validate(
|
|
4125
|
+
conditional,
|
|
4126
|
+
buildClientFunctionContext({
|
|
4127
|
+
form: mergeWithBaseFormState(values, context),
|
|
4128
|
+
validatorContext: context
|
|
4129
|
+
})
|
|
4130
|
+
);
|
|
4035
4131
|
}
|
|
4036
4132
|
function getConditionalActionsForField(field3, values) {
|
|
4037
4133
|
if (!field3.conditionals) {
|
|
@@ -4039,9 +4135,9 @@ function getConditionalActionsForField(field3, values) {
|
|
|
4039
4135
|
}
|
|
4040
4136
|
return field3.conditionals.filter((conditional) => validate(conditional.conditional, values)).map((conditional) => conditional.type);
|
|
4041
4137
|
}
|
|
4042
|
-
function areConditionsMet(conditions, values, context,
|
|
4138
|
+
function areConditionsMet(conditions, values, context, _event) {
|
|
4043
4139
|
return conditions.every(
|
|
4044
|
-
(condition) => isConditionMet(condition.conditional, values, context
|
|
4140
|
+
(condition) => isConditionMet(condition.conditional, values, context)
|
|
4045
4141
|
);
|
|
4046
4142
|
}
|
|
4047
4143
|
function isFieldConditionMet(field3, form, conditionalType, context) {
|
|
@@ -4051,14 +4147,13 @@ function isFieldConditionMet(field3, form, conditionalType, context) {
|
|
|
4051
4147
|
if (!hasRule) {
|
|
4052
4148
|
return true;
|
|
4053
4149
|
}
|
|
4054
|
-
const validConditionals = getConditionalActionsForField(
|
|
4055
|
-
|
|
4056
|
-
|
|
4057
|
-
|
|
4058
|
-
|
|
4059
|
-
|
|
4060
|
-
|
|
4061
|
-
});
|
|
4150
|
+
const validConditionals = getConditionalActionsForField(
|
|
4151
|
+
field3,
|
|
4152
|
+
buildClientFunctionContext({
|
|
4153
|
+
form: mergeWithBaseFormState(form, context),
|
|
4154
|
+
validatorContext: context
|
|
4155
|
+
})
|
|
4156
|
+
);
|
|
4062
4157
|
return validConditionals.includes(conditionalType);
|
|
4063
4158
|
}
|
|
4064
4159
|
function isFieldVisible(field3, form, context) {
|
|
@@ -4084,7 +4179,14 @@ function isActionConditionMet(actionConfig, event2, context, conditionalType) {
|
|
|
4084
4179
|
if (!rule) {
|
|
4085
4180
|
return true;
|
|
4086
4181
|
}
|
|
4087
|
-
return
|
|
4182
|
+
return validate(rule.conditional, {
|
|
4183
|
+
...buildClientFunctionContext({
|
|
4184
|
+
form: mergeWithBaseFormState(event2.declaration, context),
|
|
4185
|
+
validatorContext: context
|
|
4186
|
+
}),
|
|
4187
|
+
$flags: event2.flags,
|
|
4188
|
+
$status: event2.status
|
|
4189
|
+
});
|
|
4088
4190
|
}
|
|
4089
4191
|
function isActionEnabled(actionConfig, event2, context) {
|
|
4090
4192
|
return isActionConditionMet(
|
|
@@ -4243,19 +4345,10 @@ function runFieldValidations({
|
|
|
4243
4345
|
if (!isFieldVisible(field3.config, form, context)) {
|
|
4244
4346
|
return [];
|
|
4245
4347
|
}
|
|
4246
|
-
const conditionalParameters = {
|
|
4247
|
-
|
|
4248
|
-
|
|
4249
|
-
|
|
4250
|
-
* In real use cases, there can be hundreds of thousands of locations.
|
|
4251
|
-
* Make sure that the context contains only the locations that are needed for validation.
|
|
4252
|
-
* E.g. if the user is a leaf admin, only the leaf locations under their admin structure are needed.
|
|
4253
|
-
* Loading few megabytes of locations to memory just for validation is not efficient and will choke the application.
|
|
4254
|
-
*/
|
|
4255
|
-
$leafAdminStructureLocationIds: context.leafAdminStructureLocationIds ?? [],
|
|
4256
|
-
$online: isOnline(),
|
|
4257
|
-
$user: context.user
|
|
4258
|
-
};
|
|
4348
|
+
const conditionalParameters = buildClientFunctionContext({
|
|
4349
|
+
form: mergeWithBaseFormState(form, context),
|
|
4350
|
+
validatorContext: context
|
|
4351
|
+
});
|
|
4259
4352
|
if (isFieldGroupFieldType(field3)) {
|
|
4260
4353
|
const subfieldErrors = buildFormState(
|
|
4261
4354
|
field3.config.fields,
|
|
@@ -4394,13 +4487,13 @@ function getActionConfig({
|
|
|
4394
4487
|
actionType,
|
|
4395
4488
|
customActionType
|
|
4396
4489
|
}) {
|
|
4490
|
+
if (actionType === ActionType.NOTIFY) {
|
|
4491
|
+
return eventConfiguration.actions.find((a) => a.type === ActionType.NOTIFY) ?? eventConfiguration.actions.find((a) => a.type === ActionType.DECLARE);
|
|
4492
|
+
}
|
|
4397
4493
|
return eventConfiguration.actions.find((a) => {
|
|
4398
4494
|
if (a.type === ActionType.CUSTOM && customActionType) {
|
|
4399
4495
|
return a.customActionType === customActionType;
|
|
4400
4496
|
}
|
|
4401
|
-
if (actionType === ActionType.NOTIFY) {
|
|
4402
|
-
return a.type === ActionType.DECLARE;
|
|
4403
|
-
}
|
|
4404
4497
|
if (actionType === ActionType.APPROVE_CORRECTION || actionType === ActionType.REJECT_CORRECTION) {
|
|
4405
4498
|
return a.type === ActionType.REQUEST_CORRECTION;
|
|
4406
4499
|
}
|
|
@@ -4437,7 +4530,7 @@ var getActionAnnotationFields = (actionConfig) => {
|
|
|
4437
4530
|
if (actionConfig.type === ActionType.CUSTOM) {
|
|
4438
4531
|
return actionConfig.form;
|
|
4439
4532
|
}
|
|
4440
|
-
if ("review" in actionConfig) {
|
|
4533
|
+
if ("review" in actionConfig && actionConfig.review != null) {
|
|
4441
4534
|
return actionConfig.review.fields;
|
|
4442
4535
|
}
|
|
4443
4536
|
return [];
|
|
@@ -4739,19 +4832,32 @@ function getPendingAction(actions) {
|
|
|
4739
4832
|
}
|
|
4740
4833
|
return pendingActions[0];
|
|
4741
4834
|
}
|
|
4742
|
-
function getCompleteActionAnnotation(
|
|
4835
|
+
function getCompleteActionAnnotation(event2, action) {
|
|
4743
4836
|
if (action.originalActionId) {
|
|
4744
4837
|
const originalAction = event2.actions.find(
|
|
4745
4838
|
({ id }) => id === action.originalActionId
|
|
4746
4839
|
);
|
|
4747
4840
|
if (originalAction?.status === ActionStatus.Requested) {
|
|
4748
|
-
return deepMerge(
|
|
4749
|
-
deepMerge(annotation, originalAction.annotation ?? {}),
|
|
4750
|
-
action.annotation ?? {}
|
|
4751
|
-
);
|
|
4841
|
+
return deepMerge(originalAction.annotation ?? {}, action.annotation ?? {});
|
|
4752
4842
|
}
|
|
4753
4843
|
}
|
|
4754
|
-
return
|
|
4844
|
+
return action.annotation ?? {};
|
|
4845
|
+
}
|
|
4846
|
+
function getCompleteActionContent(event2, action) {
|
|
4847
|
+
const currentContent = "content" in action ? action.content : void 0;
|
|
4848
|
+
if (!action.originalActionId) {
|
|
4849
|
+
return currentContent;
|
|
4850
|
+
}
|
|
4851
|
+
const originalAction = event2.actions.find(
|
|
4852
|
+
({ id }) => id === action.originalActionId
|
|
4853
|
+
);
|
|
4854
|
+
if (originalAction && "content" in originalAction && originalAction.content) {
|
|
4855
|
+
return {
|
|
4856
|
+
...originalAction.content,
|
|
4857
|
+
...currentContent ?? {}
|
|
4858
|
+
};
|
|
4859
|
+
}
|
|
4860
|
+
return currentContent;
|
|
4755
4861
|
}
|
|
4756
4862
|
function getCompleteActionDeclaration(declaration, event2, action) {
|
|
4757
4863
|
if (action.originalActionId) {
|
|
@@ -4771,7 +4877,7 @@ function getAcceptedActions(event2) {
|
|
|
4771
4877
|
return event2.actions.filter(isAcceptedAction).map((action) => ({
|
|
4772
4878
|
...action,
|
|
4773
4879
|
declaration: getCompleteActionDeclaration({}, event2, action),
|
|
4774
|
-
annotation: getCompleteActionAnnotation(
|
|
4880
|
+
annotation: getCompleteActionAnnotation(event2, action)
|
|
4775
4881
|
}));
|
|
4776
4882
|
}
|
|
4777
4883
|
var EXCLUDED_ACTIONS = [
|
|
@@ -5409,7 +5515,54 @@ function createFieldConditionals(fieldId) {
|
|
|
5409
5515
|
}
|
|
5410
5516
|
},
|
|
5411
5517
|
required: [fieldId]
|
|
5412
|
-
})
|
|
5518
|
+
}),
|
|
5519
|
+
/**
|
|
5520
|
+
* Custom client-side validator. The provided function is serialised and executed
|
|
5521
|
+
* just-in-time on the client only. External references (e.g. lodash) are not
|
|
5522
|
+
* available inside the function body — all logic must be self-contained.
|
|
5523
|
+
*
|
|
5524
|
+
* @example
|
|
5525
|
+
* field('nid').customClientValidator((value) => {
|
|
5526
|
+
* // LUHN check — all logic must be inline
|
|
5527
|
+
* const digits = String(value).split('').map(Number)
|
|
5528
|
+
* // ...
|
|
5529
|
+
* return isValid
|
|
5530
|
+
* })
|
|
5531
|
+
*/
|
|
5532
|
+
customClientValidator(validationFn) {
|
|
5533
|
+
const code = validationFn.toString();
|
|
5534
|
+
return defineFormConditional({
|
|
5535
|
+
type: "object",
|
|
5536
|
+
properties: wrapToPath(
|
|
5537
|
+
{ [fieldId]: { customClientValidator: { code } } },
|
|
5538
|
+
this.$$subfield
|
|
5539
|
+
),
|
|
5540
|
+
required: [fieldId]
|
|
5541
|
+
});
|
|
5542
|
+
},
|
|
5543
|
+
/**
|
|
5544
|
+
* Custom client-side evaluation. Returns a {@link FieldReference} descriptor
|
|
5545
|
+
* that can be used as the `value` property or a DATA component entry.
|
|
5546
|
+
* The function receives the referenced field's value as the first argument and
|
|
5547
|
+
* the full form context as the second; its return value replaces the field reference.
|
|
5548
|
+
* The function is serialised and executed just-in-time on the client only.
|
|
5549
|
+
* External references (e.g. lodash) are not available inside the function body.
|
|
5550
|
+
*
|
|
5551
|
+
* For computing a default value without referencing a specific field, use
|
|
5552
|
+
* `evaluate(fn)` in the `defaultValue` property instead.
|
|
5553
|
+
*
|
|
5554
|
+
* @example
|
|
5555
|
+
* field('a').customClientEvaluation((aValue, ctx) =>
|
|
5556
|
+
* Number(aValue) + Number(ctx.$form.b)
|
|
5557
|
+
* )
|
|
5558
|
+
*/
|
|
5559
|
+
customClientEvaluation(computationFn) {
|
|
5560
|
+
return {
|
|
5561
|
+
$$code: computationFn.toString(),
|
|
5562
|
+
$$field: fieldId,
|
|
5563
|
+
$$subfield: this.$$subfield
|
|
5564
|
+
};
|
|
5565
|
+
}
|
|
5413
5566
|
};
|
|
5414
5567
|
}
|
|
5415
5568
|
|
|
@@ -6199,7 +6352,8 @@ var RejectCorrectionActionInput = BaseActionInput.extend(
|
|
|
6199
6352
|
var ApproveCorrectionActionInput = BaseActionInput.extend(
|
|
6200
6353
|
z38.object({
|
|
6201
6354
|
requestId: z38.string(),
|
|
6202
|
-
type: z38.literal(ActionType.APPROVE_CORRECTION).default(ActionType.APPROVE_CORRECTION)
|
|
6355
|
+
type: z38.literal(ActionType.APPROVE_CORRECTION).default(ActionType.APPROVE_CORRECTION),
|
|
6356
|
+
content: z38.object({ immediateCorrection: z38.boolean().optional() }).optional()
|
|
6203
6357
|
}).shape
|
|
6204
6358
|
);
|
|
6205
6359
|
var ReadActionInput = BaseActionInput.extend(
|
|
@@ -6348,6 +6502,8 @@ var updateActions = ActionTypes.extract([
|
|
|
6348
6502
|
ActionType.ARCHIVE,
|
|
6349
6503
|
ActionType.PRINT_CERTIFICATE,
|
|
6350
6504
|
ActionType.REQUEST_CORRECTION,
|
|
6505
|
+
ActionType.APPROVE_CORRECTION,
|
|
6506
|
+
ActionType.REJECT_CORRECTION,
|
|
6351
6507
|
ActionType.CUSTOM
|
|
6352
6508
|
]);
|
|
6353
6509
|
function getActionUpdateMetadata(actions) {
|
|
@@ -6362,7 +6518,7 @@ function getActionUpdateMetadata(actions) {
|
|
|
6362
6518
|
"createdAtLocation",
|
|
6363
6519
|
"createdByRole"
|
|
6364
6520
|
];
|
|
6365
|
-
return actions.filter(({ type }) => updateActions.safeParse(type).success).
|
|
6521
|
+
return actions.filter(({ type }) => updateActions.safeParse(type).success).reduce(
|
|
6366
6522
|
(_2, action) => {
|
|
6367
6523
|
if (action.originalActionId) {
|
|
6368
6524
|
const originalAction = actions.find(({ id }) => id === action.originalActionId) ?? action;
|
|
@@ -6389,9 +6545,6 @@ function getLegalStatuses(actions) {
|
|
|
6389
6545
|
// ../commons/src/events/state/flags.ts
|
|
6390
6546
|
var import_lodash3 = require("lodash");
|
|
6391
6547
|
var import_date_fns3 = require("date-fns");
|
|
6392
|
-
function isEditInProgress(actions) {
|
|
6393
|
-
return actions.at(-1)?.type === ActionType.EDIT;
|
|
6394
|
-
}
|
|
6395
6548
|
function findPendingCorrectionAction(writeActions2) {
|
|
6396
6549
|
let correctionRequestAction;
|
|
6397
6550
|
for (let i = writeActions2.length - 1; i >= 0; i--) {
|
|
@@ -6406,29 +6559,6 @@ function findPendingCorrectionAction(writeActions2) {
|
|
|
6406
6559
|
}
|
|
6407
6560
|
return correctionRequestAction;
|
|
6408
6561
|
}
|
|
6409
|
-
function isCorrectionRequested(actions) {
|
|
6410
|
-
return findPendingCorrectionAction(actions) !== void 0;
|
|
6411
|
-
}
|
|
6412
|
-
function isDeclarationIncomplete(actions) {
|
|
6413
|
-
return getStatusFromActions(actions) === EventStatus.enum.NOTIFIED;
|
|
6414
|
-
}
|
|
6415
|
-
function isRejected(actions) {
|
|
6416
|
-
const resettingActionTypes = [
|
|
6417
|
-
ActionType.NOTIFY,
|
|
6418
|
-
ActionType.DECLARE,
|
|
6419
|
-
ActionType.EDIT,
|
|
6420
|
-
ActionType.REGISTER
|
|
6421
|
-
];
|
|
6422
|
-
return actions.reduce((prev, { type }) => {
|
|
6423
|
-
if (type === ActionType.REJECT) {
|
|
6424
|
-
return true;
|
|
6425
|
-
}
|
|
6426
|
-
if (resettingActionTypes.includes(type)) {
|
|
6427
|
-
return false;
|
|
6428
|
-
}
|
|
6429
|
-
return prev;
|
|
6430
|
-
}, false);
|
|
6431
|
-
}
|
|
6432
6562
|
function isPotentialDuplicate(actions) {
|
|
6433
6563
|
return actions.reduce((prev, { type }) => {
|
|
6434
6564
|
if (type === ActionType.DUPLICATE_DETECTED) {
|
|
@@ -6456,6 +6586,88 @@ function isFlagConditionMet(conditional, form, action) {
|
|
|
6456
6586
|
}
|
|
6457
6587
|
});
|
|
6458
6588
|
}
|
|
6589
|
+
function actionConfigRemovesFlag(action, flagId, actionsUpToAndIncluding, event2, eventConfiguration) {
|
|
6590
|
+
if (!isActionConfigType(action.type)) {
|
|
6591
|
+
return false;
|
|
6592
|
+
}
|
|
6593
|
+
const actionConfig = getActionConfig({
|
|
6594
|
+
eventConfiguration,
|
|
6595
|
+
actionType: action.type,
|
|
6596
|
+
customActionType: "customActionType" in action ? action.customActionType : void 0
|
|
6597
|
+
});
|
|
6598
|
+
const removeOperations = (actionConfig?.flags ?? []).filter(
|
|
6599
|
+
({ id, operation }) => id === flagId && operation === "remove"
|
|
6600
|
+
);
|
|
6601
|
+
if (removeOperations.length === 0) {
|
|
6602
|
+
return false;
|
|
6603
|
+
}
|
|
6604
|
+
const eventUpToThisAction = { ...event2, actions: actionsUpToAndIncluding };
|
|
6605
|
+
const declaration = aggregateActionDeclarations(eventUpToThisAction);
|
|
6606
|
+
const annotation = aggregateActionAnnotations(eventUpToThisAction);
|
|
6607
|
+
const form = { ...declaration, ...annotation };
|
|
6608
|
+
return removeOperations.some(
|
|
6609
|
+
({ conditional }) => conditional ? isFlagConditionMet(conditional, form, action) : true
|
|
6610
|
+
);
|
|
6611
|
+
}
|
|
6612
|
+
var INHERENT_FLAG_RULES = [
|
|
6613
|
+
{
|
|
6614
|
+
flag: InherentFlags.CORRECTION_REQUESTED,
|
|
6615
|
+
setOn: [ActionType.REQUEST_CORRECTION],
|
|
6616
|
+
resetOn: [ActionType.APPROVE_CORRECTION, ActionType.REJECT_CORRECTION]
|
|
6617
|
+
},
|
|
6618
|
+
{
|
|
6619
|
+
// INCOMPLETE mirrors the NOTIFIED status: set by NOTIFY, cleared by any
|
|
6620
|
+
// other status-changing action (see getStatusFromActions).
|
|
6621
|
+
flag: InherentFlags.INCOMPLETE,
|
|
6622
|
+
setOn: [ActionType.NOTIFY],
|
|
6623
|
+
resetOn: [
|
|
6624
|
+
ActionType.CREATE,
|
|
6625
|
+
ActionType.DECLARE,
|
|
6626
|
+
ActionType.REGISTER,
|
|
6627
|
+
ActionType.ARCHIVE
|
|
6628
|
+
]
|
|
6629
|
+
},
|
|
6630
|
+
{
|
|
6631
|
+
flag: InherentFlags.REJECTED,
|
|
6632
|
+
setOn: [ActionType.REJECT],
|
|
6633
|
+
resetOn: [
|
|
6634
|
+
ActionType.NOTIFY,
|
|
6635
|
+
ActionType.DECLARE,
|
|
6636
|
+
ActionType.EDIT,
|
|
6637
|
+
ActionType.REGISTER
|
|
6638
|
+
]
|
|
6639
|
+
},
|
|
6640
|
+
{
|
|
6641
|
+
flag: InherentFlags.POTENTIAL_DUPLICATE,
|
|
6642
|
+
setOn: [ActionType.DUPLICATE_DETECTED],
|
|
6643
|
+
resetOn: [ActionType.MARK_AS_DUPLICATE, ActionType.MARK_AS_NOT_DUPLICATE]
|
|
6644
|
+
},
|
|
6645
|
+
{
|
|
6646
|
+
flag: InherentFlags.EDIT_IN_PROGRESS,
|
|
6647
|
+
setOn: [ActionType.EDIT],
|
|
6648
|
+
resetOnAnyOtherAction: true
|
|
6649
|
+
}
|
|
6650
|
+
];
|
|
6651
|
+
function resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration) {
|
|
6652
|
+
return acceptedActions.reduce((present, action, idx) => {
|
|
6653
|
+
if (rule.setOn.includes(action.type)) {
|
|
6654
|
+
return true;
|
|
6655
|
+
}
|
|
6656
|
+
if (rule.resetOnAnyOtherAction || (rule.resetOn ?? []).includes(action.type)) {
|
|
6657
|
+
return false;
|
|
6658
|
+
}
|
|
6659
|
+
if (actionConfigRemovesFlag(
|
|
6660
|
+
action,
|
|
6661
|
+
rule.flag,
|
|
6662
|
+
acceptedActions.slice(0, idx + 1),
|
|
6663
|
+
event2,
|
|
6664
|
+
eventConfiguration
|
|
6665
|
+
)) {
|
|
6666
|
+
return false;
|
|
6667
|
+
}
|
|
6668
|
+
return present;
|
|
6669
|
+
}, false);
|
|
6670
|
+
}
|
|
6459
6671
|
function resolveEventCustomFlags(event2, eventConfiguration) {
|
|
6460
6672
|
const actions = getAcceptedActions(event2).filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6461
6673
|
return actions.reduce((acc, action, idx) => {
|
|
@@ -6504,33 +6716,19 @@ function getActionStatusFlags(sortedActions) {
|
|
|
6504
6716
|
return flag2;
|
|
6505
6717
|
});
|
|
6506
6718
|
}
|
|
6507
|
-
function getInherentFlags(sortedActions) {
|
|
6719
|
+
function getInherentFlags(sortedActions, event2, eventConfiguration) {
|
|
6508
6720
|
const acceptedActions = sortedActions.filter(
|
|
6509
6721
|
({ status: status2 }) => status2 === ActionStatus.Accepted
|
|
6510
6722
|
);
|
|
6511
|
-
|
|
6512
|
-
|
|
6513
|
-
|
|
6514
|
-
}
|
|
6515
|
-
if (isDeclarationIncomplete(acceptedActions)) {
|
|
6516
|
-
inherentFlags.push(InherentFlags.INCOMPLETE);
|
|
6517
|
-
}
|
|
6518
|
-
if (isRejected(acceptedActions)) {
|
|
6519
|
-
inherentFlags.push(InherentFlags.REJECTED);
|
|
6520
|
-
}
|
|
6521
|
-
if (isPotentialDuplicate(acceptedActions)) {
|
|
6522
|
-
inherentFlags.push(InherentFlags.POTENTIAL_DUPLICATE);
|
|
6523
|
-
}
|
|
6524
|
-
if (isEditInProgress(acceptedActions)) {
|
|
6525
|
-
inherentFlags.push(InherentFlags.EDIT_IN_PROGRESS);
|
|
6526
|
-
}
|
|
6527
|
-
return inherentFlags;
|
|
6723
|
+
return INHERENT_FLAG_RULES.filter(
|
|
6724
|
+
(rule) => resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration)
|
|
6725
|
+
).map(({ flag: flag2 }) => flag2);
|
|
6528
6726
|
}
|
|
6529
6727
|
function getEventFlags(event2, config) {
|
|
6530
6728
|
const sortedActions = event2.actions.filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6531
6729
|
return [
|
|
6532
6730
|
...getActionStatusFlags(sortedActions),
|
|
6533
|
-
...getInherentFlags(sortedActions),
|
|
6731
|
+
...getInherentFlags(sortedActions, event2, config),
|
|
6534
6732
|
...resolveEventCustomFlags(event2, config)
|
|
6535
6733
|
];
|
|
6536
6734
|
}
|
|
@@ -6767,7 +6965,7 @@ function getActionAnnotation({
|
|
|
6767
6965
|
const action = (0, import_lodash4.findLast)(activeActions, (a) => a.type === actionType);
|
|
6768
6966
|
const actionWithCompleteAnnotation = action && {
|
|
6769
6967
|
...action,
|
|
6770
|
-
annotation: getCompleteActionAnnotation(
|
|
6968
|
+
annotation: getCompleteActionAnnotation(event2, action)
|
|
6771
6969
|
};
|
|
6772
6970
|
const matchingDraft = draft?.action.type === actionType ? draft : void 0;
|
|
6773
6971
|
const sortedActions = (0, import_lodash4.orderBy)(
|
|
@@ -6839,6 +7037,9 @@ function createFieldConfig(fieldId, options) {
|
|
|
6839
7037
|
}
|
|
6840
7038
|
|
|
6841
7039
|
// ../commons/src/events/field.ts
|
|
7040
|
+
function evaluate(computationFn) {
|
|
7041
|
+
return { $$code: computationFn.toString() };
|
|
7042
|
+
}
|
|
6842
7043
|
function field(fieldId, options = {}) {
|
|
6843
7044
|
return {
|
|
6844
7045
|
...createFieldConditionals(fieldId),
|
|
@@ -7532,6 +7733,11 @@ var TENNIS_CLUB_DECLARATION_REVIEW = {
|
|
|
7532
7733
|
id: "signature.upload.modal.title",
|
|
7533
7734
|
defaultMessage: "Draw signature",
|
|
7534
7735
|
description: "Title for the modal to draw signature"
|
|
7736
|
+
},
|
|
7737
|
+
// Zod applies the schema default at parse time, but this fixture bypasses
|
|
7738
|
+
// parsing — GeneratedInputField accesses configuration.maxFileSize directly.
|
|
7739
|
+
configuration: {
|
|
7740
|
+
maxFileSize: 5 * 1024 * 1024
|
|
7535
7741
|
}
|
|
7536
7742
|
}
|
|
7537
7743
|
]
|
|
@@ -8088,6 +8294,20 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8088
8294
|
},
|
|
8089
8295
|
review: TENNIS_CLUB_DECLARATION_REVIEW
|
|
8090
8296
|
},
|
|
8297
|
+
{
|
|
8298
|
+
type: ActionType.NOTIFY,
|
|
8299
|
+
label: {
|
|
8300
|
+
defaultMessage: "Notify health worker",
|
|
8301
|
+
description: "This is shown as the action name anywhere the user can trigger the action from",
|
|
8302
|
+
id: "event.tennis-club-membership.action.notify.label"
|
|
8303
|
+
},
|
|
8304
|
+
flags: [
|
|
8305
|
+
{
|
|
8306
|
+
id: "health-worker-notified",
|
|
8307
|
+
operation: "add"
|
|
8308
|
+
}
|
|
8309
|
+
]
|
|
8310
|
+
},
|
|
8091
8311
|
{
|
|
8092
8312
|
type: ActionType.REJECT,
|
|
8093
8313
|
label: {
|
|
@@ -8330,6 +8550,17 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8330
8550
|
}
|
|
8331
8551
|
}
|
|
8332
8552
|
],
|
|
8553
|
+
flags: [
|
|
8554
|
+
{
|
|
8555
|
+
id: "health-worker-notified",
|
|
8556
|
+
requiresAction: false,
|
|
8557
|
+
label: {
|
|
8558
|
+
id: "event.tennis-club-membership.flag.health-worker-notified.label",
|
|
8559
|
+
defaultMessage: "Health worker notified",
|
|
8560
|
+
description: "Label for the health-worker-notified flag"
|
|
8561
|
+
}
|
|
8562
|
+
}
|
|
8563
|
+
],
|
|
8333
8564
|
advancedSearch: [
|
|
8334
8565
|
{
|
|
8335
8566
|
title: {
|
|
@@ -10088,7 +10319,7 @@ function matchesJurisdictionFilter(locationIds, filter, user2) {
|
|
|
10088
10319
|
return locationIds.some((id) => id === user2.primaryOfficeId);
|
|
10089
10320
|
}
|
|
10090
10321
|
if (filter === JurisdictionFilter.enum.administrativeArea) {
|
|
10091
|
-
return user2.administrativeAreaId
|
|
10322
|
+
return !user2.administrativeAreaId || locationIds.some((id) => id === user2.administrativeAreaId);
|
|
10092
10323
|
}
|
|
10093
10324
|
return true;
|
|
10094
10325
|
}
|
|
@@ -10177,7 +10408,7 @@ function canAccessUserWithScope({
|
|
|
10177
10408
|
}
|
|
10178
10409
|
const hasAdministrativeAreaInHierarchy = userToAccess.administrativeHierarchy.some(
|
|
10179
10410
|
(id) => user2.administrativeAreaId === id
|
|
10180
|
-
) || user2.administrativeAreaId
|
|
10411
|
+
) || !user2.administrativeAreaId;
|
|
10181
10412
|
if (opts?.accessLevel === JurisdictionFilter.enum.administrativeArea && !hasAdministrativeAreaInHierarchy) {
|
|
10182
10413
|
return false;
|
|
10183
10414
|
}
|
|
@@ -10483,18 +10714,19 @@ var ACTION_FILTERS = {
|
|
|
10483
10714
|
function filterActionsByFlags(actions, flags) {
|
|
10484
10715
|
return actions.filter((action) => ACTION_FILTERS[action]?.(flags) ?? true);
|
|
10485
10716
|
}
|
|
10717
|
+
var REJECTED_ACTIONS = [
|
|
10718
|
+
ActionType.READ,
|
|
10719
|
+
ActionType.NOTIFY,
|
|
10720
|
+
ActionType.CUSTOM,
|
|
10721
|
+
ActionType.EDIT,
|
|
10722
|
+
ActionType.ARCHIVE
|
|
10723
|
+
];
|
|
10486
10724
|
function getAvailableActionsWithoutFlagFilters(status2, flags) {
|
|
10487
10725
|
if (flags.includes(InherentFlags.EDIT_IN_PROGRESS)) {
|
|
10488
10726
|
return [ActionType.NOTIFY, ActionType.DECLARE, ActionType.REGISTER];
|
|
10489
10727
|
}
|
|
10490
|
-
if (flags.includes(InherentFlags.REJECTED)) {
|
|
10491
|
-
return
|
|
10492
|
-
ActionType.READ,
|
|
10493
|
-
ActionType.NOTIFY,
|
|
10494
|
-
ActionType.CUSTOM,
|
|
10495
|
-
ActionType.EDIT,
|
|
10496
|
-
ActionType.ARCHIVE
|
|
10497
|
-
];
|
|
10728
|
+
if (flags.includes(InherentFlags.REJECTED) && status2 !== EventStatus.enum.ARCHIVED) {
|
|
10729
|
+
return REJECTED_ACTIONS;
|
|
10498
10730
|
}
|
|
10499
10731
|
return AVAILABLE_ACTIONS_BY_EVENT_STATUS[status2];
|
|
10500
10732
|
}
|