SemianiakaVY/elsa-core
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Faulted status added to Workflow Test

Browse source
This commit is contained in:
axeleron007 2021-09-16 15:38:29 +03:00
parent 3d64d75782
commit dd2c14afe9
8 changed files with 117 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/Elsa.Abstractions/Events/ActivityExecutionResultExecuted.cs
View file

@ -1,4 +1,4 @@
using Elsa.ActivityResults;
using Elsa.ActivityResults;
using Elsa.Services.Models;
using MediatR;

18
src/core/Elsa.Abstractions/Events/ActivityExecutionResultFailed.cs Normal file
View file

@ -0,0 +1,18 @@
using System;
using Elsa.Services.Models;
using MediatR;
namespace Elsa.Events
{
public class ActivityExecutionResultFailed : INotification
{
public ActivityExecutionResultFailed(Exception exception, ActivityExecutionContext activityExecutionContext)
{
Exception = exception;
ActivityExecutionContext = activityExecutionContext;
}
public Exception Exception { get; }
public ActivityExecutionContext ActivityExecutionContext { get; }
}
}

69
src/core/Elsa.Core/Services/Workflows/WorkflowRunner.cs
View file

@ -250,39 +250,48 @@ namespace Elsa.Services.Workflows
var output = outputReference != null ? await _workflowStorageService.LoadAsync(outputReference.ProviderName, new WorkflowStorageContext(workflowInstance, outputReference.ActivityId), "Output", cancellationToken) : null;
var input = !burstStarted ? workflowExecutionContext.Input : scheduledActivity.Input ?? output;
var activityExecutionContext = new ActivityExecutionContext(scope, workflowExecutionContext, activityBlueprint, input, resuming, cancellationToken);
var runtimeActivityInstance = await activityExecutionContext.ActivateActivityAsync(cancellationToken);
var activityType = runtimeActivityInstance.ActivityType;
using var executionScope = AmbientActivityExecutionContext.EnterScope(activityExecutionContext);
await _mediator.Publish(new ActivityActivating(activityExecutionContext), cancellationToken);
var activity = await activityType.ActivateAsync(activityExecutionContext);
if (!burstStarted)
try
{
await _mediator.Publish(new WorkflowExecutionBurstStarting(workflowExecutionContext, activityExecutionContext), cancellationToken);
burstStarted = true;
var runtimeActivityInstance = await activityExecutionContext.ActivateActivityAsync(cancellationToken);
var activityType = runtimeActivityInstance.ActivityType;
using var executionScope = AmbientActivityExecutionContext.EnterScope(activityExecutionContext);
await _mediator.Publish(new ActivityActivating(activityExecutionContext), cancellationToken);
var activity = await activityType.ActivateAsync(activityExecutionContext);
if (!burstStarted)
{
await _mediator.Publish(new WorkflowExecutionBurstStarting(workflowExecutionContext, activityExecutionContext), cancellationToken);
burstStarted = true;
}
if (resuming)
await _mediator.Publish(new ActivityResuming(activityExecutionContext, activity), cancellationToken);
await _mediator.Publish(new ActivityExecuting(activityExecutionContext, activity), cancellationToken);
var result = await TryExecuteActivityAsync(activityOperation, activityExecutionContext, activity, cancellationToken);
if (result == null)
return;
await _mediator.Publish(new ActivityExecuted(activityExecutionContext, activity), cancellationToken);
await _mediator.Publish(new ActivityExecutionResultExecuting(result, activityExecutionContext), cancellationToken);
await result.ExecuteAsync(activityExecutionContext, cancellationToken);
workflowExecutionContext.CompletePass();
workflowInstance.LastExecutedActivityId = currentActivityId;
await _mediator.Publish(new ActivityExecutionResultExecuted(result, activityExecutionContext), cancellationToken);
await _mediator.Publish(new WorkflowExecutionPassCompleted(workflowExecutionContext, activityExecutionContext), cancellationToken);
if (!workflowExecutionContext.HasScheduledActivities)
await _mediator.Publish(new WorkflowExecutionBurstCompleted(workflowExecutionContext, activityExecutionContext), cancellationToken);
activityOperation = Execute;
}
catch (Exception e)
{
await _mediator.Publish(new ActivityExecutionResultFailed(e, activityExecutionContext), cancellationToken);
throw;
}
if (resuming)
await _mediator.Publish(new ActivityResuming(activityExecutionContext, activity), cancellationToken);
await _mediator.Publish(new ActivityExecuting(activityExecutionContext, activity), cancellationToken);
var result = await TryExecuteActivityAsync(activityOperation, activityExecutionContext, activity, cancellationToken);
if (result == null)
return;
await _mediator.Publish(new ActivityExecuted(activityExecutionContext, activity), cancellationToken);
await _mediator.Publish(new ActivityExecutionResultExecuting(result, activityExecutionContext), cancellationToken);
await result.ExecuteAsync(activityExecutionContext, cancellationToken);
workflowExecutionContext.CompletePass();
workflowInstance.LastExecutedActivityId = currentActivityId;
await _mediator.Publish(new ActivityExecutionResultExecuted(result, activityExecutionContext), cancellationToken);
await _mediator.Publish(new WorkflowExecutionPassCompleted(workflowExecutionContext, activityExecutionContext), cancellationToken);
if (!workflowExecutionContext.HasScheduledActivities)
await _mediator.Publish(new WorkflowExecutionBurstCompleted(workflowExecutionContext, activityExecutionContext), cancellationToken);
activityOperation = Execute;
}
workflowInstance.CurrentActivity = null;

17
src/designer/elsa-workflows-studio/src/components/designers/tree/elsa-designer-tree/elsa-designer-tree.tsx
View file

@ -845,8 +845,21 @@ export class ElsaWorkflowDesigner {
if (testActivityMessage == undefined)
return "";
const color = testActivityMessage.status == "Executed" ? "green" : "red";
let color = "";
switch (testActivityMessage.status)
{
case "Executed":
color = "green";
break;
case "Suspended":
color = "yellow";
break;
case "Failed":
color = "red";
break;
}
return `<svg class="elsa-h-8 elsa-w-8 elsa-text-${color}-500" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
<path stroke="none" d="M0 0h24v24H0z"/>
<circle cx="12" cy="12" r="9" fill="${color}" />

27
src/designer/elsa-workflows-studio/src/components/screens/workflow-definition-editor/elsa-workflow-properties-panel/elsa-workflow-properties-panel.tsx
View file

@ -277,7 +277,7 @@ export class ElsaWorkflowPropertiesPanel {
{t('ExecuteWorkflow')}
</button>
</div>
{this.renderActivityMessage()}
{this.renderActivityTestMessage()}
</div>
</div>
</div>
@ -285,7 +285,7 @@ export class ElsaWorkflowPropertiesPanel {
}
renderActivityMessage() {
renderActivityTestMessage() {
const {testActivity} = this;
@ -330,7 +330,7 @@ export class ElsaWorkflowPropertiesPanel {
<dl
class="elsa-mt-2 elsa-border-t elsa-border-b elsa-border-gray-200 elsa-divide-y elsa-divide-gray-200">
<div class="elsa-py-3 elsa-flex elsa-justify-between elsa-text-sm elsa-font-medium">
<dt class="elsa-text-gray-500">{t('Correlation Id')}</dt>
<dt class="elsa-text-gray-500">{'Correlation Id'}</dt>
<dd class="elsa-text-gray-900">{testActivity.correlationId}</dd>
</div>
<div class="elsa-py-3 elsa-flex elsa-justify-between elsa-text-sm elsa-font-medium">
@ -356,10 +356,31 @@ export class ElsaWorkflowPropertiesPanel {
}
</div>
))}
{this.renderActivityTestError()}
</dl>
);
}
renderActivityTestError() {
const {testActivity} = this;
if (testActivity == undefined)
return
const t = (x, params?) => this.i18next.t(x, params);
if (!testActivity.error)
return;
return (
<div class="sm:elsa-col-span-2">
<dt class="elsa-text-sm elsa-font-medium elsa-text-gray-500 elsa-capitalize">{t('Error')}</dt>
<dd class="elsa-mt-1 elsa-text-sm elsa-text-gray-900 elsa-mb-2 elsa-overflow-x-auto">{testActivity.error}</dd>
</div>
);
}
createClient() {
return createElsaClient(this.serverUrl);
}

1
src/designer/elsa-workflows-studio/src/models/domain.ts
View file

@ -328,6 +328,7 @@ export interface WorkflowTestActivityMessage {
activityId: string;
status: string;
data?: any;
error?: string;
}
export interface WorkflowTestUpdateRequest {

19
src/server/Elsa.Server.Api/Handlers/ActivityExecutionResultExecutedHandler.cs
View file

@ -10,7 +10,7 @@ using Newtonsoft.Json.Linq;
namespace Elsa.Server.Api.Handlers
{
public class ActivityExecutionResultExecutedHandler : INotificationHandler<ActivityExecutionResultExecuted>
public class ActivityExecutionResultExecutedHandler : INotificationHandler<ActivityExecutionResultExecuted>, INotificationHandler<ActivityExecutionResultFailed>
{
private readonly IWorkflowTestService _workflowTestService;
@ -46,5 +46,22 @@ namespace Elsa.Server.Api.Handlers
await _workflowTestService.DispatchMessage(signalRConnectionId, message);
}
public async Task Handle(ActivityExecutionResultFailed notification, CancellationToken cancellationToken)
{
var context = notification.ActivityExecutionContext;
var signalRConnectionId = context.WorkflowExecutionContext.WorkflowBlueprint.SignalRConnectionId;
if (string.IsNullOrWhiteSpace(signalRConnectionId)) return;
var message = new WorkflowTestMessage
{
CorrelationId = context.CorrelationId,
ActivityId = context.ActivityId,
Status = "Failed",
Error = notification.Exception.InnerException?.InnerException?.ToString()
};
await _workflowTestService.DispatchMessage(signalRConnectionId, message);
}
}
}

1
src/server/Elsa.Server.Api/Models/WorkflowTestMessage.cs
View file

@ -6,5 +6,6 @@ namespace Elsa.Server.Api.Models
public string ActivityId { get; set; } = default!;
public string Status { get; set; } = default!;
public object? Data { get; set; }
public string? Error { get; set; }
}
}