kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed build warnings related to ModuleMessage component changes

Browse Source
This commit is contained in:
Shaun Walker 2020-10-05 09:11:47 -04:00
parent ece8f3a57e
commit 0c0916c6ab
7 changed files with 50 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Oqtane.Client/Modules/Controls/FileManager.razor
View File

@ -70,7 +70,7 @@
</span> </span>
</div> </div>
} }
<ModuleMessage @ref=_message></ModuleMessage> <ModuleMessage Message="@_message" Type="@_messagetype"></ModuleMessage>
</div> </div>
@if (_image != string.Empty) @if (_image != string.Empty)
{ {
@ -93,7 +93,8 @@
private bool _haseditpermission = false; private bool _haseditpermission = false;
private string _image = string.Empty; private string _image = string.Empty;
private string _guid; private string _guid;
private ModuleMessage _message = new ModuleMessage(); private string _message = string.Empty;
private MessageType _messagetype;
[Parameter] [Parameter]
public string Id { get; set; } // optional - for setting the id of the FileManager component for accessibility 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) private async Task FolderChanged(ChangeEventArgs e)
{ {
_message = string.Empty;
try try
{ {
FolderId = int.Parse((string)e.Value); FolderId = int.Parse((string)e.Value);
@ -217,13 +219,14 @@
{ {
await logger.LogError(ex, "Error Loading Files {Error}", ex.Message); await logger.LogError(ex, "Error Loading Files {Error}", ex.Message);
_message.Message = "Error Loading Files"; _message = "Error Loading Files";
_message.Type = MessageType.Error; _messagetype = MessageType.Error;
} }
} }
private async Task FileChanged(ChangeEventArgs e) private async Task FileChanged(ChangeEventArgs e)
{ {
_message = string.Empty;
FileId = int.Parse((string)e.Value); FileId = int.Parse((string)e.Value);
await SetImage(); await SetImage();
@ -254,6 +257,7 @@
private async Task UploadFile() private async Task UploadFile()
{ {
_message = string.Empty;
var interop = new Interop(JSRuntime); var interop = new Interop(JSRuntime);
var upload = await interop.GetFiles(_fileinputid); var upload = await interop.GetFiles(_fileinputid);
if (upload.Length > 0) if (upload.Length > 0)
@ -274,8 +278,8 @@
{ {
await logger.LogInformation("File Upload Succeeded {Files}", upload); await logger.LogInformation("File Upload Succeeded {Files}", upload);
_message.Message = "File Upload Succeeded"; _message = "File Upload Succeeded";
_message.Type = MessageType.Success; _messagetype = MessageType.Success;
await GetFiles(); await GetFiles();
@ -294,34 +298,35 @@
{ {
await logger.LogError("File Upload Failed For {Files}", result.Replace(",", ", ")); await logger.LogError("File Upload Failed For {Files}", result.Replace(",", ", "));
_message.Message = "File Upload Failed"; _message = "File Upload Failed";
_message.Type = MessageType.Error; _messagetype = MessageType.Error;
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "File Upload Failed {Error}", ex.Message); await logger.LogError(ex, "File Upload Failed {Error}", ex.Message);
_message.Message = "File Upload Failed"; _message = "File Upload Failed";
_message.Type = MessageType.Error; _messagetype = MessageType.Error;
} }
} }
else else
{ {
_message.Message = "You Have Not Selected A File To Upload"; _message = "You Have Not Selected A File To Upload";
_message.Type = MessageType.Warning; _messagetype = MessageType.Warning;
} }
} }
private async Task DeleteFile() private async Task DeleteFile()
{ {
_message = string.Empty;
try try
{ {
await FileService.DeleteFileAsync(FileId); await FileService.DeleteFileAsync(FileId);
await logger.LogInformation("File Deleted {File}", FileId); await logger.LogInformation("File Deleted {File}", FileId);
_message.Message = "File Deleted"; _message = "File Deleted";
_message.Type = MessageType.Success; _messagetype = MessageType.Success;
await GetFiles(); await GetFiles();
FileId = -1; FileId = -1;
@ -332,8 +337,8 @@
{ {
await logger.LogError(ex, "Error Deleting File {File} {Error}", FileId, ex.Message); await logger.LogError(ex, "Error Deleting File {File} {Error}", FileId, ex.Message);
_message.Message = "Error Deleting File"; _message = "Error Deleting File";
_message.Type = MessageType.Error; _messagetype = MessageType.Error;
} }
} }

15
Oqtane.Client/Modules/Controls/ModuleMessage.razor
View File

@ -16,7 +16,7 @@
@code { @code {
private string _message = string.Empty; private string _message = string.Empty;
private string _classname = "alert alert-danger"; private string _classname = string.Empty;
[Parameter] [Parameter]
public string Message { get; set; } public string Message { get; set; }
@ -26,23 +26,16 @@
protected override void OnParametersSet() protected override void OnParametersSet()
{ {
if (!string.IsNullOrEmpty(Message)) _message = Message;
if (!string.IsNullOrEmpty(_message))
{ {
_message = Message;
_classname = GetMessageType(Type); _classname = GetMessageType(Type);
} }
} }
public void SetModuleMessage(string message, MessageType type)
{
_message = message;
_classname = GetMessageType(type);
StateHasChanged();
}
private string GetMessageType(MessageType type) private string GetMessageType(MessageType type)
{ {
var classname = string.Empty; string classname = string.Empty;
switch (type) switch (type)
{ {
case MessageType.Success: case MessageType.Success:

11
Oqtane.Client/Modules/Controls/RichTextEditor.razor
View File

@ -8,7 +8,7 @@
@if (_filemanagervisible) @if (_filemanagervisible)
{ {
<FileManager @ref="_fileManager" Filter="@Constants.ImageFiles" /> <FileManager @ref="_fileManager" Filter="@Constants.ImageFiles" />
<ModuleMessage @ref=_message></ModuleMessage> <ModuleMessage Message="@_message" Type="MessageType.Warning"></ModuleMessage>
<br /> <br />
} }
<div class="row justify-content-center" style="margin-bottom: 20px;"> <div class="row justify-content-center" style="margin-bottom: 20px;">
@ -85,7 +85,7 @@
private FileManager _fileManager; private FileManager _fileManager;
private string _content = string.Empty; private string _content = string.Empty;
private string _original = string.Empty; private string _original = string.Empty;
private ModuleMessage _message = new ModuleMessage(); private string _message = string.Empty;
[Parameter] [Parameter]
public string Content { get; set; } public string Content { get; set; }
@ -107,7 +107,7 @@
public string DebugLevel { get; set; } = "info"; public string DebugLevel { get; set; } = "info";
public override List<Resource> Resources => new List<Resource>() 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/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-blot-formatter.min.js" },
new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill-interop.js" } new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill-interop.js" }
@ -144,6 +144,7 @@
public void CloseFileManager() public void CloseFileManager()
{ {
_filemanagervisible = false; _filemanagervisible = false;
_message = string.Empty;
StateHasChanged(); StateHasChanged();
} }
@ -180,6 +181,7 @@
public async Task InsertImage() public async Task InsertImage()
{ {
_message = string.Empty;
if (_filemanagervisible) if (_filemanagervisible)
{ {
var fileid = _fileManager.GetFileId(); var fileid = _fileManager.GetFileId();
@ -191,8 +193,7 @@
} }
else else
{ {
_message.Message = "You Must Select An Image To Insert"; _message = "You Must Select An Image To Insert";
_message.Type = MessageType.Warning;
} }
} }
else else

3
Oqtane.Client/Modules/MessageType.cs
View File

@ -5,6 +5,7 @@
Success, Success,
Info, Info,
Warning, Warning,
Error Error,
Undefined
} }
} }

20
Oqtane.Client/UI/Installer.razor
View File

@ -119,7 +119,7 @@
<div class="row"> <div class="row">
<div class="mx-auto text-center"> <div class="mx-auto text-center">
<button type="button" class="btn btn-success" @onclick="Install">Install Now</button><br /><br /> <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>
<div class="app-progress-indicator" style="@_loadingDisplay"></div> <div class="app-progress-indicator" style="@_loadingDisplay"></div>
</div> </div>
@ -129,13 +129,13 @@
private string _databaseType = "LocalDB"; private string _databaseType = "LocalDB";
private string _serverName = "(LocalDb)\\MSSQLLocalDB"; private string _serverName = "(LocalDb)\\MSSQLLocalDB";
private string _databaseName = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm"); private string _databaseName = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm");
private string _username = ""; private string _username = string.Empty;
private string _password = ""; private string _password = string.Empty;
private string _hostUsername = Constants.HostUser; private string _hostUsername = Constants.HostUser;
private string _hostPassword = ""; private string _hostPassword = string.Empty;
private string _confirmPassword = ""; private string _confirmPassword = string.Empty;
private string _hostEmail = ""; private string _hostEmail = string.Empty;
private ModuleMessage _message = new ModuleMessage(); private string _message = string.Empty;
private string _integratedSecurityDisplay = "display: none;"; private string _integratedSecurityDisplay = "display: none;";
private string _loadingDisplay = "display: none;"; private string _loadingDisplay = "display: none;";
@ -201,15 +201,13 @@
} }
else else
{ {
_message.Message = installation.Message; _message = installation.Message;
_message.Type = MessageType.Error;
_loadingDisplay = "display: none;"; _loadingDisplay = "display: none;";
} }
} }
else else
{ {
_message.Message = "Please Enter All Fields And Ensure Passwords Match And Are Greater Than 5 Characters In Length"; _message = "Please Enter All Fields And Ensure Passwords Match And Are Greater Than 5 Characters In Length";
_message.Type = MessageType.Error;
} }
} }

9
Oqtane.Client/UI/ModuleInstance.razor
View File

@ -1,8 +1,7 @@
@namespace Oqtane.UI @namespace Oqtane.UI
<ModuleMessage Message="@_message" Type="MessageType.Error" /> <ModuleMessage Message="@_message" Type="@_messagetype" />
<CascadingValue Value="this"> <CascadingValue Value="this">
<ModuleMessage @ref="ModuleMessage" />
@DynamicComponent @DynamicComponent
</CascadingValue> </CascadingValue>
@if (_progressindicator) @if (_progressindicator)
@ -12,6 +11,7 @@
@code { @code {
private string _message; private string _message;
private MessageType _messagetype;
private bool _progressindicator = false; private bool _progressindicator = false;
[CascadingParameter] [CascadingParameter]
@ -49,11 +49,13 @@
{ {
// module does not exist with typename specified // module does not exist with typename specified
_message = "Module Does Not Have A Component Named " + Utilities.GetTypeNameLastSegment(typename, 0) + ".razor"; _message = "Module Does Not Have A Component Named " + Utilities.GetTypeNameLastSegment(typename, 0) + ".razor";
_messagetype = MessageType.Error;
} }
} }
else else
{ {
_message = "Something is wrong with moduletype"; _message = "Something is wrong with moduletype";
_messagetype = MessageType.Error;
} }
}; };
@ -61,9 +63,10 @@
public void AddModuleMessage(string message, MessageType type) public void AddModuleMessage(string message, MessageType type)
{ {
_message = message;
_messagetype = type;
_progressindicator = false; _progressindicator = false;
StateHasChanged(); StateHasChanged();
ModuleMessage.SetModuleMessage(message, type);
} }
public void ShowProgressIndicator() public void ShowProgressIndicator()

3
Oqtane.Shared/Shared/Utilities.cs
View File

@ -326,7 +326,8 @@ namespace Oqtane.Shared
public static bool IsPathOrFileValid(this string name) 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.InvalidFileNameEndingChars.Any(name.EndsWith) &&
!Constants.ReservedDevices.Split(',').Contains(name.ToUpper().Split('.')[0])); !Constants.ReservedDevices.Split(',').Contains(name.ToUpper().Split('.')[0]));
} }