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

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

@@ -9,7 +9,7 @@ export declare const InherentFlags: {
      * 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 DECLARE or REGISTER action is allowed next.
+     * We only use this flag to determine that a NOTIFY, DECLARE or REGISTER action is allowed next.
      */
     readonly EDIT_IN_PROGRESS: "edit-in-progress";
 };
@@ -29,7 +29,7 @@ export declare const Flag: z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodEnum<{
      * 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 DECLARE or REGISTER action is allowed next.
+     * We only use this flag to determine that a NOTIFY, DECLARE or REGISTER action is allowed next.
      */
     readonly EDIT_IN_PROGRESS: "edit-in-progress";
 }>]>, z.ZodString]>;
@@ -57,7 +57,7 @@ export declare const ActionFlagConfig: z.ZodObject<{
          * 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 DECLARE or REGISTER action is allowed next.
+         * We only use this flag to determine that a NOTIFY, DECLARE or REGISTER action is allowed next.
          */
         readonly EDIT_IN_PROGRESS: "edit-in-progress";
     }>]>, z.ZodString]>;

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

@@ -37,7 +37,7 @@ export declare function configurableEventScopeAllowed(scopes: Scope[], allowedCo
  * @param {string} eventType - The type of event for which the action is being checked.
  * @returns {boolean} True if the action is in scope for the user, otherwise false.
  */
-export declare function isActionInScope(scopes: Scope[], action: DisplayableAction, eventType: string): boolean;
+export declare function isActionInScope(scopes: Scope[], action: DisplayableAction, eventType: string, customActionType?: string): boolean;
 /**
  * A shared utility to check if the user can read a record.
  * This will be removed in 1.10 and implemented by scopes.

package/dist/events/index.js

@@ -1195,12 +1195,12 @@ function flattenAndMergeScopes(scopes2) {
   }
   return { type, options: mergedOptions };
 }
-function findScope(scopes2, 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].find(
+  return [...otherScopes, mergedSearchScope].filter(
     (scope) => scope?.type === scopeType
   );
 }
@@ -1587,7 +1587,7 @@ var InherentFlags = {
    * 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 DECLARE or REGISTER action is allowed next.
+   * We only use this flag to determine that a NOTIFY, DECLARE or REGISTER action is allowed next.
    */
   EDIT_IN_PROGRESS: "edit-in-progress"
 };
@@ -8806,18 +8806,22 @@ function hasAnyOfScopes(a, b) {
   return (0, import_lodash6.intersection)(a, b).length > 0;
 }
 function configurableEventScopeAllowed(scopes2, allowedConfigurableScopes, eventType, customActionType) {
-  const parsedScopes = allowedConfigurableScopes.map((scope) => findScope(scopes2, scope)).filter((scope) => scope !== void 0);
-  const authorizedEvents = getAuthorizedEventsFromScopes(parsedScopes);
-  const firstScope = parsedScopes[0];
-  if (parsedScopes.length > 0 && firstScope.type === "record.custom-action" && customActionType) {
-    const allowedCustomActionTypes = firstScope.options.customActionType;
-    if (!allowedCustomActionTypes.includes(customActionType)) {
-      return false;
-    }
+  const parsedScopes = allowedConfigurableScopes.flatMap(
+    (scope) => findScopes(scopes2, scope)
+  );
+  if (!customActionType) {
+    const authorizedEvents2 = getAuthorizedEventsFromScopes(parsedScopes);
+    return authorizedEvents2.includes(eventType);
   }
+  const scopesWithCorrectCustomActionType = parsedScopes.filter(
+    ({ options }) => "customActionType" in options && options.customActionType.includes(customActionType)
+  );
+  const authorizedEvents = getAuthorizedEventsFromScopes(
+    scopesWithCorrectCustomActionType
+  );
   return authorizedEvents.includes(eventType);
 }
-function isActionInScope(scopes2, action, eventType) {
+function isActionInScope(scopes2, action, eventType, customActionType) {
   const allowedConfigurableScopes = ACTION_SCOPE_MAP[action];
   if (allowedConfigurableScopes === null) {
     return true;
@@ -8828,7 +8832,8 @@ function isActionInScope(scopes2, action, eventType) {
   return configurableEventScopeAllowed(
     scopes2,
     allowedConfigurableScopes,
-    eventType
+    eventType,
+    customActionType
   );
 }
 function canUserReadEvent(event2, {
@@ -8961,6 +8966,9 @@ function filterActionsByFlags(actions, flags) {
   return actions.filter((action) => ACTION_FILTERS[action]?.(flags) ?? true);
 }
 function getAvailableActionsWithoutFlagFilters(status2, flags) {
+  if (flags.includes(InherentFlags.EDIT_IN_PROGRESS)) {
+    return [ActionType.NOTIFY, ActionType.DECLARE, ActionType.REGISTER];
+  }
   switch (status2) {
     case EventStatus.enum.CREATED: {
       return AVAILABLE_ACTIONS_BY_EVENT_STATUS[status2];
@@ -8981,9 +8989,6 @@ function getAvailableActionsWithoutFlagFilters(status2, flags) {
           flags.filter((flag2) => flag2 !== InherentFlags.REJECTED)
         ).filter((action) => action !== ActionType.DELETE).concat(ActionType.EDIT).concat(ActionType.ARCHIVE);
       }
-      if (flags.includes(InherentFlags.EDIT_IN_PROGRESS)) {
-        return [ActionType.DECLARE, ActionType.REGISTER];
-      }
       return AVAILABLE_ACTIONS_BY_EVENT_STATUS[status2];
     }
     case EventStatus.enum.REGISTERED: {

package/dist/notification/index.js

@@ -1177,7 +1177,7 @@ var InherentFlags = {
    * 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 DECLARE or REGISTER action is allowed next.
+   * We only use this flag to determine that a NOTIFY, DECLARE or REGISTER action is allowed next.
    */
   EDIT_IN_PROGRESS: "edit-in-progress"
 };

package/dist/scopes/index.d.ts

@@ -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

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,
@@ -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.e91fddd",
+  "version": "1.9.2-rc.f0b9560",
   "description": "OpenCRVS toolkit for building country configurations",
   "license": "MPL-2.0",
   "exports": {