Add Workflow Instance List Filter

Directory.Packages.props

@@ -8,43 +8,49 @@
  <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all"/>
  <PackageVersion Include="Microsoft.AspNetCore.App" Version="2.2.8"/>
  <PackageVersion Include="Blazored.FluentValidation" Version="2.1.0"/>
- <PackageVersion Include="Blazored.LocalStorage" Version="4.4.0"/>
- <PackageVersion Include="CodeBeam.MudBlazor.Extensions" Version="6.6.0"/>
- <PackageVersion Include="FluentValidation" Version="11.7.1"/>
- <PackageVersion Include="MudBlazor" Version="6.11.0"/>
- <PackageVersion Include="Radzen.Blazor" Version="4.18.1"/>
+ <PackageVersion Include="Blazored.LocalStorage" Version="4.5.0"/>
+
+ <!--
+ Version 6.6.4 and above contain an issue with the MudBlazor MudSelectExtended component.
+ See: https://github.com/CodeBeamOrg/CodeBeam.MudBlazor.Extensions/issues/345 
+ -->
+ <PackageVersion Include="CodeBeam.MudBlazor.Extensions" Version="6.6.3"/>
+
+ <PackageVersion Include="FluentValidation" Version="11.9.0"/>
+ <PackageVersion Include="MudBlazor" Version="6.15.0"/>
+ <PackageVersion Include="Radzen.Blazor" Version="4.24.7"/>
  <PackageVersion Include="ShortGuid" Version="2.0.1"/>
  <PackageVersion Include="ThrottleDebounce" Version="2.0.0"/>
- <PackageVersion Include="BlazorMonaco" Version="3.1.0" />
- <PackageVersion Include="Elsa.Api.Client" Version="3.0.5"/>
+ <PackageVersion Include="BlazorMonaco" Version="3.1.0"/>
+ <PackageVersion Include="Elsa.Api.Client" Version="3.1.0-preview.1107"/>
  <PackageVersion Include="Refit" Version="7.0.0"/>
  <PackageVersion Include="Refit.HttpClientFactory" Version="7.0.0"/>
  </ItemGroup>
  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0'">
- <PackageVersion Include="Microsoft.AspNetCore.Components" Version="7.0.14"/>
- <PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="7.0.14"/>
- <PackageVersion Include="Microsoft.AspNetCore.Components.CustomElements" Version="7.0.14"/>
- <PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="7.0.14"/>
+ <PackageVersion Include="Microsoft.AspNetCore.Components" Version="7.0.16"/>
+ <PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="7.0.16"/>
+ <PackageVersion Include="Microsoft.AspNetCore.Components.CustomElements" Version="7.0.16"/>
+ <PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="7.0.16"/>
  <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0"/>
- <PackageVersion Include="Microsoft.JSInterop" Version="7.0.14"/>
- <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.14"/>
- <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="7.0.14"/>
- <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.14" PrivateAssets="all"/>
- <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.14"/>
- <PackageVersion Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.14" />
+ <PackageVersion Include="Microsoft.JSInterop" Version="7.0.16"/>
+ <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.16"/>
+ <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="7.0.16"/>
+ <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.16" PrivateAssets="all"/>
+ <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.16"/>
+ <PackageVersion Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.16"/>
 
  </ItemGroup>
  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
- <PackageVersion Include="Microsoft.AspNetCore.Components" Version="8.0.0"/>
- <PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.0"/>
- <PackageVersion Include="Microsoft.AspNetCore.Components.CustomElements" Version="8.0.0"/>
- <PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0"/>
+ <PackageVersion Include="Microsoft.AspNetCore.Components" Version="8.0.2"/>
+ <PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.2"/>
+ <PackageVersion Include="Microsoft.AspNetCore.Components.CustomElements" Version="8.0.2"/>
+ <PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="8.0.2"/>
  <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0"/>
- <PackageVersion Include="Microsoft.JSInterop" Version="8.0.0"/>
- <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0"/>
- <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.0"/>
- <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all"/>
- <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0"/>
- <PackageVersion Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.0" />
+ <PackageVersion Include="Microsoft.JSInterop" Version="8.0.2"/>
+ <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.2"/>
+ <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.2"/>
+ <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.2" PrivateAssets="all"/>
+ <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.2"/>
+ <PackageVersion Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.2"/>
  </ItemGroup>
 </Project>

Elsa.Studio-Core.sln

@@ -81,6 +81,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{D225
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorApp1", "samples\BlazorApp1\BlazorApp1.csproj", "{FAE56DEE-A51D-4FC7-AF42-D298BE59D8EE}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "client", "client", "{F4B408E1-5169-4FA9-B2D7-2377634C4DEE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Api.Client", "..\..\elsa-core\main\src\clients\Elsa.Api.Client\Elsa.Api.Client.csproj", "{26ECE061-0F39-4945-8356-EF14E67A8F39}"
+EndProject
 Global
  GlobalSection(SolutionConfigurationPlatforms) = preSolution
  Debug|Any CPU = Debug|Any CPU
@@ -191,6 +195,10 @@ Global
  {FAE56DEE-A51D-4FC7-AF42-D298BE59D8EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
  {FAE56DEE-A51D-4FC7-AF42-D298BE59D8EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
  {FAE56DEE-A51D-4FC7-AF42-D298BE59D8EE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {26ECE061-0F39-4945-8356-EF14E67A8F39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {26ECE061-0F39-4945-8356-EF14E67A8F39}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {26ECE061-0F39-4945-8356-EF14E67A8F39}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {26ECE061-0F39-4945-8356-EF14E67A8F39}.Release|Any CPU.Build.0 = Release|Any CPU
  EndGlobalSection
  GlobalSection(NestedProjects) = preSolution
  {2AA1AEE9-017E-4F8B-B5FC-2BEA37E83514} = {875A7E2E-4B7C-4AF0-A71E-3980B73AF363}
@@ -223,5 +231,6 @@ Global
  {C18714D2-7205-491D-AD2E-154876F7A77F} = {D66B9A40-8608-46F3-9868-625C50EACE43}
  {2C40C5CB-634B-45DA-8F65-F0D460C1CB63} = {D66B9A40-8608-46F3-9868-625C50EACE43}
  {FAE56DEE-A51D-4FC7-AF42-D298BE59D8EE} = {D2254084-0C4A-42F3-A2D9-A2C9BCE1114E}
+ {26ECE061-0F39-4945-8356-EF14E67A8F39} = {F4B408E1-5169-4FA9-B2D7-2377634C4DEE}
  EndGlobalSection
 EndGlobal

NuGet.Config

@@ -1,8 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <configuration>
- <packageSources>
- <clear/>
- <add key="NuGet official package source" value="https://api.nuget.org/v3/index.json" />
- <add key="Elsa 3 preview" value="https://f.feedz.io/elsa-workflows/elsa-3/nuget/index.json"/>
- </packageSources>
+ <packageSources>
+ <clear />
+ <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+ <add key="elsa3.feedz.io" value="https://f.feedz.io/elsa-workflows/elsa-3/nuget/index.json" />
+ </packageSources>
+ <packageSourceMapping>
+ <clear />
+ <packageSource key="nuget.org">
+ <package pattern="*" />
+ </packageSource>
+ <packageSource key="elsa3.feedz.io">
+ <package pattern="Elsa.*" />
+ </packageSource>
+ </packageSourceMapping>
 </configuration>

src/framework/Elsa.Studio.Core/Elsa.Studio.Core.csproj

@@ -33,9 +33,9 @@
  <PackageReference Include="ThrottleDebounce"/>
  </ItemGroup>
 
- <!-- <ItemGroup Label="Elsa">-->
- <!-- <ProjectReference Include="..\..\..\..\..\elsa-core\v3\src\clients\Elsa.Api.Client\Elsa.Api.Client.csproj"/>-->
- <!-- </ItemGroup>-->
+<!-- <ItemGroup Label="Elsa">-->
+<!-- <ProjectReference Include="..\..\..\..\..\elsa-core\main\src\clients\Elsa.Api.Client\Elsa.Api.Client.csproj"/>-->
+<!-- </ItemGroup>-->
 
  <ItemGroup Label="Elsa">
  <PackageReference Include="Elsa.Api.Client"/>

src/framework/Elsa.Studio.Shell/wwwroot/css/shell.css

@@ -14,11 +14,14 @@
 }
 
 /*****************************************************
-* Environment Picker
+* CSS hacks for the MudBlazorExtensions components
 ******************************************************/
-.elsa-environment-picker .mud-input > input.mud-input-root-outlined, div.mud-input-slot.mud-input-root-outlined {
- padding-top: 11px;
- padding-bottom: 11px;
+.mud-select.timespan-operator {
+ min-width: 150px;
+}
+
+.mud-select-extended {
+ min-width: 100px;
 }
 
 /*****************************************************

src/modules/Elsa.Studio.Login/Elsa.Studio.Login.csproj

@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
- <Import Project="..\..\..\common.props"/>
- <Import Project="..\..\..\configureawait.props"/>
- <Import Project="..\..\..\frameworks.props"/>
-
  <PropertyGroup>
  <Description>Adds a user login screen that integrates with the `Elsa.Identity` backend module.</Description>
  <PackageTags>elsa studio module</PackageTags>

src/modules/Elsa.Studio.Login/Extensions/ServiceCollectionExtensions.cs

@@ -1,4 +1,3 @@
-using Elsa.Api.Client.Contracts;
 using Elsa.Studio.Contracts;
 using Elsa.Studio.Login.ComponentProviders;
 using Elsa.Studio.Login.Contracts;

src/modules/Elsa.Studio.Workflows/Components/WorkflowInstanceList/Models/TimestampFilter.cs

@@ -0,0 +1,30 @@
+using Elsa.Api.Client.Shared.Enums;
+using JetBrains.Annotations;
+
+namespace Elsa.Studio.Workflows.Components.WorkflowInstanceList.Models;
+
+/// <summary>
+/// Represents a timestamp filter used for filtering data based on a specified timestamp column and operator.
+/// </summary>
+public class TimestampFilterModel
+{
+ /// <summary>
+ /// Gets or sets the column to filter by.
+ /// </summary>
+ public string Column { get; set; } = default!;
+
+ /// <summary>
+ /// Gets or sets the operator to use for filtering.
+ /// </summary>
+ public TimestampFilterOperator Operator { get; set; }
+
+ /// <summary>
+ /// Gets or sets the date to filter by.
+ /// </summary>
+ public string Date { get; set; }
+
+ /// <summary>
+ /// Gets or sets the time to filter by.
+ /// </summary>
+ public string Time { get; set; }
+}

src/modules/Elsa.Studio.Workflows/Components/WorkflowInstanceList/Models/WorkflowInstanceRow.cs

@@ -14,4 +14,5 @@ internal record WorkflowInstanceRow(
  int IncidentCount,
  DateTimeOffset CreatedAt,
  DateTimeOffset? UpdatedAt,
- DateTimeOffset? FinishedAt);
+ DateTimeOffset? FinishedAt
+);