From 0c0916c6ab2a4f41a4c1c48c20fde30da5992afb Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Mon, 5 Oct 2020 09:11:47 -0400 Subject: [PATCH] Fixed build warnings related to ModuleMessage component changes --- .../Modules/Controls/FileManager.razor | 37 +++++++++++-------- .../Modules/Controls/ModuleMessage.razor | 15 ++------ .../Modules/Controls/RichTextEditor.razor | 11 +++--- Oqtane.Client/Modules/MessageType.cs | 3 +- Oqtane.Client/UI/Installer.razor | 20 +++++----- Oqtane.Client/UI/ModuleInstance.razor | 9 +++-- Oqtane.Shared/Shared/Utilities.cs | 3 +- 7 files changed, 50 insertions(+), 48 deletions(-) diff --git a/Oqtane.Client/Modules/Controls/FileManager.razor b/Oqtane.Client/Modules/Controls/FileManager.razor index 596de1a67..7872aba01 100644 --- a/Oqtane.Client/Modules/Controls/FileManager.razor +++ b/Oqtane.Client/Modules/Controls/FileManager.razor @@ -70,7 +70,7 @@ } - + @if (_image != string.Empty) { @@ -93,7 +93,8 @@ private bool _haseditpermission = false; private string _image = string.Empty; private string _guid; - private ModuleMessage _message = new ModuleMessage(); + private string _message = string.Empty; + private MessageType _messagetype; [Parameter] public string Id { get; set; } // optional - for setting the id of the FileManager component for accessibility @@ -205,6 +206,7 @@ private async Task FolderChanged(ChangeEventArgs e) { + _message = string.Empty; try { FolderId = int.Parse((string)e.Value); @@ -217,13 +219,14 @@ { await logger.LogError(ex, "Error Loading Files {Error}", ex.Message); - _message.Message = "Error Loading Files"; - _message.Type = MessageType.Error; + _message = "Error Loading Files"; + _messagetype = MessageType.Error; } } private async Task FileChanged(ChangeEventArgs e) { + _message = string.Empty; FileId = int.Parse((string)e.Value); await SetImage(); @@ -254,6 +257,7 @@ private async Task UploadFile() { + _message = string.Empty; var interop = new Interop(JSRuntime); var upload = await interop.GetFiles(_fileinputid); if (upload.Length > 0) @@ -274,8 +278,8 @@ { await logger.LogInformation("File Upload Succeeded {Files}", upload); - _message.Message = "File Upload Succeeded"; - _message.Type = MessageType.Success; + _message = "File Upload Succeeded"; + _messagetype = MessageType.Success; await GetFiles(); @@ -294,34 +298,35 @@ { await logger.LogError("File Upload Failed For {Files}", result.Replace(",", ", ")); - _message.Message = "File Upload Failed"; - _message.Type = MessageType.Error; + _message = "File Upload Failed"; + _messagetype = MessageType.Error; } } catch (Exception ex) { await logger.LogError(ex, "File Upload Failed {Error}", ex.Message); - _message.Message = "File Upload Failed"; - _message.Type = MessageType.Error; + _message = "File Upload Failed"; + _messagetype = MessageType.Error; } } else { - _message.Message = "You Have Not Selected A File To Upload"; - _message.Type = MessageType.Warning; + _message = "You Have Not Selected A File To Upload"; + _messagetype = MessageType.Warning; } } private async Task DeleteFile() { + _message = string.Empty; try { await FileService.DeleteFileAsync(FileId); await logger.LogInformation("File Deleted {File}", FileId); - _message.Message = "File Deleted"; - _message.Type = MessageType.Success; + _message = "File Deleted"; + _messagetype = MessageType.Success; await GetFiles(); FileId = -1; @@ -332,8 +337,8 @@ { await logger.LogError(ex, "Error Deleting File {File} {Error}", FileId, ex.Message); - _message.Message = "Error Deleting File"; - _message.Type = MessageType.Error; + _message = "Error Deleting File"; + _messagetype = MessageType.Error; } } diff --git a/Oqtane.Client/Modules/Controls/ModuleMessage.razor b/Oqtane.Client/Modules/Controls/ModuleMessage.razor index ad5957fa4..171a89260 100644 --- a/Oqtane.Client/Modules/Controls/ModuleMessage.razor +++ b/Oqtane.Client/Modules/Controls/ModuleMessage.razor @@ -16,7 +16,7 @@ @code { private string _message = string.Empty; - private string _classname = "alert alert-danger"; + private string _classname = string.Empty; [Parameter] public string Message { get; set; } @@ -26,23 +26,16 @@ protected override void OnParametersSet() { - if (!string.IsNullOrEmpty(Message)) + _message = Message; + if (!string.IsNullOrEmpty(_message)) { - _message = Message; _classname = GetMessageType(Type); } } - public void SetModuleMessage(string message, MessageType type) - { - _message = message; - _classname = GetMessageType(type); - StateHasChanged(); - } - private string GetMessageType(MessageType type) { - var classname = string.Empty; + string classname = string.Empty; switch (type) { case MessageType.Success: diff --git a/Oqtane.Client/Modules/Controls/RichTextEditor.razor b/Oqtane.Client/Modules/Controls/RichTextEditor.razor index 0d6d0a4e7..3d7d2327d 100644 --- a/Oqtane.Client/Modules/Controls/RichTextEditor.razor +++ b/Oqtane.Client/Modules/Controls/RichTextEditor.razor @@ -8,7 +8,7 @@ @if (_filemanagervisible) { - +
}
@@ -85,7 +85,7 @@ private FileManager _fileManager; private string _content = string.Empty; private string _original = string.Empty; - private ModuleMessage _message = new ModuleMessage(); + private string _message = string.Empty; [Parameter] public string Content { get; set; } @@ -107,7 +107,7 @@ public string DebugLevel { get; set; } = "info"; public override List Resources => new List() -{ + { new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill1.3.6.min.js" }, new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill-blot-formatter.min.js" }, new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill-interop.js" } @@ -144,6 +144,7 @@ public void CloseFileManager() { _filemanagervisible = false; + _message = string.Empty; StateHasChanged(); } @@ -180,6 +181,7 @@ public async Task InsertImage() { + _message = string.Empty; if (_filemanagervisible) { var fileid = _fileManager.GetFileId(); @@ -191,8 +193,7 @@ } else { - _message.Message = "You Must Select An Image To Insert"; - _message.Type = MessageType.Warning; + _message = "You Must Select An Image To Insert"; } } else diff --git a/Oqtane.Client/Modules/MessageType.cs b/Oqtane.Client/Modules/MessageType.cs index a78f95f9a..561579b44 100644 --- a/Oqtane.Client/Modules/MessageType.cs +++ b/Oqtane.Client/Modules/MessageType.cs @@ -5,6 +5,7 @@ public enum MessageType Success, Info, Warning, - Error + Error, + Undefined } } diff --git a/Oqtane.Client/UI/Installer.razor b/Oqtane.Client/UI/Installer.razor index 11c0eec77..8b915b5f2 100644 --- a/Oqtane.Client/UI/Installer.razor +++ b/Oqtane.Client/UI/Installer.razor @@ -119,7 +119,7 @@


- +
@@ -129,13 +129,13 @@ private string _databaseType = "LocalDB"; private string _serverName = "(LocalDb)\\MSSQLLocalDB"; private string _databaseName = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm"); - private string _username = ""; - private string _password = ""; + private string _username = string.Empty; + private string _password = string.Empty; private string _hostUsername = Constants.HostUser; - private string _hostPassword = ""; - private string _confirmPassword = ""; - private string _hostEmail = ""; - private ModuleMessage _message = new ModuleMessage(); + private string _hostPassword = string.Empty; + private string _confirmPassword = string.Empty; + private string _hostEmail = string.Empty; + private string _message = string.Empty; private string _integratedSecurityDisplay = "display: none;"; private string _loadingDisplay = "display: none;"; @@ -201,15 +201,13 @@ } else { - _message.Message = installation.Message; - _message.Type = MessageType.Error; + _message = installation.Message; _loadingDisplay = "display: none;"; } } else { - _message.Message = "Please Enter All Fields And Ensure Passwords Match And Are Greater Than 5 Characters In Length"; - _message.Type = MessageType.Error; + _message = "Please Enter All Fields And Ensure Passwords Match And Are Greater Than 5 Characters In Length"; } } diff --git a/Oqtane.Client/UI/ModuleInstance.razor b/Oqtane.Client/UI/ModuleInstance.razor index 8dfe2e037..80af124da 100644 --- a/Oqtane.Client/UI/ModuleInstance.razor +++ b/Oqtane.Client/UI/ModuleInstance.razor @@ -1,8 +1,7 @@ @namespace Oqtane.UI - + - @DynamicComponent @if (_progressindicator) @@ -12,6 +11,7 @@ @code { private string _message; + private MessageType _messagetype; private bool _progressindicator = false; [CascadingParameter] @@ -49,11 +49,13 @@ { // module does not exist with typename specified _message = "Module Does Not Have A Component Named " + Utilities.GetTypeNameLastSegment(typename, 0) + ".razor"; + _messagetype = MessageType.Error; } } else { _message = "Something is wrong with moduletype"; + _messagetype = MessageType.Error; } }; @@ -61,9 +63,10 @@ public void AddModuleMessage(string message, MessageType type) { + _message = message; + _messagetype = type; _progressindicator = false; StateHasChanged(); - ModuleMessage.SetModuleMessage(message, type); } public void ShowProgressIndicator() diff --git a/Oqtane.Shared/Shared/Utilities.cs b/Oqtane.Shared/Shared/Utilities.cs index ea36861b2..c2cfc90fa 100644 --- a/Oqtane.Shared/Shared/Utilities.cs +++ b/Oqtane.Shared/Shared/Utilities.cs @@ -326,7 +326,8 @@ public static bool IsFileValid(this File file) public static bool IsPathOrFileValid(this string name) { - return (name.IndexOfAny(Constants.InvalidFileNameChars) == -1 && + return (name != null && + name.IndexOfAny(Constants.InvalidFileNameChars) == -1 && !Constants.InvalidFileNameEndingChars.Any(name.EndsWith) && !Constants.ReservedDevices.Split(',').Contains(name.ToUpper().Split('.')[0])); }