@opencrvs/toolkit 2.0.0-rc.eac601e → 2.0.0-rc.ec6b668
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/create-countryconfig/index.js +73 -0
- package/create-countryconfig/package.json +11 -0
- package/dist/application-config/index.js +56 -31
- package/dist/cli.js +1860 -346
- package/dist/commons/api/router.d.ts +3017 -297
- package/dist/commons/application-config/index.d.ts +16 -4
- package/dist/commons/conditionals/conditionals.d.ts +6 -6
- package/dist/commons/conditionals/validate.d.ts +1 -0
- package/dist/commons/events/ActionInput.d.ts +108 -0
- package/dist/commons/events/Draft.d.ts +3 -0
- package/dist/commons/events/EventIndex.d.ts +1 -0
- package/dist/commons/events/EventMetadata.d.ts +1 -0
- package/dist/commons/events/FieldConfig.d.ts +10 -0
- package/dist/commons/events/locations.d.ts +38 -1
- package/dist/commons/events/mocks.test.utils.d.ts +19 -0
- package/dist/commons/events/scopes.d.ts +24 -1
- package/dist/commons/events/state/index.d.ts +2 -1
- package/dist/commons/events/utils.d.ts +1 -1
- package/dist/conditionals/index.js +37 -7
- package/dist/events/index.js +161 -41
- package/dist/migrations/v2.0/add-birth-certificate-issuance-flag.d.ts.map +1 -1
- package/dist/migrations/v2.0/add-birth-certificate-issuance-flag.js +63 -39
- package/dist/migrations/v2.0/add-resend-invite-notification.d.ts +3 -0
- package/dist/migrations/v2.0/add-resend-invite-notification.d.ts.map +1 -0
- package/dist/migrations/v2.0/add-resend-invite-notification.js +373 -0
- package/dist/migrations/v2.0/checkout-upstream-files.d.ts +19 -0
- package/dist/migrations/v2.0/checkout-upstream-files.d.ts.map +1 -1
- package/dist/migrations/v2.0/checkout-upstream-files.js +17 -14
- package/dist/migrations/v2.0/convert-config-files-to-ts.d.ts.map +1 -1
- package/dist/migrations/v2.0/convert-config-files-to-ts.js +4 -5
- package/dist/migrations/v2.0/convert-paragraph-to-heading.d.ts.map +1 -1
- package/dist/migrations/v2.0/convert-paragraph-to-heading.js +4 -5
- package/dist/migrations/v2.0/create-events-index.d.ts.map +1 -1
- package/dist/migrations/v2.0/create-events-index.js +1 -2
- package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts +11 -0
- package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts.map +1 -0
- package/dist/migrations/v2.0/delete-infrastructure-directory.js +123 -0
- package/dist/migrations/v2.0/index.d.ts +10 -4
- package/dist/migrations/v2.0/index.d.ts.map +1 -1
- package/dist/migrations/v2.0/index.js +1828 -343
- package/dist/migrations/v2.0/make-built-in-validate-actions-custom.d.ts.map +1 -1
- package/dist/migrations/v2.0/make-built-in-validate-actions-custom.js +95 -7
- package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts +13 -0
- package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts.map +1 -0
- package/dist/migrations/v2.0/merge-infrastructure-directory.js +222 -0
- package/dist/migrations/v2.0/migrate-application-config-url.d.ts +3 -0
- package/dist/migrations/v2.0/migrate-application-config-url.d.ts.map +1 -0
- package/dist/migrations/v2.0/migrate-application-config-url.js +342 -0
- package/dist/migrations/v2.0/migrate-scopes.d.ts.map +1 -1
- package/dist/migrations/v2.0/migrate-scopes.js +55 -32
- package/dist/migrations/v2.0/migrate-validated-workqueue-status-to-flag.d.ts.map +1 -1
- package/dist/migrations/v2.0/migrate-validated-workqueue-status-to-flag.js +3 -4
- package/dist/migrations/v2.0/migrate-workqueue-configs.d.ts.map +1 -1
- package/dist/migrations/v2.0/migrate-workqueue-configs.js +143 -63
- package/dist/migrations/v2.0/remove-delete-actions.d.ts.map +1 -1
- package/dist/migrations/v2.0/remove-delete-actions.js +3 -4
- package/dist/migrations/v2.0/remove-demo-scope.d.ts.map +1 -1
- package/dist/migrations/v2.0/remove-demo-scope.js +2 -3
- package/dist/migrations/v2.0/remove-deprecated-imports.d.ts.map +1 -1
- package/dist/migrations/v2.0/remove-deprecated-imports.js +3 -4
- package/dist/migrations/v2.0/remove-fhir-url-helpers.d.ts +3 -0
- package/dist/migrations/v2.0/remove-fhir-url-helpers.d.ts.map +1 -0
- package/dist/migrations/v2.0/remove-fhir-url-helpers.js +163 -0
- package/dist/migrations/v2.0/remove-hearth-migrations.d.ts.map +1 -1
- package/dist/migrations/v2.0/remove-hearth-migrations.js +1 -2
- package/dist/migrations/v2.0/remove-old-statistics-service.d.ts +3 -0
- package/dist/migrations/v2.0/remove-old-statistics-service.d.ts.map +1 -0
- package/dist/migrations/v2.0/remove-old-statistics-service.js +356 -0
- package/dist/migrations/v2.0/remove-pending-certification-flag.d.ts.map +1 -1
- package/dist/migrations/v2.0/remove-pending-certification-flag.js +3 -4
- package/dist/migrations/v2.0/remove-review-from-register-action.d.ts.map +1 -1
- package/dist/migrations/v2.0/remove-review-from-register-action.js +3 -4
- package/dist/migrations/v2.0/remove-unused-environment-variables.d.ts +3 -0
- package/dist/migrations/v2.0/remove-unused-environment-variables.d.ts.map +1 -0
- package/dist/migrations/v2.0/remove-unused-environment-variables.js +186 -0
- package/dist/migrations/v2.0/rename-api-paths.d.ts.map +1 -1
- package/dist/migrations/v2.0/rename-api-paths.js +3 -4
- package/dist/migrations/v2.0/rename-location-parent-id.d.ts.map +1 -1
- package/dist/migrations/v2.0/rename-location-parent-id.js +3 -4
- package/dist/migrations/v2.0/simplify-analytics-precalculations.d.ts.map +1 -1
- package/dist/migrations/v2.0/simplify-analytics-precalculations.js +1 -2
- package/dist/migrations/v2.0/update-package-json.d.ts +3 -0
- package/dist/migrations/v2.0/update-package-json.d.ts.map +1 -0
- package/dist/migrations/v2.0/update-package-json.js +105 -0
- package/dist/notification/index.js +55 -27
- package/dist/scopes/index.d.ts +87 -10
- package/dist/scopes/index.js +43 -8
- package/opencrvs-toolkit-2.0.0-rc.ec6b668.tgz +0 -0
- package/package.json +1 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/opencrvs-toolkit-2.0.0-rc.eac601e.tgz +0 -0
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { DisplayableAction } from './ActionType';
|
|
2
|
-
import { EncodedScope } from '../scopes';
|
|
2
|
+
import { EncodedScope, UserScopeV2 } from '../scopes';
|
|
3
3
|
import { EventIndexWithAdministrativeHierarchy } from './locations';
|
|
4
4
|
import { UserContext } from '../users/User';
|
|
5
5
|
import { EventIndex } from './EventIndex';
|
|
6
|
+
import { UUID } from 'src/uuid';
|
|
6
7
|
export declare const ACTION_SCOPE_MAP: {
|
|
7
8
|
READ: "record.read"[];
|
|
8
9
|
CREATE: "record.create"[];
|
|
@@ -53,4 +54,26 @@ export declare function isActionInScope({ scopes, action, event, currentUser }:
|
|
|
53
54
|
event: EventIndexWithAdministrativeHierarchy;
|
|
54
55
|
currentUser: UserContext;
|
|
55
56
|
}): boolean;
|
|
57
|
+
/**
|
|
58
|
+
*
|
|
59
|
+
*
|
|
60
|
+
* @param allRoles - All possible roles in the system
|
|
61
|
+
* @param userLocation - The location and role information of the user whose role options are being determined
|
|
62
|
+
* @param acceptedScopes - The scopes of the user requesting the role update, used to determine which roles they can assign.
|
|
63
|
+
* @param userRequesting - The user context of the user requesting the role update, used to check location-based access to the target user's location.
|
|
64
|
+
*
|
|
65
|
+
* @returns An array of roles that the requesting user is allowed to assign to the target user based on their scopes and location
|
|
66
|
+
*
|
|
67
|
+
* 1) Used to determine which roles should be available in the dropdown when a user is editing another user's role in the user management interface.
|
|
68
|
+
* 2) Used to check if payload includes valid role.
|
|
69
|
+
*/
|
|
70
|
+
export declare function getAvailableRolesForUserUpdatePayload({ allRoles, userLocation, acceptedScopes, userRequesting }: {
|
|
71
|
+
allRoles: string[];
|
|
72
|
+
userRequesting: UserContext;
|
|
73
|
+
acceptedScopes: UserScopeV2[];
|
|
74
|
+
userLocation: {
|
|
75
|
+
administrativeHierarchy: UUID[];
|
|
76
|
+
primaryOfficeId: UUID;
|
|
77
|
+
};
|
|
78
|
+
}): string[];
|
|
56
79
|
//# sourceMappingURL=scopes.d.ts.map
|
|
@@ -9,7 +9,7 @@ import { UUID } from '../../uuid';
|
|
|
9
9
|
import { DocumentPath } from '../../documents';
|
|
10
10
|
export declare function getStatusFromActions(actions: Array<Action>): "CREATED" | "NOTIFIED" | "DECLARED" | "REGISTERED" | "ARCHIVED";
|
|
11
11
|
export declare function getAssignedUserFromActions(actions: Array<ActionDocument>): string | null;
|
|
12
|
-
export declare function getAssignedUserSignatureFromActions(actions: Array<ActionDocument>): string | null;
|
|
12
|
+
export declare function getAssignedUserSignatureFromActions(actions: Array<ActionDocument>): (string & import("zod").$brand<"DocumentPath">) | null;
|
|
13
13
|
type NonNullableDeep<T> = T extends [unknown, ...unknown[]] ? {
|
|
14
14
|
[K in keyof T]: NonNullableDeep<NonNullable<T[K]>>;
|
|
15
15
|
} : T extends UUID ? T : T extends DocumentPath ? T : T extends string ? NonNullable<T> : T extends (infer U)[] ? NonNullableDeep<U>[] : T extends object ? {
|
|
@@ -104,6 +104,7 @@ export declare function applyDraftToEventIndex(eventIndex: EventIndex, draft: Dr
|
|
|
104
104
|
createdBySignature?: (string & import("zod").$brand<"DocumentPath">) | null | undefined;
|
|
105
105
|
updatedAtLocation?: (string & import("zod").$brand<"UUID">) | null | undefined;
|
|
106
106
|
assignedTo?: string | null | undefined;
|
|
107
|
+
assignedToSignature?: (string & import("zod").$brand<"DocumentPath">) | null | undefined;
|
|
107
108
|
updatedBy?: string | null | undefined;
|
|
108
109
|
};
|
|
109
110
|
/**
|
|
@@ -131,7 +131,7 @@ export declare function isPageVisible(page: PageConfig, formValues: ActionUpdate
|
|
|
131
131
|
* * @param validatorContext - custom validation context
|
|
132
132
|
* @returns {Partial<T>} A new object containing only the values for visible fields
|
|
133
133
|
*/
|
|
134
|
-
export declare function omitHiddenFields<T extends EventState | ActionUpdate>(fields: FieldConfig[], formValues: T, validatorContext: ValidatorContext, includeHiddenFieldsWithNullValues?: boolean
|
|
134
|
+
export declare function omitHiddenFields<T extends EventState | ActionUpdate>(fields: FieldConfig[], formValues: T, validatorContext: ValidatorContext, includeHiddenFieldsWithNullValues?: boolean): Partial<T>;
|
|
135
135
|
export declare function omitHiddenPaginatedFields<T extends EventState | ActionUpdate>(formConfig: FormConfig, values: T, validatorContext: ValidatorContext, includeHiddenFieldsWithNullValues?: boolean): Partial<Partial<T>>;
|
|
136
136
|
/**
|
|
137
137
|
*
|
|
@@ -182,6 +182,10 @@ var scopeByEvent = z6.preprocess(
|
|
|
182
182
|
(val) => val === void 0 ? void 0 : [val].flat(),
|
|
183
183
|
z6.array(z6.string()).optional()
|
|
184
184
|
).describe("Event type, e.g. birth, death");
|
|
185
|
+
var userRole = z6.preprocess(
|
|
186
|
+
(val) => val === void 0 ? void 0 : [val].flat(),
|
|
187
|
+
z6.array(z6.string()).optional()
|
|
188
|
+
).describe("User role, e.g. admin, field agent");
|
|
185
189
|
var scopeOptionsPlaceEvent = z6.object({
|
|
186
190
|
event: scopeByEvent,
|
|
187
191
|
placeOfEvent: JurisdictionFilter.optional()
|
|
@@ -205,6 +209,9 @@ var CustomActionScopeOptions = AllRecordScopeOptions.extend({
|
|
|
205
209
|
var AccessLevelOptions = z6.object({
|
|
206
210
|
accessLevel: JurisdictionFilter.optional()
|
|
207
211
|
});
|
|
212
|
+
var AllUserScopeOptions = AccessLevelOptions.extend({
|
|
213
|
+
role: userRole.optional()
|
|
214
|
+
});
|
|
208
215
|
var WorkqueueOrDashboardOptions = z6.object({
|
|
209
216
|
ids: z6.preprocess(
|
|
210
217
|
(val) => val === void 0 ? void 0 : [val].flat(),
|
|
@@ -214,6 +221,7 @@ var WorkqueueOrDashboardOptions = z6.object({
|
|
|
214
221
|
var AllScopeOptions = z6.object({
|
|
215
222
|
...AllRecordScopeOptions.shape,
|
|
216
223
|
...AccessLevelOptions.shape,
|
|
224
|
+
...AllUserScopeOptions.shape,
|
|
217
225
|
...WorkqueueOrDashboardOptions.shape
|
|
218
226
|
});
|
|
219
227
|
var ScopeOptionKey = AllScopeOptions.keyof();
|
|
@@ -286,6 +294,30 @@ var RecordScopeV2 = z6.discriminatedUnion("type", [
|
|
|
286
294
|
]).describe(
|
|
287
295
|
"Scopes used to check user's permission to perform actions on a record."
|
|
288
296
|
);
|
|
297
|
+
var SystemScopeType = z6.enum([
|
|
298
|
+
"organisation.read-locations",
|
|
299
|
+
"user.read",
|
|
300
|
+
"user.create",
|
|
301
|
+
"user.edit",
|
|
302
|
+
"user.search"
|
|
303
|
+
]);
|
|
304
|
+
var UserScopeType = SystemScopeType.extract([
|
|
305
|
+
"user.read",
|
|
306
|
+
"user.create",
|
|
307
|
+
"user.edit",
|
|
308
|
+
"user.search"
|
|
309
|
+
]);
|
|
310
|
+
var ScopesWithRoleOption = UserScopeType.extract(["user.edit", "user.create"]);
|
|
311
|
+
var UserScopeV2 = z6.discriminatedUnion("type", [
|
|
312
|
+
z6.object({
|
|
313
|
+
type: ScopesWithRoleOption,
|
|
314
|
+
options: AllUserScopeOptions.optional()
|
|
315
|
+
}),
|
|
316
|
+
z6.object({
|
|
317
|
+
type: UserScopeType.extract(["user.read", "user.search"]),
|
|
318
|
+
options: AccessLevelOptions.optional()
|
|
319
|
+
})
|
|
320
|
+
]);
|
|
289
321
|
var ResolvedRecordScopeV2 = z6.discriminatedUnion("type", [
|
|
290
322
|
z6.object({
|
|
291
323
|
type: ScopesWithPlaceEventOptions,
|
|
@@ -306,16 +338,14 @@ var ResolvedRecordScopeV2 = z6.discriminatedUnion("type", [
|
|
|
306
338
|
}).optional()
|
|
307
339
|
})
|
|
308
340
|
]).describe("Resolved scope with location/user IDs instead of filters.");
|
|
309
|
-
var SystemScopeType = z6.enum([
|
|
310
|
-
"organisation.read-locations",
|
|
311
|
-
"user.read",
|
|
312
|
-
"user.create",
|
|
313
|
-
"user.edit"
|
|
314
|
-
]);
|
|
315
341
|
var Scope2 = z6.discriminatedUnion("type", [
|
|
316
342
|
z6.object({ type: PlainScopeType }),
|
|
317
343
|
...RecordScopeV2.options,
|
|
318
|
-
|
|
344
|
+
...UserScopeV2.options,
|
|
345
|
+
z6.object({
|
|
346
|
+
type: z6.literal("organisation.read-locations"),
|
|
347
|
+
options: AccessLevelOptions.optional()
|
|
348
|
+
}),
|
|
319
349
|
z6.object({
|
|
320
350
|
type: z6.literal("workqueue"),
|
|
321
351
|
options: WorkqueueOrDashboardOptions
|
package/dist/events/index.js
CHANGED
|
@@ -243,6 +243,8 @@ __export(events_exports, {
|
|
|
243
243
|
areConditionsMet: () => areConditionsMet,
|
|
244
244
|
buildFormState: () => buildFormState,
|
|
245
245
|
canAccessEventWithScope: () => canAccessEventWithScope,
|
|
246
|
+
canAccessOtherUserWithScopes: () => canAccessOtherUserWithScopes,
|
|
247
|
+
canAccessUserWithScope: () => canAccessUserWithScope,
|
|
246
248
|
compositeFieldTypes: () => compositeFieldTypes,
|
|
247
249
|
createEmptyDraft: () => createEmptyDraft,
|
|
248
250
|
createFieldConditionals: () => createFieldConditionals,
|
|
@@ -300,12 +302,14 @@ __export(events_exports, {
|
|
|
300
302
|
getActionConfig: () => getActionConfig,
|
|
301
303
|
getActionReview: () => getActionReview,
|
|
302
304
|
getActionReviewFields: () => getActionReviewFields,
|
|
305
|
+
getAdministrativeAreaHierarchy: () => getAdministrativeAreaHierarchy,
|
|
303
306
|
getAllUniqueFields: () => getAllUniqueFields,
|
|
304
307
|
getAnnotationFromDrafts: () => getAnnotationFromDrafts,
|
|
305
308
|
getAssignedUserFromActions: () => getAssignedUserFromActions,
|
|
306
309
|
getAssignedUserSignatureFromActions: () => getAssignedUserSignatureFromActions,
|
|
307
310
|
getAssignmentStatus: () => getAssignmentStatus,
|
|
308
311
|
getAvailableActionsForEvent: () => getAvailableActionsForEvent,
|
|
312
|
+
getAvailableRolesForUserUpdatePayload: () => getAvailableRolesForUserUpdatePayload,
|
|
309
313
|
getCompleteActionAnnotation: () => getCompleteActionAnnotation,
|
|
310
314
|
getCompleteActionDeclaration: () => getCompleteActionDeclaration,
|
|
311
315
|
getCurrentEventState: () => getCurrentEventState,
|
|
@@ -316,6 +320,7 @@ __export(events_exports, {
|
|
|
316
320
|
getDeclarationPages: () => getDeclarationPages,
|
|
317
321
|
getEventConfigById: () => getEventConfigById,
|
|
318
322
|
getFilePathsFromEvent: () => getFilePathsFromEvent,
|
|
323
|
+
getLocationHierarchy: () => getLocationHierarchy,
|
|
319
324
|
getMixedPath: () => getMixedPath,
|
|
320
325
|
getPendingAction: () => getPendingAction,
|
|
321
326
|
getPrintCertificatePages: () => getPrintCertificatePages,
|
|
@@ -489,6 +494,10 @@ var scopeByEvent = z2.preprocess(
|
|
|
489
494
|
(val) => val === void 0 ? void 0 : [val].flat(),
|
|
490
495
|
z2.array(z2.string()).optional()
|
|
491
496
|
).describe("Event type, e.g. birth, death");
|
|
497
|
+
var userRole = z2.preprocess(
|
|
498
|
+
(val) => val === void 0 ? void 0 : [val].flat(),
|
|
499
|
+
z2.array(z2.string()).optional()
|
|
500
|
+
).describe("User role, e.g. admin, field agent");
|
|
492
501
|
var scopeOptionsPlaceEvent = z2.object({
|
|
493
502
|
event: scopeByEvent,
|
|
494
503
|
placeOfEvent: JurisdictionFilter.optional()
|
|
@@ -512,6 +521,9 @@ var CustomActionScopeOptions = AllRecordScopeOptions.extend({
|
|
|
512
521
|
var AccessLevelOptions = z2.object({
|
|
513
522
|
accessLevel: JurisdictionFilter.optional()
|
|
514
523
|
});
|
|
524
|
+
var AllUserScopeOptions = AccessLevelOptions.extend({
|
|
525
|
+
role: userRole.optional()
|
|
526
|
+
});
|
|
515
527
|
var WorkqueueOrDashboardOptions = z2.object({
|
|
516
528
|
ids: z2.preprocess(
|
|
517
529
|
(val) => val === void 0 ? void 0 : [val].flat(),
|
|
@@ -521,6 +533,7 @@ var WorkqueueOrDashboardOptions = z2.object({
|
|
|
521
533
|
var AllScopeOptions = z2.object({
|
|
522
534
|
...AllRecordScopeOptions.shape,
|
|
523
535
|
...AccessLevelOptions.shape,
|
|
536
|
+
...AllUserScopeOptions.shape,
|
|
524
537
|
...WorkqueueOrDashboardOptions.shape
|
|
525
538
|
});
|
|
526
539
|
var ScopeOptionKey = AllScopeOptions.keyof();
|
|
@@ -593,6 +606,33 @@ var RecordScopeV2 = z2.discriminatedUnion("type", [
|
|
|
593
606
|
]).describe(
|
|
594
607
|
"Scopes used to check user's permission to perform actions on a record."
|
|
595
608
|
);
|
|
609
|
+
var SystemScopeType = z2.enum([
|
|
610
|
+
"organisation.read-locations",
|
|
611
|
+
"user.read",
|
|
612
|
+
"user.create",
|
|
613
|
+
"user.edit",
|
|
614
|
+
"user.search"
|
|
615
|
+
]);
|
|
616
|
+
var UserScopeType = SystemScopeType.extract([
|
|
617
|
+
"user.read",
|
|
618
|
+
"user.create",
|
|
619
|
+
"user.edit",
|
|
620
|
+
"user.search"
|
|
621
|
+
]);
|
|
622
|
+
var ScopesWithRoleOption = UserScopeType.extract(["user.edit", "user.create"]);
|
|
623
|
+
var UserScopeV2 = z2.discriminatedUnion("type", [
|
|
624
|
+
z2.object({
|
|
625
|
+
type: ScopesWithRoleOption,
|
|
626
|
+
options: AllUserScopeOptions.optional()
|
|
627
|
+
}),
|
|
628
|
+
z2.object({
|
|
629
|
+
type: UserScopeType.extract(["user.read", "user.search"]),
|
|
630
|
+
options: AccessLevelOptions.optional()
|
|
631
|
+
})
|
|
632
|
+
]);
|
|
633
|
+
function scopeUsesRoleOptions(scope) {
|
|
634
|
+
return ScopesWithRoleOption?.options.some((opt) => opt === scope.type);
|
|
635
|
+
}
|
|
596
636
|
function scopeUsesDeclaredOptions(scope) {
|
|
597
637
|
return !ScopesWithPlaceEventOptions.options.some((opt) => opt === scope.type);
|
|
598
638
|
}
|
|
@@ -625,16 +665,14 @@ var ResolvedRecordScopeV2 = z2.discriminatedUnion("type", [
|
|
|
625
665
|
}).optional()
|
|
626
666
|
})
|
|
627
667
|
]).describe("Resolved scope with location/user IDs instead of filters.");
|
|
628
|
-
var SystemScopeType = z2.enum([
|
|
629
|
-
"organisation.read-locations",
|
|
630
|
-
"user.read",
|
|
631
|
-
"user.create",
|
|
632
|
-
"user.edit"
|
|
633
|
-
]);
|
|
634
668
|
var Scope = z2.discriminatedUnion("type", [
|
|
635
669
|
z2.object({ type: PlainScopeType }),
|
|
636
670
|
...RecordScopeV2.options,
|
|
637
|
-
|
|
671
|
+
...UserScopeV2.options,
|
|
672
|
+
z2.object({
|
|
673
|
+
type: z2.literal("organisation.read-locations"),
|
|
674
|
+
options: AccessLevelOptions.optional()
|
|
675
|
+
}),
|
|
638
676
|
z2.object({
|
|
639
677
|
type: z2.literal("workqueue"),
|
|
640
678
|
options: WorkqueueOrDashboardOptions
|
|
@@ -1376,28 +1414,20 @@ function schemaPriority(schema) {
|
|
|
1376
1414
|
return idx === -1 ? 9999 : idx;
|
|
1377
1415
|
}
|
|
1378
1416
|
function safeUnion(schemas) {
|
|
1417
|
+
const sortedSchemas = [...schemas].sort(
|
|
1418
|
+
(a, b) => schemaPriority(a) - schemaPriority(b)
|
|
1419
|
+
);
|
|
1379
1420
|
return z12.any().superRefine((val, ctx) => {
|
|
1380
|
-
const
|
|
1381
|
-
|
|
1382
|
-
|
|
1383
|
-
|
|
1384
|
-
if (successful.length === 0) {
|
|
1385
|
-
ctx.addIssue({
|
|
1386
|
-
code: "invalid_type",
|
|
1387
|
-
expected: "custom",
|
|
1388
|
-
message: "Value does not match any schema"
|
|
1389
|
-
});
|
|
1390
|
-
return;
|
|
1391
|
-
}
|
|
1392
|
-
successful.sort((a, b) => schemaPriority(a) - schemaPriority(b));
|
|
1393
|
-
const best = successful[0];
|
|
1394
|
-
if (!best.safeParse(val).success) {
|
|
1395
|
-
ctx.addIssue({
|
|
1396
|
-
expected: "custom",
|
|
1397
|
-
code: "invalid_type",
|
|
1398
|
-
message: "Value did not match the best schema"
|
|
1399
|
-
});
|
|
1421
|
+
for (const schema of sortedSchemas) {
|
|
1422
|
+
if (schema.safeParse(val).success) {
|
|
1423
|
+
return;
|
|
1424
|
+
}
|
|
1400
1425
|
}
|
|
1426
|
+
ctx.addIssue({
|
|
1427
|
+
code: "invalid_type",
|
|
1428
|
+
expected: "custom",
|
|
1429
|
+
message: "Value does not match any schema"
|
|
1430
|
+
});
|
|
1401
1431
|
}).meta({
|
|
1402
1432
|
description: "Value that matches exactly one of the possible schema types (TextValue, DateValue, DateRangeFieldValue). The best matching schema is chosen by priority."
|
|
1403
1433
|
});
|
|
@@ -1774,6 +1804,9 @@ var EventMetadata = z16.object({
|
|
|
1774
1804
|
"Timestamp of the most recent *accepted* status change. Possibly 3rd party update, if action is validation asynchronously."
|
|
1775
1805
|
),
|
|
1776
1806
|
assignedTo: z16.string().nullish().describe("ID of the user currently assigned to the event."),
|
|
1807
|
+
assignedToSignature: DocumentPath.nullish().describe(
|
|
1808
|
+
"Signature of the user who is currently assigned to the event."
|
|
1809
|
+
),
|
|
1777
1810
|
updatedBy: z16.string().nullish().describe("ID of the user who last changed the status."),
|
|
1778
1811
|
trackingId: z16.string().describe(
|
|
1779
1812
|
"System-generated tracking ID used by informants or registrars to look up the event."
|
|
@@ -3766,6 +3799,9 @@ function precompileActionSchemas(eventConfigurations) {
|
|
|
3766
3799
|
function isAgeValue(value) {
|
|
3767
3800
|
return typeof value === "object" && value !== null && "age" in value && typeof value.age === "number";
|
|
3768
3801
|
}
|
|
3802
|
+
function mergeWithBaseFormState(values, context) {
|
|
3803
|
+
return { ...context.baseFormState, ...values };
|
|
3804
|
+
}
|
|
3769
3805
|
function validate(schema, data) {
|
|
3770
3806
|
const validator = ajv.getSchema(schema.$id) || ajv.compile(schema);
|
|
3771
3807
|
if ("$form" in data) {
|
|
@@ -3804,7 +3840,7 @@ function isOnline() {
|
|
|
3804
3840
|
}
|
|
3805
3841
|
function isConditionMet(conditional, values, context, eventIndex) {
|
|
3806
3842
|
return validate(conditional, {
|
|
3807
|
-
$form: values,
|
|
3843
|
+
$form: mergeWithBaseFormState(values, context),
|
|
3808
3844
|
$now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
|
|
3809
3845
|
$online: isOnline(),
|
|
3810
3846
|
$user: context.user,
|
|
@@ -3833,7 +3869,7 @@ function isFieldConditionMet(field3, form, conditionalType, context) {
|
|
|
3833
3869
|
return true;
|
|
3834
3870
|
}
|
|
3835
3871
|
const validConditionals = getConditionalActionsForField(field3, {
|
|
3836
|
-
$form: form,
|
|
3872
|
+
$form: mergeWithBaseFormState(form, context),
|
|
3837
3873
|
$now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
|
|
3838
3874
|
$online: isOnline(),
|
|
3839
3875
|
$user: context.user,
|
|
@@ -4025,7 +4061,7 @@ function runFieldValidations({
|
|
|
4025
4061
|
return [];
|
|
4026
4062
|
}
|
|
4027
4063
|
const conditionalParameters = {
|
|
4028
|
-
$form: form,
|
|
4064
|
+
$form: mergeWithBaseFormState(form, context),
|
|
4029
4065
|
$now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
|
|
4030
4066
|
/**
|
|
4031
4067
|
* In real use cases, there can be hundreds of thousands of locations.
|
|
@@ -4269,17 +4305,16 @@ function isPageVisible(page, formValues, context) {
|
|
|
4269
4305
|
}
|
|
4270
4306
|
return isConditionMet(page.conditional, formValues, context);
|
|
4271
4307
|
}
|
|
4272
|
-
function omitHiddenFields(fields, formValues, validatorContext, includeHiddenFieldsWithNullValues = false
|
|
4308
|
+
function omitHiddenFields(fields, formValues, validatorContext, includeHiddenFieldsWithNullValues = false) {
|
|
4273
4309
|
const base = (0, import_lodash.cloneDeep)(formValues);
|
|
4274
4310
|
function fn(prevVisibilityContext) {
|
|
4275
|
-
const visibilityForm = declarationContext ? { ...declarationContext, ...prevVisibilityContext } : prevVisibilityContext;
|
|
4276
4311
|
const cleaned = (0, import_lodash.omitBy)(base, (value, fieldId) => {
|
|
4277
4312
|
const fieldConfig = fields.filter((f) => f.id === fieldId);
|
|
4278
4313
|
if (!fieldConfig.length) {
|
|
4279
4314
|
return false;
|
|
4280
4315
|
}
|
|
4281
4316
|
const isHidden = fieldConfig.every(
|
|
4282
|
-
(f) => !isFieldVisible(f,
|
|
4317
|
+
(f) => !isFieldVisible(f, prevVisibilityContext, validatorContext)
|
|
4283
4318
|
);
|
|
4284
4319
|
if (!isHidden) {
|
|
4285
4320
|
return false;
|
|
@@ -4297,7 +4332,7 @@ function omitHiddenPaginatedFields(formConfig, values, validatorContext, include
|
|
|
4297
4332
|
const visibleFields = formConfig.pages.filter((p) => isPageVisible(p, values, validatorContext)).flatMap((p) => p.fields);
|
|
4298
4333
|
const hiddenFields = formConfig.pages.filter((p) => !isPageVisible(p, values, validatorContext)).flatMap((p) => p.fields);
|
|
4299
4334
|
const valuesExceptHiddenPage = (0, import_lodash.omitBy)(values, (_2, fieldId) => {
|
|
4300
|
-
return hiddenFields.some((f) => f.id === fieldId);
|
|
4335
|
+
return hiddenFields.some((f) => f.id === fieldId) && !visibleFields.some((f) => f.id === fieldId);
|
|
4301
4336
|
});
|
|
4302
4337
|
return omitHiddenFields(
|
|
4303
4338
|
visibleFields,
|
|
@@ -4344,13 +4379,10 @@ function getVisibleVerificationPageIds(pages, annotation, context) {
|
|
|
4344
4379
|
}
|
|
4345
4380
|
function omitHiddenAnnotationFields(actionConfig, declaration, annotation, context) {
|
|
4346
4381
|
const annotationFields = getActionAnnotationFields(actionConfig);
|
|
4347
|
-
return omitHiddenFields(
|
|
4348
|
-
|
|
4349
|
-
|
|
4350
|
-
|
|
4351
|
-
false,
|
|
4352
|
-
declaration
|
|
4353
|
-
);
|
|
4382
|
+
return omitHiddenFields(annotationFields, annotation, {
|
|
4383
|
+
...context,
|
|
4384
|
+
baseFormState: declaration
|
|
4385
|
+
});
|
|
4354
4386
|
}
|
|
4355
4387
|
function deepMerge(currentDocument, actionDocument) {
|
|
4356
4388
|
const currentDocumentClone = (0, import_lodash.cloneDeep)(currentDocument);
|
|
@@ -5862,6 +5894,9 @@ var BaseActionInput = z38.object({
|
|
|
5862
5894
|
originalActionId: UUID.optional(),
|
|
5863
5895
|
// should not be part of base action.
|
|
5864
5896
|
keepAssignment: z38.boolean().optional(),
|
|
5897
|
+
keepAssignmentIfAccepted: z38.boolean().optional(),
|
|
5898
|
+
keepAssignmentIfRejected: z38.boolean().optional(),
|
|
5899
|
+
waitFor: z38.boolean().optional(),
|
|
5865
5900
|
// For normal users, the createdAtLocation is resolved on the backend from the user's primaryOfficeId.
|
|
5866
5901
|
// @TODO: createdAtLocation should be limited to actions that system users can perform. For normal users, it should not be part of the base action.
|
|
5867
5902
|
createdAtLocation: UUID.nullish().describe(
|
|
@@ -9930,11 +9965,77 @@ function canAccessEventWithScope(event2, scope, user2, customActionType) {
|
|
|
9930
9965
|
}
|
|
9931
9966
|
return true;
|
|
9932
9967
|
}
|
|
9968
|
+
function canAccessUserWithScope({
|
|
9969
|
+
userToAccess,
|
|
9970
|
+
scope,
|
|
9971
|
+
user: user2
|
|
9972
|
+
}) {
|
|
9973
|
+
const opts = scope.options;
|
|
9974
|
+
const hasSameOffice = user2.primaryOfficeId === userToAccess.primaryOfficeId;
|
|
9975
|
+
if (opts?.accessLevel === JurisdictionFilter.enum.location && !hasSameOffice) {
|
|
9976
|
+
return false;
|
|
9977
|
+
}
|
|
9978
|
+
const hasAdministrativeAreaInHierarchy = userToAccess.administrativeHierarchy.some(
|
|
9979
|
+
(id) => user2.administrativeAreaId === id
|
|
9980
|
+
) || user2.administrativeAreaId === null;
|
|
9981
|
+
if (opts?.accessLevel === JurisdictionFilter.enum.administrativeArea && !hasAdministrativeAreaInHierarchy) {
|
|
9982
|
+
return false;
|
|
9983
|
+
}
|
|
9984
|
+
if (scopeUsesRoleOptions(scope)) {
|
|
9985
|
+
const { options } = scope;
|
|
9986
|
+
if (options?.role && !options.role.includes(userToAccess.role)) {
|
|
9987
|
+
return false;
|
|
9988
|
+
}
|
|
9989
|
+
}
|
|
9990
|
+
return true;
|
|
9991
|
+
}
|
|
9992
|
+
function canAccessOtherUserWithScopes({
|
|
9993
|
+
scopes,
|
|
9994
|
+
userToAccess,
|
|
9995
|
+
user: user2
|
|
9996
|
+
}) {
|
|
9997
|
+
return scopes.some(
|
|
9998
|
+
(scope) => canAccessUserWithScope({ userToAccess, scope, user: user2 })
|
|
9999
|
+
);
|
|
10000
|
+
}
|
|
9933
10001
|
function userCanAccessEventWithScopes(event2, scopes, user2, customActionType) {
|
|
9934
10002
|
return scopes.some(
|
|
9935
10003
|
(scope) => canAccessEventWithScope(event2, scope, user2, customActionType)
|
|
9936
10004
|
);
|
|
9937
10005
|
}
|
|
10006
|
+
function getAdministrativeAreaHierarchy(administrativeAreaId, administrativeAreas) {
|
|
10007
|
+
const collectedLocations = [];
|
|
10008
|
+
const parsedAdministrativeAreaId = administrativeAreaId && UUID.safeParse(administrativeAreaId).data;
|
|
10009
|
+
let current = parsedAdministrativeAreaId ? administrativeAreas.get(parsedAdministrativeAreaId) : null;
|
|
10010
|
+
while (current) {
|
|
10011
|
+
collectedLocations.push(current);
|
|
10012
|
+
if (!current.parentId) {
|
|
10013
|
+
break;
|
|
10014
|
+
}
|
|
10015
|
+
const parentId = current.parentId;
|
|
10016
|
+
current = administrativeAreas.get(parentId);
|
|
10017
|
+
}
|
|
10018
|
+
return collectedLocations;
|
|
10019
|
+
}
|
|
10020
|
+
function getLocationHierarchy(selectedId, context) {
|
|
10021
|
+
const { administrativeAreas, locations } = context;
|
|
10022
|
+
const loc = locations.get(selectedId);
|
|
10023
|
+
if (loc) {
|
|
10024
|
+
if (loc.administrativeAreaId) {
|
|
10025
|
+
const hierarchy2 = getAdministrativeAreaHierarchy(
|
|
10026
|
+
loc.administrativeAreaId,
|
|
10027
|
+
administrativeAreas
|
|
10028
|
+
);
|
|
10029
|
+
return [...hierarchy2.reverse().map((area) => area.id), loc.id];
|
|
10030
|
+
}
|
|
10031
|
+
return [loc.id];
|
|
10032
|
+
}
|
|
10033
|
+
const hierarchy = getAdministrativeAreaHierarchy(
|
|
10034
|
+
selectedId,
|
|
10035
|
+
administrativeAreas
|
|
10036
|
+
);
|
|
10037
|
+
return hierarchy.reverse().map((area) => area.id);
|
|
10038
|
+
}
|
|
9938
10039
|
|
|
9939
10040
|
// ../commons/src/events/scopes.ts
|
|
9940
10041
|
var ACTION_SCOPE_MAP = {
|
|
@@ -10009,6 +10110,25 @@ function isActionInScope({
|
|
|
10009
10110
|
);
|
|
10010
10111
|
return canAccess;
|
|
10011
10112
|
}
|
|
10113
|
+
function getAvailableRolesForUserUpdatePayload({
|
|
10114
|
+
allRoles,
|
|
10115
|
+
userLocation,
|
|
10116
|
+
acceptedScopes,
|
|
10117
|
+
userRequesting
|
|
10118
|
+
}) {
|
|
10119
|
+
const availableRoles = allRoles.filter((role) => {
|
|
10120
|
+
const canAccess = canAccessOtherUserWithScopes({
|
|
10121
|
+
userToAccess: {
|
|
10122
|
+
...userLocation,
|
|
10123
|
+
role
|
|
10124
|
+
},
|
|
10125
|
+
user: userRequesting,
|
|
10126
|
+
scopes: acceptedScopes
|
|
10127
|
+
});
|
|
10128
|
+
return canAccess;
|
|
10129
|
+
});
|
|
10130
|
+
return availableRoles;
|
|
10131
|
+
}
|
|
10012
10132
|
|
|
10013
10133
|
// ../commons/src/events/serializers/user/deserializer.ts
|
|
10014
10134
|
function userDeserializer(serializedUserField, user2) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-birth-certificate-issuance-flag.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/add-birth-certificate-issuance-flag.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"add-birth-certificate-issuance-flag.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/add-birth-certificate-issuance-flag.ts"],"names":[],"mappings":"AAycA,iBAAe,IAAI,kBAiDlB;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
|