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

HicServices · Dec 10, 2024 · 1542808 · 1542808
2 parents 0628315 + ac0d33a
commit 1542808
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [8.4.1] - 2024-12-10
+
+- Improve Overview Model Generation Speed
+- Add Remote Table Without DB Creation Attacher
+
 ## [8.4.0] - 2024-12-02
 
 - Add Ordering to Filters

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -11,6 +11,7 @@
     <PackageVersion Include="HIC.SynthEHR" Version="2.0.1" />
     <PackageVersion Include="HIC.FAnsiSql" Version="3.2.7" />
     <PackageVersion Include="LibArchive.Net" Version="0.1.5" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Documentation/CodeTutorials/Packages.md b/Documentation/CodeTutorials/Packages.md
@@ -42,4 +42,5 @@
 | AWSSDK.SecurityToken | [GitHub](https://github.com/aws/aws-sdk-net) | [Apache 2.0](https://opensource.org/licenses/Apache-2.0)  | |
 | AWSSDK.SSO | [GitHub](https://github.com/aws/aws-sdk-net) | [Apache 2.0](https://opensource.org/licenses/Apache-2.0)  | |
 | AWSSDK.SSOOIDC | [GitHub](https://github.com/aws/aws-sdk-net) | [Apache 2.0](https://opensource.org/licenses/Apache-2.0)  | |
+| Microsoft.Bcl.AsyncInterfaces | [Nuget](https://www.nuget.org/packages/microsoft.bcl.asyncinterfaces/) | [MIT](https://opensource.org/licenses/MIT)  | |
 [DBMS]: ./Glossary.md#DBMS
diff --git a/Rdmp.Core/Curation/Data/Overview/OverviewModel.cs b/Rdmp.Core/Curation/Data/Overview/OverviewModel.cs
@@ -69,7 +69,7 @@ public void Regen(string whereClause)
         dt.EndLoadData();
         con.Dispose();
         _numberOfRecords = dt.Rows.Count;
-        _numberOfPeople = hasExtractionIdentifier ? dt.DefaultView.ToTable(true, column.ColumnInfo.GetRuntimeName()).Rows.Count : 0;
+        _numberOfPeople = hasExtractionIdentifier?dt.AsEnumerable().Select(r => r[column.ColumnInfo.GetRuntimeName()]).ToList().Distinct().Count():0;
         GetDataLoads();
         dt.Dispose();
     }

diff --git a/Rdmp.Core/DataLoad/Modules/Attachers/RemoteAttacher.cs b/Rdmp.Core/DataLoad/Modules/Attachers/RemoteAttacher.cs
@@ -24,7 +24,7 @@ namespace Rdmp.Core.DataLoad.Modules.Attachers;
 public class RemoteAttacher : Attacher, IPluginAttacher
 {
 
-    public RemoteAttacher() : base(true) { }
+    public RemoteAttacher(bool requestsExternalDatabaseCreation=true) : base(requestsExternalDatabaseCreation) { }
     [DemandsInitialization("How far back to pull data from")]
     public AttacherHistoricalDurations HistoricalFetchDuration { get; set; }
 

diff --git a/Rdmp.Core/DataLoad/Modules/Attachers/RemoteTableAttacher.cs b/Rdmp.Core/DataLoad/Modules/Attachers/RemoteTableAttacher.cs
@@ -37,7 +37,7 @@ public class RemoteTableAttacher : RemoteAttacher
 {
     private const string FutureLoadMessage = "Cannot load data from the future";
 
-    public RemoteTableAttacher() : base()
+    public RemoteTableAttacher(bool requestsExternalDatabaseCreation=true) : base(requestsExternalDatabaseCreation)
     {
     }
 

diff --git a/Rdmp.Core/DataLoad/Modules/Attachers/RemoteTableWithoutDBCreationAttacher.cs b/Rdmp.Core/DataLoad/Modules/Attachers/RemoteTableWithoutDBCreationAttacher.cs
@@ -0,0 +1,19 @@
+// Copyright (c) The University of Dundee 2024-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.
+// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.
+
+
+namespace Rdmp.Core.DataLoad.Modules.Attachers;
+
+/// <summary>
+/// Data load component for loading tables with records read from a remote database server.  Runs the specified query (which can include a date parameter)
+/// and inserts the results of the query into RAW.
+/// This attcher does not create RAW if it does not exist. Another attacher will be required to generate the initial RAW database
+/// </summary>
+public class RemoteTableWithoutDBCreationAttacher: RemoteTableAttacher
+{
+
+    public RemoteTableWithoutDBCreationAttacher() : base(false) { }
+}
diff --git a/Rdmp.Core/Rdmp.Core.csproj b/Rdmp.Core/Rdmp.Core.csproj
@@ -327,6 +327,7 @@
 		<PackageReference Include="HIC.SynthEHR" />
 		<PackageReference Include="HIC.FAnsiSql" />
 		<PackageReference Include="LibArchive.Net" />
+		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
 		<PackageReference Include="Microsoft.SourceLink.GitHub">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsCatalogue.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsCatalogue.cs
@@ -10,6 +10,7 @@
 using Rdmp.Core.CommandExecution.Combining;
 using Rdmp.Core.Curation.Data;
 using Rdmp.UI.ItemActivation;
+using Rdmp.UI.MainFormUITabs;
 using Rdmp.UI.Overview;
 
 namespace Rdmp.UI.CommandExecution.Proposals;
@@ -24,7 +25,7 @@ public ProposeExecutionWhenTargetIsCatalogue(IActivateItems itemActivator) : bas
 
     public override void Activate(Catalogue c)
     {
-        ItemActivator.Activate<ViewCatalogueOverviewUI, Catalogue>(c);
+        ItemActivator.Activate<CatalogueUI, Catalogue>(c);
     }
 
     public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, Catalogue targetCatalogue,

diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs
@@ -10,6 +10,6 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("8.4.0")]
-[assembly: AssemblyFileVersion("8.4.0")]
-[assembly: AssemblyInformationalVersion("8.4.0")]
+[assembly: AssemblyVersion("8.4.1")]
+[assembly: AssemblyFileVersion("8.4.1")]
+[assembly: AssemblyInformationalVersion("8.4.1")]
diff --git a/rdmp-client.xml b/rdmp-client.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-    <version>8.4.0.0</version>
-    <url>https://github.com/HicServices/RDMP/releases/download/v8.4.0/rdmp-8.4.0-client.zip</url>
+    <version>8.4.1.0</version>
+    <url>https://github.com/HicServices/RDMP/releases/download/v8.4.1/rdmp-8.4.1-client.zip</url>
     <changelog>https://github.com/HicServices/RDMP/blob/main/CHANGELOG.md#7</changelog>
     <mandatory>true</mandatory>
 </item>
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,7 +37,7 @@ public class RemoteTableAttacher : RemoteAttacher @@
     {
         private const string FutureLoadMessage = "Cannot load data from the future";
-        public RemoteTableAttacher() : base()
+        public RemoteTableAttacher(bool requestsExternalDatabaseCreation=true) : base(requestsExternalDatabaseCreation)
         {
         }
@@ Expand Down @@