Merge pull request #781 from sbwalker/master

Fixed build warnings related to ModuleMessage component changes
oqtane · Oct 5, 2020 · 0a9edd8 · 0a9edd8
2 parents 3d7630d + 0c0916c
commit 0a9edd8
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 48 deletions.
diff --git a/Oqtane.Client/Modules/Controls/FileManager.razor b/Oqtane.Client/Modules/Controls/FileManager.razor
@@ -70,7 +70,7 @@
                         </span>
                     </div>
                 }
-                <ModuleMessage @ref=_message></ModuleMessage>
+                <ModuleMessage Message="@_message" Type="@_messagetype"></ModuleMessage>
             </div>
             @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
@@ -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
@@ -8,7 +8,7 @@
                 @if (_filemanagervisible)
                 {
                     <FileManager @ref="_fileManager" Filter="@Constants.ImageFiles" />
-                    <ModuleMessage @ref=_message></ModuleMessage>
+                    <ModuleMessage Message="@_message" Type="MessageType.Warning"></ModuleMessage>
                     <br />
                 }
                 <div class="row justify-content-center" style="margin-bottom: 20px;">
@@ -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<Resource> Resources => new List<Resource>()
-{
+    {
         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
@@ -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
@@ -119,7 +119,7 @@
     <div class="row">
         <div class="mx-auto text-center">
             <button type="button" class="btn btn-success" @onclick="Install">Install Now</button><br /><br />
-            <ModuleMessage @ref=_message></ModuleMessage>
+            <ModuleMessage Message="@_message" Type="MessageType.Error"></ModuleMessage>
         </div>
         <div class="app-progress-indicator" style="@_loadingDisplay"></div>
     </div>
@@ -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
@@ -1,8 +1,7 @@
 @namespace Oqtane.UI
 
-<ModuleMessage Message="@_message" Type="MessageType.Error" />
+<ModuleMessage Message="@_message" Type="@_messagetype" />
 <CascadingValue Value="this">
-    <ModuleMessage @ref="ModuleMessage" />
     @DynamicComponent
 </CascadingValue>
 @if (_progressindicator)
@@ -12,6 +11,7 @@
 
 @code {
     private string _message;
+    private MessageType _messagetype;
     private bool _progressindicator = false;
 
     [CascadingParameter]
@@ -49,21 +49,24 @@
                 {
                     // 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;
             }
 
         };
     }
 
     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
@@ -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]));
         }