Merge branch 'develop' of https://github.com/HicServices/RDMP into ta…

…sk/RDMP-32-regex-redaction
HicServices · Oct 18, 2024 · 1ec283f · 1ec283f
2 parents bd547a2 + 0d808a5
commit 1ec283f
Show file tree

Hide file tree

Showing 31 changed files with 863 additions and 613 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -71,7 +71,7 @@ jobs:
           mv `find coverage -type f` db-ui.lcov
           dotnet test Rdmp.Core.Tests/Rdmp.Core.Tests.csproj --nologo --collect:"XPlat Code Coverage" --no-build --verbosity minimal -c Release -e AWS_ENDPOINT_URL="http://127.0.0.1:9000" --results-directory coverage -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=lcov
           mv `find coverage -type f` db-core.lcov
-      - uses: coverallsapp/github-action@v2.3.0
+      - uses: coverallsapp/github-action@v2.3.3
         with:
           github-token: ${{ secrets.github_token }}
           files: ./db-ui.lcov ./db-core.lcov
@@ -137,7 +137,7 @@ jobs:
           mv `find coverage -type f` fs-ui.lcov
           dotnet test Rdmp.Core.Tests/Rdmp.Core.Tests.csproj --nologo --collect:"XPlat Code Coverage" --no-build --verbosity minimal -c Release  -e AWS_ENDPOINT_URL="http://127.0.0.1:9000" --results-directory coverage -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=lcov
           mv `find coverage -type f` fs-core.lcov
-      - uses: coverallsapp/github-action@v2.3.0
+      - uses: coverallsapp/github-action@v2.3.3
         with:
           github-token: ${{ secrets.github_token }}
           files: ./fs-ui.lcov ./fs-core.lcov
@@ -176,7 +176,6 @@ jobs:
           cp -r Application/ResearchDataManagementPlatform/bin/Release/net8.0-windows/win-x64/runtimes ./PublishWinForms
           cp -r Application/ResearchDataManagementPlatform/bin/Release/net8.0-windows/win-x64/x64 ./PublishWinForms
           cp Application/ResearchDataManagementPlatform/bin/Release/net8.0-windows/win-x64/D3DCompiler_47_cor3.dll ./PublishWinForms
-          cp Application/ResearchDataManagementPlatform/bin/Release/net8.0-windows/win-x64/mongocrypt.dll ./PublishWinForms
           cp Application/ResearchDataManagementPlatform/bin/Release/net8.0-windows/win-x64/PenImc_cor3.dll ./PublishWinForms
           cp Application/ResearchDataManagementPlatform/bin/Release/net8.0-windows/win-x64/PresentationNative_cor3.dll ./PublishWinForms
           cp Application/ResearchDataManagementPlatform/bin/Release/net8.0-windows/win-x64/vcruntime140_cor3.dll ./PublishWinForms

diff --git a/Application/ResearchDataManagementPlatform/WindowManagement/ActivateItems.cs b/Application/ResearchDataManagementPlatform/WindowManagement/ActivateItems.cs
@@ -373,9 +373,24 @@ private T Activate<T, T2>(T2 databaseObject, Image<Rgba32> tabImage)
 
         var uiInstance = new T();
         var floatable = WindowFactory.Create(this, RefreshBus, uiInstance, tabImage, databaseObject);
+
+        int? insertIndex = null;
+        var panel = _mainDockPanel.Panes.Where(p => p.IsActiveDocumentPane).SingleOrDefault();
+        if (panel is not null)
+        {
+            var contents = panel.Contents;
+            insertIndex = contents.IndexOf(panel.ActiveContent)+1;
+        }
+
         floatable.Show(_mainDockPanel, DockState.Document);
+
         uiInstance.SetDatabaseObject(this, databaseObject);
 
+        if (insertIndex is not null)
+        {
+            _mainDockPanel.ActivePane.SetContentIndex(floatable, (int)insertIndex);
+        }
+
         SetTabText(floatable, uiInstance);
 
         return uiInstance;
@@ -436,32 +451,32 @@ public DockContent Activate(DeserializeInstruction instruction, IActivateItems a
             case IObjectCollectionControl uiCollection:
                 return Activate(uiCollection, instruction.ObjectCollection);
             case IRDMPSingleDatabaseObjectControl uiInstance:
-            {
-                var databaseObject = instruction.DatabaseObject;
-
-                //the database object is gone? deleted maybe
-                if (databaseObject == null)
-                    return null;
-
-                DockContent floatable = WindowFactory.Create(this, RefreshBus, uiInstance,
-                    CoreIconProvider.GetImage(databaseObject), databaseObject);
-
-                floatable.Show(_mainDockPanel, DockState.Document);
-                try
                 {
-                    uiInstance.SetDatabaseObject(this, (DatabaseEntity)databaseObject);
-                    SetTabText(floatable, uiInstance);
+                    var databaseObject = instruction.DatabaseObject;
+
+                    //the database object is gone? deleted maybe
+                    if (databaseObject == null)
+                        return null;
+
+                    DockContent floatable = WindowFactory.Create(this, RefreshBus, uiInstance,
+                        CoreIconProvider.GetImage(databaseObject), databaseObject);
+
+                    floatable.Show(_mainDockPanel, DockState.Document);
+                    try
+                    {
+                        uiInstance.SetDatabaseObject(this, (DatabaseEntity)databaseObject);
+                        SetTabText(floatable, uiInstance);
+                    }
+                    catch (Exception e)
+                    {
+                        floatable.Close();
+                        throw new Exception(
+                            $"SetDatabaseObject failed on Control of Type '{instruction.UIControlType.Name}', control closed, see inner Exception for details",
+                            e);
+                    }
+
+                    return floatable;
                 }
-                catch (Exception e)
-                {
-                    floatable.Close();
-                    throw new Exception(
-                        $"SetDatabaseObject failed on Control of Type '{instruction.UIControlType.Name}', control closed, see inner Exception for details",
-                        e);
-                }
-
-                return floatable;
-            }
             default:
                 return (DockContent)activator.ShowWindow(c, true);
         }
@@ -833,7 +848,7 @@ public void StartSession(string sessionName, IEnumerable<IMapsDirectlyToDatabase
     public override IPipelineRunner GetPipelineRunner(DialogArgs args, IPipelineUseCase useCase, IPipeline pipeline)
     {
 
-        if(useCase is not null && pipeline is not null)
+        if (useCase is not null && pipeline is not null)
         {
             return new PipelineRunner(useCase, pipeline);
         }
@@ -868,7 +883,7 @@ public override CohortHoldoutLookupRequest GetCohortHoldoutLookupRequest(Externa
             return _mainDockPanel.Invoke(() =>
                 GetCohortHoldoutLookupRequest(externalCohortTable, project, cic));
 
-        var ui = new Rdmp.UI.CohortUI.CreateHoldoutLookup.CreateHoldoutLookupUI(this, externalCohortTable,  cic);
+        var ui = new Rdmp.UI.CohortUI.CreateHoldoutLookup.CreateHoldoutLookupUI(this, externalCohortTable, cic);
 
         if (!string.IsNullOrWhiteSpace(cic.Description))
             ui.CohortDescription = $"{cic.Description} ({Environment.UserName} - {DateTime.Now})";
@@ -878,7 +893,7 @@ public override CohortHoldoutLookupRequest GetCohortHoldoutLookupRequest(Externa
     public override ICatalogue CreateAndConfigureCatalogue(ITableInfo tableInfo,
         ColumnInfo[] extractionIdentifierColumns, string initialDescription, IProject projectSpecific, string folder)
     {
-        if(extractionIdentifierColumns is not null)
+        if (extractionIdentifierColumns is not null)
         {
             return base.CreateAndConfigureCatalogue(tableInfo, extractionIdentifierColumns, initialDescription, projectSpecific, folder);
         }

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,3 @@
-
 # Changelog
 All notable changes to this project will be documented in this file.
 
@@ -10,9 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add Ordering to Filters
 - [MSSQL ONLY] Add ability to perform Regex redactions on data loads and existing catalogues
 
-## [8.3.1] - Unreleased
+## [8.3.1] - 2024-10-16
 
 - Improve Performance of regenerating problems with child providers
+- Update UI Tab opening Logic
+- Add Filter to Left-Hand Tree View
 
 ## [8.3.0] - 2024-09-23
 

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>11.0</LangVersion>
-    <Version>8.2.0</Version>
+    <Version>8.3.0</Version>
 		<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,22 +1,22 @@
 <Project>
   <ItemGroup>
-    <PackageVersion Include="AWSSDK.S3" Version="3.7.403.1" />
-    <PackageVersion Include="AWSSDK.SecurityToken" Version="3.7.400.22" />
-    <PackageVersion Include="AWSSDK.SSO" Version="3.7.400.22" />
-    <PackageVersion Include="AWSSDK.SSOOIDC" Version="3.7.400.22" />
+    <PackageVersion Include="AWSSDK.S3" Version="3.7.405" />
+    <PackageVersion Include="AWSSDK.SecurityToken" Version="3.7.400.36" />
+    <PackageVersion Include="AWSSDK.SSO" Version="3.7.400.36" />
+    <PackageVersion Include="AWSSDK.SSOOIDC" Version="3.7.400.36" />
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
     <PackageVersion Include="Equ" Version="2.3.0" />
     <PackageVersion Include="ExcelNumberFormat" Version="1.1.0" />
     <PackageVersion Include="FluentFTP" Version="51.1.0" />
     <PackageVersion Include="HIC.SynthEHR" Version="2.0.1" />
-    <PackageVersion Include="HIC.FAnsiSql" Version="3.2.6" />
+    <PackageVersion Include="HIC.FAnsiSql" Version="3.2.7" />
     <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="Minio" Version="6.0.3" />
-    <PackageVersion Include="MongoDB.Driver" Version="2.29.0" />
+    <PackageVersion Include="MongoDB.Driver" Version="3.0.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="NPOI" Version="2.7.1" />
     <PackageVersion Include="NLog" Version="5.3.4" />
@@ -25,7 +25,7 @@
     <PackageVersion Include="Spectre.Console" Version="0.49.1" />
     <PackageVersion Include="SSH.NET" Version="2024.1.0" />
     <PackageVersion Include="Terminal.Gui" Version="1.17.1" />
-    <PackageVersion Include="YamlDotNet" Version="16.1.2" />
+    <PackageVersion Include="YamlDotNet" Version="16.1.3" />
     <PackageVersion Include="ConsoleControl" Version="1.3.0" />
     <PackageVersion Include="Autoupdater.NET.Official" Version="1.9.2" />
     <PackageVersion Include="DockPanelSuite.ThemeVS2015" Version="3.1.1" />
@@ -37,7 +37,7 @@
     <PackageVersion Include="System.Resources.Extensions" Version="8.0.0" />
     <PackageVersion Include="VPKSoft.ScintillaLexers.NET" Version="1.1.16" />
     <PackageVersion Include="HIC.System.Windows.Forms.DataVisualization" Version="1.0.1" />
-    <PackageVersion Include="NunitXml.TestLogger" Version="4.0.254" />
+    <PackageVersion Include="NunitXml.TestLogger" Version="4.1.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
     <PackageVersion Include="NUnit.Analyzers" Version="4.3.0" />
     <PackageVersion Include="NSubstitute" Version="5.1.0" />