diff --git a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor index 3e93cf7c..b4588da3 100644 --- a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor +++ b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor @@ -140,6 +140,7 @@ { try { + ModuleInstance.ShowProgressIndicator(); foreach (Page page in _pages) { await PageService.DeletePageAsync(page.PageId); @@ -148,6 +149,7 @@ await logger.LogInformation("Pages Permanently Deleted"); await Load(); + ModuleInstance.HideProgressIndicator(); StateHasChanged(); NavigationManager.NavigateTo(NavigateUrl()); } @@ -155,6 +157,7 @@ { await logger.LogError(ex, "Error Permanently Deleting Pages {Error}", ex.Message); AddModuleMessage(ex.Message, MessageType.Error); + ModuleInstance.HideProgressIndicator(); } } @@ -204,6 +207,7 @@ { try { + ModuleInstance.ShowProgressIndicator(); foreach (Module module in _modules) { await PageModuleService.DeletePageModuleAsync(module.PageModuleId); @@ -218,12 +222,14 @@ await logger.LogInformation("Modules Permanently Deleted"); await Load(); + ModuleInstance.HideProgressIndicator(); StateHasChanged(); } catch (Exception ex) { await logger.LogError(ex, "Error Permanently Deleting Modules {Error}", ex.Message); AddModuleMessage(Localizer["Error.Modules.Delete"], MessageType.Error); + ModuleInstance.HideProgressIndicator(); } } } diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor index 98912db2..28166ecb 100644 --- a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor +++ b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor @@ -226,8 +226,8 @@ else @code { private string username = string.Empty; private string _password = string.Empty; - private string _passwordtype = "password"; - private string _togglepassword = string.Empty; + private string _passwordtype = "password"; + private string _togglepassword = string.Empty; private string confirm = string.Empty; private bool allowtwofactor = false; private string twofactor = "False"; @@ -429,6 +429,7 @@ else { try { + ModuleInstance.ShowProgressIndicator(); foreach(var Notification in notifications) { if (!Notification.IsDeleted) @@ -444,12 +445,15 @@ else } await logger.LogInformation("Notifications Permanently Deleted"); await LoadNotificationsAsync(); + ModuleInstance.HideProgressIndicator(); + StateHasChanged(); } catch (Exception ex) { await logger.LogError(ex, "Error Deleting Notifications {Error}", ex.Message); AddModuleMessage(ex.Message, MessageType.Error); + ModuleInstance.HideProgressIndicator(); } }