Skip to content

Commit df9b394

Browse files
neozhuneozhu
committed
rename
1 parent d5b16e8 commit df9b394

File tree

8 files changed

+36
-44
lines changed

8 files changed

+36
-44
lines changed

‎src/Blazor.Server.UI/Pages/Identity/Roles/Roles.razor‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
@using LazyCache
2-
@using CleanArchitecture.Blazor.Application.Features.Identity.Dto
32
@using System.Security.Claims
43
@using System.ComponentModel
54
@using System.Reflection
5+
@using CleanArchitecture.Blazor.Application.Features.Identity.Dto
66
@using CleanArchitecture.Blazor.Application.Common.ExceptionHandlers
77
@using CleanArchitecture.Blazor.Application.Constants.ClaimTypes
8-
@using CleanArchitecture.Blazor.Application.Constants.Permission
98
@inherits OwningComponentBase
109
@page "/identity/roles"
1110

‎src/Blazor.Server.UI/Pages/Identity/Users/Users.razor‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
@using System.Reflection
1212
@using CleanArchitecture.Blazor.Application.Common.ExceptionHandlers
1313
@using CleanArchitecture.Blazor.Application.Constants.ClaimTypes
14-
@using CleanArchitecture.Blazor.Application.Constants.Permission
1514
@using CleanArchitecture.Blazor.Application.Constants.Role
1615
@implements IDisposable
1716
@page "/identity/users"

‎src/Blazor.Server.UI/Pages/Products/Products.razor‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@
44
@using CleanArchitecture.Blazor.Application.Features.Products.Queries.Export
55
@using CleanArchitecture.Blazor.Application.Features.Products.Queries.Pagination
66
@using BlazorDownloadFile
7-
@using CleanArchitecture.Blazor.Application.Constants.Permission
87
@using CleanArchitecture.Blazor.Application.Features.Products.Caching
98
@using CleanArchitecture.Blazor.Application.Features.Products.Commands.AddEdit
109
@using CleanArchitecture.Blazor.Application.Features.Products.Commands.Delete
1110
@using CleanArchitecture.Blazor.Application.Features.Products.Commands.Import
12-
@using CleanArchitecture.Blazor.Domain.Enums
11+
1312

1413
@inject IJSRuntime JS
1514
@inject IStringLocalizer<Products> L
@@ -234,7 +233,7 @@
234233
[Inject]
235234
private IMediator Mediator { get; set; } = default!;
236235
[Inject]
237-
private IMapper _mapper { get; set; } = default!;
236+
private IMapper Mapper { get; set; } = default!;
238237
[CascadingParameter]
239238
private Task<AuthenticationState> AuthState { get; set; } = default!;
240239

@@ -324,7 +323,7 @@
324323
}
325324
private async Task OnEdit(ProductDto dto)
326325
{
327-
var command = _mapper.Map<AddEditProductCommand>(dto);
326+
var command = Mapper.Map<AddEditProductCommand>(dto);
328327
var parameters = new DialogParameters
329328
{
330329
{ nameof(_ProductFormDialog.Model),command },

‎src/Blazor.Server.UI/Pages/SystemManagement/AuditTrails.razor‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
@using CleanArchitecture.Blazor.Application.Features.AuditTrails.DTOs
33
@using CleanArchitecture.Blazor.Application.Features.AuditTrails.Queries.PaginationQuery
44
@using CleanArchitecture.Blazor.Application.Features.AuditTrails.Caching
5-
@using CleanArchitecture.Blazor.Application.Constants.Permission
6-
@using CleanArchitecture.Blazor.Domain.Enums
7-
85

96
@attribute [Authorize(Policy = Permissions.AuditTrails.View)]
107
@inject IStringLocalizer<AuditTrails> L
@@ -31,7 +28,7 @@
3128
<MudIcon Icon="@Icons.Material.Filled.ReceiptLong" Size="Size.Large" />
3229
<div class="d-flex flex-column">
3330
<MudText Typo="Typo.caption">@L[Title]</MudText>
34-
<MudEnumSelect Style="min-width:220px" TEnum="AuditTrailListView" ValueChanged="OnChangedListView" Value="_query.ListView" Dense="true" Label="List View">
31+
<MudEnumSelect Style="min-width:220px" TEnum="AuditTrailListView" ValueChanged="OnChangedListView" Value="Query.ListView" Dense="true" Label="List View">
3532
</MudEnumSelect>
3633
</div>
3734
</div>
@@ -47,8 +44,8 @@
4744
</div>
4845

4946
<MudStack Row="true" AlignItems="AlignItems.Stretch">
50-
<MudEnumSelect TEnum="AuditType?" Placeholder="Search for audit type" Value="@_query.AuditType" Clearable="true" ValueChanged="@(s=>OnSearch(s))" Style="width:160px" FullWidth="true"> </MudEnumSelect>
51-
<MudTextField T="string" ValueChanged="@(s=>OnSearch(s))" Value="@_query.Keyword" Placeholder="Search" Adornment="Adornment.End" Style="width:260px" FullWidth="true"
47+
<MudEnumSelect TEnum="AuditType?" Placeholder="Search for audit type" Value="@Query.AuditType" Clearable="true" ValueChanged="@(s=>OnSearch(s))" Style="width:160px" FullWidth="true"> </MudEnumSelect>
48+
<MudTextField T="string" ValueChanged="@(s=>OnSearch(s))" Value="@Query.Keyword" Placeholder="Search" Adornment="Adornment.End" Style="width:260px" FullWidth="true"
5249
AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Small"></MudTextField>
5350
</MudStack>
5451

@@ -108,15 +105,15 @@
108105
<CustomError Exception="context"></CustomError>
109106
</ErrorContent>
110107
</ErrorBoundary>
111-
@code {
108+
@code {
112109
public string Title { get; private set; } = "Audit Trails";
113110
private MudDataGrid<AuditTrailDto> _table = null!;
114111
private bool _loading;
115112
private int _defaultPageSize = 15;
116113
[Inject]
117114
private IMediator Mediator { get; set; } = default!;
118115
private readonly AuditTrailDto _currentDto = new();
119-
private readonly AuditTrailsWithPaginationQuery _query = new();
116+
private AuditTrailsWithPaginationQuery Query { get; set; } = new();
120117

121118
[CascadingParameter]
122119
private Task<AuthenticationState> AuthState { get; set; } = default!;
@@ -131,12 +128,12 @@
131128
try
132129
{
133130
_loading = true;
134-
_query.Sort = state.SortDefinitions.FirstOrDefault()?.SortBy ?? "Id";
135-
_query.SortBy = (state.SortDefinitions.FirstOrDefault()?.Descending == false ? AutoFilterer.Enums.Sorting.Ascending : AutoFilterer.Enums.Sorting.Descending);
136-
_query.Page = state.Page + 1;
137-
_query.PerPage = state.PageSize;
131+
Query.Sort = state.SortDefinitions.FirstOrDefault()?.SortBy ?? "Id";
132+
Query.SortBy = (state.SortDefinitions.FirstOrDefault()?.Descending == false ? AutoFilterer.Enums.Sorting.Ascending : AutoFilterer.Enums.Sorting.Descending);
133+
Query.Page = state.Page + 1;
134+
Query.PerPage = state.PageSize;
138135

139-
var result = await Mediator.Send(_query).ConfigureAwait(false);
136+
var result = await Mediator.Send(Query).ConfigureAwait(false);
140137
return new GridData<AuditTrailDto>() { TotalItems = result.TotalItems, Items = result.Items };
141138
}
142139
finally
@@ -146,23 +143,23 @@
146143
}
147144
private async Task OnChangedListView(AuditTrailListView listview)
148145
{
149-
_query.ListView = listview;
146+
Query.ListView = listview;
150147
await _table.ReloadServerData();
151148
}
152149
private async Task OnSearch(string text)
153150
{
154-
_query.Keyword = text;
151+
Query.Keyword = text;
155152
await _table.ReloadServerData();
156153
}
157154
private async Task OnSearch(AuditType? val)
158155
{
159-
_query.AuditType = val;
156+
Query.AuditType = val;
160157
await _table.ReloadServerData();
161158
}
162159
private async Task OnRefresh()
163160
{
164161
AuditTrailsCacheKey.Refresh();
165-
_query.Keyword = string.Empty;
162+
Query.Keyword = string.Empty;
166163
await _table.ReloadServerData();
167164
}
168165
private Task OnShowDetail(AuditTrailDto dto)

‎src/Blazor.Server.UI/Pages/SystemManagement/Dictionaries.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@
201201
private IBlazorDownloadFileService BlazorDownloadFileService { get; set; } = null!;
202202
[Inject]
203203
private IMediator Mediator { get; set; } = default!;
204-
private KeyValuesWithPaginationQuery _request = new();
204+
private KeyValuesWithPaginationQuery Query { get; set; } = new();
205205
private bool _canCreate;
206206
private bool _canSearch;
207207
private bool _canEdit;

‎src/Blazor.Server.UI/Pages/SystemManagement/Logs.razor‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
@page "/system/logs"
22
@using Blazor.Server.UI.Pages.SystemManagement.Components
3-
@using CleanArchitecture.Blazor.Application.Constants.Permission
43
@using CleanArchitecture.Blazor.Application.Features.Loggers.Commands.Delete
54
@using CleanArchitecture.Blazor.Application.Features.Loggers.DTOs
65
@using CleanArchitecture.Blazor.Application.Features.Loggers.Queries.ChatData
@@ -32,7 +31,7 @@
3231
<MudIcon Icon="@Icons.Material.Filled.BarChart" Size="Size.Large" />
3332
<div class="d-flex flex-column">
3433
<MudText Typo="Typo.caption">@L["Logs"]</MudText>
35-
<MudEnumSelect Style="min-width:220px" TEnum="LogListView" ValueChanged="OnChangedListView" Value="_query.ListView" Dense="true" Label="List View">
34+
<MudEnumSelect Style="min-width:220px" TEnum="LogListView" ValueChanged="OnChangedListView" Value="Query.ListView" Dense="true" Label="List View">
3635
</MudEnumSelect>
3736
</div>
3837
</div>
@@ -68,8 +67,8 @@
6867
}
6968
</div>
7069
<MudStack Row="true" AlignItems="AlignItems.Stretch">
71-
<MudEnumSelect TEnum="LogLevel?" Placeholder="Search for level" Value="@_query.Level" Clearable="true" ValueChanged="OnChangedLevel" Style="width:160px" FullWidth="true"> </MudEnumSelect>
72-
<MudTextField T="string" Style="min-width:300px" ValueChanged="@(s=>OnSearch(s))" Value="@_query.Keyword" Placeholder="Search" Adornment="Adornment.End"
70+
<MudEnumSelect TEnum="LogLevel?" Placeholder="Search for level" Value="@Query.Level" Clearable="true" ValueChanged="OnChangedLevel" Style="width:160px" FullWidth="true"> </MudEnumSelect>
71+
<MudTextField T="string" Style="min-width:300px" ValueChanged="@(s=>OnSearch(s))" Value="@Query.Keyword" Placeholder="Search" Adornment="Adornment.End"
7372
AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Medium"></MudTextField>
7473
</MudStack>
7574

@@ -157,7 +156,7 @@
157156
[Inject]
158157
private IMediator Mediator { get; set; } = default!;
159158
private bool _canPurge;
160-
private readonly LogsWithPaginationQuery _query = new();
159+
private LogsWithPaginationQuery Query { get; set; } = new();
161160
protected override async void OnInitialized()
162161
{
163162
Title = L["Logs"];
@@ -180,11 +179,11 @@
180179
try
181180
{
182181
_loading = true;
183-
_query.Sort = state.SortDefinitions.FirstOrDefault()?.SortBy ?? "Id";
184-
_query.SortBy = (state.SortDefinitions.FirstOrDefault()?.Descending == false ? AutoFilterer.Enums.Sorting.Ascending : AutoFilterer.Enums.Sorting.Descending);
185-
_query.Page = state.Page + 1;
186-
_query.PerPage = state.PageSize;
187-
var result = await Mediator.Send(_query).ConfigureAwait(false);
182+
Query.Sort = state.SortDefinitions.FirstOrDefault()?.SortBy ?? "Id";
183+
Query.SortBy = (state.SortDefinitions.FirstOrDefault()?.Descending == false ? AutoFilterer.Enums.Sorting.Ascending : AutoFilterer.Enums.Sorting.Descending);
184+
Query.Page = state.Page + 1;
185+
Query.PerPage = state.PageSize;
186+
var result = await Mediator.Send(Query).ConfigureAwait(false);
188187
return new GridData<LogDto>() { TotalItems = result.TotalItems, Items = result.Items };
189188
}
190189
finally
@@ -194,22 +193,22 @@
194193
}
195194
private async Task OnChangedListView(LogListView listview)
196195
{
197-
_query.ListView = listview;
196+
Query.ListView = listview;
198197
await _table.ReloadServerData();
199198
}
200199
private async Task OnChangedLevel(LogLevel? level)
201200
{
202-
_query.Level = level;
201+
Query.Level = level;
203202
await _table.ReloadServerData();
204203
}
205204
private async Task OnSearch(string text)
206205
{
207-
_query.Keyword = text;
206+
Query.Keyword = text;
208207
await _table.ReloadServerData();
209208
}
210209
private async Task OnRefresh()
211210
{
212-
_query.Keyword = string.Empty;
211+
Query.Keyword = string.Empty;
213212
await _table.ReloadServerData();
214213
}
215214
private Task OnShowDetail(LogDto dto)

‎src/Blazor.Server.UI/Shared/MainLayout.razor.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ public partial class MainLayout : LayoutComponentBase, IDisposable
1616
private MudThemeProvider _mudThemeProvider=null!;
1717
private bool _themingDrawerOpen;
1818
private bool _defaultDarkMode;
19-
[Inject] private IDialogService _dialogService { get; set; } = default!;
2019
[Inject] private HotKeys HotKeys { get; set; } = default!;
2120

2221

@@ -83,7 +82,7 @@ private async Task OpenCommandPalette()
8382
FullWidth = true
8483
};
8584

86-
var commandPalette = _dialogService.Show<CommandPalette>("", options);
85+
var commandPalette = DialogService.Show<CommandPalette>("", options);
8786
_commandPaletteOpen = true;
8887

8988
await commandPalette.Result;

‎src/Blazor.Server.UI/Shared/UserLoginState.razor‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
[CascadingParameter]
1010
protected Task<AuthenticationState> AuthState { get; set; } = default!;
1111
[Inject]
12-
private AuthenticationStateProvider _authenticationStateProvider { get; set; } = default!;
12+
private AuthenticationStateProvider AuthenticationStateProvider { get; set; } = default!;
1313
[Inject]
1414
public IDispatcher Dispatcher { get; set; } = null!;
1515
public void Dispose()
1616
{
1717
Client.Login -= _client_Login;
1818
Client.Logout -= _client_Logout;
19-
_authenticationStateProvider.AuthenticationStateChanged -= _authenticationStateProvider_AuthenticationStateChanged;
19+
AuthenticationStateProvider.AuthenticationStateChanged -= _authenticationStateProvider_AuthenticationStateChanged;
2020
GC.SuppressFinalize(this);
2121
}
2222
[Inject]
@@ -26,7 +26,7 @@
2626
Client.Login += _client_Login;
2727
Client.Logout += _client_Logout;
2828
await Client.StartAsync().ConfigureAwait(false);
29-
_authenticationStateProvider.AuthenticationStateChanged += _authenticationStateProvider_AuthenticationStateChanged;
29+
AuthenticationStateProvider.AuthenticationStateChanged += _authenticationStateProvider_AuthenticationStateChanged;
3030
var state = await AuthState;
3131
if (state.User.Identity?.IsAuthenticated ?? false)
3232
{

0 commit comments

Comments
 (0)