@opencrvs/toolkit 1.9.2-rc.ebb7011 → 1.9.2-rc.f0b9560

package/dist/notification/index.js

@@ -77,8 +77,8 @@ var ActionType = {
   NOTIFY: "NOTIFY",
   // Declaration actions
   DECLARE: "DECLARE",
-  VALIDATE: "VALIDATE",
   REGISTER: "REGISTER",
+  EDIT: "EDIT",
   // Declaration system actions. Non-configurable.
   DUPLICATE_DETECTED: "DUPLICATE_DETECTED",
   REJECT: "REJECT",
@@ -101,7 +101,7 @@ var ActionType = {
 var ConfirmableActions = [
   ActionType.NOTIFY,
   ActionType.DECLARE,
-  ActionType.VALIDATE,
+  ActionType.EDIT,
   ActionType.REGISTER,
   ActionType.REJECT,
   ActionType.ARCHIVE,
@@ -116,7 +116,7 @@ var ActionTypes = z2.enum([
   "CREATE",
   "NOTIFY",
   "DECLARE",
-  "VALIDATE",
+  "EDIT",
   "REGISTER",
   "DUPLICATE_DETECTED",
   "REJECT",
@@ -137,7 +137,7 @@ var ClientSpecificAction = {
 };
 var declarationActionValues = [
   ActionTypes.enum.DECLARE,
-  ActionTypes.enum.VALIDATE,
+  ActionTypes.enum.EDIT,
   ActionTypes.enum.REGISTER,
   ActionTypes.enum.NOTIFY,
   ActionTypes.enum.DUPLICATE_DETECTED
@@ -267,7 +267,7 @@ var FieldType = {
   QR_READER: "QR_READER",
   ID_READER: "ID_READER",
   LOADER: "LOADER",
-  CUSTOM: "CUSTOM"
+  ALPHA_HIDDEN: "ALPHA_HIDDEN"
 };
 var FileFieldType = z4.enum([
   FieldType.FILE,
@@ -292,7 +292,8 @@ var FieldTypesToHideInReview = [
   FieldType.LOADER,
   FieldType.HTTP,
   FieldType.QUERY_PARAM_READER,
-  FieldType.DATA
+  FieldType.DATA,
+  FieldType.ALPHA_HIDDEN
 ];
 
 // ../commons/src/events/FieldValue.ts
@@ -394,10 +395,10 @@ var ReadDataValue = z6.object({
 });
 var QrReaderFieldValue = ReadDataValue;
 var IdReaderFieldValue = ReadDataValue;
-var CustomFieldValue = z6.unknown();
 
 // ../commons/src/events/FieldValue.ts
 var TextValue = z7.string();
+var HiddenFieldValue = z7.string();
 var NonEmptyTextValue = TextValue.min(1);
 var DateValue = z7.iso.date().describe("Date in the format YYYY-MM-DD");
 var AgeValue = z7.object({
@@ -449,8 +450,7 @@ var FieldValuesWithoutDataField = z7.union([
   VerificationStatusValue,
   QueryParamReaderFieldValue,
   QrReaderFieldValue,
-  IdReaderFieldValue,
-  CustomFieldValue
+  IdReaderFieldValue
 ]);
 var DataFieldValue = z7.object({
   data: z7.record(z7.string(), FieldValuesWithoutDataField)
@@ -525,7 +525,7 @@ var FieldUpdateValue = safeUnion([
   NameFieldUpdateValue.describe("NameFieldUpdateValue"),
   HttpFieldUpdateValue.describe("HttpFieldUpdateValue"),
   QueryParamReaderFieldUpdateValue.describe("QueryParamReaderFieldUpdateValue"),
-  CustomFieldValue.describe("CustomFieldValue")
+  HiddenFieldValue.describe("HiddenFieldValue")
 ]);
 
 // ../commons/src/uuid.ts
@@ -786,7 +786,7 @@ var RecordScopeType = z10.enum([
   "record.read",
   "record.declare",
   "record.notify",
-  "record.declared.validate",
+  "record.declared.edit",
   "record.declared.reject",
   "record.declared.archive",
   "record.declared.review-duplicates",
@@ -1032,11 +1032,6 @@ var DeclareAction = ActionBase.extend(
     type: z12.literal(ActionType.DECLARE)
   }).shape
 );
-var ValidateAction = ActionBase.extend(
-  z12.object({
-    type: z12.literal(ActionType.VALIDATE)
-  }).shape
-);
 var ReasonContent = z12.object({
   reason: z12.string().min(1, { error: "Message cannot be empty" }).describe(
     "Message describing the reason for rejecting or archiving the event."
@@ -1089,6 +1084,14 @@ var NotifiedAction = ActionBase.extend(
     type: z12.literal(ActionType.NOTIFY)
   }).shape
 );
+var EditAction = ActionBase.extend(
+  z12.object({
+    type: z12.literal(ActionType.EDIT),
+    content: z12.object({
+      comment: z12.string().describe("Comment for the edit action.").optional()
+    })
+  }).shape
+);
 var PrintContent = z12.object({
   templateId: z12.string().optional()
 });
@@ -1131,7 +1134,6 @@ var CustomAction = ActionBase.merge(
 );
 var ActionDocument = z12.discriminatedUnion("type", [
   CreatedAction.meta({ id: "CreatedAction" }),
-  ValidateAction.meta({ id: "ValidateAction" }),
   RejectAction.meta({ id: "RejectAction" }),
   DuplicateDetectedAction.meta({ id: "DuplicateDetectedAction" }),
   MarkNotDuplicateAction.meta({ id: "MarkNotDuplicateAction" }),
@@ -1147,6 +1149,7 @@ var ActionDocument = z12.discriminatedUnion("type", [
   UnassignedAction.meta({ id: "UnassignedAction" }),
   PrintCertificateAction.meta({ id: "PrintCertificateAction" }),
   ReadAction.meta({ id: "ReadAction" }),
+  EditAction.meta({ id: "EditAction" }),
   CustomAction.meta({ id: "CustomAction" })
 ]).meta({
   id: "ActionDocument"
@@ -1169,7 +1172,14 @@ var InherentFlags = {
   INCOMPLETE: "incomplete",
   REJECTED: "rejected",
   CORRECTION_REQUESTED: "correction-requested",
-  POTENTIAL_DUPLICATE: "potential-duplicate"
+  POTENTIAL_DUPLICATE: "potential-duplicate",
+  /**
+   * This flag is set by the Edit-action and removed after the declaration or registration.
+   * A record should never stay with the EDIT_IN_PROGRESS flag, since it should always be declared or registered right after.
+   *
+   * We only use this flag to determine that a NOTIFY, DECLARE or REGISTER action is allowed next.
+   */
+  EDIT_IN_PROGRESS: "edit-in-progress"
 };
 var ActionFlag = z13.string().regex(
   new RegExp(
@@ -1240,6 +1250,7 @@ var EventMetadata = z14.object({
   ),
   createdAt: z14.iso.datetime().describe("The timestamp when the event was first created and saved."),
   dateOfEvent: ZodDate.nullish(),
+  placeOfEvent: CreatedAtLocation,
   createdBy: z14.string().describe("ID of the user who created the event."),
   createdByUserType: z14.enum(["user", "system"]).nullish().describe("Whether the user is a normal user or a system."),
   updatedByUserRole: z14.string().describe("Role of the user who last changed the status."),
@@ -1269,6 +1280,7 @@ var EventMetadataKeysArray = [
   "status",
   "createdAt",
   "dateOfEvent",
+  "placeOfEvent",
   "createdBy",
   "createdByUserType",
   "updatedByUserRole",
@@ -1954,12 +1966,6 @@ var IdReaderField = BaseField.extend({
     z16.union([QrReaderField, LinkButtonField]).describe("Methods for reading an ID")
   )
 });
-var CustomField = BaseField.extend({
-  type: z16.literal(FieldType.CUSTOM),
-  defaultValue: CustomFieldValue.optional(),
-  src: z16.string().describe("Module source path for the custom field component"),
-  configuration: z16.unknown().optional()
-});
 var LoaderField = BaseField.extend({
   type: z16.literal(FieldType.LOADER),
   configuration: z16.object({
@@ -1968,6 +1974,13 @@ var LoaderField = BaseField.extend({
 }).describe(
   "A non-interactive field that indicates an in progress operation in form"
 );
+var HiddenField = BaseField.extend({
+  type: z16.literal(FieldType.ALPHA_HIDDEN),
+  required: z16.boolean().default(false).optional(),
+  defaultValue: TextValue.optional()
+}).describe(
+  "A non-interactive, hidden field that only hold a value in the form"
+);
 var FieldConfig = z16.discriminatedUnion("type", [
   Address,
   TextField,
@@ -2008,7 +2021,7 @@ var FieldConfig = z16.discriminatedUnion("type", [
   QueryParamReaderField,
   LoaderField,
   SearchField,
-  CustomField
+  HiddenField
 ]).meta({
   description: "Form field configuration",
   id: "FieldConfig"
@@ -2247,6 +2260,7 @@ var AvailableIcons = z20.enum([
   "Users",
   "WarningCircle",
   "X",
+  "ChatText",
   "CircleWavyCheck",
   "CircleWavyQuestion",
   "ArchiveBox",
@@ -2312,11 +2326,6 @@ var RejectConfig = ActionConfigBase.extend(
     type: z21.literal(ActionType.REJECT)
   }).shape
 );
-var ValidateConfig = DeclarationActionBase.extend(
-  z21.object({
-    type: z21.literal(ActionType.VALIDATE)
-  }).shape
-);
 var RegisterConfig = DeclarationActionBase.extend(
   z21.object({
     type: z21.literal(ActionType.REGISTER)
@@ -2352,7 +2361,6 @@ var ActionConfig = z21.discriminatedUnion("type", [
   ReadActionConfig.meta({ id: "ReadActionConfig" }),
   DeclareConfig.meta({ id: "DeclareActionConfig" }),
   RejectConfig.meta({ id: "RejectActionConfig" }),
-  ValidateConfig.meta({ id: "ValidateActionConfig" }),
   RegisterConfig.meta({ id: "RegisterActionConfig" }),
   PrintCertificateActionConfig.meta({
     id: "PrintCertificateActionConfig"
@@ -2367,7 +2375,6 @@ var actionConfigTypes = new Set(
 );
 var DeclarationActionConfig = z21.discriminatedUnion("type", [
   DeclareConfig,
-  ValidateConfig,
   RegisterConfig
 ]);
 
@@ -2688,6 +2695,9 @@ var EventConfig = z29.object({
   dateOfEvent: FieldReference.optional().describe(
     "Reference to the field capturing the date of the event (e.g. date of birth). Defaults to the event creation date if unspecified."
   ),
+  placeOfEvent: FieldReference.optional().describe(
+    "Reference to the field capturing the place of the event (e.g. place of birth). Defaults to the meta.createdAtLocation if unspecified."
+  ),
   title: TranslationConfig.describe(
     'Title template for the singular event, supporting variables (e.g. "{applicant.name.firstname} {applicant.name.surname}").'
   ),
@@ -2762,10 +2772,23 @@ var EventConfig = z29.object({
       });
     }
   }
+  if (event2.placeOfEvent) {
+    const eventPlaceFieldId = getDeclarationFields(event2).find(
+      ({ id }) => id === event2.placeOfEvent?.$$field
+    );
+    if (!eventPlaceFieldId) {
+      ctx.addIssue({
+        code: "custom",
+        message: `Place of event field id must match a field id in the event.declaration fields.
+            Invalid place of event field ID for event ${event2.id}: ${event2.placeOfEvent.$$field}`,
+        path: ["placeOfEvent"]
+      });
+    }
+  }
   const isInherentFlag = (value) => Object.values(InherentFlags).includes(value);
-  const configuredFlagIds = event2.flags.map((flag2) => flag2.id);
+  const configuredFlagIds = event2.flags.map((flag) => flag.id);
   const actionFlagIds = event2.actions.flatMap(
-    (action) => action.flags.map((flag2) => flag2.id)
+    (action) => action.flags.map((flag) => flag.id)
   );
   for (const actionFlagId of actionFlagIds) {
     const isConfigured = configuredFlagIds.includes(actionFlagId);
@@ -2968,21 +2991,6 @@ function defineComparison(field3, value, keyword) {
     required: [field3.$$field]
   });
 }
-function flag(flagvalue) {
-  return defineConditional({
-    type: "object",
-    properties: {
-      $flags: {
-        type: "array",
-        contains: {
-          type: "string",
-          const: flagvalue
-        }
-      }
-    },
-    required: ["$flags"]
-  });
-}
 function createFieldConditionals(fieldId) {
   const getDayRange = (field3, days, clause) => ({
     type: "object",
@@ -3674,11 +3682,6 @@ var RegisterActionInput = BaseActionInput.extend(
     registrationNumber: z33.string().optional()
   }).shape
 );
-var ValidateActionInput = BaseActionInput.extend(
-  z33.object({
-    type: z33.literal(ActionType.VALIDATE).default(ActionType.VALIDATE)
-  }).shape
-);
 var NotifyActionInput = BaseActionInput.extend(
   z33.object({
     type: z33.literal(ActionType.NOTIFY).default(ActionType.NOTIFY)
@@ -3697,6 +3700,14 @@ var DeclareActionInput = BaseActionInput.extend(
     type: z33.literal(ActionType.DECLARE).default(ActionType.DECLARE)
   }).shape
 );
+var EditActionInput = BaseActionInput.extend(
+  z33.object({
+    type: z33.literal(ActionType.EDIT).default(ActionType.EDIT),
+    content: z33.object({
+      comment: z33.string().describe("Comment for the edit action.").optional()
+    })
+  }).shape
+);
 var PrintCertificateActionInput = BaseActionInput.extend(
   z33.object({
     type: z33.literal(ActionType.PRINT_CERTIFICATE).default(ActionType.PRINT_CERTIFICATE),
@@ -3780,7 +3791,6 @@ var CustomActionInput = BaseActionInput.extend(
 );
 var ActionInput = z33.discriminatedUnion("type", [
   CreateActionInput.meta({ id: "CreateActionInput" }),
-  ValidateActionInput.meta({ id: "ValidateActionInput" }),
   RegisterActionInput.meta({ id: "RegisterActionInput" }),
   NotifyActionInput.meta({ id: "NotifyActionInput" }),
   DeclareActionInput.meta({ id: "DeclareActionInput" }),
@@ -3808,7 +3818,8 @@ var ActionInput = z33.discriminatedUnion("type", [
     id: "ApproveCorrectionActionInput"
   }),
   ReadActionInput.meta({ id: "ReadActionInput" }),
-  CustomActionInput.meta({ id: "CustomActionInput" })
+  CustomActionInput.meta({ id: "CustomActionInput" }),
+  EditActionInput.meta({ id: "EditActionInput" })
 ]).meta({
   id: "ActionInput"
 });
@@ -3866,7 +3877,6 @@ var updateActions = ActionTypes.extract([
   ActionType.CREATE,
   ActionType.NOTIFY,
   ActionType.DECLARE,
-  ActionType.VALIDATE,
   ActionType.REGISTER,
   ActionType.REJECT,
   ActionType.ARCHIVE,
@@ -5128,17 +5138,6 @@ var tennisClubMembershipEvent = defineConfig({
       }
     ]
   },
-  flags: [
-    {
-      id: "validated",
-      label: {
-        id: "event.tennis-club-membership.flag.validated",
-        defaultMessage: "Validated",
-        description: "Flag label for validated"
-      },
-      requiresAction: true
-    }
-  ],
   actions: [
     {
       type: ActionType.READ,
@@ -5158,26 +5157,13 @@ var tennisClubMembershipEvent = defineConfig({
       },
       review: TENNIS_CLUB_DECLARATION_REVIEW
     },
-    {
-      type: ActionType.VALIDATE,
-      label: {
-        defaultMessage: "Validate",
-        description: "This is shown as the action name anywhere the user can trigger the action from",
-        id: "event.tennis-club-membership.action.validate.label"
-      },
-      flags: [{ id: "validated", operation: "add" }],
-      conditionals: [
-        { type: ConditionalType.SHOW, conditional: not(flag("validated")) }
-      ]
-    },
     {
       type: ActionType.REJECT,
       label: {
         defaultMessage: "Reject",
         description: "This is shown as the action name anywhere the user can trigger the action from",
         id: "event.tennis-club-membership.action.reject.label"
-      },
-      flags: [{ id: "validated", operation: "remove" }]
+      }
     },
     {
       type: ActionType.REGISTER,
@@ -5500,14 +5486,6 @@ var footballClubMembershipEvent = defineConfig({
       },
       review: TENNIS_CLUB_DECLARATION_REVIEW
     },
-    {
-      type: ActionType.VALIDATE,
-      label: {
-        defaultMessage: "Validate",
-        description: "This is shown as the action name anywhere the user can trigger the action from",
-        id: "event.football-club-membership.action.validate.label"
-      }
-    },
     {
       type: ActionType.REGISTER,
       label: {
@@ -6032,10 +6010,6 @@ var ChildOnboardingEvent = defineConfig({
       label: generateTranslationConfig("Declare"),
       review: CHILD_ONBOARDING_DECLARATION_REVIEW
     },
-    {
-      type: ActionType.VALIDATE,
-      label: generateTranslationConfig("Validate")
-    },
     {
       type: ActionType.REGISTER,
       label: generateTranslationConfig("Register")
@@ -6062,13 +6036,9 @@ var ACTION_SCOPE_MAP = {
   [ActionType.READ]: ["record.read"],
   [ActionType.CREATE]: ["record.create"],
   [ActionType.NOTIFY]: ["record.notify"],
-  [ActionType.DECLARE]: [
-    "record.declare",
-    "record.declared.validate",
-    "record.register"
-  ],
+  [ActionType.DECLARE]: ["record.declare", "record.register"],
+  [ActionType.EDIT]: ["record.declared.edit"],
   [ActionType.DELETE]: ["record.declare"],
-  [ActionType.VALIDATE]: ["record.declared.validate", "record.register"],
   [ActionType.REGISTER]: ["record.register"],
   [ActionType.PRINT_CERTIFICATE]: ["record.registered.print-certified-copies"],
   [ActionType.REQUEST_CORRECTION]: [
@@ -6109,12 +6079,12 @@ var AVAILABLE_ACTIONS_BY_EVENT_STATUS = {
   ],
   [EventStatus.enum.DECLARED]: [
     ActionType.READ,
-    ActionType.VALIDATE,
     ActionType.REGISTER,
     ActionType.MARK_AS_DUPLICATE,
     ActionType.ARCHIVE,
     ActionType.REJECT,
-    ActionType.CUSTOM
+    ActionType.CUSTOM,
+    ActionType.EDIT
   ],
   [EventStatus.enum.REGISTERED]: [
     ActionType.READ,
@@ -6133,16 +6103,16 @@ var AVAILABLE_ACTIONS_BY_EVENT_STATUS = {
   ]
 };
 var ACTION_FILTERS = {
-  [ActionType.PRINT_CERTIFICATE]: (flags) => !flags.includes(InherentFlags.CORRECTION_REQUESTED) && !flags.some((flag2) => flag2.endsWith(":requested")),
-  [ActionType.REQUEST_CORRECTION]: (flags) => !flags.includes(InherentFlags.CORRECTION_REQUESTED) && !flags.some((flag2) => flag2.endsWith(":requested")),
-  [ClientSpecificAction.REVIEW_CORRECTION_REQUEST]: (flags) => flags.includes(InherentFlags.CORRECTION_REQUESTED) && !flags.some((flag2) => flag2.endsWith(":requested")),
-  [ActionType.APPROVE_CORRECTION]: (flags) => flags.includes(InherentFlags.CORRECTION_REQUESTED) && !flags.some((flag2) => flag2.endsWith(":requested")),
-  [ActionType.REJECT_CORRECTION]: (flags) => flags.includes(InherentFlags.CORRECTION_REQUESTED) && !flags.some((flag2) => flag2.endsWith(":requested")),
-  [ActionType.MARK_AS_DUPLICATE]: (flags) => flags.includes(InherentFlags.POTENTIAL_DUPLICATE) && !flags.some((flag2) => flag2.endsWith(":requested")),
-  [ActionType.VALIDATE]: (flags) => !flags.includes(InherentFlags.POTENTIAL_DUPLICATE) && !flags.some((flag2) => flag2.endsWith(":requested")),
-  [ActionType.REGISTER]: (flags) => !flags.includes(InherentFlags.POTENTIAL_DUPLICATE) && !flags.some((flag2) => flag2.endsWith(":requested")),
-  [ActionType.REJECT]: (flags) => !flags.includes(InherentFlags.REJECTED) && !flags.some((flag2) => flag2.endsWith(":requested")),
-  [ActionType.ARCHIVE]: (flags) => !flags.some((flag2) => flag2.endsWith(":requested"))
+  [ActionType.PRINT_CERTIFICATE]: (flags) => !flags.includes(InherentFlags.CORRECTION_REQUESTED) && !flags.some((flag) => flag.endsWith(":requested")),
+  [ActionType.REQUEST_CORRECTION]: (flags) => !flags.includes(InherentFlags.CORRECTION_REQUESTED) && !flags.some((flag) => flag.endsWith(":requested")),
+  [ClientSpecificAction.REVIEW_CORRECTION_REQUEST]: (flags) => flags.includes(InherentFlags.CORRECTION_REQUESTED) && !flags.some((flag) => flag.endsWith(":requested")),
+  [ActionType.APPROVE_CORRECTION]: (flags) => flags.includes(InherentFlags.CORRECTION_REQUESTED) && !flags.some((flag) => flag.endsWith(":requested")),
+  [ActionType.REJECT_CORRECTION]: (flags) => flags.includes(InherentFlags.CORRECTION_REQUESTED) && !flags.some((flag) => flag.endsWith(":requested")),
+  [ActionType.MARK_AS_DUPLICATE]: (flags) => flags.includes(InherentFlags.POTENTIAL_DUPLICATE) && !flags.some((flag) => flag.endsWith(":requested")),
+  [ActionType.EDIT]: (flags) => !flags.includes(InherentFlags.POTENTIAL_DUPLICATE) && !flags.some((flag) => flag.endsWith(":requested")),
+  [ActionType.REGISTER]: (flags) => !flags.includes(InherentFlags.POTENTIAL_DUPLICATE) && !flags.some((flag) => flag.endsWith(":requested")),
+  [ActionType.REJECT]: (flags) => !flags.includes(InherentFlags.REJECTED) && !flags.some((flag) => flag.endsWith(":requested")),
+  [ActionType.ARCHIVE]: (flags) => !flags.some((flag) => flag.endsWith(":requested"))
 };
 
 // ../commons/src/events/FileUtils.ts

package/dist/scopes/index.d.ts

@@ -82,7 +82,7 @@ export declare const RecordScopeType: z.ZodEnum<{
     "record.create": "record.create";
     "record.declare": "record.declare";
     "record.notify": "record.notify";
-    "record.declared.validate": "record.declared.validate";
+    "record.declared.edit": "record.declared.edit";
     "record.declared.reject": "record.declared.reject";
     "record.declared.archive": "record.declared.archive";
     "record.declared.review-duplicates": "record.declared.review-duplicates";
@@ -99,7 +99,7 @@ export declare const RecordScope: z.ZodObject<{
         "record.create": "record.create";
         "record.declare": "record.declare";
         "record.notify": "record.notify";
-        "record.declared.validate": "record.declared.validate";
+        "record.declared.edit": "record.declared.edit";
         "record.declared.reject": "record.declared.reject";
         "record.declared.archive": "record.declared.archive";
         "record.declared.review-duplicates": "record.declared.review-duplicates";
@@ -152,7 +152,7 @@ declare const ConfigurableRawScopes: z.ZodDiscriminatedUnion<[z.ZodObject<{
         "record.create": "record.create";
         "record.declare": "record.declare";
         "record.notify": "record.notify";
-        "record.declared.validate": "record.declared.validate";
+        "record.declared.edit": "record.declared.edit";
         "record.declared.reject": "record.declared.reject";
         "record.declared.archive": "record.declared.archive";
         "record.declared.review-duplicates": "record.declared.review-duplicates";
@@ -178,7 +178,7 @@ export declare const ConfigurableActionScopes: z.ZodDiscriminatedUnion<[z.ZodObj
         "record.create": "record.create";
         "record.declare": "record.declare";
         "record.notify": "record.notify";
-        "record.declared.validate": "record.declared.validate";
+        "record.declared.edit": "record.declared.edit";
         "record.declared.reject": "record.declared.reject";
         "record.declared.archive": "record.declared.archive";
         "record.declared.review-duplicates": "record.declared.review-duplicates";
@@ -196,7 +196,7 @@ export declare const ConfigurableActionScopes: z.ZodDiscriminatedUnion<[z.ZodObj
         customActionType: z.ZodArray<z.ZodString>;
     }, z.core.$strip>;
 }, z.core.$strip>], "type">;
-type ConfigurableRawScopes = z.infer<typeof ConfigurableRawScopes>;
+export type ConfigurableRawScopes = z.infer<typeof ConfigurableRawScopes>;
 export type ConfigurableScopeType = ConfigurableRawScopes['type'];
 type FlattenedSearchScope = {
     type: 'search';
@@ -227,7 +227,7 @@ export declare function findScope<T extends ConfigurableScopeType>(scopes: strin
 }, {
     type: T;
 }> | Extract<{
-    type: "record.unassign-others" | "record.register" | "record.read" | "record.create" | "record.declare" | "record.notify" | "record.declared.validate" | "record.declared.reject" | "record.declared.archive" | "record.declared.review-duplicates" | "record.registered.print-certified-copies" | "record.registered.request-correction" | "record.registered.correct";
+    type: "record.unassign-others" | "record.register" | "record.read" | "record.create" | "record.declare" | "record.notify" | "record.declared.edit" | "record.declared.reject" | "record.declared.archive" | "record.declared.review-duplicates" | "record.registered.print-certified-copies" | "record.registered.request-correction" | "record.registered.correct";
     options: {
         event: string[];
     };
@@ -244,6 +244,45 @@ export declare function findScope<T extends ConfigurableScopeType>(scopes: strin
 }> | Extract<FlattenedSearchScope, {
     type: T;
 }> | undefined;
+export declare function findScopes<T extends ConfigurableScopeType>(scopes: string[], scopeType: T): (Extract<{
+    type: "user.create";
+    options: {
+        role: string[];
+    };
+}, {
+    type: T;
+}> | Extract<{
+    type: "user.edit";
+    options: {
+        role: string[];
+    };
+}, {
+    type: T;
+}> | Extract<{
+    type: "workqueue";
+    options: {
+        id: string[];
+    };
+}, {
+    type: T;
+}> | Extract<{
+    type: "record.unassign-others" | "record.register" | "record.read" | "record.create" | "record.declare" | "record.notify" | "record.declared.edit" | "record.declared.reject" | "record.declared.archive" | "record.declared.review-duplicates" | "record.registered.print-certified-copies" | "record.registered.request-correction" | "record.registered.correct";
+    options: {
+        event: string[];
+    };
+}, {
+    type: T;
+}> | Extract<{
+    type: "record.custom-action";
+    options: {
+        event: string[];
+        customActionType: string[];
+    };
+}, {
+    type: T;
+}> | Extract<FlattenedSearchScope, {
+    type: T;
+}>)[];
 /**
  * Parses a configurable scope string into a ConfigurableRawScopes object.
  * @param {string} scope - The scope string to parse
@@ -274,7 +313,7 @@ export declare function parseConfigurableScope(scope: string): {
         id: string[];
     };
 } | {
-    type: "record.unassign-others" | "record.register" | "record.read" | "record.create" | "record.declare" | "record.notify" | "record.declared.validate" | "record.declared.reject" | "record.declared.archive" | "record.declared.review-duplicates" | "record.registered.print-certified-copies" | "record.registered.request-correction" | "record.registered.correct";
+    type: "record.unassign-others" | "record.register" | "record.read" | "record.create" | "record.declare" | "record.notify" | "record.declared.edit" | "record.declared.reject" | "record.declared.archive" | "record.declared.review-duplicates" | "record.registered.print-certified-copies" | "record.registered.request-correction" | "record.registered.correct";
     options: {
         event: string[];
     };

package/dist/scopes/index.js

@@ -38,6 +38,7 @@ __export(scopes_exports, {
   SCOPES: () => SCOPES,
   SearchScopes: () => SearchScopes,
   findScope: () => findScope,
+  findScopes: () => findScopes,
   getAuthorizedEventsFromScopes: () => getAuthorizedEventsFromScopes,
   parseConfigurableScope: () => parseConfigurableScope,
   parseLiteralScope: () => parseLiteralScope,
@@ -251,7 +252,7 @@ var RecordScopeType = z.enum([
   "record.read",
   "record.declare",
   "record.notify",
-  "record.declared.validate",
+  "record.declared.edit",
   "record.declared.reject",
   "record.declared.archive",
   "record.declared.review-duplicates",
@@ -313,6 +314,15 @@ function findScope(scopes2, scopeType) {
     (scope) => scope?.type === scopeType
   );
 }
+function findScopes(scopes2, scopeType) {
+  const parsedScopes = scopes2.map(parseConfigurableScope);
+  const searchScopes = parsedScopes.filter((scope) => scope?.type === "search");
+  const otherScopes = parsedScopes.filter((scope) => scope?.type !== "search");
+  const mergedSearchScope = flattenAndMergeScopes(searchScopes);
+  return [...otherScopes, mergedSearchScope].filter(
+    (scope) => scope?.type === scopeType
+  );
+}
 function getScopeOptions(rawOptions) {
   return rawOptions.split(",").reduce((acc, option) => {
     const [key, value] = option.split("=");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencrvs/toolkit",
-  "version": "1.9.2-rc.ebb7011",
+  "version": "1.9.2-rc.f0b9560",
   "description": "OpenCRVS toolkit for building country configurations",
   "license": "MPL-2.0",
   "exports": {