mz/DiunaBI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Filter Layers by Type
All checks were successful
Build Docker Images / test (push) Successful in 1m37s
Details
Build Docker Images / build-and-push (push) Successful in 1m35s
Details

Browse Source
This commit is contained in:
Michał Zieliński
2025-12-01 13:21:45 +01:00
parent 4d7df85df1
commit 7ea5ed506e
7 changed files with 56 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
DiunaBI.API/Controllers/DataInboxController.cs
View File

@@ -92,20 +92,15 @@ public class DataInboxController : Controller
[HttpGet]
[Route("GetAll")]
public IActionResult GetAll([FromQuery] int start, [FromQuery] int limit, [FromQuery] string? name, [FromQuery] string? source)
public IActionResult GetAll([FromQuery] int start, [FromQuery] int limit, [FromQuery] string? search)
{
try
{
var query = _db.DataInbox.AsQueryable();
if (name != null)
if (!string.IsNullOrEmpty(search))
{
query = query.Where(x => x.Name.Contains(name));
}
if (source != null)
{
query = query.Where(x => x.Source.Contains(source));
query = query.Where(x => x.Name.Contains(search) || x.Source.Contains(search));
}
var totalCount = query.Count();
@@ -133,8 +128,8 @@ public class DataInboxController : Controller
PageSize = limit
};
_logger.LogDebug("GetAll: Retrieved {Count} of {TotalCount} data inbox items (page {Page}) with filter name={Name}, source={Source}",
items.Count, totalCount, pagedResult.Page, name, source);
_logger.LogDebug("GetAll: Retrieved {Count} of {TotalCount} data inbox items (page {Page}) with filter search={Search}",
items.Count, totalCount, pagedResult.Page, search);
return Ok(pagedResult);
}

16
DiunaBI.UI.Shared/Components/DataInboxListComponent.razor
View File

@@ -3,7 +3,7 @@
<MudExpansionPanel Icon="@Icons.Material.Filled.FilterList"
Text="Filters"
Expanded="true">
<MudGrid>
<MudGrid AlignItems="Center">
<MudItem xs="12" sm="6" md="4">
<MudTextField @bind-Value="filterRequest.Search"
Label="Search"
@@ -12,15 +12,17 @@
DebounceInterval="500"
OnDebounceIntervalElapsed="SearchDataInbox"
Clearable="true"/>
</MudItem>
<MudItem xs="12" sm="6" md="4">
<MudButton Variant="Variant.Outlined"
OnClick="ClearFilters"
StartIcon="Icons.Material.Filled.Clear">
Clear filters
</MudButton>
</MudItem>
<MudItem xs="12" sm="12" md="4" Class="d-flex justify-end">
<MudIconButton Icon="@Icons.Material.Filled.Clear"
OnClick="ClearFilters"
Color="Color.Default"
Size="Size.Medium"
Title="Clear filters"/>
</MudItem>
</MudGrid>
</MudExpansionPanel>

29
DiunaBI.UI.Shared/Components/LayerListComponent.razor
View File

@@ -1,9 +1,10 @@
@using MudBlazor.Internal
@using DiunaBI.Application.DTOModels
<MudExpansionPanels Class="mb-4">
<MudExpansionPanel Icon="@Icons.Material.Filled.FilterList"
Text="Filters"
Expanded="true">
<MudGrid>
<MudGrid AlignItems="Center">
<MudItem xs="12" sm="6" md="4">
<MudTextField @bind-Value="filterRequest.Search"
Label="Search"
@@ -12,15 +13,29 @@
DebounceInterval="500"
OnDebounceIntervalElapsed="SearchLayers"
Clearable="true"/>
</MudItem>
<MudItem xs="12" sm="6" md="4">
<MudButton Variant="Variant.Outlined"
OnClick="ClearFilters"
StartIcon="Icons.Material.Filled.Clear">
Clear filters
</MudButton>
<MudSelect T="LayerType?"
Value="filterRequest.Type"
ValueChanged="OnTypeChanged"
Label="Type"
Placeholder="All types"
Clearable="true"
OnClearButtonClick="OnTypeClear">
@foreach (LayerType type in Enum.GetValues(typeof(LayerType)))
{
<MudSelectItem T="LayerType?" Value="@type">@type.ToString()</MudSelectItem>
}
</MudSelect>
</MudItem>
<MudItem xs="12" sm="12" md="4" Class="d-flex justify-end">
<MudIconButton Icon="@Icons.Material.Filled.Clear"
OnClick="ClearFilters"
Color="Color.Default"
Size="Size.Medium"
Title="Clear filters"/>
</MudItem>
</MudGrid>
</MudExpansionPanel>

14
DiunaBI.UI.Shared/Components/LayerListComponent.razor.cs
View File

@@ -58,6 +58,20 @@ public partial class LayerListComponent : ComponentBase
await LoadLayers();
}
private async Task OnTypeClear()
{
filterRequest.Type = null;
filterRequest.Page = 1;
await LoadLayers();
}
private async Task OnTypeChanged(LayerType? type)
{
filterRequest.Type = type;
filterRequest.Page = 1;
await LoadLayers();
}
private void OnRowClick(LayerDto layer)
{
NavigationManager.NavigateTo($"/layers/{layer.Id}");

1
DiunaBI.UI.Shared/MainLayout.razor
View File

@@ -5,6 +5,7 @@
<AuthGuard>
<MudThemeProvider Theme="_theme"/>
<MudPopoverProvider/>
<MudDialogProvider/>
<MudSnackbarProvider/>

4
DiunaBI.UI.Shared/Services/DataInboxService.cs
View File

@@ -26,7 +26,9 @@ public class DataInboxService
var query = $"DataInbox/GetAll?start={start}&limit={filterRequest.PageSize}";
if (!string.IsNullOrEmpty(filterRequest.Search))
query += $"&name={Uri.EscapeDataString(filterRequest.Search)}";
{
query += $"&search={Uri.EscapeDataString(filterRequest.Search)}";
}
var response = await _httpClient.GetAsync(query);
response.EnsureSuccessStatusCode();

6
DiunaBI.UI.Shared/Services/LayerService.cs
View File

@@ -28,10 +28,8 @@ public class LayerService
if (!string.IsNullOrEmpty(filterRequest.Search))
query += $"&name={Uri.EscapeDataString(filterRequest.Search)}";
/*
if (type.HasValue)
query += $"&type={type.Value}";
*/
if (filterRequest.Type.HasValue)
query += $"&type={(int)filterRequest.Type.Value}";
var response = await _httpClient.GetAsync(query);
response.EnsureSuccessStatusCode();