From b10dd08c8faae17a749dd046eeaef3e8d46eaa0b Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Thu, 9 Nov 2023 11:59:30 -0800 Subject: [PATCH] Cleanup workflow activities (#14597) --- .../Workflows/Activities/EmailTask.cs | 4 +- .../Activities/AddModelValidationErrorTask.cs | 4 +- .../Activities/BindModelStateTask.cs | 4 +- .../ValidateAntiforgeryTokenTask.cs | 4 +- .../Activities/ValidateFormFieldTask.cs | 4 +- .../Workflows/Activities/ValidateFormTask.cs | 4 +- .../Activities/NotifyContentOwnerTask.cs | 4 +- .../Activities/NotifyUserTask.cs | 4 +- .../Activities/NotifyUserTaskActivity.cs | 16 +++ .../Workflows/ValidateReCaptchaTask.cs | 4 +- .../OrchardCore.Sms/Activities/SmsTask.cs | 4 +- .../Activities/UpdateTwitterStatusTask.cs | 5 +- .../Activities/AssignUserRoleTask.cs | 12 +- .../Workflows/Activities/RegisterUserTask.cs | 5 +- .../Workflows/Activities/ValidateUserTask.cs | 4 +- .../Activities/CommitTransactionTask.cs | 4 +- .../Activities/CorrelateTask.cs | 4 +- .../Activities/ForEachTask.cs | 3 +- .../Activities/ForLoopTask.cs | 4 +- .../Activities/ForkTask.cs | 4 +- .../Activities/IfElseTask.cs | 3 +- .../Activities/JoinTask.cs | 4 +- .../Activities/LogTask.cs | 3 +- .../Activities/NotifyTask.cs | 8 +- .../Activities/ScriptTask.cs | 4 +- .../Activities/SetOutputTask.cs | 4 +- .../Activities/SetPropertyTask.cs | 4 +- .../Activities/WhileLoopTask.cs | 4 +- .../Http/Activities/HttpRedirectTask.cs | 4 +- .../Http/Activities/HttpRequestTask.cs | 128 +++++++++--------- .../Http/Activities/HttpResponseTask.cs | 4 +- .../Items/HttpRedirectTask.Fields.Edit.cshtml | 12 +- .../Activities/TaskActivity.cs | 13 +- .../Workflows/Activities/AddTask.cs | 4 +- .../Workflows/Activities/WriteLineTask.cs | 4 +- 35 files changed, 136 insertions(+), 168 deletions(-) diff --git a/src/OrchardCore.Modules/OrchardCore.Email/Workflows/Activities/EmailTask.cs b/src/OrchardCore.Modules/OrchardCore.Email/Workflows/Activities/EmailTask.cs index ca0f954223f..cf7b9d1c8ff 100644 --- a/src/OrchardCore.Modules/OrchardCore.Email/Workflows/Activities/EmailTask.cs +++ b/src/OrchardCore.Modules/OrchardCore.Email/Workflows/Activities/EmailTask.cs @@ -9,7 +9,7 @@ namespace OrchardCore.Email.Workflows.Activities { - public class EmailTask : TaskActivity + public class EmailTask : TaskActivity { private readonly ISmtpService _smtpService; private readonly IWorkflowExpressionEvaluator _expressionEvaluator; @@ -29,8 +29,8 @@ HtmlEncoder htmlEncoder _htmlEncoder = htmlEncoder; } - public override string Name => nameof(EmailTask); public override LocalizedString DisplayText => S["Email Task"]; + public override LocalizedString Category => S["Messaging"]; public WorkflowExpression Author diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/AddModelValidationErrorTask.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/AddModelValidationErrorTask.cs index 66f973e26cd..cb2d3f7a821 100644 --- a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/AddModelValidationErrorTask.cs +++ b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/AddModelValidationErrorTask.cs @@ -8,7 +8,7 @@ namespace OrchardCore.Forms.Workflows.Activities { - public class AddModelValidationErrorTask : TaskActivity + public class AddModelValidationErrorTask : TaskActivity { private readonly IUpdateModelAccessor _updateModelAccessor; protected readonly IStringLocalizer S; @@ -22,8 +22,6 @@ IStringLocalizer localizer S = localizer; } - public override string Name => nameof(AddModelValidationErrorTask); - public override LocalizedString DisplayText => S["Add Model Validation Error Task"]; public override LocalizedString Category => S["Validation"]; diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/BindModelStateTask.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/BindModelStateTask.cs index b402b2521e9..e5b2a749c99 100644 --- a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/BindModelStateTask.cs +++ b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/BindModelStateTask.cs @@ -9,7 +9,7 @@ namespace OrchardCore.Forms.Workflows.Activities { - public class BindModelStateTask : TaskActivity + public class BindModelStateTask : TaskActivity { private readonly IUpdateModelAccessor _updateModelAccessor; private readonly IHttpContextAccessor _httpContextAccessor; @@ -26,8 +26,6 @@ IStringLocalizer localizer S = localizer; } - public override string Name => nameof(BindModelStateTask); - public override LocalizedString DisplayText => S["Bind Model State Task"]; public override LocalizedString Category => S["Validation"]; diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/ValidateAntiforgeryTokenTask.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/ValidateAntiforgeryTokenTask.cs index 44343734971..37b14f587cd 100644 --- a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/ValidateAntiforgeryTokenTask.cs +++ b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/ValidateAntiforgeryTokenTask.cs @@ -9,7 +9,7 @@ namespace OrchardCore.Forms.Workflows.Activities { - public class ValidateAntiforgeryTokenTask : TaskActivity + public class ValidateAntiforgeryTokenTask : TaskActivity { private readonly IHttpContextAccessor _httpContextAccessor; private readonly IAntiforgery _antiforgery; @@ -26,8 +26,6 @@ IStringLocalizer localizer S = localizer; } - public override string Name => nameof(ValidateAntiforgeryTokenTask); - public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"]; public override LocalizedString Category => S["Validation"]; diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/ValidateFormFieldTask.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/ValidateFormFieldTask.cs index 5018f10c6d4..284eec279c0 100644 --- a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/ValidateFormFieldTask.cs +++ b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/ValidateFormFieldTask.cs @@ -10,7 +10,7 @@ namespace OrchardCore.Forms.Workflows.Activities { // TODO: Add the ability to configure various types of validators. - public class ValidateFormFieldTask : TaskActivity + public class ValidateFormFieldTask : TaskActivity { private readonly IHttpContextAccessor _httpContextAccessor; private readonly IUpdateModelAccessor _updateModelAccessor; @@ -27,8 +27,6 @@ IStringLocalizer localizer S = localizer; } - public override string Name => nameof(ValidateFormFieldTask); - public override LocalizedString DisplayText => S["Validate Form Field Task"]; public override LocalizedString Category => S["Validation"]; diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/ValidateFormTask.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/ValidateFormTask.cs index 74de8e96e3f..3477af87bfe 100644 --- a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/ValidateFormTask.cs +++ b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/ValidateFormTask.cs @@ -8,7 +8,7 @@ namespace OrchardCore.Forms.Workflows.Activities { - public class ValidateFormTask : TaskActivity + public class ValidateFormTask : TaskActivity { private readonly IUpdateModelAccessor _updateModelAccessor; protected readonly IStringLocalizer S; @@ -22,8 +22,6 @@ IStringLocalizer localizer S = localizer; } - public override string Name => nameof(ValidateFormTask); - public override LocalizedString DisplayText => S["Validate Form Task"]; public override LocalizedString Category => S["Validation"]; diff --git a/src/OrchardCore.Modules/OrchardCore.Notifications/Activities/NotifyContentOwnerTask.cs b/src/OrchardCore.Modules/OrchardCore.Notifications/Activities/NotifyContentOwnerTask.cs index b8a11dac220..01120a0ca6f 100644 --- a/src/OrchardCore.Modules/OrchardCore.Notifications/Activities/NotifyContentOwnerTask.cs +++ b/src/OrchardCore.Modules/OrchardCore.Notifications/Activities/NotifyContentOwnerTask.cs @@ -15,7 +15,7 @@ namespace OrchardCore.Notifications.Activities; -public class NotifyContentOwnerTask : NotifyUserTaskActivity +public class NotifyContentOwnerTask : NotifyUserTaskActivity { private readonly ISession _session; @@ -35,8 +35,6 @@ ISession session _session = session; } - public override string Name => nameof(NotifyContentOwnerTask); - public override LocalizedString DisplayText => S["Notify Content's Owner Task"]; protected override async Task> GetUsersAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext) diff --git a/src/OrchardCore.Modules/OrchardCore.Notifications/Activities/NotifyUserTask.cs b/src/OrchardCore.Modules/OrchardCore.Notifications/Activities/NotifyUserTask.cs index 3ceea687029..c4a24145aa8 100644 --- a/src/OrchardCore.Modules/OrchardCore.Notifications/Activities/NotifyUserTask.cs +++ b/src/OrchardCore.Modules/OrchardCore.Notifications/Activities/NotifyUserTask.cs @@ -11,7 +11,7 @@ namespace OrchardCore.Notifications.Activities; -public class NotifyUserTask : NotifyUserTaskActivity +public class NotifyUserTask : NotifyUserTaskActivity { public NotifyUserTask( INotificationService notificationCoordinator, @@ -27,8 +27,6 @@ IStringLocalizer localizer { } - public override string Name => nameof(NotifyUserTask); - public override LocalizedString DisplayText => S["Notify User Task"]; protected override Task> GetUsersAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext) diff --git a/src/OrchardCore.Modules/OrchardCore.Notifications/Activities/NotifyUserTaskActivity.cs b/src/OrchardCore.Modules/OrchardCore.Notifications/Activities/NotifyUserTaskActivity.cs index 30ff4c1c5e2..e94563fb5d7 100644 --- a/src/OrchardCore.Modules/OrchardCore.Notifications/Activities/NotifyUserTaskActivity.cs +++ b/src/OrchardCore.Modules/OrchardCore.Notifications/Activities/NotifyUserTaskActivity.cs @@ -112,3 +112,19 @@ protected virtual async Task GetMessageAsync(WorkflowExecu abstract protected Task> GetUsersAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext); } + +public abstract class NotifyUserTaskActivity : NotifyUserTaskActivity where TActivity : ITask +{ + protected NotifyUserTaskActivity( + INotificationService notificationService, + IWorkflowExpressionEvaluator expressionEvaluator, + HtmlEncoder htmlEncoder, + ILogger logger, + IStringLocalizer localizer) + : base(notificationService, expressionEvaluator, htmlEncoder, logger, localizer) + { + } + + // The technical name of the activity. Within a workflow definition, activities make use of this name. + public override string Name => typeof(TActivity).Name; +} diff --git a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Workflows/ValidateReCaptchaTask.cs b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Workflows/ValidateReCaptchaTask.cs index d6330ae3c24..5d5167c1e63 100644 --- a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Workflows/ValidateReCaptchaTask.cs +++ b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Workflows/ValidateReCaptchaTask.cs @@ -9,7 +9,7 @@ namespace OrchardCore.ReCaptcha.Workflows { - public class ValidateReCaptchaTask : TaskActivity + public class ValidateReCaptchaTask : TaskActivity { private readonly ReCaptchaService _reCaptchaService; private readonly IUpdateModelAccessor _updateModelAccessor; @@ -26,8 +26,6 @@ IStringLocalizer localizer S = localizer; } - public override string Name => nameof(ValidateReCaptchaTask); - public override LocalizedString DisplayText => S["Validate ReCaptcha Task"]; public override LocalizedString Category => S["Validation"]; diff --git a/src/OrchardCore.Modules/OrchardCore.Sms/Activities/SmsTask.cs b/src/OrchardCore.Modules/OrchardCore.Sms/Activities/SmsTask.cs index c1fe319353c..9c227074be8 100644 --- a/src/OrchardCore.Modules/OrchardCore.Sms/Activities/SmsTask.cs +++ b/src/OrchardCore.Modules/OrchardCore.Sms/Activities/SmsTask.cs @@ -9,7 +9,7 @@ namespace OrchardCore.Sms.Activities; -public class SmsTask : TaskActivity +public class SmsTask : TaskActivity { private readonly ISmsProvider _smsProvider; private readonly IWorkflowExpressionEvaluator _expressionEvaluator; @@ -29,8 +29,8 @@ IStringLocalizer stringLocalizer S = stringLocalizer; } - public override string Name => nameof(SmsTask); public override LocalizedString DisplayText => S["SMS Task"]; + public override LocalizedString Category => S["Messaging"]; public WorkflowExpression PhoneNumber diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Activities/UpdateTwitterStatusTask.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Activities/UpdateTwitterStatusTask.cs index c6776b8abe4..82cb93b2294 100644 --- a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Activities/UpdateTwitterStatusTask.cs +++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Activities/UpdateTwitterStatusTask.cs @@ -9,7 +9,7 @@ namespace OrchardCore.Twitter.Workflows.Activities { - public class UpdateTwitterStatusTask : TaskActivity + public class UpdateTwitterStatusTask : TaskActivity { private readonly TwitterClient _twitterClient; private readonly IWorkflowExpressionEvaluator _expressionEvaluator; @@ -26,9 +26,6 @@ IStringLocalizer localizer S = localizer; } - // The technical name of the activity. Activities on a workflow definition reference this name. - public override string Name => nameof(UpdateTwitterStatusTask); - public override LocalizedString DisplayText => S["Update Twitter Status Task"]; // The category to which this activity belongs. The activity picker groups activities by this category. diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/AssignUserRoleTask.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/AssignUserRoleTask.cs index afeaea0f56e..ff0fa28221d 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/AssignUserRoleTask.cs +++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/AssignUserRoleTask.cs @@ -11,23 +11,25 @@ namespace OrchardCore.Users.Workflows.Activities { - public class AssignUserRoleTask : TaskActivity + public class AssignUserRoleTask : TaskActivity { private readonly UserManager _userManager; private readonly IUserService _userService; private readonly IWorkflowExpressionEvaluator _expressionEvaluator; protected readonly IStringLocalizer S; - public AssignUserRoleTask(UserManager userManager, IUserService userService, IWorkflowExpressionEvaluator expressionvaluator, IStringLocalizer localizer) + public AssignUserRoleTask( + UserManager userManager, + IUserService userService, + IWorkflowExpressionEvaluator expressionEvaluator, + IStringLocalizer localizer) { _userManager = userManager; _userService = userService; - _expressionEvaluator = expressionvaluator; + _expressionEvaluator = expressionEvaluator; S = localizer; } - public override string Name => nameof(AssignUserRoleTask); - public override LocalizedString DisplayText => S["Assign User Role Task"]; public override LocalizedString Category => S["User"]; diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/RegisterUserTask.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/RegisterUserTask.cs index a0baa162ad4..0400668aeea 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/RegisterUserTask.cs +++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/RegisterUserTask.cs @@ -18,7 +18,7 @@ namespace OrchardCore.Users.Workflows.Activities { - public class RegisterUserTask : TaskActivity + public class RegisterUserTask : TaskActivity { private readonly IUserService _userService; private readonly UserManager _userManager; @@ -49,9 +49,6 @@ public RegisterUserTask( _htmlEncoder = htmlEncoder; } - // The technical name of the activity. Activities on a workflow definition reference this name. - public override string Name => nameof(RegisterUserTask); - public override LocalizedString DisplayText => S["Register User Task"]; // The category to which this activity belongs. The activity picker groups activities by this category. diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/ValidateUserTask.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/ValidateUserTask.cs index 992dfe7f78c..c3e66bda050 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/ValidateUserTask.cs +++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/ValidateUserTask.cs @@ -10,7 +10,7 @@ namespace OrchardCore.Users.Workflows.Activities { - public class ValidateUserTask : TaskActivity + public class ValidateUserTask : TaskActivity { private readonly IHttpContextAccessor _httpContextAccessor; private readonly string _roleClaimType; @@ -23,8 +23,6 @@ public ValidateUserTask(IHttpContextAccessor httpContextAccessor, IOptions nameof(ValidateUserTask); - public override LocalizedString Category => S["User"]; public bool SetUserName diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/CommitTransactionTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/CommitTransactionTask.cs index 98a64d7db85..3630c278dc2 100644 --- a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/CommitTransactionTask.cs +++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/CommitTransactionTask.cs @@ -8,7 +8,7 @@ namespace OrchardCore.Workflows.Activities { - public class CommitTransactionTask : TaskActivity + public class CommitTransactionTask : TaskActivity { private readonly ISession _session; private readonly IUpdateModelAccessor _updateModelAccessor; @@ -24,8 +24,6 @@ public CommitTransactionTask( S = localizer; } - public override string Name => nameof(CommitTransactionTask); - public override LocalizedString DisplayText => S["Commit Transaction Task"]; public override LocalizedString Category => S["Session"]; diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/CorrelateTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/CorrelateTask.cs index 31265d6bb9a..94442b9f447 100644 --- a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/CorrelateTask.cs +++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/CorrelateTask.cs @@ -7,7 +7,7 @@ namespace OrchardCore.Workflows.Activities { - public class CorrelateTask : TaskActivity + public class CorrelateTask : TaskActivity { private readonly IWorkflowScriptEvaluator _scriptEvaluator; protected readonly IStringLocalizer S; @@ -18,8 +18,6 @@ public CorrelateTask(IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer< S = localizer; } - public override string Name => nameof(CorrelateTask); - public override LocalizedString DisplayText => S["Correlate Task"]; public override LocalizedString Category => S["Primitives"]; diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/ForEachTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/ForEachTask.cs index 40cb5b912ac..db4b9466ea7 100644 --- a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/ForEachTask.cs +++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/ForEachTask.cs @@ -8,7 +8,7 @@ namespace OrchardCore.Workflows.Activities { - public class ForEachTask : TaskActivity + public class ForEachTask : TaskActivity { private readonly IWorkflowScriptEvaluator _scriptEvaluator; protected readonly IStringLocalizer S; @@ -18,7 +18,6 @@ public ForEachTask(IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer nameof(ForEachTask); public override LocalizedString DisplayText => S["For Each Task"]; diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/ForLoopTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/ForLoopTask.cs index f5758313ee7..0cb1c01a999 100644 --- a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/ForLoopTask.cs +++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/ForLoopTask.cs @@ -8,7 +8,7 @@ namespace OrchardCore.Workflows.Activities { - public class ForLoopTask : TaskActivity + public class ForLoopTask : TaskActivity { private readonly IWorkflowScriptEvaluator _scriptEvaluator; protected readonly IStringLocalizer S; @@ -19,8 +19,6 @@ public ForLoopTask(IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer nameof(ForLoopTask); - public override LocalizedString DisplayText => S["For Loop Task"]; public override LocalizedString Category => S["Control Flow"]; diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/ForkTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/ForkTask.cs index 553d98c5dac..9d0e7fafc27 100644 --- a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/ForkTask.cs +++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/ForkTask.cs @@ -6,7 +6,7 @@ namespace OrchardCore.Workflows.Activities { - public class ForkTask : TaskActivity + public class ForkTask : TaskActivity { protected readonly IStringLocalizer S; @@ -15,8 +15,6 @@ public ForkTask(IStringLocalizer localizer) S = localizer; } - public override string Name => nameof(ForkTask); - public override LocalizedString DisplayText => S["Fork Task"]; public override LocalizedString Category => S["Control Flow"]; diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/IfElseTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/IfElseTask.cs index a849b210e8e..3753b773879 100644 --- a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/IfElseTask.cs +++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/IfElseTask.cs @@ -7,7 +7,7 @@ namespace OrchardCore.Workflows.Activities { - public class IfElseTask : TaskActivity + public class IfElseTask : TaskActivity { private readonly IWorkflowScriptEvaluator _scriptEvaluator; protected readonly IStringLocalizer S; @@ -17,7 +17,6 @@ public IfElseTask(IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer nameof(IfElseTask); public override LocalizedString DisplayText => S["If Else Task"]; diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/JoinTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/JoinTask.cs index 4c2fa84b7c4..9c4d6be0f98 100644 --- a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/JoinTask.cs +++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/JoinTask.cs @@ -7,7 +7,7 @@ namespace OrchardCore.Workflows.Activities { - public class JoinTask : TaskActivity + public class JoinTask : TaskActivity { protected readonly IStringLocalizer S; @@ -22,8 +22,6 @@ public JoinTask(IStringLocalizer localizer) S = localizer; } - public override string Name => nameof(JoinTask); - public override LocalizedString DisplayText => S["Join Task"]; public override LocalizedString Category => S["Control Flow"]; diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/LogTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/LogTask.cs index 3cb65633c86..e81041f9fbd 100644 --- a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/LogTask.cs +++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/LogTask.cs @@ -8,7 +8,7 @@ namespace OrchardCore.Workflows.Activities { - public class LogTask : TaskActivity + public class LogTask : TaskActivity { private readonly ILogger _logger; private readonly IWorkflowExpressionEvaluator _expressionEvaluator; @@ -20,7 +20,6 @@ public LogTask(ILogger logger, IWorkflowExpressionEvaluator expressionE _expressionEvaluator = expressionEvaluator; S = localizer; } - public override string Name => nameof(LogTask); public override LocalizedString DisplayText => S["Log Task"]; diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/NotifyTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/NotifyTask.cs index 145a96b815f..dfa40247cc9 100644 --- a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/NotifyTask.cs +++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/NotifyTask.cs @@ -10,7 +10,7 @@ namespace OrchardCore.Workflows.Activities { - public class NotifyTask : TaskActivity + public class NotifyTask : TaskActivity { private readonly INotifier _notifier; private readonly IWorkflowExpressionEvaluator _expressionEvaluator; @@ -19,18 +19,16 @@ public class NotifyTask : TaskActivity public NotifyTask( INotifier notifier, - IWorkflowExpressionEvaluator expressionvaluator, + IWorkflowExpressionEvaluator expressionEvaluator, IStringLocalizer localizer, HtmlEncoder htmlEncoder) { _notifier = notifier; - _expressionEvaluator = expressionvaluator; + _expressionEvaluator = expressionEvaluator; S = localizer; _htmlEncoder = htmlEncoder; } - public override string Name => nameof(NotifyTask); - public override LocalizedString DisplayText => S["Notify Task"]; public override LocalizedString Category => S["UI"]; diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/ScriptTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/ScriptTask.cs index d39105c2fda..5acf66f7358 100644 --- a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/ScriptTask.cs +++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/ScriptTask.cs @@ -9,7 +9,7 @@ namespace OrchardCore.Workflows.Activities { - public class ScriptTask : TaskActivity + public class ScriptTask : TaskActivity { private readonly IWorkflowScriptEvaluator _scriptEvaluator; protected readonly IStringLocalizer S; @@ -20,8 +20,6 @@ public ScriptTask(IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer nameof(ScriptTask); - public override LocalizedString DisplayText => S["Script Task"]; public override LocalizedString Category => S["Control Flow"]; diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/SetOutputTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/SetOutputTask.cs index d6bc19be873..5954993e175 100644 --- a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/SetOutputTask.cs +++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/SetOutputTask.cs @@ -7,7 +7,7 @@ namespace OrchardCore.Workflows.Activities { - public class SetOutputTask : TaskActivity + public class SetOutputTask : TaskActivity { private readonly IWorkflowScriptEvaluator _scriptEvaluator; protected readonly IStringLocalizer S; @@ -18,8 +18,6 @@ public SetOutputTask(IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer< S = localizer; } - public override string Name => nameof(SetOutputTask); - public override LocalizedString DisplayText => S["Set Output Task"]; public override LocalizedString Category => S["Primitives"]; diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/SetPropertyTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/SetPropertyTask.cs index 7ecebfccccc..43930af32ce 100644 --- a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/SetPropertyTask.cs +++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/SetPropertyTask.cs @@ -7,7 +7,7 @@ namespace OrchardCore.Workflows.Activities { - public class SetPropertyTask : TaskActivity + public class SetPropertyTask : TaskActivity { private readonly IWorkflowScriptEvaluator _scriptEvaluator; protected readonly IStringLocalizer S; @@ -18,8 +18,6 @@ public SetPropertyTask(IWorkflowScriptEvaluator scriptEvaluator, IStringLocalize S = localizer; } - public override string Name => nameof(SetPropertyTask); - public override LocalizedString DisplayText => S["Set Property Task"]; public override LocalizedString Category => S["Primitives"]; diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/WhileLoopTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/WhileLoopTask.cs index a74f0421f5b..9230445f758 100644 --- a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/WhileLoopTask.cs +++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/WhileLoopTask.cs @@ -7,7 +7,7 @@ namespace OrchardCore.Workflows.Activities { - public class WhileLoopTask : TaskActivity + public class WhileLoopTask : TaskActivity { private readonly IWorkflowScriptEvaluator _scriptEvaluator; protected readonly IStringLocalizer S; @@ -18,8 +18,6 @@ public WhileLoopTask(IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer< S = localizer; } - public override string Name => nameof(WhileLoopTask); - public override LocalizedString DisplayText => S["While Loop Task"]; public override LocalizedString Category => S["Control Flow"]; diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpRedirectTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpRedirectTask.cs index fe752f2ce3b..6852ff62e73 100644 --- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpRedirectTask.cs +++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpRedirectTask.cs @@ -11,7 +11,7 @@ namespace OrchardCore.Workflows.Http.Activities { - public class HttpRedirectTask : TaskActivity + public class HttpRedirectTask : TaskActivity { private readonly IHttpContextAccessor _httpContextAccessor; private readonly IWorkflowExpressionEvaluator _expressionEvaluator; @@ -28,8 +28,6 @@ IWorkflowExpressionEvaluator expressionEvaluator _expressionEvaluator = expressionEvaluator; } - public override string Name => nameof(HttpRedirectTask); - public override LocalizedString DisplayText => S["Http Redirect Task"]; public override LocalizedString Category => S["HTTP"]; diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpRequestTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpRequestTask.cs index 7d32c58c09f..b0961519406 100644 --- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpRequestTask.cs +++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpRequestTask.cs @@ -14,73 +14,73 @@ namespace OrchardCore.Workflows.Http.Activities { - public class HttpRequestTask : TaskActivity + public class HttpRequestTask : TaskActivity { private static readonly Dictionary _httpStatusCodeDictionary = new() { { 100, "Continue" }, - { 101, " Switching Protocols" }, - { 102 , "Processing" }, - { 200 , "OK" }, - { 201 , "Created" }, - { 202 , "Accepted" }, - { 203 , "Non-authoritative Information" }, - { 204 , "No Content" }, - { 205 , "Reset Content" }, - { 206 , "Partial Content" }, - { 207 , "Multi-Status" }, - { 208 , "Already Reported" }, - { 226 , "IM Used" }, - { 300 , "Multiple Choices" }, - { 301 , "Moved Permanently" }, - { 302 , "Found" }, - { 303 , "See Other" }, - { 304 , "Not Modified" }, - { 305 , "Use Proxy" }, - { 307 , "Temporary Redirect" }, - { 308 , "Permanent Redirect" }, - { 400 , "Bad Request" }, - { 401 , "Unauthorized" }, - { 402 , "Payment Required" }, - { 403 , "Forbidden" }, - { 404 , "Not Found" }, - { 405 , "Method Not Allowed" }, - { 406 , "Not Acceptable" }, - { 407 , "Proxy Authentication Required" }, - { 408 , "Request Timeout" }, - { 409 , "Conflict" }, - { 410 , "Gone" }, - { 411 , "Length Required" }, - { 412 , "Precondition Failed" }, - { 413 , "Payload Too Large" }, - { 414 , "Request-URI Too Long" }, - { 415 , "Unsupported Media Type" }, - { 416 , "Requested Range Not Satisfiable" }, - { 417 , "Expectation Failed" }, - { 418 , "I'm a teapot" }, - { 421 , "Misdirected Request" }, - { 422 , "Unprocessable Entity" }, - { 423 , "Locked" }, - { 424 , "Failed Dependency" }, - { 426 , "Upgrade Required" }, - { 428 , "Precondition Required" }, - { 429 , "Too Many Requests" }, - { 431 , "Request Header Fields Too Large" }, - { 444 , "Connection Closed Without Response" }, - { 451 , "Unavailable For Legal Reasons" }, - { 499 , "Client Closed Request" }, - { 500 , "Internal Server Error" }, - { 501 , "Not Implemented" }, - { 502 , "Bad Gateway" }, - { 503 , "Service Unavailable" }, - { 504 , "Gateway Timeout" }, - { 505 , "HTTP Version Not Supported" }, - { 506 , "Variant Also Negotiates" }, - { 507 , "Insufficient Storage" }, - { 508 , "Loop Detected" }, - { 510 , "Not Extended" }, - { 511 , "Network Authentication Required" }, - { 599 , "Network Connect Timeout Error" } + { 101, "Switching Protocols" }, + { 102, "Processing" }, + { 200, "OK" }, + { 201, "Created" }, + { 202, "Accepted" }, + { 203, "Non-authoritative Information" }, + { 204, "No Content" }, + { 205, "Reset Content" }, + { 206, "Partial Content" }, + { 207, "Multi-Status" }, + { 208, "Already Reported" }, + { 226, "IM Used" }, + { 300, "Multiple Choices" }, + { 301, "Moved Permanently" }, + { 302, "Found" }, + { 303, "See Other" }, + { 304, "Not Modified" }, + { 305, "Use Proxy" }, + { 307, "Temporary Redirect" }, + { 308, "Permanent Redirect" }, + { 400, "Bad Request" }, + { 401, "Unauthorized" }, + { 402, "Payment Required" }, + { 403, "Forbidden" }, + { 404, "Not Found" }, + { 405, "Method Not Allowed" }, + { 406, "Not Acceptable" }, + { 407, "Proxy Authentication Required" }, + { 408, "Request Timeout" }, + { 409, "Conflict" }, + { 410, "Gone" }, + { 411, "Length Required" }, + { 412, "Precondition Failed" }, + { 413, "Payload Too Large" }, + { 414, "Request-URI Too Long" }, + { 415, "Unsupported Media Type" }, + { 416, "Requested Range Not Satisfiable" }, + { 417, "Expectation Failed" }, + { 418, "I'm a teapot" }, + { 421, "Misdirected Request" }, + { 422, "Unprocessable Entity" }, + { 423, "Locked" }, + { 424, "Failed Dependency" }, + { 426, "Upgrade Required" }, + { 428, "Precondition Required" }, + { 429, "Too Many Requests" }, + { 431, "Request Header Fields Too Large" }, + { 444, "Connection Closed Without Response" }, + { 451, "Unavailable For Legal Reasons" }, + { 499, "Client Closed Request" }, + { 500, "Internal Server Error" }, + { 501, "Not Implemented" }, + { 502, "Bad Gateway" }, + { 503, "Service Unavailable" }, + { 504, "Gateway Timeout" }, + { 505, "HTTP Version Not Supported" }, + { 506, "Variant Also Negotiates" }, + { 507, "Insufficient Storage" }, + { 508, "Loop Detected" }, + { 510, "Not Extended" }, + { 511, "Network Authentication Required" }, + { 599, "Network Connect Timeout Error" } }; private static readonly HttpClient _httpClient = new(); @@ -99,8 +99,6 @@ UrlEncoder urlEncoder _urlEncoder = urlEncoder; } - public override string Name => nameof(HttpRequestTask); - public override LocalizedString DisplayText => S["Http Request Task"]; public override LocalizedString Category => S["HTTP"]; diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpResponseTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpResponseTask.cs index f824d29fc83..413d89ced97 100644 --- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpResponseTask.cs +++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpResponseTask.cs @@ -13,7 +13,7 @@ namespace OrchardCore.Workflows.Http.Activities { - public class HttpResponseTask : TaskActivity + public class HttpResponseTask : TaskActivity { private readonly IHttpContextAccessor _httpContextAccessor; private readonly IWorkflowExpressionEvaluator _expressionEvaluator; @@ -33,8 +33,6 @@ UrlEncoder urlEncoder _urlEncoder = urlEncoder; } - public override string Name => nameof(HttpResponseTask); - public override LocalizedString DisplayText => S["Http Response Task"]; public override LocalizedString Category => S["HTTP"]; diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Views/Items/HttpRedirectTask.Fields.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Workflows/Views/Items/HttpRedirectTask.Fields.Edit.cshtml index 5e884be7d5c..33f82b23bf4 100644 --- a/src/OrchardCore.Modules/OrchardCore.Workflows/Views/Items/HttpRedirectTask.Fields.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Views/Items/HttpRedirectTask.Fields.Edit.cshtml @@ -9,9 +9,11 @@
- - @T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."] +
+ + @T["Check if the redirect should be permanent (301). Leave unchecked for a temporary redirect (302)."] +
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/TaskActivity.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/TaskActivity.cs index e6b44150d20..f3f2fe339be 100644 --- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/TaskActivity.cs +++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/TaskActivity.cs @@ -1,6 +1,11 @@ -namespace OrchardCore.Workflows.Activities +namespace OrchardCore.Workflows.Activities; + +public abstract class TaskActivity : Activity, ITask { - public abstract class TaskActivity : Activity, ITask - { - } +} + +public abstract class TaskActivity : TaskActivity where TActivity : ITask +{ + // The technical name of the activity. Within a workflow definition, activities make use of this name. + public override string Name => typeof(TActivity).Name; } diff --git a/test/OrchardCore.Tests/Workflows/Activities/AddTask.cs b/test/OrchardCore.Tests/Workflows/Activities/AddTask.cs index 90e2631a4b5..a2d6e651390 100644 --- a/test/OrchardCore.Tests/Workflows/Activities/AddTask.cs +++ b/test/OrchardCore.Tests/Workflows/Activities/AddTask.cs @@ -5,7 +5,7 @@ namespace OrchardCore.Tests.Workflows.Activities { - public class AddTask : TaskActivity + public class AddTask : TaskActivity { private readonly IWorkflowScriptEvaluator _scriptEvaluator; protected readonly IStringLocalizer S; @@ -16,8 +16,6 @@ public AddTask(IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer nameof(AddTask); - public override LocalizedString DisplayText => S["Add Task"]; public override LocalizedString Category => S["Test"]; diff --git a/test/OrchardCore.Tests/Workflows/Activities/WriteLineTask.cs b/test/OrchardCore.Tests/Workflows/Activities/WriteLineTask.cs index d821947f54b..eaba090f7e7 100644 --- a/test/OrchardCore.Tests/Workflows/Activities/WriteLineTask.cs +++ b/test/OrchardCore.Tests/Workflows/Activities/WriteLineTask.cs @@ -5,7 +5,7 @@ namespace OrchardCore.Tests.Workflows.Activities { - public class WriteLineTask : TaskActivity + public class WriteLineTask : TaskActivity { private readonly IWorkflowScriptEvaluator _scriptEvaluator; private readonly TextWriter _output; @@ -18,8 +18,6 @@ public WriteLineTask(IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer S = stringLocalizer; } - public override string Name => nameof(WriteLineTask); - public override LocalizedString DisplayText => S["Write Line Task"]; public override LocalizedString Category => S["Test"];