Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed build warnings related to ModuleMessage component changes #781

Merged
merged 2 commits into from
Oct 5, 2020
Merged

Fixed build warnings related to ModuleMessage component changes #781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ece8f3a
Merge pull request #56 from oqtane/master
sbwalker Oct 4, 2020
0c0916c
Fixed build warnings related to ModuleMessage component changes
sbwalker Oct 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 21 additions & 16 deletions Oqtane.Client/Modules/Controls/FileManager.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
</span>
</div>
}
<ModuleMessage @ref=_message></ModuleMessage>
<ModuleMessage Message="@_message" Type="@_messagetype"></ModuleMessage>
</div>
@if (_image != string.Empty)
{
Expand All @@ -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
Expand Down Expand Up @@ -205,6 +206,7 @@

private async Task FolderChanged(ChangeEventArgs e)
{
_message = string.Empty;
try
{
FolderId = int.Parse((string)e.Value);
Expand All @@ -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();
Expand Down Expand Up @@ -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)
Expand All @@ -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();

Expand All @@ -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;
Expand All @@ -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;
}
}

Expand Down
15 changes: 4 additions & 11 deletions Oqtane.Client/Modules/Controls/ModuleMessage.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand All @@ -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:
Expand Down
11 changes: 6 additions & 5 deletions Oqtane.Client/Modules/Controls/RichTextEditor.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;">
Expand Down Expand Up @@ -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; }
Expand All @@ -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" }
Expand Down Expand Up @@ -144,6 +144,7 @@
public void CloseFileManager()
{
_filemanagervisible = false;
_message = string.Empty;
StateHasChanged();
}

Expand Down Expand Up @@ -180,6 +181,7 @@

public async Task InsertImage()
{
_message = string.Empty;
if (_filemanagervisible)
{
var fileid = _fileManager.GetFileId();
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion Oqtane.Client/Modules/MessageType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ public enum MessageType
Success,
Info,
Warning,
Error
Error,
Undefined
}
}
20 changes: 9 additions & 11 deletions Oqtane.Client/UI/Installer.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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;";

Expand Down Expand Up @@ -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";
}
}

Expand Down
9 changes: 6 additions & 3 deletions Oqtane.Client/UI/ModuleInstance.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -12,6 +11,7 @@

@code {
private string _message;
private MessageType _messagetype;
private bool _progressindicator = false;

[CascadingParameter]
Expand Down Expand Up @@ -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()
Expand Down
3 changes: 2 additions & 1 deletion Oqtane.Shared/Shared/Utilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]));
}
Expand Down