From 2f5bfe65a1445fac20dec29916bd3502ba5274f9 Mon Sep 17 00:00:00 2001 From: Phil-NHS Date: Mon, 8 Sep 2025 16:21:58 +0100 Subject: [PATCH 1/5] TD-5925 Updating packages --- .gitignore | 5 +++++ .../LearningHub.Nhs.AdminUI.csproj | 2 +- Directory.Packages.props | 4 ++-- LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj | 2 +- .../Views/User/AdditionalSecurity.cshtml | 9 ++++++++- .../LearningHub.Nhs.OpenApi.Models.csproj | 2 +- .../LearningHub.Nhs.OpenApi.Services.Interface.csproj | 4 ++-- .../LearningHub.Nhs.OpenApi.Services.csproj | 4 ++-- .../LearningHub.Nhs.ReportApi.Services.Interface.csproj | 2 +- .../LearningHub.Nhs.ReportApi.Services.UnitTests.csproj | 2 +- .../LearningHub.Nhs.ReportApi.Services.csproj | 2 +- .../LearningHub.Nhs.ReportApi.Shared.csproj | 2 +- .../LearningHub.Nhs.ReportApi.csproj | 2 +- WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj | 4 ++-- .../LearningHub.Nhs.Api.Shared.csproj | 4 ++-- .../LearningHub.Nhs.Api.UnitTests.csproj | 4 ++-- .../LearningHub.Nhs.Repository.Interface.csproj | 4 ++-- .../LearningHub.Nhs.Repository.csproj | 4 ++-- .../LearningHub.Nhs.Services.Interface.csproj | 4 ++-- .../LearningHub.Nhs.Services.UnitTests.csproj | 4 ++-- .../LearningHub.Nhs.Services.csproj | 4 ++-- .../LearningHub.Nhs.Migration.ConsoleApp.csproj | 4 ++-- .../LearningHub.Nhs.Migration.Interface.csproj | 4 ++-- .../LearningHub.Nhs.Migration.Models.csproj | 4 ++-- .../LearningHub.Nhs.Migration.Staging.Repository.csproj | 4 ++-- .../LearningHub.Nhs.Migration.UnitTests.csproj | 4 ++-- .../LearningHub.Nhs.Migration.csproj | 4 ++-- 27 files changed, 55 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index 8cc7d8bbe..afc108f1c 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,8 @@ obj /AdminUI/LearningHub.Nhs.AdminUI/web.config /LearningHub.Nhs.WebUI/web.config /WebAPI/LearningHub.Nhs.API/web.config +/.github/workflows/test.yml +/LearningHub.Nhs.WebUI.BlazorClient/LearningHub.Nhs.WebUI.BlazorClient.csproj.user +/LearningHub.Nhs.WebUI.BlazorClient/Properties/launchSettings.json +/LearningHub.Nhs.WebUI.slnLaunch.user +/nuget.config diff --git a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj index a0de54f8f..7fb565761 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj +++ b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj @@ -89,7 +89,7 @@ - + diff --git a/Directory.Packages.props b/Directory.Packages.props index 59413f8ea..d12e65528 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -8,10 +8,10 @@ - + - + diff --git a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj index dc2cf661d..5a74a0695 100644 --- a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj +++ b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj @@ -113,7 +113,7 @@ - + diff --git a/LearningHub.Nhs.WebUI/Views/User/AdditionalSecurity.cshtml b/LearningHub.Nhs.WebUI/Views/User/AdditionalSecurity.cshtml index 190d4c8fa..6b097c918 100644 --- a/LearningHub.Nhs.WebUI/Views/User/AdditionalSecurity.cshtml +++ b/LearningHub.Nhs.WebUI/Views/User/AdditionalSecurity.cshtml @@ -29,7 +29,14 @@
- + @* qqqq original *@ +
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj index 727560e3f..f72cddc16 100644 --- a/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj +++ b/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj @@ -16,7 +16,7 @@ - + diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj index aa019e18c..efd745099 100644 --- a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj +++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj @@ -16,8 +16,8 @@ - - + + diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj index 9002a0237..6b0d841f9 100644 --- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj +++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj @@ -29,8 +29,8 @@ - - + + diff --git a/ReportAPI/LearningHub.Nhs.ReportApi.Services.Interface/LearningHub.Nhs.ReportApi.Services.Interface.csproj b/ReportAPI/LearningHub.Nhs.ReportApi.Services.Interface/LearningHub.Nhs.ReportApi.Services.Interface.csproj index 227e30bf8..9d47917df 100644 --- a/ReportAPI/LearningHub.Nhs.ReportApi.Services.Interface/LearningHub.Nhs.ReportApi.Services.Interface.csproj +++ b/ReportAPI/LearningHub.Nhs.ReportApi.Services.Interface/LearningHub.Nhs.ReportApi.Services.Interface.csproj @@ -16,7 +16,7 @@ - + diff --git a/ReportAPI/LearningHub.Nhs.ReportApi.Services.UnitTests/LearningHub.Nhs.ReportApi.Services.UnitTests.csproj b/ReportAPI/LearningHub.Nhs.ReportApi.Services.UnitTests/LearningHub.Nhs.ReportApi.Services.UnitTests.csproj index 3af90e39a..d50f43411 100644 --- a/ReportAPI/LearningHub.Nhs.ReportApi.Services.UnitTests/LearningHub.Nhs.ReportApi.Services.UnitTests.csproj +++ b/ReportAPI/LearningHub.Nhs.ReportApi.Services.UnitTests/LearningHub.Nhs.ReportApi.Services.UnitTests.csproj @@ -18,7 +18,7 @@ - + diff --git a/ReportAPI/LearningHub.Nhs.ReportApi.Services/LearningHub.Nhs.ReportApi.Services.csproj b/ReportAPI/LearningHub.Nhs.ReportApi.Services/LearningHub.Nhs.ReportApi.Services.csproj index c6d03d856..26d4cbd96 100644 --- a/ReportAPI/LearningHub.Nhs.ReportApi.Services/LearningHub.Nhs.ReportApi.Services.csproj +++ b/ReportAPI/LearningHub.Nhs.ReportApi.Services/LearningHub.Nhs.ReportApi.Services.csproj @@ -19,7 +19,7 @@ - + diff --git a/ReportAPI/LearningHub.Nhs.ReportApi.Shared/LearningHub.Nhs.ReportApi.Shared.csproj b/ReportAPI/LearningHub.Nhs.ReportApi.Shared/LearningHub.Nhs.ReportApi.Shared.csproj index 78f41769e..0c7b94d1e 100644 --- a/ReportAPI/LearningHub.Nhs.ReportApi.Shared/LearningHub.Nhs.ReportApi.Shared.csproj +++ b/ReportAPI/LearningHub.Nhs.ReportApi.Shared/LearningHub.Nhs.ReportApi.Shared.csproj @@ -17,7 +17,7 @@ - + diff --git a/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj b/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj index f87bb47d5..46f1e74f2 100644 --- a/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj +++ b/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj @@ -20,7 +20,7 @@ - + diff --git a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj index 3b09a079f..4b35a3a83 100644 --- a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj +++ b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj @@ -26,10 +26,10 @@ - + - + diff --git a/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj b/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj index 1963fd724..e1d378a8f 100644 --- a/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj +++ b/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj @@ -7,9 +7,9 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj b/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj index e7a054e23..079bf9bef 100644 --- a/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj +++ b/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj @@ -8,10 +8,10 @@ - + - + diff --git a/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj b/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj index 7e09ec673..c3bd8559d 100644 --- a/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj +++ b/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj @@ -8,9 +8,9 @@ - + - + diff --git a/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj b/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj index 6da0f9200..30a8cda4d 100644 --- a/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj +++ b/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj @@ -7,9 +7,9 @@ - + - + diff --git a/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj b/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj index 024756991..17f727a15 100644 --- a/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj +++ b/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj @@ -14,9 +14,9 @@ - + - + all diff --git a/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj b/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj index 6b6743743..6796276c8 100644 --- a/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj +++ b/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj @@ -9,11 +9,11 @@ - + - + diff --git a/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj b/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj index 44f8119cb..e54921640 100644 --- a/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj +++ b/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj @@ -10,10 +10,10 @@ - + - + diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj index 73e18184e..f29d9e270 100644 --- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj +++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj @@ -22,10 +22,10 @@ - + - + all diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj index 7b945c483..5f3f91faf 100644 --- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj +++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj @@ -7,9 +7,9 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj index 189b0348e..8bcdbfceb 100644 --- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj +++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj @@ -7,10 +7,10 @@ - + - + all diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj index 090dce6fc..275e52338 100644 --- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj +++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj @@ -7,9 +7,9 @@ - + - + diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj index a9b7683f7..2f13eb8a3 100644 --- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj +++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj @@ -8,9 +8,9 @@ - + - + diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj index 71195c130..9285efcd5 100644 --- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj +++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj @@ -8,11 +8,11 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 5ceb081af84bf64e5545d668d5dc6611d95dc665 Mon Sep 17 00:00:00 2001 From: Phil-NHS Date: Thu, 11 Sep 2025 16:51:44 +0100 Subject: [PATCH 2/5] TD-5925 Package Changes --- .../Controllers/CacheController.cs | 1 + .../Controllers/ReleaseController.cs | 1 + .../Filters/CheckInitialLogonFilter.cs | 1 + .../LearningHub.Nhs.AdminUI.csproj | 6 ++--- .../Middleware/TimezoneInfoMiddleware.cs | 1 + .../Models/ContactViewModel.cs | 1 + .../ServiceCollectionExtension.cs | 1 + .../Services/BaseHttpClient.cs | 1 + .../Services/LearningHubHttpClient.cs | 1 + .../Services/OpenApiHttpClient.cs | 1 + .../Services/ProviderService.cs | 1 + .../Services/RoleService.cs | 1 + .../Services/UserApiHttpClient.cs | 1 + .../Services/UserGroupService.cs | 1 + .../Services/UserService.cs | 1 + .../Shared/_TimezoneInfoScriptPartial.cshtml | 2 +- Directory.Packages.props | 8 +++---- .../Interfaces/Http/IAPIHttpClient.cs | 5 +++- .../LearningHub.Nhs.Shared.csproj | 23 ++++++++++++------- .../LearningHub.Nhs.WebUI.Shared.csproj | 16 ++++++++++--- .../Controllers/AccountController.cs | 1 + .../Controllers/CatalogueController.cs | 1 + .../Controllers/LoginWizardController.cs | 16 ++++++------- .../Controllers/MyAccountController.cs | 8 +++++-- .../Controllers/ResourceController.cs | 1 + .../Controllers/UserController.cs | 5 +++- .../Filters/LoginWizardFilter.cs | 1 + .../LearningHub.Nhs.WebUI.csproj | 8 ++++--- .../ServiceCollectionExtension.cs | 1 + .../Services/BaseHttpClient.cs | 1 + .../Services/CatalogueService.cs | 1 + .../Services/LearningHubHttpClient.cs | 1 + .../Services/OpenApiHttpClient.cs | 1 + .../Services/ProviderService.cs | 1 + LearningHub.Nhs.WebUI/Services/RoleService.cs | 1 + .../Services/UserApiHttpClient.cs | 1 + .../Services/UserGroupService.cs | 1 + .../Startup/AuthenticationConfiguration.cs | 1 + .../Startup/TimezoneInfoMiddleware.cs | 1 + .../NavigationItemsViewComponent.cs | 1 + .../Views/Shared/_FooterPartial.cshtml | 2 +- .../Views/Shared/_NavPartial.cshtml | 2 +- .../Shared/_TimezoneInfoScriptPartial.cshtml | 2 +- .../LearningHub.Nhs.OpenApi.Models.csproj | 2 +- ...gHub.Nhs.OpenApi.Services.Interface.csproj | 7 +++--- .../LearningHub.Nhs.OpenApi.Services.csproj | 6 ++--- .../Services/CachingService.cs | 1 + .../Startup.cs | 1 + .../Controllers/UserController.cs | 1 + ...ub.Nhs.ReportApi.Services.Interface.csproj | 2 +- ...ub.Nhs.ReportApi.Services.UnitTests.csproj | 2 +- .../LearningHub.Nhs.ReportApi.Services.csproj | 2 +- .../LearningHub.Nhs.ReportApi.Shared.csproj | 2 +- .../LearningHub.Nhs.ReportApi.csproj | 2 +- .../LearningHub.Nhs.Api.csproj | 6 ++--- .../Startup/ServiceMappings.cs | 1 + .../LearningHub.Nhs.Api.Shared.csproj | 6 ++--- .../LearningHub.Nhs.Api.UnitTests.csproj | 6 ++--- ...earningHub.Nhs.Repository.Interface.csproj | 6 ++--- .../LearningHub.Nhs.Repository.csproj | 6 ++--- .../LearningHub.Nhs.Services.Interface.csproj | 6 ++--- .../LearningHub.Nhs.Services.UnitTests.csproj | 6 ++--- .../CachingService.cs | 1 + .../LearningHub.Nhs.Services.csproj | 6 ++--- ...earningHub.Nhs.Migration.ConsoleApp.csproj | 6 ++--- ...LearningHub.Nhs.Migration.Interface.csproj | 6 ++--- .../LearningHub.Nhs.Migration.Models.csproj | 6 ++--- ...ub.Nhs.Migration.Staging.Repository.csproj | 6 ++--- ...LearningHub.Nhs.Migration.UnitTests.csproj | 6 ++--- .../LearningHub.Nhs.Migration.csproj | 6 ++--- 70 files changed, 156 insertions(+), 91 deletions(-) diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/CacheController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/CacheController.cs index a8b1e94c5..4442bbc8a 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/CacheController.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/CacheController.cs @@ -6,6 +6,7 @@ using LearningHub.Nhs.Models.Entities.Analytics; using LearningHub.Nhs.Models.Enums; using LearningHub.Nhs.Models.Extensions; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ReleaseController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ReleaseController.cs index 86c3b8cde..c3a6367e6 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ReleaseController.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ReleaseController.cs @@ -12,6 +12,7 @@ using LearningHub.Nhs.Models.Extensions; using LearningHub.Nhs.Models.Maintenance; using LearningHub.Nhs.Models.Paging; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Filters/CheckInitialLogonFilter.cs b/AdminUI/LearningHub.Nhs.AdminUI/Filters/CheckInitialLogonFilter.cs index 3e07e56f7..2b2b898cf 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Filters/CheckInitialLogonFilter.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Filters/CheckInitialLogonFilter.cs @@ -4,6 +4,7 @@ using LearningHub.Nhs.AdminUI.Helpers; using LearningHub.Nhs.Caching; using LearningHub.Nhs.Models.Extensions; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using Microsoft.AspNetCore.Mvc.Filters; /// diff --git a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj index 0cc06a396..889633f05 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj +++ b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj @@ -83,13 +83,13 @@ - + - - + + diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Middleware/TimezoneInfoMiddleware.cs b/AdminUI/LearningHub.Nhs.AdminUI/Middleware/TimezoneInfoMiddleware.cs index 8a7502cb7..cc1aaf00e 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Middleware/TimezoneInfoMiddleware.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Middleware/TimezoneInfoMiddleware.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using LearningHub.Nhs.AdminUI.Extensions; using LearningHub.Nhs.Caching; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Primitives; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Models/ContactViewModel.cs b/AdminUI/LearningHub.Nhs.AdminUI/Models/ContactViewModel.cs index 377771ff4..db0f4855e 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Models/ContactViewModel.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Models/ContactViewModel.cs @@ -1,6 +1,7 @@ namespace LearningHub.Nhs.AdminUI.Models { using System.ComponentModel.DataAnnotations; + using LearningHub.Nhs.Caching.Binders; using LearningHub.Nhs.Models.Binders; /// diff --git a/AdminUI/LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs b/AdminUI/LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs index 1039a3673..10a3e8137 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs @@ -21,6 +21,7 @@ using LearningHub.Nhs.Models.Automapper; using LearningHub.Nhs.Models.Enums; using LearningHub.Nhs.Models.Extensions; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Authentication.OpenIdConnect; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/BaseHttpClient.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/BaseHttpClient.cs index 00cd33837..5050690a6 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/BaseHttpClient.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/BaseHttpClient.cs @@ -10,6 +10,7 @@ using LearningHub.Nhs.AdminUI.Configuration; using LearningHub.Nhs.AdminUI.Extensions; using LearningHub.Nhs.Caching; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/LearningHubHttpClient.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/LearningHubHttpClient.cs index 48ff81cb6..9e3489f45 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/LearningHubHttpClient.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/LearningHubHttpClient.cs @@ -4,6 +4,7 @@ using LearningHub.Nhs.AdminUI.Configuration; using LearningHub.Nhs.AdminUI.Interfaces; using LearningHub.Nhs.Caching; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/OpenApiHttpClient.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/OpenApiHttpClient.cs index 5e8463cad..c0ae5b67c 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/OpenApiHttpClient.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/OpenApiHttpClient.cs @@ -4,6 +4,7 @@ using LearningHub.Nhs.AdminUI.Configuration; using LearningHub.Nhs.AdminUI.Interfaces; using LearningHub.Nhs.Caching; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/ProviderService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/ProviderService.cs index cfdc4050b..0691fe097 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/ProviderService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/ProviderService.cs @@ -12,6 +12,7 @@ using LearningHub.Nhs.Models.Common; using LearningHub.Nhs.Models.Provider; using LearningHub.Nhs.Models.Validation; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using Newtonsoft.Json; /// diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/RoleService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/RoleService.cs index 7b435cca0..e2c1f2fab 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/RoleService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/RoleService.cs @@ -7,6 +7,7 @@ using LearningHub.Nhs.AdminUI.Interfaces; using LearningHub.Nhs.Caching; using LearningHub.Nhs.Models.User; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; /// /// The role service. diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/UserApiHttpClient.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/UserApiHttpClient.cs index 5af8f9bec..3fe33eaf9 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/UserApiHttpClient.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/UserApiHttpClient.cs @@ -4,6 +4,7 @@ using LearningHub.Nhs.AdminUI.Configuration; using LearningHub.Nhs.AdminUI.Interfaces; using LearningHub.Nhs.Caching; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/UserGroupService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/UserGroupService.cs index 0a941c761..e17942e90 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/UserGroupService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/UserGroupService.cs @@ -16,6 +16,7 @@ namespace LearningHub.Nhs.AdminUI.Services using LearningHub.Nhs.Models.Paging; using LearningHub.Nhs.Models.User; using LearningHub.Nhs.Models.Validation; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using Microsoft.AspNetCore.Http; using Newtonsoft.Json; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/UserService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/UserService.cs index c84dbc2f2..85b82b2a7 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/UserService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/UserService.cs @@ -17,6 +17,7 @@ using LearningHub.Nhs.Models.Resource; using LearningHub.Nhs.Models.User; using LearningHub.Nhs.Models.Validation; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using Newtonsoft.Json; /// diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Views/Shared/_TimezoneInfoScriptPartial.cshtml b/AdminUI/LearningHub.Nhs.AdminUI/Views/Shared/_TimezoneInfoScriptPartial.cshtml index 56ff582ff..3097a8e08 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Views/Shared/_TimezoneInfoScriptPartial.cshtml +++ b/AdminUI/LearningHub.Nhs.AdminUI/Views/Shared/_TimezoneInfoScriptPartial.cshtml @@ -1,6 +1,6 @@ @using LearningHub.Nhs.AdminUI.Extensions @using LearningHub.Nhs.AdminUI.Middleware -@inject LearningHub.Nhs.Caching.ICacheService cacheService +@inject LearningHub.Nhs.Models.WebUtilitiesInterfaces.ICacheService cacheService @if (User.Identity.IsAuthenticated) { diff --git a/Directory.Packages.props b/Directory.Packages.props index d12e65528..bf2b306f5 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -8,10 +8,10 @@ - + - - + + @@ -28,7 +28,7 @@ - + diff --git a/LearningHub.Nhs.Shared/Interfaces/Http/IAPIHttpClient.cs b/LearningHub.Nhs.Shared/Interfaces/Http/IAPIHttpClient.cs index c65fe674b..c60da3de5 100644 --- a/LearningHub.Nhs.Shared/Interfaces/Http/IAPIHttpClient.cs +++ b/LearningHub.Nhs.Shared/Interfaces/Http/IAPIHttpClient.cs @@ -1,4 +1,7 @@ -namespace LearningHub.Nhs.Shared.Interfaces.Http +using System.Net.Http; +using System.Threading.Tasks; + +namespace LearningHub.Nhs.Shared.Interfaces.Http { /// /// Represents an HTTP client for a specific API. diff --git a/LearningHub.Nhs.Shared/LearningHub.Nhs.Shared.csproj b/LearningHub.Nhs.Shared/LearningHub.Nhs.Shared.csproj index d51462771..1f748847a 100644 --- a/LearningHub.Nhs.Shared/LearningHub.Nhs.Shared.csproj +++ b/LearningHub.Nhs.Shared/LearningHub.Nhs.Shared.csproj @@ -1,16 +1,23 @@  - net8.0 - enable + + netstandard2.1 + enable - + + + + + + - - + + + + + - - - + \ No newline at end of file diff --git a/LearningHub.Nhs.WebUI.Shared/LearningHub.Nhs.WebUI.Shared.csproj b/LearningHub.Nhs.WebUI.Shared/LearningHub.Nhs.WebUI.Shared.csproj index fa71b7ae6..3249d8d1d 100644 --- a/LearningHub.Nhs.WebUI.Shared/LearningHub.Nhs.WebUI.Shared.csproj +++ b/LearningHub.Nhs.WebUI.Shared/LearningHub.Nhs.WebUI.Shared.csproj @@ -1,9 +1,19 @@  - net8.0 - enable - enable + netstandard2.1 + + enable + + + + + + + + + + diff --git a/LearningHub.Nhs.WebUI/Controllers/AccountController.cs b/LearningHub.Nhs.WebUI/Controllers/AccountController.cs index 2d2017cd2..16383bf33 100644 --- a/LearningHub.Nhs.WebUI/Controllers/AccountController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/AccountController.cs @@ -14,6 +14,7 @@ using GDS.MultiPageFormData.Enums; using LearningHub.Nhs.Caching; using LearningHub.Nhs.Models.Common; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using LearningHub.Nhs.WebUI.Configuration; using LearningHub.Nhs.WebUI.Extensions; using LearningHub.Nhs.WebUI.Filters; diff --git a/LearningHub.Nhs.WebUI/Controllers/CatalogueController.cs b/LearningHub.Nhs.WebUI/Controllers/CatalogueController.cs index 12d9973ac..1804c5389 100644 --- a/LearningHub.Nhs.WebUI/Controllers/CatalogueController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/CatalogueController.cs @@ -13,6 +13,7 @@ using LearningHub.Nhs.Models.Hierarchy; using LearningHub.Nhs.Models.Search; using LearningHub.Nhs.Models.User; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using LearningHub.Nhs.WebUI.Configuration; using LearningHub.Nhs.WebUI.Filters; using LearningHub.Nhs.WebUI.Interfaces; diff --git a/LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs b/LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs index fab43e688..ee7a048f4 100644 --- a/LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs @@ -1,16 +1,12 @@ namespace LearningHub.Nhs.WebUI.Controllers { - using System; - using System.Collections.Generic; - using System.Linq; - using System.Net.Http; - using System.Threading.Tasks; using elfhHub.Nhs.Models.Common; using elfhHub.Nhs.Models.Entities; using elfhHub.Nhs.Models.Enums; using GDS.MultiPageFormData; using GDS.MultiPageFormData.Enums; using LearningHub.Nhs.Caching; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using LearningHub.Nhs.WebUI.Configuration; using LearningHub.Nhs.WebUI.Filters; using LearningHub.Nhs.WebUI.Helpers; @@ -19,6 +15,7 @@ using LearningHub.Nhs.WebUI.Models.UserProfile; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; + using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; @@ -309,7 +306,8 @@ public async Task SelectSecurityQuestion(int questionIndex, strin var viewModel = new SecurityQuestionSelectViewModel { - SecurityQuestions = securityViewModel.SecurityQuestions, + // qqqq + SecurityQuestions = securityViewModel.SecurityQuestions.Select(q => new SelectListItem { Value = q.Value, Text = q.Text }).ToList(), QuestionIndex = questionIndex, SelectedSecurityQuestionId = userQuestion.SecurityQuestionId, }; @@ -360,7 +358,8 @@ public async Task SelectSecurityQuestionPost(SecurityQuestionSele { var viewModel = new SecurityQuestionSelectViewModel { - SecurityQuestions = securityViewModel.SecurityQuestions, + // qqqq + SecurityQuestions = securityViewModel.SecurityQuestions.Select(q => new SelectListItem { Value = q.Value, Text = q.Text }).ToList(), QuestionIndex = model.QuestionIndex, }; @@ -426,7 +425,8 @@ public async Task AnswerSecurityQuestionPost(SecurityQuestionAnsw { var viewModel = new SecurityQuestionSelectViewModel { - SecurityQuestions = securityViewModel.SecurityQuestions, + // qqqq + SecurityQuestions = securityViewModel.SecurityQuestions.Select(q => new SelectListItem { Value = q.Value, Text = q.Text }).ToList(), QuestionIndex = model.QuestionIndex, }; diff --git a/LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs b/LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs index d1dadb902..ade316a18 100644 --- a/LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs @@ -11,6 +11,7 @@ using GDS.MultiPageFormData; using GDS.MultiPageFormData.Enums; using LearningHub.Nhs.Caching; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using LearningHub.Nhs.WebUI.Configuration; using LearningHub.Nhs.WebUI.Helpers; using LearningHub.Nhs.WebUI.Interfaces; @@ -20,6 +21,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; + using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; @@ -299,7 +301,9 @@ public async Task SecurityQuestionsDetails(int questionIndex) { SecurityQuestionSelectViewModel securityViewModel = new SecurityQuestionSelectViewModel(); var model = await this.loginWizardService.GetSecurityQuestionsModel(this.CurrentUserId); - securityViewModel.SecurityQuestions = model.SecurityQuestions; + + // qqqq + securityViewModel.SecurityQuestions = model.SecurityQuestions.Select(q => new SelectListItem { Value = q.Value, Text = q.Text }).ToList(); securityViewModel.QuestionIndex = questionIndex; securityViewModel.SelectedSecurityQuestionId = model.UserSecurityQuestions.ElementAt(questionIndex).SecurityQuestionId; return this.View("SecurityQuestionsDetails", securityViewModel); @@ -505,7 +509,7 @@ public async Task ValidateSecurityQuestion(SecurityQuestionSelect { bool duplicatesExist = false; var securityQuestionsViewModel = await this.loginWizardService.GetSecurityQuestionsModel(this.CurrentUserId); - model.SecurityQuestions = securityQuestionsViewModel.SecurityQuestions; + model.SecurityQuestions = securityQuestionsViewModel.SecurityQuestions.Select(q => new SelectListItem { Value = q.Value, Text = q.Text }).ToList(); if (model.QuestionIndex == 0) { diff --git a/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs b/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs index 5df61185e..38e32f378 100644 --- a/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs @@ -11,6 +11,7 @@ using LearningHub.Nhs.Models.Resource; using LearningHub.Nhs.Models.Resource.Activity; using LearningHub.Nhs.Models.Validation; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using LearningHub.Nhs.WebUI.Configuration; using LearningHub.Nhs.WebUI.Filters; using LearningHub.Nhs.WebUI.Helpers; diff --git a/LearningHub.Nhs.WebUI/Controllers/UserController.cs b/LearningHub.Nhs.WebUI/Controllers/UserController.cs index 284c2a0b9..f5bcfa327 100644 --- a/LearningHub.Nhs.WebUI/Controllers/UserController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/UserController.cs @@ -252,7 +252,10 @@ public async Task AdditionalSecurity(SecurityQuestionsViewModel s else { var questions = await this.loginWizardService.GetSecurityQuestions(); - securityQuestionsModel.SecurityQuestions = questions.Select(q => new SelectListItem() { Value = q.Id.ToString(), Text = q.Text }).ToList(); + + // qqqq securityQuestionsModel.SecurityQuestions = questions.Select(q => new SelectListItem() { Value = q.Id.ToString(), Text = q.Text }).ToList(); + // securityQuestionsModel.SecurityQuestions = questions.Select(q => new List<(string Value, string Text)>() { Value = q.Id.ToString(), Text = q.Text }).ToList(); + securityQuestionsModel.SecurityQuestions = questions.Select(q => (Value: q.Id.ToString(), Text: q.Text)).ToList(); } return this.View("AdditionalSecurity", securityQuestionsModel); diff --git a/LearningHub.Nhs.WebUI/Filters/LoginWizardFilter.cs b/LearningHub.Nhs.WebUI/Filters/LoginWizardFilter.cs index 36cbcc9ff..c9305223e 100644 --- a/LearningHub.Nhs.WebUI/Filters/LoginWizardFilter.cs +++ b/LearningHub.Nhs.WebUI/Filters/LoginWizardFilter.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using LearningHub.Nhs.Caching; using LearningHub.Nhs.Models.Extensions; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using LearningHub.Nhs.WebUI.Helpers; using LearningHub.Nhs.WebUI.Interfaces; using Microsoft.AspNetCore.Mvc; diff --git a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj index fc5a294e6..2e3cecfe4 100644 --- a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj +++ b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj @@ -11,6 +11,7 @@ true x64 true + enable @@ -108,19 +109,20 @@ + + - + - - + diff --git a/LearningHub.Nhs.WebUI/ServiceCollectionExtension.cs b/LearningHub.Nhs.WebUI/ServiceCollectionExtension.cs index 5ed5cc926..71d40a6b3 100644 --- a/LearningHub.Nhs.WebUI/ServiceCollectionExtension.cs +++ b/LearningHub.Nhs.WebUI/ServiceCollectionExtension.cs @@ -5,6 +5,7 @@ using System.Net; using AspNetCoreRateLimit; using LearningHub.Nhs.Caching; + using LearningHub.Nhs.Caching.Binders; using LearningHub.Nhs.Models.Binders; using LearningHub.Nhs.Models.Enums; using LearningHub.Nhs.Models.Extensions; diff --git a/LearningHub.Nhs.WebUI/Services/BaseHttpClient.cs b/LearningHub.Nhs.WebUI/Services/BaseHttpClient.cs index cb2900fc2..cd5f29d15 100644 --- a/LearningHub.Nhs.WebUI/Services/BaseHttpClient.cs +++ b/LearningHub.Nhs.WebUI/Services/BaseHttpClient.cs @@ -10,6 +10,7 @@ using IdentityModel.Client; using LearningHub.Nhs.Caching; using LearningHub.Nhs.Models.Extensions; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using LearningHub.Nhs.Shared.Interfaces.Http; using LearningHub.Nhs.WebUI.Configuration; using LearningHub.Nhs.WebUI.Extensions; diff --git a/LearningHub.Nhs.WebUI/Services/CatalogueService.cs b/LearningHub.Nhs.WebUI/Services/CatalogueService.cs index 934e942c1..dda1f95cc 100644 --- a/LearningHub.Nhs.WebUI/Services/CatalogueService.cs +++ b/LearningHub.Nhs.WebUI/Services/CatalogueService.cs @@ -10,6 +10,7 @@ using LearningHub.Nhs.Models.Common; using LearningHub.Nhs.Models.User; using LearningHub.Nhs.Models.Validation; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using LearningHub.Nhs.Shared.Interfaces.Http; using LearningHub.Nhs.WebUI.Interfaces; using Microsoft.Extensions.Logging; diff --git a/LearningHub.Nhs.WebUI/Services/LearningHubHttpClient.cs b/LearningHub.Nhs.WebUI/Services/LearningHubHttpClient.cs index 9af95a1e6..9771d5d45 100644 --- a/LearningHub.Nhs.WebUI/Services/LearningHubHttpClient.cs +++ b/LearningHub.Nhs.WebUI/Services/LearningHubHttpClient.cs @@ -2,6 +2,7 @@ { using System.Net.Http; using LearningHub.Nhs.Caching; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using LearningHub.Nhs.Shared.Interfaces.Http; using LearningHub.Nhs.WebUI.Configuration; using LearningHub.Nhs.WebUI.Interfaces; diff --git a/LearningHub.Nhs.WebUI/Services/OpenApiHttpClient.cs b/LearningHub.Nhs.WebUI/Services/OpenApiHttpClient.cs index 502025b0b..927508a70 100644 --- a/LearningHub.Nhs.WebUI/Services/OpenApiHttpClient.cs +++ b/LearningHub.Nhs.WebUI/Services/OpenApiHttpClient.cs @@ -2,6 +2,7 @@ { using System.Net.Http; using LearningHub.Nhs.Caching; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using LearningHub.Nhs.Shared.Interfaces.Http; using LearningHub.Nhs.WebUI.Configuration; using Microsoft.AspNetCore.Http; diff --git a/LearningHub.Nhs.WebUI/Services/ProviderService.cs b/LearningHub.Nhs.WebUI/Services/ProviderService.cs index 7b0ed7d5d..069caa5fb 100644 --- a/LearningHub.Nhs.WebUI/Services/ProviderService.cs +++ b/LearningHub.Nhs.WebUI/Services/ProviderService.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using LearningHub.Nhs.Caching; using LearningHub.Nhs.Models.Provider; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using LearningHub.Nhs.Shared.Interfaces.Http; using LearningHub.Nhs.WebUI.Interfaces; using Microsoft.Extensions.Logging; diff --git a/LearningHub.Nhs.WebUI/Services/RoleService.cs b/LearningHub.Nhs.WebUI/Services/RoleService.cs index 5ce80f927..3535ad026 100644 --- a/LearningHub.Nhs.WebUI/Services/RoleService.cs +++ b/LearningHub.Nhs.WebUI/Services/RoleService.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using LearningHub.Nhs.Caching; using LearningHub.Nhs.Models.User; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using LearningHub.Nhs.Shared.Interfaces.Http; using LearningHub.Nhs.WebUI.Interfaces; using Microsoft.Extensions.Logging; diff --git a/LearningHub.Nhs.WebUI/Services/UserApiHttpClient.cs b/LearningHub.Nhs.WebUI/Services/UserApiHttpClient.cs index 8483e44c6..7e75ca6cc 100644 --- a/LearningHub.Nhs.WebUI/Services/UserApiHttpClient.cs +++ b/LearningHub.Nhs.WebUI/Services/UserApiHttpClient.cs @@ -2,6 +2,7 @@ { using System.Net.Http; using LearningHub.Nhs.Caching; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using LearningHub.Nhs.Shared.Interfaces.Http; using LearningHub.Nhs.WebUI.Configuration; using Microsoft.AspNetCore.Http; diff --git a/LearningHub.Nhs.WebUI/Services/UserGroupService.cs b/LearningHub.Nhs.WebUI/Services/UserGroupService.cs index 3a33a3d60..5b6e892f5 100644 --- a/LearningHub.Nhs.WebUI/Services/UserGroupService.cs +++ b/LearningHub.Nhs.WebUI/Services/UserGroupService.cs @@ -8,6 +8,7 @@ using LearningHub.Nhs.Models.Enums; using LearningHub.Nhs.Models.Extensions; using LearningHub.Nhs.Models.User; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using LearningHub.Nhs.Shared.Interfaces.Http; using LearningHub.Nhs.WebUI.Interfaces; using Microsoft.AspNetCore.Http; diff --git a/LearningHub.Nhs.WebUI/Startup/AuthenticationConfiguration.cs b/LearningHub.Nhs.WebUI/Startup/AuthenticationConfiguration.cs index e939bb2ea..c0cc3a616 100644 --- a/LearningHub.Nhs.WebUI/Startup/AuthenticationConfiguration.cs +++ b/LearningHub.Nhs.WebUI/Startup/AuthenticationConfiguration.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using IdentityModel; using LearningHub.Nhs.Caching; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using LearningHub.Nhs.WebUI.Configuration; using LearningHub.Nhs.WebUI.Handlers; using LearningHub.Nhs.WebUI.Helpers; diff --git a/LearningHub.Nhs.WebUI/Startup/TimezoneInfoMiddleware.cs b/LearningHub.Nhs.WebUI/Startup/TimezoneInfoMiddleware.cs index 8284e1cfe..2c88d6bfe 100644 --- a/LearningHub.Nhs.WebUI/Startup/TimezoneInfoMiddleware.cs +++ b/LearningHub.Nhs.WebUI/Startup/TimezoneInfoMiddleware.cs @@ -2,6 +2,7 @@ { using System.Threading.Tasks; using LearningHub.Nhs.Caching; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using LearningHub.Nhs.WebUI.Extensions; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Primitives; diff --git a/LearningHub.Nhs.WebUI/ViewComponents/NavigationItemsViewComponent.cs b/LearningHub.Nhs.WebUI/ViewComponents/NavigationItemsViewComponent.cs index 6b81891cd..b3f01e981 100644 --- a/LearningHub.Nhs.WebUI/ViewComponents/NavigationItemsViewComponent.cs +++ b/LearningHub.Nhs.WebUI/ViewComponents/NavigationItemsViewComponent.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using LearningHub.Nhs.Caching; using LearningHub.Nhs.Models.Extensions; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using LearningHub.Nhs.WebUI.Interfaces; using LearningHub.Nhs.WebUI.Models; using Microsoft.AspNetCore.Mvc; diff --git a/LearningHub.Nhs.WebUI/Views/Shared/_FooterPartial.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/_FooterPartial.cshtml index 2c6e87651..844c53846 100644 --- a/LearningHub.Nhs.WebUI/Views/Shared/_FooterPartial.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Shared/_FooterPartial.cshtml @@ -1,4 +1,4 @@ -@inject LearningHub.Nhs.Caching.ICacheService cacheService +@inject LearningHub.Nhs.Models.WebUtilitiesInterfaces.ICacheService cacheService @using Microsoft.Extensions.Options; @using LearningHub.Nhs.WebUI.Configuration; @inject IOptions settings; diff --git a/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml index 594c62f7c..1beb7322b 100644 --- a/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml @@ -1,4 +1,4 @@ -@inject LearningHub.Nhs.Caching.ICacheService cacheService +@inject LearningHub.Nhs.Models.WebUtilitiesInterfaces.ICacheService cacheService @using LearningHub.Nhs.Models.Extensions @using Microsoft.Extensions.Options; @using LearningHub.Nhs.WebUI.Configuration; diff --git a/LearningHub.Nhs.WebUI/Views/Shared/_TimezoneInfoScriptPartial.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/_TimezoneInfoScriptPartial.cshtml index 0825c43e8..b0b17db10 100644 --- a/LearningHub.Nhs.WebUI/Views/Shared/_TimezoneInfoScriptPartial.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Shared/_TimezoneInfoScriptPartial.cshtml @@ -1,6 +1,6 @@ @using LearningHub.Nhs.WebUI.Extensions @using LearningHub.Nhs.WebUI.Startup -@inject LearningHub.Nhs.Caching.ICacheService cacheService +@inject LearningHub.Nhs.Models.WebUtilitiesInterfaces.ICacheService cacheService @if (User.Identity.IsAuthenticated) { diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj index f72cddc16..cecf1b22a 100644 --- a/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj +++ b/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj @@ -16,7 +16,7 @@ - + diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj index efd745099..a328cf76b 100644 --- a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj +++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj @@ -1,4 +1,4 @@ - + net8.0 @@ -16,8 +16,9 @@ - - + + + diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj index 6b0d841f9..eb14e2ec7 100644 --- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj +++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj @@ -28,9 +28,9 @@ - - - + + + diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/CachingService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/CachingService.cs index 958cb09e2..307f4debc 100644 --- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/CachingService.cs +++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/CachingService.cs @@ -4,6 +4,7 @@ using System.Threading.Tasks; using LearningHub.Nhs.Caching; using LearningHub.Nhs.Models.Enums; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using LearningHub.Nhs.OpenApi.Models.Configuration; using LearningHub.Nhs.OpenApi.Services.Interface.Services; using Microsoft.Extensions.Logging; diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Startup.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Startup.cs index fb9098bde..6c6610726 100644 --- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Startup.cs +++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Startup.cs @@ -1,6 +1,7 @@ namespace LearningHub.Nhs.OpenApi.Services { using LearningHub.Nhs.Caching; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using LearningHub.Nhs.OpenApi.Services.HttpClients; using LearningHub.Nhs.OpenApi.Services.Interface.HttpClients; using LearningHub.Nhs.OpenApi.Services.Interface.Services; diff --git a/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/UserController.cs b/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/UserController.cs index 3dac1615d..18c03f524 100644 --- a/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/UserController.cs +++ b/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/UserController.cs @@ -15,6 +15,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; /// /// The log controller. diff --git a/ReportAPI/LearningHub.Nhs.ReportApi.Services.Interface/LearningHub.Nhs.ReportApi.Services.Interface.csproj b/ReportAPI/LearningHub.Nhs.ReportApi.Services.Interface/LearningHub.Nhs.ReportApi.Services.Interface.csproj index 9d47917df..9925c85ea 100644 --- a/ReportAPI/LearningHub.Nhs.ReportApi.Services.Interface/LearningHub.Nhs.ReportApi.Services.Interface.csproj +++ b/ReportAPI/LearningHub.Nhs.ReportApi.Services.Interface/LearningHub.Nhs.ReportApi.Services.Interface.csproj @@ -16,7 +16,7 @@ - + diff --git a/ReportAPI/LearningHub.Nhs.ReportApi.Services.UnitTests/LearningHub.Nhs.ReportApi.Services.UnitTests.csproj b/ReportAPI/LearningHub.Nhs.ReportApi.Services.UnitTests/LearningHub.Nhs.ReportApi.Services.UnitTests.csproj index d50f43411..0948fa06c 100644 --- a/ReportAPI/LearningHub.Nhs.ReportApi.Services.UnitTests/LearningHub.Nhs.ReportApi.Services.UnitTests.csproj +++ b/ReportAPI/LearningHub.Nhs.ReportApi.Services.UnitTests/LearningHub.Nhs.ReportApi.Services.UnitTests.csproj @@ -18,7 +18,7 @@ - + diff --git a/ReportAPI/LearningHub.Nhs.ReportApi.Services/LearningHub.Nhs.ReportApi.Services.csproj b/ReportAPI/LearningHub.Nhs.ReportApi.Services/LearningHub.Nhs.ReportApi.Services.csproj index 26d4cbd96..1e3c6f360 100644 --- a/ReportAPI/LearningHub.Nhs.ReportApi.Services/LearningHub.Nhs.ReportApi.Services.csproj +++ b/ReportAPI/LearningHub.Nhs.ReportApi.Services/LearningHub.Nhs.ReportApi.Services.csproj @@ -19,7 +19,7 @@ - + diff --git a/ReportAPI/LearningHub.Nhs.ReportApi.Shared/LearningHub.Nhs.ReportApi.Shared.csproj b/ReportAPI/LearningHub.Nhs.ReportApi.Shared/LearningHub.Nhs.ReportApi.Shared.csproj index 0c7b94d1e..8ce8cf572 100644 --- a/ReportAPI/LearningHub.Nhs.ReportApi.Shared/LearningHub.Nhs.ReportApi.Shared.csproj +++ b/ReportAPI/LearningHub.Nhs.ReportApi.Shared/LearningHub.Nhs.ReportApi.Shared.csproj @@ -17,7 +17,7 @@ - + diff --git a/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj b/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj index 46f1e74f2..99ba74bda 100644 --- a/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj +++ b/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj @@ -20,7 +20,7 @@ - + diff --git a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj index 4b35a3a83..95e9e3073 100644 --- a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj +++ b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj @@ -26,10 +26,10 @@ - + - - + + diff --git a/WebAPI/LearningHub.Nhs.API/Startup/ServiceMappings.cs b/WebAPI/LearningHub.Nhs.API/Startup/ServiceMappings.cs index a9f0988ce..e0aff6d91 100644 --- a/WebAPI/LearningHub.Nhs.API/Startup/ServiceMappings.cs +++ b/WebAPI/LearningHub.Nhs.API/Startup/ServiceMappings.cs @@ -10,6 +10,7 @@ namespace LearningHub.Nhs.Api using LearningHub.Nhs.Migration.Validation; using LearningHub.Nhs.Migration.Validation.Helpers; using LearningHub.Nhs.Migration.Validation.Rules; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using LearningHub.Nhs.Repository; using LearningHub.Nhs.Repository.Activity; using LearningHub.Nhs.Repository.Analytics; diff --git a/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj b/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj index e1d378a8f..d287e601f 100644 --- a/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj +++ b/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj @@ -7,9 +7,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj b/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj index 079bf9bef..3663de5ce 100644 --- a/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj +++ b/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj @@ -8,10 +8,10 @@ - + - - + + diff --git a/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj b/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj index c3bd8559d..9d55608d9 100644 --- a/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj +++ b/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj b/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj index 30a8cda4d..2696ed676 100644 --- a/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj +++ b/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj @@ -7,9 +7,9 @@ - - - + + + diff --git a/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj b/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj index 17f727a15..eb697251a 100644 --- a/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj +++ b/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj @@ -14,9 +14,9 @@ - - - + + + all diff --git a/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj b/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj index 6796276c8..4a808006d 100644 --- a/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj +++ b/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj @@ -9,11 +9,11 @@ - + - - + + diff --git a/WebAPI/LearningHub.Nhs.Services/CachingService.cs b/WebAPI/LearningHub.Nhs.Services/CachingService.cs index 615814d12..3202f887b 100644 --- a/WebAPI/LearningHub.Nhs.Services/CachingService.cs +++ b/WebAPI/LearningHub.Nhs.Services/CachingService.cs @@ -5,6 +5,7 @@ using LearningHub.Nhs.Api.Shared.Configuration; using LearningHub.Nhs.Caching; using LearningHub.Nhs.Models.Enums; + using LearningHub.Nhs.Models.WebUtilitiesInterfaces; using LearningHub.Nhs.Services.Interface; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; diff --git a/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj b/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj index e54921640..ba5531d1c 100644 --- a/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj +++ b/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj @@ -10,10 +10,10 @@ - + - - + + diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj index f29d9e270..f914d3ed7 100644 --- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj +++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj @@ -22,10 +22,10 @@ - + - - + + all diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj index 5f3f91faf..5d0ad850c 100644 --- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj +++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj @@ -7,9 +7,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj index 8bcdbfceb..7e2cff6e2 100644 --- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj +++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj @@ -7,10 +7,10 @@ - + - - + + all diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj index 275e52338..ec2a1743d 100644 --- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj +++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj @@ -7,9 +7,9 @@ - - - + + + diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj index 2f13eb8a3..ece0e8657 100644 --- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj +++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj index 9285efcd5..d786cc9e0 100644 --- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj +++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj @@ -8,11 +8,11 @@ - + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive From b65a21b0207c8960e196a69e84e163004a1a806f Mon Sep 17 00:00:00 2001 From: Phil-NHS Date: Mon, 15 Sep 2025 10:05:45 +0100 Subject: [PATCH 3/5] TD-5925 Tweaks and implement ICaching TODOs --- AdminUI/LearningHub.Nhs.AdminUI/Models/ContactViewModel.cs | 1 - LearningHub.Nhs.Shared/Interfaces/Http/IAPIHttpClient.cs | 4 ++-- LearningHub.Nhs.Shared/LearningHub.Nhs.Shared.csproj | 3 +-- LearningHub.Nhs.WebUI.BlazorClient/Program.cs | 3 ++- .../Services/WasmCacheServiceStub.cs | 4 ++-- .../LearningHub.Nhs.WebUI.Shared.csproj | 2 +- LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs | 3 --- LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs | 1 - LearningHub.Nhs.WebUI/Controllers/UserController.cs | 3 --- LearningHub.Nhs.WebUI/ServiceCollectionExtension.cs | 1 - LearningHub.Nhs.WebUI/Views/User/AdditionalSecurity.cshtml | 3 +-- .../LearningHub.Nhs.OpenApi.Services.csproj | 1 - .../LearningHub.Nhs.Api.Shared.csproj | 1 - .../LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj | 1 - .../LearningHub.Nhs.Migration.Models.csproj | 1 - 15 files changed, 9 insertions(+), 23 deletions(-) diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Models/ContactViewModel.cs b/AdminUI/LearningHub.Nhs.AdminUI/Models/ContactViewModel.cs index db0f4855e..146aabde8 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Models/ContactViewModel.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Models/ContactViewModel.cs @@ -2,7 +2,6 @@ { using System.ComponentModel.DataAnnotations; using LearningHub.Nhs.Caching.Binders; - using LearningHub.Nhs.Models.Binders; /// /// Defines the . diff --git a/LearningHub.Nhs.Shared/Interfaces/Http/IAPIHttpClient.cs b/LearningHub.Nhs.Shared/Interfaces/Http/IAPIHttpClient.cs index c60da3de5..a9ae40996 100644 --- a/LearningHub.Nhs.Shared/Interfaces/Http/IAPIHttpClient.cs +++ b/LearningHub.Nhs.Shared/Interfaces/Http/IAPIHttpClient.cs @@ -1,8 +1,8 @@ using System.Net.Http; -using System.Threading.Tasks; - namespace LearningHub.Nhs.Shared.Interfaces.Http { + using System.Threading.Tasks; + /// /// Represents an HTTP client for a specific API. /// diff --git a/LearningHub.Nhs.Shared/LearningHub.Nhs.Shared.csproj b/LearningHub.Nhs.Shared/LearningHub.Nhs.Shared.csproj index 1f748847a..65998ee57 100644 --- a/LearningHub.Nhs.Shared/LearningHub.Nhs.Shared.csproj +++ b/LearningHub.Nhs.Shared/LearningHub.Nhs.Shared.csproj @@ -1,9 +1,8 @@  - + netstandard2.1 - enable diff --git a/LearningHub.Nhs.WebUI.BlazorClient/Program.cs b/LearningHub.Nhs.WebUI.BlazorClient/Program.cs index c65aca1ab..e98372c63 100644 --- a/LearningHub.Nhs.WebUI.BlazorClient/Program.cs +++ b/LearningHub.Nhs.WebUI.BlazorClient/Program.cs @@ -24,6 +24,7 @@ using TELBlazor.Components.Core.Configuration; using TELBlazor.Components.Core.Services.HelperServices; using TELBlazor.Components.OptionalImplementations.Core.Services.HelperServices; +using LearningHub.Nhs.Models.WebUtilitiesInterfaces; var builder = WebAssemblyHostBuilder.CreateDefault(args); @@ -88,7 +89,7 @@ builder.Services.AddScoped(sp => levelSwitch); builder.Services.AddScoped(); - // TODO (QQQQ) implement post TD-5925 builder.Services.AddScoped(); + builder.Services.AddScoped(); await builder.Build().RunAsync(); } diff --git a/LearningHub.Nhs.WebUI.BlazorClient/Services/WasmCacheServiceStub.cs b/LearningHub.Nhs.WebUI.BlazorClient/Services/WasmCacheServiceStub.cs index 6083581c2..1bd244f25 100644 --- a/LearningHub.Nhs.WebUI.BlazorClient/Services/WasmCacheServiceStub.cs +++ b/LearningHub.Nhs.WebUI.BlazorClient/Services/WasmCacheServiceStub.cs @@ -1,4 +1,4 @@ -// TODO (QQQQ) implement post TD-5925: using LearningHub.Nhs.Models; +using LearningHub.Nhs.Models.WebUtilitiesInterfaces; namespace LearningHub.Nhs.WebUI.BlazorClient.Services { @@ -6,7 +6,7 @@ namespace LearningHub.Nhs.WebUI.BlazorClient.Services /// We may use storage, we may just stub it and throw an error, we cant directly use redis we may access it via an api /// The cachestub currently just returns there is nothing available so the caller then will revert to calling the api. /// - public class WasmCacheServiceStub // TODO (QQQQ) implement post TD-5925 and get from NHS.Models: ICacheService + public class WasmCacheServiceStub : ICacheService { public Task GetAsync(string key) { diff --git a/LearningHub.Nhs.WebUI.Shared/LearningHub.Nhs.WebUI.Shared.csproj b/LearningHub.Nhs.WebUI.Shared/LearningHub.Nhs.WebUI.Shared.csproj index 3249d8d1d..68453347a 100644 --- a/LearningHub.Nhs.WebUI.Shared/LearningHub.Nhs.WebUI.Shared.csproj +++ b/LearningHub.Nhs.WebUI.Shared/LearningHub.Nhs.WebUI.Shared.csproj @@ -1,8 +1,8 @@  + netstandard2.1 - enable diff --git a/LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs b/LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs index ee7a048f4..8cb4795ec 100644 --- a/LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs @@ -306,7 +306,6 @@ public async Task SelectSecurityQuestion(int questionIndex, strin var viewModel = new SecurityQuestionSelectViewModel { - // qqqq SecurityQuestions = securityViewModel.SecurityQuestions.Select(q => new SelectListItem { Value = q.Value, Text = q.Text }).ToList(), QuestionIndex = questionIndex, SelectedSecurityQuestionId = userQuestion.SecurityQuestionId, @@ -358,7 +357,6 @@ public async Task SelectSecurityQuestionPost(SecurityQuestionSele { var viewModel = new SecurityQuestionSelectViewModel { - // qqqq SecurityQuestions = securityViewModel.SecurityQuestions.Select(q => new SelectListItem { Value = q.Value, Text = q.Text }).ToList(), QuestionIndex = model.QuestionIndex, }; @@ -425,7 +423,6 @@ public async Task AnswerSecurityQuestionPost(SecurityQuestionAnsw { var viewModel = new SecurityQuestionSelectViewModel { - // qqqq SecurityQuestions = securityViewModel.SecurityQuestions.Select(q => new SelectListItem { Value = q.Value, Text = q.Text }).ToList(), QuestionIndex = model.QuestionIndex, }; diff --git a/LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs b/LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs index ade316a18..b16547f15 100644 --- a/LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs @@ -302,7 +302,6 @@ public async Task SecurityQuestionsDetails(int questionIndex) SecurityQuestionSelectViewModel securityViewModel = new SecurityQuestionSelectViewModel(); var model = await this.loginWizardService.GetSecurityQuestionsModel(this.CurrentUserId); - // qqqq securityViewModel.SecurityQuestions = model.SecurityQuestions.Select(q => new SelectListItem { Value = q.Value, Text = q.Text }).ToList(); securityViewModel.QuestionIndex = questionIndex; securityViewModel.SelectedSecurityQuestionId = model.UserSecurityQuestions.ElementAt(questionIndex).SecurityQuestionId; diff --git a/LearningHub.Nhs.WebUI/Controllers/UserController.cs b/LearningHub.Nhs.WebUI/Controllers/UserController.cs index f5bcfa327..4ad9edab3 100644 --- a/LearningHub.Nhs.WebUI/Controllers/UserController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/UserController.cs @@ -252,9 +252,6 @@ public async Task AdditionalSecurity(SecurityQuestionsViewModel s else { var questions = await this.loginWizardService.GetSecurityQuestions(); - - // qqqq securityQuestionsModel.SecurityQuestions = questions.Select(q => new SelectListItem() { Value = q.Id.ToString(), Text = q.Text }).ToList(); - // securityQuestionsModel.SecurityQuestions = questions.Select(q => new List<(string Value, string Text)>() { Value = q.Id.ToString(), Text = q.Text }).ToList(); securityQuestionsModel.SecurityQuestions = questions.Select(q => (Value: q.Id.ToString(), Text: q.Text)).ToList(); } diff --git a/LearningHub.Nhs.WebUI/ServiceCollectionExtension.cs b/LearningHub.Nhs.WebUI/ServiceCollectionExtension.cs index 71d40a6b3..84d67a3c2 100644 --- a/LearningHub.Nhs.WebUI/ServiceCollectionExtension.cs +++ b/LearningHub.Nhs.WebUI/ServiceCollectionExtension.cs @@ -6,7 +6,6 @@ using AspNetCoreRateLimit; using LearningHub.Nhs.Caching; using LearningHub.Nhs.Caching.Binders; - using LearningHub.Nhs.Models.Binders; using LearningHub.Nhs.Models.Enums; using LearningHub.Nhs.Models.Extensions; using LearningHub.Nhs.WebUI.Configuration; diff --git a/LearningHub.Nhs.WebUI/Views/User/AdditionalSecurity.cshtml b/LearningHub.Nhs.WebUI/Views/User/AdditionalSecurity.cshtml index 6b097c918..d2bb39acb 100644 --- a/LearningHub.Nhs.WebUI/Views/User/AdditionalSecurity.cshtml +++ b/LearningHub.Nhs.WebUI/Views/User/AdditionalSecurity.cshtml @@ -29,9 +29,8 @@
- @* qqqq original *@