Update client API models to match server side endpoint response models

Fixes #3783
elsa-workflows · Sep 10, 2023 · 13d656a · 13d656a
1 parent 0091791
commit 13d656a
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 24 deletions.
diff --git a/src/clients/Elsa.Client/Models/WorkflowBlueprintSummary.cs b/src/clients/Elsa.Client/Models/WorkflowBlueprintSummary.cs
@@ -6,14 +6,17 @@ namespace Elsa.Client.Models
     public class WorkflowBlueprintSummary
     {
         [DataMember(Order = 0)] public string Id { get; set; } = default!;
-        [DataMember(Order = 1)] public string? Name { get; set; }
-        [DataMember(Order = 2)] public string? DisplayName { get; set; }
-        [DataMember(Order = 3)] public string? Description { get; set;}
-        [DataMember(Order = 4)] public int Version { get; set; }
-        [DataMember(Order = 5)] public string? TenantId { get; set; }
-        [DataMember(Order = 6)] public bool IsSingleton { get; set; }
-        [DataMember(Order = 7)] public bool IsEnabled { get; set; }
-        [DataMember(Order = 8)] public bool IsPublished { get; set; }
-        [DataMember(Order = 9)] public bool IsLatest { get; set; }
+        [DataMember(Order = 1)] string VersionId { get; } = default!;
+        [DataMember(Order = 2)] public string? Name { get; set; }
+        [DataMember(Order = 3)] public string? DisplayName { get; set; }
+        [DataMember(Order = 4)] public string? Description { get; set; }
+        [DataMember(Order = 5)] public int Version { get; set; }
+        [DataMember(Order = 6)] public string? TenantId { get; set; }
+        [DataMember(Order = 7)] public bool IsSingleton { get; set; }
+        [DataMember(Order = 8)] public bool IsDisabled { get; set; }
+        [DataMember(Order = 9)] public bool IsPublished { get; set; }
+        [DataMember(Order = 10)] public bool IsLatest { get; set; }
+        [DataMember(Order = 11)] string? Tag { get; }
+        [DataMember(Order = 12)] string? Channel { get; }
     }
 }
diff --git a/src/clients/Elsa.Client/Models/WorkflowInstanceSummary.cs b/src/clients/Elsa.Client/Models/WorkflowInstanceSummary.cs
@@ -8,17 +8,18 @@ public class WorkflowInstanceSummary
     {
         [DataMember(Order = 0)] public string Id { get; set; } = default!;
         [DataMember(Order = 1)] public string DefinitionId { get; set; } = default!;
-        [DataMember(Order = 2)] public string? TenantId { get; set; }
-        [DataMember(Order = 3)] public int Version { get; set; }
-        [DataMember(Order = 4)] public WorkflowStatus WorkflowStatus { get; set; }
-        [DataMember(Order = 5)] public string? CorrelationId { get; set; }
-        [DataMember(Order = 6)] public string? ContextType { get; set; }
-        [DataMember(Order = 7)] public string? ContextId { get; set; }
-        [DataMember(Order = 8)] public string? Name { get; set; }
-        [DataMember(Order = 9)] public Instant CreatedAt { get; set; }
-        [DataMember(Order = 10)] public Instant? LastExecutedAt { get; set; }
-        [DataMember(Order = 11)] public Instant? FinishedAt { get; set; }
-        [DataMember(Order = 12)] public Instant? CancelledAt { get; set; }
-        [DataMember(Order = 13)] public Instant? FaultedAt { get; set; }
+        [DataMember(Order = 2)] public string DefinitionVersionId { get; set; } = default!;
+        [DataMember(Order = 3)] public string? TenantId { get; set; }
+        [DataMember(Order = 4)] public int Version { get; set; }
+        [DataMember(Order = 5)] public WorkflowStatus WorkflowStatus { get; set; }
+        [DataMember(Order = 6)] public string? CorrelationId { get; set; }
+        [DataMember(Order = 7)] public string? ContextType { get; set; }
+        [DataMember(Order = 8)] public string? ContextId { get; set; }
+        [DataMember(Order = 9)] public string? Name { get; set; }
+        [DataMember(Order = 10)] public Instant CreatedAt { get; set; }
+        [DataMember(Order = 11)] public Instant? LastExecutedAt { get; set; }
+        [DataMember(Order = 12)] public Instant? FinishedAt { get; set; }
+        [DataMember(Order = 13)] public Instant? CancelledAt { get; set; }
+        [DataMember(Order = 14)] public Instant? FaultedAt { get; set; }
     }
 }
diff --git a/src/clients/Elsa.Client/Services/IWorkflowRegistryApi.cs b/src/clients/Elsa.Client/Services/IWorkflowRegistryApi.cs
@@ -1,4 +1,5 @@
-using System.Threading;
+using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 using Elsa.Client.Models;
 using Refit;
@@ -11,6 +12,6 @@ public interface IWorkflowRegistryApi
         Task<WorkflowBlueprint?> GetByIdAsync(string id, VersionOptions versionOptions, CancellationToken cancellationToken = default);
 
         [Get("/v1/workflow-registry")]
-        Task<PagedList<WorkflowBlueprintSummary>> ListAsync(int? page = default, int? pageSize = default, VersionOptions? versionOptions = default, CancellationToken cancellationToken = default);
+        Task<IEnumerable<WorkflowBlueprintSummary>> ListAsync(int? page = default, int? pageSize = default, VersionOptions? versionOptions = default, CancellationToken cancellationToken = default);
     }
 }
diff --git a/src/server/Elsa.Server.Api/Endpoints/WorkflowRegistry/ListAll.cs b/src/server/Elsa.Server.Api/Endpoints/WorkflowRegistry/ListAll.cs
@@ -57,7 +57,7 @@ private async IAsyncEnumerable<IWorkflowBlueprint> ListAllAsync(string? tenantId
         {
             var workflowBlueprints = workflowProvider.ListAsync(versionOptions, tenantId: tenantId, cancellationToken: cancellationToken);
 
-            await foreach (var workflowBlueprint in workflowBlueprints.WithCancellation(cancellationToken))
+            await foreach (var workflowBlueprint in workflowBlueprints)
                 yield return workflowBlueprint;
         }
     }