Merge branch 'develop' into main

Author: tpurschke

roles/lib/files/FWO.Api.Client/GraphQlApiSubscription.cs

@@ -12,6 +12,7 @@ public class GraphQlApiSubscription<SubscriptionResponseType> : ApiSubscription,
 
         private IObservable<GraphQLResponse<dynamic>> subscriptionStream = null!;
         private IDisposable subscription = null!;
+        private readonly ApiConnection apiConnection;
         private readonly GraphQLHttpClient graphQlClient;
         private readonly GraphQLRequest request;
         private readonly Action<Exception> internalExceptionHandler;
@@ -22,6 +23,7 @@ public void Initialize()
         }
         public GraphQlApiSubscription(ApiConnection apiConnection, GraphQLHttpClient graphQlClient, GraphQLRequest request, Action<Exception> exceptionHandler, SubscriptionUpdate OnUpdate)
         {
+            this.apiConnection = apiConnection;
             this.OnUpdate = OnUpdate;
             this.graphQlClient = graphQlClient;
             this.request = request;
@@ -91,15 +93,18 @@ protected virtual void CreateSubscription()
 
         private void ApiConnectionOnAuthHeaderChanged(object? sender, string jwt)
         {
-            subscription.Dispose();
+            subscription?.Dispose();
             CreateSubscription();
         }
 
         protected override void Dispose(bool disposing)
         {
             if (disposing)
             {
-                subscription.Dispose();
+                subscription?.Dispose();
+
+                // Important: detach from ApiConnection event to avoid keeping this subscription alive.
+                apiConnection.OnAuthHeaderChanged -= ApiConnectionOnAuthHeaderChanged;
             }
         }
     }

roles/lib/files/FWO.Config.Api/Config.cs

@@ -8,7 +8,7 @@
 
 namespace FWO.Config.Api
 {
-    public abstract class Config : ConfigData
+    public abstract class Config : ConfigData, IDisposable
     {
         /// <summary>
         /// Internal connection to api server. Used to get/edit config data.
@@ -22,8 +22,12 @@ public abstract class Config : ConfigData
 
         protected SemaphoreSlim semaphoreSlim = new(1, 1);
 
+        private GraphQlApiSubscription<ConfigItem[]>? configSubscription;
+
         public ConfigItem[] RawConfigItems { get; set; } = [];
 
+        private bool disposedValue;
+
         protected Config() { }
 
         protected Config(ApiConnection apiConnection, int userId, bool withSubscription = false)
@@ -34,18 +38,25 @@ protected Config(ApiConnection apiConnection, int userId, bool withSubscription
         public async Task InitWithUserId(ApiConnection apiConnection, int userId, bool withSubscription = false)
         {
             this.apiConnection = apiConnection;
-            if(withSubscription) // used in Ui context
+
+            // Always set UserId, even when no subscription is used.
+            UserId = userId;
+
+            if (withSubscription) // used in Ui context
             {
-                UserId = userId;
+                // Re-init (e.g. login) can happen; dispose previous subscription to avoid handler accumulation.
+                configSubscription?.Dispose();
+                configSubscription = null;
+
                 List<string> ignoreKeys = []; // currently nothing ignored, may be used later
-                apiConnection.GetSubscription<ConfigItem[]>(SubscriptionExceptionHandler, SubscriptionUpdateHandler,
-                    ConfigQueries.subscribeConfigChangesByUser, new { UserId , ignoreKeys });
+                configSubscription = apiConnection.GetSubscription<ConfigItem[]>(SubscriptionExceptionHandler, SubscriptionUpdateHandler,
+                    ConfigQueries.subscribeConfigChangesByUser, new { UserId, ignoreKeys });
                 await Task.Run(async () => { while (!Initialized) { await Task.Delay(10); } }); // waitForFirstUpdate
             }
             else // when only simple read is needed, e.g. during scheduled report in middleware server
             {
                 ConfigItem[] configItems = await apiConnection.SendQueryAsync<ConfigItem[]>(ConfigQueries.getConfigItemsByUser, new { User = UserId });
-                if(configItems.Length > 0)
+                if (configItems.Length > 0)
                 {
                     Update(configItems);
                     RawConfigItems = configItems;
@@ -96,7 +107,7 @@ protected void Update(ConfigItem[] configItems)
                     }
                 }
             }
-            foreach(var name in remainingConfigItemNames.Where(n => !n.Contains("StateMatrix"))) // StateMatrix ConfigItems are handled separately
+            foreach (var name in remainingConfigItemNames.Where(n => !n.Contains("StateMatrix"))) // StateMatrix ConfigItems are handled separately
             {
                 Log.WriteDebug($"Load {(UserId == 0 ? "Global " : "")}Config Items", $"Config item with key \"{name}\" could not be found. {(UserId == 0 ? "" : "User might not have customized the setting. ")}Using default value.");
             }
@@ -144,7 +155,7 @@ public async Task<ConfigData> GetEditableConfig()
         {
             await semaphoreSlim.WaitAsync();
             try
-            { 
+            {
                 return (ConfigData)CloneEditable();
             }
             finally { semaphoreSlim.Release(); }
@@ -160,6 +171,37 @@ protected void InvokeOnChange(Config config, ConfigItem[] configItems)
             OnChange?.Invoke(config, configItems);
         }
 
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!disposedValue)
+            {
+                if (disposing)
+                {
+                    // Stop GraphQL subscription so it no longer holds references to this instance.
+                    configSubscription?.Dispose();
+                    configSubscription = null;
+
+                    // Dispose SemaphoreSlim
+                    semaphoreSlim?.Dispose();
+
+                    // Clear all event subscribers
+                    OnChange = null;
+                }
+                disposedValue = true;
+            }
+        }
+
+        public void Dispose()
+        {
+            Dispose(disposing: true);
+            GC.SuppressFinalize(this);
+        }
+
+        ~Config()
+        {
+            Dispose(disposing: false);
+        }
+
         public abstract string GetText(string key);
     }
 }

roles/lib/files/FWO.Config.Api/UserConfig.cs

@@ -57,7 +57,7 @@ public UserConfig() : base()
         {
             User = new UiUser();
         }
-        
+
         private void OnGlobalConfigChange(Config config, ConfigItem[] changedItems)
         {
             // Get properties that belong to the user config 
@@ -74,7 +74,7 @@ private void OnGlobalConfigChange(Config config, ConfigItem[] changedItems)
 
         public async Task SetUserInformation(string userDn, ApiConnection apiConnection)
         {
-            if(globalConfig != null)
+            if (globalConfig != null)
             {
                 OnGlobalConfigChange(globalConfig, globalConfig.RawConfigItems);
             }
@@ -95,11 +95,11 @@ public async Task SetUserInformation(string userDn, ApiConnection apiConnection)
 
         public async Task ChangeLanguage(string languageName, ApiConnection apiConnection)
         {
-            if(globalConfig != null)
+            if (globalConfig != null)
             {
                 await apiConnection.SendQueryAsync<ReturnId>(AuthQueries.updateUserLanguage, new { id = User.DbId, language = languageName });
                 Translate = globalConfig.LangDict[languageName];
-                Overwrite = apiConnection != null ? await GetCustomDict(languageName): globalConfig.OverDict[languageName];
+                Overwrite = apiConnection != null ? await GetCustomDict(languageName) : globalConfig.OverDict[languageName];
                 User.Language = languageName;
                 InvokeOnChange(this, []);
             }
@@ -112,8 +112,12 @@ public string GetUserLanguage()
 
         public void SetLanguage(string languageName)
         {
-            User = new UiUser(){ Language = languageName != null && languageName != "" ? languageName : 
-                globalConfig != null ? globalConfig.DefaultLanguage : GlobalConst.kEnglish};
+            string defaultLanguage = globalConfig != null ? globalConfig.DefaultLanguage : GlobalConst.kEnglish;
+
+            User = new UiUser()
+            {
+                Language = languageName != null && languageName != "" ? languageName : defaultLanguage
+            };
             if (globalConfig != null && globalConfig.LangDict.TryGetValue(User.Language, out Dictionary<string, string>? langDict))
             {
                 Translate = langDict;
@@ -133,7 +137,7 @@ public override string GetText(string key)
             }
             else
             {
-                if(globalConfig != null)
+                if (globalConfig != null)
                 {
                     string defaultLanguage = globalConfig.DefaultLanguage;
                     if (defaultLanguage == "")
@@ -160,15 +164,15 @@ public string PureLine(string text)
 
         public static string PureLineStat(string text)
         {
-			var regex = new Regex(@"\s", RegexOptions.None, TimeSpan.FromSeconds(1));
-			string output = RemoveLinks(regex.Replace(text.Trim(), " "));
+            var regex = new Regex(@"\s", RegexOptions.None, TimeSpan.FromSeconds(1));
+            string output = RemoveLinks(regex.Replace(text.Trim(), " "));
             output = ReplaceListElems(output);
             bool cont = true;
-            while(cont)
+            while (cont)
             {
                 string outputOrig = output;
                 output = Regex.Replace(outputOrig, @"  ", " ");
-                if(output.Length == outputOrig.Length)
+                if (output.Length == outputOrig.Length)
                 {
                     cont = false;
                 }
@@ -248,7 +252,7 @@ private static string RemoveLinks(string txtString)
             txtString = Regex.Replace(txtString, "</a>", "");
             return txtString;
         }
-    
+
         private static string ReplaceListElems(string txtString)
         {
             txtString = Regex.Replace(txtString, "<ol>", "");
@@ -260,7 +264,7 @@ private static string ReplaceListElems(string txtString)
             txtString = Regex.Replace(txtString, "<br>", "\r\n");
             return txtString;
         }
-        
+
         private string Convert(string rawText)
         {
             string plainText = System.Web.HttpUtility.HtmlDecode(rawText);
@@ -300,7 +304,13 @@ private string Convert(string rawText)
             return plainText;
         }
 
-        protected virtual void Dispose(bool disposing)
+        public new void Dispose()
+        {
+            Dispose(disposing: true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected override void Dispose(bool disposing)
         {
             if (!disposedValue)
             {
@@ -310,12 +320,7 @@ protected virtual void Dispose(bool disposing)
                 }
                 disposedValue = true;
             }
-        }
-
-        public void Dispose()
-        {
-            Dispose(disposing: true);
-            GC.SuppressFinalize(this);
+            base.Dispose(disposing);  // Call base class dispose
         }
     }
 }

roles/lib/files/FWO.Data/Middleware/SchedulerParameters.cs

@@ -0,0 +1,22 @@
+using System;
+
+namespace FWO.Data.Middleware
+{
+    /// <summary>Represents a Quartz job exposed to the UI.</summary>
+    public class SchedulerJobInfo
+    {
+        public string JobName { get; set; } = "";
+        public string Group { get; set; } = "";
+        public DateTimeOffset? NextFireTimeUtc { get; set; }
+        public DateTimeOffset? LastFireTimeUtc { get; set; }
+        public string IntervalDescription { get; set; } = "";
+        public string LastExecutionStatus { get; set; } = "";
+        public string LastExecutionError { get; set; } = "";
+    }
+
+    /// <summary>Request payload to trigger a job manually.</summary>
+    public class SchedulerJobTriggerParameters
+    {
+        public string JobName { get; set; } = "";
+    }
+}