Ocrvs 11215

packages/client/src/v2-events/utils.ts

@@ -23,6 +23,8 @@ import {
   SystemVariables,
   Scope,
   ActionScopes,
+  ConfigurableActionScopes,
+  parseConfigurableScope,
   WorkqueueConfigWithoutQuery,
   joinValues,
   UUID,
@@ -232,7 +234,14 @@ export enum CoreWorkqueues {
 }
 
 export function hasOutboxWorkqueue(scopes: Scope[]) {
-  return scopes.some((scope) => ActionScopes.safeParse(scope).success)
+  const hasLiteralActionScopes = scopes.some(
+    (scope) => ActionScopes.safeParse(scope).success
+  )
+  const parsedScopes = scopes.map(parseConfigurableScope)
+  const hasConfigurableActionScopes = parsedScopes.some(
+    (scope) => ConfigurableActionScopes.safeParse(scope).success
+  )
+  return hasLiteralActionScopes || hasConfigurableActionScopes
 }
 
 export function hasDraftWorkqueue(scopes: Scope[]) {

packages/commons/src/conditionals/conditionals.test.ts

@@ -1048,6 +1048,9 @@ describe('"flag" conditionals', () => {
     expect(validate(flag(InherentFlags.CORRECTION_REQUESTED), params)).toBe(
       false
     )
+    expect(
+      validate(not(flag(InherentFlags.CORRECTION_REQUESTED)), params)
+    ).toBe(true)
   })
 
   it('validation fails if params dont include flags', () => {

packages/commons/src/events/EventConfig.ts

@@ -18,7 +18,7 @@ import { DeclarationFormConfig } from './FormConfig'
 
 import { FieldType } from './FieldType'
 import { FieldReference } from './FieldConfig'
-import { FlagConfig } from './Flag'
+import { FlagConfig, InherentFlags } from './Flag'
 
 /**
  * Description of event features defined by the country. Includes configuration for process steps and forms involved.
@@ -141,10 +141,16 @@ export const EventConfig = z
     )
 
     for (const actionFlagId of actionFlagIds) {
-      if (!configuredFlagIds.includes(actionFlagId)) {
+      const isConfigured = configuredFlagIds.includes(actionFlagId)
+      const isInherent = Object.values(InherentFlags).includes(
+        // @ts-expect-error - actionFlagId can be a inherent flag or any string
+        actionFlagId
+      )
+
+      if (!isConfigured && !isInherent) {
         ctx.addIssue({
           code: 'custom',
-          message: `Action flag id must match a configured flag in the flags array. Invalid action flag ID for event '${event.id}': '${actionFlagId}'`,
+          message: `Action flag id must match an inherent flag or a configured flag in the flags array. Invalid action flag ID for event '${event.id}': '${actionFlagId}'`,
           path: ['actions']
         })
       }

packages/commons/src/events/Flag.ts

@@ -79,7 +79,7 @@ export type FlagConfig = z.infer<typeof FlagConfig>
  * Configuration for a flag action, which is executed when the action is performed.
  */
 export const ActionFlagConfig = z.object({
-  id: CustomFlag,
+  id: Flag,
   operation: z
     .enum(['add', 'remove'])
     .describe('Operation to perform on the flag.'),

packages/commons/src/scopes.ts

@@ -327,6 +327,12 @@ const ConfigurableRawScopes = z.discriminatedUnion('type', [
   CustomActionScope
 ])
 
+export const ConfigurableActionScopes = z.discriminatedUnion('type', [
+  // @TODO - Configure actual action scopes
+  RecordScope,
+  CustomActionScope
+])
+
 type ConfigurableRawScopes = z.infer<typeof ConfigurableRawScopes>
 export type ConfigurableScopeType = ConfigurableRawScopes['type']