Update version to 1.1.4, refactor dialog components for visibility control, and adjust theme settings for LittleHelpBook.

Author: markdav-is

OpenEugene.Module.LittleHelpBook/Client/Modules/Provider/Dialogs/AddAddress.razor

@@ -6,9 +6,9 @@
 @inject IStringLocalizer<OpenEugene.Module.Provider.Index> Localizer
 @inject IDialogService DialogService
 
-<MudDialog>
+<MudDialog @bind-Visible="@visible">
     <DialogContent>
-        <Address Addr="@addr"></Address>
+        <AddressEdit Addr="@addr"></AddressEdit>
     </DialogContent>
     <DialogActions>
         <MudButton Color="Color.Primary" OnClick="@(()=> AddAddr())">@Localizer["Save"]</MudButton>
@@ -19,12 +19,15 @@
  @code {
 
     private M.Address addr = new();
+    bool visible = true;
+
 
     [CascadingParameter] MudDialogInstance MudDialog { get; set; }
     [Parameter] public int Id { get; set; }
 
     private void Back()
     {
+        visible = false;
         MudDialog.Cancel();
     }
 

OpenEugene.Module.LittleHelpBook/Client/Modules/Provider/Dialogs/AddAttribute.razor

@@ -6,7 +6,7 @@
 @inject NavigationManager NavigationManager
 @inject IStringLocalizer<OpenEugene.Module.Provider.Index> Localizer
 
-<MudDialog>
+<MudDialog @bind-Visible="@visible">
     <DialogContent>
         @if (_attributes != null)
         {
@@ -32,7 +32,7 @@
     </DialogContent>
     <DialogActions>
         <MudButton Color="Color.Primary" OnClick="@(()=> AddProviderAttribute())">Add</MudButton>
-        <MudButton Color="Color.Secondary" OnClick="@(()=> Back())">@Localizer["Cancel"]</MudButton>
+        <MudButton Color="Color.Secondary" OnClick="Back">@Localizer["Cancel"]</MudButton>
     </DialogActions>
 </MudDialog>
 
@@ -51,13 +51,16 @@
     private MudSelect<M.Attribute> _selectCategory;
 
     bool success;
+    bool visible = true;
+
     string[] errors = { };
 
-    protected override async Task OnInitializedAsync()
+    protected override async Task OnParametersSetAsync()
     {
         await ReadData();
         _allAttributes = await AttributeService.GetAttributesAsync();
         ResetDropDowns();
+        visible = true;
     }
 
     private async Task ReadData()
@@ -98,11 +101,12 @@
             AttributeId = _selectedSubcategory?.AttributeId ?? _selectedCategory.AttributeId
         };
         await ProviderService.AddProviderAttribute(pa);
-        MudDialog.Close();
+        MudDialog.Close(DialogResult.Ok(true));
     }
 
     private void Back()
     {
+        visible = false;
         MudDialog.Cancel();
     }
 

OpenEugene.Module.LittleHelpBook/Client/Modules/Provider/Dialogs/AddPhone.razor

@@ -5,13 +5,13 @@
 @inject IStringLocalizer<OpenEugene.Module.Provider.Index> Localizer
 @inject NavigationManager NavigationManager
 
-<MudDialog>
+<MudDialog @bind-Visible="@visible">
     <DialogContent>
-        <PhoneNumber Phone="@_phone"></PhoneNumber>
+        <PhoneNumberEdit Phone="@_phone"></PhoneNumberEdit>
     </DialogContent>
     <DialogActions>
-        <MudButton Color="Color.Primary" OnClick="@(()=> AddPhoneNumber())">@Localizer["Save"]</MudButton>
-        <MudButton Color="Color.Secondary" OnClick="@(()=> Back())">@Localizer["Cancel"]</MudButton>
+        <MudButton Color="Color.Primary" OnClick="AddPhoneNumber">@Localizer["Save"]</MudButton>
+        <MudButton Color="Color.Secondary" OnClick="Back">@Localizer["Cancel"]</MudButton>
     </DialogActions>
 </MudDialog>
 
@@ -22,15 +22,18 @@
     [CascadingParameter] MudDialogInstance MudDialog { get; set; }
     [Parameter] public int Id { get; set; }
 
+    bool visible = true;
+
     private void Back()
     {
+        visible = false;
         MudDialog.Cancel();
     }
 
     private async Task AddPhoneNumber()
     {
         _phone.ProviderId = Id;
         await PhoneNumberService.AddPhoneNumberAsync(_phone);
-        MudDialog.Close();
+        MudDialog.Close(DialogResult.Ok(true));
     }
 }

OpenEugene.Module.LittleHelpBook/Client/Modules/Provider/Edit.razor

@@ -12,6 +12,13 @@
 
 @if (_model != null)
 {
+ 
+    <MudDialogProvider 
+        CloseButton="true"
+        BackdropClick="true"
+        CloseOnEscapeKey="true" />
+    <MudPopoverProvider />
+
     <EditForm @ref="form" Model="@_model"
               OnValidSubmit="OnValidSubmit"
               OnInvalidSubmit="OnInvalidSubmit">
@@ -197,8 +204,7 @@
     {
         var parameters = new DialogParameters<AddPhone>();
         parameters.Add(x => x.Id, _id);
-        var options = new DialogOptions { CloseOnEscapeKey = true };
-        var dialog = await DialogService.ShowAsync<AddPhone>("Add Phone Number", parameters, options);
+        var dialog = await DialogService.ShowAsync<AddPhone>("Add Phone Number", parameters);
         var result = await dialog.Result;
         if (!result.Canceled)
         {

OpenEugene.Module.LittleHelpBook/Client/Services/AttributeService.cs

@@ -19,10 +19,17 @@ public AttributeService(HttpClient http, SiteState siteState) : base(http, siteS
 
         public async Task<List<Models.Attribute>> GetAttributesAsync()
         {
-            List<Models.Attribute> list = await GetJsonAsync<List<Models.Attribute>>($"{Apiurl}");
-            if (list != null)
+            try
             {
-                return list.OrderBy(item => item.Name).ToList();
+                List<Models.Attribute> list = await GetJsonAsync<List<Models.Attribute>>($"{Apiurl}");
+                if (list != null)
+                {
+                    return list.OrderBy(item => item.Name).ToList();
+                }
+            }
+            catch (Exception ex)
+            {
+                var message = ex.Message;
             }
             return null;
         }

OpenEugene.Module.LittleHelpBook/Package/OpenEugene.Module.LittleHelpBook.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>OpenEugene.LittleHelpBook</id>
-    <version>1.1.3</version>
+    <version>1.1.4</version>
     <authors>OpenEugene</authors>
     <owners>OpenEugene</owners>
     <title>LittleHelpBook</title>

OpenEugene.Module.LittleHelpBook/Server/Repository/AttributeRepository.cs

@@ -16,7 +16,7 @@ public IEnumerable<Attribute> GetAttributes() {
             using var db = _factory.CreateDbContext();
             var list = from a in db.Attribute.AsNoTracking()
                        select a;
-            return list;
+            return list.ToList();
         }
 
     }

OpenEugene.Theme.LittleHelpBook/Client/ThemeInfo.cs

@@ -30,8 +30,7 @@ public class ThemeInfo : ITheme
                 //MudBlazor
                 new Resource { ResourceType = ResourceType.Stylesheet, Url = "https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" },
                 new Resource { ResourceType = ResourceType.Stylesheet, Url = "_content/MudBlazor/MudBlazor.min.css" },
-                //new Resource { ResourceType = ResourceType.Script,     Url = "_content/MudBlazor/MudBlazor.min.js", Level=ResourceLevel.Site },
-
+                new Resource { ResourceType = ResourceType.Script,     Url = "_content/MudBlazor/MudBlazor.min.js", Level=ResourceLevel.Site,Location=ResourceLocation.Body },
                 new Resource { ResourceType = ResourceType.Stylesheet, Url = "~/Theme.css"},
             }
         };

OpenEugene.Theme.LittleHelpBook/Client/Themes/Theme.razor

@@ -6,8 +6,10 @@
 @inherits ThemeBase
 
 <MudThemeProvider @ref=_mudThemeProvider @bind-IsDarkMode=_darkMode Theme="LittleHelpMudTheme" />
-<MudPopoverProvider />
+@* these are set in pages that need them
 <MudDialogProvider />
+<MudPopoverProvider />
+ *@
 <MudSnackbarProvider />
 
 <MudLayout>

OpenEugene.Theme.LittleHelpBook/Client/Themes/Theme.razor.cs

@@ -55,9 +55,19 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
 
          MudTheme LittleHelpMudTheme = new MudTheme()
         {
+             ZIndex = new ZIndex()
+             {
+                 Drawer = 1000,
+                 AppBar = 1100,
+                 Dialog = 1200,
+                 Snackbar = 1300,
+                 Tooltip = 1400,
+                 Popover = 1500,                
+             },
             PaletteLight = new PaletteLight() {
             },
             PaletteDark = new PaletteDark() {
+                
             },
         };
     }

OpenEugene.Theme.LittleHelpBook/Package/OpenEugene.Theme.LittleHelpBook.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
 		<id>OpenEugene.Theme.LittleHelpBook</id>
-		<version>1.1.3</version>
+		<version>1.1.4</version>
 		<authors>OpenEugene</authors>
 		<owners>OpenEugene</owners>
 		<title>LittleHelpBook</title>