SemianiakaVY/elsa-core
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Update and optimize WorkflowDefinitionStore logic (#5462)

Browse source 
The update involves optimizing the WorkflowDefinitionStore logic. The minor change is that it removed an unneeded space in the CountDistinctAsync method. More importantly, an upgrade issue with 'IsSystem' from older versions of Elsa to 3.2 has been rectified by adding checks and conditions to suit legacy versions. In the future, once all systems are updated, this check can be removed.
This commit is contained in:
Sipke Schoorstra 2024-05-29 10:35:42 +02:00 committed by GitHub
parent 411151d748
commit 51cd3fa851
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/modules/Elsa.EntityFrameworkCore/Modules/Management/WorkflowDefinitionStore.cs
View file

@ -140,7 +140,7 @@ public class EFCoreWorkflowDefinitionStore : IWorkflowDefinitionStore
/// <inheritdoc />
public async Task<long> CountDistinctAsync(CancellationToken cancellationToken = default)
{
return await _store.CountAsync(x => true, x => x.DefinitionId, cancellationToken);
return await _store.CountAsync(x => true, x => x.DefinitionId, cancellationToken);
}
/// <inheritdoc />
@ -193,7 +193,14 @@ public class EFCoreWorkflowDefinitionStore : IWorkflowDefinitionStore
if (filter.Names != null) queryable = queryable.Where(x => filter.Names.Contains(x.Name!));
if (filter.UsableAsActivity != null) queryable = queryable.Where(x => EF.Property<bool>(x, "UsableAsActivity") == filter.UsableAsActivity);
if (!string.IsNullOrWhiteSpace(filter.SearchTerm)) queryable = queryable.Where(x => x.Name!.Contains(filter.SearchTerm) || x.Description!.Contains(filter.SearchTerm) || x.Id.Contains(filter.SearchTerm) || x.DefinitionId.Contains(filter.SearchTerm));
if (filter.IsSystem != null) queryable = queryable.Where(x => x.IsSystem == filter.IsSystem);
// TEMP: IsSystem may be null when upgrading from older versions of Elsa to 3.2. See issue #5366.
// In a future version, we should remove this check and simply do queryable.Where(x => x.IsSystem == filter.IsSystem).
if (filter.IsSystem != null)
queryable = filter.IsSystem == true
? queryable.Where(x => x.IsSystem == true)
: queryable.Where(x => x.IsSystem == false || x.IsSystem == null);
if (filter.IsReadonly != null) queryable = queryable.Where(x => x.IsReadonly == filter.IsReadonly);
return queryable;
}
@ -204,7 +211,7 @@ public class EFCoreWorkflowDefinitionStore : IWorkflowDefinitionStore
if (pageArgs?.Limit != null) queryable = queryable.Take(pageArgs.Limit.Value);
return queryable;
}
private class WorkflowDefinitionState
{
[JsonConstructor]