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

files validation

Browse Source
This commit is contained in:
Grayson Walker 2021-07-31 16:59:03 -04:00
parent 00ca3d856b
commit 1cc26c3902
3 changed files with 225 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
Oqtane.Client/Modules/Admin/Files/Add.razor
View File

@ -19,36 +19,40 @@
</div> </div>
<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink> <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
</TabPanel> </TabPanel>
<TabPanel Name="Download" Heading="Download Files" ResourceKey="DownloadFiles"> <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
@if (_folders != null) <TabPanel Name="Download" Heading="Download Files" ResourceKey="DownloadFiles">
{ @if (_folders != null)
<div class="container"> {
<div class="row mb-1 align-items-center"> <div class="container">
<Label Class="col-sm-3" For="url" HelpText="Enter the url of the file you wish to download" ResourceKey="Url">Url: </Label> <div class="row mb-1 align-items-center">
<div class="col-sm-9"> <Label Class="col-sm-3" For="url" HelpText="Enter the url of the file you wish to download" ResourceKey="Url">Url: </Label>
<input id="url" class="form-control" @bind="@url" /> <div class="col-sm-9">
<input id="url" class="form-control" @bind="@url" required />
</div>
</div>
<div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="folder" HelpText="Select the folder to save the file in" ResourceKey="Folder">Folder: </Label>
<div class="col-sm-9">
<select id="folder" class="form-select" @bind="@_folderId" required>
<option value="-1">&lt;@Localizer["Folder.Select"]&gt;</option>
@foreach (Folder folder in _folders)
{
<option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
}
</select>
</div>
</div>
</div> </div>
</div> <button type="button" class="btn btn-success" @onclick="Download">@SharedLocalizer["Download"]</button>
<div class="row mb-1 align-items-center"> <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
<Label Class="col-sm-3" For="folder" HelpText="Select the folder to save the file in" ResourceKey="Folder">Folder: </Label> }
<div class="col-sm-9"> </TabPanel>
<select id="folder" class="form-select" @bind="@_folderId"> </form>
<option value="-1">&lt;@Localizer["Folder.Select"]&gt;</option>
@foreach (Folder folder in _folders)
{
<option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
}
</select>
</div>
</div>
</div>
<button type="button" class="btn btn-success" @onclick="Download">@SharedLocalizer["Download"]</button>
<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
}
</TabPanel>
</TabStrip> </TabStrip>
@code { @code {
private ElementReference form;
private bool validated = false;
private string url = string.Empty; private string url = string.Empty;
private List<Folder> _folders; private List<Folder> _folders;
private int _folderId = -1; private int _folderId = -1;
@ -67,37 +71,46 @@
private async Task Download() private async Task Download()
{ {
if (url == string.Empty || _folderId == -1) validated = true;
var interop = new Interop(JSRuntime);
if (await interop.FormValid(form))
{ {
AddModuleMessage(Localizer["Message.Required.UrlFolder"], MessageType.Warning); if (url == string.Empty || _folderId == -1)
return; {
} AddModuleMessage(Localizer["Message.Required.UrlFolder"], MessageType.Warning);
return;
}
var filename = url.Substring(url.LastIndexOf("/", StringComparison.Ordinal) + 1); var filename = url.Substring(url.LastIndexOf("/", StringComparison.Ordinal) + 1);
if (!Constants.UploadableFiles.Split(',') if (!Constants.UploadableFiles.Split(',')
.Contains(Path.GetExtension(filename).ToLower().Replace(".", ""))) .Contains(Path.GetExtension(filename).ToLower().Replace(".", "")))
{ {
AddModuleMessage(Localizer["Message.Download.InvalidExtension"], MessageType.Warning); AddModuleMessage(Localizer["Message.Download.InvalidExtension"], MessageType.Warning);
return; return;
} }
if (!filename.IsPathOrFileValid()) if (!filename.IsPathOrFileValid())
{ {
AddModuleMessage(Localizer["Message.Required.UrlName"], MessageType.Warning); AddModuleMessage(Localizer["Message.Required.UrlName"], MessageType.Warning);
return; return;
} }
try try
{ {
await FileService.UploadFileAsync(url, _folderId); await FileService.UploadFileAsync(url, _folderId);
await logger.LogInformation("File Downloaded Successfully From Url {Url}", url); await logger.LogInformation("File Downloaded Successfully From Url {Url}", url);
AddModuleMessage(Localizer["Success.Download.File"], MessageType.Success); AddModuleMessage(Localizer["Success.Download.File"], MessageType.Success);
}
catch (Exception ex)
{
await logger.LogError(ex, "Error Downloading File From Url {Url} {Error}", url, ex.Message);
AddModuleMessage(Localizer["Error.Download.InvalidUrl"], MessageType.Error);
}
} }
catch (Exception ex) else
{ {
await logger.LogError(ex, "Error Downloading File From Url {Url} {Error}", url, ex.Message); AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
AddModuleMessage(Localizer["Error.Download.InvalidUrl"], MessageType.Error);
} }
} }
} }

97
Oqtane.Client/Modules/Admin/Files/Details.razor
View File

@ -8,39 +8,43 @@
@if (_folders != null) @if (_folders != null)
{ {
<div class="container"> <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
<div class="row mb-1 align-items-center"> <div class="container">
<Label Class="col-sm-3" For="name" HelpText="The name of the file" ResourceKey="Name">Name: </Label> <div class="row mb-1 align-items-center">
<div class="col-sm-9"> <Label Class="col-sm-3" For="name" HelpText="The name of the file" ResourceKey="Name">Name: </Label>
<input id="name" class="form-control" @bind="@_name" /> <div class="col-sm-9">
<input id="name" class="form-control" @bind="@_name" maxlength="50" required />
</div>
</div>
<div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="parent" HelpText="The folder where the file is located" ResourceKey="Folder">Folder: </Label>
<div class="col-sm-9">
<select id="parent" class="form-select" @bind="@_folderId" required>
@foreach (Folder folder in _folders)
{
<option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
}
</select>
</div>
</div>
<div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="size" HelpText="The size of the file (in bytes)" ResourceKey="Size">Size: </Label>
<div class="col-sm-9">
<input id="size" class="form-control" @bind="@_size" readonly />
</div>
</div>
</div> </div>
</div> <button type="button" class="btn btn-success" @onclick="SaveFile">@SharedLocalizer["Save"]</button>
<div class="row mb-1 align-items-center"> <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
<Label Class="col-sm-3" For="parent" HelpText="The folder where the file is located" ResourceKey="Folder">Folder: </Label> <br />
<div class="col-sm-9"> <br />
<select id="parent" class="form-select" @bind="@_folderId"> <AuditInfo CreatedBy="@_createdBy" CreatedOn="@_createdOn" ModifiedBy="@_modifiedBy" ModifiedOn="@_modifiedOn"></AuditInfo>
@foreach (Folder folder in _folders) </form>
{
<option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
}
</select>
</div>
</div>
<div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="size" HelpText="The size of the file (in bytes)" ResourceKey="Size">Size: </Label>
<div class="col-sm-9">
<input id="size" class="form-control" @bind="@_size" readonly />
</div>
</div>
</div>
<button type="button" class="btn btn-success" @onclick="SaveFile">@SharedLocalizer["Save"]</button>
<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
<br />
<br />
<AuditInfo CreatedBy="@_createdBy" CreatedOn="@_createdOn" ModifiedBy="@_modifiedBy" ModifiedOn="@_modifiedOn"></AuditInfo>
} }
@code { @code {
private ElementReference form;
private bool validated = false;
private int _fileId = -1; private int _fileId = -1;
private string _name; private string _name;
private List<Folder> _folders; private List<Folder> _folders;
@ -82,26 +86,35 @@
private async Task SaveFile() private async Task SaveFile()
{ {
try validated = true;
var interop = new Interop(JSRuntime);
if (await interop.FormValid(form))
{ {
if (_name.IsPathOrFileValid()) try
{ {
File file = await FileService.GetFileAsync(_fileId); if (_name.IsPathOrFileValid())
file.Name = _name; {
file.FolderId = _folderId; File file = await FileService.GetFileAsync(_fileId);
file = await FileService.UpdateFileAsync(file); file.Name = _name;
await logger.LogInformation("File Saved {File}", file); file.FolderId = _folderId;
NavigationManager.NavigateTo(NavigateUrl()); file = await FileService.UpdateFileAsync(file);
await logger.LogInformation("File Saved {File}", file);
NavigationManager.NavigateTo(NavigateUrl());
}
else
{
AddModuleMessage(Localizer["Message.File.InvalidName"], MessageType.Warning);
}
} }
else catch (Exception ex)
{ {
AddModuleMessage(Localizer["Message.File.InvalidName"], MessageType.Warning); await logger.LogError(ex, "Error Saving File {FileId} {Error}", _fileId, ex.Message);
AddModuleMessage(Localizer["Error.File.Save"], MessageType.Error);
} }
} }
catch (Exception ex) else
{ {
await logger.LogError(ex, "Error Saving File {FileId} {Error}", _fileId, ex.Message); AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
AddModuleMessage(Localizer["Error.File.Save"], MessageType.Error);
} }
} }
} }

199
Oqtane.Client/Modules/Admin/Files/Edit.razor
View File

@ -8,52 +8,54 @@
@if (_folders != null) @if (_folders != null)
{ {
<div class="container"> <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
<div class="row mb-1 align-items-center"> <div class="container">
<Label Class="col-sm-3" For="parent" HelpText="Select the parent folder" ResourceKey="Parent">Parent: </Label> <div class="row mb-1 align-items-center">
<div class="col-sm-9"> <Label Class="col-sm-3" For="parent" HelpText="Select the parent folder" ResourceKey="Parent">Parent: </Label>
<select id="parent" class="form-select" @bind="@_parentId"> <div class="col-sm-9">
@if (PageState.QueryString.ContainsKey("id")) <select id="parent" class="form-select" @bind="@_parentId" required>
{ @if (PageState.QueryString.ContainsKey("id"))
<option value="-1">&lt;@Localizer["NoParent"]&gt;</option> {
} <option value="-1">&lt;@Localizer["NoParent"]&gt;</option>
@foreach (Folder folder in _folders) }
{ @foreach (Folder folder in _folders)
<option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option> {
} <option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
</select> }
</div> </select>
</div> </div>
<div class="row mb-1 align-items-center"> </div>
<Label Class="col-sm-3" For="name" HelpText="Enter the folder name" ResourceKey="Name">Name: </Label> <div class="row mb-1 align-items-center">
<div class="col-sm-9"> <Label Class="col-sm-3" For="name" HelpText="Enter the folder name" ResourceKey="Name">Name: </Label>
<input id="name" class="form-control" @bind="@_name" /> <div class="col-sm-9">
</div> <input id="name" class="form-control" @bind="@_name" maxlength="50" required />
</div> </div>
<div class="row mb-1 align-items-center"> </div>
<Label Class="col-sm-3" For="type" HelpText="Select the folder type. Private folders are only accessible by authorized users. Public folders can be accessed by all users" ResourceKey="Name">Type: </Label> <div class="row mb-1 align-items-center">
<div class="col-sm-9"> <Label Class="col-sm-3" For="type" HelpText="Select the folder type. Private folders are only accessible by authorized users. Public folders can be accessed by all users" ResourceKey="Name">Type: </Label>
@if (PageState.QueryString.ContainsKey("id")) <div class="col-sm-9">
{ @if (PageState.QueryString.ContainsKey("id"))
<input id="type" class="form-control" readonly @bind="@_type" /> {
} <input id="type" class="form-control" readonly @bind="@_type" />
else }
{ else
<select id="type" class="form-select" @bind="@_type"> {
<option value="@FolderTypes.Private">@Localizer[FolderTypes.Private]</option> <select id="type" class="form-select" @bind="@_type" required>
<option value="@FolderTypes.Public">@Localizer[FolderTypes.Public]</option> <option value="@FolderTypes.Private">@Localizer[FolderTypes.Private]</option>
</select> <option value="@FolderTypes.Public">@Localizer[FolderTypes.Public]</option>
} </select>
</div> }
</div> </div>
<div class="row mb-1 align-items-center"> </div>
<div class="col-sm-12"> <div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="permissions" HelpText="Select the permissions you want for the folder" ResourceKey="Permissions">Permissions: </Label> <div class="col-sm-12">
<PermissionGrid EntityName="@EntityNames.Folder" PermissionNames="@(PermissionNames.Browse + "," + PermissionNames.View + "," + PermissionNames.Edit)" Permissions="@_permissions" @ref="_permissionGrid" /> <Label Class="col-sm-3" For="permissions" HelpText="Select the permissions you want for the folder" ResourceKey="Permissions">Permissions: </Label>
<PermissionGrid EntityName="@EntityNames.Folder" PermissionNames="@(PermissionNames.Browse + "," + PermissionNames.View + "," + PermissionNames.Edit)" Permissions="@_permissions" @ref="_permissionGrid" />
</div>
</div>
</div> </div>
</div> </form>
</div>
@if (!_isSystem) @if (!_isSystem)
{ {
@ -75,6 +77,8 @@
} }
@code { @code {
private ElementReference form;
private bool validated = false;
private List<Folder> _folders; private List<Folder> _folders;
private int _folderId = -1; private int _folderId = -1;
private int _parentId = -1; private int _parentId = -1;
@ -133,70 +137,79 @@
private async Task SaveFolder() private async Task SaveFolder()
{ {
if (_name == string.Empty || _parentId == -1) validated = true;
var interop = new Interop(JSRuntime);
if (await interop.FormValid(form))
{ {
AddModuleMessage(Localizer["Message.Required.FolderParent"], MessageType.Warning); if (_name == string.Empty || _parentId == -1)
return;
}
if (!_name.IsPathOrFileValid())
{
AddModuleMessage(Localizer["Message.Folder.InvalidName"], MessageType.Warning);
return;
}
try
{
Folder folder;
if (_folderId != -1)
{ {
folder = await FolderService.GetFolderAsync(_folderId); AddModuleMessage(Localizer["Message.Required.FolderParent"], MessageType.Warning);
} return;
else
{
folder = new Folder();
} }
folder.SiteId = PageState.Site.SiteId; if (!_name.IsPathOrFileValid())
if (_parentId == -1)
{ {
folder.ParentId = null; AddModuleMessage(Localizer["Message.Folder.InvalidName"], MessageType.Warning);
} return;
else
{
folder.ParentId = _parentId;
} }
folder.Name = _name; try
folder.Type = _type; {
folder.IsSystem = _isSystem; Folder folder;
folder.Permissions = _permissionGrid.GetPermissions(); if (_folderId != -1)
{
folder = await FolderService.GetFolderAsync(_folderId);
}
else
{
folder = new Folder();
}
if (_folderId != -1) folder.SiteId = PageState.Site.SiteId;
{
folder = await FolderService.UpdateFolderAsync(folder);
}
else
{
folder = await FolderService.AddFolderAsync(folder);
}
if (folder != null) if (_parentId == -1)
{ {
await FolderService.UpdateFolderOrderAsync(folder.SiteId, folder.FolderId, folder.ParentId); folder.ParentId = null;
await logger.LogInformation("Folder Saved {Folder}", folder); }
NavigationManager.NavigateTo(NavigateUrl()); else
{
folder.ParentId = _parentId;
}
folder.Name = _name;
folder.Type = _type;
folder.IsSystem = _isSystem;
folder.Permissions = _permissionGrid.GetPermissions();
if (_folderId != -1)
{
folder = await FolderService.UpdateFolderAsync(folder);
}
else
{
folder = await FolderService.AddFolderAsync(folder);
}
if (folder != null)
{
await FolderService.UpdateFolderOrderAsync(folder.SiteId, folder.FolderId, folder.ParentId);
await logger.LogInformation("Folder Saved {Folder}", folder);
NavigationManager.NavigateTo(NavigateUrl());
}
else
{
AddModuleMessage(Localizer["Error.Folder.Save"], MessageType.Error);
}
} }
else catch (Exception ex)
{ {
await logger.LogError(ex, "Error Saving Folder {FolderId} {Error}", _folderId, ex.Message);
AddModuleMessage(Localizer["Error.Folder.Save"], MessageType.Error); AddModuleMessage(Localizer["Error.Folder.Save"], MessageType.Error);
} }
} }
catch (Exception ex) else
{ {
await logger.LogError(ex, "Error Saving Folder {FolderId} {Error}", _folderId, ex.Message); AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
AddModuleMessage(Localizer["Error.Folder.Save"], MessageType.Error);
} }
} }