From c74b105e1954f0f0e08d5ce5e26525d0e8e19494 Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipkeschoorstra@outlook.com>
Date: Thu, 24 Mar 2022 12:29:39 +0100
Subject: [PATCH] Move Timer to Activities namespace

---
 src/modules/Elsa.Modules.Scheduling/Activities/Delay.cs       | 2 +-
 .../Elsa.Modules.Scheduling/{Triggers => Activities}/Timer.cs | 3 ++-
 .../Elsa.Modules.Scheduling/Elsa.Modules.Scheduling.csproj    | 4 ++++
 .../Services/WorkflowTriggerScheduler.cs                      | 4 ++--
 src/samples/aspnet/Elsa.Samples.Web1/Program.cs               | 1 -
 .../aspnet/Elsa.Samples.Web1/Workflows/HeartbeatWorkflow.cs   | 2 +-
 src/samples/console/Elsa.Samples.Console2/Program.cs          | 2 +-
 7 files changed, 11 insertions(+), 7 deletions(-)
 rename src/modules/Elsa.Modules.Scheduling/{Triggers => Activities}/Timer.cs (89%)

diff --git a/src/modules/Elsa.Modules.Scheduling/Activities/Delay.cs b/src/modules/Elsa.Modules.Scheduling/Activities/Delay.cs
index 4c9a12470..27c9f1ef4 100644
--- a/src/modules/Elsa.Modules.Scheduling/Activities/Delay.cs
+++ b/src/modules/Elsa.Modules.Scheduling/Activities/Delay.cs
@@ -5,7 +5,7 @@ using Elsa.Models;
 
 namespace Elsa.Modules.Scheduling.Activities;
 
-[Activity("Scheduling", "Delays execution for the specified amount of time.")]
+[Activity( "Elsa", "Scheduling", "Delay execution for the specified amount of time.")]
 public class Delay : Activity
 {
     public Delay()
diff --git a/src/modules/Elsa.Modules.Scheduling/Triggers/Timer.cs b/src/modules/Elsa.Modules.Scheduling/Activities/Timer.cs
similarity index 89%
rename from src/modules/Elsa.Modules.Scheduling/Triggers/Timer.cs
rename to src/modules/Elsa.Modules.Scheduling/Activities/Timer.cs
index 06f3c1a5f..60b85ac52 100644
--- a/src/modules/Elsa.Modules.Scheduling/Triggers/Timer.cs
+++ b/src/modules/Elsa.Modules.Scheduling/Activities/Timer.cs
@@ -5,11 +5,12 @@ using Elsa.Attributes;
 using Elsa.Contracts;
 using Elsa.Models;
 
-namespace Elsa.Modules.Scheduling.Triggers;
+namespace Elsa.Modules.Scheduling.Activities;
 
 /// <summary>
 /// Represents a timer to periodically trigger the workflow.
 /// </summary>
+[Activity( "Elsa", "Scheduling", "Trigger workflow execution at a specific interval.")] 
 public class Timer : EventGenerator
 {
     [JsonConstructor]
diff --git a/src/modules/Elsa.Modules.Scheduling/Elsa.Modules.Scheduling.csproj b/src/modules/Elsa.Modules.Scheduling/Elsa.Modules.Scheduling.csproj
index 18211728a..e8f0fbcec 100644
--- a/src/modules/Elsa.Modules.Scheduling/Elsa.Modules.Scheduling.csproj
+++ b/src/modules/Elsa.Modules.Scheduling/Elsa.Modules.Scheduling.csproj
@@ -10,4 +10,8 @@
       <ProjectReference Include="..\..\core\Elsa.Jobs\Elsa.Jobs.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Folder Include="Triggers" />
+    </ItemGroup>
+
 </Project>
diff --git a/src/modules/Elsa.Modules.Scheduling/Services/WorkflowTriggerScheduler.cs b/src/modules/Elsa.Modules.Scheduling/Services/WorkflowTriggerScheduler.cs
index 7f586d2a6..6e3b07e46 100644
--- a/src/modules/Elsa.Modules.Scheduling/Services/WorkflowTriggerScheduler.cs
+++ b/src/modules/Elsa.Modules.Scheduling/Services/WorkflowTriggerScheduler.cs
@@ -5,12 +5,12 @@ using System.Threading;
 using System.Threading.Tasks;
 using Elsa.Modules.Scheduling.Contracts;
 using Elsa.Modules.Scheduling.Jobs;
-using Elsa.Modules.Scheduling.Triggers;
 using Elsa.Persistence.Entities;
 using Elsa.Persistence.Extensions;
 using Elsa.Jobs.Contracts;
 using Elsa.Jobs.Schedules;
-using Timer = Elsa.Modules.Scheduling.Triggers.Timer;
+using Elsa.Modules.Scheduling.Activities;
+using Timer = Elsa.Modules.Scheduling.Activities.Timer;
 
 namespace Elsa.Modules.Scheduling.Services;
 
diff --git a/src/samples/aspnet/Elsa.Samples.Web1/Program.cs b/src/samples/aspnet/Elsa.Samples.Web1/Program.cs
index 9d6be7610..4264ff120 100644
--- a/src/samples/aspnet/Elsa.Samples.Web1/Program.cs
+++ b/src/samples/aspnet/Elsa.Samples.Web1/Program.cs
@@ -15,7 +15,6 @@ using Elsa.Modules.Http.Extensions;
 using Elsa.Modules.JavaScript.Activities;
 using Elsa.Modules.Quartz.Services;
 using Elsa.Modules.Scheduling.Activities;
-using Elsa.Modules.Scheduling.Triggers;
 using Elsa.Modules.WorkflowContexts.Extensions;
 using Elsa.Persistence.EntityFrameworkCore.Extensions;
 using Elsa.Persistence.EntityFrameworkCore.Sqlite;
diff --git a/src/samples/aspnet/Elsa.Samples.Web1/Workflows/HeartbeatWorkflow.cs b/src/samples/aspnet/Elsa.Samples.Web1/Workflows/HeartbeatWorkflow.cs
index 55008193a..1f3a30dcd 100644
--- a/src/samples/aspnet/Elsa.Samples.Web1/Workflows/HeartbeatWorkflow.cs
+++ b/src/samples/aspnet/Elsa.Samples.Web1/Workflows/HeartbeatWorkflow.cs
@@ -2,7 +2,7 @@ using System;
 using Elsa.Activities;
 using Elsa.Contracts;
 using Elsa.Modules.Activities.Activities.Console;
-using Elsa.Modules.Scheduling.Triggers;
+using Elsa.Modules.Scheduling.Activities;
 using Elsa.Runtime.Contracts;
 
 namespace Elsa.Samples.Web1.Workflows;
diff --git a/src/samples/console/Elsa.Samples.Console2/Program.cs b/src/samples/console/Elsa.Samples.Console2/Program.cs
index 7578578e2..e55225c00 100644
--- a/src/samples/console/Elsa.Samples.Console2/Program.cs
+++ b/src/samples/console/Elsa.Samples.Console2/Program.cs
@@ -10,7 +10,7 @@ using Elsa.Extensions;
 using Elsa.Models;
 using Elsa.Modules.Activities.Activities.Console;
 using Elsa.Modules.Http;
-using Elsa.Modules.Scheduling.Triggers;
+using Elsa.Modules.Scheduling.Activities;
 using Elsa.Persistence.InMemory.Extensions;
 using Elsa.Scripting.JavaScript.Extensions;
 using Microsoft.Extensions.DependencyInjection;