Skip to content

Commit dd16eb6

Browse files
neozhuneozhu
authored
Merge pull request #310 from neozhu/navigation
fixed
2 parents 0657749 + 23a7402 commit dd16eb6

File tree

3 files changed

+50
-43
lines changed

3 files changed

+50
-43
lines changed

‎src/Application/Features/Documents/Commands/Delete/DeleteDocumentCommand.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
namespace CleanArchitecture.Blazor.Application.Features.Documents.Commands.Delete;
77

8-
public class DeleteDocumentCommand : ICacheInvalidatorRequest<Result>
8+
public class DeleteDocumentCommand : ICacheInvalidatorRequest<Result<int>>
99
{
1010
public CancellationTokenSource? SharedExpiryTokenSource => DocumentCacheKey.SharedExpiryTokenSource();
1111
public int[] Id { get; set; }
@@ -16,7 +16,7 @@ public DeleteDocumentCommand(int[] id)
1616
}
1717

1818

19-
public class DeleteDocumentCommandHandler : IRequestHandler<DeleteDocumentCommand, Result>
19+
public class DeleteDocumentCommandHandler : IRequestHandler<DeleteDocumentCommand, Result<int>>
2020

2121
{
2222
private readonly IApplicationDbContext _context;
@@ -27,15 +27,15 @@ IApplicationDbContext context
2727
{
2828
_context = context;
2929
}
30-
public async Task<Result> Handle(DeleteDocumentCommand request, CancellationToken cancellationToken)
30+
public async Task<Result<int>> Handle(DeleteDocumentCommand request, CancellationToken cancellationToken)
3131
{
3232
var items = await _context.Documents.Where(x => request.Id.Contains(x.Id)).ToListAsync(cancellationToken);
3333
foreach (var item in items)
3434
{
3535
item.AddDomainEvent(new DeletedEvent<Document>(item));
3636
_context.Documents.Remove(item);
3737
}
38-
await _context.SaveChangesAsync(cancellationToken);
39-
return await Result.SuccessAsync();
38+
var result= await _context.SaveChangesAsync(cancellationToken);
39+
return await Result<int>.SuccessAsync(result);
4040
}
4141
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,8 @@
336336
var command = _mapper.Map<AddEditDocumentCommand>(dto);
337337
var parameters = new DialogParameters
338338
{
339-
{ nameof(_DocumentFormDialog.model),command },
339+
{ nameof(DeleteConfirmation.Command), command },
340+
{ nameof(_DocumentFormDialog.model),command },
340341
};
341342
var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.Medium, FullWidth = true };
342343
var dialog = DialogService.Show<_DocumentFormDialog>(string.Format(ConstantString.EDITTHEITEM, L["Document"]), parameters, options);
@@ -346,9 +347,7 @@
346347
var state = await dialog.Result;
347348
if (!state.Canceled)
348349
{
349-
var result = await _mediator.Send(command);
350-
await _table.ReloadServerData();
351-
Snackbar.Add($"{ConstantString.SAVESUCCESS}", MudBlazor.Severity.Info);
350+
await _table.ReloadServerData();
352351
}
353352
}
354353

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

Lines changed: 42 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
Variant="Variant.Outlined"
8787
Color="Color.Primary"
8888
StartIcon="@Icons.Material.Filled.Upload"
89-
for="@context">
89+
for="@context">
9090
@if (_uploading)
9191
{
9292
<MudProgressCircular Class="ms-n1" Size="Size.Small" Indeterminate="true" />
@@ -225,20 +225,20 @@
225225
</MudTd>
226226
<MudTd HideSmall="true" DataLabel="@L["Is Active"]">
227227
<MudCheckBox Checked="@context.IsActive" ReadOnly Color="Color.Secondary"></MudCheckBox>
228-
</MudTd>
229-
<MudTd HideSmall="true" DataLabel="@L["Lock Status"]">@context.LockoutEnd</MudTd>
230-
</RowTemplate>
231-
<PagerContent>
232-
<MudTablePager PageSizeOptions="@(new int[]{10,15,30,50,100,500,1000})" />
233-
</PagerContent>
234-
</MudTable>
235-
236-
<_PermissionsDrawer OnAssignAllChanged="OnAssignAllChangedHandler" Waiting="@_processing" OnOpenChanged="OnOpenChangedHandler" Open="_showPermissionsDrawer" Permissions="_permissions" OnAssignChanged="OnAssignChangedHandler"></_PermissionsDrawer>
237-
</ChildContent>
238-
<ErrorContent>
239-
<CustomError Exception="context"></CustomError>
240-
</ErrorContent>
241-
</ErrorBoundary>
228+
</MudTd>
229+
<MudTd HideSmall="true" DataLabel="@L["Lock Status"]">@context.LockoutEnd</MudTd>
230+
</RowTemplate>
231+
<PagerContent>
232+
<MudTablePager PageSizeOptions="@(new int[]{10,15,30,50,100,500,1000})" />
233+
</PagerContent>
234+
</MudTable>
235+
236+
<_PermissionsDrawer OnAssignAllChanged="OnAssignAllChangedHandler" Waiting="@_processing" OnOpenChanged="OnOpenChangedHandler" Open="_showPermissionsDrawer" Permissions="_permissions" OnAssignChanged="OnAssignChangedHandler"></_PermissionsDrawer>
237+
</ChildContent>
238+
<ErrorContent>
239+
<CustomError Exception="context"></CustomError>
240+
</ErrorContent>
241+
</ErrorBoundary>
242242

243243
@code {
244244
[Inject]
@@ -332,12 +332,13 @@
332332
try
333333
{
334334
_loading = true;
335-
var items = await _userManager.Users.Where(x => x.UserName.Contains(_searchString) ||
336-
x.Email.Contains(_searchString) ||
337-
x.DisplayName.Contains(_searchString) ||
338-
x.PhoneNumber.Contains(_searchString) ||
339-
x.TenantName.Contains(_searchString) ||
340-
x.UserRoles.Any(x=>x.Role.Name.Contains(_searchString)))
335+
var items = await _userManager.Users.Where(x => x.UserName.Contains(_searchString) ||
336+
x.Email.Contains(_searchString) ||
337+
x.DisplayName.Contains(_searchString) ||
338+
x.PhoneNumber.Contains(_searchString) ||
339+
x.TenantName.Contains(_searchString) ||
340+
x.Provider.Contains(_searchString) ||
341+
x.UserRoles.Any(x => x.Role.Name.Contains(_searchString)))
341342
.Include(x => x.UserRoles).ThenInclude(x => x.Role)
342343
.OrderBy($"{state.SortLabel ?? "UserName"} {(state.SortDirection == SortDirection.None ? SortDirection.Descending.ToString() : state.SortDirection.ToString())}")
343344
.Skip(state.Page * state.PageSize).Take(state.PageSize).ProjectTo<ApplicationUserDto>(_mapper.ConfigurationProvider).ToListAsync();
@@ -670,27 +671,34 @@
670671
private async Task OnExport()
671672
{
672673
_exporting = true;
673-
var items = await _userManager.Users
674-
.Where(x => x.UserName.Contains(_searchString) || x.Email.Contains(_searchString) || x.DisplayName.Contains(_searchString) || x.PhoneNumber.Contains(_searchString))
675-
.Select(x => new ApplicationUserDto()
676-
{
677-
Id = x.Id,
678-
UserName = x.UserName!,
679-
DisplayName = x.DisplayName,
680-
Email = x.Email!,
681-
PhoneNumber = x.PhoneNumber,
682-
TenantName = x.TenantName,
683-
}).ToListAsync();
674+
var items = await _userManager.Users.Where(x => x.UserName.Contains(_searchString) ||
675+
x.Email.Contains(_searchString) ||
676+
x.DisplayName.Contains(_searchString) ||
677+
x.PhoneNumber.Contains(_searchString) ||
678+
x.TenantName.Contains(_searchString) ||
679+
x.Provider.Contains(_searchString) ||
680+
x.UserRoles.Any(x => x.Role.Name.Contains(_searchString)))
681+
.Select(x => new ApplicationUserDto()
682+
{
683+
Id = x.Id,
684+
UserName = x.UserName!,
685+
DisplayName = x.DisplayName,
686+
Email = x.Email!,
687+
PhoneNumber = x.PhoneNumber,
688+
TenantId = x.TenantId,
689+
TenantName = x.TenantName,
690+
}).ToListAsync();
684691
var result = await _excelService.ExportAsync(items,
685692
new Dictionary<string, Func<ApplicationUserDto, object?>>()
686-
{
693+
{
687694
{L["Id"],item => item.Id},
688695
{L["User Name"],item => item.UserName},
689696
{L["Display Name"],item => item.DisplayName},
690697
{L["Email"],item => item.Email},
691698
{L["Phone Number"],item => item.PhoneNumber},
699+
{L["Tenant Id"],item => item.TenantId},
692700
{L["Tenant Name"],item => item.TenantName},
693-
}
701+
}
694702
, L["Users"]);
695703
var downloadresult = await _blazorDownloadFileService.DownloadFile($"{L["Users"]}.xlsx", result, contentType: "application/octet-stream");
696704
Snackbar.Add($"{ConstantString.EXPORTSUCESS}", MudBlazor.Severity.Info);

0 commit comments

Comments
 (0)