Merge pull request #439 from serverlessworkflow/feat-dashboard-restart-workflow

cdavernas · web-flow · commit 03eae9d06619 · 2024-10-23T16:31:39.000+02:00
Added capability to replay a workflow with the same input in the Dashboard
diff --git a/src/dashboard/Synapse.Dashboard/Components/DocumentDetails/Store.cs b/src/dashboard/Synapse.Dashboard/Components/DocumentDetails/Store.cs
@@ -372,7 +372,7 @@ public async Task OnCopyToClipboard()
         try
         {
             await this.JSRuntime.InvokeVoidAsync("navigator.clipboard.writeText", text);
-            this.ToastService.Notify(new(ToastType.Success, "Definition copied to the clipboard!"));
+            this.ToastService.Notify(new(ToastType.Success, "Copied to the clipboard!"));
         }
         catch (Exception ex)
         {
diff --git a/src/dashboard/Synapse.Dashboard/Components/MonacoEditor/Store.cs b/src/dashboard/Synapse.Dashboard/Components/MonacoEditor/Store.cs
@@ -290,7 +290,7 @@ public async Task OnCopyToClipboard()
         try
         {
             await this.JSRuntime.InvokeVoidAsync("navigator.clipboard.writeText", text);
-            this.ToastService.Notify(new(ToastType.Success, "Definition copied to the clipboard!"));
+            this.ToastService.Notify(new(ToastType.Success, "Copied to the clipboard!"));
         }
         catch (Exception ex)
         {
diff --git a/src/dashboard/Synapse.Dashboard/Components/ResourceEditor/ResourceEditor.razor b/src/dashboard/Synapse.Dashboard/Components/ResourceEditor/ResourceEditor.razor
@@ -256,7 +256,7 @@
         try
         {
             await this.JSRuntime.InvokeVoidAsync("navigator.clipboard.writeText", text);
-            this.ToastService.Notify(new(ToastType.Success, "Definition copied to the clipboard!"));
+            this.ToastService.Notify(new(ToastType.Success, "Copied to the clipboard!"));
         }
         catch (Exception ex)
         {
diff --git a/src/dashboard/Synapse.Dashboard/Components/WorkflowInstanceCreation/WorkflowInstanceCreation.razor b/src/dashboard/Synapse.Dashboard/Components/WorkflowInstanceCreation/WorkflowInstanceCreation.razor
@@ -19,7 +19,7 @@
 @inject MonacoInterop MonacoInterop
 @inject IJsonSerializer Serializer
 
-<MonacoEditor OnTextChanged="OnTextChanged" ModelName="@modelName" />
+<MonacoEditor OnTextChanged="OnTextChanged" ModelName="@modelName" Document="input" />
 <div class="text-center">
     <Button Outline="true" Color="ButtonColor.Primary" class="m-auto mt-3" @onclick="async (_) => await OnStart()">
         <Icon Name="IconName.Play" />
@@ -30,8 +30,10 @@
 @code {
     string payload = string.Empty;
     string modelName = string.Empty;
+    EquatableDictionary<string, object>? input;
 
     [Parameter] public WorkflowDefinition? WorkflowDefinition { get; set; }
+    [Parameter] public EquatableDictionary<string, object>? Input { get; set; }
     [Parameter] public EventCallback<string> OnCreate { get; set; }
 
     void OnTextChanged(string value)
@@ -50,12 +52,15 @@
     protected override async Task OnParametersSetAsync()
     {
         await base.OnParametersSetAsync();
-        if (this.WorkflowDefinition?.Input?.Schema?.Document != null)
+        if (Input != input)
         {
-            modelName = this.WorkflowDefinition.Document.Name + "-" + this.WorkflowDefinition.Document.Version;
-            await this.MonacoInterop.AddValidationSchemaAsync(this.Serializer.SerializeToText(this.WorkflowDefinition.Input.Schema.Document), $"https://synapse.io/schemas/{modelName}.json", $"{modelName}*").ConfigureAwait(false);
-    }
-        
+            input = Input;
+        }
+        if (WorkflowDefinition?.Input?.Schema?.Document != null)
+        {
+            modelName = WorkflowDefinition.Document.Name + "-" + WorkflowDefinition.Document.Version;
+            await MonacoInterop.AddValidationSchemaAsync(Serializer.SerializeToText(WorkflowDefinition.Input.Schema.Document), $"https://synapse.io/schemas/{modelName}.json", $"{modelName}*").ConfigureAwait(false);
+        }
     }
 
 }
diff --git a/src/dashboard/Synapse.Dashboard/Components/WorkflowInstancesList/WorkflowInstancesList.razor b/src/dashboard/Synapse.Dashboard/Components/WorkflowInstancesList/WorkflowInstancesList.razor
@@ -149,6 +149,9 @@
                                                 </ul>
                                             </div>
                                             break;
+                                        case "Replay":
+                                            <button class="btn btn-sm text-primary" @onclick="async _ => await OnReplayClickedAsync(instance)" @onclick:stopPropagation="true"><Icon Name="IconName.ArrowClockwise" /></button>
+                                            break;
                                         case "Delete":
                                             <button class="btn btn-sm text-danger" @onclick="async _ => await OnDeleteClickedAsync(instance)" @onclick:stopPropagation="true"><Icon Name="IconName.Trash" /></button>
                                             break;
@@ -204,6 +207,7 @@
     [Parameter] public EventCallback<WorkflowInstance> OnShowDetails { get; set; }
     [Parameter] public EventCallback<string?> OnToggleSelected { get; set; }
     [Parameter] public EventCallback<WorkflowInstance> OnDelete { get; set; }
+    [Parameter] public EventCallback<WorkflowInstance> OnReplay { get; set; }
     [Parameter] public EventCallback OnDeleteSelected { get; set; }
 
     IEnumerable<string> knownColumns = [
@@ -217,6 +221,7 @@
     "Duration",
     "Operator",
     "Actions",
+    "Replay",
     "Delete"
     ];
 
@@ -391,7 +396,7 @@
     }
 
     /// <summary>
-    /// Handles the clikc on the delete button
+    /// Handles the click on the delete button
     /// </summary>
     /// <param name="instance"></param>
     /// <returns></returns>
@@ -402,4 +407,17 @@
             await this.OnDelete.InvokeAsync(instance);
         }
     }
+
+    /// <summary>
+    /// Handles the click on the replay button
+    /// </summary>
+    /// <param name="instance"></param>
+    /// <returns></returns>
+    protected async Task OnReplayClickedAsync(WorkflowInstance instance)
+    {
+        if (this.OnReplay.HasDelegate)
+        {
+            await this.OnReplay.InvokeAsync(instance);
+        }
+    }
 }
diff --git a/src/dashboard/Synapse.Dashboard/Pages/Functions/Create/Store.cs b/src/dashboard/Synapse.Dashboard/Pages/Functions/Create/Store.cs
@@ -334,9 +334,10 @@ async Task SetTextEditorValueAsync()
         {
             return;
         }
-        await this.TextEditor.SetValue(document);
         try
         {
+            await this.TextEditor.SetValue(document);
+            await Task.Delay(10);
             await this.TextEditor.Trigger("", "editor.action.formatDocument");
         }
         catch (Exception ex)
diff --git a/src/dashboard/Synapse.Dashboard/Pages/Workflows/Create/Store.cs b/src/dashboard/Synapse.Dashboard/Pages/Workflows/Create/Store.cs
@@ -338,9 +338,10 @@ async Task SetTextEditorValueAsync()
         {
             return;
         }
-        await this.TextEditor.SetValue(document);
         try
         {
+            await this.TextEditor.SetValue(document);
+            await Task.Delay(10);
             await this.TextEditor.Trigger("", "editor.action.formatDocument");
         }
         catch (Exception ex)
@@ -357,6 +358,7 @@ async Task SetTextEditorValueAsync()
     public async Task OnDidChangeModelContent(ModelContentChangedEvent e)
     {
         if (this.TextEditor == null) return;
+
         var document = await this.TextEditor.GetValue();
         this.Reduce(state => state with
         {
diff --git a/src/dashboard/Synapse.Dashboard/Pages/Workflows/Details/Store.cs b/src/dashboard/Synapse.Dashboard/Pages/Workflows/Details/Store.cs
@@ -309,7 +309,7 @@ public async Task OnCopyToClipboard()
         try
         {
             await this.JSRuntime.InvokeVoidAsync("navigator.clipboard.writeText", text);
-            this.ToastService.Notify(new(ToastType.Success, "Definition copied to the clipboard!"));
+            this.ToastService.Notify(new(ToastType.Success, "Copied to the clipboard!"));
         }
         catch (Exception ex)
         {
@@ -322,13 +322,14 @@ public async Task OnCopyToClipboard()
     /// Displays the modal used to provide the new workflow input
     /// </summary>
     /// <returns>A awaitable task</returns>
-    public async Task OnShowCreateInstanceAsync(WorkflowDefinition workflowDefinition)
+    public async Task OnShowCreateInstanceAsync(WorkflowDefinition workflowDefinition, EquatableDictionary<string, object>? input = null)
     {
         if (this.Modal != null)
         {
             var parameters = new Dictionary<string, object>
             {
                 { nameof(WorkflowInstanceCreation.WorkflowDefinition), workflowDefinition },
+                { nameof(WorkflowInstanceCreation.Input), input! },
                 { nameof(WorkflowInstanceCreation.OnCreate), EventCallback.Factory.Create<string>(this, CreateInstanceAsync) }
             };
             await this.Modal.ShowAsync<WorkflowInstanceCreation>(title: "Start a new worklfow", parameters: parameters);
diff --git a/src/dashboard/Synapse.Dashboard/Pages/Workflows/Details/View.razor b/src/dashboard/Synapse.Dashboard/Pages/Workflows/Details/View.razor
@@ -37,6 +37,7 @@
                                    OnSearchInput="Store.SetSearchTerm"
                                    OnShowDetails="OnShowInstanceDetails"
                                    OnDelete="OnDeleteWorkflowInstanceAsync"
+                                   OnReplay="async instance => await Store.OnShowCreateInstanceAsync(workflowDefinition, instance.Spec?.Input)"
                                    OnToggleSelected="Store.ToggleResourceSelection"
                                    OnDeleteSelected="OnDeleteSelectedResourcesAsync" />
             <Button Outline="true" Color="ButtonColor.Primary" @onclick="async _ => await Store.OnShowCreateInstanceAsync(workflowDefinition)" class="w-100 mt-3">
@@ -126,6 +127,7 @@
     "Status",
     "Start Time",
     "End Time",
+    "Replay",
     "Delete"
     ];
 

Original file line number	Diff line number	Diff line change
`@@ -372,7 +372,7 @@ public async Task OnCopyToClipboard()`
`372`	`372`	`try`
`373`	`373`	`{`
`374`	`374`	`await this.JSRuntime.InvokeVoidAsync("navigator.clipboard.writeText", text);`
`375`		`- this.ToastService.Notify(new(ToastType.Success, "Definition copied to the clipboard!"));`
	`375`	`+ this.ToastService.Notify(new(ToastType.Success, "Copied to the clipboard!"));`
`376`	`376`	`}`
`377`	`377`	`catch (Exception ex)`
`378`	`378`	`{`
Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ public async Task OnCopyToClipboard()`
`290`	`290`	`try`
`291`	`291`	`{`
`292`	`292`	`await this.JSRuntime.InvokeVoidAsync("navigator.clipboard.writeText", text);`
`293`		`- this.ToastService.Notify(new(ToastType.Success, "Definition copied to the clipboard!"));`
	`293`	`+ this.ToastService.Notify(new(ToastType.Success, "Copied to the clipboard!"));`
`294`	`294`	`}`
`295`	`295`	`catch (Exception ex)`
`296`	`296`	`{`
Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@`
`256`	`256`	`try`
`257`	`257`	`{`
`258`	`258`	`await this.JSRuntime.InvokeVoidAsync("navigator.clipboard.writeText", text);`
`259`		`- this.ToastService.Notify(new(ToastType.Success, "Definition copied to the clipboard!"));`
	`259`	`+ this.ToastService.Notify(new(ToastType.Success, "Copied to the clipboard!"));`
`260`	`260`	`}`
`261`	`261`	`catch (Exception ex)`
`262`	`262`	`{`
Original file line number	Diff line number	Diff line change
`@@ -334,9 +334,10 @@ async Task SetTextEditorValueAsync()`
`334`	`334`	`{`
`335`	`335`	`return;`
`336`	`336`	`}`
`337`		`- await this.TextEditor.SetValue(document);`
`338`	`337`	`try`
`339`	`338`	`{`
	`339`	`+ await this.TextEditor.SetValue(document);`
	`340`	`+ await Task.Delay(10);`
`340`	`341`	`await this.TextEditor.Trigger("", "editor.action.formatDocument");`
`341`	`342`	`}`
`342`	`343`	`catch (Exception ex)`
Original file line number	Diff line number	Diff line change
`@@ -338,9 +338,10 @@ async Task SetTextEditorValueAsync()`
`338`	`338`	`{`
`339`	`339`	`return;`
`340`	`340`	`}`
`341`		`- await this.TextEditor.SetValue(document);`
`342`	`341`	`try`
`343`	`342`	`{`
	`343`	`+ await this.TextEditor.SetValue(document);`
	`344`	`+ await Task.Delay(10);`
`344`	`345`	`await this.TextEditor.Trigger("", "editor.action.formatDocument");`
`345`	`346`	`}`
`346`	`347`	`catch (Exception ex)`
`@@ -357,6 +358,7 @@ async Task SetTextEditorValueAsync()`
`357`	`358`	`public async Task OnDidChangeModelContent(ModelContentChangedEvent e)`
`358`	`359`	`{`
`359`	`360`	`if (this.TextEditor == null) return;`
	`361`	`+`
`360`	`362`	`var document = await this.TextEditor.GetValue();`
`361`	`363`	`this.Reduce(state => state with`
`362`	`364`	`{`
Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ public async Task OnCopyToClipboard()`
`309`	`309`	`try`
`310`	`310`	`{`
`311`	`311`	`await this.JSRuntime.InvokeVoidAsync("navigator.clipboard.writeText", text);`
`312`		`- this.ToastService.Notify(new(ToastType.Success, "Definition copied to the clipboard!"));`
	`312`	`+ this.ToastService.Notify(new(ToastType.Success, "Copied to the clipboard!"));`
`313`	`313`	`}`
`314`	`314`	`catch (Exception ex)`
`315`	`315`	`{`
`@@ -322,13 +322,14 @@ public async Task OnCopyToClipboard()`
`322`	`322`	`/// Displays the modal used to provide the new workflow input`
`323`	`323`	`/// </summary>`
`324`	`324`	`/// <returns>A awaitable task</returns>`
`325`		`- public async Task OnShowCreateInstanceAsync(WorkflowDefinition workflowDefinition)`
	`325`	`+ public async Task OnShowCreateInstanceAsync(WorkflowDefinition workflowDefinition, EquatableDictionary<string, object>? input = null)`
`326`	`326`	`{`
`327`	`327`	`if (this.Modal != null)`
`328`	`328`	`{`
`329`	`329`	`var parameters = new Dictionary<string, object>`
`330`	`330`	`{`
`331`	`331`	`{ nameof(WorkflowInstanceCreation.WorkflowDefinition), workflowDefinition },`
	`332`	`+ { nameof(WorkflowInstanceCreation.Input), input! },`
`332`	`333`	`{ nameof(WorkflowInstanceCreation.OnCreate), EventCallback.Factory.Create<string>(this, CreateInstanceAsync) }`
`333`	`334`	`};`
`334`	`335`	`await this.Modal.ShowAsync<WorkflowInstanceCreation>(title: "Start a new worklfow", parameters: parameters);`