Update Elsa API Client package reference (#163)

* Refactor API client and add 'IsSystem' filter The code has been refactored to properly structure 'ListWorkflowDefinitionsRequest.cs' in the 'Requests' namespace instead of 'Responses'. In addition, a boolean filter 'IsSystem' is introduced in the 'WorkflowDefinitionList.razor.cs', 'WorkflowInstanceList.razor.cs' and few other files to filter out system-specific workflows. This enhancement provides a more specific selection of workflows, giving more control to the user. * Refactor color assignment logic in ActivityWrapper The color assignment logic in ActivityWrapper.razor has been modified. The condition to assign 'Color.Info' has been changed from 'Stats.Uncompleted > 0' to 'Stats.Uncompleted > Stats.Completed'. This ensures the color coding better reflects the status of the activity, ensuring 'Color.Info' is used when uncompleted activities outnumber completed ones. * Update Elsa.Api.Client package version The version of the Elsa.Api.Client package used in the project has been updated from 3.1.0-preview.1133 to 3.1.0-5006.1148. * Update Elsa.Api.Client version The Elsa.Api.Client package version within the Directory.Packages.props file has been updated. Specifically, the version has been changed from "3.1.0-preview.1152" to "3.1.0-5006.1148". The update is necessary to access new features or bug fixes in the latest version. * Update package references and tags The main changes include the update of the Microsoft.AspNetCore.App from a PackageReference to a FrameworkReference in Elsa.Studio.Core.BlazorServer and Elsa.Studio.Login.BlazorServer. Additionally, the Elsa.Api.Client version has been updated in Directory.Packages.props. Finally, the package tags have been corrected in Elsa.Studio.Core.BlazorWasm.csproj to accurately reflect that it is a WebAssembly project. * Update Elsa.Api.Client package version The version of the Elsa.Api.Client package has been bumped from 3.1.0-preview.1184 to 3.1.0-preview.1210 to include the latest updates and bug fixes. No other packages were upgraded or changed in this commit.
elsa-workflows · Mar 14, 2024 · d480e27 · d480e27
1 parent d69e943
commit d480e27
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 56 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,56 +1,53 @@
 <Project>
-    <PropertyGroup>
-        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-        <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
-    </PropertyGroup>
-    <ItemGroup>
-        <PackageVersion Include="JetBrains.Annotations" Version="2023.3.0"/>
-        <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.5.0"/>
-
-        <!--
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="JetBrains.Annotations" Version="2023.3.0" />
+    <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.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.1.0-preview.1184"/>
-        <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.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.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.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.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>
+    <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.1.0-preview.1210" />
+    <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.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.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.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.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>
diff --git a/src/framework/Elsa.Studio.Core.BlazorServer/Elsa.Studio.Core.BlazorServer.csproj b/src/framework/Elsa.Studio.Core.BlazorServer/Elsa.Studio.Core.BlazorServer.csproj
@@ -7,7 +7,7 @@
 
     <ItemGroup>
         <PackageReference Include="Blazored.LocalStorage"/>
-        <PackageReference Include="Microsoft.AspNetCore.App"/>
+        <FrameworkReference Include="Microsoft.AspNetCore.App"/>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/framework/Elsa.Studio.Core.BlazorWasm/Elsa.Studio.Core.BlazorWasm.csproj b/src/framework/Elsa.Studio.Core.BlazorWasm/Elsa.Studio.Core.BlazorWasm.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <Description>Blazor WebAssembly impementation for certain abstractions provided by Elsa.Studio.Core.</Description>
-        <PackageTags>elsa studio blazor server</PackageTags>
+        <PackageTags>elsa studio blazor webassembly</PackageTags>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/modules/Elsa.Studio.Login.BlazorServer/Elsa.Studio.Login.BlazorServer.csproj b/src/modules/Elsa.Studio.Login.BlazorServer/Elsa.Studio.Login.BlazorServer.csproj
@@ -7,7 +7,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer"/>
-        <PackageReference Include="Microsoft.AspNetCore.App"/>
+        <FrameworkReference Include="Microsoft.AspNetCore.App"/>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/modules/Elsa.Studio.Workflows.Designer/Components/ActivityWrapper.razor b/src/modules/Elsa.Studio.Workflows.Designer/Components/ActivityWrapper.razor
@@ -7,7 +7,7 @@
 @inherits StudioComponentBase
 @if (Stats != null)
 {
-    var color = Stats.Faulted ? Color.Error : Stats.Blocked ? Color.Warning : Stats.Uncompleted > 0 ? Color.Info : Stats.Completed > 0 ? Color.Success : Color.Default;
+    var color = Stats.Faulted ? Color.Error : Stats.Blocked ? Color.Warning : Stats.Uncompleted > Stats.Completed ? Color.Info : Stats.Completed > 0 ? Color.Success : Color.Default;
     var content = Stats.Blocked ? default : Stats.Completed.ToString();
     var icon = content == null ? Stats.Blocked ? Icons.Material.Outlined.HourglassTop : Stats.Uncompleted > 0 ? Icons.Material.Outlined.PlayArrow : default : default;
     <MudBadge Color="color" Content="content" Overlap="true" Icon="@icon" Style="width: 100%; height: 100%;">

diff --git a/...s/Elsa.Studio.Workflows/Components/WorkflowDefinitionList/WorkflowDefinitionList.razor.cs b/...s/Elsa.Studio.Workflows/Components/WorkflowDefinitionList/WorkflowDefinitionList.razor.cs
@@ -39,6 +39,7 @@ private async Task<TableData<WorkflowDefinitionRow>> ServerReload(TableState sta
     {
         var request = new ListWorkflowDefinitionsRequest
         {
+            IsSystem = false,
             Page = state.Page,
             PageSize = state.PageSize,
             SearchTerm = SearchTerm,

diff --git a/...dules/Elsa.Studio.Workflows/Components/WorkflowInstanceList/WorkflowInstanceList.razor.cs b/...dules/Elsa.Studio.Workflows/Components/WorkflowInstanceList/WorkflowInstanceList.razor.cs
@@ -74,6 +74,7 @@ private async Task<TableData<WorkflowInstanceRow>> LoadData(TableState state)
             SubStatuses = SelectedSubStatuses,
             SearchTerm = SearchTerm,
             HasIncidents = HasIncidents,
+            IsSystem = false,
             OrderBy = GetOrderBy(state.SortLabel),
             OrderDirection = state.SortDirection == SortDirection.Descending ? OrderDirection.Descending : OrderDirection.Ascending,
             TimestampFilters = TimestampFilters.Select(Map).Where(x => x.Timestamp.Date > DateTime.MinValue && !string.IsNullOrWhiteSpace(x.Column)).ToList()