#370 - Allow to disable bottom menu by configuring zero items.

maraf · Jun 7, 2021 · 0595a45 · 0595a45
1 parent caa6b99
commit 0595a45
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 37 deletions.
diff --git a/src/Money.Blazor.Host/Layouts/BottomMenu.razor b/src/Money.Blazor.Host/Layouts/BottomMenu.razor
@@ -1,30 +1,34 @@
-@if (Items != null)
+@if (Items != null && Items.Count > 0)
 {
-    <div class="row my-2 items-@Items.Count">
-        @foreach (var item in Items)
-        {
-            <div class="col">
-                @if (item.Url != null)
+    <nav class="fixed-bottom d-block d-sm-none bottom-bar">
+        <div class="container">
+            <div class="row my-2 items-@Items.Count">
+                @foreach (var item in Items)
                 {
-                    <Match Url="@item.Url" PageType="@item.PageType" Context="IsActive">
-                        <a href="@item.Url" class="btn btn-block @(IsActive ? "btn-primary" : "btn-light")">
-                            <Icon Identifier="@item.Icon" />
-                            <span class="text">
-                                @item.Text
-                            </span>
-                        </a>
-                    </Match>
-                }
-                else
-                {
-                    <button @onclick="@item.OnClick" class="btn btn-block btn-light">
-                        <Icon Identifier="@item.Icon" />
-                        <span class="text">
-                            @item.Text
-                        </span>
-                    </button>
+                    <div class="col">
+                        @if (item.Url != null)
+                        {
+                            <Match Url="@item.Url" PageType="@item.PageType" Context="IsActive">
+                                <a href="@item.Url" class="btn btn-block @(IsActive ? "btn-primary" : "btn-light")">
+                                    <Icon Identifier="@item.Icon" />
+                                    <span class="text">
+                                        @item.Text
+                                    </span>
+                                </a>
+                            </Match>
+                        }
+                        else
+                        {
+                            <button @onclick="@item.OnClick" class="btn btn-block btn-light">
+                                <Icon Identifier="@item.Icon" />
+                                <span class="text">
+                                    @item.Text
+                                </span>
+                            </button>
+                        }
+                    </div>
                 }
             </div>
-        }
-    </div>
-}
+        </div>
+    </nav>
+}
diff --git a/src/Money.Blazor.Host/Layouts/Layout.razor b/src/Money.Blazor.Host/Layouts/Layout.razor
@@ -9,13 +9,10 @@
 <div class="container body-content">
     @Body
 </div>
-<nav class="fixed-bottom d-block d-sm-none bottom-bar">
-    <div class="container">
-        <AuthenticatedView>
-            <BottomMenu />
-        </AuthenticatedView>
-    </div>
-</nav>
+<AuthenticatedView>
+    <BottomMenu />
+</AuthenticatedView>
+
 <footer class="navbar navbar-light d-none d-sm-block">
     <div class="container">
         <span class="navbar-text">

diff --git a/src/Money.Blazor.Host/MenuItems/MenuItemService.cs b/src/Money.Blazor.Host/MenuItems/MenuItemService.cs
@@ -65,7 +65,10 @@ async Task<object> HttpQueryDispatcher.IMiddleware.ExecuteAsync(object query, Ht
             if (query is ListBottomMenuItem)
             {
                 var value = await dispatcher.QueryAsync(new FindUserProperty("MobileMenu"));
-                var selectedItems = value.Split(',');
+
+                Console.WriteLine($"MM: (1) '{value}', {value == null}, {value == String.Empty}");
+
+                var selectedItems = value != null ? value.Split(',') : Array.Empty<string>();
 
                 return storage.Where(m => selectedItems.Contains(m.Identifier)).ToList<IActionMenuItemModel>();
             }
@@ -76,14 +79,21 @@ async Task<object> HttpQueryDispatcher.IMiddleware.ExecuteAsync(object query, Ht
             else if (query is FindUserProperty findProperty && findProperty.Key == "MobileMenu")
             {
                 var value = (string)await next(findProperty);
-                if (String.IsNullOrEmpty(value))
+
+                Console.WriteLine($"MM: (2) '{value}', {value == null}, {value == String.Empty}");
+
+                if (value == null)
                     return DefaultValue;
+
+                return value;
             }
             else if (query is ListUserProperty listProperty)
             {
                 var value = (List<UserPropertyModel>)await next(listProperty);
                 var property = value.FirstOrDefault(p => p.Key == "MobileMenu");
-                if (property != null && String.IsNullOrEmpty(property.Value))
+
+                Console.WriteLine($"MM: (3) '{property.Value}', {property.Value == null}, {property.Value == String.Empty}");
+                if (property != null && property.Value == null)
                     property.Value = DefaultValue;
 
                 return value;

diff --git a/src/Money.Blazor.Host/Pages/Users/Settings.razor.cs b/src/Money.Blazor.Host/Pages/Users/Settings.razor.cs
@@ -59,7 +59,9 @@ protected async override Task OnInitializedAsync()
 
             await LoadAsync();
 
-            MobileSelectedIdentifiers = MobileMenu.CurrentValue.Split(',').ToList();
+            MobileSelectedIdentifiers = MobileMenu.CurrentValue != null 
+                ? MobileMenu.CurrentValue.Split(',').ToList()
+                : new List<string>(0);
         }
 
         public void Dispose()