Skip to content

Commit aad581a

Browse files
bxdaviesbxdavies
committed
Fix SettingsService.cs
1 parent f6f03ce commit aad581a

12 files changed

Lines changed: 161 additions & 71 deletions

File tree

‎Components/Pages/Account/Localization.razor.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,15 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
4646
if (_settings.Auth0UserId == null || _settings.OrganizationId == null || _settings.UserId == null ||
4747
_settings.S3Endpoint == null)
4848
{
49+
// Get the settings redirect url
50+
string? settingsRedirect = await SettingsService.CheckOrSet();
51+
52+
// If the settings redirect url is not null then redirect
53+
if (settingsRedirect != null)
54+
{
55+
NavigationManager.NavigateTo(settingsRedirect, true);
56+
}
57+
4958
// Use the setting service to retrieve the settings
5059
_settings = await SettingsService.Get();
5160

‎Components/Pages/Audit.razor.cs‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage;
2-
using MudBlazor;
1+
using MudBlazor;
32
using Web.Models;
43

54
namespace Web.Components.Pages;
@@ -9,6 +8,8 @@ public class AuditBase : ComponentBase
98
[Inject] private LighthouseNotesAPIGet LighthouseNotesApiGet { get; set; } = default!;
109

1110
[Inject] private ISettingsService SettingsService { get; set; } = default!;
11+
12+
[Inject] private NavigationManager NavigationManager { get; set; } = default!;
1213

1314
// Page variables
1415
protected Settings Settings = new();
@@ -20,6 +21,15 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
2021
if (Settings.Auth0UserId == null || Settings.OrganizationId == null || Settings.UserId == null ||
2122
Settings.S3Endpoint == null)
2223
{
24+
// Get the settings redirect url
25+
string? settingsRedirect = await SettingsService.CheckOrSet();
26+
27+
// If the settings redirect url is not null then redirect
28+
if (settingsRedirect != null)
29+
{
30+
NavigationManager.NavigateTo(settingsRedirect, true);
31+
}
32+
2333
// Use the setting service to retrieve the settings
2434
Settings = await SettingsService.Get();
2535

‎Components/Pages/Case/Case.razor.cs‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System.ComponentModel.DataAnnotations;
22
using Microsoft.AspNetCore.Components.Forms;
3-
using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage;
43
using MudBlazor;
54

65
namespace Web.Components.Pages.Case;
@@ -11,10 +10,10 @@ public class CaseBase : ComponentBase
1110
[Inject] private LighthouseNotesAPIGet LighthouseNotesAPIGet { get; set; } = default!;
1211
[Inject] private LighthouseNotesAPIPut LighthouseNotesAPIPut { get; set; } = default!;
1312
[Inject] private LighthouseNotesAPIDelete LighthouseNotesAPIDelete { get; set; } = default!;
14-
[Inject] private ProtectedLocalStorage ProtectedLocalStore { get; set; } = null!;
1513
[Inject] private ISnackbar Snackbar { get; set; } = default!;
1614
[Inject] private IJSRuntime JS { get; set; } = default!;
1715
[Inject] private ISettingsService SettingsService { get; set; } = default!;
16+
[Inject] private NavigationManager NavigationManager { get; set; } = default!;
1817

1918
// Page variables
2019
protected API.Case SCase = null!;
@@ -54,6 +53,15 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
5453
if (Settings.Auth0UserId == null || Settings.OrganizationId == null || Settings.UserId == null ||
5554
Settings.S3Endpoint == null)
5655
{
56+
// Get the settings redirect url
57+
string? settingsRedirect = await SettingsService.CheckOrSet();
58+
59+
// If the settings redirect url is not null then redirect
60+
if (settingsRedirect != null)
61+
{
62+
NavigationManager.NavigateTo(settingsRedirect, true);
63+
}
64+
5765
// Use the setting service to retrieve the settings
5866
Settings = await SettingsService.Get();
5967

‎Components/Pages/Case/Exhibits.razor.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ public class ExhibitsBase : ComponentBase
1313
[Inject] private LighthouseNotesAPIPost LighthouseNotesAPIPost { get; set; } = default!;
1414
[Inject] private ISettingsService SettingsService { get; set; } = default!;
1515
[Inject] private ISnackbar Snackbar { get; set; } = default!;
16+
[Inject] private NavigationManager NavigationManager { get; set; } = default!;
1617

1718
// Page variables
1819
protected PageLoad? PageLoad;
@@ -59,6 +60,15 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
5960
if (Settings.Auth0UserId == null || Settings.OrganizationId == null || Settings.UserId == null ||
6061
Settings.S3Endpoint == null)
6162
{
63+
// Get the settings redirect url
64+
string? settingsRedirect = await SettingsService.CheckOrSet();
65+
66+
// If the settings redirect url is not null then redirect
67+
if (settingsRedirect != null)
68+
{
69+
NavigationManager.NavigateTo(settingsRedirect, true);
70+
}
71+
6272
// Use the setting service to retrieve the settings
6373
Settings = await SettingsService.Get();
6474

‎Components/Pages/Case/Personal/ContemporaneousNotes.Razor.cs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ public class ContemporaneousNotesBase : ComponentBase
2323
[Inject] private IConfiguration Configuration { get; set; } = default!;
2424

2525
[Inject] private ISettingsService SettingsService { get; set; } = default!;
26+
27+
[Inject] private NavigationManager NavigationManager { get; set; } = default!;
2628

2729
// Contemporaneous Notes Expansion Panel Variables
2830
private protected static MudExpansionPanels? ContemporaneousNotesCollapse;
@@ -98,6 +100,15 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
98100
if (Settings.Auth0UserId == null || Settings.OrganizationId == null || Settings.UserId == null ||
99101
Settings.S3Endpoint == null)
100102
{
103+
// Get the settings redirect url
104+
string? settingsRedirect = await SettingsService.CheckOrSet();
105+
106+
// If the settings redirect url is not null then redirect
107+
if (settingsRedirect != null)
108+
{
109+
NavigationManager.NavigateTo(settingsRedirect, true);
110+
}
111+
101112
// Use the setting service to retrieve the settings
102113
Settings = await SettingsService.Get();
103114

‎Components/Pages/Case/Personal/Tab.Razor.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ public class TabBase : ComponentBase
1111
[Inject] private IDialogService Dialog { get; set; } = default!;
1212
[Inject] private IConfiguration Configuration { get; set; } = default!;
1313
[Inject] private ISettingsService SettingsService { get; set; } = default!;
14+
[Inject] private NavigationManager NavigationManager { get; set; } = default!;
1415

1516
// API Objects
1617
protected API.Tab Tab = null!;
@@ -68,6 +69,15 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
6869
if (Settings.Auth0UserId == null || Settings.OrganizationId == null || Settings.UserId == null ||
6970
Settings.S3Endpoint == null)
7071
{
72+
// Get the settings redirect url
73+
string? settingsRedirect = await SettingsService.CheckOrSet();
74+
75+
// If the settings redirect url is not null then redirect
76+
if (settingsRedirect != null)
77+
{
78+
NavigationManager.NavigateTo(settingsRedirect, true);
79+
}
80+
7181
// Use the setting service to retrieve the settings
7282
Settings = await SettingsService.Get();
7383

‎Components/Pages/Case/Shared/ContemporaneousNotes.Razor.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,15 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
101101
if (Settings.Auth0UserId == null || Settings.OrganizationId == null || Settings.UserId == null ||
102102
Settings.S3Endpoint == null)
103103
{
104+
// Get the settings redirect url
105+
string? settingsRedirect = await SettingsService.CheckOrSet();
106+
107+
// If the settings redirect url is not null then redirect
108+
if (settingsRedirect != null)
109+
{
110+
NavigationManager.NavigateTo(settingsRedirect, true);
111+
}
112+
104113
// Use the setting service to retrieve the settings
105114
Settings = await SettingsService.Get();
106115

‎Components/Pages/Case/Shared/Tab.Razor.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,15 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
7676
if (Settings.Auth0UserId == null || Settings.OrganizationId == null || Settings.UserId == null ||
7777
Settings.S3Endpoint == null)
7878
{
79+
// Get the settings redirect url
80+
string? settingsRedirect = await SettingsService.CheckOrSet();
81+
82+
// If the settings redirect url is not null then redirect
83+
if (settingsRedirect != null)
84+
{
85+
NavigationManager.NavigateTo(settingsRedirect, true);
86+
}
87+
7988
// Use the setting service to retrieve the settings
8089
Settings = await SettingsService.Get();
8190

‎Components/Pages/Error.razor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ protected override async Task OnParametersSetAsync()
3434
try
3535
{
3636
Models.Error errorMessage = JsonSerializer.Deserialize<Models.Error>(responseContent)!;
37-
Description = errorMessage?.Detail ??
37+
Description = errorMessage.Detail ??
3838
System.Text.RegularExpressions.Regex.Unescape(responseContent).Replace("\"", "");
3939
}
4040
catch

‎Components/Pages/Home.razor.cs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ public class HomeBase : ComponentBase
1616
[Inject] private IHostEnvironment HostEnvironment { get; set; } = default!;
1717

1818
[Inject] private ISettingsService SettingsService { get; set; } = default!;
19+
20+
[Inject] private NavigationManager NavigationManager { get; set; } = default!;
1921

2022
// Page variables
2123
protected PageLoad? PageLoad;
@@ -52,6 +54,15 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
5254
if (Settings.Auth0UserId == null || Settings.OrganizationId == null || Settings.UserId == null ||
5355
Settings.S3Endpoint == null)
5456
{
57+
// Get the settings redirect url
58+
string? settingsRedirect = await SettingsService.CheckOrSet();
59+
60+
// If the settings redirect url is not null then redirect
61+
if (settingsRedirect != null)
62+
{
63+
NavigationManager.NavigateTo(settingsRedirect, true);
64+
}
65+
5566
// Use the setting service to retrieve the settings
5667
Settings = await SettingsService.Get();
5768

0 commit comments

Comments
 (0)