Skip to content

Develop/feature/td 5925 models caching package changes refactor #1401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: Develop/Feature/TD-5930-Blazor-Implementation-Integration-LH
Choose a base branch
from
Open

Develop/feature/td 5925 models caching package changes refactor #1401

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2f5bfe6
TD-5925 Updating packages
Phil-NHS Sep 8, 2025
b2a4b28
TD-5925 Bring in current blazor change
Phil-NHS Sep 8, 2025
5ceb081
TD-5925 Package Changes
Phil-NHS Sep 11, 2025
b65a21b
TD-5925 Tweaks and implement ICaching TODOs
Phil-NHS Sep 15, 2025
38812c6
TD-5925 Removing minor package duplication reference
Phil-NHS Sep 15, 2025
73f1cf3
TD-5925 Litte duplication package reference tidying
Phil-NHS Sep 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AdminUI/LearningHub.Nhs.AdminUI/Controllers/CacheController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions AdminUI/LearningHub.Nhs.AdminUI/Controllers/ReleaseController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions AdminUI/LearningHub.Nhs.AdminUI/Filters/CheckInitialLogonFilter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/// <summary>
Expand Down
6 changes: 3 additions & 3 deletions AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@
<PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" />
<PackageReference Include="Azure.Storage.Files.Shares" Version="12.8.0" />
<PackageReference Include="BuildWebCompiler" Version="1.12.405" />
<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
<PackageReference Include="elfhHub.Nhs.Models" Version="4.0.3" />
<PackageReference Include="FluentValidation" Version="11.11.0" />
<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
<PackageReference Include="HtmlSanitizer" Version="6.0.453" />
<PackageReference Include="IdentityModel" Version="4.6.0" />
<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.48" />
<PackageReference Include="LearningHub.Nhs.Caching" Version="3.0.0" />
<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.36" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.36" />
Expand Down
1 change: 1 addition & 0 deletions AdminUI/LearningHub.Nhs.AdminUI/Middleware/TimezoneInfoMiddleware.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion AdminUI/LearningHub.Nhs.AdminUI/Models/ContactViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace LearningHub.Nhs.AdminUI.Models
{
using System.ComponentModel.DataAnnotations;
using LearningHub.Nhs.Models.Binders;
using LearningHub.Nhs.Caching.Binders;

/// <summary>
/// Defines the <see cref="ContactViewModel" />.
Expand Down
1 change: 1 addition & 0 deletions AdminUI/LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions AdminUI/LearningHub.Nhs.AdminUI/Services/BaseHttpClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions AdminUI/LearningHub.Nhs.AdminUI/Services/LearningHubHttpClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions AdminUI/LearningHub.Nhs.AdminUI/Services/OpenApiHttpClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions AdminUI/LearningHub.Nhs.AdminUI/Services/ProviderService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/// <summary>
Expand Down
1 change: 1 addition & 0 deletions AdminUI/LearningHub.Nhs.AdminUI/Services/RoleService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using LearningHub.Nhs.AdminUI.Interfaces;
using LearningHub.Nhs.Caching;
using LearningHub.Nhs.Models.User;
using LearningHub.Nhs.Models.WebUtilitiesInterfaces;

/// <summary>
/// The role service.
Expand Down
1 change: 1 addition & 0 deletions AdminUI/LearningHub.Nhs.AdminUI/Services/UserApiHttpClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions AdminUI/LearningHub.Nhs.AdminUI/Services/UserGroupService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 1 addition & 0 deletions AdminUI/LearningHub.Nhs.AdminUI/Services/UserService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion AdminUI/LearningHub.Nhs.AdminUI/Views/Shared/_TimezoneInfoScriptPartial.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
{
Expand Down
8 changes: 4 additions & 4 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

<ItemGroup>

<PackageVersion Include="elfhHub.Nhs.Models" Version="3.0.9" />
<PackageVersion Include="LearningHub.Nhs.Models" Version="4.0.3" />
<PackageVersion Include="GDS.MultiPageFormData" Version="1.0.6" />
<PackageVersion Include="LearningHub.Nhs.Caching" Version="2.0.2" />
<PackageVersion Include="LearningHub.Nhs.Models" Version="3.0.48" />
<PackageVersion Include="LearningHub.Nhs.Caching" Version="3.0.0" />
<PackageVersion Include="LearningHub.Nhs.Models" Version="4.0.3" />
<PackageVersion Include="UK.NHS.CookieBanner" Version="2.0.7" />

<PackageVersion Include="AngleSharp" Version="0.16.1" />
Expand All @@ -28,7 +28,7 @@
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
<PackageVersion Include="EntityFrameworkCore.Testing.Moq" Version="9.0.1" />
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
<PackageVersion Include="FluentValidation" Version="12.0.0" />
<PackageVersion Include="FluentValidation" Version="11.11.0" />
<PackageVersion Include="FluentValidation.AspNetCore" Version="11.3.1" />
<PackageVersion Include="HtmlAgilityPack" Version="1.12.1" />
<PackageVersion Include="HtmlSanitizer" Version="6.0.453" />
Expand Down
5 changes: 4 additions & 1 deletion LearningHub.Nhs.Shared/Interfaces/Http/IAPIHttpClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
namespace LearningHub.Nhs.Shared.Interfaces.Http
using System.Net.Http;
namespace LearningHub.Nhs.Shared.Interfaces.Http
{
using System.Threading.Tasks;

/// <summary>
/// Represents an HTTP client for a specific API.
/// </summary>
Expand Down
22 changes: 14 additions & 8 deletions LearningHub.Nhs.Shared/LearningHub.Nhs.Shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<!--Shared needs to be agnostic so uses netstandard 2.1 so can be widely consumed as it has maximum compatibility-->
<TargetFrameworks>netstandard2.1</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>

<Target Name="CheckForIncompatiblePackages" BeforeTargets="Restore">
<ItemGroup>
<IncompatiblePackages Include="Microsoft.AspNetCore.Mvc;Microsoft.AspNetCore.App;System.Web;Microsoft.EntityFrameworkCore" />
</ItemGroup>
<Error Condition="'%(PackageReference.Identity)' != '' and '@(IncompatiblePackages->'%(Identity)')' == '%(PackageReference.Identity)'" Text="Incompatible package '%(PackageReference.Identity)' detected. Use .NET Standard 2.0-compatible packages for Blazor WASM compatibility." />
</Target>
<ItemGroup>
<Folder Include="Models\Contribute\" />
<Folder Include="Models\Paging\" />
<Folder Include="Models\Contribute\" />
<Folder Include="Models\Paging\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
</ItemGroup>

</Project>


</Project>
3 changes: 2 additions & 1 deletion LearningHub.Nhs.WebUI.BlazorClient/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -88,7 +89,7 @@
builder.Services.AddScoped<LoggingLevelSwitch>(sp => levelSwitch);
builder.Services.AddScoped<ILogLevelSwitcherService, SerilogLogLevelSwitcherService>();

// TODO (QQQQ) implement post TD-5925 builder.Services.AddScoped<ICacheService, WasmCacheServiceStub>();
builder.Services.AddScoped<ICacheService, WasmCacheServiceStub>();

await builder.Build().RunAsync();
}
Expand Down
4 changes: 2 additions & 2 deletions LearningHub.Nhs.WebUI.BlazorClient/Services/WasmCacheServiceStub.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// TODO (QQQQ) implement post TD-5925: using LearningHub.Nhs.Models;
using LearningHub.Nhs.Models.WebUtilitiesInterfaces;

namespace LearningHub.Nhs.WebUI.BlazorClient.Services
{
/// <summary>
/// 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.
/// </summary>
public class WasmCacheServiceStub // TODO (QQQQ) implement post TD-5925 and get from NHS.Models: ICacheService
public class WasmCacheServiceStub : ICacheService
{
public Task<T> GetAsync<T>(string key)
{
Expand Down
16 changes: 13 additions & 3 deletions LearningHub.Nhs.WebUI.Shared/LearningHub.Nhs.WebUI.Shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<!--Shared needs to be agnostic so uses netstandard 2.1 so can be widely consumed as it has maximum compatibility-->
<TargetFrameworks>netstandard2.1</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>
<Target Name="CheckForIncompatiblePackages" BeforeTargets="Restore">
<ItemGroup>
<IncompatiblePackages Include="Microsoft.AspNetCore.Mvc;Microsoft.AspNetCore.App;System.Web;Microsoft.EntityFrameworkCore" />
</ItemGroup>
<Error Condition="'%(PackageReference.Identity)' != '' and '@(IncompatiblePackages->'%(Identity)')' == '%(PackageReference.Identity)'" Text="Incompatible package '%(PackageReference.Identity)' detected. Use .NET Standard 2.0-compatible packages for Blazor WASM compatibility." />
</Target>

<ItemGroup>
<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
</ItemGroup>

</Project>
1 change: 1 addition & 0 deletions LearningHub.Nhs.WebUI/Controllers/AccountController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions LearningHub.Nhs.WebUI/Controllers/CatalogueController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
13 changes: 5 additions & 8 deletions LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -309,7 +306,7 @@ public async Task<IActionResult> SelectSecurityQuestion(int questionIndex, strin

var viewModel = new SecurityQuestionSelectViewModel
{
SecurityQuestions = securityViewModel.SecurityQuestions,
SecurityQuestions = securityViewModel.SecurityQuestions.Select(q => new SelectListItem { Value = q.Value, Text = q.Text }).ToList(),
QuestionIndex = questionIndex,
SelectedSecurityQuestionId = userQuestion.SecurityQuestionId,
};
Expand Down Expand Up @@ -360,7 +357,7 @@ public async Task<IActionResult> SelectSecurityQuestionPost(SecurityQuestionSele
{
var viewModel = new SecurityQuestionSelectViewModel
{
SecurityQuestions = securityViewModel.SecurityQuestions,
SecurityQuestions = securityViewModel.SecurityQuestions.Select(q => new SelectListItem { Value = q.Value, Text = q.Text }).ToList(),
QuestionIndex = model.QuestionIndex,
};

Expand Down Expand Up @@ -426,7 +423,7 @@ public async Task<IActionResult> AnswerSecurityQuestionPost(SecurityQuestionAnsw
{
var viewModel = new SecurityQuestionSelectViewModel
{
SecurityQuestions = securityViewModel.SecurityQuestions,
SecurityQuestions = securityViewModel.SecurityQuestions.Select(q => new SelectListItem { Value = q.Value, Text = q.Text }).ToList(),
QuestionIndex = model.QuestionIndex,
};

Expand Down
7 changes: 5 additions & 2 deletions LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -299,7 +301,8 @@ public async Task<IActionResult> SecurityQuestionsDetails(int questionIndex)
{
SecurityQuestionSelectViewModel securityViewModel = new SecurityQuestionSelectViewModel();
var model = await this.loginWizardService.GetSecurityQuestionsModel(this.CurrentUserId);
securityViewModel.SecurityQuestions = model.SecurityQuestions;

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);
Expand Down Expand Up @@ -505,7 +508,7 @@ public async Task<IActionResult> 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)
{
Expand Down
1 change: 1 addition & 0 deletions LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/Controllers/UserController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ public async Task<IActionResult> 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();
securityQuestionsModel.SecurityQuestions = questions.Select(q => (Value: q.Id.ToString(), Text: q.Text)).ToList();
}

return this.View("AdditionalSecurity", securityQuestionsModel);
Expand Down
1 change: 1 addition & 0 deletions LearningHub.Nhs.WebUI/Filters/LoginWizardFilter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading
Loading