@opencrvs/toolkit 2.0.0-rc.1232518 → 2.0.0-rc.1239696
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/README.md +15 -0
- package/build.sh +5 -4
- package/dist/application-config/index.js +23 -6
- package/dist/cli.js +3186 -4921
- package/dist/commons/api/router.d.ts +19 -4
- package/dist/commons/conditionals/conditionals.d.ts +3 -3
- package/dist/commons/events/ActionConfig.d.ts +211 -2
- package/dist/commons/events/AdvancedSearchConfig.d.ts +12 -0
- package/dist/commons/events/CountryConfigQueryInput.d.ts +42 -0
- package/dist/commons/events/EventConfig.d.ts +2 -0
- package/dist/commons/events/EventIndex.d.ts +25 -0
- package/dist/commons/events/EventMetadata.d.ts +26 -0
- package/dist/commons/events/FieldConfig.d.ts +11 -0
- package/dist/commons/events/FieldType.d.ts +1 -0
- package/dist/commons/events/FieldTypeMapping.d.ts +1 -1
- package/dist/commons/events/WorkqueueConfig.d.ts +39 -0
- package/dist/commons/events/locations.d.ts +1 -0
- package/dist/commons/events/state/index.d.ts +8 -0
- package/dist/commons/events/state/utils.d.ts +9 -0
- package/dist/commons/events/utils.d.ts +8 -0
- package/dist/conditionals/index.js +10 -5
- package/dist/environment/custom-types.d.ts +33 -0
- package/dist/environment/custom-types.d.ts.map +1 -0
- package/dist/environment/custom-types.js +12 -0
- package/dist/environment/derived-variables.d.ts +134 -0
- package/dist/environment/derived-variables.d.ts.map +1 -0
- package/dist/environment/derived-variables.js +169 -0
- package/dist/environment/editor-questions.d.ts +4 -0
- package/dist/environment/editor-questions.d.ts.map +1 -0
- package/dist/environment/editor-questions.js +67 -0
- package/dist/environment/git.d.ts +5 -0
- package/dist/environment/git.d.ts.map +1 -0
- package/dist/environment/git.js +38 -0
- package/dist/environment/github.d.ts +26 -0
- package/dist/environment/github.d.ts.map +1 -0
- package/dist/environment/github.js +247 -0
- package/dist/environment/index.d.ts +5 -0
- package/dist/environment/index.d.ts.map +1 -0
- package/dist/environment/index.js +71 -0
- package/dist/environment/logger.d.ts +15 -0
- package/dist/environment/logger.d.ts.map +1 -0
- package/dist/environment/logger.js +25 -0
- package/dist/environment/manage-users.d.ts +11 -0
- package/dist/environment/manage-users.d.ts.map +1 -0
- package/dist/environment/manage-users.js +497 -0
- package/dist/environment/questions-helper.d.ts +15 -0
- package/dist/environment/questions-helper.d.ts.map +1 -0
- package/dist/environment/questions-helper.js +70 -0
- package/dist/environment/questions.d.ts +199 -0
- package/dist/environment/questions.d.ts.map +1 -0
- package/dist/environment/questions.js +412 -0
- package/dist/environment/setup-environment.d.ts +2 -0
- package/dist/environment/setup-environment.d.ts.map +1 -0
- package/dist/environment/setup-environment.js +794 -0
- package/dist/environment/ssh-keygen.d.ts +5 -0
- package/dist/environment/ssh-keygen.d.ts.map +1 -0
- package/dist/environment/ssh-keygen.js +21 -0
- package/dist/environment/swarm-to-k8s.d.ts +2 -0
- package/dist/environment/swarm-to-k8s.d.ts.map +1 -0
- package/dist/environment/swarm-to-k8s.js +173 -0
- package/dist/environment/templates.d.ts +27 -0
- package/dist/environment/templates.d.ts.map +1 -0
- package/dist/environment/templates.js +163 -0
- package/dist/environment/update-workflows.d.ts +2 -0
- package/dist/environment/update-workflows.d.ts.map +1 -0
- package/dist/environment/update-workflows.js +169 -0
- package/dist/environment/users.d.ts +2 -0
- package/dist/environment/users.d.ts.map +1 -0
- package/dist/environment/users.js +112 -0
- package/dist/environment/utils.d.ts +18 -0
- package/dist/environment/utils.d.ts.map +1 -0
- package/dist/environment/utils.js +100 -0
- package/dist/events/index.js +302 -76
- 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 +88 -5139
- package/dist/migrations/v2.1/add-explicit-correction-flags.d.ts +3 -0
- package/dist/migrations/v2.1/add-explicit-correction-flags.d.ts.map +1 -0
- package/dist/migrations/v2.1/add-explicit-correction-flags.js +234 -0
- package/dist/migrations/v2.1/index.d.ts +6 -0
- package/dist/migrations/v2.1/index.d.ts.map +1 -0
- package/dist/migrations/v2.1/index.js +218 -0
- package/dist/notification/index.js +209 -20
- package/dist/scopes/index.d.ts +89 -1
- package/dist/scopes/index.js +10 -5
- package/dist/templates/charts-values/dependencies/values.override.yaml +4 -0
- package/dist/templates/charts-values/dependencies/values.yaml +83 -0
- package/dist/templates/charts-values/opencrvs-services/values.override.yaml +4 -0
- package/dist/templates/charts-values/opencrvs-services/values.yaml +81 -0
- package/dist/templates/charts-values/traefik/values.override.yaml +4 -0
- package/dist/templates/charts-values/traefik/values.yaml +115 -0
- package/dist/templates/inventory/inventory.template.yml +100 -0
- package/dist/templates/inventory/production.example.yml +77 -0
- package/dist/templates/inventory/qa.example.yml +48 -0
- package/opencrvs-toolkit-2.0.0-rc.1239696.tgz +0 -0
- package/package.json +15 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/opencrvs-toolkit-2.0.0-rc.1232518.tgz +0 -0
package/dist/events/index.js
CHANGED
|
@@ -151,6 +151,7 @@ __export(events_exports, {
|
|
|
151
151
|
FormPageConfig: () => FormPageConfig,
|
|
152
152
|
Fuzzy: () => Fuzzy,
|
|
153
153
|
GeographicalArea: () => GeographicalArea,
|
|
154
|
+
HiddenFieldTypes: () => HiddenFieldTypes,
|
|
154
155
|
HiddenFieldValue: () => HiddenFieldValue,
|
|
155
156
|
HttpFieldUpdateValue: () => HttpFieldUpdateValue,
|
|
156
157
|
HttpFieldValue: () => HttpFieldValue,
|
|
@@ -311,6 +312,7 @@ __export(events_exports, {
|
|
|
311
312
|
getActionAnnotation: () => getActionAnnotation,
|
|
312
313
|
getActionAnnotationFields: () => getActionAnnotationFields,
|
|
313
314
|
getActionConfig: () => getActionConfig,
|
|
315
|
+
getActionFormFields: () => getActionFormFields,
|
|
314
316
|
getActionReview: () => getActionReview,
|
|
315
317
|
getActionReviewFields: () => getActionReviewFields,
|
|
316
318
|
getAdministrativeAreaHierarchy: () => getAdministrativeAreaHierarchy,
|
|
@@ -519,11 +521,13 @@ var scopeOptionsPlaceEvent = z2.object({
|
|
|
519
521
|
event: scopeByEvent,
|
|
520
522
|
placeOfEvent: JurisdictionFilter.optional()
|
|
521
523
|
}).describe("Options applicable to all record scopes.");
|
|
522
|
-
var
|
|
524
|
+
var scopeOptionsDeclaredOrNotified = scopeOptionsPlaceEvent.extend({
|
|
525
|
+
notifiedIn: JurisdictionFilter.optional(),
|
|
526
|
+
notifiedBy: UserFilter.optional(),
|
|
523
527
|
declaredIn: JurisdictionFilter.optional(),
|
|
524
528
|
declaredBy: UserFilter.optional()
|
|
525
529
|
}).describe("Options applicable to actions that may take place after DECLARE");
|
|
526
|
-
var AllRecordScopeOptions =
|
|
530
|
+
var AllRecordScopeOptions = scopeOptionsDeclaredOrNotified.extend({
|
|
527
531
|
registeredIn: JurisdictionFilter.optional(),
|
|
528
532
|
registeredBy: UserFilter.optional()
|
|
529
533
|
}).describe(
|
|
@@ -561,6 +565,8 @@ var ResolvedScopeOptionsPlaceEvent = z2.object({
|
|
|
561
565
|
"Resolved options applicable to all record scopes, with location ID instead of jurisdiction filter."
|
|
562
566
|
);
|
|
563
567
|
var ResolvedScopeOptionsDeclared = ResolvedScopeOptionsPlaceEvent.extend({
|
|
568
|
+
notifiedIn: UUID.nullish(),
|
|
569
|
+
notifiedBy: z2.string().optional(),
|
|
564
570
|
declaredIn: UUID.nullish(),
|
|
565
571
|
declaredBy: z2.string().optional()
|
|
566
572
|
}).describe(
|
|
@@ -606,7 +612,7 @@ var RecordScopeV2 = z2.discriminatedUnion("type", [
|
|
|
606
612
|
}),
|
|
607
613
|
z2.object({
|
|
608
614
|
type: ScopesWithDeclaredOptions,
|
|
609
|
-
options:
|
|
615
|
+
options: scopeOptionsDeclaredOrNotified.optional()
|
|
610
616
|
}),
|
|
611
617
|
z2.object({
|
|
612
618
|
type: ScopesWithFullOptions,
|
|
@@ -729,8 +735,9 @@ var decodeScope = (encodedScope) => {
|
|
|
729
735
|
var DEFAULT_SCOPE_OPTIONS = {
|
|
730
736
|
placeOfEvent: JurisdictionFilter.enum.all,
|
|
731
737
|
accessLevel: JurisdictionFilter.enum.all,
|
|
732
|
-
|
|
733
|
-
declaredIn: JurisdictionFilter.enum.all
|
|
738
|
+
notifiedIn: JurisdictionFilter.enum.all,
|
|
739
|
+
declaredIn: JurisdictionFilter.enum.all,
|
|
740
|
+
registeredIn: JurisdictionFilter.enum.all
|
|
734
741
|
};
|
|
735
742
|
function getAcceptedScopesByType({
|
|
736
743
|
acceptedScopes,
|
|
@@ -1219,6 +1226,11 @@ var FieldTypesToHideInReview = [
|
|
|
1219
1226
|
FieldType.ALPHA_PRINT_BUTTON,
|
|
1220
1227
|
FieldType.ALPHA_HIDDEN
|
|
1221
1228
|
];
|
|
1229
|
+
var HiddenFieldTypes = [
|
|
1230
|
+
FieldType.HTTP,
|
|
1231
|
+
FieldType.QUERY_PARAM_READER,
|
|
1232
|
+
FieldType.ALPHA_HIDDEN
|
|
1233
|
+
];
|
|
1222
1234
|
|
|
1223
1235
|
// ../commons/src/events/FieldValue.ts
|
|
1224
1236
|
var z12 = __toESM(require("zod/v4"));
|
|
@@ -1809,6 +1821,7 @@ var RegistrationCreationMetadata = ActionCreationMetadata.extend({
|
|
|
1809
1821
|
)
|
|
1810
1822
|
});
|
|
1811
1823
|
var LegalStatuses = z16.object({
|
|
1824
|
+
[EventStatus.enum.NOTIFIED]: ActionCreationMetadata.nullish(),
|
|
1812
1825
|
[EventStatus.enum.DECLARED]: ActionCreationMetadata.nullish(),
|
|
1813
1826
|
[EventStatus.enum.REGISTERED]: RegistrationCreationMetadata.nullish()
|
|
1814
1827
|
});
|
|
@@ -1950,6 +1963,8 @@ var eventMetadataLabelMap = {
|
|
|
1950
1963
|
var EventMetadataDateFieldIdInput = z16.enum([
|
|
1951
1964
|
"createdAt",
|
|
1952
1965
|
"updatedAt",
|
|
1966
|
+
"legalStatuses.NOTIFIED.createdAt",
|
|
1967
|
+
"legalStatuses.NOTIFIED.acceptedAt",
|
|
1953
1968
|
"legalStatuses.DECLARED.createdAt",
|
|
1954
1969
|
"legalStatuses.DECLARED.acceptedAt",
|
|
1955
1970
|
"legalStatuses.REGISTERED.createdAt",
|
|
@@ -1958,6 +1973,8 @@ var EventMetadataDateFieldIdInput = z16.enum([
|
|
|
1958
1973
|
var EventMetadataDateFieldId = z16.enum([
|
|
1959
1974
|
"event.createdAt",
|
|
1960
1975
|
"event.updatedAt",
|
|
1976
|
+
"event.legalStatuses.NOTIFIED.createdAt",
|
|
1977
|
+
"event.legalStatuses.NOTIFIED.acceptedAt",
|
|
1961
1978
|
"event.legalStatuses.DECLARED.createdAt",
|
|
1962
1979
|
"event.legalStatuses.DECLARED.acceptedAt",
|
|
1963
1980
|
"event.legalStatuses.REGISTERED.createdAt",
|
|
@@ -2017,7 +2034,8 @@ var Range = import_v4.z.object({
|
|
|
2017
2034
|
});
|
|
2018
2035
|
var ContainsFlags = import_v4.z.object({
|
|
2019
2036
|
anyOf: import_v4.z.array(Flag).optional(),
|
|
2020
|
-
noneOf: import_v4.z.array(Flag).optional()
|
|
2037
|
+
noneOf: import_v4.z.array(Flag).optional(),
|
|
2038
|
+
allOf: import_v4.z.array(Flag).optional()
|
|
2021
2039
|
}).meta({
|
|
2022
2040
|
id: "ContainsFlags"
|
|
2023
2041
|
});
|
|
@@ -2292,6 +2310,7 @@ var NumberField = BaseField.extend({
|
|
|
2292
2310
|
configuration: import_v43.default.object({
|
|
2293
2311
|
min: import_v43.default.number().optional().describe("Minimum value"),
|
|
2294
2312
|
max: import_v43.default.number().optional().describe("Maximum value"),
|
|
2313
|
+
integer: import_v43.default.boolean().optional().describe("When true, only whole numbers are allowed"),
|
|
2295
2314
|
prefix: TranslationConfig.optional(),
|
|
2296
2315
|
postfix: TranslationConfig.optional()
|
|
2297
2316
|
}).optional()
|
|
@@ -3206,6 +3225,9 @@ var ActionConfigBase = z24.object({
|
|
|
3206
3225
|
var DeclarationActionBase = ActionConfigBase.extend({
|
|
3207
3226
|
deduplication: DeduplicationConfig.optional()
|
|
3208
3227
|
});
|
|
3228
|
+
var actionConfirmationForm = z24.array(FieldConfig).optional().describe(
|
|
3229
|
+
"Fields rendered on the action confirmation dialog. Submitted values are stored in the action annotation and shown in the audit history."
|
|
3230
|
+
);
|
|
3209
3231
|
var ReadActionConfig = ActionConfigBase.extend(
|
|
3210
3232
|
z24.object({
|
|
3211
3233
|
type: z24.literal(ActionType.READ),
|
|
@@ -3215,12 +3237,65 @@ var ReadActionConfig = ActionConfigBase.extend(
|
|
|
3215
3237
|
conditionals: z24.never().optional().describe("Read-action can not be disabled or hidden with conditionals.")
|
|
3216
3238
|
}).shape
|
|
3217
3239
|
);
|
|
3240
|
+
var NotifyConfig = ActionConfigBase.extend(
|
|
3241
|
+
z24.object({
|
|
3242
|
+
type: z24.literal(ActionType.NOTIFY),
|
|
3243
|
+
form: actionConfirmationForm
|
|
3244
|
+
}).shape
|
|
3245
|
+
);
|
|
3246
|
+
var DuplicateDetectedConfig = ActionConfigBase.extend(
|
|
3247
|
+
z24.object({
|
|
3248
|
+
type: z24.literal(ActionType.DUPLICATE_DETECTED),
|
|
3249
|
+
label: z24.never().optional().describe(
|
|
3250
|
+
"DUPLICATE_DETECTED is system-generated and never shown as a button, so it has no label."
|
|
3251
|
+
),
|
|
3252
|
+
supportingCopy: z24.never().optional(),
|
|
3253
|
+
icon: z24.never().optional().describe(
|
|
3254
|
+
"DUPLICATE_DETECTED is system-generated and never shown as a button, so it has no icon."
|
|
3255
|
+
),
|
|
3256
|
+
conditionals: z24.never().optional().describe(
|
|
3257
|
+
"DUPLICATE_DETECTED is system-generated and never shown as a button, so it cannot be disabled or hidden with conditionals."
|
|
3258
|
+
)
|
|
3259
|
+
}).shape
|
|
3260
|
+
);
|
|
3261
|
+
var MarkAsDuplicateConfig = ActionConfigBase.extend(
|
|
3262
|
+
z24.object({
|
|
3263
|
+
type: z24.literal(ActionType.MARK_AS_DUPLICATE)
|
|
3264
|
+
}).shape
|
|
3265
|
+
);
|
|
3266
|
+
var MarkAsNotDuplicateConfig = ActionConfigBase.extend(
|
|
3267
|
+
z24.object({
|
|
3268
|
+
type: z24.literal(ActionType.MARK_AS_NOT_DUPLICATE)
|
|
3269
|
+
}).shape
|
|
3270
|
+
);
|
|
3271
|
+
var AssignConfig = ActionConfigBase.extend(
|
|
3272
|
+
z24.object({
|
|
3273
|
+
type: z24.literal(ActionType.ASSIGN),
|
|
3274
|
+
flags: z24.never().optional().describe(
|
|
3275
|
+
"ASSIGN is a meta action excluded from flag resolution, so flags configured here would never apply."
|
|
3276
|
+
)
|
|
3277
|
+
}).shape
|
|
3278
|
+
);
|
|
3279
|
+
var UnassignConfig = ActionConfigBase.extend(
|
|
3280
|
+
z24.object({
|
|
3281
|
+
type: z24.literal(ActionType.UNASSIGN),
|
|
3282
|
+
flags: z24.never().optional().describe(
|
|
3283
|
+
"UNASSIGN is a meta action excluded from flag resolution, so flags configured here would never apply."
|
|
3284
|
+
)
|
|
3285
|
+
}).shape
|
|
3286
|
+
);
|
|
3287
|
+
var DeleteConfig = ActionConfigBase.extend(
|
|
3288
|
+
z24.object({
|
|
3289
|
+
type: z24.literal(ActionType.DELETE)
|
|
3290
|
+
}).shape
|
|
3291
|
+
);
|
|
3218
3292
|
var DeclareConfig = DeclarationActionBase.extend(
|
|
3219
3293
|
z24.object({
|
|
3220
3294
|
type: z24.literal(ActionType.DECLARE),
|
|
3221
3295
|
review: DeclarationReviewConfig.describe(
|
|
3222
3296
|
"Configuration of the review page fields."
|
|
3223
3297
|
),
|
|
3298
|
+
form: actionConfirmationForm,
|
|
3224
3299
|
dialogCopy: z24.object({
|
|
3225
3300
|
notify: TranslationConfig.describe(
|
|
3226
3301
|
"Confirmation text for the notify action"
|
|
@@ -3236,7 +3311,8 @@ var DeclareConfig = DeclarationActionBase.extend(
|
|
|
3236
3311
|
);
|
|
3237
3312
|
var ArchiveConfig = ActionConfigBase.extend(
|
|
3238
3313
|
z24.object({
|
|
3239
|
-
type: z24.literal(ActionType.ARCHIVE)
|
|
3314
|
+
type: z24.literal(ActionType.ARCHIVE),
|
|
3315
|
+
form: actionConfirmationForm
|
|
3240
3316
|
}).shape
|
|
3241
3317
|
);
|
|
3242
3318
|
var EditActionConfig = ActionConfigBase.extend(
|
|
@@ -3257,12 +3333,14 @@ var EditActionConfig = ActionConfigBase.extend(
|
|
|
3257
3333
|
);
|
|
3258
3334
|
var RejectConfig = ActionConfigBase.extend(
|
|
3259
3335
|
z24.object({
|
|
3260
|
-
type: z24.literal(ActionType.REJECT)
|
|
3336
|
+
type: z24.literal(ActionType.REJECT),
|
|
3337
|
+
form: actionConfirmationForm
|
|
3261
3338
|
}).shape
|
|
3262
3339
|
);
|
|
3263
3340
|
var RegisterConfig = DeclarationActionBase.extend(
|
|
3264
3341
|
z24.object({
|
|
3265
|
-
type: z24.literal(ActionType.REGISTER)
|
|
3342
|
+
type: z24.literal(ActionType.REGISTER),
|
|
3343
|
+
form: actionConfirmationForm
|
|
3266
3344
|
}).shape
|
|
3267
3345
|
);
|
|
3268
3346
|
var PrintCertificateActionConfig = ActionConfigBase.extend(
|
|
@@ -3277,7 +3355,17 @@ var RequestCorrectionConfig = ActionConfigBase.extend(
|
|
|
3277
3355
|
correctionForm: ActionFormConfig
|
|
3278
3356
|
}).shape
|
|
3279
3357
|
);
|
|
3280
|
-
var
|
|
3358
|
+
var ApproveCorrectionConfig = ActionConfigBase.extend(
|
|
3359
|
+
z24.object({
|
|
3360
|
+
type: z24.literal(ActionType.APPROVE_CORRECTION)
|
|
3361
|
+
}).shape
|
|
3362
|
+
);
|
|
3363
|
+
var RejectCorrectionConfig = ActionConfigBase.extend(
|
|
3364
|
+
z24.object({
|
|
3365
|
+
type: z24.literal(ActionType.REJECT_CORRECTION)
|
|
3366
|
+
}).shape
|
|
3367
|
+
);
|
|
3368
|
+
var CustomActionConfig = ActionConfigBase.extend(
|
|
3281
3369
|
z24.object({
|
|
3282
3370
|
type: z24.literal(ActionType.CUSTOM),
|
|
3283
3371
|
customActionType: z24.string().describe("Type identifier of the custom action."),
|
|
@@ -3288,7 +3376,7 @@ var CustomActionConfig = ActionConfigBase.merge(
|
|
|
3288
3376
|
auditHistoryLabel: TranslationConfig.describe(
|
|
3289
3377
|
'The label to show in audit history for this action. For example "Approved".'
|
|
3290
3378
|
)
|
|
3291
|
-
})
|
|
3379
|
+
}).shape
|
|
3292
3380
|
);
|
|
3293
3381
|
var ActionConfig = z24.discriminatedUnion("type", [
|
|
3294
3382
|
/*
|
|
@@ -3299,9 +3387,37 @@ var ActionConfig = z24.discriminatedUnion("type", [
|
|
|
3299
3387
|
id: "ReadActionConfig",
|
|
3300
3388
|
description: "Configuration for the read action \u2014 defines the record-tab content displayed on the event overview page."
|
|
3301
3389
|
}),
|
|
3390
|
+
AssignConfig.meta({
|
|
3391
|
+
id: "AssignActionConfig",
|
|
3392
|
+
description: "Configuration for assigning a record to the current user."
|
|
3393
|
+
}),
|
|
3394
|
+
UnassignConfig.meta({
|
|
3395
|
+
id: "UnassignActionConfig",
|
|
3396
|
+
description: "Configuration for unassigning a record from its current assignee."
|
|
3397
|
+
}),
|
|
3398
|
+
DeleteConfig.meta({
|
|
3399
|
+
id: "DeleteActionConfig",
|
|
3400
|
+
description: "Configuration for deleting a draft record."
|
|
3401
|
+
}),
|
|
3402
|
+
NotifyConfig.meta({
|
|
3403
|
+
id: "NotifyActionConfig",
|
|
3404
|
+
description: "Configuration for the notify action. When present, NOTIFY uses this config independently from DECLARE. When absent, NOTIFY falls back to the DeclareActionConfig."
|
|
3405
|
+
}),
|
|
3302
3406
|
DeclareConfig.meta({
|
|
3303
3407
|
id: "DeclareActionConfig",
|
|
3304
|
-
description: "Configuration for the declare action. Includes review-page fields.
|
|
3408
|
+
description: "Configuration for the declare action. Includes review-page fields. NOTIFY falls back to this config when no dedicated NotifyActionConfig is provided."
|
|
3409
|
+
}),
|
|
3410
|
+
DuplicateDetectedConfig.meta({
|
|
3411
|
+
id: "DuplicateDetectedActionConfig",
|
|
3412
|
+
description: "Configuration for the system-generated duplicate-detection action. Never shown as a button, so it only supports flags \u2014 not label, icon, or conditionals."
|
|
3413
|
+
}),
|
|
3414
|
+
MarkAsDuplicateConfig.meta({
|
|
3415
|
+
id: "MarkAsDuplicateActionConfig",
|
|
3416
|
+
description: "Configuration for marking a record as a duplicate."
|
|
3417
|
+
}),
|
|
3418
|
+
MarkAsNotDuplicateConfig.meta({
|
|
3419
|
+
id: "MarkAsNotDuplicateActionConfig",
|
|
3420
|
+
description: "Configuration for marking a record as not a duplicate, after it was previously flagged as one."
|
|
3305
3421
|
}),
|
|
3306
3422
|
RejectConfig.meta({
|
|
3307
3423
|
id: "RejectActionConfig",
|
|
@@ -3319,6 +3435,14 @@ var ActionConfig = z24.discriminatedUnion("type", [
|
|
|
3319
3435
|
id: "RequestCorrectionActionConfig",
|
|
3320
3436
|
description: "Configuration for requesting a correction on a registered record."
|
|
3321
3437
|
}),
|
|
3438
|
+
ApproveCorrectionConfig.meta({
|
|
3439
|
+
id: "ApproveCorrectionActionConfig",
|
|
3440
|
+
description: "Configuration for approving a requested correction."
|
|
3441
|
+
}),
|
|
3442
|
+
RejectCorrectionConfig.meta({
|
|
3443
|
+
id: "RejectCorrectionActionConfig",
|
|
3444
|
+
description: "Configuration for rejecting a requested correction."
|
|
3445
|
+
}),
|
|
3322
3446
|
EditActionConfig.meta({
|
|
3323
3447
|
id: "EditActionConfig",
|
|
3324
3448
|
description: "Configuration for editing a record before registration."
|
|
@@ -3908,7 +4032,7 @@ var isHiddenFieldType = (field3) => {
|
|
|
3908
4032
|
return field3.config.type === FieldType.ALPHA_HIDDEN;
|
|
3909
4033
|
};
|
|
3910
4034
|
var isNonInteractiveFieldType = (field3) => {
|
|
3911
|
-
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.
|
|
4035
|
+
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;
|
|
3912
4036
|
};
|
|
3913
4037
|
|
|
3914
4038
|
// ../commons/src/conditionals/validate.ts
|
|
@@ -4470,16 +4594,13 @@ function getActionConfig({
|
|
|
4470
4594
|
actionType,
|
|
4471
4595
|
customActionType
|
|
4472
4596
|
}) {
|
|
4597
|
+
if (actionType === ActionType.NOTIFY) {
|
|
4598
|
+
return eventConfiguration.actions.find((a) => a.type === ActionType.NOTIFY) ?? eventConfiguration.actions.find((a) => a.type === ActionType.DECLARE);
|
|
4599
|
+
}
|
|
4473
4600
|
return eventConfiguration.actions.find((a) => {
|
|
4474
4601
|
if (a.type === ActionType.CUSTOM && customActionType) {
|
|
4475
4602
|
return a.customActionType === customActionType;
|
|
4476
4603
|
}
|
|
4477
|
-
if (actionType === ActionType.NOTIFY) {
|
|
4478
|
-
return a.type === ActionType.DECLARE;
|
|
4479
|
-
}
|
|
4480
|
-
if (actionType === ActionType.APPROVE_CORRECTION || actionType === ActionType.REJECT_CORRECTION) {
|
|
4481
|
-
return a.type === ActionType.REQUEST_CORRECTION;
|
|
4482
|
-
}
|
|
4483
4604
|
return a.type === actionType;
|
|
4484
4605
|
});
|
|
4485
4606
|
}
|
|
@@ -4489,7 +4610,19 @@ function getCustomActionFields(eventConfiguration, customActionType) {
|
|
|
4489
4610
|
customActionType,
|
|
4490
4611
|
actionType: ActionType.CUSTOM
|
|
4491
4612
|
});
|
|
4492
|
-
if (!actionConfig ||
|
|
4613
|
+
if (!actionConfig || actionConfig.type !== ActionType.CUSTOM) {
|
|
4614
|
+
return [];
|
|
4615
|
+
}
|
|
4616
|
+
return actionConfig.form;
|
|
4617
|
+
}
|
|
4618
|
+
function getActionFormFields(eventConfiguration, actionType, customActionType) {
|
|
4619
|
+
const actionConfig = eventConfiguration.actions.find((a) => {
|
|
4620
|
+
if (a.type === ActionType.CUSTOM && customActionType) {
|
|
4621
|
+
return a.customActionType === customActionType;
|
|
4622
|
+
}
|
|
4623
|
+
return a.type === actionType;
|
|
4624
|
+
});
|
|
4625
|
+
if (!actionConfig || !("form" in actionConfig) || actionConfig.form == null) {
|
|
4493
4626
|
return [];
|
|
4494
4627
|
}
|
|
4495
4628
|
return actionConfig.form;
|
|
@@ -4510,13 +4643,9 @@ var getActionAnnotationFields = (actionConfig) => {
|
|
|
4510
4643
|
if (actionConfig.type === ActionType.PRINT_CERTIFICATE) {
|
|
4511
4644
|
return actionConfig.printForm.pages.flatMap(({ fields }) => fields);
|
|
4512
4645
|
}
|
|
4513
|
-
|
|
4514
|
-
|
|
4515
|
-
|
|
4516
|
-
if ("review" in actionConfig) {
|
|
4517
|
-
return actionConfig.review.fields;
|
|
4518
|
-
}
|
|
4519
|
-
return [];
|
|
4646
|
+
const reviewFields = "review" in actionConfig && actionConfig.review != null ? actionConfig.review.fields : [];
|
|
4647
|
+
const formFields = "form" in actionConfig && actionConfig.form != null ? actionConfig.form : [];
|
|
4648
|
+
return [...reviewFields, ...formFields];
|
|
4520
4649
|
};
|
|
4521
4650
|
function getAllAnnotationFields(config) {
|
|
4522
4651
|
return (0, import_lodash.flattenDeep)(config.actions.map(getActionAnnotationFields));
|
|
@@ -5633,7 +5762,7 @@ function validateActionFlags(event2, ctx) {
|
|
|
5633
5762
|
const isInherentFlag = (value) => Object.values(InherentFlags).includes(value);
|
|
5634
5763
|
const configuredFlagIds = event2.flags.map((flag2) => flag2.id);
|
|
5635
5764
|
const actionFlagIds = event2.actions.flatMap(
|
|
5636
|
-
(action) => action.flags.map((flag2) => flag2.id)
|
|
5765
|
+
(action) => (action.flags ?? []).map((flag2) => flag2.id)
|
|
5637
5766
|
);
|
|
5638
5767
|
for (const actionFlagId of actionFlagIds) {
|
|
5639
5768
|
const isConfigured = configuredFlagIds.includes(actionFlagId);
|
|
@@ -6485,6 +6614,8 @@ var updateActions = ActionTypes.extract([
|
|
|
6485
6614
|
ActionType.ARCHIVE,
|
|
6486
6615
|
ActionType.PRINT_CERTIFICATE,
|
|
6487
6616
|
ActionType.REQUEST_CORRECTION,
|
|
6617
|
+
ActionType.APPROVE_CORRECTION,
|
|
6618
|
+
ActionType.REJECT_CORRECTION,
|
|
6488
6619
|
ActionType.CUSTOM
|
|
6489
6620
|
]);
|
|
6490
6621
|
function getActionUpdateMetadata(actions) {
|
|
@@ -6512,6 +6643,10 @@ function getActionUpdateMetadata(actions) {
|
|
|
6512
6643
|
}
|
|
6513
6644
|
function getLegalStatuses(actions) {
|
|
6514
6645
|
return {
|
|
6646
|
+
[EventStatus.enum.NOTIFIED]: getDeclarationActionCreationMetadata(
|
|
6647
|
+
ActionType.NOTIFY,
|
|
6648
|
+
actions
|
|
6649
|
+
),
|
|
6515
6650
|
[EventStatus.enum.DECLARED]: getDeclarationActionCreationMetadata(
|
|
6516
6651
|
ActionType.DECLARE,
|
|
6517
6652
|
actions
|
|
@@ -6526,9 +6661,6 @@ function getLegalStatuses(actions) {
|
|
|
6526
6661
|
// ../commons/src/events/state/flags.ts
|
|
6527
6662
|
var import_lodash3 = require("lodash");
|
|
6528
6663
|
var import_date_fns3 = require("date-fns");
|
|
6529
|
-
function isEditInProgress(actions) {
|
|
6530
|
-
return actions.at(-1)?.type === ActionType.EDIT;
|
|
6531
|
-
}
|
|
6532
6664
|
function findPendingCorrectionAction(writeActions2) {
|
|
6533
6665
|
let correctionRequestAction;
|
|
6534
6666
|
for (let i = writeActions2.length - 1; i >= 0; i--) {
|
|
@@ -6543,29 +6675,6 @@ function findPendingCorrectionAction(writeActions2) {
|
|
|
6543
6675
|
}
|
|
6544
6676
|
return correctionRequestAction;
|
|
6545
6677
|
}
|
|
6546
|
-
function isCorrectionRequested(actions) {
|
|
6547
|
-
return findPendingCorrectionAction(actions) !== void 0;
|
|
6548
|
-
}
|
|
6549
|
-
function isDeclarationIncomplete(actions) {
|
|
6550
|
-
return getStatusFromActions(actions) === EventStatus.enum.NOTIFIED;
|
|
6551
|
-
}
|
|
6552
|
-
function isRejected(actions) {
|
|
6553
|
-
const resettingActionTypes = [
|
|
6554
|
-
ActionType.NOTIFY,
|
|
6555
|
-
ActionType.DECLARE,
|
|
6556
|
-
ActionType.EDIT,
|
|
6557
|
-
ActionType.REGISTER
|
|
6558
|
-
];
|
|
6559
|
-
return actions.reduce((prev, { type }) => {
|
|
6560
|
-
if (type === ActionType.REJECT) {
|
|
6561
|
-
return true;
|
|
6562
|
-
}
|
|
6563
|
-
if (resettingActionTypes.includes(type)) {
|
|
6564
|
-
return false;
|
|
6565
|
-
}
|
|
6566
|
-
return prev;
|
|
6567
|
-
}, false);
|
|
6568
|
-
}
|
|
6569
6678
|
function isPotentialDuplicate(actions) {
|
|
6570
6679
|
return actions.reduce((prev, { type }) => {
|
|
6571
6680
|
if (type === ActionType.DUPLICATE_DETECTED) {
|
|
@@ -6593,6 +6702,88 @@ function isFlagConditionMet(conditional, form, action) {
|
|
|
6593
6702
|
}
|
|
6594
6703
|
});
|
|
6595
6704
|
}
|
|
6705
|
+
function actionConfigRemovesFlag(action, flagId, actionsUpToAndIncluding, event2, eventConfiguration) {
|
|
6706
|
+
if (!isActionConfigType(action.type)) {
|
|
6707
|
+
return false;
|
|
6708
|
+
}
|
|
6709
|
+
const actionConfig = getActionConfig({
|
|
6710
|
+
eventConfiguration,
|
|
6711
|
+
actionType: action.type,
|
|
6712
|
+
customActionType: "customActionType" in action ? action.customActionType : void 0
|
|
6713
|
+
});
|
|
6714
|
+
const removeOperations = (actionConfig?.flags ?? []).filter(
|
|
6715
|
+
({ id, operation }) => id === flagId && operation === "remove"
|
|
6716
|
+
);
|
|
6717
|
+
if (removeOperations.length === 0) {
|
|
6718
|
+
return false;
|
|
6719
|
+
}
|
|
6720
|
+
const eventUpToThisAction = { ...event2, actions: actionsUpToAndIncluding };
|
|
6721
|
+
const declaration = aggregateActionDeclarations(eventUpToThisAction);
|
|
6722
|
+
const annotation = aggregateActionAnnotations(eventUpToThisAction);
|
|
6723
|
+
const form = { ...declaration, ...annotation };
|
|
6724
|
+
return removeOperations.some(
|
|
6725
|
+
({ conditional }) => conditional ? isFlagConditionMet(conditional, form, action) : true
|
|
6726
|
+
);
|
|
6727
|
+
}
|
|
6728
|
+
var INHERENT_FLAG_RULES = [
|
|
6729
|
+
{
|
|
6730
|
+
flag: InherentFlags.CORRECTION_REQUESTED,
|
|
6731
|
+
setOn: [ActionType.REQUEST_CORRECTION],
|
|
6732
|
+
resetOn: [ActionType.APPROVE_CORRECTION, ActionType.REJECT_CORRECTION]
|
|
6733
|
+
},
|
|
6734
|
+
{
|
|
6735
|
+
// INCOMPLETE mirrors the NOTIFIED status: set by NOTIFY, cleared by any
|
|
6736
|
+
// other status-changing action (see getStatusFromActions).
|
|
6737
|
+
flag: InherentFlags.INCOMPLETE,
|
|
6738
|
+
setOn: [ActionType.NOTIFY],
|
|
6739
|
+
resetOn: [
|
|
6740
|
+
ActionType.CREATE,
|
|
6741
|
+
ActionType.DECLARE,
|
|
6742
|
+
ActionType.REGISTER,
|
|
6743
|
+
ActionType.ARCHIVE
|
|
6744
|
+
]
|
|
6745
|
+
},
|
|
6746
|
+
{
|
|
6747
|
+
flag: InherentFlags.REJECTED,
|
|
6748
|
+
setOn: [ActionType.REJECT],
|
|
6749
|
+
resetOn: [
|
|
6750
|
+
ActionType.NOTIFY,
|
|
6751
|
+
ActionType.DECLARE,
|
|
6752
|
+
ActionType.EDIT,
|
|
6753
|
+
ActionType.REGISTER
|
|
6754
|
+
]
|
|
6755
|
+
},
|
|
6756
|
+
{
|
|
6757
|
+
flag: InherentFlags.POTENTIAL_DUPLICATE,
|
|
6758
|
+
setOn: [ActionType.DUPLICATE_DETECTED],
|
|
6759
|
+
resetOn: [ActionType.MARK_AS_DUPLICATE, ActionType.MARK_AS_NOT_DUPLICATE]
|
|
6760
|
+
},
|
|
6761
|
+
{
|
|
6762
|
+
flag: InherentFlags.EDIT_IN_PROGRESS,
|
|
6763
|
+
setOn: [ActionType.EDIT],
|
|
6764
|
+
resetOnAnyOtherAction: true
|
|
6765
|
+
}
|
|
6766
|
+
];
|
|
6767
|
+
function resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration) {
|
|
6768
|
+
return acceptedActions.reduce((present, action, idx) => {
|
|
6769
|
+
if (rule.setOn.includes(action.type)) {
|
|
6770
|
+
return true;
|
|
6771
|
+
}
|
|
6772
|
+
if (rule.resetOnAnyOtherAction || (rule.resetOn ?? []).includes(action.type)) {
|
|
6773
|
+
return false;
|
|
6774
|
+
}
|
|
6775
|
+
if (actionConfigRemovesFlag(
|
|
6776
|
+
action,
|
|
6777
|
+
rule.flag,
|
|
6778
|
+
acceptedActions.slice(0, idx + 1),
|
|
6779
|
+
event2,
|
|
6780
|
+
eventConfiguration
|
|
6781
|
+
)) {
|
|
6782
|
+
return false;
|
|
6783
|
+
}
|
|
6784
|
+
return present;
|
|
6785
|
+
}, false);
|
|
6786
|
+
}
|
|
6596
6787
|
function resolveEventCustomFlags(event2, eventConfiguration) {
|
|
6597
6788
|
const actions = getAcceptedActions(event2).filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6598
6789
|
return actions.reduce((acc, action, idx) => {
|
|
@@ -6614,7 +6805,7 @@ function resolveEventCustomFlags(event2, eventConfiguration) {
|
|
|
6614
6805
|
const declaration = aggregateActionDeclarations(eventUpToThisAction);
|
|
6615
6806
|
const annotation = aggregateActionAnnotations(eventUpToThisAction);
|
|
6616
6807
|
const form = { ...declaration, ...annotation };
|
|
6617
|
-
const flagsWithMetConditions = actionConfig.flags.filter(
|
|
6808
|
+
const flagsWithMetConditions = (actionConfig.flags ?? []).filter(
|
|
6618
6809
|
({ conditional }) => (
|
|
6619
6810
|
// If conditional is not provided, the flag is resolved
|
|
6620
6811
|
conditional ? isFlagConditionMet(conditional, form, action) : true
|
|
@@ -6641,33 +6832,19 @@ function getActionStatusFlags(sortedActions) {
|
|
|
6641
6832
|
return flag2;
|
|
6642
6833
|
});
|
|
6643
6834
|
}
|
|
6644
|
-
function getInherentFlags(sortedActions) {
|
|
6835
|
+
function getInherentFlags(sortedActions, event2, eventConfiguration) {
|
|
6645
6836
|
const acceptedActions = sortedActions.filter(
|
|
6646
6837
|
({ status: status2 }) => status2 === ActionStatus.Accepted
|
|
6647
6838
|
);
|
|
6648
|
-
|
|
6649
|
-
|
|
6650
|
-
|
|
6651
|
-
}
|
|
6652
|
-
if (isDeclarationIncomplete(acceptedActions)) {
|
|
6653
|
-
inherentFlags.push(InherentFlags.INCOMPLETE);
|
|
6654
|
-
}
|
|
6655
|
-
if (isRejected(acceptedActions)) {
|
|
6656
|
-
inherentFlags.push(InherentFlags.REJECTED);
|
|
6657
|
-
}
|
|
6658
|
-
if (isPotentialDuplicate(acceptedActions)) {
|
|
6659
|
-
inherentFlags.push(InherentFlags.POTENTIAL_DUPLICATE);
|
|
6660
|
-
}
|
|
6661
|
-
if (isEditInProgress(acceptedActions)) {
|
|
6662
|
-
inherentFlags.push(InherentFlags.EDIT_IN_PROGRESS);
|
|
6663
|
-
}
|
|
6664
|
-
return inherentFlags;
|
|
6839
|
+
return INHERENT_FLAG_RULES.filter(
|
|
6840
|
+
(rule) => resolveInherentFlag(rule, acceptedActions, event2, eventConfiguration)
|
|
6841
|
+
).map(({ flag: flag2 }) => flag2);
|
|
6665
6842
|
}
|
|
6666
6843
|
function getEventFlags(event2, config) {
|
|
6667
6844
|
const sortedActions = event2.actions.filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
6668
6845
|
return [
|
|
6669
6846
|
...getActionStatusFlags(sortedActions),
|
|
6670
|
-
...getInherentFlags(sortedActions),
|
|
6847
|
+
...getInherentFlags(sortedActions, event2, config),
|
|
6671
6848
|
...resolveEventCustomFlags(event2, config)
|
|
6672
6849
|
];
|
|
6673
6850
|
}
|
|
@@ -7672,6 +7849,11 @@ var TENNIS_CLUB_DECLARATION_REVIEW = {
|
|
|
7672
7849
|
id: "signature.upload.modal.title",
|
|
7673
7850
|
defaultMessage: "Draw signature",
|
|
7674
7851
|
description: "Title for the modal to draw signature"
|
|
7852
|
+
},
|
|
7853
|
+
// Zod applies the schema default at parse time, but this fixture bypasses
|
|
7854
|
+
// parsing — GeneratedInputField accesses configuration.maxFileSize directly.
|
|
7855
|
+
configuration: {
|
|
7856
|
+
maxFileSize: 5 * 1024 * 1024
|
|
7675
7857
|
}
|
|
7676
7858
|
}
|
|
7677
7859
|
]
|
|
@@ -8228,6 +8410,20 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8228
8410
|
},
|
|
8229
8411
|
review: TENNIS_CLUB_DECLARATION_REVIEW
|
|
8230
8412
|
},
|
|
8413
|
+
{
|
|
8414
|
+
type: ActionType.NOTIFY,
|
|
8415
|
+
label: {
|
|
8416
|
+
defaultMessage: "Notify health worker",
|
|
8417
|
+
description: "This is shown as the action name anywhere the user can trigger the action from",
|
|
8418
|
+
id: "event.tennis-club-membership.action.notify.label"
|
|
8419
|
+
},
|
|
8420
|
+
flags: [
|
|
8421
|
+
{
|
|
8422
|
+
id: "health-worker-notified",
|
|
8423
|
+
operation: "add"
|
|
8424
|
+
}
|
|
8425
|
+
]
|
|
8426
|
+
},
|
|
8231
8427
|
{
|
|
8232
8428
|
type: ActionType.REJECT,
|
|
8233
8429
|
label: {
|
|
@@ -8470,6 +8666,17 @@ var tennisClubMembershipEvent = defineConfig({
|
|
|
8470
8666
|
}
|
|
8471
8667
|
}
|
|
8472
8668
|
],
|
|
8669
|
+
flags: [
|
|
8670
|
+
{
|
|
8671
|
+
id: "health-worker-notified",
|
|
8672
|
+
requiresAction: false,
|
|
8673
|
+
label: {
|
|
8674
|
+
id: "event.tennis-club-membership.flag.health-worker-notified.label",
|
|
8675
|
+
defaultMessage: "Health worker notified",
|
|
8676
|
+
description: "Label for the health-worker-notified flag"
|
|
8677
|
+
}
|
|
8678
|
+
}
|
|
8679
|
+
],
|
|
8473
8680
|
advancedSearch: [
|
|
8474
8681
|
{
|
|
8475
8682
|
title: {
|
|
@@ -10228,7 +10435,7 @@ function matchesJurisdictionFilter(locationIds, filter, user2) {
|
|
|
10228
10435
|
return locationIds.some((id) => id === user2.primaryOfficeId);
|
|
10229
10436
|
}
|
|
10230
10437
|
if (filter === JurisdictionFilter.enum.administrativeArea) {
|
|
10231
|
-
return user2.administrativeAreaId
|
|
10438
|
+
return !user2.administrativeAreaId || locationIds.some((id) => id === user2.administrativeAreaId);
|
|
10232
10439
|
}
|
|
10233
10440
|
return true;
|
|
10234
10441
|
}
|
|
@@ -10255,6 +10462,25 @@ function canAccessEventWithScope(event2, scope, user2, customActionType) {
|
|
|
10255
10462
|
}
|
|
10256
10463
|
if (scopeUsesDeclaredOptions(scope)) {
|
|
10257
10464
|
const { options } = scope;
|
|
10465
|
+
if (options?.notifiedBy === UserFilter.enum.user) {
|
|
10466
|
+
if (event2.legalStatuses?.NOTIFIED?.createdBy !== user2.id) {
|
|
10467
|
+
return false;
|
|
10468
|
+
}
|
|
10469
|
+
}
|
|
10470
|
+
if (options?.notifiedIn === JurisdictionFilter.enum.location && !matchesJurisdictionFilter(
|
|
10471
|
+
event2.legalStatuses?.NOTIFIED?.createdAtLocation,
|
|
10472
|
+
JurisdictionFilter.enum.location,
|
|
10473
|
+
user2
|
|
10474
|
+
)) {
|
|
10475
|
+
return false;
|
|
10476
|
+
}
|
|
10477
|
+
if (options?.notifiedIn === JurisdictionFilter.enum.administrativeArea && !matchesJurisdictionFilter(
|
|
10478
|
+
event2.legalStatuses?.NOTIFIED?.createdAtLocation,
|
|
10479
|
+
JurisdictionFilter.enum.administrativeArea,
|
|
10480
|
+
user2
|
|
10481
|
+
)) {
|
|
10482
|
+
return false;
|
|
10483
|
+
}
|
|
10258
10484
|
if (options?.declaredBy === UserFilter.enum.user) {
|
|
10259
10485
|
if (event2.legalStatuses?.DECLARED?.createdBy !== user2.id) {
|
|
10260
10486
|
return false;
|
|
@@ -10317,7 +10543,7 @@ function canAccessUserWithScope({
|
|
|
10317
10543
|
}
|
|
10318
10544
|
const hasAdministrativeAreaInHierarchy = userToAccess.administrativeHierarchy.some(
|
|
10319
10545
|
(id) => user2.administrativeAreaId === id
|
|
10320
|
-
) || user2.administrativeAreaId
|
|
10546
|
+
) || !user2.administrativeAreaId;
|
|
10321
10547
|
if (opts?.accessLevel === JurisdictionFilter.enum.administrativeArea && !hasAdministrativeAreaInHierarchy) {
|
|
10322
10548
|
return false;
|
|
10323
10549
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export declare const UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
|
|
2
|
-
export declare const UPSTREAM_BRANCH = "release
|
|
2
|
+
export declare const UPSTREAM_BRANCH = "release/2.0.0";
|
|
3
3
|
/**
|
|
4
4
|
* Runs a git command in the country config working directory.
|
|
5
5
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkout-upstream-files.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/checkout-upstream-files.ts"],"names":[],"mappings":"AA8CA,eAAO,MAAM,YAAY,2DACiC,CAAA;AAE1D,eAAO,MAAM,eAAe,
|
|
1
|
+
{"version":3,"file":"checkout-upstream-files.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/checkout-upstream-files.ts"],"names":[],"mappings":"AA8CA,eAAO,MAAM,YAAY,2DACiC,CAAA;AAE1D,eAAO,MAAM,eAAe,kBAAkB,CAAA;AAc9C;;;;;;GAMG;AACH,wBAAgB,MAAM,CACpB,IAAI,EAAE,MAAM,EAAE,EACd,EAAE,MAAc,EAAE,GAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO,GAC5C,MAAM,CAMR;AAED;;;;GAIG;AACH,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAO9C;AAED,wBAAgB,eAAe,IAAI,IAAI,CAMtC;AAID,iBAAe,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAuDnC;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
|
|
@@ -59,7 +59,7 @@ exports.main = main;
|
|
|
59
59
|
*/
|
|
60
60
|
const child_process_1 = require("child_process");
|
|
61
61
|
exports.UPSTREAM_URL = 'https://github.com/opencrvs/opencrvs-countryconfig.git';
|
|
62
|
-
exports.UPSTREAM_BRANCH = 'release
|
|
62
|
+
exports.UPSTREAM_BRANCH = 'release/2.0.0';
|
|
63
63
|
// Remote name used only for the duration of this codemod. Prefixed to avoid
|
|
64
64
|
// clashing with remotes the user may have (origin, upstream, etc.).
|
|
65
65
|
const TEMP_REMOTE = 'opencrvs-upgrade-v19-v20-codemod';
|