From b3e010d5e2eaa7d63b0c100c5a03f1e122d2b6cd Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Thu, 24 Oct 2019 14:59:15 -0400 Subject: [PATCH] created generic confirmation dialog control and implemented in File Management module --- Oqtane.Client/Modules/Admin/Files/Index.razor | 18 ++--- .../Modules/Controls/ConfirmationDialog.razor | 69 ++++++++++++++++++ Oqtane.Client/Shared/Installer.razor | 10 +-- Oqtane.Client/Themes/AdminContainer.razor | 8 +- Oqtane.Client/wwwroot/css/app.css | 1 + .../Tenants/1/Sites/1/Softvision Pen.jpg | Bin 3694995 -> 0 bytes Oqtane.Server/wwwroot/css/app.css | 3 +- 7 files changed, 88 insertions(+), 21 deletions(-) create mode 100644 Oqtane.Client/Modules/Controls/ConfirmationDialog.razor delete mode 100644 Oqtane.Server/wwwroot/Tenants/1/Sites/1/Softvision Pen.jpg diff --git a/Oqtane.Client/Modules/Admin/Files/Index.razor b/Oqtane.Client/Modules/Admin/Files/Index.razor index 18d8b7d4..f31aa809 100644 --- a/Oqtane.Client/Modules/Admin/Files/Index.razor +++ b/Oqtane.Client/Modules/Admin/Files/Index.razor @@ -9,18 +9,16 @@ } else { - +
- Name   + Name
+ @context - - - } @@ -40,7 +38,7 @@ else } catch (Exception ex) { - await logger.LogError("Error Loading Files {Error}", ex.Message); + await logger.LogError(ex, "Error Loading Files {Error}", ex.Message); AddModuleMessage("Error Loading Files", MessageType.Error); } } @@ -51,13 +49,13 @@ else { await FileService.DeleteFileAsync(PageState.Site.SiteRootPath, filename); Files = await FileService.GetFilesAsync(PageState.Site.SiteRootPath); - await logger.LogInformation("File Deleted"); - AddModuleMessage("File Deleted", MessageType.Success); + await logger.LogInformation("File Deleted {File}", filename); + AddModuleMessage("File " + filename + " Deleted", MessageType.Success); } catch (Exception ex) { - await logger.LogError("Error Deleting File {Error}", ex.Message); - AddModuleMessage("Error Deleting File", MessageType.Error); + await logger.LogError(ex, "Error Deleting File {File} {Error}", filename, ex.Message); + AddModuleMessage("Error Deleting File " + filename, MessageType.Error); } } } \ No newline at end of file diff --git a/Oqtane.Client/Modules/Controls/ConfirmationDialog.razor b/Oqtane.Client/Modules/Controls/ConfirmationDialog.razor new file mode 100644 index 00000000..00e5cdd4 --- /dev/null +++ b/Oqtane.Client/Modules/Controls/ConfirmationDialog.razor @@ -0,0 +1,69 @@ +@namespace Oqtane.Modules.Controls +@inherits ModuleBase + +@if (visible) +{ +
+ +
+} + + +@code { + [Parameter] + public string Header { get; set; } + + [Parameter] + public string Message { get; set; } + + [Parameter] + public string Action { get; set; } + + [Parameter] + public string Class { get; set; } + + [Parameter] + public Action OnClick { get; set; } + + bool visible = false; + + protected override void OnParametersSet() + { + if (string.IsNullOrEmpty(Action)) + { + Action = "Ok"; + } + if (string.IsNullOrEmpty(Class)) + { + Class = "btn btn-success"; + } + } + + private void DisplayModal() + { + visible = !visible; + StateHasChanged(); + } + + private void Confirm() + { + DisplayModal(); + OnClick(); + } +} diff --git a/Oqtane.Client/Shared/Installer.razor b/Oqtane.Client/Shared/Installer.razor index 1579151d..dbd8b02b 100644 --- a/Oqtane.Client/Shared/Installer.razor +++ b/Oqtane.Client/Shared/Installer.razor @@ -128,14 +128,14 @@ private string HostEmail = ""; private string Message = ""; - private string IntegratedSecurityDisplay = "display:none;"; - private string LoadingDisplay = "display:none;"; + private string IntegratedSecurityDisplay = "display: none;"; + private string LoadingDisplay = "display: none;"; private void SetIntegratedSecurity(ChangeEventArgs e) { if (Convert.ToBoolean(e.Value)) { - IntegratedSecurityDisplay = "display:none;"; + IntegratedSecurityDisplay = "display: none;"; } else { @@ -158,7 +158,7 @@ else { connectionstring = "Data Source=" + ServerName + ";Initial Catalog=" + DatabaseName + ";"; - if (IntegratedSecurityDisplay == "display:none;") + if (IntegratedSecurityDisplay == "display: none;") { connectionstring += "Integrated Security=SSPI;"; } @@ -193,7 +193,7 @@ else { Message = "
" + response.Message + "
"; - LoadingDisplay = "display:none;"; + LoadingDisplay = "display: none;"; } } else diff --git a/Oqtane.Client/Themes/AdminContainer.razor b/Oqtane.Client/Themes/AdminContainer.razor index 74f3a1e3..bce9ff44 100644 --- a/Oqtane.Client/Themes/AdminContainer.razor +++ b/Oqtane.Client/Themes/AdminContainer.razor @@ -3,14 +3,12 @@ @inject NavigationManager NavigationManager
-
-
+