@opencrvs/toolkit 2.0.0-rc.fef9d21 → 2.0.0-rc.ff04b30

package/dist/commons/events/WorkqueueConfig.d.ts

@@ -910,6 +910,152 @@ export declare const WorkqueueConfigWithoutQuery: z.ZodObject<{
 export declare const WorkqueueConfigInput: z.ZodObject<{
     slug: z.ZodString;
     name: z.ZodObject<import("./TranslationConfig").MessageDescriptorZod, z.core.$strip>;
+    action: z.ZodOptional<z.ZodObject<{
+        type: z.ZodEnum<{
+            DELETE: "DELETE";
+            DECLARE: "DECLARE";
+            REGISTER: "REGISTER";
+            EDIT: "EDIT";
+            REJECT: "REJECT";
+            MARK_AS_DUPLICATE: "MARK_AS_DUPLICATE";
+            ARCHIVE: "ARCHIVE";
+            PRINT_CERTIFICATE: "PRINT_CERTIFICATE";
+            REQUEST_CORRECTION: "REQUEST_CORRECTION";
+            READ: "READ";
+        }>;
+    }, z.core.$strip>>;
+    columns: z.ZodDefault<z.ZodArray<z.ZodObject<{
+        label: z.ZodObject<import("./TranslationConfig").MessageDescriptorZod, z.core.$strip>;
+        value: z.ZodObject<{
+            $event: z.ZodEnum<{
+                id: "id";
+                title: "title";
+                type: "type";
+                updatedAt: "updatedAt";
+                placeOfEvent: "placeOfEvent";
+                createdByUserType: "createdByUserType";
+                createdAt: "createdAt";
+                createdBy: "createdBy";
+                createdAtLocation: "createdAtLocation";
+                status: "status";
+                assignedTo: "assignedTo";
+                trackingId: "trackingId";
+                legalStatuses: "legalStatuses";
+                dateOfEvent: "dateOfEvent";
+                updatedByUserRole: "updatedByUserRole";
+                updatedAtLocation: "updatedAtLocation";
+                updatedBy: "updatedBy";
+                flags: "flags";
+                outbox: "outbox";
+            }>;
+        }, z.core.$strip>;
+    }, z.core.$strip>>>;
+    icon: z.ZodEnum<{
+        Archived: "Archived";
+        Assigned: "Assigned";
+        Briefcase: "Briefcase";
+        Certified: "Certified";
+        Close: "Close";
+        Collapse: "Collapse";
+        Draft: "Draft";
+        DuplicateYellow: "DuplicateYellow";
+        Expand: "Expand";
+        ExternalValidate: "ExternalValidate";
+        FilledCheck: "FilledCheck";
+        InReview: "InReview";
+        Offline: "Offline";
+        Registered: "Registered";
+        RequiresUpdates: "RequiresUpdates";
+        Sent: "Sent";
+        Validated: "Validated";
+        WaitingApproval: "WaitingApproval";
+        ChartActivity: "ChartActivity";
+        Activity: "Activity";
+        Archive: "Archive";
+        ArchiveTray: "ArchiveTray";
+        ArrowLeft: "ArrowLeft";
+        ArrowRight: "ArrowRight";
+        Buildings: "Buildings";
+        Circle: "Circle";
+        CaretDown: "CaretDown";
+        CaretLeft: "CaretLeft";
+        CaretRight: "CaretRight";
+        ChartBar: "ChartBar";
+        ChartLine: "ChartLine";
+        ChatCircle: "ChatCircle";
+        CheckSquare: "CheckSquare";
+        Compass: "Compass";
+        Check: "Check";
+        Copy: "Copy";
+        Database: "Database";
+        DotsThreeVertical: "DotsThreeVertical";
+        ArrowCounterClockwise: "ArrowCounterClockwise";
+        MagnifyingGlassMinus: "MagnifyingGlassMinus";
+        MagnifyingGlassPlus: "MagnifyingGlassPlus";
+        Export: "Export";
+        Eye: "Eye";
+        EyeSlash: "EyeSlash";
+        Envelope: "Envelope";
+        File: "File";
+        FileSearch: "FileSearch";
+        FileMinus: "FileMinus";
+        FilePlus: "FilePlus";
+        FileText: "FileText";
+        FileX: "FileX";
+        Handshake: "Handshake";
+        Gear: "Gear";
+        GitBranch: "GitBranch";
+        IdentificationCard: "IdentificationCard";
+        List: "List";
+        ListBullets: "ListBullets";
+        Lock: "Lock";
+        MagnifyingGlass: "MagnifyingGlass";
+        MapPin: "MapPin";
+        Medal: "Medal";
+        NotePencil: "NotePencil";
+        Paperclip: "Paperclip";
+        PaperPlaneTilt: "PaperPlaneTilt";
+        Pen: "Pen";
+        PenNib: "PenNib";
+        Pencil: "Pencil";
+        PencilSimpleLine: "PencilSimpleLine";
+        Phone: "Phone";
+        Plus: "Plus";
+        Printer: "Printer";
+        SignOut: "SignOut";
+        Stamp: "Stamp";
+        Star: "Star";
+        Target: "Target";
+        TextT: "TextT";
+        Trash: "Trash";
+        UploadSimple: "UploadSimple";
+        User: "User";
+        UserPlus: "UserPlus";
+        Users: "Users";
+        WarningCircle: "WarningCircle";
+        X: "X";
+        ChatText: "ChatText";
+        CircleWavyCheck: "CircleWavyCheck";
+        CircleWavyQuestion: "CircleWavyQuestion";
+        ArchiveBox: "ArchiveBox";
+        ArrowCircleDown: "ArrowCircleDown";
+        FileArrowUp: "FileArrowUp";
+        FileDotted: "FileDotted";
+        Files: "Files";
+        PencilLine: "PencilLine";
+        PencilCircle: "PencilCircle";
+        UserCircle: "UserCircle";
+        Clock: "Clock";
+        QrCode: "QrCode";
+        Webcam: "Webcam";
+        Sun: "Sun";
+        DeviceTabletCamera: "DeviceTabletCamera";
+        Globe: "Globe";
+        Fingerprint: "Fingerprint";
+        PushPin: "PushPin";
+        Timer: "Timer";
+    }>;
+    emptyMessage: z.ZodOptional<z.ZodObject<import("./TranslationConfig").MessageDescriptorZod, z.core.$strip>>;
     query: z.ZodUnion<readonly [z.ZodObject<{
         eventType: z.ZodOptional<z.ZodString>;
         status: z.ZodOptional<z.ZodOptional<z.ZodUnion<readonly [z.ZodObject<{
@@ -1838,152 +1984,6 @@ export declare const WorkqueueConfigInput: z.ZodObject<{
             data: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
         }, z.core.$strip>>;
     }, z.core.$strip>]>;
-    action: z.ZodOptional<z.ZodObject<{
-        type: z.ZodEnum<{
-            DELETE: "DELETE";
-            DECLARE: "DECLARE";
-            REGISTER: "REGISTER";
-            EDIT: "EDIT";
-            REJECT: "REJECT";
-            MARK_AS_DUPLICATE: "MARK_AS_DUPLICATE";
-            ARCHIVE: "ARCHIVE";
-            PRINT_CERTIFICATE: "PRINT_CERTIFICATE";
-            REQUEST_CORRECTION: "REQUEST_CORRECTION";
-            READ: "READ";
-        }>;
-    }, z.core.$strip>>;
-    columns: z.ZodDefault<z.ZodArray<z.ZodObject<{
-        label: z.ZodObject<import("./TranslationConfig").MessageDescriptorZod, z.core.$strip>;
-        value: z.ZodObject<{
-            $event: z.ZodEnum<{
-                id: "id";
-                title: "title";
-                type: "type";
-                updatedAt: "updatedAt";
-                placeOfEvent: "placeOfEvent";
-                createdByUserType: "createdByUserType";
-                createdAt: "createdAt";
-                createdBy: "createdBy";
-                createdAtLocation: "createdAtLocation";
-                status: "status";
-                assignedTo: "assignedTo";
-                trackingId: "trackingId";
-                legalStatuses: "legalStatuses";
-                dateOfEvent: "dateOfEvent";
-                updatedByUserRole: "updatedByUserRole";
-                updatedAtLocation: "updatedAtLocation";
-                updatedBy: "updatedBy";
-                flags: "flags";
-                outbox: "outbox";
-            }>;
-        }, z.core.$strip>;
-    }, z.core.$strip>>>;
-    icon: z.ZodEnum<{
-        Archived: "Archived";
-        Assigned: "Assigned";
-        Briefcase: "Briefcase";
-        Certified: "Certified";
-        Close: "Close";
-        Collapse: "Collapse";
-        Draft: "Draft";
-        DuplicateYellow: "DuplicateYellow";
-        Expand: "Expand";
-        ExternalValidate: "ExternalValidate";
-        FilledCheck: "FilledCheck";
-        InReview: "InReview";
-        Offline: "Offline";
-        Registered: "Registered";
-        RequiresUpdates: "RequiresUpdates";
-        Sent: "Sent";
-        Validated: "Validated";
-        WaitingApproval: "WaitingApproval";
-        ChartActivity: "ChartActivity";
-        Activity: "Activity";
-        Archive: "Archive";
-        ArchiveTray: "ArchiveTray";
-        ArrowLeft: "ArrowLeft";
-        ArrowRight: "ArrowRight";
-        Buildings: "Buildings";
-        Circle: "Circle";
-        CaretDown: "CaretDown";
-        CaretLeft: "CaretLeft";
-        CaretRight: "CaretRight";
-        ChartBar: "ChartBar";
-        ChartLine: "ChartLine";
-        ChatCircle: "ChatCircle";
-        CheckSquare: "CheckSquare";
-        Compass: "Compass";
-        Check: "Check";
-        Copy: "Copy";
-        Database: "Database";
-        DotsThreeVertical: "DotsThreeVertical";
-        ArrowCounterClockwise: "ArrowCounterClockwise";
-        MagnifyingGlassMinus: "MagnifyingGlassMinus";
-        MagnifyingGlassPlus: "MagnifyingGlassPlus";
-        Export: "Export";
-        Eye: "Eye";
-        EyeSlash: "EyeSlash";
-        Envelope: "Envelope";
-        File: "File";
-        FileSearch: "FileSearch";
-        FileMinus: "FileMinus";
-        FilePlus: "FilePlus";
-        FileText: "FileText";
-        FileX: "FileX";
-        Handshake: "Handshake";
-        Gear: "Gear";
-        GitBranch: "GitBranch";
-        IdentificationCard: "IdentificationCard";
-        List: "List";
-        ListBullets: "ListBullets";
-        Lock: "Lock";
-        MagnifyingGlass: "MagnifyingGlass";
-        MapPin: "MapPin";
-        Medal: "Medal";
-        NotePencil: "NotePencil";
-        Paperclip: "Paperclip";
-        PaperPlaneTilt: "PaperPlaneTilt";
-        Pen: "Pen";
-        PenNib: "PenNib";
-        Pencil: "Pencil";
-        PencilSimpleLine: "PencilSimpleLine";
-        Phone: "Phone";
-        Plus: "Plus";
-        Printer: "Printer";
-        SignOut: "SignOut";
-        Stamp: "Stamp";
-        Star: "Star";
-        Target: "Target";
-        TextT: "TextT";
-        Trash: "Trash";
-        UploadSimple: "UploadSimple";
-        User: "User";
-        UserPlus: "UserPlus";
-        Users: "Users";
-        WarningCircle: "WarningCircle";
-        X: "X";
-        ChatText: "ChatText";
-        CircleWavyCheck: "CircleWavyCheck";
-        CircleWavyQuestion: "CircleWavyQuestion";
-        ArchiveBox: "ArchiveBox";
-        ArrowCircleDown: "ArrowCircleDown";
-        FileArrowUp: "FileArrowUp";
-        FileDotted: "FileDotted";
-        Files: "Files";
-        PencilLine: "PencilLine";
-        PencilCircle: "PencilCircle";
-        UserCircle: "UserCircle";
-        Clock: "Clock";
-        QrCode: "QrCode";
-        Webcam: "Webcam";
-        Sun: "Sun";
-        DeviceTabletCamera: "DeviceTabletCamera";
-        Globe: "Globe";
-        Fingerprint: "Fingerprint";
-        PushPin: "PushPin";
-        Timer: "Timer";
-    }>;
-    emptyMessage: z.ZodOptional<z.ZodObject<import("./TranslationConfig").MessageDescriptorZod, z.core.$strip>>;
 }, z.core.$strip>;
 export type WorkqueueConfig = z.infer<typeof WorkqueueConfig>;
 export type WorkqueueConfigWithoutQuery = z.infer<typeof WorkqueueConfigWithoutQuery>;

package/dist/commons/events/locations.d.ts

@@ -1,7 +1,8 @@
+import { UUID } from '../uuid';
 import * as z from 'zod/v4';
 import { EventIndex } from './EventIndex';
 import { ActionCreationMetadata, RegistrationCreationMetadata } from './EventMetadata';
-import { RecordScopeV2 } from '../scopes';
+import { RecordScopeV2, UserScopeV2 } from '../scopes';
 import { SystemContext, UserContext } from '../users/User';
 /** @deprecated Moving on, location types are arbitrary and defined by the country config. */
 export declare const LocationTypeV1: z.ZodEnum<{
@@ -51,11 +52,47 @@ export type EventIndexWithAdministrativeHierarchy = Omit<ToArrayFields<EventInde
  *
  */
 export declare function canAccessEventWithScope(event: Partial<EventIndexWithAdministrativeHierarchy>, scope: RecordScopeV2, user: UserContext | SystemContext, customActionType?: string): boolean;
+export type UserWithResolvedHierarchy = {
+    role: string;
+    administrativeHierarchy: UUID[];
+    primaryOfficeId: UUID;
+};
+export declare function canAccessUserWithScope({ userToAccess, scope, user }: {
+    userToAccess: UserWithResolvedHierarchy;
+    scope: UserScopeV2;
+    user: UserContext | SystemContext;
+}): boolean;
+export declare function canAccessOtherUserWithScopes({ scopes, userToAccess, user }: {
+    scopes: UserScopeV2[];
+    userToAccess: UserWithResolvedHierarchy;
+    user: UserContext | SystemContext;
+}): boolean;
 /**
  * Given indexed event and list of resolved scopes, determine if any of the scopes allow access to the event.
  *
  * One of the scopes must allow access for the event to be accessible.
  */
 export declare function userCanAccessEventWithScopes(event: Partial<EventIndexWithAdministrativeHierarchy>, scopes: RecordScopeV2[], user: UserContext | SystemContext, customActionType?: string): boolean;
+export declare function getAdministrativeAreaHierarchy(administrativeAreaId: string | undefined | null, administrativeAreas: Map<UUID, AdministrativeArea>): {
+    id: string & z.core.$brand<"UUID">;
+    name: string;
+    parentId: (string & z.core.$brand<"UUID">) | null;
+    validUntil: string | null;
+    externalId?: string | null | undefined;
+}[];
+/**
+ * Resolves a location or administrative area UUID into a root-first hierarchy of UUIDs.
+ *
+ * If the ID refers to a `Location` (e.g. CRVS office), the hierarchy includes
+ * the administrative area ancestors followed by the location itself.
+ * If the ID refers to an `AdministrativeArea`, returns the area's ancestor chain (root-first).
+ *
+ * Uses `getAdministrativeAreaHierarchy` which returns leaf-first order,
+ * so the result is reversed to match the root-first convention used by the server.
+ */
+export declare function getLocationHierarchy(selectedId: UUID, context: {
+    administrativeAreas: Map<UUID, AdministrativeArea>;
+    locations: Map<UUID, Location>;
+}): UUID[];
 export {};
 //# sourceMappingURL=locations.d.ts.map

package/dist/commons/events/mocks.test.utils.d.ts

@@ -0,0 +1,19 @@
+import { AdministrativeArea, Location } from './locations';
+export declare const V2_DEFAULT_MOCK_ADMINISTRATIVE_AREAS: AdministrativeArea[];
+export declare const V2_DEFAULT_MOCK_LOCATIONS: Location[];
+export declare const V2_DEFAULT_MOCK_LOCATIONS_MAP: Map<string & import("zod").$brand<"UUID">, {
+    id: string & import("zod").$brand<"UUID">;
+    name: string;
+    administrativeAreaId: (string & import("zod").$brand<"UUID">) | null;
+    validUntil: string | null;
+    locationType: string | null;
+    externalId?: string | null | undefined;
+}>;
+export declare const V2_DEFAULT_MOCK_ADMINISTRATIVE_AREAS_MAP: Map<string & import("zod").$brand<"UUID">, {
+    id: string & import("zod").$brand<"UUID">;
+    name: string;
+    parentId: (string & import("zod").$brand<"UUID">) | null;
+    validUntil: string | null;
+    externalId?: string | null | undefined;
+}>;
+//# sourceMappingURL=mocks.test.utils.d.ts.map

package/dist/commons/events/scopes.d.ts

@@ -1,8 +1,9 @@
 import { DisplayableAction } from './ActionType';
-import { EncodedScope } from '../scopes';
+import { EncodedScope, UserScopeV2 } from '../scopes';
 import { EventIndexWithAdministrativeHierarchy } from './locations';
 import { UserContext } from '../users/User';
 import { EventIndex } from './EventIndex';
+import { UUID } from 'src/uuid';
 export declare const ACTION_SCOPE_MAP: {
     READ: "record.read"[];
     CREATE: "record.create"[];
@@ -53,4 +54,26 @@ export declare function isActionInScope({ scopes, action, event, currentUser }:
     event: EventIndexWithAdministrativeHierarchy;
     currentUser: UserContext;
 }): boolean;
+/**
+ *
+ *
+ * @param allRoles - All possible roles in the system
+ * @param userLocation - The location and role information of the user whose role options are being determined
+ * @param acceptedScopes - The scopes of the user requesting the role update, used to determine which roles they can assign.
+ * @param userRequesting - The user context of the user requesting the role update, used to check location-based access to the target user's location.
+ *
+ * @returns An array of roles that the requesting user is allowed to assign to the target user based on their scopes and location
+ *
+ * 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.
+ * 2) Used to check if payload includes valid role.
+ */
+export declare function getAvailableRolesForUserUpdatePayload({ allRoles, userLocation, acceptedScopes, userRequesting }: {
+    allRoles: string[];
+    userRequesting: UserContext;
+    acceptedScopes: UserScopeV2[];
+    userLocation: {
+        administrativeHierarchy: UUID[];
+        primaryOfficeId: UUID;
+    };
+}): string[];
 //# sourceMappingURL=scopes.d.ts.map

package/dist/commons/events/state/index.d.ts

@@ -9,7 +9,6 @@ import { UUID } from '../../uuid';
 import { DocumentPath } from '../../documents';
 export declare function getStatusFromActions(actions: Array<Action>): "CREATED" | "NOTIFIED" | "DECLARED" | "REGISTERED" | "ARCHIVED";
 export declare function getAssignedUserFromActions(actions: Array<ActionDocument>): string | null;
-export declare function getAssignedUserSignatureFromActions(actions: Array<ActionDocument>): string | null;
 type NonNullableDeep<T> = T extends [unknown, ...unknown[]] ? {
     [K in keyof T]: NonNullableDeep<NonNullable<T[K]>>;
 } : T extends UUID ? T : T extends DocumentPath ? T : T extends string ? NonNullable<T> : T extends (infer U)[] ? NonNullableDeep<U>[] : T extends object ? {
@@ -73,7 +72,6 @@ export declare function applyDraftToEventIndex(eventIndex: EventIndex, draft: Dr
             createdAtLocation?: (string & import("zod").$brand<"UUID">) | null | undefined;
             createdByUserType?: "user" | "system" | null | undefined;
             createdByRole?: string | undefined;
-            createdBySignature?: string | null | undefined;
         } | null | undefined;
         REGISTERED?: {
             createdAt: string;
@@ -83,7 +81,6 @@ export declare function applyDraftToEventIndex(eventIndex: EventIndex, draft: Dr
             createdAtLocation?: (string & import("zod").$brand<"UUID">) | null | undefined;
             createdByUserType?: "user" | "system" | null | undefined;
             createdByRole?: string | undefined;
-            createdBySignature?: string | null | undefined;
         } | null | undefined;
     };
     createdAt: string;
@@ -101,7 +98,6 @@ export declare function applyDraftToEventIndex(eventIndex: EventIndex, draft: Dr
     createdByUserType?: "user" | "system" | null | undefined;
     updatedByUserRole?: string | null | undefined;
     createdAtLocation?: (string & import("zod").$brand<"UUID">) | null | undefined;
-    createdBySignature?: (string & import("zod").$brand<"DocumentPath">) | null | undefined;
     updatedAtLocation?: (string & import("zod").$brand<"UUID">) | null | undefined;
     assignedTo?: string | null | undefined;
     updatedBy?: string | null | undefined;

package/dist/commons/events/state/utils.d.ts

@@ -312,7 +312,6 @@ export declare function getLegalStatuses(actions: Action[]): {
         createdAtLocation: (string & import("zod").$brand<"UUID">) | null | undefined;
         acceptedAt: string;
         createdByRole: string | undefined;
-        createdBySignature: (string & import("zod").$brand<"DocumentPath">) | null | undefined;
         registrationNumber: string | null | undefined;
     } | null;
     REGISTERED: {
@@ -322,7 +321,6 @@ export declare function getLegalStatuses(actions: Action[]): {
         createdAtLocation: (string & import("zod").$brand<"UUID">) | null | undefined;
         acceptedAt: string;
         createdByRole: string | undefined;
-        createdBySignature: (string & import("zod").$brand<"DocumentPath">) | null | undefined;
         registrationNumber: string | null | undefined;
     } | null;
 };

package/dist/commons/events/utils.d.ts

@@ -131,7 +131,7 @@ export declare function isPageVisible(page: PageConfig, formValues: ActionUpdate
  * * @param validatorContext - custom validation context
  * @returns {Partial<T>} A new object containing only the values for visible fields
  */
-export declare function omitHiddenFields<T extends EventState | ActionUpdate>(fields: FieldConfig[], formValues: T, validatorContext: ValidatorContext, includeHiddenFieldsWithNullValues?: boolean, declarationContext?: EventState): Partial<T>;
+export declare function omitHiddenFields<T extends EventState | ActionUpdate>(fields: FieldConfig[], formValues: T, validatorContext: ValidatorContext, includeHiddenFieldsWithNullValues?: boolean): Partial<T>;
 export declare function omitHiddenPaginatedFields<T extends EventState | ActionUpdate>(formConfig: FormConfig, values: T, validatorContext: ValidatorContext, includeHiddenFieldsWithNullValues?: boolean): Partial<Partial<T>>;
 /**
  *

package/dist/conditionals/index.js

@@ -182,6 +182,10 @@ var scopeByEvent = z6.preprocess(
   (val) => val === void 0 ? void 0 : [val].flat(),
   z6.array(z6.string()).optional()
 ).describe("Event type, e.g. birth, death");
+var userRole = z6.preprocess(
+  (val) => val === void 0 ? void 0 : [val].flat(),
+  z6.array(z6.string()).optional()
+).describe("User role, e.g. admin, field agent");
 var scopeOptionsPlaceEvent = z6.object({
   event: scopeByEvent,
   placeOfEvent: JurisdictionFilter.optional()
@@ -205,6 +209,9 @@ var CustomActionScopeOptions = AllRecordScopeOptions.extend({
 var AccessLevelOptions = z6.object({
   accessLevel: JurisdictionFilter.optional()
 });
+var AllUserScopeOptions = AccessLevelOptions.extend({
+  role: userRole.optional()
+});
 var WorkqueueOrDashboardOptions = z6.object({
   ids: z6.preprocess(
     (val) => val === void 0 ? void 0 : [val].flat(),
@@ -214,6 +221,7 @@ var WorkqueueOrDashboardOptions = z6.object({
 var AllScopeOptions = z6.object({
   ...AllRecordScopeOptions.shape,
   ...AccessLevelOptions.shape,
+  ...AllUserScopeOptions.shape,
   ...WorkqueueOrDashboardOptions.shape
 });
 var ScopeOptionKey = AllScopeOptions.keyof();
@@ -286,6 +294,30 @@ var RecordScopeV2 = z6.discriminatedUnion("type", [
 ]).describe(
   "Scopes used to check user's permission to perform actions on a record."
 );
+var SystemScopeType = z6.enum([
+  "organisation.read-locations",
+  "user.read",
+  "user.create",
+  "user.edit",
+  "user.search"
+]);
+var UserScopeType = SystemScopeType.extract([
+  "user.read",
+  "user.create",
+  "user.edit",
+  "user.search"
+]);
+var ScopesWithRoleOption = UserScopeType.extract(["user.edit", "user.create"]);
+var UserScopeV2 = z6.discriminatedUnion("type", [
+  z6.object({
+    type: ScopesWithRoleOption,
+    options: AllUserScopeOptions.optional()
+  }),
+  z6.object({
+    type: UserScopeType.extract(["user.read", "user.search"]),
+    options: AccessLevelOptions.optional()
+  })
+]);
 var ResolvedRecordScopeV2 = z6.discriminatedUnion("type", [
   z6.object({
     type: ScopesWithPlaceEventOptions,
@@ -306,16 +338,14 @@ var ResolvedRecordScopeV2 = z6.discriminatedUnion("type", [
     }).optional()
   })
 ]).describe("Resolved scope with location/user IDs instead of filters.");
-var SystemScopeType = z6.enum([
-  "organisation.read-locations",
-  "user.read",
-  "user.create",
-  "user.edit"
-]);
 var Scope2 = z6.discriminatedUnion("type", [
   z6.object({ type: PlainScopeType }),
   ...RecordScopeV2.options,
-  z6.object({ type: SystemScopeType, options: AccessLevelOptions.optional() }),
+  ...UserScopeV2.options,
+  z6.object({
+    type: z6.literal("organisation.read-locations"),
+    options: AccessLevelOptions.optional()
+  }),
   z6.object({
     type: z6.literal("workqueue"),
     options: WorkqueueOrDashboardOptions
@@ -335,7 +365,9 @@ var ScopeType2 = z6.enum([
 var EncodedScope2 = z6.string().brand("EncodedScope");
 var DEFAULT_SCOPE_OPTIONS = {
   placeOfEvent: JurisdictionFilter.enum.all,
-  accessLevel: JurisdictionFilter.enum.all
+  accessLevel: JurisdictionFilter.enum.all,
+  registeredIn: JurisdictionFilter.enum.all,
+  declaredIn: JurisdictionFilter.enum.all
 };
 
 // ../commons/src/users/userReferences.ts