Merge pull request #2132 from HicServices/bugfix/RDMP-280-delete-coho…

…rt-versions

fix up cohort freezing and warning UI alert

Application/ResearchDataManagementPlatform/WindowManagement/ActivateItems.cs

@@ -94,6 +94,18 @@ public override void Publish(IMapsDirectlyToDatabaseTable databaseEntity)
             RefreshBus.Publish(this, new RefreshObjectEventArgs(de));
     }
 
+    public override void ShowWarning(string message)
+    {
+        // if on wrong Thread
+        if (_mainDockPanel?.InvokeRequired ?? false)
+        {
+            _mainDockPanel.Invoke(() => ShowWarning(message));
+            return;
+        }
+
+        WideMessageBox.Show("Message", message, Environment.StackTrace, true, null, WideMessageBoxTheme.Warning);
+    }
+
     public override void Show(string title, string message)
     {
         // if on wrong Thread

CHANGELOG.md

@@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Improve cohort deprecation override test
 - Add Filters for CatalogueItems to Dashboard graphs
 - Add ability to use cohort temp table during extractions
+- Fix bug where cohort configuration versions could not be deleted
+- Extraction UI alerts are now marked as warnings as opposed to information
 
 ## [8.4.2] - 2024-12-18
 

Rdmp.Core/CommandExecution/BasicActivateItems.cs

@@ -544,6 +544,9 @@ public void Show(string message)
         Show("Message", message);
     }
 
+    /// <inheritdoc/>
+    public abstract void ShowWarning(string message);
+
     public abstract void Show(string title, string message);
 
     /// <inheritdoc/>

Rdmp.Core/CommandExecution/IBasicActivateItems.cs

@@ -342,6 +342,13 @@ bool SelectObjects<T>(string prompt, T[] available, out T[] selected, string ini
     /// <param name="message"></param>
     void Show(string message);
 
+    /// <summary>
+    /// Display the given message to the user (e.g. in a MessageBox or out into the Console) as a warning
+    /// </summary>
+    /// <param name="message"></param>
+    void ShowWarning(string message);
+
+
     /// <summary>
     /// Display the given message to the user (e.g. in a MessageBox or out into the Console).  If provided <paramref name="title"/> may also be featured in the presentation
     /// </summary>

Rdmp.Core/CommandExecution/ThrowImmediatelyActivator.cs

@@ -90,6 +90,11 @@ public override void Show(string title, string message)
     {
     }
 
+    public override void ShowWarning(string message)
+    {
+    }
+
+
     public override bool TypeText(DialogArgs args, int maxLength, string initialText, out string text,
         bool requireSaneHeaderText)
     {

Rdmp.Core/CommandLine/Interactive/ConsoleInputManager.cs

@@ -57,6 +57,11 @@ public override void Show(string title, string message)
         Console.WriteLine(message);
     }
 
+    public override void ShowWarning(string message)
+    {
+        Console.WriteLine(message);
+    }
+
     public override bool TypeText(DialogArgs args, int maxLength, string initialText, out string text,
         bool requireSaneHeaderText)
     {

Rdmp.Core/Curation/Data/Cohort/CohortIdentificationConfiguration.cs

@@ -274,7 +274,7 @@ public void CreateRootContainerIfNotExists()
 
     public bool ShouldBeReadOnly(out string reason)
     {
-        if (Frozen)
+        if (Frozen && Version is null)
         {
             reason = $"{Name} is Frozen";
             return true;

Rdmp.Core/DataFlowPipeline/DataFlowPipelineEngine.cs

@@ -15,6 +15,7 @@
 using Rdmp.Core.DataFlowPipeline.Requirements;
 using Rdmp.Core.ReusableLibraryCode.Checks;
 using Rdmp.Core.ReusableLibraryCode.Progress;
+using Renci.SshNet.Messages;
 
 namespace Rdmp.Core.DataFlowPipeline;
 
@@ -96,11 +97,11 @@ public void Initialize(params object[] initializationObjects)
     private void UIAlert(string alert, IBasicActivateItems activator)
     {
         if (!activator.IsInteractive) return;
-
         new Thread(() =>
         {
             // run as a separate thread to not halt the UI
-            activator.Show(alert);
+            activator.ShowWarning(alert);
+
         })
         {
             IsBackground = true

Rdmp.UI.Tests/TestActivateItems.cs

@@ -313,6 +313,11 @@ public override void ShowData(System.Data.DataTable collection)
     {
         throw new NotImplementedException();
     }
+
+    public override void ShowWarning(string message)
+    {
+        Show("Message", message);
+    }
 }
 
 public class TestActivateItemsResults : ICheckNotifier

Tools/rdmp/CommandLine/Gui/ConsoleGuiActivator.cs

@@ -388,4 +388,9 @@ public override void LaunchSubprocess(ProcessStartInfo startInfo)
     {
         throw new NotSupportedException();
     }
+
+    public override void ShowWarning(string message)
+    {
+        Show("Message", message);
+    }
 }