@acorex/platform 21.0.0-next.37 → 21.0.0-next.40

package/fesm2022/acorex-platform-workflow.mjs

@@ -3,6 +3,7 @@ import { Injectable, inject, InjectionToken, Optional, Inject, NgModule } from '
 import { Subject, filter } from 'rxjs';
 import { cloneDeep, get, set } from 'lodash-es';
 import { setSmart, AXPExpressionEvaluatorService, AXPDataGenerator } from '@acorex/platform/core';
+import { AXTranslationService } from '@acorex/core/translation';
 import { AXPCommandService } from '@acorex/platform/runtime';
 
 class AXPWorkflowError extends Error {
@@ -628,7 +629,7 @@ class AXPActivityDefinitionService {
         if (definition && definition.category) {
             // Try to find category by name/id
             const categories = await this.getCategories();
-            const found = categories.find(cat => cat.id === definition.category || cat.title === definition.category);
+            const found = categories.find((cat) => cat.id === definition.category);
             if (found) {
                 return found.id;
             }
@@ -871,6 +872,17 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
  */
 const AXP_WORKFLOW_ENGINE = new InjectionToken('AXP_WORKFLOW_ENGINE');
 
+/**
+ * Activity types that use the task board (suspend until user acts via inbox), not inline interactive execution.
+ */
+const AXP_WORKFLOW_TASK_BOARD_ACTIVITY_TYPES = [
+    'workflow-activity:human-task',
+    'workflow-activity:cartable',
+];
+function axpIsWorkflowTaskBoardActivityType(activityType) {
+    return !!activityType && AXP_WORKFLOW_TASK_BOARD_ACTIVITY_TYPES.includes(activityType);
+}
+
 //#endregion
 /**
  * Workflow Expression Scope Service
@@ -1114,6 +1126,7 @@ class ActivityExecutor {
         this.commandService = inject(AXPCommandService);
         this.expressionEvaluator = inject(AXPExpressionEvaluatorService);
         this.expressionScopeService = inject(WorkflowExpressionScopeService);
+        this.translateService = inject(AXTranslationService);
     }
     //#endregion
     //#region ----   Public Methods   ----
@@ -1173,7 +1186,7 @@ class ActivityExecutor {
             if (!result.success) {
                 return {
                     output: {
-                        error: result.message?.text,
+                        error: await this.resolveCommandMessageTextForError(result.message?.text),
                     },
                     outcome: 'Failed',
                 };
@@ -1211,6 +1224,18 @@ class ActivityExecutor {
             };
         }
     }
+    /**
+     * Resolves command failure message text for workflow output: `@` keys via translate, MLS maps via resolve.
+     */
+    async resolveCommandMessageTextForError(value) {
+        if (value == null) {
+            return '';
+        }
+        if (typeof value === 'string') {
+            return value.startsWith('@') ? await this.translateService.translateAsync(value) : value;
+        }
+        return this.translateService.resolve(value);
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: ActivityExecutor, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: ActivityExecutor, providedIn: 'root' }); }
 }
@@ -1285,9 +1310,9 @@ class AXPWorkflowManager {
         let iterationCount = 0;
         while (currentTask && iterationCount < maxIterations) {
             iterationCount++;
-            // Interactive = frontend executionMode and NOT workflow-activity:human-task (that one goes to task board)
+            // Interactive = frontend executionMode and NOT task-board activities (human-task, cartable)
             const isInteractive = (currentTask.executionMode === 'frontend' || currentTask.executionMode === 'both') &&
-                currentTask.activityType !== 'workflow-activity:human-task';
+                !axpIsWorkflowTaskBoardActivityType(currentTask.activityType);
             if (isInteractive) {
                 // Execute frontend activity
                 const execResult = await this.activityExecutor.execute(currentTask, currentState, currentActivityOutputs);
@@ -1325,9 +1350,9 @@ class AXPWorkflowManager {
                         output: completeResponse.output,
                     };
                 }
-                // Backend decides: if nextTask is workflow-activity:human-task or not frontend, return it (task board or done)
+                // Backend decides: if nextTask is task-board activity or not frontend, return it (task board or done)
                 const nextInteractive = (completeResponse.nextTask.executionMode === 'frontend' || completeResponse.nextTask.executionMode === 'both') &&
-                    completeResponse.nextTask.activityType !== 'workflow-activity:human-task';
+                    !axpIsWorkflowTaskBoardActivityType(completeResponse.nextTask.activityType);
                 if (!nextInteractive) {
                     return {
                         nextTask: completeResponse.nextTask,
@@ -1338,7 +1363,7 @@ class AXPWorkflowManager {
                 currentTask = completeResponse.nextTask;
             }
             else {
-                // Not interactive (e.g. workflow-activity:human-task) - return as-is for task board
+                // Not interactive (e.g. human-task / cartable) - return as-is for task board
                 return {
                     nextTask: currentTask,
                     state: currentState,
@@ -1389,13 +1414,13 @@ class AXPWorkflowManager {
                 startNormalizedState.lastUpdated = new Date(startNormalizedState.lastUpdated);
             }
             this.stateCache.set(response.instanceId, startNormalizedState);
-            // 🎯 Interactive flow: Execute frontend activities that are NOT workflow-activity:human-task (those go to task board)
+            // 🎯 Interactive flow: Execute frontend activities that are NOT task-board types (those go to task board)
             let finalNextTask = response.pendingTask || null;
             let finalOutput = startNormalizedState.output;
             const pendingTask = response.pendingTask;
             if (pendingTask &&
                 (pendingTask.executionMode === 'frontend' || pendingTask.executionMode === 'both') &&
-                pendingTask.activityType !== 'workflow-activity:human-task') {
+                !axpIsWorkflowTaskBoardActivityType(pendingTask.activityType)) {
                 const interactiveResult = await this.executeInteractiveFlow(response.instanceId, pendingTask, startNormalizedState, response.activityOutputs || response.state.activityOutputs);
                 finalNextTask = interactiveResult.nextTask;
                 startNormalizedState = interactiveResult.state;
@@ -1458,13 +1483,13 @@ class AXPWorkflowManager {
             if (normalizedState) {
                 this.stateCache.set(instanceId, normalizedState);
             }
-            // 🎯 Interactive flow: Execute frontend activities that are NOT workflow-activity:human-task (those go to task board)
+            // 🎯 Interactive flow: Execute frontend activities that are NOT task-board types (those go to task board)
             let finalNextTask = response.nextTask || null;
             let finalOutput = response.output;
             const nextTask = response.nextTask;
             if (nextTask &&
                 (nextTask.executionMode === 'frontend' || nextTask.executionMode === 'both') &&
-                nextTask.activityType !== 'workflow-activity:human-task') {
+                !axpIsWorkflowTaskBoardActivityType(nextTask.activityType)) {
                 const interactiveResult = await this.executeInteractiveFlow(instanceId, nextTask, normalizedState, normalizedState?.activityOutputs);
                 finalNextTask = interactiveResult.nextTask;
                 normalizedState = interactiveResult.state;
@@ -1535,6 +1560,35 @@ class AXPWorkflowManager {
             return null;
         }
     }
+    /**
+     * Claim a pooled workflow task (assign current user on the bookmark without advancing the workflow).
+     * Supported only when the injected workflow engine implements {@link AXPWorkflowEngine.claimTask}.
+     */
+    async claimTask(instanceId, bookmarkId, stepId) {
+        const claim = this.workflowEngine.claimTask?.bind(this.workflowEngine);
+        if (!claim) {
+            return {
+                success: false,
+                instanceId,
+                error: 'Claim task is not supported by this workflow engine',
+            };
+        }
+        try {
+            const result = await claim({ instanceId, bookmarkId, stepId });
+            return {
+                success: result.success,
+                instanceId,
+                error: result.error,
+            };
+        }
+        catch (error) {
+            return {
+                success: false,
+                instanceId,
+                error: error instanceof Error ? error.message : 'Failed to claim task',
+            };
+        }
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPWorkflowManager, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPWorkflowManager, providedIn: 'root' }); }
 }
@@ -1573,6 +1627,7 @@ class AXPWorkflowLocalEngine {
         //#region ----   Services & Dependencies   ----
         this.activityDefinitionService = inject(AXPActivityDefinitionService);
         this.workflowProviders = inject(AXP_WORKFLOW_PROVIDER, { optional: true }) || [];
+        this.multiLanguageResolver = inject(AXTranslationService);
         //#endregion
         //#region ----   Instance Storage   ----
         /**
@@ -1693,6 +1748,11 @@ class AXPWorkflowLocalEngine {
                 ...(request.userInput || {}),
             };
         }
+        localState.state.variables = {
+            ...localState.state.variables,
+            [`${request.stepId}_outcome`]: outcome,
+            [`${request.stepId}_activityOutput`]: request.userInput || {},
+        };
         // Mark activity as completed and continue progression
         // Continue progressing workflow steps (skipping backend activities)
         const nextTask = await this.executeWorkflowSteps(localState);
@@ -1766,13 +1826,13 @@ class AXPWorkflowLocalEngine {
         const connections = graph.connections || [];
         // Build activity map
         const activityMap = new Map();
-        activities.forEach(activity => {
+        activities.forEach((activity) => {
             activityMap.set(activity.id, activity);
         });
         // Build connection graph
         const outgoingConnections = new Map();
         const incomingConnections = new Map();
-        connections.forEach(conn => {
+        connections.forEach((conn) => {
             const sourceId = conn.source.activtyName;
             const targetId = conn.target.activtyName;
             if (!outgoingConnections.has(sourceId)) {
@@ -1829,7 +1889,7 @@ class AXPWorkflowLocalEngine {
                 found: !!activityDefinition,
             });
             const executionMode = activityDefinition?.executionMode || 'frontend';
-            const activityTitle = activityDefinition?.title;
+            const activityTitle = this.multiLanguageResolver.resolve(activityDefinition?.title) || activityDefinition?.name;
             // Handle backend activities: skip
             if (executionMode === 'backend') {
                 console.log(`[WorkflowLocalEngine] ⏭️ Skipping backend activity: ${activity.name} (${activity.id})`);
@@ -2497,5 +2557,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { AXPActivityDefinitionService, AXPWorkflowAction, AXPWorkflowContext, AXPWorkflowDefinitionService, AXPWorkflowError, AXPWorkflowEventService, AXPWorkflowFunction, AXPWorkflowLocalEngine, AXPWorkflowManager, AXPWorkflowModule, AXPWorkflowRegistryService, AXPWorkflowService, AXP_ACTIVITY_CATEGORY_PROVIDER, AXP_ACTIVITY_PROVIDER, AXP_WORKFLOW_CATEGORY_PROVIDER, AXP_WORKFLOW_ENGINE, AXP_WORKFLOW_PROVIDER, ActivityExecutor, WorkflowExpressionScopeService, createWorkFlowEvent, ofType };
+export { AXPActivityDefinitionService, AXPWorkflowAction, AXPWorkflowContext, AXPWorkflowDefinitionService, AXPWorkflowError, AXPWorkflowEventService, AXPWorkflowFunction, AXPWorkflowLocalEngine, AXPWorkflowManager, AXPWorkflowModule, AXPWorkflowRegistryService, AXPWorkflowService, AXP_ACTIVITY_CATEGORY_PROVIDER, AXP_ACTIVITY_PROVIDER, AXP_WORKFLOW_CATEGORY_PROVIDER, AXP_WORKFLOW_ENGINE, AXP_WORKFLOW_PROVIDER, AXP_WORKFLOW_TASK_BOARD_ACTIVITY_TYPES, ActivityExecutor, WorkflowExpressionScopeService, axpIsWorkflowTaskBoardActivityType, createWorkFlowEvent, ofType };
 //# sourceMappingURL=acorex-platform-workflow.mjs.map