diff --git a/src/clients/Elsa.Client/Models/OrderBy.cs b/src/clients/Elsa.Client/Models/OrderBy.cs index e176b5f57..916e850fc 100644 --- a/src/clients/Elsa.Client/Models/OrderBy.cs +++ b/src/clients/Elsa.Client/Models/OrderBy.cs @@ -3,6 +3,7 @@ public enum OrderBy { Started, + LastExecuted, Finished } } \ No newline at end of file diff --git a/src/dashboards/blazor/ElsaDashboard.Application/Pages/WorkflowInstances/List.razor.cs b/src/dashboards/blazor/ElsaDashboard.Application/Pages/WorkflowInstances/List.razor.cs index e57a46ea2..4e45b6dd1 100644 --- a/src/dashboards/blazor/ElsaDashboard.Application/Pages/WorkflowInstances/List.razor.cs +++ b/src/dashboards/blazor/ElsaDashboard.Application/Pages/WorkflowInstances/List.razor.cs @@ -50,7 +50,7 @@ namespace ElsaDashboard.Application.Pages.WorkflowInstances }.Select(x => new ButtonDropdownItem(x?.ToString() ?? "All", x.ToString(), BuildFilterUrl(SelectedWorkflowId, x, SelectedOrderBy), x == SelectedWorkflowStatus)); private IEnumerable OrderByItems => - new[] { OrderBy.Finished, OrderBy.Started }.Select(x => new ButtonDropdownItem(x.ToString(), x.ToString(), BuildFilterUrl(SelectedWorkflowId, SelectedWorkflowStatus, x), x == SelectedOrderBy)); + new[] { OrderBy.Finished, OrderBy.LastExecuted, OrderBy.Started }.Select(x => new ButtonDropdownItem(x.ToString(), x.ToString(), BuildFilterUrl(SelectedWorkflowId, SelectedWorkflowStatus, x), x == SelectedOrderBy)); private string SelectedWorkflowText => SelectedWorkflowId == null ? "Workflow" : LatestWorkflowBlueprints.FirstOrDefault(x => x.Id == SelectedWorkflowId)?.DisplayName ?? "Workflow"; private string SelectedWorkflowStatusText => SelectedWorkflowStatus?.ToString() ?? "Status"; diff --git a/src/server/Elsa.Server.Api/Endpoints/WorkflowInstances/List.cs b/src/server/Elsa.Server.Api/Endpoints/WorkflowInstances/List.cs index 02d268934..c7a94223a 100644 --- a/src/server/Elsa.Server.Api/Endpoints/WorkflowInstances/List.cs +++ b/src/server/Elsa.Server.Api/Endpoints/WorkflowInstances/List.cs @@ -70,6 +70,7 @@ namespace Elsa.Server.Api.Endpoints.WorkflowInstances orderBySpecification = orderBy switch { OrderBy.Started => OrderBySpecification.OrderByDescending(x => x.CreatedAt), + OrderBy.LastExecuted => OrderBySpecification.OrderByDescending(x => x.LastExecutedAt!), OrderBy.Finished => OrderBySpecification.OrderByDescending(x => x.FinishedAt!), _ => OrderBySpecification.OrderByDescending(x => x.FinishedAt!) }; diff --git a/src/server/Elsa.Server.Api/Models/OrderBy.cs b/src/server/Elsa.Server.Api/Models/OrderBy.cs index b7781729f..5ce3b722b 100644 --- a/src/server/Elsa.Server.Api/Models/OrderBy.cs +++ b/src/server/Elsa.Server.Api/Models/OrderBy.cs @@ -3,6 +3,7 @@ public enum OrderBy { Started, + LastExecuted, Finished } } \ No newline at end of file