Update 1.4.0

Breaking Change: DetailTemplate/EmptyDataTemplate/LoadingDataTemplate no longer need nested Template component Exposed Filtered Items Added Custom Select IFilter Fixed custom IFilters not rendering
IvanJosipovic · Mar 9, 2020 · 7102ac1 · 7102ac1
2 parents 47d3cfe + bdc56c7
commit 7102ac1
Show file tree

Hide file tree

Showing 28 changed files with 325 additions and 79 deletions.
diff --git a/src/BlazorTable.Sample.Server/Properties/launchSettings.json b/src/BlazorTable.Sample.Server/Properties/launchSettings.json
@@ -18,10 +18,11 @@
     "BlazorTable.Sample.Server": {
       "commandName": "Project",
       "launchBrowser": true,
-      "applicationUrl": "http://localhost:51075/",
+      "launchUrl": "/CustomSelect",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      }
+      },
+      "applicationUrl": "http://localhost:51075/"
     }
   }
-}
+}
diff --git a/src/BlazorTable.Sample.Shared/NavMenu.razor b/src/BlazorTable.Sample.Shared/NavMenu.razor
@@ -42,6 +42,11 @@
                 <span class="oi oi-home" aria-hidden="true"></span> JObject
             </NavLink>
         </li>
+        <li class="nav-item px-3">
+            <NavLink class="nav-link" href="/CustomSelect" Match="NavLinkMatch.All">
+                <span class="oi oi-home" aria-hidden="true"></span> CustomSelect
+            </NavLink>
+        </li>
     </ul>
 </div>
 

diff --git a/src/BlazorTable.Sample.Shared/Pages/CustomSelectExample.razor b/src/BlazorTable.Sample.Shared/Pages/CustomSelectExample.razor
@@ -0,0 +1,53 @@
+@page "/CustomSelect"
+
+@using BlazorTable
+
+<h1>CustomSelect</h1>
+
+<p>The <code>CustomSelect</code> can be used to display custom filter options.</p>
+<br />
+<Table TableItem="PersonData" Items="data" PageSize="15" ColumnReorder="true">
+    <Column TableItem="PersonData" Title="Full Name" Field="@(x => x.full_name)" Sortable="true" Filterable="true" Width="20%">
+        <CustomIFilters>
+            <CustomSelect TableItem="PersonData">
+                <CustomSelectOption Key="Astrix Mariette" Value="@("Astrix Mariette")" />
+                <CustomSelectOption Key="Marja Mustill" Value="@("Marja Mustill")" />
+                <CustomSelectOption Key="Creighton Keyzman" Value="@("Creighton Keyzman")" />
+                <CustomSelectOption Key="Jacobo Linton" Value="@("Jacobo Linton")" />
+                <CustomSelectOption Key="Michael O'Dyvoy" Value="@("Michael O'Dyvoy")" />
+            </CustomSelect>
+        </CustomIFilters>
+    </Column>
+</Table>
+
+@code
+{
+    [Inject]
+    private HttpClient Http { get; set; }
+
+    private PersonData[] data;
+
+    protected override async Task OnInitializedAsync()
+    {
+        data = await Http.GetJsonAsync<PersonData[]>("sample-data/MOCK_DATA.json");
+    }
+
+    public class PersonData
+    {
+        public int? id { get; set; }
+        public string full_name { get; set; }
+        public string email { get; set; }
+        public bool? paid { get; set; }
+        public decimal? price { get; set; }
+        public CreditCard? cc_type { get; set; }
+        public DateTime? created_date { get; set; }
+    }
+
+    public enum CreditCard
+    {
+        none = 0,
+        [Description("MasterCard")]
+        MasterCard = 1,
+        Visa = 2
+    }
+}
diff --git a/src/BlazorTable.Sample.Shared/Pages/Detail.razor b/src/BlazorTable.Sample.Shared/Pages/Detail.razor
@@ -31,14 +31,12 @@
         </Template>
     </Column>
     <DetailTemplate TableItem="PersonData">
-        <Template Context="personContext">
-            <strong>Name</strong> @personContext.full_name
-            <br />
-            <strong>Email</strong> @personContext.email
-            <br />
-            <strong>Created Date</strong>@personContext.created_date
-            <br />
-        </Template>
+        <strong>Name</strong> @context.full_name
+        <br />
+        <strong>Email</strong> @context.email
+        <br />
+        <strong>Created Date</strong>@context.created_date
+        <br />
     </DetailTemplate>
     <Pager ShowPageNumber="true" ShowTotalCount="true" />
 </Table>

diff --git a/src/BlazorTable.Sample.Shared/Pages/EmptyData.razor b/src/BlazorTable.Sample.Shared/Pages/EmptyData.razor
@@ -10,11 +10,9 @@
     <Column TableItem="SampleData" Title="Id" Field="@(x => x.id)" Sortable="true" Filterable="true" Width="10%" DefaultSortColumn="true" />
     <Column TableItem="SampleData" Title="Full Name" Field="@(x => x.full_name)" Sortable="true" Filterable="true" Width="20%" />
     <EmptyDataTemplate>
-        <Template>
-            <div class="text-center">
-                No rows found!
-            </div>
-        </Template>
+        <div class="text-center">
+            No rows found!
+        </div>
     </EmptyDataTemplate>
     <Pager ShowPageNumber="true" ShowTotalCount="true" />
 </Table>

diff --git a/src/BlazorTable.Sample.Shared/Pages/Index.razor b/src/BlazorTable.Sample.Shared/Pages/Index.razor
@@ -35,35 +35,33 @@
             @context.cc_type
         </Template>
     </Column>
-    <DetailTemplate TableItem="PersonData">
-        <Template Context="personContext">
-            <Table TableItem="PersonData" Items="data" PageSize="15" ColumnReorder="true" TableRowClass="@(x => x.RowClass)" style="background-color: white;">
-                <Column TableItem="PersonData" Title="Id" Field="@(x => x.id)" Sortable="true" Filterable="true" Width="10%" DefaultSortColumn="true" />
-                <Column TableItem="PersonData" Title="Full Name" Field="@(x => x.full_name)" Sortable="true" Filterable="true" Width="20%" />
-                <Column TableItem="PersonData" Title="Email" Field="@(x => x.email)" Sortable="true" Filterable="true" Width="20%">
-                    <Template>
-                        <a href="mailto:@context.email">@context.email</a>
-                    </Template>
-                </Column>
-                <Column TableItem="PersonData" Title="Paid" Field="@(x => x.paid)" Sortable="true" Filterable="true" Width="10%">
-                    <Template>
-                        @context.paid.ToString()
-                    </Template>
-                </Column>
-                <Column TableItem="PersonData" Title="Price" Field="@(x => x.price)" Sortable="true" Filterable="true" Width="10%" Format="C" Align="Align.Right" />
-                <Column TableItem="PersonData" Title="Created Date" Field="@(x => x.created_date)" Sortable="true" Filterable="true" Width="10%">
-                    <Template>
-                        @(context.created_date.HasValue ? context.created_date.Value.ToShortDateString() : string.Empty)
-                    </Template>
-                </Column>
-                <Column TableItem="PersonData" Title="Enum" Field="@(x => x.cc_type)" Sortable="true" Filterable="true" Width="10%">
-                    <Template>
-                        @context.cc_type
-                    </Template>
-                </Column>
-                <Pager ShowPageNumber="true" ShowTotalCount="true" />
-            </Table>
-        </Template>
+    <DetailTemplate TableItem="PersonData" Context="context2">
+        <Table TableItem="PersonData" Items="data" PageSize="15" ColumnReorder="true" TableRowClass="@(x => x.RowClass)" style="background-color: white;">
+            <Column TableItem="PersonData" Title="Id" Field="@(x => x.id)" Sortable="true" Filterable="true" Width="10%" DefaultSortColumn="true" />
+            <Column TableItem="PersonData" Title="Full Name" Field="@(x => x.full_name)" Sortable="true" Filterable="true" Width="20%" />
+            <Column TableItem="PersonData" Title="Email" Field="@(x => x.email)" Sortable="true" Filterable="true" Width="20%">
+                <Template>
+                    <a href="mailto:@context.email">@context.email</a>
+                </Template>
+            </Column>
+            <Column TableItem="PersonData" Title="Paid" Field="@(x => x.paid)" Sortable="true" Filterable="true" Width="10%">
+                <Template>
+                    @context.paid.ToString()
+                </Template>
+            </Column>
+            <Column TableItem="PersonData" Title="Price" Field="@(x => x.price)" Sortable="true" Filterable="true" Width="10%" Format="C" Align="Align.Right" />
+            <Column TableItem="PersonData" Title="Created Date" Field="@(x => x.created_date)" Sortable="true" Filterable="true" Width="10%">
+                <Template>
+                    @(context.created_date.HasValue ? context.created_date.Value.ToShortDateString() : string.Empty)
+                </Template>
+            </Column>
+            <Column TableItem="PersonData" Title="Enum" Field="@(x => x.cc_type)" Sortable="true" Filterable="true" Width="10%">
+                <Template>
+                    @context.cc_type
+                </Template>
+            </Column>
+            <Pager ShowPageNumber="true" ShowTotalCount="true" />
+        </Table>
     </DetailTemplate>
     <Pager ShowPageNumber="true" ShowTotalCount="true" />
 </Table>

diff --git a/src/BlazorTable.Sample.Shared/Pages/LoadingData.razor b/src/BlazorTable.Sample.Shared/Pages/LoadingData.razor
@@ -11,11 +11,9 @@
     <Column TableItem="SampleData" Title="Id" Field="@(x => x.id)" Sortable="true" Filterable="true" Width="10%" DefaultSortColumn="true" />
     <Column TableItem="SampleData" Title="Full Name" Field="@(x => x.full_name)" Sortable="true" Filterable="true" Width="20%" />
     <LoadingDataTemplate>
-        <Template>
-            <div class="text-center">
-                <h1>Custom Loading Template</h1>
-            </div>
-        </Template>
+        <div class="text-center">
+            <h1>Custom Loading Template</h1>
+        </div>
     </LoadingDataTemplate>
     <Pager ShowPageNumber="true" ShowTotalCount="true" />
 </Table>

diff --git a/src/BlazorTable.Sample.Wasm/wwwroot/_redirects b/src/BlazorTable.Sample.Wasm/wwwroot/_redirects
@@ -0,0 +1 @@
+/*    /index.html   200
diff --git a/src/BlazorTable/Components/Column.razor b/src/BlazorTable/Components/Column.razor
@@ -14,7 +14,7 @@
                 <EnumFilter TableItem="TableItem" />
                 @if (this.CustomIFilters != null)
                 {
-                    this.CustomIFilters(this);
+                    @this.CustomIFilters(this);
                 }
             </FilterManager>
 

diff --git a/src/BlazorTable/Components/CustomSelectOption.razor b/src/BlazorTable/Components/CustomSelectOption.razor
@@ -0,0 +1 @@
+@namespace BlazorTable
diff --git a/src/BlazorTable/Components/CustomSelectOption.razor.cs b/src/BlazorTable/Components/CustomSelectOption.razor.cs
@@ -0,0 +1,30 @@
+using Microsoft.AspNetCore.Components;
+
+namespace BlazorTable
+{
+    /// <summary>
+    /// Option for CustomSelect
+    /// </summary>
+    public partial class CustomSelectOption
+    {
+        /// <summary>
+        /// Parent table
+        /// </summary>
+        [CascadingParameter(Name = "CustomSelect")]
+        public ICustomSelect CustomSelect { get; set; }
+
+        [Parameter]
+        public string Key { get; set; }
+
+        [Parameter]
+        public object Value { get; set; }
+
+        /// <summary>
+        /// When initialized, tell CustomSelect of this item
+        /// </summary>
+        protected override void OnInitialized()
+        {
+            CustomSelect.AddSelect(Key, Value);
+        }
+    }
+}
diff --git a/src/BlazorTable/Components/DetailTemplate.razor.cs b/src/BlazorTable/Components/DetailTemplate.razor.cs
@@ -18,7 +18,7 @@ public partial class DetailTemplate<TableItem>
         /// Content to show
         /// </summary>
         [Parameter]
-        public RenderFragment<TableItem> Template { get; set; }
+        public RenderFragment<TableItem> ChildContent { get; set; }
 
         /// <summary>
         /// When initialized, tell table of this item

diff --git a/src/BlazorTable/Components/EmptyDataTemplate.razor.cs b/src/BlazorTable/Components/EmptyDataTemplate.razor.cs
@@ -5,7 +5,6 @@ namespace BlazorTable
     /// <summary>
     /// Child content for empty dataset
     /// </summary>
-    /// <typeparam name="TableItem"></typeparam>
     public partial class EmptyDataTemplate
     {
         /// <summary>
@@ -18,7 +17,7 @@ public partial class EmptyDataTemplate
         /// Content to show
         /// </summary>
         [Parameter]
-        public RenderFragment Template { get; set; }
+        public RenderFragment ChildContent { get; set; }
 
         /// <summary>
         /// When initialized, tell table of this item

diff --git a/src/BlazorTable/Components/FilterManager.razor.cs b/src/BlazorTable/Components/FilterManager.razor.cs
@@ -5,21 +5,26 @@ namespace BlazorTable
 {
     public partial class FilterManager<TableItem>
     {
-        [CascadingParameter(Name = "Column")] public IColumn<TableItem> Column { get; set; }
+        [CascadingParameter(Name = "Column")]
+        public IColumn<TableItem> Column { get; set; }
 
-        [Parameter] public RenderFragment ChildContent { get; set; }
+        [Parameter]
+        public RenderFragment ChildContent { get; set; }
 
-        [Inject] public ILogger<FilterManager<TableItem>> Logger { get; set; }
+        [Inject]
+        public ILogger<FilterManager<TableItem>> Logger { get; set; }
 
         private void ApplyFilter()
         {
             Column.ToggleFilter();
+
             if (Column.FilterControl != null)
             {
                 Column.Filter = Column.FilterControl.GetFilter();
                 Column.Table.Update();
                 Column.Table.FirstPage();
-            } else
+            }
+            else
             {
                 Logger.LogInformation("Filter is null");
             }
@@ -28,8 +33,12 @@ private void ApplyFilter()
         private void ClearFilter()
         {
             Column.ToggleFilter();
-            Column.Filter = null;
-            Column.Table.Update();
+
+            if (Column.Filter != null)
+            {
+                Column.Filter = null;
+                Column.Table.Update();
+            }
         }
     }
 }
diff --git a/src/BlazorTable/Components/LoadingDataTemplate.razor.cs b/src/BlazorTable/Components/LoadingDataTemplate.razor.cs
@@ -5,7 +5,6 @@ namespace BlazorTable
     /// <summary>
     /// Child content for null dataset
     /// </summary>
-    /// <typeparam name="TableItem"></typeparam>
     public partial class LoadingDataTemplate
     {
         /// <summary>
@@ -18,7 +17,7 @@ public partial class LoadingDataTemplate
         /// Content to show
         /// </summary>
         [Parameter]
-        public RenderFragment Template { get; set; }
+        public RenderFragment ChildContent { get; set; }
 
         /// <summary>
         /// When initialized, tell table of this item

diff --git a/src/BlazorTable/Components/Pager.razor.cs b/src/BlazorTable/Components/Pager.razor.cs
@@ -5,7 +5,6 @@ namespace BlazorTable
     /// <summary>
     /// BlazorTable Pager
     /// </summary>
-    /// <typeparam name="TableItem"></typeparam>
     public partial class Pager
     {
         [CascadingParameter(Name = "Table")]

diff --git a/src/BlazorTable/Components/Table.razor b/src/BlazorTable/Components/Table.razor
@@ -45,13 +45,13 @@
             </tr>
         </thead>
         <tbody class="@TableBodyClass">
-            @if (TempItems != null)
+            @if (FilteredItems != null)
             {
-                if (TempItems.Any())
+                if (FilteredItems.Any())
                 {
                     int i = 0;
 
-                    foreach (TableItem item in TempItems)
+                    foreach (TableItem item in FilteredItems)
                     {
                         <tr @key="item" class="@RowClass(item)">