SchedulerDialog create method tested and fixed

Author: dolunay

Aspire/Syrna.QuartzAdmin.AppHost/Properties/launchSettings.json

@@ -1,29 +1,33 @@
-{
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "profiles": {
-    "https": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "applicationUrl": "https://localhost:15179;http://localhost:15178",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development",
-        "DOTNET_ENVIRONMENT": "Development",
-        "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:16224",
-        "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22123"
-      }
-    },
-    "http": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "applicationUrl": "http://localhost:15178",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development",
-        "DOTNET_ENVIRONMENT": "Development",
-        "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:16223",
-        "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:21123"
-      }
-    }
-  }
-}
+{
+  "profiles": {
+    "https": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "DOTNET_ENVIRONMENT": "Development",
+        "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:16224",
+        "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22123"
+      },
+      "dotnetRunMessages": true,
+      "applicationUrl": "https://localhost:15179;http://localhost:15178",
+      "nativeDebugging": true,
+      "jsWebView2Debugging": true
+    },
+    "http": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "DOTNET_ENVIRONMENT": "Development",
+        "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:16223",
+        "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:21123"
+      },
+      "dotnetRunMessages": true,
+      "applicationUrl": "http://localhost:15178",
+      "jsWebView2Debugging": true,
+      "nativeDebugging": true
+    }
+  },
+  "$schema": "https://json.schemastore.org/launchsettings.json"
+}

demos/MainDemo/host/Syrna.QuartzAdmin.MainDemo.Blazor.Host.Client/MainDemoBlazorHostClientModule.cs

@@ -76,6 +76,8 @@ private void ConfigureBlazorise(ServiceConfigurationContext context)
 
     private void ConfigureQuartzAdmin(ServiceConfigurationContext context)
     {
+        var configuration = context.Services.GetConfiguration();
+        context.Services.AddQuartzAdminMain(configuration.GetSection("QuartzAdmin"));
         context.Services.AddTransient<ITriggerDetailModelValidator, TriggerDetailModelValidator>();
         context.Services.AddSingleton<IJobUIProvider, JobUIProvider>();
     }

demos/MainDemo/host/Syrna.QuartzAdmin.MainDemo.Blazor.Host.Client/ServiceCollectionExtensions.cs

@@ -6,11 +6,11 @@
 using System.Collections.Generic;
 using System.Reflection;
 
-namespace Syrna.QuartzAdmin.MainDemo;
+namespace Syrna.QuartzAdmin.MainDemo.Blazor.Host.Client;
 
 public static class ServiceCollectionExtensions
 {
-    public static IServiceCollection AddQuartzAdmin(
+    public static IServiceCollection AddQuartzAdminMain(
         this IServiceCollection services,
         IConfiguration quartzAdminUIConfiguration,
         Func<List<Assembly>> jobsasmlist = null)
@@ -19,15 +19,41 @@ public static IServiceCollection AddQuartzAdmin(
 
         var uiOptions = quartzAdminUIConfiguration.Get<QuartzAdminUIOptions>();
 
-        services.AddSingleton<IJobFactory, ServiceCollectionJobFactory>();
+        //services.AddSingleton<IJobFactory, ServiceCollectionJobFactory>();
         var bb = new JobRegistrator(services);
         var types = JobsListHelper.GetQuartzAdminJobs(jobsasmlist?.Invoke());
         types.ForEach(t =>
         {
             var so = t.GetCustomAttribute<QuartzTriggerAttribute>();
-            services.AddQuartzJob(t, so.Identity ?? t.Name, so.Desciption ?? t.FullName);
+            if (so == null)
+            {
+                services.AddQuartzJob(t, t.Name, t.FullName);
+            }
+            else
+            {
+                services.AddQuartzJob(t, so.Identity ?? t.Name, so.Desciption ?? t.FullName);
+            }
         });
+        services.AddQuartzAdmin(quartzAdminUIConfiguration);
 
         return services;
     }
+
+    public static IServiceCollection AddQuartzAdmin(this IServiceCollection services, IConfiguration? config = null)
+    {
+        QuartzAdminCoreOptions coreOptions = null;
+        if (config != null)
+        {
+            services.Configure<QuartzAdminCoreOptions>(config);
+            coreOptions = config.Get<QuartzAdminCoreOptions>();
+        }
+        else
+        {
+            services.AddOptions<QuartzAdminCoreOptions>()
+                .Configure(opt =>
+                {
+                });
+        }
+        return services;
+    }
 }

demos/MainDemo/host/Syrna.QuartzAdmin.MainDemo.Blazor.Host.Client/Syrna.QuartzAdmin.MainDemo.Blazor.Host.Client.csproj

@@ -7,12 +7,13 @@
 		<TargetFramework>net9.0</TargetFramework>
 		<BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
 		<LangVersion>latest</LangVersion>
+		<DebuggerSupport>true</DebuggerSupport>
+		<CopyOutputSymbolsToPublishDirectory>true</CopyOutputSymbolsToPublishDirectory>
 	</PropertyGroup>
 
 	<ItemGroup>
 	  <Compile Remove="Components\CustomUserMenu.razor.cs" />
 	  <Compile Remove="RemoteExternalLocalizationStore.cs" />
-	  <Compile Remove="ServiceCollectionExtensions.cs" />
 	  <Compile Remove="UserExceptionInformer.cs" />
 	</ItemGroup>
 

demos/MainDemo/host/Syrna.QuartzAdmin.MainDemo.Blazor.Host.Client/wwwroot/appsettings.json

@@ -21,5 +21,11 @@
 
       }
     }
+  },
+  "QuartzAdmin": {
+    "AllowedJobAssemblyFiles": [
+      "Syrna.QuartzAdmin.MainDemo.Jobs",
+      "Syrna.QuartzAdmin.Blazor"
+    ]
   }
 }

demos/MainDemo/host/Syrna.QuartzAdmin.MainDemo.HttpApi.Host/SampleSchedulerListener.cs

@@ -33,7 +33,7 @@ public override async Task SchedulerStarted(CancellationToken cancellationToken
     public async Task UseQuartzAdmin()
     {
         var type = typeof(IJob);
-        var types = JobsListHelper.GetQuartzAdminJobs();
+        var types = AutoJobsListHelper.GetQuartzAdminJobs();
         foreach (var t in types)
         {
             var so = t.GetCustomAttribute<QuartzTriggerAttribute>();

demos/MainDemo/host/Syrna.QuartzAdmin.MainDemo.HttpApi.Host/ServiceCollectionExtensions.cs

@@ -1,8 +1,6 @@
-using LiteDB;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
 using Quartz.Spi;
 using Syrna.QuartzAdmin.Jobs.Abstractions;
+using Syrna.QuartzAdmin.Scheduler;
 using System.Reflection;
 
 namespace Syrna.QuartzAdmin.MainDemo;
@@ -18,13 +16,23 @@ public static IServiceCollection AddQuartzAdminMain(
 
         var uiOptions = quartzAdminUIConfiguration.Get<QuartzAdminUIOptions>();
 
+        services.AddQuartzAdminJobs();
+        services.AddSingleton<ISchedulerDefinitionService, SchedulerDefinitionService>();
         services.AddSingleton<IJobFactory, ServiceCollectionJobFactory>();
+
         var bb = new JobRegistrator(services);
         var types = JobsListHelper.GetQuartzAdminJobs(jobsasmlist?.Invoke());
         types.ForEach(t =>
         {
             var so = t.GetCustomAttribute<QuartzTriggerAttribute>();
-            services.AddQuartzJob(t, so.Identity ?? t.Name, so.Desciption ?? t.FullName);
+            if (so == null)
+            {
+                services.AddQuartzJob(t, t.Name, t.FullName);
+            }
+            else
+            {
+                services.AddQuartzJob(t, so.Identity ?? t.Name, so.Desciption ?? t.FullName);
+            }
         });
         services.AddQuartzAdmin(quartzAdminUIConfiguration);
 

modules/src/Syrna.QuartzAdmin.Application.Contracts/Syrna/QuartzAdmin/Jobs/JobDetailModel.cs

@@ -10,7 +10,7 @@ public class JobDetailModel
 
         public string Group { get; set; } = Constants.DEFAULT_GROUP;
         public string Description { get; set; }
-        public Type JobClass { get; set; }
+        public string JobClassName { get; set; }
         public IDictionary<string, object> JobDataMap { get; set; } = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
         /// <summary>
         /// Flag indicate whether Job should stay in scheduler even there are no more triggers assgined to it.

modules/src/Syrna.QuartzAdmin.Application.Contracts/Syrna/QuartzAdmin/Scheduler/CreateScheduleArgs.cs

@@ -0,0 +1,11 @@
+using Syrna.QuartzAdmin.Jobs;
+using Syrna.QuartzAdmin.Triggers;
+
+namespace Syrna.QuartzAdmin.Scheduler
+{
+    public class CreateScheduleArgs
+    {
+        public JobDetailModel JobDetailModel { get; set; }
+        public TriggerDetailModel TriggerDetailModel { get; set; }
+    }
+}

modules/src/Syrna.QuartzAdmin.Application.Contracts/Syrna/QuartzAdmin/Scheduler/ISchedulerAppService.cs

@@ -25,7 +25,7 @@ public interface ISchedulerAppService : IApplicationService
 
         Task<ScheduleModel> GetScheduleModelAsync(ITrigger trigger);
         Task<List<ScheduleModel>> GetAllJobsAsync(ScheduleJobFilter filter);
-        Task CreateSchedule(JobDetailModel jobDetailModel, TriggerDetailModel triggerDetailModel);
+        Task CreateSchedule(CreateScheduleArgs createScheduleArgs);
         Task<IReadOnlyCollection<string>> GetJobGroups();
         Task<IReadOnlyCollection<string>> GetTriggerGroups();
         Task<JobDetailModel> GetJobDetail(string jobName, string groupName);