From f27563a93fa1890937e3b6d3abc4d165f2cb1f7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marius=20Vasile=20Vu=C8=99can?= <marius.vuscan@nexxbiz.io>
Date: Mon, 13 Jan 2025 16:48:24 +0200
Subject: [PATCH 1/3] Added DeleteVariablesAsync method for the workflow
 context

---
 .../Contracts/IVariablePersistenceManager.cs  |  7 ++++-
 .../Services/VariablePersistenceManager.cs    | 27 +++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/modules/Elsa.Workflows.Core/Contracts/IVariablePersistenceManager.cs b/src/modules/Elsa.Workflows.Core/Contracts/IVariablePersistenceManager.cs
index 37115a9ad7..b050bb3900 100644
--- a/src/modules/Elsa.Workflows.Core/Contracts/IVariablePersistenceManager.cs
+++ b/src/modules/Elsa.Workflows.Core/Contracts/IVariablePersistenceManager.cs
@@ -16,7 +16,12 @@ public interface IVariablePersistenceManager
     Task SaveVariablesAsync(WorkflowExecutionContext context);
 
     /// <summary>
-    /// Deletes the specified variables from the <see cref="WorkflowExecutionContext"/>.
+    /// Deletes the specified variables from the <see cref="ActivityExecutionContext"/>.
     /// </summary>
     Task DeleteVariablesAsync(ActivityExecutionContext context);
+    
+    /// <summary>
+    /// Deletes the specified variables from the <see cref="WorkflowExecutionContext"/>.
+    /// </summary>
+    Task DeleteVariablesAsync(WorkflowExecutionContext context);
 }
\ No newline at end of file
diff --git a/src/modules/Elsa.Workflows.Core/Services/VariablePersistenceManager.cs b/src/modules/Elsa.Workflows.Core/Services/VariablePersistenceManager.cs
index fa9f10b9a4..6d608a00fc 100644
--- a/src/modules/Elsa.Workflows.Core/Services/VariablePersistenceManager.cs
+++ b/src/modules/Elsa.Workflows.Core/Services/VariablePersistenceManager.cs
@@ -110,6 +110,33 @@ public async Task DeleteVariablesAsync(ActivityExecutionContext context)
         }
     }
 
+    /// <inheritdoc />
+    public async Task DeleteVariablesAsync(WorkflowExecutionContext context)
+    {
+        var cancellationToken = context.CancellationTokens.ApplicationCancellationToken;
+        var activityContexts = context.ActivityExecutionContexts.ToList();
+
+        foreach (var activityContext in activityContexts)
+        {
+            var variables = GetLocalVariables(activityContext).ToList();
+
+            foreach (var variable in variables)
+            {
+                var block = variable.GetBlock(activityContext.ExpressionExecutionContext);
+                var metadata = (VariableBlockMetadata)block.Metadata!;
+                var driver = _storageDriverManager.Get(metadata.StorageDriverType!);
+
+                if (driver == null)
+                    continue;
+                
+                var id = GetStateId(variable);
+                var storageDriverContext = new StorageDriverContext(activityContext, variable, cancellationToken);
+
+                await driver.DeleteAsync(id, storageDriverContext);
+            }
+        }
+    }
+
     private IEnumerable<Variable> GetLocalVariables(IExecutionContext context) => context.Variables;
 
     private MemoryBlock EnsureBlock(MemoryRegister register, Variable variable)

From 7df058dd2a009919cba1d60d104df7fd134031e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marius=20Vasile=20Vu=C8=99can?= <marius.vuscan@nexxbiz.io>
Date: Tue, 14 Jan 2025 12:23:21 +0200
Subject: [PATCH 2/3] Improvements

---
 .../Services/VariablePersistenceManager.cs     | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/modules/Elsa.Workflows.Core/Services/VariablePersistenceManager.cs b/src/modules/Elsa.Workflows.Core/Services/VariablePersistenceManager.cs
index 6d608a00fc..61469bec68 100644
--- a/src/modules/Elsa.Workflows.Core/Services/VariablePersistenceManager.cs
+++ b/src/modules/Elsa.Workflows.Core/Services/VariablePersistenceManager.cs
@@ -113,27 +113,11 @@ public async Task DeleteVariablesAsync(ActivityExecutionContext context)
     /// <inheritdoc />
     public async Task DeleteVariablesAsync(WorkflowExecutionContext context)
     {
-        var cancellationToken = context.CancellationTokens.ApplicationCancellationToken;
         var activityContexts = context.ActivityExecutionContexts.ToList();
 
         foreach (var activityContext in activityContexts)
         {
-            var variables = GetLocalVariables(activityContext).ToList();
-
-            foreach (var variable in variables)
-            {
-                var block = variable.GetBlock(activityContext.ExpressionExecutionContext);
-                var metadata = (VariableBlockMetadata)block.Metadata!;
-                var driver = _storageDriverManager.Get(metadata.StorageDriverType!);
-
-                if (driver == null)
-                    continue;
-                
-                var id = GetStateId(variable);
-                var storageDriverContext = new StorageDriverContext(activityContext, variable, cancellationToken);
-
-                await driver.DeleteAsync(id, storageDriverContext);
-            }
+            await DeleteVariablesAsync(activityContext);
         }
     }
 

From 83b43f8daf94ce3b32b6d7eb2597e1274c4af546 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marius=20Vasile=20Vu=C8=99can?= <marius.vuscan@nexxbiz.io>
Date: Tue, 14 Jan 2025 12:30:37 +0200
Subject: [PATCH 3/3] update

---
 .github/workflows/packages.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml
index fb03e222bb..80cac5692c 100644
--- a/.github/workflows/packages.yml
+++ b/.github/workflows/packages.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - 'blueberry'
+      - 'feature/*'
   release:
     types: [ prereleased, published ]
 env: