From 105d060d71039eecc8433fd11de2ed994cedd171 Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipkeschoorstra@outlook.com>
Date: Fri, 27 May 2022 11:01:54 +0200
Subject: [PATCH] Fix workflow definition query

---
 .../Endpoints/WorkflowDefinitions/List.cs                   | 4 ++--
 .../Implementations/EFCoreWorkflowDefinitionStore.cs        | 6 ++----
 .../Implementations/MemoryWorkflowDefinitionStore.cs        | 2 --
 .../Services/IWorkflowDefinitionStore.cs                    | 1 -
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/List.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/List.cs
index 3c39a1803..5181387a2 100644
--- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/List.cs
+++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/List.cs
@@ -33,7 +33,7 @@ public class List : Controller
         [FromQuery] string? versionOptions = default,
         [FromQuery] string? definitionIds = default,
         [FromQuery(Name = "materializer")] string? materializerName = default,
-        [FromQuery(Name = "label")] string[]? labels = default,
+        //[FromQuery(Name = "label")] string[]? labels = default,
         [FromQuery] int? page = default,
         [FromQuery] int? pageSize = default)
     {
@@ -51,7 +51,7 @@ public class List : Controller
         }
         else
         {
-            var pageOfSummaries = await _store.ListSummariesAsync(parsedVersionOptions, materializerName, labels, pageArgs, cancellationToken);
+            var pageOfSummaries = await _store.ListSummariesAsync(parsedVersionOptions, materializerName, pageArgs, cancellationToken);
             return Json(pageOfSummaries, serializerOptions);
         }
     }
diff --git a/src/modules/Elsa.Workflows.Persistence.EntityFrameworkCore/Implementations/EFCoreWorkflowDefinitionStore.cs b/src/modules/Elsa.Workflows.Persistence.EntityFrameworkCore/Implementations/EFCoreWorkflowDefinitionStore.cs
index 682225628..aad1920e7 100644
--- a/src/modules/Elsa.Workflows.Persistence.EntityFrameworkCore/Implementations/EFCoreWorkflowDefinitionStore.cs
+++ b/src/modules/Elsa.Workflows.Persistence.EntityFrameworkCore/Implementations/EFCoreWorkflowDefinitionStore.cs
@@ -75,7 +75,6 @@ public class EFCoreWorkflowDefinitionStore : IWorkflowDefinitionStore
     public async Task<Page<WorkflowDefinitionSummary>> ListSummariesAsync(
         VersionOptions? versionOptions = default,
         string? materializerName = default,
-        IEnumerable<string>? labelNames = default,
         PageArgs? pageArgs = default,
         CancellationToken cancellationToken = default)
     {
@@ -83,9 +82,8 @@ public class EFCoreWorkflowDefinitionStore : IWorkflowDefinitionStore
         var workflowDefinitions = dbContext.WorkflowDefinitions;
         var query = workflowDefinitions.AsQueryable();
 
-        if (versionOptions != null) query = workflowDefinitions.WithVersion(versionOptions.Value);
-        if (!string.IsNullOrWhiteSpace(materializerName)) query = workflowDefinitions.Where(x => x.MaterializerName == materializerName);
-        if (labelNames != null) query = await FilterByLabelsAsync(dbContext, query, labelNames, cancellationToken);
+        if (versionOptions != null) query = query.WithVersion(versionOptions.Value);
+        if (!string.IsNullOrWhiteSpace(materializerName)) query = query.Where(x => x.MaterializerName == materializerName);
 
         query = query.OrderBy(x => x.Name); //.Distinct();
 
diff --git a/src/modules/Elsa.Workflows.Persistence/Implementations/MemoryWorkflowDefinitionStore.cs b/src/modules/Elsa.Workflows.Persistence/Implementations/MemoryWorkflowDefinitionStore.cs
index 24c090707..3e897da19 100644
--- a/src/modules/Elsa.Workflows.Persistence/Implementations/MemoryWorkflowDefinitionStore.cs
+++ b/src/modules/Elsa.Workflows.Persistence/Implementations/MemoryWorkflowDefinitionStore.cs
@@ -99,7 +99,6 @@ public class MemoryWorkflowDefinitionStore : IWorkflowDefinitionStore
     public Task<Page<WorkflowDefinitionSummary>> ListSummariesAsync(
         VersionOptions? versionOptions = default,
         string? materializerName = default,
-        IEnumerable<string>? labelNames = default,
         PageArgs? pageArgs = default,
         CancellationToken cancellationToken = default)
     {
@@ -107,7 +106,6 @@ public class MemoryWorkflowDefinitionStore : IWorkflowDefinitionStore
 
         if (versionOptions != null) query = query.WithVersion(versionOptions.Value);
         if (!string.IsNullOrWhiteSpace(materializerName)) query = query.Where(x => x.MaterializerName == materializerName);
-        if (labelNames != null) query = FilterByLabels(query, labelNames);
 
         var page = query.Paginate(x => WorkflowDefinitionSummary.FromDefinition(x), pageArgs);
         return Task.FromResult(page);
diff --git a/src/modules/Elsa.Workflows.Persistence/Services/IWorkflowDefinitionStore.cs b/src/modules/Elsa.Workflows.Persistence/Services/IWorkflowDefinitionStore.cs
index d23368110..07ebc46ed 100644
--- a/src/modules/Elsa.Workflows.Persistence/Services/IWorkflowDefinitionStore.cs
+++ b/src/modules/Elsa.Workflows.Persistence/Services/IWorkflowDefinitionStore.cs
@@ -31,7 +31,6 @@ public interface IWorkflowDefinitionStore
     Task<Page<WorkflowDefinitionSummary>> ListSummariesAsync(
         VersionOptions? versionOptions = default,
         string? materializerName = default,
-        IEnumerable<string>? labelNames = default,
         PageArgs? pageArgs = default,
         CancellationToken cancellationToken = default);