Diplomarbeit-Absolventenverein/oqtane.framework
6
0
Fork 0
Code Issues 1 Pull Requests 1 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
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>
</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;
}
}

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

@ -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:

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

@ -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