Merge pull request #3436 from sbwalker/net8

complete fix for #3427 in User Profile component

Oqtane.Client/Modules/Admin/UserProfile/Index.razor

@@ -11,6 +11,8 @@
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
+@if (_initialized)
+{
     @if (PageState.User != null && photo != null)
     {
         <img src="@ImageUrl(photofileid, 400, 400)" alt="@displayname" style="max-width: 400px" class="rounded-circle mx-auto d-block">
@@ -21,8 +23,6 @@ else
     }
     <TabStrip>
         <TabPanel Name="Identity" ResourceKey="Identity">
-        @if (profiles != null && settings != null)
-        {
             <ModuleMessage Message="@_passwordrequirements" Type="MessageType.Info" />
             <div class="container">
                 <div class="row mb-1 align-items-center">
@@ -83,11 +83,8 @@ else
             <br />
             <button type="button" class="btn btn-success" @onclick="Save">@SharedLocalizer["Save"]</button>
             <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
-        }
         </TabPanel>
         <TabPanel Name="Profile" ResourceKey="Profile">
-        @if (profiles != null && settings != null)
-        {
             <div class="container">
                 <div class="row mb-1 align-items-center">
                     @foreach (Profile profile in profiles)
@@ -154,19 +151,16 @@ else
             </div>
             <button type="button" class="btn btn-success" @onclick="Save">@SharedLocalizer["Save"]</button>
             <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
-        }
         </TabPanel>
         <TabPanel Name="Notifications" ResourceKey="Notifications">
-        @if (notifications != null)
+            <ActionLink Action="Add" Text="Send Notification" Security="SecurityAccessLevel.View" EditMode="false" ResourceKey="SendNotification" />
-        {
+            <br />
+            <br />
             <select class="form-select" @onchange="(e => FilterChanged(e))">
                 <option value="to">@Localizer["Inbox"]</option>
                 <option value="from">@Localizer["Items.Sent"]</option>
             </select>
             <br />
-            <ActionLink Action="Add" Text="Send Notification" Security="SecurityAccessLevel.View" EditMode="false" ResourceKey="SendNotification" />
-            <br />
-            <br />
             @if (filter == "to")
             {
                 @if (notifications.Any())
@@ -294,12 +288,14 @@ else
                     </div>
                 }
             }
-        }
         </TabPanel>
     </TabStrip>
-<br /><br />
+    <br />
+    <br />
+}
 
 @code {
+    private bool _initialized = false;
     private string _passwordrequirements;
     private string username = string.Empty;
     private string _password = string.Empty;
@@ -325,15 +321,14 @@ else
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
 
-    protected override async Task OnParametersSetAsync()
+    protected override async Task OnInitializedAsync()
     {
         try
         {
             _passwordrequirements = await UserService.GetPasswordRequirementsAsync(PageState.Site.SiteId);
-
             _togglepassword = SharedLocalizer["ShowPassword"];
-
             allowtwofactor = (SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:TwoFactor", "false") == "true");
+            profiles = await ProfileService.GetProfilesAsync(ModuleState.SiteId);
 
             if (PageState.User != null)
             {
@@ -360,10 +355,11 @@ else
                     photo = null;
                 }
 
-                profiles = await ProfileService.GetProfilesAsync(ModuleState.SiteId);
                 settings = await SettingService.GetUserSettingsAsync(PageState.User.UserId);
 
                 await LoadNotificationsAsync();
+
+                _initialized = true;
             }
             else
             {
@@ -463,13 +459,14 @@ else
     {
         foreach (Profile profile in profiles)
         {
-            if (string.IsNullOrEmpty(SettingService.GetSetting(settings, profile.Name, string.Empty)) && !string.IsNullOrEmpty(profile.DefaultValue))
+            var value = GetProfileValue(profile.Name, string.Empty);
+            if (string.IsNullOrEmpty(value) && !string.IsNullOrEmpty(profile.DefaultValue))
             {
                 settings = SettingService.SetSetting(settings, profile.Name, profile.DefaultValue);
             }
             if (!profile.IsPrivate || UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
             {
-                if (profile.IsRequired && string.IsNullOrEmpty(SettingService.GetSetting(settings, profile.Name, string.Empty)))
+                if (profile.IsRequired && string.IsNullOrEmpty(value))
                 {
                     AddModuleMessage(string.Format(SharedLocalizer["ProfileRequired"], profile.Title), MessageType.Warning);
                     return false;
@@ -477,7 +474,7 @@ else
                 if (!string.IsNullOrEmpty(profile.Validation))
                 {
                     Regex regex = new Regex(profile.Validation);
-                    bool valid = regex.Match(SettingService.GetSetting(settings, profile.Name, string.Empty)).Success;
+                    bool valid = regex.Match(value).Success;
                     if (!valid)
                     {
                         AddModuleMessage(string.Format(SharedLocalizer["ProfileInvalid"], profile.Title), MessageType.Warning);
@@ -528,7 +525,6 @@ else
     private async void FilterChanged(ChangeEventArgs e)
     {
         filter = (string)e.Value;
-
         await LoadNotificationsAsync();
         StateHasChanged();
     }