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

Fix dynamic outcomes of SendHttpRequest

Browse source 
Fixes #1069
This commit is contained in:
Sipke Schoorstra 2021-06-08 20:43:59 +02:00
parent 4eb3736bf5
commit eae633c102
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/activities/Elsa.Activities.Http/Activities/SendHttpRequest/SendHttpRequest.cs
View file

@ -73,13 +73,18 @@ namespace Elsa.Activities.Http
)]
public string? ContentType { get; set; }
[ActivityInput(Hint = "The Authorization header value to send.", SupportedSyntaxes = new[] { SyntaxNames.JavaScript, SyntaxNames.Liquid })]
[ActivityInput(Hint = "The Authorization header value to send.", SupportedSyntaxes = new[] { SyntaxNames.JavaScript, SyntaxNames.Liquid }, Category = PropertyCategories.Advanced)]
public string? Authorization { get; set; }
/// <summary>
/// The headers to send along with the request.
/// </summary>
[ActivityInput(Hint = "Additional headers to send along with the request.", UIHint = ActivityInputUIHints.MultiLine, DefaultSyntax = SyntaxNames.Json, SupportedSyntaxes = new[] { SyntaxNames.Json, SyntaxNames.JavaScript, SyntaxNames.Liquid })]
[ActivityInput(
Hint = "Additional headers to send along with the request.",
UIHint = ActivityInputUIHints.MultiLine, DefaultSyntax = SyntaxNames.Json,
SupportedSyntaxes = new[] { SyntaxNames.Json, SyntaxNames.JavaScript, SyntaxNames.Liquid },
Category = PropertyCategories.Advanced
)]
public HttpRequestHeaders RequestHeaders { get; set; } = new();
[ActivityInput(Hint = "Read the content of the response.", SupportedSyntaxes = new[] { SyntaxNames.Literal, SyntaxNames.JavaScript, SyntaxNames.Liquid })]
@ -125,7 +130,7 @@ namespace Elsa.Activities.Http
var outcomes = new List<string> { OutcomeNames.Done, statusOutcome };
if (!isSupportedStatusCode)
outcomes.Add("UnSupportedStatusCode");
outcomes.Add("Unsupported Status Code");
return Combine(Output(responseModel), Outcomes(outcomes));
}

6
src/designer/elsa-workflows-studio/src/plugins/send-http-request-plugin.tsx
View file

@ -19,6 +19,10 @@ export class SendHttpRequestPlugin implements ElsaPlugin {
const syntax = SyntaxNames.Json;
const supportedStatusCodes = props.find(x => x.name == 'SupportedStatusCodes') || {expressions: {'Json': '[]'}, syntax: syntax};
const expression = supportedStatusCodes.expressions[syntax] || '[]';
context.outcomes = !!expression['$values'] ? expression['$values'] : parseJson(expression) || [];
let outcomes = !!expression['$values'] ? expression['$values'] : parseJson(expression) || [];
outcomes = [...outcomes, 'Done', 'Unsupported Status Code']
context.outcomes = outcomes;
}
}