From 9cdcd3051caedfd1931d7c5b9ac69aaf2bef543e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 00:27:54 +0000 Subject: [PATCH 01/17] Bump the aws-sdk group with 4 updates Bumps the aws-sdk group with 4 updates: [AWSSDK.S3](https://github.com/aws/aws-sdk-net), [AWSSDK.SecurityToken](https://github.com/aws/aws-sdk-net), [AWSSDK.SSO](https://github.com/aws/aws-sdk-net) and [AWSSDK.SSOOIDC](https://github.com/aws/aws-sdk-net). Updates `AWSSDK.S3` from 3.7.404.5 to 3.7.404.6 - [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD) - [Commits](https://github.com/aws/aws-sdk-net/commits) Updates `AWSSDK.SecurityToken` from 3.7.400.33 to 3.7.400.34 - [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD) - [Commits](https://github.com/aws/aws-sdk-net/commits) Updates `AWSSDK.SSO` from 3.7.400.33 to 3.7.400.34 - [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD) - [Commits](https://github.com/aws/aws-sdk-net/commits) Updates `AWSSDK.SSOOIDC` from 3.7.400.33 to 3.7.400.34 - [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD) - [Commits](https://github.com/aws/aws-sdk-net/commits) --- updated-dependencies: - dependency-name: AWSSDK.S3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk - dependency-name: AWSSDK.SecurityToken dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk - dependency-name: AWSSDK.SSO dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk - dependency-name: AWSSDK.SSOOIDC dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk ... Signed-off-by: dependabot[bot] --- Directory.Packages.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 2fc0aebf8b..e5bf09180b 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,9 +1,9 @@ - - - - + + + + From 277b287d72fb700fbdaa7eac8850893f15f40920 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 00:17:06 +0000 Subject: [PATCH 02/17] Bump NunitXml.TestLogger from 4.0.254 to 4.1.0 Bumps [NunitXml.TestLogger](https://github.com/spekt/testlogger) from 4.0.254 to 4.1.0. - [Release notes](https://github.com/spekt/testlogger/releases) - [Changelog](https://github.com/spekt/testlogger/blob/master/CHANGELOG.md) - [Commits](https://github.com/spekt/testlogger/compare/v4.0.254...v4.1.0) --- updated-dependencies: - dependency-name: NunitXml.TestLogger dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index e5bf09180b..e442002bec 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -37,7 +37,7 @@ - + From 3284365377b0d683abade3eedc4eef215a616658 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2024 00:08:59 +0000 Subject: [PATCH 03/17] Bump coverallsapp/github-action from 2.3.0 to 2.3.1 Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.3.0 to 2.3.1. - [Release notes](https://github.com/coverallsapp/github-action/releases) - [Commits](https://github.com/coverallsapp/github-action/compare/v2.3.0...v2.3.1) --- updated-dependencies: - dependency-name: coverallsapp/github-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index befd64bd40..cadccacafc 100644 --- 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.1 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.1 with: github-token: ${{ secrets.github_token }} files: ./fs-ui.lcov ./fs-core.lcov From bfeba16d19de00088c56556b5b8bccb16eb2988e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 00:37:11 +0000 Subject: [PATCH 04/17] Bump coverallsapp/github-action from 2.3.1 to 2.3.2 Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.3.1 to 2.3.2. - [Release notes](https://github.com/coverallsapp/github-action/releases) - [Commits](https://github.com/coverallsapp/github-action/compare/v2.3.1...v2.3.2) --- updated-dependencies: - dependency-name: coverallsapp/github-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cadccacafc..f2a69a187b 100644 --- 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.1 + - uses: coverallsapp/github-action@v2.3.2 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.1 + - uses: coverallsapp/github-action@v2.3.2 with: github-token: ${{ secrets.github_token }} files: ./fs-ui.lcov ./fs-core.lcov From 0e91a2bf91863706b706e7e5b22c7eb5e8017107 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 00:12:20 +0000 Subject: [PATCH 05/17] Bump the aws-sdk group with 4 updates Bumps the aws-sdk group with 4 updates: [AWSSDK.S3](https://github.com/aws/aws-sdk-net), [AWSSDK.SecurityToken](https://github.com/aws/aws-sdk-net), [AWSSDK.SSO](https://github.com/aws/aws-sdk-net) and [AWSSDK.SSOOIDC](https://github.com/aws/aws-sdk-net). Updates `AWSSDK.S3` from 3.7.404.6 to 3.7.404.7 - [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD) - [Commits](https://github.com/aws/aws-sdk-net/commits) Updates `AWSSDK.SecurityToken` from 3.7.400.34 to 3.7.400.35 - [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD) - [Commits](https://github.com/aws/aws-sdk-net/commits) Updates `AWSSDK.SSO` from 3.7.400.34 to 3.7.400.35 - [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD) - [Commits](https://github.com/aws/aws-sdk-net/commits) Updates `AWSSDK.SSOOIDC` from 3.7.400.34 to 3.7.400.35 - [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD) - [Commits](https://github.com/aws/aws-sdk-net/commits) --- updated-dependencies: - dependency-name: AWSSDK.S3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk - dependency-name: AWSSDK.SecurityToken dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk - dependency-name: AWSSDK.SSO dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk - dependency-name: AWSSDK.SSOOIDC dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk ... Signed-off-by: dependabot[bot] --- Directory.Packages.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index e442002bec..1eeb88bed9 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,9 +1,9 @@ - - - - + + + + From d7084f96778f1b0b78ef3f902857e4e6071475e6 Mon Sep 17 00:00:00 2001 From: James Friel Date: Wed, 16 Oct 2024 08:49:33 +0100 Subject: [PATCH 06/17] prep release (#2029) --- CHANGELOG.md | 2 +- Directory.Packages.props | 2 +- SharedAssemblyInfo.cs | 6 +++--- rdmp-client.xml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9c5930f28..628f46cf3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ 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.3.1] - Unreleased +## [8.3.1] - 2024-10-16 - Improve Performance of regenerating problems with child providers - Update UI Tab opening Logic diff --git a/Directory.Packages.props b/Directory.Packages.props index 1eeb88bed9..09e2e23aa9 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -16,7 +16,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs index 559a541653..142b75ae4f 100644 --- a/SharedAssemblyInfo.cs +++ b/SharedAssemblyInfo.cs @@ -10,6 +10,6 @@ [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("8.3.0")] -[assembly: AssemblyFileVersion("8.3.0")] -[assembly: AssemblyInformationalVersion("8.3.0")] \ No newline at end of file +[assembly: AssemblyVersion("8.3.1")] +[assembly: AssemblyFileVersion("8.3.1")] +[assembly: AssemblyInformationalVersion("8.3.1")] \ No newline at end of file diff --git a/rdmp-client.xml b/rdmp-client.xml index 0132d9c97a..c4285dc766 100644 --- a/rdmp-client.xml +++ b/rdmp-client.xml @@ -1,7 +1,7 @@ - 8.2.3.0 - https://github.com/HicServices/RDMP/releases/download/v8.3.0/rdmp-8.3.0-client.zip + 8.3.1.0 + https://github.com/HicServices/RDMP/releases/download/v8.3.1/rdmp-8.3.1-client.zip https://github.com/HicServices/RDMP/blob/main/CHANGELOG.md#7 true From 7448d3262786f0f3cd438ac73775e007238aeb40 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 00:18:19 +0000 Subject: [PATCH 07/17] Bump coverallsapp/github-action from 2.3.2 to 2.3.3 Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.3.2 to 2.3.3. - [Release notes](https://github.com/coverallsapp/github-action/releases) - [Commits](https://github.com/coverallsapp/github-action/compare/v2.3.2...v2.3.3) --- updated-dependencies: - dependency-name: coverallsapp/github-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f2a69a187b..e4fa21309f 100644 --- 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.2 + - 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.2 + - uses: coverallsapp/github-action@v2.3.3 with: github-token: ${{ secrets.github_token }} files: ./fs-ui.lcov ./fs-core.lcov From 666b06d74c1056e0c69da549a685be6eba00925d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 13:23:55 +0000 Subject: [PATCH 08/17] Bump the aws-sdk group with 4 updates Bumps the aws-sdk group with 4 updates: [AWSSDK.S3](https://github.com/aws/aws-sdk-net), [AWSSDK.SecurityToken](https://github.com/aws/aws-sdk-net), [AWSSDK.SSO](https://github.com/aws/aws-sdk-net) and [AWSSDK.SSOOIDC](https://github.com/aws/aws-sdk-net). Updates `AWSSDK.S3` from 3.7.404.7 to 3.7.405 - [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD) - [Commits](https://github.com/aws/aws-sdk-net/commits/3.7.405.0) Updates `AWSSDK.SecurityToken` from 3.7.400.35 to 3.7.400.36 - [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD) - [Commits](https://github.com/aws/aws-sdk-net/commits) Updates `AWSSDK.SSO` from 3.7.400.35 to 3.7.400.36 - [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD) - [Commits](https://github.com/aws/aws-sdk-net/commits) Updates `AWSSDK.SSOOIDC` from 3.7.400.35 to 3.7.400.36 - [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD) - [Commits](https://github.com/aws/aws-sdk-net/commits) --- updated-dependencies: - dependency-name: AWSSDK.S3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk - dependency-name: AWSSDK.SecurityToken dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk - dependency-name: AWSSDK.SSO dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk - dependency-name: AWSSDK.SSOOIDC dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk ... Signed-off-by: dependabot[bot] --- Directory.Packages.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 09e2e23aa9..1d0c5270e8 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,9 +1,9 @@ - - - - + + + + From b26ebaf4aaa57054c8b42c53bca68bb1c94e30a7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 00:09:18 +0000 Subject: [PATCH 09/17] Bump MongoDB.Driver from 2.30.0 to 3.0.0 Bumps [MongoDB.Driver](https://github.com/mongodb/mongo-csharp-driver) from 2.30.0 to 3.0.0. - [Release notes](https://github.com/mongodb/mongo-csharp-driver/releases) - [Commits](https://github.com/mongodb/mongo-csharp-driver/compare/v2.30.0...v3.0.0) --- updated-dependencies: - dependency-name: MongoDB.Driver dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 09e2e23aa9..ac5961da72 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -16,7 +16,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + From a9996dd48bf0f919cab140ba72c561c5db033b0e Mon Sep 17 00:00:00 2001 From: James A Sutherland <> Date: Thu, 17 Oct 2024 07:24:55 -0500 Subject: [PATCH 10/17] Mongo finally dropped the libmongocrypt native lib in v3, one less file to add... --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e4fa21309f..7dc0d81696 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 From 83cf6b2fc24ea732c5c3353fd135ea08c475acc2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 13:23:03 +0000 Subject: [PATCH 11/17] Bump HIC.FAnsiSql from 3.2.6 to 3.2.7 Bumps [HIC.FAnsiSql](https://github.com/HicServices/FAnsiSql) from 3.2.6 to 3.2.7. - [Release notes](https://github.com/HicServices/FAnsiSql/releases) - [Changelog](https://github.com/HicServices/FAnsiSql/blob/main/CHANGELOG.md) - [Commits](https://github.com/HicServices/FAnsiSql/compare/v3.2.6...v3.2.7) --- updated-dependencies: - dependency-name: HIC.FAnsiSql dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index ac5961da72..a71fa73de4 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -9,7 +9,7 @@ - + all From 0d808a55ffbc8cccc30b6082857b0372d21550df Mon Sep 17 00:00:00 2001 From: James A Sutherland Date: Thu, 17 Oct 2024 08:55:09 -0500 Subject: [PATCH 12/17] TUI syntax cleanup (#1951) * Console UI syntax cleanup * Update ConsoleGuiCohortIdentificationConfigurationUI.cs Update API --------- Co-authored-by: James Friel --- ...eGuiCohortIdentificationConfigurationUI.cs | 40 +++++++++-------- .../Gui/ConsoleGuiContextMenuFactory.cs | 10 ++--- .../rdmp/CommandLine/Gui/ConsoleMainWindow.cs | 44 ++++++++----------- 3 files changed, 44 insertions(+), 50 deletions(-) diff --git a/Tools/rdmp/CommandLine/Gui/ConsoleGuiCohortIdentificationConfigurationUI.cs b/Tools/rdmp/CommandLine/Gui/ConsoleGuiCohortIdentificationConfigurationUI.cs index d25ef2f160..1361e18d0b 100644 --- a/Tools/rdmp/CommandLine/Gui/ConsoleGuiCohortIdentificationConfigurationUI.cs +++ b/Tools/rdmp/CommandLine/Gui/ConsoleGuiCohortIdentificationConfigurationUI.cs @@ -140,38 +140,40 @@ private void Tableview1_CellActivated(TableView.CellActivatedEventArgs obj) var o = RowObjects[obj.Row]; if (o == null) return; + var col = tableview1.Table.Columns[obj.Col]; - if (col.ColumnName.Equals("Name")) + switch (col.ColumnName) { - var factory = new ConsoleGuiContextMenuFactory(_activator); - var menu = factory.Create(Array.Empty(), o); - - if (menu != null) + case "Name": { var p = tableview1.CellToScreen(obj.Col, obj.Row); if (p == null) return; - menu.Position = p.Value; - _contextMenuShowing = true; - menu.Show(); - menu.MenuBar.MenuAllClosed += () => _contextMenuShowing = false; + var factory = new ConsoleGuiContextMenuFactory(_activator); + var menu = factory.Create(p.Value.X, p.Value.Y, Array.Empty(), o); + if (menu != null) + { + menu.Position = p.Value; + _contextMenuShowing = true; + menu.Show(); + menu.MenuBar.MenuAllClosed += () => _contextMenuShowing = false; + } + + break; } - } - - if (col.ColumnName.Equals("Working")) - { - var key = Common.GetKey(o); - if (key?.CrashMessage != null) + case "Working": { - _activator.ShowException("Task Crashed", key.CrashMessage); - return; + var key = Common.GetKey(o); + if (key?.CrashMessage != null) _activator.ShowException("Task Crashed", key.CrashMessage); + break; } + case "Execute": + Common.ExecuteOrCancel(o, int.MaxValue); + break; } - - if (col.ColumnName.Equals("Execute")) Common.ExecuteOrCancel(o, Common.Timeout); } private bool IsValidSelection(int col, int row) diff --git a/Tools/rdmp/CommandLine/Gui/ConsoleGuiContextMenuFactory.cs b/Tools/rdmp/CommandLine/Gui/ConsoleGuiContextMenuFactory.cs index b232ba777c..a08111813a 100644 --- a/Tools/rdmp/CommandLine/Gui/ConsoleGuiContextMenuFactory.cs +++ b/Tools/rdmp/CommandLine/Gui/ConsoleGuiContextMenuFactory.cs @@ -28,7 +28,7 @@ public ConsoleGuiContextMenuFactory(IBasicActivateItems activator) this.activator = activator; } - public ContextMenu Create(object[] many, object single) + public ContextMenu Create(int x,int y,object[] many, object single) { var commands = GetCommands(activator, many, single).ToArray(); @@ -65,18 +65,16 @@ public ContextMenu Create(object[] many, object single) items.Add(bar); } - // we can do nothing if theres no menu items + // we can do nothing if there are no menu items if (items.Count == 0) return null; var withSpacers = AddSpacers(items, order); - var menu = new ContextMenu + return new ContextMenu(x, y, new MenuBarItem(withSpacers)) { - MenuItems = new MenuBarItem(withSpacers) + UseSubMenusSingleFrame = true }; - - return menu; } private static MenuItem[] AddSpacers(List items, Dictionary order) diff --git a/Tools/rdmp/CommandLine/Gui/ConsoleMainWindow.cs b/Tools/rdmp/CommandLine/Gui/ConsoleMainWindow.cs index 64f7e53e3b..ec7fe1d2f3 100644 --- a/Tools/rdmp/CommandLine/Gui/ConsoleMainWindow.cs +++ b/Tools/rdmp/CommandLine/Gui/ConsoleMainWindow.cs @@ -17,6 +17,7 @@ using Rdmp.Core.MapsDirectlyToDatabaseTable; using Rdmp.Core.Providers; using Rdmp.Core.Providers.Nodes; +using Rdmp.Core.ReusableLibraryCode.Annotations; using Rdmp.Core.ReusableLibraryCode.Settings; using Terminal.Gui; using Terminal.Gui.Trees; @@ -27,7 +28,7 @@ internal class ConsoleMainWindow { private Window _win; private TreeView _treeView; - private IBasicActivateItems _activator; + private readonly IBasicActivateItems _activator; /// /// The last passed to this UI. @@ -167,7 +168,7 @@ internal void SetUp(Toplevel top) var statusBar = new StatusBar(new StatusItem[] { new(Key.Q | Key.CtrlMask, "~^Q~ Quit", Quit), - new(Key.R | Key.CtrlMask, "~^R~ Run", action: Run), + new(Key.R | Key.CtrlMask, "~^R~ Run", Run), new(Key.F | Key.CtrlMask, "~^F~ Find", Find), new(Key.N | Key.CtrlMask, "~^N~ New", New), new(Key.F5, "~F5~ Refresh", Publish) @@ -252,21 +253,18 @@ private void _treeView_ObjectActivated(ObjectActivatedEventArgs obj) private string AspectGetter(object model) { - if (model is IContainer container) return $"{container} ({container.Operation})"; - - if (model is CohortAggregateContainer setContainer) return $"{setContainer} ({setContainer.Operation})"; - - if (model is ExtractionInformation ei) return $"{ei} ({ei.ExtractionCategory})"; - - if (model is CatalogueItemsNode cin) return $"{cin} ({cin.CatalogueItems.Length})"; - - if (model is TableInfoServerNode server) return $"{server.ServerName} ({server.DatabaseType})"; - - if (model is IDisableable d) return d.IsDisabled ? $"{d} (Disabled)" : d.ToString(); - - return model is IArgument arg - ? $"{arg} ({(string.IsNullOrWhiteSpace(arg.Value) ? "Null" : arg.Value)})" - : model?.ToString() ?? "Null Object"; + return model switch + { + IContainer container => $"{container} ({container.Operation})", + CohortAggregateContainer setContainer => $"{setContainer} ({setContainer.Operation})", + ExtractionInformation ei => $"{ei} ({ei.ExtractionCategory})", + CatalogueItemsNode cin => $"{cin} ({cin.CatalogueItems.Length})", + TableInfoServerNode server => $"{server.ServerName} ({server.DatabaseType})", + IDisableable d => d.IsDisabled ? $"{d} (Disabled)" : d.ToString(), + _ => model is IArgument arg + ? $"{arg} ({(string.IsNullOrWhiteSpace(arg.Value) ? "Null" : arg.Value)})" + : model?.ToString() ?? "Null Object" + }; } private void Publish() @@ -337,7 +335,7 @@ private void Show(object selected) _treeView.SetNeedsDisplay(); } - private void _treeView_SelectionChanged(object sender, SelectionChangedEventArgs e) + private void _treeView_SelectionChanged(object sender, [NotNull] SelectionChangedEventArgs e) { if (e.NewValue != null) _treeView.RefreshObject(e.NewValue); @@ -346,13 +344,9 @@ private void _treeView_SelectionChanged(object sender, SelectionChangedEventArgs private void Menu() { var factory = new ConsoleGuiContextMenuFactory(_activator); - var menu = factory.Create(_treeView.GetAllSelectedObjects().ToArray(), _treeView.SelectedObject); - - if (menu == null) - return; - - menu.Position = DateTime.Now.Subtract(_lastMouseMove).TotalSeconds < 1 ? _lastMousePos : new Point(10, 5); - menu.Show(); + var position = DateTime.Now.Subtract(_lastMouseMove).TotalSeconds < 1 ? _lastMousePos : new Point(10, 5); + var menu = factory.Create(position.X,position.Y,_treeView.GetAllSelectedObjects().ToArray(), _treeView.SelectedObject); + menu?.Show(); } From 05d98369ae64a46aa626f20923410688945dd9fe Mon Sep 17 00:00:00 2001 From: Ruairidh MacLeod Date: Fri, 18 Oct 2024 15:21:39 +0100 Subject: [PATCH 13/17] ensure LogManager commands are quoted for postgres (#2031) * ensure LogManager commands are quoted for postgres * use sh.False --- Rdmp.Core/Logging/LogManager.cs | 34 ++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/Rdmp.Core/Logging/LogManager.cs b/Rdmp.Core/Logging/LogManager.cs index 7376316c9b..f17ce88f48 100644 --- a/Rdmp.Core/Logging/LogManager.cs +++ b/Rdmp.Core/Logging/LogManager.cs @@ -63,7 +63,8 @@ public string[] ListDataTasks(bool hideTests = false) using var con = Server.GetConnection(); con.Open(); - using var cmd = Server.GetCommand("SELECT * FROM DataLoadTask", con); + var sh = Server.GetQuerySyntaxHelper(); + using var cmd = Server.GetCommand($"SELECT * FROM {sh.EnsureWrapped("DataLoadTask")}", con); using var r = cmd.ExecuteReader(); while (r.Read()) if (!hideTests || !(bool)r["isTest"]) @@ -113,7 +114,8 @@ public string[] ListDataSets() using var con = Server.GetConnection(); con.Open(); - using var cmd = Server.GetCommand("SELECT * FROM DataSet", con); + var sh = Server.GetQuerySyntaxHelper(); + using var cmd = Server.GetCommand($"SELECT * FROM {sh.EnsureWrapped("DataSet")}", con); using var r = cmd.ExecuteReader(); while (r.Read()) tasks.Add(r["dataSetID"].ToString()); @@ -133,7 +135,8 @@ public IEnumerable GetArchivalDataLoadInfos(string dataTas int? specificDataLoadRunIDOnly = null, int? topX = null) { var db = Server.GetCurrentDatabase(); - var run = db.ExpectTable("DataLoadRun"); + var sh = Server.GetQuerySyntaxHelper(); + var run = db.ExpectTable(sh.EnsureWrapped("DataLoadRun")); using var con = Server.GetConnection(); con.Open(); @@ -144,11 +147,11 @@ public IEnumerable GetArchivalDataLoadInfos(string dataTas string where; if (specificDataLoadRunIDOnly != null) { - where = $"WHERE ID={specificDataLoadRunIDOnly.Value}"; + where = $"WHERE {sh.EnsureWrapped("ID")}={specificDataLoadRunIDOnly.Value}"; } else { - where = "WHERE dataLoadTaskID = @dataTaskId"; + where = $"WHERE {sh.EnsureWrapped("dataLoadTaskID")} = @dataTaskId"; var p = cmd.CreateParameter(); p.ParameterName = "@dataTaskId"; p.Value = dataTaskId; @@ -158,13 +161,13 @@ public IEnumerable GetArchivalDataLoadInfos(string dataTas TopXResponse top = null; if (topX.HasValue) - top = Server.GetQuerySyntaxHelper().HowDoWeAchieveTopX(topX.Value); + top = sh.HowDoWeAchieveTopX(topX.Value); var sb = new StringBuilder("SELECT "); if (top?.Location == QueryComponent.SELECT) sb.AppendLine(top.SQL); - sb.AppendLine($" * FROM {run.GetFullyQualifiedName()} {where} ORDER BY ID desc"); + sb.AppendLine($" * FROM {run.GetFullyQualifiedName()} {where} ORDER BY {sh.EnsureWrapped("ID")} desc"); if (top?.Location == QueryComponent.Postfix) sb.AppendLine(top.SQL); @@ -204,7 +207,8 @@ public IEnumerable GetArchivalDataLoadInfos(string dataTas private static int GetDataTaskId(string dataTask, DiscoveredServer server, DbConnection con) { - using var cmd = server.GetCommand("SELECT ID FROM DataLoadTask WHERE name = @name", con); + var sh = server.GetQuerySyntaxHelper(); + using var cmd = server.GetCommand($"SELECT {sh.EnsureWrapped("ID")} FROM {sh.EnsureWrapped("DataLoadTask")} WHERE name = @name", con); var p = cmd.CreateParameter(); p.ParameterName = "@name"; p.Value = dataTask; @@ -236,9 +240,10 @@ public IDataLoadInfo CreateDataLoadInfo(string dataLoadTaskName, string packageN public void CreateNewLoggingTask(int id, string dataSetID) { using var conn = Server.GetConnection(); + var sh = Server.GetQuerySyntaxHelper(); conn.Open(); var sql = - $"INSERT INTO DataLoadTask (ID, description, name, createTime, userAccount, statusID, isTest, dataSetID) VALUES ({id}, @dataSetID, @dataSetID, @date, @username, 1, 0, @dataSetID)"; + $"INSERT INTO {sh.EnsureWrapped("DataLoadTask")} ({sh.EnsureWrapped("ID")}, description, name, {sh.EnsureWrapped("createTime")}, {sh.EnsureWrapped("userAccount")}, {sh.EnsureWrapped("statusID")}, {sh.EnsureWrapped("isTest")}, {sh.EnsureWrapped("dataSetID")}) VALUES ({id}, @dataSetID, @dataSetID, @date, @username, 1, {sh.False}, @dataSetID)"; using var cmd = Server.GetCommand(sql, conn); Server.AddParameterWithValueToCommand("@date", cmd, DateTime.Now); @@ -251,9 +256,10 @@ public void CreateNewLoggingTask(int id, string dataSetID) private void CreateNewDataSet(string datasetName) { using var conn = Server.GetConnection(); + var sh = Server.GetQuerySyntaxHelper(); conn.Open(); { - const string sql = "INSERT INTO DataSet (dataSetID,name) VALUES (@datasetName,@datasetName)"; + var sql = $"INSERT INTO {sh.EnsureWrapped("DataSet")} ({sh.EnsureWrapped("dataSetID")},name) VALUES (@datasetName,@datasetName)"; using var cmd = Server.GetCommand(sql, conn); Server.AddParameterWithValueToCommand("@datasetName", cmd, datasetName.Substring(Math.Max(0, datasetName.Length - 150))); @@ -274,8 +280,9 @@ public void CreateNewLoggingTaskIfNotExists(string toCreate) private int GetMaxTaskID() { using var conn = Server.GetConnection(); + var sh = Server.GetQuerySyntaxHelper(); conn.Open(); - const string sql = "SELECT MAX(ID) FROM DataLoadTask"; + var sql = $"SELECT MAX({sh.EnsureWrapped("ID")}) FROM {sh.EnsureWrapped("DataLoadTask")}"; using var cmd = Server.GetCommand(sql, conn); var result = cmd.ExecuteScalar(); @@ -285,9 +292,10 @@ private int GetMaxTaskID() public void ResolveFatalErrors(int[] ids, DataLoadInfo.FatalErrorStates newState, string newExplanation) { using var conn = Server.GetConnection(); + var sh = Server.GetQuerySyntaxHelper(); conn.Open(); var sql = - $"UPDATE FatalError SET explanation =@explanation, statusID=@statusID where ID in ({string.Join(",", ids)})"; + $"UPDATE {sh.EnsureWrapped("FatalError")} SET explanation =@explanation, {sh.EnsureWrapped("statusID")}=@statusID where {sh.EnsureWrapped("ID")} in ({string.Join(",", ids)})"; using var cmd = Server.GetCommand(sql, conn); Server.AddParameterWithValueToCommand("@explanation", cmd, newExplanation); @@ -298,4 +306,4 @@ public void ResolveFatalErrors(int[] ids, DataLoadInfo.FatalErrorStates newState throw new Exception( $"Query {sql} resulted in {affectedRows}, we were expecting there to be {ids.Length} updates because that is how many FatalError IDs that were passed to this method"); } -} \ No newline at end of file +} From 637e86636063993b0156997bee867d2a7f5ed9ba Mon Sep 17 00:00:00 2001 From: James Friel Date: Tue, 22 Oct 2024 07:37:31 +0100 Subject: [PATCH 14/17] update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 628f46cf3b..c949ffc2cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ 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.3.1] - 2024-10-16 +## [8.3.1] - 2024-10-22 - Improve Performance of regenerating problems with child providers - Update UI Tab opening Logic From 78b0a41a7c834c1e422f5bfb7d668aa5fcf63e0f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 00:38:46 +0000 Subject: [PATCH 15/17] Bump the aws-sdk group with 4 updates Bumps the aws-sdk group with 4 updates: [AWSSDK.S3](https://github.com/aws/aws-sdk-net), [AWSSDK.SecurityToken](https://github.com/aws/aws-sdk-net), [AWSSDK.SSO](https://github.com/aws/aws-sdk-net) and [AWSSDK.SSOOIDC](https://github.com/aws/aws-sdk-net). Updates `AWSSDK.S3` from 3.7.405 to 3.7.405.1 - [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD) - [Commits](https://github.com/aws/aws-sdk-net/commits) Updates `AWSSDK.SecurityToken` from 3.7.400.36 to 3.7.400.37 - [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD) - [Commits](https://github.com/aws/aws-sdk-net/commits) Updates `AWSSDK.SSO` from 3.7.400.36 to 3.7.400.37 - [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD) - [Commits](https://github.com/aws/aws-sdk-net/commits) Updates `AWSSDK.SSOOIDC` from 3.7.400.36 to 3.7.400.37 - [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD) - [Commits](https://github.com/aws/aws-sdk-net/commits) --- updated-dependencies: - dependency-name: AWSSDK.S3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk - dependency-name: AWSSDK.SecurityToken dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk - dependency-name: AWSSDK.SSO dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk - dependency-name: AWSSDK.SSOOIDC dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk ... Signed-off-by: dependabot[bot] --- Directory.Packages.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index d85d9441bb..d6380fcebc 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,9 +1,9 @@ - - - - + + + + From 5deda7a1bf44bde8db7e013b582cf9e34b3c86c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 24 Oct 2024 00:46:58 +0000 Subject: [PATCH 16/17] Bump WeCantSpell.Hunspell from 5.0.0 to 5.1.0 Bumps [WeCantSpell.Hunspell](https://github.com/aarondandy/WeCantSpell.Hunspell) from 5.0.0 to 5.1.0. - [Release notes](https://github.com/aarondandy/WeCantSpell.Hunspell/releases) - [Changelog](https://github.com/aarondandy/WeCantSpell.Hunspell/blob/main/changelog.md) - [Commits](https://github.com/aarondandy/WeCantSpell.Hunspell/compare/5.0.0...5.1.0) --- updated-dependencies: - dependency-name: WeCantSpell.Hunspell dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index d6380fcebc..3502812f02 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -30,7 +30,7 @@ - + From 4787dce9a97be538ddcc4d0ca5e566f5b8259afb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 24 Oct 2024 00:46:31 +0000 Subject: [PATCH 17/17] Bump the aws-sdk group with 4 updates Bumps the aws-sdk group with 4 updates: [AWSSDK.S3](https://github.com/aws/aws-sdk-net), [AWSSDK.SecurityToken](https://github.com/aws/aws-sdk-net), [AWSSDK.SSO](https://github.com/aws/aws-sdk-net) and [AWSSDK.SSOOIDC](https://github.com/aws/aws-sdk-net). Updates `AWSSDK.S3` from 3.7.405.1 to 3.7.405.2 - [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD) - [Commits](https://github.com/aws/aws-sdk-net/commits) Updates `AWSSDK.SecurityToken` from 3.7.400.37 to 3.7.400.38 - [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD) - [Commits](https://github.com/aws/aws-sdk-net/commits) Updates `AWSSDK.SSO` from 3.7.400.37 to 3.7.400.38 - [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD) - [Commits](https://github.com/aws/aws-sdk-net/commits) Updates `AWSSDK.SSOOIDC` from 3.7.400.37 to 3.7.400.38 - [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD) - [Commits](https://github.com/aws/aws-sdk-net/commits) --- updated-dependencies: - dependency-name: AWSSDK.S3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk - dependency-name: AWSSDK.SecurityToken dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk - dependency-name: AWSSDK.SSO dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk - dependency-name: AWSSDK.SSOOIDC dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk ... Signed-off-by: dependabot[bot] --- Directory.Packages.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 3502812f02..6f15da9dfa 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,9 +1,9 @@ - - - - + + + +