Skip to content

Commit 4e73cab

Browse files
Refactor file deletion to Edit page, remove from Index #18
1 parent 9f35c3a commit 4e73cab

File tree

4 files changed

+26
-26
lines changed

4 files changed

+26
-26
lines changed

Client/Modules/FileHub/Edit.razor

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,17 @@
156156
<NavLink class="btn btn-secondary" href="@NavigateUrl()">
157157
<i class="oi oi-x"></i> @Localizer["Cancel"]
158158
</NavLink>
159+
@if (PageState.Action == "Edit")
160+
{
161+
<ActionDialog Header="Delete File"
162+
Message="Are You Sure You Wish To Delete This File?"
163+
Action="Delete"
164+
Security="SecurityAccessLevel.Edit"
165+
Class="btn btn-danger"
166+
OnClick="@(async () => await Delete())"
167+
ResourceKey="Delete"
168+
Id="@_id.ToString()" />
169+
}
159170
</div>
160171

161172
<br /><br />

Client/Modules/FileHub/Edit.razor.cs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,21 @@ private async Task Save()
371371
}
372372
}
373373

374+
private async Task Delete()
375+
{
376+
try
377+
{
378+
await FileService.DeleteAsync(_id, ModuleState.ModuleId).ConfigureAwait(true);
379+
await logger.LogInformation("File Deleted {Id}", _id).ConfigureAwait(true);
380+
NavigationManager.NavigateTo(NavigateUrl());
381+
}
382+
catch (Exception ex)
383+
{
384+
await logger.LogError(ex, "Error Deleting File {Id} {Error}", _id, ex.Message).ConfigureAwait(true);
385+
AddModuleMessage(Localizer["Message.DeleteError"], MessageType.Error);
386+
}
387+
}
388+
374389
private IEnumerable<ListCategoryDto> GetAllCategories()
375390
{
376391
var result = new List<ListCategoryDto>();

Client/Modules/FileHub/Index.razor

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,6 @@ else
6767
@onclick:stopPropagation="true">
6868
<i class="oi oi-data-transfer-download"></i> Download
6969
</a>
70-
<ActionDialog Header="Delete File"
71-
Message="Are You Sure You Wish To Delete This File?"
72-
Action="Delete"
73-
Security="SecurityAccessLevel.Edit"
74-
Class="btn btn-danger btn-sm"
75-
OnClick="@(async () => await Delete(file))"
76-
ResourceKey="Delete"
77-
Id="@file.Id.ToString()" />
7870
</div>
7971
</div>
8072
</div>

Client/Modules/FileHub/Index.razor.cs

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,24 +37,6 @@ protected override async Task OnInitializedAsync()
3737
}
3838
}
3939

40-
private async Task Delete(ListFileDto file)
41-
{
42-
try
43-
{
44-
await FileService.DeleteAsync(file.Id, ModuleState.ModuleId).ConfigureAwait(true);
45-
await logger.LogInformation("File Deleted {Id}", file.Id).ConfigureAwait(true);
46-
47-
var pagedResult = await FileService.ListAsync(ModuleState.ModuleId, pageNumber: 1, pageSize: int.MaxValue).ConfigureAwait(true);
48-
_files = pagedResult?.Items?.ToList();
49-
StateHasChanged();
50-
}
51-
catch (Exception ex)
52-
{
53-
await logger.LogError(ex, "Error Deleting File {Id} {Error}", file.Id, ex.Message).ConfigureAwait(true);
54-
AddModuleMessage(Localizer["Message.DeleteError"], MessageType.Error);
55-
}
56-
}
57-
5840
private void OnDownloadClick(ListFileDto file)
5941
{
6042
// Increment the counter in the UI immediately for instant feedback

0 commit comments

Comments
 (0)