Merge branch 'develop' into task/RDMP-165-setup-using-yaml-file

CHANGELOG.md

@@ -1,3 +1,4 @@
+
 # Changelog
 All notable changes to this project will be documented in this file.
 
@@ -9,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Changed
 
 - Add Microsoft.Bcl.AsyncInterfaces 6.0.0 for plugin dependancy tree
+- Add prompt to reanem container when adding a cohort filter
 
 ## [8.1.5] - 2024-04-03
 

Directory.Packages.props

@@ -6,18 +6,18 @@
 		<PackageVersion Include="FluentFTP" Version="50.0.1"/>
 		<PackageVersion Include="HIC.BadMedicine" Version="1.2.1"/>
 		<PackageVersion Include="HIC.FAnsiSql" Version="3.2.2"/>
-		<PackageVersion Include="LibArchive.Net" Version="0.1.4"/>
+		<PackageVersion Include="LibArchive.Net" Version="0.1.5"/>
 		<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageVersion>
 		<PackageVersion Include="MongoDB.Driver" Version="2.25.0"/>
 		<PackageVersion Include="Newtonsoft.Json" Version="13.0.3"/>
 		<PackageVersion Include="NPOI" Version="2.7.0"/>
-		<PackageVersion Include="NLog" Version="5.2.8"/>
+		<PackageVersion Include="NLog" Version="5.3.1"/>
 		<PackageVersion Include="SixLabors.ImageSharp" Version="3.1.4"/>
 		<PackageVersion Include="SixLabors.ImageSharp.Drawing" Version="2.1.3"/>
-		<PackageVersion Include="Spectre.Console" Version="0.48.0"/>
+		<PackageVersion Include="Spectre.Console" Version="0.49.1"/>
 		<PackageVersion Include="SSH.NET" Version="2024.0.0"/>
 		<PackageVersion Include="Terminal.Gui" Version="1.16.0"/>
 		<PackageVersion Include="YamlDotNet" Version="15.1.2"/>
@@ -34,7 +34,7 @@
 		<PackageVersion Include="HIC.System.Windows.Forms.DataVisualization" Version="1.0.1"/>
 		<PackageVersion Include="NunitXml.TestLogger" Version="3.1.20"/>
 		<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0"/>
-		<PackageVersion Include="NUnit.Analyzers" Version="4.1.0"/>
+		<PackageVersion Include="NUnit.Analyzers" Version="4.2.0"/>
 		<PackageVersion Include="NSubstitute" Version="5.1.0"/>
 		<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0"/>
 		<PackageVersion Include="coverlet.collector" Version="6.0.2"/>

Rdmp.Core/ReusableLibraryCode/Settings/UserSettings.cs

@@ -1,4 +1,4 @@
-// Copyright (c) The University of Dundee 2018-2019
+// Copyright (c) The University of Dundee 2018-2024
 // This file is part of the Research Data Management Platform (RDMP).
 // RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 // RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
@@ -171,6 +171,13 @@ public static bool EnableCommits
     }
 
 
+    public static bool PromptRenameOnCohortFilterChange
+    {
+        get => AppSettings.GetValueOrDefault("PromptRenameOnCohortFilterChange", true);
+        set => AppSettings.AddOrUpdateValue("PromptRenameOnCohortFilterChange", value);
+    }
+
+
     #region Catalogue flag visibility settings
 
     public static bool ShowInternalCatalogues

Rdmp.UI/SimpleControls/ObjectSaverButton.cs

@@ -1,4 +1,4 @@
-// Copyright (c) The University of Dundee 2018-2019
+// Copyright (c) The University of Dundee 2018-2024
 // This file is part of the Research Data Management Platform (RDMP).
 // RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 // RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
@@ -237,4 +237,6 @@ public void CheckForUnsavedChangesAnOfferToSave()
         else
             _o.RevertToDatabaseState();
     }
+
+    public bool IsEnabled => _isEnabled;
 }

Rdmp.UI/SimpleDialogs/UserSettingsUI.cs

@@ -1,4 +1,4 @@
-// Copyright (c) The University of Dundee 2018-2019
+// Copyright (c) The University of Dundee 2018-2024
 // This file is part of the Research Data Management Platform (RDMP).
 // RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 // RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
@@ -103,6 +103,7 @@ public UserSettingsFileUI(IActivateItems activator)
         RegisterCheckbox(cbAlwaysJoinEverything, nameof(UserSettings.AlwaysJoinEverything));
         RegisterCheckbox(cbAutoRunSqlQueries, nameof(UserSettings.AutoRunSqlQueries));
         RegisterCheckbox(cbExpandAllInCohortBuilder, nameof(UserSettings.ExpandAllInCohortBuilder));
+        RegisterCheckbox(cbPromptFilterRename, nameof(UserSettings.PromptRenameOnCohortFilterChange));
         RegisterCheckbox(cbUseAliasInsteadOfTransformInGroupByAggregateGraphs,
             nameof(UserSettings.UseAliasInsteadOfTransformInGroupByAggregateGraphs));
         RegisterCheckbox(cbUseLocalFileSystem, nameof(UserSettings.UseLocalFileSystem));

Rdmp.UI/TestsAndSetup/ServicePropogation/RDMPSingleDatabaseObjectControl.cs

@@ -1,4 +1,4 @@
-// Copyright (c) The University of Dundee 2018-2019
+// Copyright (c) The University of Dundee 2018-2024
 // This file is part of the Research Data Management Platform (RDMP).
 // RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 // RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
@@ -12,7 +12,12 @@
 using Rdmp.Core.CommandExecution;
 using Rdmp.Core.CommandExecution.AtomicCommands;
 using Rdmp.Core.Curation.Data;
+using Rdmp.Core.Curation.Data.Aggregation;
+using Rdmp.Core.Curation.Data.Cohort;
 using Rdmp.Core.MapsDirectlyToDatabaseTable;
+using Rdmp.Core.Repositories;
+using Rdmp.Core.ReusableLibraryCode.Settings;
+using Rdmp.UI.ExtractionUIs.FilterUIs;
 using Rdmp.UI.ItemActivation;
 using Rdmp.UI.Refreshing;
 using Rdmp.UI.Rules;
@@ -128,6 +133,11 @@ public virtual void SetDatabaseObject(IActivateItems activator, T databaseObject
                 ObjectSaverButton1.BeforeSave += BeforeSave_FinishCommitInProgressIfAny;
                 ObjectSaverButton1.AfterSave += AfterSave_BeginNewCommitIfApplicable;
             }
+            if (this.GetType() == typeof(ExtractionFilterUI) && UserSettings.PromptRenameOnCohortFilterChange)
+            {
+                ObjectSaverButton1.BeforeSave -= BeforeSave_PromptRenameOfExtractionFilterContainer;
+                ObjectSaverButton1.BeforeSave += BeforeSave_PromptRenameOfExtractionFilterContainer;
+            }
 
             ObjectSaverButton1.SetupFor(this, databaseObject, activator);
         }
@@ -141,6 +151,32 @@ public virtual void SetDatabaseObject(IActivateItems activator, T databaseObject
         }
     }
 
+    protected bool BeforeSave_PromptRenameOfExtractionFilterContainer(DatabaseEntity _)
+    {
+        if (!ObjectSaverButton1.IsEnabled) return true;
+        AggregateFilter af;
+        try
+        {
+            af = (AggregateFilter)_;
+        }
+        catch (Exception)
+        {
+            //DatabaseEntity was not an aggregateFilter
+            return true;
+        }
+        AggregateFilterContainer afc = af.CatalogueRepository.GetAllObjectsWhere<AggregateFilterContainer>("ID", af.FilterContainer_ID).FirstOrDefault();
+        if (afc != null)
+        {
+            AggregateConfiguration ac = afc.GetAggregate();
+            if (ac != null)
+            {
+                var rename = new ExecuteCommandRename(Activator, ac);
+                rename.Execute();
+            }
+        }
+        return true;
+    }
+
 
     protected bool BeforeSave_FinishCommitInProgressIfAny(DatabaseEntity _)
     {
@@ -308,6 +344,7 @@ protected override void Dispose(bool disposing)
         if (ObjectSaverButton1 != null)
         {
             ObjectSaverButton1.BeforeSave -= BeforeSave_FinishCommitInProgressIfAny;
+            ObjectSaverButton1.BeforeSave -= BeforeSave_PromptRenameOfExtractionFilterContainer;
             ObjectSaverButton1.AfterSave -= AfterSave_BeginNewCommitIfApplicable;
         }
     }