@opencrvs/toolkit 2.0.0-rc.0fb1707 → 2.0.0-rc.0fd6802
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/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 +378 -147
- package/dist/migrations/v2.0/checkout-upstream-files.d.ts +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.0fd6802.tgz +0 -0
- package/package.json +1 -1
- package/opencrvs-toolkit-2.0.0-rc.0fb1707.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(
|
|
@@ -2189,8 +2212,21 @@ var FieldReference = import_v43.default.object({
|
|
|
2189
2212
|
$$field: FieldId.describe("Id of the field to reference"),
|
|
2190
2213
|
$$subfield: import_v43.default.array(import_v43.default.string()).optional().default([]).describe(
|
|
2191
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."
|
|
2192
2228
|
)
|
|
2193
|
-
}).describe("
|
|
2229
|
+
}).describe("A context-only computation used as a field default value.");
|
|
2194
2230
|
var ValidationConfig = import_v43.default.object({
|
|
2195
2231
|
validator: Conditional.describe(
|
|
2196
2232
|
"Conditional expression that must hold for the field value to be considered valid."
|
|
@@ -2231,7 +2267,7 @@ var BaseField = import_v43.default.object({
|
|
|
2231
2267
|
"Indicates whether the field can be modified during record correction."
|
|
2232
2268
|
),
|
|
2233
2269
|
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."
|
|
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."
|
|
2235
2271
|
),
|
|
2236
2272
|
analytics: import_v43.default.boolean().default(false).optional().describe(
|
|
2237
2273
|
"Indicates whether the field is included in analytics. When enabled, its value becomes available in the analytics dashboard."
|
|
@@ -2245,7 +2281,7 @@ var Divider = BaseField.extend({
|
|
|
2245
2281
|
});
|
|
2246
2282
|
var TextField = BaseField.extend({
|
|
2247
2283
|
type: import_v43.default.literal(FieldType.TEXT),
|
|
2248
|
-
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField]).optional(),
|
|
2284
|
+
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField, ComputedDefaultValue]).optional(),
|
|
2249
2285
|
configuration: import_v43.default.object({
|
|
2250
2286
|
maxLength: import_v43.default.number().optional().describe("Maximum length of the text"),
|
|
2251
2287
|
type: import_v43.default.enum(["text", "password"]).optional(),
|
|
@@ -2258,10 +2294,11 @@ var TextField = BaseField.extend({
|
|
|
2258
2294
|
});
|
|
2259
2295
|
var NumberField = BaseField.extend({
|
|
2260
2296
|
type: import_v43.default.literal(FieldType.NUMBER),
|
|
2261
|
-
defaultValue: NumberFieldValue.optional(),
|
|
2297
|
+
defaultValue: NumberFieldValue.or(ComputedDefaultValue).optional(),
|
|
2262
2298
|
configuration: import_v43.default.object({
|
|
2263
2299
|
min: import_v43.default.number().optional().describe("Minimum value"),
|
|
2264
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"),
|
|
2265
2302
|
prefix: TranslationConfig.optional(),
|
|
2266
2303
|
postfix: TranslationConfig.optional()
|
|
2267
2304
|
}).optional()
|
|
@@ -2271,7 +2308,7 @@ var NumberField = BaseField.extend({
|
|
|
2271
2308
|
});
|
|
2272
2309
|
var TextAreaField = BaseField.extend({
|
|
2273
2310
|
type: import_v43.default.literal(FieldType.TEXTAREA),
|
|
2274
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2311
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2275
2312
|
configuration: import_v43.default.object({
|
|
2276
2313
|
maxLength: import_v43.default.number().optional().describe("Maximum length of the text"),
|
|
2277
2314
|
rows: import_v43.default.number().optional().describe("Number of visible text lines"),
|
|
@@ -2305,7 +2342,7 @@ var SignatureField = BaseField.extend({
|
|
|
2305
2342
|
signaturePromptLabel: TranslationConfig.describe(
|
|
2306
2343
|
"Title of the signature modal"
|
|
2307
2344
|
),
|
|
2308
|
-
defaultValue:
|
|
2345
|
+
defaultValue: SignatureFieldValue.or(ComputedDefaultValue).optional(),
|
|
2309
2346
|
configuration: import_v43.default.object({
|
|
2310
2347
|
maxFileSize: import_v43.default.number().describe("Maximum file size in bytes").default(DEFAULT_MAX_FILE_SIZE_BYTES),
|
|
2311
2348
|
acceptedFileTypes: MimeType.array().optional().describe("List of allowed file formats for the signature")
|
|
@@ -2321,14 +2358,14 @@ var EmailField = BaseField.extend({
|
|
|
2321
2358
|
configuration: import_v43.default.object({
|
|
2322
2359
|
maxLength: import_v43.default.number().optional().describe("Maximum length of the text")
|
|
2323
2360
|
}).default({ maxLength: 255 }).optional(),
|
|
2324
|
-
defaultValue: NonEmptyTextValue.optional()
|
|
2361
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional()
|
|
2325
2362
|
}).meta({
|
|
2326
2363
|
description: "An email input field",
|
|
2327
2364
|
id: "EmailField"
|
|
2328
2365
|
});
|
|
2329
2366
|
var DateField = BaseField.extend({
|
|
2330
2367
|
type: import_v43.default.literal(FieldType.DATE),
|
|
2331
|
-
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)"),
|
|
2332
2369
|
configuration: import_v43.default.object({
|
|
2333
2370
|
notice: TranslationConfig.describe(
|
|
2334
2371
|
"Text to display above the date input"
|
|
@@ -2340,7 +2377,7 @@ var DateField = BaseField.extend({
|
|
|
2340
2377
|
});
|
|
2341
2378
|
var AgeField = BaseField.extend({
|
|
2342
2379
|
type: import_v43.default.literal(FieldType.AGE),
|
|
2343
|
-
defaultValue: NumberFieldValue.optional(),
|
|
2380
|
+
defaultValue: NumberFieldValue.or(ComputedDefaultValue).optional(),
|
|
2344
2381
|
configuration: import_v43.default.object({
|
|
2345
2382
|
asOfDate: FieldReference,
|
|
2346
2383
|
prefix: TranslationConfig.optional(),
|
|
@@ -2352,7 +2389,7 @@ var AgeField = BaseField.extend({
|
|
|
2352
2389
|
});
|
|
2353
2390
|
var TimeField = BaseField.extend({
|
|
2354
2391
|
type: import_v43.default.literal(FieldType.TIME),
|
|
2355
|
-
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)"),
|
|
2356
2393
|
configuration: import_v43.default.object({
|
|
2357
2394
|
use12HourFormat: import_v43.default.boolean().optional().describe("Whether to use 12-hour format"),
|
|
2358
2395
|
notice: TranslationConfig.describe(
|
|
@@ -2365,7 +2402,7 @@ var TimeField = BaseField.extend({
|
|
|
2365
2402
|
});
|
|
2366
2403
|
var DateRangeField = BaseField.extend({
|
|
2367
2404
|
type: import_v43.default.literal(FieldType.DATE_RANGE),
|
|
2368
|
-
defaultValue: DateRangeFieldValue.optional(),
|
|
2405
|
+
defaultValue: DateRangeFieldValue.or(ComputedDefaultValue).optional(),
|
|
2369
2406
|
configuration: import_v43.default.object({
|
|
2370
2407
|
notice: TranslationConfig.describe(
|
|
2371
2408
|
"Text to display above the date input"
|
|
@@ -2444,7 +2481,7 @@ var PageHeader = BaseField.extend({
|
|
|
2444
2481
|
});
|
|
2445
2482
|
var File = BaseField.extend({
|
|
2446
2483
|
type: import_v43.default.literal(FieldType.FILE),
|
|
2447
|
-
defaultValue: FileFieldValue.optional(),
|
|
2484
|
+
defaultValue: FileFieldValue.or(ComputedDefaultValue).optional(),
|
|
2448
2485
|
configuration: import_v43.default.object({
|
|
2449
2486
|
maxFileSize: import_v43.default.number().describe("Maximum file size in bytes").default(DEFAULT_MAX_FILE_SIZE_BYTES),
|
|
2450
2487
|
acceptedFileTypes: MimeType.array().optional().describe("List of allowed file formats for the signature"),
|
|
@@ -2471,7 +2508,7 @@ var SelectOption = import_v43.default.object({
|
|
|
2471
2508
|
});
|
|
2472
2509
|
var NumberWithUnitField = BaseField.extend({
|
|
2473
2510
|
type: import_v43.default.literal(FieldType.NUMBER_WITH_UNIT),
|
|
2474
|
-
defaultValue: NumberWithUnitFieldValue.optional(),
|
|
2511
|
+
defaultValue: NumberWithUnitFieldValue.or(ComputedDefaultValue).optional(),
|
|
2475
2512
|
options: import_v43.default.array(SelectOption).describe("A list of options for the unit select"),
|
|
2476
2513
|
configuration: import_v43.default.object({
|
|
2477
2514
|
min: import_v43.default.number().optional().describe("Minimum value of the number field"),
|
|
@@ -2486,7 +2523,7 @@ var NumberWithUnitField = BaseField.extend({
|
|
|
2486
2523
|
});
|
|
2487
2524
|
var RadioGroup = BaseField.extend({
|
|
2488
2525
|
type: import_v43.default.literal(FieldType.RADIO_GROUP),
|
|
2489
|
-
defaultValue: TextValue.optional(),
|
|
2526
|
+
defaultValue: TextValue.or(ComputedDefaultValue).optional(),
|
|
2490
2527
|
options: import_v43.default.array(SelectOption).describe("A list of options"),
|
|
2491
2528
|
configuration: import_v43.default.object({
|
|
2492
2529
|
styles: import_v43.default.object({
|
|
@@ -2511,7 +2548,7 @@ var BulletList = BaseField.extend({
|
|
|
2511
2548
|
});
|
|
2512
2549
|
var Select = BaseField.extend({
|
|
2513
2550
|
type: import_v43.default.literal(FieldType.SELECT),
|
|
2514
|
-
defaultValue: TextValue.optional(),
|
|
2551
|
+
defaultValue: TextValue.or(ComputedDefaultValue).optional(),
|
|
2515
2552
|
options: import_v43.default.array(SelectOption).describe("A list of options"),
|
|
2516
2553
|
noOptionsMessage: TranslationConfig.optional().describe(
|
|
2517
2554
|
`
|
|
@@ -2533,7 +2570,7 @@ var SelectDateRangeOption = import_v43.default.object({
|
|
|
2533
2570
|
});
|
|
2534
2571
|
var SelectDateRangeField = BaseField.extend({
|
|
2535
2572
|
type: import_v43.default.literal(FieldType.SELECT_DATE_RANGE),
|
|
2536
|
-
defaultValue: SelectDateRangeValue.optional(),
|
|
2573
|
+
defaultValue: SelectDateRangeValue.or(ComputedDefaultValue).optional(),
|
|
2537
2574
|
options: import_v43.default.array(SelectDateRangeOption).describe("A list of options")
|
|
2538
2575
|
}).meta({
|
|
2539
2576
|
description: "A date range selection field",
|
|
@@ -2550,7 +2587,7 @@ var NameField = BaseField.extend({
|
|
|
2550
2587
|
firstname: SerializedUserField.or(NonEmptyTextValue).optional(),
|
|
2551
2588
|
middlename: SerializedUserField.or(NonEmptyTextValue).optional(),
|
|
2552
2589
|
surname: SerializedUserField.or(NonEmptyTextValue).optional()
|
|
2553
|
-
}).optional(),
|
|
2590
|
+
}).or(ComputedDefaultValue).optional(),
|
|
2554
2591
|
configuration: import_v43.default.object({
|
|
2555
2592
|
name: NameConfig.default({
|
|
2556
2593
|
firstname: { required: true },
|
|
@@ -2574,14 +2611,14 @@ var NameField = BaseField.extend({
|
|
|
2574
2611
|
id: "NameField"
|
|
2575
2612
|
});
|
|
2576
2613
|
var PhoneField = BaseField.extend({
|
|
2577
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2614
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2578
2615
|
type: import_v43.default.literal(FieldType.PHONE)
|
|
2579
2616
|
}).meta({
|
|
2580
2617
|
description: "A field for entering a phone number",
|
|
2581
2618
|
id: "PhoneField"
|
|
2582
2619
|
});
|
|
2583
2620
|
var IdField = BaseField.extend({
|
|
2584
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2621
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2585
2622
|
type: import_v43.default.literal(FieldType.ID)
|
|
2586
2623
|
}).meta({
|
|
2587
2624
|
description: "A field for entering an ID",
|
|
@@ -2589,14 +2626,14 @@ var IdField = BaseField.extend({
|
|
|
2589
2626
|
});
|
|
2590
2627
|
var Checkbox = BaseField.extend({
|
|
2591
2628
|
type: import_v43.default.literal(FieldType.CHECKBOX),
|
|
2592
|
-
defaultValue: CheckboxFieldValue.default(false)
|
|
2629
|
+
defaultValue: CheckboxFieldValue.or(ComputedDefaultValue).default(false)
|
|
2593
2630
|
}).meta({
|
|
2594
2631
|
description: "A boolean checkbox field",
|
|
2595
2632
|
id: "Checkbox"
|
|
2596
2633
|
});
|
|
2597
2634
|
var Country = BaseField.extend({
|
|
2598
2635
|
type: import_v43.default.literal(FieldType.COUNTRY),
|
|
2599
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2636
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2600
2637
|
optionOverrides: import_v43.default.array(SelectOption.omit({ label: true })).optional().describe(
|
|
2601
2638
|
"Conditionals for specific countries. Countries not listed are always shown and enabled."
|
|
2602
2639
|
)
|
|
@@ -2614,7 +2651,7 @@ var AdministrativeAreas = import_v43.default.enum([
|
|
|
2614
2651
|
]);
|
|
2615
2652
|
var AdministrativeAreaField = BaseField.extend({
|
|
2616
2653
|
type: import_v43.default.literal(FieldType.ADMINISTRATIVE_AREA),
|
|
2617
|
-
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField]).optional(),
|
|
2654
|
+
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField, ComputedDefaultValue]).optional(),
|
|
2618
2655
|
configuration: import_v43.default.object({
|
|
2619
2656
|
partOf: FieldReference.optional().describe("Parent location"),
|
|
2620
2657
|
type: AdministrativeAreas,
|
|
@@ -2626,7 +2663,7 @@ var AdministrativeAreaField = BaseField.extend({
|
|
|
2626
2663
|
});
|
|
2627
2664
|
var LocationInput = BaseField.extend({
|
|
2628
2665
|
type: import_v43.default.literal(FieldType.LOCATION),
|
|
2629
|
-
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField]).optional(),
|
|
2666
|
+
defaultValue: import_v43.default.union([NonEmptyTextValue, SerializedUserField, ComputedDefaultValue]).optional(),
|
|
2630
2667
|
configuration: import_v43.default.object({
|
|
2631
2668
|
locationTypes: import_v43.default.array(import_v43.default.string()).optional().describe("Types of the locations that are available for selection."),
|
|
2632
2669
|
allowedLocations: AllowedLocations
|
|
@@ -2638,7 +2675,7 @@ var LocationInput = BaseField.extend({
|
|
|
2638
2675
|
var FileUploadWithOptions = BaseField.extend({
|
|
2639
2676
|
type: import_v43.default.literal(FieldType.FILE_WITH_OPTIONS),
|
|
2640
2677
|
options: import_v43.default.array(SelectOption).describe("A list of options"),
|
|
2641
|
-
defaultValue: FileFieldWithOptionValue.optional(),
|
|
2678
|
+
defaultValue: FileFieldWithOptionValue.or(ComputedDefaultValue).optional(),
|
|
2642
2679
|
configuration: import_v43.default.object({
|
|
2643
2680
|
maxFileSize: import_v43.default.number().describe("Maximum file size in bytes").default(DEFAULT_MAX_FILE_SIZE_BYTES),
|
|
2644
2681
|
maxImageSize: import_v43.default.object({
|
|
@@ -2654,12 +2691,12 @@ var FileUploadWithOptions = BaseField.extend({
|
|
|
2654
2691
|
});
|
|
2655
2692
|
var Facility = BaseField.extend({
|
|
2656
2693
|
type: import_v43.default.literal(FieldType.FACILITY),
|
|
2657
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2694
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2658
2695
|
configuration: import_v43.default.object({ allowedLocations: AllowedLocations }).optional()
|
|
2659
2696
|
}).describe("Input field for a facility");
|
|
2660
2697
|
var Office = BaseField.extend({
|
|
2661
2698
|
type: import_v43.default.literal(FieldType.OFFICE),
|
|
2662
|
-
defaultValue: NonEmptyTextValue.optional(),
|
|
2699
|
+
defaultValue: NonEmptyTextValue.or(ComputedDefaultValue).optional(),
|
|
2663
2700
|
configuration: import_v43.default.object({ allowedLocations: AllowedLocations }).optional()
|
|
2664
2701
|
}).describe("Input field for an office");
|
|
2665
2702
|
var DefaultAddressFieldValue = DomesticAddressFieldValue.extend({
|
|
@@ -2695,7 +2732,7 @@ var Address = BaseField.extend({
|
|
|
2695
2732
|
).optional(),
|
|
2696
2733
|
allowedLocations: AllowedLocations
|
|
2697
2734
|
}).optional(),
|
|
2698
|
-
defaultValue: DefaultAddressFieldValue.optional()
|
|
2735
|
+
defaultValue: DefaultAddressFieldValue.or(ComputedDefaultValue).optional()
|
|
2699
2736
|
}).meta({
|
|
2700
2737
|
description: "Address input field \u2013 a combination of location and text fields",
|
|
2701
2738
|
id: "Address"
|
|
@@ -2742,7 +2779,7 @@ var ButtonConfiguration = import_v43.default.object({
|
|
|
2742
2779
|
});
|
|
2743
2780
|
var ButtonField = BaseField.extend({
|
|
2744
2781
|
type: import_v43.default.literal(FieldType.BUTTON),
|
|
2745
|
-
defaultValue: ButtonFieldValue.optional(),
|
|
2782
|
+
defaultValue: ButtonFieldValue.or(ComputedDefaultValue).optional(),
|
|
2746
2783
|
configuration: ButtonConfiguration
|
|
2747
2784
|
}).meta({
|
|
2748
2785
|
description: "A generic button that can be used to trigger an action",
|
|
@@ -2770,7 +2807,7 @@ var AlphaPrintButton = BaseField.extend({
|
|
|
2770
2807
|
});
|
|
2771
2808
|
var HttpField = BaseField.extend({
|
|
2772
2809
|
type: import_v43.default.literal(FieldType.HTTP),
|
|
2773
|
-
defaultValue: HttpFieldValue.optional(),
|
|
2810
|
+
defaultValue: HttpFieldValue.or(ComputedDefaultValue).optional(),
|
|
2774
2811
|
configuration: import_v43.default.object({
|
|
2775
2812
|
trigger: FieldReference.optional().describe(
|
|
2776
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."
|
|
@@ -2856,7 +2893,7 @@ var LinkButtonField = BaseField.extend({
|
|
|
2856
2893
|
});
|
|
2857
2894
|
var VerificationStatus = BaseField.extend({
|
|
2858
2895
|
type: import_v43.default.literal(FieldType.VERIFICATION_STATUS),
|
|
2859
|
-
defaultValue: VerificationStatusValue.optional(),
|
|
2896
|
+
defaultValue: VerificationStatusValue.or(ComputedDefaultValue).optional(),
|
|
2860
2897
|
configuration: import_v43.default.object({
|
|
2861
2898
|
status: TranslationConfig.describe("Text to display on the status pill."),
|
|
2862
2899
|
description: TranslationConfig.describe(
|
|
@@ -2878,7 +2915,7 @@ var QueryParamReaderField = BaseField.extend({
|
|
|
2878
2915
|
});
|
|
2879
2916
|
var QrReaderField = BaseField.extend({
|
|
2880
2917
|
type: import_v43.default.literal(FieldType.QR_READER),
|
|
2881
|
-
defaultValue: QrReaderFieldValue.optional(),
|
|
2918
|
+
defaultValue: QrReaderFieldValue.or(ComputedDefaultValue).optional(),
|
|
2882
2919
|
configuration: import_v43.default.object({
|
|
2883
2920
|
validator: import_v43.default.any().meta({
|
|
2884
2921
|
description: "JSON Schema to validate the scanned QR code data against before populating the form fields.",
|
|
@@ -2891,7 +2928,7 @@ var QrReaderField = BaseField.extend({
|
|
|
2891
2928
|
});
|
|
2892
2929
|
var IdReaderField = BaseField.extend({
|
|
2893
2930
|
type: import_v43.default.literal(FieldType.ID_READER),
|
|
2894
|
-
defaultValue: IdReaderFieldValue.optional(),
|
|
2931
|
+
defaultValue: IdReaderFieldValue.or(ComputedDefaultValue).optional(),
|
|
2895
2932
|
methods: import_v43.default.array(
|
|
2896
2933
|
import_v43.default.union([QrReaderField, LinkButtonField]).describe("Methods for reading an ID")
|
|
2897
2934
|
)
|
|
@@ -3185,6 +3222,11 @@ var ReadActionConfig = ActionConfigBase.extend(
|
|
|
3185
3222
|
conditionals: z24.never().optional().describe("Read-action can not be disabled or hidden with conditionals.")
|
|
3186
3223
|
}).shape
|
|
3187
3224
|
);
|
|
3225
|
+
var NotifyConfig = ActionConfigBase.extend(
|
|
3226
|
+
z24.object({
|
|
3227
|
+
type: z24.literal(ActionType.NOTIFY)
|
|
3228
|
+
}).shape
|
|
3229
|
+
);
|
|
3188
3230
|
var DeclareConfig = DeclarationActionBase.extend(
|
|
3189
3231
|
z24.object({
|
|
3190
3232
|
type: z24.literal(ActionType.DECLARE),
|
|
@@ -3269,9 +3311,13 @@ var ActionConfig = z24.discriminatedUnion("type", [
|
|
|
3269
3311
|
id: "ReadActionConfig",
|
|
3270
3312
|
description: "Configuration for the read action \u2014 defines the record-tab content displayed on the event overview page."
|
|
3271
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
|
+
}),
|
|
3272
3318
|
DeclareConfig.meta({
|
|
3273
3319
|
id: "DeclareActionConfig",
|
|
3274
|
-
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."
|
|
3275
3321
|
}),
|
|
3276
3322
|
RejectConfig.meta({
|
|
3277
3323
|
id: "RejectActionConfig",
|
|
@@ -3450,6 +3496,9 @@ var BaseField3 = z28.object({
|
|
|
3450
3496
|
),
|
|
3451
3497
|
validations: z28.array(ValidationConfig).optional().describe(
|
|
3452
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.`
|
|
3453
3502
|
)
|
|
3454
3503
|
});
|
|
3455
3504
|
var SearchQueryParams = z28.object({
|
|
@@ -3524,9 +3573,11 @@ var z30 = __toESM(require("zod/v4"));
|
|
|
3524
3573
|
var z29 = __toESM(require("zod/v4"));
|
|
3525
3574
|
function getDynamicNameValue(field3) {
|
|
3526
3575
|
const nameConfiguration = field3.configuration?.name;
|
|
3576
|
+
const firstnameRequired = nameConfiguration?.firstname?.required ?? field3.required;
|
|
3577
|
+
const surnameRequired = nameConfiguration?.surname?.required ?? field3.required;
|
|
3527
3578
|
return z29.object({
|
|
3528
|
-
firstname:
|
|
3529
|
-
surname:
|
|
3579
|
+
firstname: firstnameRequired ? NonEmptyTextValue : TextValue,
|
|
3580
|
+
surname: surnameRequired ? NonEmptyTextValue : TextValue,
|
|
3530
3581
|
middlename: nameConfiguration?.middlename?.required ? NonEmptyTextValue : TextValue.optional()
|
|
3531
3582
|
});
|
|
3532
3583
|
}
|
|
@@ -3873,7 +3924,7 @@ var isHiddenFieldType = (field3) => {
|
|
|
3873
3924
|
return field3.config.type === FieldType.ALPHA_HIDDEN;
|
|
3874
3925
|
};
|
|
3875
3926
|
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.
|
|
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;
|
|
3877
3928
|
};
|
|
3878
3929
|
|
|
3879
3930
|
// ../commons/src/conditionals/validate.ts
|
|
@@ -3909,7 +3960,37 @@ function resolveDataPath(rootData, dataPath, instancePath) {
|
|
|
3909
3960
|
}
|
|
3910
3961
|
return current;
|
|
3911
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
|
+
}
|
|
3912
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
|
+
}
|
|
3913
3994
|
ajv.addKeyword({
|
|
3914
3995
|
keyword: "daysFromDate",
|
|
3915
3996
|
type: "string",
|
|
@@ -3954,7 +4035,7 @@ ajv.addKeyword({
|
|
|
3954
4035
|
$data: true,
|
|
3955
4036
|
errors: true,
|
|
3956
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.
|
|
3957
|
-
validate(
|
|
4038
|
+
validate(_schema, data, _2, dataContext) {
|
|
3958
4039
|
const locationIdInput = data;
|
|
3959
4040
|
const locations = dataContext?.rootData.$leafAdminStructureLocationIds ?? [];
|
|
3960
4041
|
return locations.some((location) => location.id === locationIdInput);
|
|
@@ -3985,6 +4066,23 @@ function isAgeValue(value) {
|
|
|
3985
4066
|
function mergeWithBaseFormState(values, context) {
|
|
3986
4067
|
return { ...context.baseFormState, ...values };
|
|
3987
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
|
+
});
|
|
3988
4086
|
function validate(schema, data) {
|
|
3989
4087
|
const validator = ajv.getSchema(schema.$id) || ajv.compile(schema);
|
|
3990
4088
|
if ("$form" in data) {
|
|
@@ -4021,17 +4119,14 @@ function isOnline() {
|
|
|
4021
4119
|
}
|
|
4022
4120
|
return true;
|
|
4023
4121
|
}
|
|
4024
|
-
function isConditionMet(conditional, values, context
|
|
4025
|
-
return validate(
|
|
4026
|
-
|
|
4027
|
-
|
|
4028
|
-
|
|
4029
|
-
|
|
4030
|
-
|
|
4031
|
-
|
|
4032
|
-
$status: eventIndex?.status,
|
|
4033
|
-
$event: context.event
|
|
4034
|
-
});
|
|
4122
|
+
function isConditionMet(conditional, values, context) {
|
|
4123
|
+
return validate(
|
|
4124
|
+
conditional,
|
|
4125
|
+
buildClientFunctionContext({
|
|
4126
|
+
form: mergeWithBaseFormState(values, context),
|
|
4127
|
+
validatorContext: context
|
|
4128
|
+
})
|
|
4129
|
+
);
|
|
4035
4130
|
}
|
|
4036
4131
|
function getConditionalActionsForField(field3, values) {
|
|
4037
4132
|
if (!field3.conditionals) {
|
|
@@ -4039,9 +4134,9 @@ function getConditionalActionsForField(field3, values) {
|
|
|
4039
4134
|
}
|
|
4040
4135
|
return field3.conditionals.filter((conditional) => validate(conditional.conditional, values)).map((conditional) => conditional.type);
|
|
4041
4136
|
}
|
|
4042
|
-
function areConditionsMet(conditions, values, context,
|
|
4137
|
+
function areConditionsMet(conditions, values, context, _event) {
|
|
4043
4138
|
return conditions.every(
|
|
4044
|
-
(condition) => isConditionMet(condition.conditional, values, context
|
|
4139
|
+
(condition) => isConditionMet(condition.conditional, values, context)
|
|
4045
4140
|
);
|
|
4046
4141
|
}
|
|
4047
4142
|
function isFieldConditionMet(field3, form, conditionalType, context) {
|
|
@@ -4051,14 +4146,13 @@ function isFieldConditionMet(field3, form, conditionalType, context) {
|
|
|
4051
4146
|
if (!hasRule) {
|
|
4052
4147
|
return true;
|
|
4053
4148
|
}
|
|
4054
|
-
const validConditionals = getConditionalActionsForField(
|
|
4055
|
-
|
|
4056
|
-
|
|
4057
|
-
|
|
4058
|
-
|
|
4059
|
-
|
|
4060
|
-
|
|
4061
|
-
});
|
|
4149
|
+
const validConditionals = getConditionalActionsForField(
|
|
4150
|
+
field3,
|
|
4151
|
+
buildClientFunctionContext({
|
|
4152
|
+
form: mergeWithBaseFormState(form, context),
|
|
4153
|
+
validatorContext: context
|
|
4154
|
+
})
|
|
4155
|
+
);
|
|
4062
4156
|
return validConditionals.includes(conditionalType);
|
|
4063
4157
|
}
|
|
4064
4158
|
function isFieldVisible(field3, form, context) {
|
|
@@ -4084,7 +4178,14 @@ function isActionConditionMet(actionConfig, event2, context, conditionalType) {
|
|
|
4084
4178
|
if (!rule) {
|
|
4085
4179
|
return true;
|
|
4086
4180
|
}
|
|
4087
|
-
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
|
+
});
|
|
4088
4189
|
}
|
|
4089
4190
|
function isActionEnabled(actionConfig, event2, context) {
|
|
4090
4191
|
return isActionConditionMet(
|
|
@@ -4243,19 +4344,10 @@ function runFieldValidations({
|
|
|
4243
4344
|
if (!isFieldVisible(field3.config, form, context)) {
|
|
4244
4345
|
return [];
|
|
4245
4346
|
}
|
|
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
|
-
};
|
|
4347
|
+
const conditionalParameters = buildClientFunctionContext({
|
|
4348
|
+
form: mergeWithBaseFormState(form, context),
|
|
4349
|
+
validatorContext: context
|
|
4350
|
+
});
|
|
4259
4351
|
if (isFieldGroupFieldType(field3)) {
|
|
4260
4352
|
const subfieldErrors = buildFormState(
|
|
4261
4353
|
field3.config.fields,
|
|
@@ -4394,13 +4486,13 @@ function getActionConfig({
|
|
|
4394
4486
|
actionType,
|
|
4395
4487
|
customActionType
|
|
4396
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
|
+
}
|
|
4397
4492
|
return eventConfiguration.actions.find((a) => {
|
|
4398
4493
|
if (a.type === ActionType.CUSTOM && customActionType) {
|
|
4399
4494
|
return a.customActionType === customActionType;
|
|
4400
4495
|
}
|
|
4401
|
-
if (actionType === ActionType.NOTIFY) {
|
|
4402
|
-
return a.type === ActionType.DECLARE;
|
|
4403
|
-
}
|
|
4404
4496
|
if (actionType === ActionType.APPROVE_CORRECTION || actionType === ActionType.REJECT_CORRECTION) {
|
|
4405
4497
|
return a.type === ActionType.REQUEST_CORRECTION;
|
|
4406
4498
|
}
|
|
@@ -4437,7 +4529,7 @@ var getActionAnnotationFields = (actionConfig) => {
|
|
|
4437
4529
|
if (actionConfig.type === ActionType.CUSTOM) {
|
|
4438
4530
|
return actionConfig.form;
|
|
4439
4531
|
}
|
|
4440
|
-
if ("review" in actionConfig) {
|
|
4532
|
+
if ("review" in actionConfig && actionConfig.review != null) {
|
|
4441
4533
|
return actionConfig.review.fields;
|
|
4442
4534
|
}
|
|
4443
4535
|
return [];
|
|
@@ -4739,19 +4831,32 @@ function getPendingAction(actions) {
|
|
|
4739
4831
|
}
|
|
4740
4832
|
return pendingActions[0];
|
|
4741
4833
|
}
|
|
4742
|
-
function getCompleteActionAnnotation(
|
|
4834
|
+
function getCompleteActionAnnotation(event2, action) {
|
|
4743
4835
|
if (action.originalActionId) {
|
|
4744
4836
|
const originalAction = event2.actions.find(
|
|
4745
4837
|
({ id }) => id === action.originalActionId
|
|
4746
4838
|
);
|
|
4747
4839
|
if (originalAction?.status === ActionStatus.Requested) {
|
|
4748
|
-
return deepMerge(
|
|
4749
|
-
deepMerge(annotation, originalAction.annotation ?? {}),
|
|
4750
|
-
action.annotation ?? {}
|
|
4751
|
-
);
|
|
4840
|
+
return deepMerge(originalAction.annotation ?? {}, action.annotation ?? {});
|
|
4752
4841
|
}
|
|
4753
4842
|
}
|
|
4754
|
-
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;
|
|
4755
4860
|
}
|
|
4756
4861
|
function getCompleteActionDeclaration(declaration, event2, action) {
|
|
4757
4862
|
if (action.originalActionId) {
|
|
@@ -4771,7 +4876,7 @@ function getAcceptedActions(event2) {
|
|
|
4771
4876
|
return event2.actions.filter(isAcceptedAction).map((action) => ({
|
|
4772
4877
|
...action,
|
|
4773
4878
|
declaration: getCompleteActionDeclaration({}, event2, action),
|
|
4774
|
-
annotation: getCompleteActionAnnotation(
|
|
4879
|
+
annotation: getCompleteActionAnnotation(event2, action)
|
|
4775
4880
|
}));
|
|
4776
4881
|
}
|
|
4777
4882
|
var EXCLUDED_ACTIONS = [
|
|
@@ -5409,7 +5514,54 @@ function createFieldConditionals(fieldId) {
|
|
|
5409
5514
|
}
|
|
5410
5515
|
},
|
|
5411
5516
|
required: [fieldId]
|
|
5412
|
-
})
|
|
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
|
+
}
|
|
5413
5565
|
};
|
|
5414
5566
|
}
|
|
5415
5567
|
|
|
@@ -6199,7 +6351,8 @@ var RejectCorrectionActionInput = BaseActionInput.extend(
|
|
|
6199
6351
|
var ApproveCorrectionActionInput = BaseActionInput.extend(
|
|
6200
6352
|
z38.object({
|
|
6201
6353
|
requestId: z38.string(),
|
|
6202
|
-
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()
|
|
6203
6356
|
}).shape
|
|
6204
6357
|
);
|
|
6205
6358
|
var ReadActionInput = BaseActionInput.extend(
|
|
@@ -6348,6 +6501,8 @@ var updateActions = ActionTypes.extract([
|
|
|
6348
6501
|
ActionType.ARCHIVE,
|
|
6349
6502
|
ActionType.PRINT_CERTIFICATE,
|
|
6350
6503
|
ActionType.REQUEST_CORRECTION,
|
|
6504
|
+
ActionType.APPROVE_CORRECTION,
|
|
6505
|
+
ActionType.REJECT_CORRECTION,
|
|
6351
6506
|
ActionType.CUSTOM
|
|
6352
6507
|
]);
|
|
6353
6508
|
function getActionUpdateMetadata(actions) {
|
|
@@ -6362,7 +6517,7 @@ function getActionUpdateMetadata(actions) {
|
|
|
6362
6517
|
"createdAtLocation",
|
|
6363
6518
|
"createdByRole"
|
|
6364
6519
|
];
|
|
6365
|
-
return actions.filter(({ type }) => updateActions.safeParse(type).success).
|
|
6520
|
+
return actions.filter(({ type }) => updateActions.safeParse(type).success).reduce(
|
|
6366
6521
|
(_2, action) => {
|
|
6367
6522
|
if (action.originalActionId) {
|
|
6368
6523
|
const originalAction = actions.find(({ id }) => id === action.originalActionId) ?? action;
|
|
@@ -6389,9 +6544,6 @@ function getLegalStatuses(actions) {
|
|
|
6389
6544
|
// ../commons/src/events/state/flags.ts
|
|
6390
6545
|
var import_lodash3 = require("lodash");
|
|
6391
6546
|
var import_date_fns3 = require("date-fns");
|
|
6392
|
-
function isEditInProgress(actions) {
|
|
6393
|
-
return actions.at(-1)?.type === ActionType.EDIT;
|
|
6394
|
-
}
|
|
6395
6547
|
function findPendingCorrectionAction(writeActions2) {
|
|
6396
6548
|
let correctionRequestAction;
|
|
6397
6549
|
for (let i = writeActions2.length - 1; i >= 0; i--) {
|
|
@@ -6406,29 +6558,6 @@ function findPendingCorrectionAction(writeActions2) {
|
|
|
6406
6558
|
}
|
|
6407
6559
|
return correctionRequestAction;
|
|
6408
6560
|
}
|
|
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
6561
|
function isPotentialDuplicate(actions) {
|
|
6433
6562
|
return actions.reduce((prev, { type }) => {
|
|
6434
6563
|
if (type === ActionType.DUPLICATE_DETECTED) {
|
|
@@ -6456,6 +6585,88 @@ function isFlagConditionMet(conditional, form, action) {
|
|
|
6456
6585
|
}
|
|
6457
6586
|
});
|
|
6458
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
|
+
}
|
|
6459
6670
|
function resolveEventCustomFlags(event2, eventConfiguration) {
|
|
6460
6671
|
const actions = getAcceptedActions(event2).filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6461
6672
|
return actions.reduce((acc, action, idx) => {
|
|
@@ -6504,33 +6715,19 @@ function getActionStatusFlags(sortedActions) {
|
|
|
6504
6715
|
return flag2;
|
|
6505
6716
|
});
|
|
6506
6717
|
}
|
|
6507
|
-
function getInherentFlags(sortedActions) {
|
|
6718
|
+
function getInherentFlags(sortedActions, event2, eventConfiguration) {
|
|
6508
6719
|
const acceptedActions = sortedActions.filter(
|
|
6509
6720
|
({ status: status2 }) => status2 === ActionStatus.Accepted
|
|
6510
6721
|
);
|
|
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;
|
|
6722
|
+
return INHERENT_FLAG_RULES.filter(
|
|
6723
|
+
(rule) => resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration)
|
|
6724
|
+
).map(({ flag: flag2 }) => flag2);
|
|
6528
6725
|
}
|
|
6529
6726
|
function getEventFlags(event2, config) {
|
|
6530
6727
|
const sortedActions = event2.actions.filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6531
6728
|
return [
|
|
6532
6729
|
...getActionStatusFlags(sortedActions),
|
|
6533
|
-
...getInherentFlags(sortedActions),
|
|
6730
|
+
...getInherentFlags(sortedActions, event2, config),
|
|
6534
6731
|
...resolveEventCustomFlags(event2, config)
|
|
6535
6732
|
];
|
|
6536
6733
|
}
|
|
@@ -6767,7 +6964,7 @@ function getActionAnnotation({
|
|
|
6767
6964
|
const action = (0, import_lodash4.findLast)(activeActions, (a) => a.type === actionType);
|
|
6768
6965
|
const actionWithCompleteAnnotation = action && {
|
|
6769
6966
|
...action,
|
|
6770
|
-
annotation: getCompleteActionAnnotation(
|
|
6967
|
+
annotation: getCompleteActionAnnotation(event2, action)
|
|
6771
6968
|
};
|
|
6772
6969
|
const matchingDraft = draft?.action.type === actionType ? draft : void 0;
|
|
6773
6970
|
const sortedActions = (0, import_lodash4.orderBy)(
|
|
@@ -6839,6 +7036,9 @@ function createFieldConfig(fieldId, options) {
|
|
|
6839
7036
|
}
|
|
6840
7037
|
|
|
6841
7038
|
// ../commons/src/events/field.ts
|
|
7039
|
+
function evaluate(computationFn) {
|
|
7040
|
+
return { $$code: computationFn.toString() };
|
|
7041
|
+
}
|
|
6842
7042
|
function field(fieldId, options = {}) {
|
|
6843
7043
|
return {
|
|
6844
7044
|
...createFieldConditionals(fieldId),
|
|
@@ -7532,6 +7732,11 @@ var TENNIS_CLUB_DECLARATION_REVIEW = {
|
|
|
7532
7732
|
id: "signature.upload.modal.title",
|
|
7533
7733
|
defaultMessage: "Draw signature",
|
|
7534
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
|
|
7535
7740
|
}
|
|
7536
7741
|
}
|
|
7537
7742
|
]
|
|
@@ -8088,6 +8293,20 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8088
8293
|
},
|
|
8089
8294
|
review: TENNIS_CLUB_DECLARATION_REVIEW
|
|
8090
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
|
+
},
|
|
8091
8310
|
{
|
|
8092
8311
|
type: ActionType.REJECT,
|
|
8093
8312
|
label: {
|
|
@@ -8330,6 +8549,17 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8330
8549
|
}
|
|
8331
8550
|
}
|
|
8332
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
|
+
],
|
|
8333
8563
|
advancedSearch: [
|
|
8334
8564
|
{
|
|
8335
8565
|
title: {
|
|
@@ -10088,7 +10318,7 @@ function matchesJurisdictionFilter(locationIds, filter, user2) {
|
|
|
10088
10318
|
return locationIds.some((id) => id === user2.primaryOfficeId);
|
|
10089
10319
|
}
|
|
10090
10320
|
if (filter === JurisdictionFilter.enum.administrativeArea) {
|
|
10091
|
-
return user2.administrativeAreaId
|
|
10321
|
+
return !user2.administrativeAreaId || locationIds.some((id) => id === user2.administrativeAreaId);
|
|
10092
10322
|
}
|
|
10093
10323
|
return true;
|
|
10094
10324
|
}
|
|
@@ -10177,7 +10407,7 @@ function canAccessUserWithScope({
|
|
|
10177
10407
|
}
|
|
10178
10408
|
const hasAdministrativeAreaInHierarchy = userToAccess.administrativeHierarchy.some(
|
|
10179
10409
|
(id) => user2.administrativeAreaId === id
|
|
10180
|
-
) || user2.administrativeAreaId
|
|
10410
|
+
) || !user2.administrativeAreaId;
|
|
10181
10411
|
if (opts?.accessLevel === JurisdictionFilter.enum.administrativeArea && !hasAdministrativeAreaInHierarchy) {
|
|
10182
10412
|
return false;
|
|
10183
10413
|
}
|
|
@@ -10483,18 +10713,19 @@ var ACTION_FILTERS = {
|
|
|
10483
10713
|
function filterActionsByFlags(actions, flags) {
|
|
10484
10714
|
return actions.filter((action) => ACTION_FILTERS[action]?.(flags) ?? true);
|
|
10485
10715
|
}
|
|
10716
|
+
var REJECTED_ACTIONS = [
|
|
10717
|
+
ActionType.READ,
|
|
10718
|
+
ActionType.NOTIFY,
|
|
10719
|
+
ActionType.CUSTOM,
|
|
10720
|
+
ActionType.EDIT,
|
|
10721
|
+
ActionType.ARCHIVE
|
|
10722
|
+
];
|
|
10486
10723
|
function getAvailableActionsWithoutFlagFilters(status2, flags) {
|
|
10487
10724
|
if (flags.includes(InherentFlags.EDIT_IN_PROGRESS)) {
|
|
10488
10725
|
return [ActionType.NOTIFY, ActionType.DECLARE, ActionType.REGISTER];
|
|
10489
10726
|
}
|
|
10490
|
-
if (flags.includes(InherentFlags.REJECTED)) {
|
|
10491
|
-
return
|
|
10492
|
-
ActionType.READ,
|
|
10493
|
-
ActionType.NOTIFY,
|
|
10494
|
-
ActionType.CUSTOM,
|
|
10495
|
-
ActionType.EDIT,
|
|
10496
|
-
ActionType.ARCHIVE
|
|
10497
|
-
];
|
|
10727
|
+
if (flags.includes(InherentFlags.REJECTED) && status2 !== EventStatus.enum.ARCHIVED) {
|
|
10728
|
+
return REJECTED_ACTIONS;
|
|
10498
10729
|
}
|
|
10499
10730
|
return AVAILABLE_ACTIONS_BY_EVENT_STATUS[status2];
|
|
10500
10731
|
}
|