Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'oqtane/dev' into dev

Browse Source
This commit is contained in:
Leigh Pointer
2023-07-17 16:48:24 +02:00
parent 6b16808207 1ef28494b3
commit ea45044dc7
6 changed files with 94 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,10 +61,20 @@
} }
</div> </div>
</div> </div>
<div class="row"> @if (ShowProgress)
<div class="col mt-1"><span id="@_progressinfoid" style="display: none;"></span></div> {
<div class="col mt-1"><progress id="@_progressbarid" class="mt-1" style="display: none;"></progress></div> <div class="row">
</div> <div class="col mt-1"><span id="@_progressinfoid" style="display: none;"></span></div>
<div class="col mt-1"><progress id="@_progressbarid" class="mt-1" style="display: none;"></progress></div>
</div>
}
else
{
if (_uploading)
{
<div class="app-progress-indicator"></div>
}
}
} }
</div> </div>
</div> </div>
@ -100,6 +110,7 @@
private string _guid; private string _guid;
private string _message = string.Empty; private string _message = string.Empty;
private MessageType _messagetype; private MessageType _messagetype;
private bool _uploading = false;
[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
@ -128,6 +139,9 @@
[Parameter] [Parameter]
public bool ShowImage { get; set; } = true; // optional - for indicating whether an image thumbnail should be displayed - default is true public bool ShowImage { get; set; } = true; // optional - for indicating whether an image thumbnail should be displayed - default is true
[Parameter]
public bool ShowProgress { get; set; } = true; // optional - for indicating whether progress info should be displayed during upload - default is true
[Parameter] [Parameter]
public bool ShowSuccess { get; set; } = false; // optional - for indicating whether a success message should be displayed upon successful upload - default is false public bool ShowSuccess { get; set; } = false; // optional - for indicating whether a success message should be displayed upon successful upload - default is false
@ -271,13 +285,10 @@
{ {
_message = string.Empty; _message = string.Empty;
FileId = int.Parse((string)e.Value); FileId = int.Parse((string)e.Value);
if (FileId != -1)
{
await OnSelect.InvokeAsync(FileId);
}
await SetImage(); await SetImage();
await OnSelect.InvokeAsync(FileId);
StateHasChanged(); StateHasChanged();
} }
private async Task SetImage() private async Task SetImage()
@ -321,6 +332,12 @@
} }
if (restricted == "") if (restricted == "")
{ {
if (!ShowProgress)
{
_uploading = true;
StateHasChanged();
}
try try
{ {
// upload the files // upload the files
@ -354,8 +371,16 @@
} }
// reset progress indicators // reset progress indicators
await interop.SetElementAttribute(_guid + "ProgressInfo", "style", "display: none;"); if (ShowProgress)
await interop.SetElementAttribute(_guid + "ProgressBar", "style", "display: none;"); {
await interop.SetElementAttribute(_guid + "ProgressInfo", "style", "display: none;");
await interop.SetElementAttribute(_guid + "ProgressBar", "style", "display: none;");
}
else
{
_uploading = false;
StateHasChanged();
}
if (success) if (success)
{ {
@ -396,7 +421,9 @@
await logger.LogError(ex, "File Upload Failed {Error}", ex.Message); await logger.LogError(ex, "File Upload Failed {Error}", ex.Message);
_message = Localizer["Error.File.Upload"]; _message = Localizer["Error.File.Upload"];
_messagetype = MessageType.Error; _messagetype = MessageType.Error;
_uploading = false;
} }
} }
else else
{ {

17
Oqtane.Client/Services/ServiceBase.cs
View File

@ -202,15 +202,15 @@ namespace Oqtane.Services
private async Task<bool> CheckResponse(HttpResponseMessage response, string uri) private async Task<bool> CheckResponse(HttpResponseMessage response, string uri)
{ {
if (uri.Contains("/api/") && !response.RequestMessage.RequestUri.AbsolutePath.Contains("/api/")) if (response.IsSuccessStatusCode && uri.Contains("/api/") && !response.RequestMessage.RequestUri.AbsolutePath.Contains("/api/"))
{ {
await Log(uri, response.RequestMessage.Method.ToString(), "Request {Uri} Not Mapped To A Controller Method", uri); await Log(uri, response.RequestMessage.Method.ToString(), response.StatusCode.ToString(), "Request {Uri} Not Mapped To An API Controller Method", uri);
return false; return false;
} }
if (response.IsSuccessStatusCode) return true; if (response.IsSuccessStatusCode) return true;
if (response.StatusCode != HttpStatusCode.NoContent && response.StatusCode != HttpStatusCode.NotFound) if (response.StatusCode != HttpStatusCode.NoContent && response.StatusCode != HttpStatusCode.NotFound)
{ {
await Log(uri, response.RequestMessage.Method.ToString(), "Request {Uri} Failed With Status {StatusCode} - {ReasonPhrase}", uri, response.StatusCode, response.ReasonPhrase); await Log(uri, response.RequestMessage.Method.ToString(), response.StatusCode.ToString(), "Request {Uri} Failed With Status {StatusCode} - {ReasonPhrase}", uri, response.StatusCode, response.ReasonPhrase);
} }
return false; return false;
} }
@ -221,7 +221,7 @@ namespace Oqtane.Services
return mediaType != null && mediaType.Equals("application/json", StringComparison.OrdinalIgnoreCase); return mediaType != null && mediaType.Equals("application/json", StringComparison.OrdinalIgnoreCase);
} }
private async Task Log(string uri, string method, string message, params object[] args) private async Task Log(string uri, string method, string status, string message, params object[] args)
{ {
if (_siteState.Alias != null) if (_siteState.Alias != null)
{ {
@ -251,7 +251,14 @@ namespace Oqtane.Services
log.Function = LogFunction.Other.ToString(); log.Function = LogFunction.Other.ToString();
break; break;
} }
log.Level = LogLevel.Error.ToString(); if (status == "500")
{
log.Level = LogLevel.Error.ToString();
}
else
{
log.Level = LogLevel.Warning.ToString();
}
log.Message = message; log.Message = message;
log.MessageTemplate = ""; log.MessageTemplate = "";
log.Properties = JsonSerializer.Serialize(args); log.Properties = JsonSerializer.Serialize(args);

4
Oqtane.Client/Themes/Controls/Container/ModuleActionsBase.cs
View File

@ -139,11 +139,11 @@ namespace Oqtane.Themes.Controls
var permissions = pagemodule.Module.PermissionList; var permissions = pagemodule.Module.PermissionList;
if (!permissions.Any(item => item.PermissionName == PermissionNames.View && item.RoleName == RoleNames.Everyone)) if (!permissions.Any(item => item.PermissionName == PermissionNames.View && item.RoleName == RoleNames.Everyone))
{ {
permissions.Add(new Permission(ModuleState.SiteId, EntityNames.Page, pagemodule.PageId, PermissionNames.View, RoleNames.Everyone, null, true)); permissions.Add(new Permission(ModuleState.SiteId, EntityNames.Module, pagemodule.ModuleId, PermissionNames.View, RoleNames.Everyone, null, true));
} }
if (!permissions.Any(item => item.PermissionName == PermissionNames.View && item.RoleName == RoleNames.Registered)) if (!permissions.Any(item => item.PermissionName == PermissionNames.View && item.RoleName == RoleNames.Registered))
{ {
permissions.Add(new Permission(ModuleState.SiteId, EntityNames.Page, pagemodule.PageId, PermissionNames.View, RoleNames.Registered, null, true)); permissions.Add(new Permission(ModuleState.SiteId, EntityNames.Module, pagemodule.ModuleId, PermissionNames.View, RoleNames.Registered, null, true));
} }
pagemodule.Module.PermissionList = permissions; pagemodule.Module.PermissionList = permissions;
await ModuleService.UpdateModuleAsync(pagemodule.Module); await ModuleService.UpdateModuleAsync(pagemodule.Module);

4
Oqtane.Server/Controllers/PageController.cs
View File

@ -89,7 +89,7 @@ namespace Oqtane.Controllers
{ {
if (page != null) if (page != null)
{ {
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Page Get Attempt {PageId}", id); _logger.Log(LogLevel.Warning, this, LogFunction.Security, "Unauthorized Page Get Attempt {PageId}", id);
HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden; HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
} }
else else
@ -116,7 +116,7 @@ namespace Oqtane.Controllers
{ {
if (page != null) if (page != null)
{ {
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Page Get Attempt {SiteId} {Path}", siteid, path); _logger.Log(LogLevel.Warning, this, LogFunction.Security, "Unauthorized Page Get Attempt {SiteId} {Path}", siteid, path);
HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden; HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
} }
else else

19
Oqtane.Server/Infrastructure/InstallationManager.cs
View File

@ -201,7 +201,24 @@ namespace Oqtane.Infrastructure
{ {
Directory.CreateDirectory(Path.GetDirectoryName(filename)); Directory.CreateDirectory(Path.GetDirectoryName(filename));
} }
entry.ExtractToFile(filename, true); if (Path.Exists(filename) && Path.GetExtension(filename).ToLower() == ".dll")
{
// ensure assembly version is equal to or greater than existing assembly
var assembly = filename.Replace(Path.GetFileName(filename), "temp.dll");
entry.ExtractToFile(assembly, true);
if (Version.Parse(FileVersionInfo.GetVersionInfo(assembly).FileVersion).CompareTo(Version.Parse(FileVersionInfo.GetVersionInfo(filename).FileVersion)) >= 0)
{
File.Move(assembly, filename, true);
}
else
{
File.Delete(assembly);
}
}
else
{
entry.ExtractToFile(filename, true);
}
} }
catch catch
{ {

34
Oqtane.Server/wwwroot/js/interop.js
View File

@ -290,8 +290,10 @@ Oqtane.Interop = {
var progressinfo = document.getElementById('ProgressInfo_' + id); var progressinfo = document.getElementById('ProgressInfo_' + id);
var progressbar = document.getElementById('ProgressBar_' + id); var progressbar = document.getElementById('ProgressBar_' + id);
progressinfo.setAttribute("style", "display: inline;"); if (progressinfo !== null && progressbar !== null) {
progressbar.setAttribute("style", "width: 100%; display: inline;"); progressinfo.setAttribute("style", "display: inline;");
progressbar.setAttribute("style", "width: 100%; display: inline;");
}
for (var i = 0; i < files.length; i++) { for (var i = 0; i < files.length; i++) {
var FileChunk = []; var FileChunk = [];
@ -322,21 +324,29 @@ Oqtane.Interop = {
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.open('POST', posturl, true); request.open('POST', posturl, true);
request.upload.onloadstart = function (e) { request.upload.onloadstart = function (e) {
progressinfo.innerHTML = file.name + ' 0%'; if (progressinfo !== null && progressbar !== null) {
progressbar.value = 0; progressinfo.innerHTML = file.name + ' 0%';
progressbar.value = 0;
}
}; };
request.upload.onprogress = function (e) { request.upload.onprogress = function (e) {
var percent = Math.ceil((e.loaded / e.total) * 100); if (progressinfo !== null && progressbar !== null) {
progressinfo.innerHTML = file.name + '[' + PartCount + '] ' + percent + '%'; var percent = Math.ceil((e.loaded / e.total) * 100);
progressbar.value = (percent / 100); progressinfo.innerHTML = file.name + '[' + PartCount + '] ' + percent + '%';
progressbar.value = (percent / 100);
}
}; };
request.upload.onloadend = function (e) { request.upload.onloadend = function (e) {
progressinfo.innerHTML = file.name + ' 100%'; if (progressinfo !== null && progressbar !== null) {
progressbar.value = 1; progressinfo.innerHTML = file.name + ' 100%';
progressbar.value = 1;
}
}; };
request.upload.onerror = function () { request.upload.onerror = function() {
progressinfo.innerHTML = file.name + ' Error: ' + xhr.status; if (progressinfo !== null && progressbar !== null) {
progressbar.value = 0; progressinfo.innerHTML = file.name + ' Error: ' + xhr.status;
progressbar.value = 0;
}
}; };
request.send(data); request.send(data);
} }