FormLocationKey ArgumentNullException (OrchardCMS#14936)

src/OrchardCore.Modules/OrchardCore.Forms/Activities/HttpRedirectToFormLocationTask.cs

@@ -32,19 +32,16 @@ public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContex
 
  public string FormLocationKey
  {
- get => GetProperty<string>();
- set => SetProperty(value);
+ get => GetProperty(() => string.Empty);
+ set => SetProperty(value ?? string.Empty);
  }
 
  public override Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
  {
  if (workflowContext.Output.TryGetValue(WorkflowConstants.HttpFormLocationOutputKeyName, out var obj)
  && obj is Dictionary<string, string> formLocations)
  {
- // if no custom location-key was provided, we use empty string as the default key.
- var location = FormLocationKey ?? string.Empty;
-
- if (formLocations.TryGetValue(location, out var path))
+ if (formLocations.TryGetValue(FormLocationKey, out var path))
  {
  _httpContextAccessor.HttpContext.Items[WorkflowConstants.FormOriginatedLocationItemsKey] = path;
 

src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/HttpRedirectToFormLocationTask.Fields.Edit.cshtml

@@ -6,5 +6,5 @@
  <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
  <input type="text" asp-for="FormLocationKey" class="form-control" />
  <span asp-validation-for="FormLocationKey"></span>
- <span class="hint">@T["This value needs to correspond with the Form Location Key value utilized in the HTTP request event settings. Leave blank if the workflow handles a single form event."]</span>
+ <span class="hint">@T["This key name should be equal to the 'Form Location Key' of the HTTP request event. Leave blank if the workflow only handles a single form."]</span>
 </div>

src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpRequestEvent.cs

@@ -55,8 +55,8 @@ public int TokenLifeSpan
 
  public string FormLocationKey
  {
- get => GetProperty<string>();
- set => SetProperty(value);
+ get => GetProperty(() => string.Empty);
+ set => SetProperty(value ?? string.Empty);
  }
 
  public override bool CanExecute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
@@ -77,13 +77,10 @@ public override Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionCont
  if (!workflowContext.Output.TryGetValue(WorkflowConstants.HttpFormLocationOutputKeyName, out var obj)
  || obj is not Dictionary<string, string> formLocation)
  {
- formLocation = new Dictionary<string, string>();
+ formLocation = [];
  }
 
- // if no custom location-key was provided, we use empty string as the default key.
- var location = FormLocationKey ?? string.Empty;
-
- formLocation[location] = GetLocationUrl(value);
+ formLocation[FormLocationKey] = GetLocationUrl(value);
 
  workflowContext.Output[WorkflowConstants.HttpFormLocationOutputKeyName] = formLocation;
  }

src/OrchardCore.Modules/OrchardCore.Workflows/Views/Items/HttpRequestEvent.Fields.Edit.cshtml

@@ -41,10 +41,10 @@
 
 
 <div class="mb-3" asp-validation-class-for="FormLocationKey">
- <label asp-for="FormLocationKey" class="form-label">@T["Form Location"]</label>
+ <label asp-for="FormLocationKey" class="form-label">@T["Form Location Key"]</label>
  <input type="text" asp-for="FormLocationKey" class="form-control" />
  <span asp-validation-for="FormLocationKey"></span>
- <span class="hint">@T["This key serves to differentiate the current form's location. Leave blank if the workflow handles a single form event."]</span>
+ <span class="hint">@T["This key name is used to store and then retrieve the current form's location. Leave blank if the workflow doesn't handle any form or a single one."]</span>
 </div>
 
 <script depends-on="jQuery" asp-src="~/OrchardCore.Workflows/Scripts/orchard.http-request-event-editor.min.js" debug-src="~/OrchardCore.Workflows/Scripts/orchard.http-request-event-editor.js" at="Foot"></script>