diff --git a/CHANGELOG.md b/CHANGELOG.md index fb08969ab1..28022ff86e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [8.4.1] - Unreleased +- Improve Overview Model Generation Speed - Add Remote Table Without DB Creation Attacher ## [8.4.0] - 2024-12-02 diff --git a/Directory.Packages.props b/Directory.Packages.props index a615b3a42c..fe5f1a894c 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -11,6 +11,7 @@ + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Documentation/CodeTutorials/Packages.md b/Documentation/CodeTutorials/Packages.md index 48521778e1..f6d9aad516 100644 --- 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 index a058df3cf8..609e8384b0 100644 --- 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/Rdmp.Core.csproj b/Rdmp.Core/Rdmp.Core.csproj index 2de063bb79..44696b6cff 100644 --- a/Rdmp.Core/Rdmp.Core.csproj +++ b/Rdmp.Core/Rdmp.Core.csproj @@ -327,6 +327,7 @@ + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsCatalogue.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsCatalogue.cs index 12a80d2f32..9b2a9a3a6d 100644 --- 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(c); + ItemActivator.Activate(c); } public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, Catalogue targetCatalogue, diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs index a672341220..ec5884a345 100644 --- 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")]