From 7966980e4141d73b10640d8221a5877db5c9df33 Mon Sep 17 00:00:00 2001
From: Mike Alhayek <mike@crestapps.com>
Date: Thu, 19 Oct 2023 10:56:37 -0700
Subject: [PATCH] Add a way to restart a workflow instance (#14470)

---
 .../Workflows/Activities/ContentActivity.cs   |  42 ++++-
 .../Workflows/Handlers/ContentsHandler.cs     |   3 +-
 .../Controllers/WorkflowController.cs         |  52 ++++++
 .../Services/WorkflowManager.cs               | 165 +++++++++++++-----
 .../Drivers/UserTaskEventContentDriver.cs     |   3 +-
 .../Views/Workflow/Details.cshtml             |  39 +++--
 .../Views/Workflow/Index.cshtml               |  33 ++--
 .../Workflows/ContentEventContext.cs          |   1 +
 .../Activities/Activity.cs                    |  10 ++
 .../Activities/IActivity.cs                   |  10 ++
 .../Services/IWorkflowManager.cs              |  27 +++
 src/docs/releases/1.8.0.md                    |  15 +-
 12 files changed, 323 insertions(+), 77 deletions(-)

diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentActivity.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentActivity.cs
index 72711504803..5c94e70abd0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentActivity.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentActivity.cs
@@ -1,8 +1,9 @@
-using System;
 using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Localization;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Workflows;
 using OrchardCore.Workflows.Abstractions.Models;
@@ -17,7 +18,10 @@ public abstract class ContentActivity : Activity
     {
         protected readonly IStringLocalizer S;
 
-        protected ContentActivity(IContentManager contentManager, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer localizer)
+        protected ContentActivity(
+            IContentManager contentManager,
+            IWorkflowScriptEvaluator scriptEvaluator,
+            IStringLocalizer localizer)
         {
             ContentManager = contentManager;
             ScriptEvaluator = scriptEvaluator;
@@ -68,6 +72,40 @@ public override ActivityExecutionResult Execute(WorkflowExecutionContext workflo
             return Outcomes("Done");
         }
 
+        public override async Task OnWorkflowRestartingAsync(WorkflowExecutionContext workflowContext, CancellationToken cancellationToken = default)
+        {
+            ContentItem contentItem = null;
+
+            if (workflowContext.Input.TryGetValue(ContentEventConstants.ContentEventInputKey, out var contentEvent))
+            {
+                var contentEventContext = ((JObject)contentEvent).ToObject<ContentEventContext>();
+
+                if (contentEventContext?.ContentItemVersionId != null)
+                {
+                    contentItem = await ContentManager.GetVersionAsync(contentEventContext.ContentItemVersionId);
+                }
+                if (contentItem == null && contentEventContext?.ContentItemId != null)
+                {
+                    contentItem = await ContentManager.GetAsync(contentEventContext.ContentItemId);
+                }
+            }
+
+            if (contentItem == null && workflowContext.Input.TryGetValue(ContentEventConstants.ContentItemInputKey, out var contentItemEvent))
+            {
+                var item = ((JObject)contentItemEvent).ToObject<ContentItem>();
+
+                if (item?.ContentItemId != null)
+                {
+                    contentItem = await ContentManager.GetAsync(item.ContentItemId);
+                }
+            }
+
+            if (contentItem != null)
+            {
+                workflowContext.Input[ContentEventConstants.ContentItemInputKey] = contentItem;
+            }
+        }
+
         protected virtual async Task<IContent> GetContentAsync(WorkflowExecutionContext workflowContext)
         {
             IContent content;
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Handlers/ContentsHandler.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Handlers/ContentsHandler.cs
index 07a72f186da..2e2d62a9654 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Handlers/ContentsHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Handlers/ContentsHandler.cs
@@ -58,7 +58,8 @@ private Task TriggerWorkflowEventAsync(string name, ContentItem contentItem)
             {
                 Name = name,
                 ContentType = contentItem.ContentType,
-                ContentItemId = contentItem.ContentItemId
+                ContentItemId = contentItem.ContentItemId,
+                ContentItemVersionId = contentItem.ContentItemVersionId,
             };
 
             var input = new Dictionary<string, object>
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Controllers/WorkflowController.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Controllers/WorkflowController.cs
index e7223836dcf..4f4de22c1c1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Controllers/WorkflowController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Controllers/WorkflowController.cs
@@ -15,6 +15,7 @@
 using OrchardCore.DisplayManagement;
 using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.DisplayManagement.Notify;
+using OrchardCore.Locking.Distributed;
 using OrchardCore.Mvc.Core.Utilities;
 using OrchardCore.Navigation;
 using OrchardCore.Routing;
@@ -42,6 +43,7 @@ public class WorkflowController : Controller
         private readonly IUpdateModelAccessor _updateModelAccessor;
         protected readonly dynamic New;
         protected readonly IHtmlLocalizer H;
+        private readonly IDistributedLock _distributedLock;
         protected readonly IStringLocalizer S;
 
         public WorkflowController(
@@ -55,6 +57,7 @@ public WorkflowController(
             IShapeFactory shapeFactory,
             INotifier notifier,
             IHtmlLocalizer<WorkflowController> htmlLocalizer,
+            IDistributedLock distributedLock,
             IStringLocalizer<WorkflowController> stringLocalizer,
             IUpdateModelAccessor updateModelAccessor)
         {
@@ -69,6 +72,7 @@ public WorkflowController(
             _updateModelAccessor = updateModelAccessor;
             New = shapeFactory;
             H = htmlLocalizer;
+            _distributedLock = distributedLock;
             S = stringLocalizer;
         }
 
@@ -242,6 +246,54 @@ public async Task<IActionResult> Delete(long id)
             return RedirectToAction(nameof(Index), new { workflowTypeId = workflowType.Id });
         }
 
+        [HttpPost]
+        public async Task<IActionResult> Restart(long id)
+        {
+            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
+            {
+                return Forbid();
+            }
+
+            var workflow = await _workflowStore.GetAsync(id);
+
+            if (workflow == null)
+            {
+                return NotFound();
+            }
+
+            var workflowType = await _workflowTypeStore.GetAsync(workflow.WorkflowTypeId);
+
+            if (workflowType == null)
+            {
+                return NotFound();
+            }
+
+            // If a singleton, try to acquire a lock per workflow type.
+            (var locker, var locked) = await _distributedLock.TryAcquireWorkflowTypeLockAsync(workflowType);
+            if (!locked)
+            {
+                await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+            }
+            else
+            {
+                await using var acquiredLock = locker;
+
+                // Check if this is a workflow singleton and there's already an halted instance on any activity.
+                if (workflowType.IsSingleton && await _workflowStore.HasHaltedInstanceAsync(workflowType.WorkflowTypeId))
+                {
+                    await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+                }
+                else
+                {
+                    await _workflowManager.RestartWorkflowAsync(workflow, workflowType);
+
+                    await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+                }
+            }
+
+            return RedirectToAction(nameof(Index), new { workflowTypeId = workflowType.Id });
+        }
+
         [HttpPost]
         [ActionName(nameof(Index))]
         [FormValueRequired("submit.BulkAction")]
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Services/WorkflowManager.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Services/WorkflowManager.cs
index 9d2fcc7aaa2..e3eee6c7ef4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Services/WorkflowManager.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Services/WorkflowManager.cs
@@ -64,13 +64,18 @@ public WorkflowManager
 
         public Workflow NewWorkflow(WorkflowType workflowType, string correlationId = null)
         {
+            if (workflowType == null)
+            {
+                throw new ArgumentNullException(nameof(workflowType));
+            }
+
             var workflow = new Workflow
             {
                 WorkflowTypeId = workflowType.WorkflowTypeId,
                 Status = WorkflowStatus.Idle,
                 State = JObject.FromObject(new WorkflowState
                 {
-                    ActivityStates = workflowType.Activities.Select(x => x).ToDictionary(x => x.ActivityId, x => x.Properties)
+                    ActivityStates = workflowType.Activities.ToDictionary(x => x.ActivityId, x => x.Properties)
                 }),
                 CorrelationId = correlationId,
                 LockTimeout = workflowType.LockTimeout,
@@ -84,6 +89,16 @@ public Workflow NewWorkflow(WorkflowType workflowType, string correlationId = nu
 
         public async Task<WorkflowExecutionContext> CreateWorkflowExecutionContextAsync(WorkflowType workflowType, Workflow workflow, IDictionary<string, object> input = null)
         {
+            if (workflowType == null)
+            {
+                throw new ArgumentNullException(nameof(workflowType));
+            }
+
+            if (workflow == null)
+            {
+                throw new ArgumentNullException(nameof(workflow));
+            }
+
             var state = workflow.State.ToObject<WorkflowState>();
             var activityQuery = await Task.WhenAll(workflowType.Activities.Select(x =>
             {
@@ -100,11 +115,17 @@ public async Task<WorkflowExecutionContext> CreateWorkflowExecutionContextAsync(
             var output = await DeserializeAsync(state.Output);
             var lastResult = await DeserializeAsync(state.LastResult);
             var executedActivities = state.ExecutedActivities;
+
             return new WorkflowExecutionContext(workflowType, workflow, mergedInput, output, properties, executedActivities, lastResult, activityQuery);
         }
 
         public Task<ActivityContext> CreateActivityExecutionContextAsync(ActivityRecord activityRecord, JObject properties)
         {
+            if (activityRecord == null)
+            {
+                throw new ArgumentNullException(nameof(activityRecord));
+            }
+
             var activity = _activityLibrary.InstantiateActivity<IActivity>(activityRecord.Name, properties);
 
             if (activity == null)
@@ -227,6 +248,16 @@ public async Task TriggerEventAsync(string name, IDictionary<string, object> inp
 
         public async Task<WorkflowExecutionContext> ResumeWorkflowAsync(Workflow workflow, BlockingActivity awaitingActivity, IDictionary<string, object> input = null)
         {
+            if (workflow == null)
+            {
+                throw new ArgumentNullException(nameof(workflow));
+            }
+
+            if (awaitingActivity == null)
+            {
+                throw new ArgumentNullException(nameof(awaitingActivity));
+            }
+
             var workflowType = await _workflowTypeStore.GetAsync(workflow.WorkflowTypeId);
             var activityRecord = workflowType.Activities.SingleOrDefault(x => x.ActivityId == awaitingActivity.ActivityId);
             var workflowContext = await CreateWorkflowExecutionContextAsync(workflowType, workflow, input);
@@ -243,29 +274,28 @@ public async Task<WorkflowExecutionContext> ResumeWorkflowAsync(Workflow workflo
             {
                 // Workflow is aborted.
                 workflowContext.Status = WorkflowStatus.Aborted;
+
+                return workflowContext;
             }
-            else
-            {
-                // Check if the current activity can execute.
-                var activityContext = workflowContext.GetActivity(activityRecord.ActivityId);
-                if (await activityContext.Activity.CanExecuteAsync(workflowContext, activityContext))
-                {
-                    // Signal every activity that the workflow is resumed.
-                    await InvokeActivitiesAsync(workflowContext, x => x.Activity.OnWorkflowResumedAsync(workflowContext));
 
-                    // Remove the blocking activity.
-                    workflowContext.Workflow.BlockingActivities.Remove(awaitingActivity);
+            // Check if the current activity can execute.
+            var activityContext = workflowContext.GetActivity(activityRecord.ActivityId);
+            if (!await activityContext.Activity.CanExecuteAsync(workflowContext, activityContext))
+            {
+                workflowContext.Status = WorkflowStatus.Halted;
 
-                    // Resume the workflow at the specified blocking activity.
-                    await ExecuteWorkflowAsync(workflowContext, activityRecord);
-                }
-                else
-                {
-                    workflowContext.Status = WorkflowStatus.Halted;
-                    return workflowContext;
-                }
+                return workflowContext;
             }
 
+            // Signal every activity that the workflow is resumed.
+            await InvokeActivitiesAsync(workflowContext, x => x.Activity.OnWorkflowResumedAsync(workflowContext));
+
+            // Remove the blocking activity.
+            workflowContext.Workflow.BlockingActivities.Remove(awaitingActivity);
+
+            // Resume the workflow at the specified blocking activity.
+            await ExecuteWorkflowAsync(workflowContext, activityRecord);
+
             if (workflowContext.Status == WorkflowStatus.Finished && workflowType.DeleteFinishedWorkflows)
             {
                 await _workflowStore.DeleteAsync(workflowContext.Workflow);
@@ -278,18 +308,73 @@ public async Task<WorkflowExecutionContext> ResumeWorkflowAsync(Workflow workflo
             return workflowContext;
         }
 
-        public async Task<WorkflowExecutionContext> StartWorkflowAsync(WorkflowType workflowType, ActivityRecord startActivity = null, IDictionary<string, object> input = null, string correlationId = null)
+        public async Task<WorkflowExecutionContext> RestartWorkflowAsync(WorkflowType workflowType, IDictionary<string, object> input = null, string correlationId = null)
         {
-            if (startActivity == null)
+            if (workflowType == null)
             {
-                startActivity = workflowType.Activities.FirstOrDefault(x => x.IsStart);
+                throw new ArgumentNullException(nameof(workflowType));
+            }
 
-                if (startActivity == null)
-                {
-                    throw new InvalidOperationException($"Workflow with ID {workflowType.Id} does not have a start activity.");
-                }
+            var startActivity = workflowType.Activities?.FirstOrDefault(x => x.IsStart)
+                ?? throw new InvalidOperationException($"Workflow with ID {workflowType.Id} does not have a start activity.");
+
+            // Create a new workflow instance.
+            var workflow = NewWorkflow(workflowType, correlationId);
+
+            // Create a workflow context.
+            var workflowContext = await CreateWorkflowExecutionContextAsync(workflowType, workflow, input);
+            workflowContext.Status = WorkflowStatus.Starting;
+
+            // Signal every activity that the workflow is about to start.
+            // This should be called prior OnInputReceivedAsync.
+            var cancellationToken = new CancellationToken();
+            await InvokeActivitiesAsync(workflowContext, x => x.Activity.OnWorkflowRestartingAsync(workflowContext, cancellationToken));
+
+            // Signal every activity about available input.
+            await InvokeActivitiesAsync(workflowContext, x => x.Activity.OnInputReceivedAsync(workflowContext, input));
+
+            if (cancellationToken.IsCancellationRequested)
+            {
+                // Workflow is aborted.
+                workflowContext.Status = WorkflowStatus.Aborted;
+
+                return workflowContext;
+            }
+
+            // Check if the current activity can execute.
+            var activityContext = workflowContext.GetActivity(startActivity.ActivityId);
+            if (!await activityContext.Activity.CanExecuteAsync(workflowContext, activityContext))
+            {
+                workflowContext.Status = WorkflowStatus.Idle;
+
+                return workflowContext;
+            }
+
+            // Signal every activity that the workflow has started.
+            await InvokeActivitiesAsync(workflowContext, x => x.Activity.OnWorkflowRestartedAsync(workflowContext));
+
+            // Execute the activity.
+            await ExecuteWorkflowAsync(workflowContext, startActivity);
+
+            if (workflowContext.Status != WorkflowStatus.Finished || !workflowType.DeleteFinishedWorkflows)
+            {
+                // Serialize state.
+                await PersistAsync(workflowContext);
+            }
+
+            return workflowContext;
+        }
+
+        public async Task<WorkflowExecutionContext> StartWorkflowAsync(WorkflowType workflowType, ActivityRecord startActivity = null, IDictionary<string, object> input = null, string correlationId = null)
+        {
+            if (workflowType == null)
+            {
+                throw new ArgumentNullException(nameof(workflowType));
             }
 
+            startActivity ??= workflowType.Activities?.FirstOrDefault(x => x.IsStart)
+                ?? throw new InvalidOperationException($"Workflow with ID {workflowType.Id} does not have a start activity.");
+
             // Create a new workflow instance.
             var workflow = NewWorkflow(workflowType, correlationId);
 
@@ -308,27 +393,25 @@ public async Task<WorkflowExecutionContext> StartWorkflowAsync(WorkflowType work
             {
                 // Workflow is aborted.
                 workflowContext.Status = WorkflowStatus.Aborted;
+
                 return workflowContext;
             }
-            else
+
+            // Check if the current activity can execute.
+            var activityContext = workflowContext.GetActivity(startActivity.ActivityId);
+            if (!await activityContext.Activity.CanExecuteAsync(workflowContext, activityContext))
             {
-                // Check if the current activity can execute.
-                var activityContext = workflowContext.GetActivity(startActivity.ActivityId);
-                if (await activityContext.Activity.CanExecuteAsync(workflowContext, activityContext))
-                {
-                    // Signal every activity that the workflow has started.
-                    await InvokeActivitiesAsync(workflowContext, x => x.Activity.OnWorkflowStartedAsync(workflowContext));
+                workflowContext.Status = WorkflowStatus.Idle;
 
-                    // Execute the activity.
-                    await ExecuteWorkflowAsync(workflowContext, startActivity);
-                }
-                else
-                {
-                    workflowContext.Status = WorkflowStatus.Idle;
-                    return workflowContext;
-                }
+                return workflowContext;
             }
 
+            // Signal every activity that the workflow has started.
+            await InvokeActivitiesAsync(workflowContext, x => x.Activity.OnWorkflowStartedAsync(workflowContext));
+
+            // Execute the activity.
+            await ExecuteWorkflowAsync(workflowContext, startActivity);
+
             if (workflowContext.Status != WorkflowStatus.Finished || !workflowType.DeleteFinishedWorkflows)
             {
                 // Serialize state.
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/UserTasks/Drivers/UserTaskEventContentDriver.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/UserTasks/Drivers/UserTaskEventContentDriver.cs
index 3a90d8ec0d8..68fc4e38086 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/UserTasks/Drivers/UserTaskEventContentDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/UserTasks/Drivers/UserTaskEventContentDriver.cs
@@ -77,7 +77,8 @@ public override async Task<IDisplayResult> UpdateAsync(ContentItem model, IUpdat
                     {
                         Name = nameof(UserTaskEvent),
                         ContentType = model.ContentType,
-                        ContentItemId = model.ContentItemId
+                        ContentItemId = model.ContentItemId,
+                        ContentItemVersionId = model.ContentItemVersionId,
                     };
 
                     var input = new Dictionary<string, object>
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Views/Workflow/Details.cshtml b/src/OrchardCore.Modules/OrchardCore.Workflows/Views/Workflow/Details.cshtml
index f5f842ee5ce..44085feb893 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Views/Workflow/Details.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Views/Workflow/Details.cshtml
@@ -6,14 +6,14 @@
 <zone Name="Title"><h1>@RenderTitleSegments(Model.WorkflowType.Name)</h1></zone>
 
 <zone name="Breadcrumbs">
-<nav aria-label="breadcrumb">
-    <ol class="breadcrumb">
-        <li class="breadcrumb-item"><a asp-action="Index" asp-controller="WorkflowType">@T["Workflows"]</a></li>
-        <li class="breadcrumb-item"><a asp-action="Edit" asp-controller="WorkflowType" asp-route-id="@Model.WorkflowType.Id">@Model.WorkflowType.Name</a></li>
-        <li class="breadcrumb-item"><a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@Model.WorkflowType.Id">@T["Instances"]</a></li>
-        <li class="breadcrumb-item active" aria-current="page">@Model.Workflow.WorkflowId</li>
-    </ol>
-</nav>
+    <nav aria-label="breadcrumb">
+        <ol class="breadcrumb">
+            <li class="breadcrumb-item"><a asp-action="Index" asp-controller="WorkflowType">@T["Workflows"]</a></li>
+            <li class="breadcrumb-item"><a asp-action="Edit" asp-controller="WorkflowType" asp-route-id="@Model.WorkflowType.Id">@Model.WorkflowType.Name</a></li>
+            <li class="breadcrumb-item"><a asp-action="Index" asp-controller="Workflow" asp-route-workflowtypeid="@Model.WorkflowType.Id">@T["Instances"]</a></li>
+            <li class="breadcrumb-item active" aria-current="page">@Model.Workflow.WorkflowId</li>
+        </ol>
+    </nav>
 </zone>
 <nav class="mb-3">
     <ul class="nav nav-pills" role="tablist">
@@ -25,8 +25,8 @@
         </li>
         @*TODO: Enable this when workflow logging is implemented.*@
         @*<li class="nav-item">
-                <a class="nav-link" id="log-tab" data-bs-toggle="pill" href="#log" role="tab" aria-controls="log">Log</a>
-            </li>*@
+        <a class="nav-link" id="log-tab" data-bs-toggle="pill" href="#log" role="tab" aria-controls="log">Log</a>
+        </li>*@
     </ul>
 </nav>
 <div class="tab-content">
@@ -82,15 +82,22 @@
     </div>
     @*TODO: Enable this when workflow logging is implemented.*@
     @*<div id="log" class="tab-pane" role="tabpanel" aria-labelledby="log-tab">
-            <div class="card">
-                <div class="card-body">
-                    Pretty LOG goes here...
-                </div>
-            </div>
-        </div>*@
+    <div class="card">
+    <div class="card-body">
+    Pretty LOG goes here...
+    </div>
+    </div>
+    </div>*@
 </div>
 <div class="mb-3">
     <a class="btn btn-secondary" asp-route-action="Index" asp-route-workflowTypeId="@Model.WorkflowType.Id">@T["Back"]</a>
+    @if (Model.Workflow.Status != WorkflowStatus.Executing
+    && Model.Workflow.Status != WorkflowStatus.Halted
+    && Model.Workflow.Status != WorkflowStatus.Resuming
+    && Model.Workflow.Status != WorkflowStatus.Starting)
+    {
+        <a asp-action="Restart" asp-route-id="@Model.Workflow.Id" class="btn btn-warning" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+    }
     <a class="btn btn-danger" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl" asp-action="Delete" asp-route-id="@Model.Workflow.Id">@T["Delete"]</a>
 </div>
 
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Views/Workflow/Index.cshtml b/src/OrchardCore.Modules/OrchardCore.Workflows/Views/Workflow/Index.cshtml
index da11be743bf..b6bee6b75b9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Views/Workflow/Index.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Views/Workflow/Index.cshtml
@@ -64,8 +64,8 @@
                 @for (var i = 0; i < Model.Workflows.Count; i++)
                 {
                     var entry = Model.Workflows[i];
-                    var statusCss = "";
-
+                    var statusCss = string.Empty;
+                    var restartable = true;
                     switch (entry.Workflow.Status)
                     {
                         case WorkflowStatus.Aborted:
@@ -83,6 +83,7 @@
                         case WorkflowStatus.Resuming:
                         case WorkflowStatus.Starting:
                             statusCss = "info";
+                            restartable = false;
                             break;
                         case WorkflowStatus.Faulted:
                             statusCss = "danger";
@@ -92,6 +93,10 @@
                     <li class="list-group-item">
                         <div class="w-100">
                             <div class="float-end">
+                                @if (restartable)
+                                {
+                                    <a asp-action="Restart" asp-route-id="@entry.Workflow.Id" class="btn btn-warning btn-sm" data-title="@T["Restart"]" data-message="@T["Are you sure you want to restart this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Restart"]</a>
+                                }
                                 <a asp-action="Delete" asp-route-id="@entry.Workflow.Id" class="btn btn-danger btn-sm" data-message="@T["Are you sure you want to delete this workflow instance?"]" data-url-af="RemoveUrl UnsafeUrl">@T["Delete"]</a>
                             </div>
 
@@ -132,7 +137,9 @@
 <script at="Foot">
     $(function () {
         $('.selectpicker').selectpicker();
-
+        $('.selectpicker').on('changed.bs.select', function (e, clickedIndex, isSelected, previousValue) {
+            $("[name='submit.Filter']").click();
+        });
         var actions = $("#actions");
         var items = $("#items");
         var filters = $(".filter");
@@ -144,21 +151,19 @@
             $("[name='submit.Filter']").click();
         });
 
-        $('.selectpicker').on('changed.bs.select', function (e, clickedIndex, isSelected, previousValue) {
-            $("[name='submit.Filter']").click();
-        });
-
-        $(".dropdown-menu .dropdown-item").filter(function() {
+        $(".dropdown-menu .dropdown-item").filter(function () {
             return $(this).data("action");
         }).on("click", function () {
             if ($(":checkbox[name='itemIds']:checked").length > 1) {
                 var $this = $(this);
-                confirmDialog({title: $this.data('title'), message: $this.data('message'), callback: function(r) {
-                    if (r) {
-                        $("[name='Options.BulkAction']").val($this.data("action"));
-                        $("[name='submit.BulkAction']").click();
+                confirmDialog({
+                    title: $this.data('title'), message: $this.data('message'), callback: function (r) {
+                        if (r) {
+                            $("[name='Options.BulkAction']").val($this.data("action"));
+                            $("[name='submit.BulkAction']").click();
+                        }
                     }
-                }});
+                });
             }
         });
 
@@ -177,7 +182,7 @@
             }
         }
 
-        selectAllCtrl.click(function(){
+        selectAllCtrl.click(function () {
             itemsCheckboxes.not(this).prop("checked", this.checked);
             selectedItems.text($(":checkbox[name='itemIds']:checked").length + ' @T["selected"]');
             displayActionsOrFilters();
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Workflows/ContentEventContext.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Workflows/ContentEventContext.cs
index 659b08162fd..e59cad75fd7 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Workflows/ContentEventContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Workflows/ContentEventContext.cs
@@ -5,6 +5,7 @@ public class ContentEventContext
         public string Name { get; set; }
         public string ContentType { get; set; }
         public string ContentItemId { get; set; }
+        public string ContentItemVersionId { get; set; }
         public bool IsStart { get; set; }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/Activity.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/Activity.cs
index 72645b51834..6afb8e65967 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/Activity.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/Activity.cs
@@ -66,6 +66,16 @@ public virtual Task OnWorkflowStartedAsync(WorkflowExecutionContext context)
             return Task.CompletedTask;
         }
 
+        public virtual Task OnWorkflowRestartingAsync(WorkflowExecutionContext context, CancellationToken cancellationToken = default)
+        {
+            return Task.CompletedTask;
+        }
+
+        public virtual Task OnWorkflowRestartedAsync(WorkflowExecutionContext context)
+        {
+            return Task.CompletedTask;
+        }
+
         public virtual Task OnWorkflowResumingAsync(WorkflowExecutionContext context, CancellationToken cancellationToken = default)
         {
             return Task.CompletedTask;
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/IActivity.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/IActivity.cs
index 2cfdaf17d64..2679159bd61 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/IActivity.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/IActivity.cs
@@ -63,6 +63,16 @@ public interface IActivity : IEntity
         /// </summary>
         Task OnWorkflowResumedAsync(WorkflowExecutionContext context);
 
+        /// <summary>
+        /// Called on each activity when a workflow is about to be restarted.
+        /// </summary>
+        Task OnWorkflowRestartingAsync(WorkflowExecutionContext context, CancellationToken cancellationToken = default);
+
+        /// <summary>
+        /// Called on each activity when a workflow is restarted.
+        /// </summary>
+        Task OnWorkflowRestartedAsync(WorkflowExecutionContext context);
+
         /// <summary>
         /// Called on each activity when an activity is about to be executed.
         /// </summary>
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowManager.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowManager.cs
index 160e1d51f9e..38d9b3f89ec 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowManager.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowManager.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Routing;
@@ -49,6 +50,15 @@ public interface IWorkflowManager
         /// <returns>Returns the created workflow context. Can be used for further inspection of the workflow state.</returns>
         Task<WorkflowExecutionContext> StartWorkflowAsync(WorkflowType workflowType, ActivityRecord startActivity = null, IDictionary<string, object> input = null, string correlationId = null);
 
+        /// <summary>
+        /// Starts a new workflow using the specified workflow definition.
+        /// </summary>
+        /// <param name="workflowType">The workflow definition to start.</param>
+        /// <param name="input">Optionally specify any inputs to be used by the workflow.</param>
+        /// <param name="correlationId">Optionally specify an application-specific value to associate the workflow instance with. For example, a content item ID.</param>
+        /// <returns>Returns the created workflow context. Can be used for further inspection of the workflow state.</returns>
+        Task<WorkflowExecutionContext> RestartWorkflowAsync(WorkflowType workflowType, IDictionary<string, object> input = null, string correlationId = null);
+
         /// <summary>
         /// Resumes the specified workflow instance at the specified activity.
         /// </summary>
@@ -66,5 +76,22 @@ public static Task TriggerEventAsync(this IWorkflowManager workflowManager, stri
         {
             return workflowManager.TriggerEventAsync(name, new RouteValueDictionary(input), correlationId);
         }
+
+        public static Task<WorkflowExecutionContext> RestartWorkflowAsync(this IWorkflowManager workflowManager, Workflow workflow, WorkflowType workflowType)
+        {
+            if (workflow == null)
+            {
+                throw new ArgumentNullException(nameof(workflow));
+            }
+
+            if (workflowType == null)
+            {
+                throw new ArgumentNullException(nameof(workflowType));
+            }
+
+            var state = workflow.State.ToObject<WorkflowState>();
+
+            return workflowManager.RestartWorkflowAsync(workflowType, state.Input, workflow.CorrelationId);
+        }
     }
 }
diff --git a/src/docs/releases/1.8.0.md b/src/docs/releases/1.8.0.md
index 5962e509335..2e5eaa0fd5d 100644
--- a/src/docs/releases/1.8.0.md
+++ b/src/docs/releases/1.8.0.md
@@ -14,8 +14,19 @@ The `TheAdmin` theme was upgraded to Bootstrap 5.3.2. Here is a list of the brea
  - By default, the theme is set to `auto` which allows us to use the default device color preference.
  - Metrial-icons are no longer included.
  - The `DarkModeService.cs` was replaced with `ThemeTogglerService`.
- - The property named `DisplayDarkMode` in `AdminSettings` was replaced with `DisplayThemeToggler`.
- - Bootstrap is no longer compiled in `TheAdmin.css`. Bootstrap assets are loaded independently for performance and maintainability reasons.
+ - The prperty named `DisplayDarkMode` in `AdminSettings` was replaced with `DisplayThemeToggler`.
+ - Bootstrap is no longer compiled in `TheAdmin.css`. Bootstrap are loaded independently for performance and maintainability reasons.
+
+### Workflow Module
+
+A new option for restarting a specific Workflow instance has been incorporated, involving adjustments to both the `IActivity` and `IWorkflowManager` interfaces.The following method was added to `IWorkflowManager` interface.
+
+ - `Task<WorkflowExecutionContext> RestartWorkflowAsync(WorkflowType workflowType, IDictionary<string, object> input = null, string correlationId = null)`
+ 
+ The following methods were added to the `IActivity` interface.
+
+ - `Task OnWorkflowRestartingAsync(WorkflowExecutionContext context, CancellationToken cancellationToken = default)`
+ - `Task OnWorkflowRestartedAsync(WorkflowExecutionContext context)`
 
  ### Navbar