Implement multi-select workflow definition filter

elsa-workflows · Jul 7, 2023 · e2ed610 · e2ed610
1 parent 10e55c2
commit e2ed610
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 9 deletions.
diff --git a/src/modules/Elsa.Studio.Workflows/Pages/WorkflowInstances/List/Index.razor b/src/modules/Elsa.Studio.Workflows/Pages/WorkflowInstances/List/Index.razor
@@ -1,6 +1,6 @@
 @page "/workflows/instances"
 @using System.Globalization
-@using Elsa.Api.Client.Resources.WorkflowInstances.Enums
+@using Elsa.Api.Client.Resources.WorkflowDefinitions.Models
 @using Elsa.Studio.Workflows.Pages.WorkflowInstances.List.Models
 @using Variant = MudBlazor.Variant
 
@@ -27,6 +27,13 @@
                 <MudMenuItem>Cancel</MudMenuItem>
                 <MudMenuItem>Retry</MudMenuItem>
             </MudMenu>
+            <MudSpacer/>
+            <MudSelect T="WorkflowDefinitionSummary" Label="Workflow" SelectedValues="SelectedWorkflowDefinitions" MultiSelection="true" ToStringFunc="@(definition => definition.Name)" SelectedValuesChanged="OnSelectedWorkflowDefinitionsChanged">
+                @foreach (var workflowDefinition in WorkflowDefinitions)
+                {
+                    <MudSelectItem Value="@workflowDefinition">@workflowDefinition.Name</MudSelectItem>
+                }
+            </MudSelect>
         </ToolBarContent>
         <HeaderContent>
             <MudTh>
@@ -56,9 +63,6 @@
             <MudTh>
                 <MudTableSortLabel SortLabel="FinishedAt" T="WorkflowInstanceRow">Finished</MudTableSortLabel>
             </MudTh>
-            <MudTh>
-                <MudTableSortLabel SortLabel="FaultedAt" T="WorkflowInstanceRow">Faulted</MudTableSortLabel>
-            </MudTh>
             <MudTh></MudTh>
         </HeaderContent>
         <RowTemplate>
@@ -78,7 +82,6 @@
             <MudTd DataLabel="CreatedAt">@context.CreatedAt.ToString("G", CultureInfo.InvariantCulture)</MudTd>
             <MudTd DataLabel="LastExecutedAt">@context.LastExecutedAt?.ToString("G", CultureInfo.InvariantCulture)</MudTd>
             <MudTd DataLabel="FinishedAt">@context.FinishedAt?.ToString("G", CultureInfo.InvariantCulture)</MudTd>
-            <MudTd DataLabel="FaultedAt">@context.FaultedAt?.ToString("G", CultureInfo.InvariantCulture)</MudTd>
             <MudTd DataLabel="" Style="text-align:right">
                 <MudMenu Icon="@Icons.Material.Filled.MoreVert">
                     <MudMenuItem Icon="@Icons.Material.Outlined.ZoomIn" OnClick="@(() => OnViewClicked(context.WorkflowInstanceId))">View</MudMenuItem>

diff --git a/src/modules/Elsa.Studio.Workflows/Pages/WorkflowInstances/List/Index.razor.cs b/src/modules/Elsa.Studio.Workflows/Pages/WorkflowInstances/List/Index.razor.cs
@@ -1,13 +1,10 @@
+using Elsa.Api.Client.Resources.WorkflowDefinitions.Models;
 using Elsa.Api.Client.Resources.WorkflowDefinitions.Responses;
 using Elsa.Api.Client.Resources.WorkflowInstances.Enums;
 using Elsa.Api.Client.Resources.WorkflowInstances.Requests;
 using Elsa.Api.Client.Shared.Models;
-using Elsa.Studio.DomInterop.Contracts;
 using Elsa.Studio.Workflows.Domain.Contracts;
-using Elsa.Studio.Workflows.Models;
-using Elsa.Studio.Workflows.Pages.WorkflowDefinitions.List;
 using Elsa.Studio.Workflows.Pages.WorkflowInstances.List.Models;
-using Humanizer;
 using Microsoft.AspNetCore.Components;
 using MudBlazor;
 
@@ -24,13 +21,29 @@ public partial class Index
     [Inject] private ISnackbar Snackbar { get; set; } = default!;
     [Inject] private IWorkflowInstanceService WorkflowInstanceService { get; set; } = default!;
     [Inject] private IWorkflowDefinitionService WorkflowDefinitionService { get; set; } = default!;
+
+    private ICollection<WorkflowDefinitionSummary> WorkflowDefinitions { get; set; } = new List<WorkflowDefinitionSummary>();
+    private ICollection<WorkflowDefinitionSummary> SelectedWorkflowDefinitions { get; set; } = new List<WorkflowDefinitionSummary>();
+
+    protected override async Task OnInitializedAsync()
+    {
+        await LoadWorkflowDefinitionsAsync();
+    }
+
+    private async Task LoadWorkflowDefinitionsAsync()
+    {
+        var workflowDefinitionsResponse = await WorkflowDefinitionService.ListAsync(new ListWorkflowDefinitionsRequest(), VersionOptions.Published);
+
+        WorkflowDefinitions = workflowDefinitionsResponse.Items;
+    }
 
     private async Task<TableData<WorkflowInstanceRow>> ServerReload(TableState state)
     {
         var request = new ListWorkflowInstancesRequest
         {
             Page = state.Page,
             PageSize = state.PageSize,
+            DefinitionIds = SelectedWorkflowDefinitions.Select(x => x.DefinitionId).ToList(), 
         };
 
         var workflowInstancesResponse = await WorkflowInstanceService.ListAsync(request);
@@ -102,4 +115,10 @@ private async Task OnBulkDeleteClicked()
         await WorkflowInstanceService.BulkDeleteAsync(workflowInstanceIds);
         Reload();
     }
+
+    private async Task OnSelectedWorkflowDefinitionsChanged(IEnumerable<WorkflowDefinitionSummary> values)
+    {
+        SelectedWorkflowDefinitions = values.ToList();
+        await _table.ReloadServerData();
+    }
 }