Merge pull request #1709 from sbwalker/dev

Fixed validation issue in Role Managment - Users. Modified FileManager component to allow Folder parameter to contain a folder path which is translated to a FolderId internally and refactored Packages folder logic.

Oqtane.Client/Modules/Admin/Files/Add.razor

@@ -13,7 +13,7 @@
             <div class="row mb-1 align-items-center">
                 <Label Class="col-sm-3" For="upload" HelpText="Upload the file you want" ResourceKey="Upload">Upload: </Label>
                 <div class="col-sm-9">
-                    <FileManager UploadMultiple="true" ShowFiles="false" FolderId="@_folderId" />
+                    <FileManager UploadMultiple="true" ShowFiles="false" FolderId="@_folderId" ShowSuccess="true" />
                 </div>
             </div>
         </div>

Oqtane.Client/Modules/Admin/Languages/Add.razor

@@ -115,7 +115,7 @@ else
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" HelpText="Upload one or more translations. Once they are uploaded click Install to complete the installation." ResourceKey="Module">Language: </Label>
                     <div class="col-sm-9">
-                        <FileManager Filter="nupkg" ShowFiles="true" Folder="Packages" UploadMultiple="true" />
+                        <FileManager Folder="@Constants.PackagesFolder" UploadMultiple="true" />
                     </div>
                 </div>
             </div>
@@ -317,7 +317,7 @@ else
     {
         try
         {
-            await PackageService.DownloadPackageAsync(_packageid, _version, "Packages");
+            await PackageService.DownloadPackageAsync(_packageid, _version, Constants.PackagesFolder);
             await logger.LogInformation("Language Package {Name} {Version} Downloaded Successfully", _packageid, _version);
             AddModuleMessage(Localizer["Success.Language.Download"], MessageType.Success);
             StateHasChanged();

Oqtane.Client/Modules/Admin/Languages/Index.razor

@@ -97,7 +97,7 @@ else
         {
             if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
             {
-                await PackageService.DownloadPackageAsync(Constants.PackageId + ".Client." + code, Constants.Version, "Packages");
+                await PackageService.DownloadPackageAsync(Constants.PackageId + ".Client." + code, Constants.Version, Constants.PackagesFolder);
                 await logger.LogInformation("Translation Downloaded {Code} {Version}", code, Constants.Version);
                 await PackageService.InstallPackagesAsync();
                 AddModuleMessage(string.Format(Localizer["Success.Language.Install"], NavigateUrl("admin/system")), MessageType.Success);

Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor

@@ -70,7 +70,7 @@
             <div class="row mb-1 align-items-center">
                 <Label Class="col-sm-3" HelpText="Upload one or more module packages. Once they are uploaded click Install to complete the installation." ResourceKey="Module">Module: </Label>
                 <div class="col-sm-9">
-                    <FileManager Filter="nupkg" ShowFiles="false" Folder="Packages" UploadMultiple="true" />
+                    <FileManager Folder="@Constants.PackagesFolder" UploadMultiple="true" />
                 </div>
             </div>
         </div>
@@ -229,7 +229,7 @@
     {
         try
         {
-            await PackageService.DownloadPackageAsync(_packageid, _version, "Packages");
+            await PackageService.DownloadPackageAsync(_packageid, _version, Constants.PackagesFolder);
             await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _packageid, _version);
             AddModuleMessage(Localizer["Success.Module.Download"], MessageType.Success);
             _productname = "";

Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor

@@ -111,7 +111,7 @@ else
     {
         try
         {
-            await PackageService.DownloadPackageAsync(packagename, version, "Packages");
+            await PackageService.DownloadPackageAsync(packagename, version, Constants.PackagesFolder);
             await logger.LogInformation("Module Downloaded {ModuleDefinitionName} {Version}", packagename, version);
             await ModuleDefinitionService.InstallModuleDefinitionsAsync();
             AddModuleMessage(string.Format(Localizer["Success.Module.Install"], NavigateUrl("admin/system")), MessageType.Success);

Oqtane.Client/Modules/Admin/Roles/Users.razor

@@ -35,13 +35,13 @@ else
             <div class="row mb-1 align-items-center">
                 <Label Class="col-sm-3" For="effectiveDate" HelpText="The date that this role assignment is active" ResourceKey="EffectiveDate">Effective Date: </Label>
                 <div class="col-sm-9">
-                    <input type="date" id="effectiveDate" class="form-control" @bind="@effectivedate" required />
+                    <input type="date" id="effectiveDate" class="form-control" @bind="@effectivedate" />
                 </div>
             </div>
             <div class="row mb-1 align-items-center">
                 <Label Class="col-sm-3" For="expiryDate" HelpText="The date that this role assignment expires" ResourceKey="ExpiryDate">Expiry Date: </Label>
                 <div class="col-sm-9">
-                    <input type="date" id="expiryDate" class="form-control" @bind="@expirydate" required />
+                    <input type="date" id="expiryDate" class="form-control" @bind="@expirydate" />
                 </div>
             </div>
             <br /><br />

Oqtane.Client/Modules/Admin/Themes/Add.razor

@@ -70,8 +70,7 @@
             <div class="row mb-1 align-items-center">
                 <Label Class="col-sm-3" HelpText="Upload one or more theme packages. Once they are uploaded click Install to complete the installation." ResourceKey="Theme">Theme: </Label>
                 <div class="col-sm-9">
-                    <FileManager Filter="nupkg" ShowFiles="false" Folder="Packages" UploadMultiple="@true" />
+                    <FileManager Folder="@Constants.PackagesFolder" UploadMultiple="true" />
-
                 </div>
             </div>
         </div>
@@ -230,7 +229,7 @@
     {
         try
         {
-            await PackageService.DownloadPackageAsync(_packageid, _version, "Packages");
+            await PackageService.DownloadPackageAsync(_packageid, _version, Constants.PackagesFolder);
             await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _packageid, _version);
             AddModuleMessage(Localizer["Success.Theme.Download"], MessageType.Success);
             _productname = "";

Oqtane.Client/Modules/Admin/Themes/Index.razor

@@ -112,7 +112,7 @@ else
     {
         try
         {
-            await PackageService.DownloadPackageAsync(packagename, version, "Packages");
+            await PackageService.DownloadPackageAsync(packagename, version, Constants.PackagesFolder);
             await logger.LogInformation("Theme Downloaded {ThemeName} {Version}", packagename, version);
             await ThemeService.InstallThemesAsync();
             AddModuleMessage(string.Format(Localizer["Success.Theme.Install"], NavigateUrl("admin/system")), MessageType.Success);

Oqtane.Client/Modules/Admin/Upgrade/Index.razor

@@ -26,7 +26,7 @@
             <div class="row mb-1 align-items-center">
                 <Label Class="col-sm-3" HelpText="Upload A Framework Package And Then Select Upgrade" ResourceKey="Framework">Framework: </Label>
                 <div class="col-sm-9">
-                    <FileManager Filter="nupkg" ShowFiles="false" Folder="Packages" />
+                    <FileManager Folder="@Constants.PackagesFolder" />
                 </div>
             </div>
         </div>
@@ -85,8 +85,8 @@
     {
         try
         {
-            await PackageService.DownloadPackageAsync(packageid, version, "Packages");
+            await PackageService.DownloadPackageAsync(packageid, version, Constants.PackagesFolder);
-            await PackageService.DownloadPackageAsync(Constants.UpdaterPackageId, version, "Packages");
+            await PackageService.DownloadPackageAsync(Constants.UpdaterPackageId, version, Constants.PackagesFolder);
             AddModuleMessage(Localizer["Success.Framework.Download"], MessageType.Success);
         }
         catch (Exception ex)

Oqtane.Client/Modules/Controls/FileManager.razor

@@ -11,15 +11,12 @@
         <div class="row">
             <div class="col">
                 <div class="container-fluid px-0">
-                    @if (ShowFolders || FolderId <= 0)
+                    @if (ShowFolders)
                     {
                         <div class="row">
                             <div class="col">
                                 <select class="form-select" value="@FolderId" @onchange="(e => FolderChanged(e))">
-                                    @if (string.IsNullOrEmpty(Folder))
+                                    <option value="-1">&lt;@Localizer["Folder.Select"]&gt;</option>
-                                    {
-                                        <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>
@@ -107,10 +104,16 @@
     public string Id { get; set; } // optional - for setting the id of the FileManager component for accessibility
 
     [Parameter]
-    public string Folder { get; set; } // optional - for setting a specific folder by default ( only relevant for host functions )
+    public int FolderId { get; set; } = -1; // optional - for setting a specific default folder by folderid 
 
     [Parameter]
-    public int FolderId { get; set; } = -1; // optional - for setting a specific folderid by default
+    public string Folder { get; set; } = ""; // optional - for setting a specific default folder by folder path 
+
+    [Parameter]
+    public int FileId { get; set; } = -1; // optional - for selecting a specific file by default
+
+    [Parameter]
+    public string Filter { get; set; } // optional - comma delimited list of file types that can be selected or uploaded ie. "jpg,gif"
 
     [Parameter]
     public bool ShowFiles { get; set; } = true; // optional - for indicating whether a list of files should be displayed - default is true
@@ -125,10 +128,7 @@
     public bool ShowImage { get; set; } = true; // optional - for indicating whether an image thumbnail should be displayed - default is true
 
     [Parameter]
-    public int FileId { get; set; } = -1; // optional - for selecting a specific file by default
+    public bool ShowSuccess { get; set; } = false; // optional - for indicating whether a success message should be displayed upon successful upload - default is false
-
-    [Parameter]
-    public string Filter { get; set; } // optional - comma delimited list of file types that can be selected or uploaded ie. "jpg,gif"
 
     [Parameter]
     public bool UploadMultiple { get; set; } = false; // optional - enable multiple file uploads - default false
@@ -149,19 +149,35 @@
             _id = Id;
         }
 
+        // packages folder is a framework folder for uploading installable nuget packages
+        if (Folder == Constants.PackagesFolder)
+        {
+            ShowFiles = false;
+            ShowFolders = false;
+            Filter = "nupkg";
+            ShowSuccess = true;
+        }
+
         if (!ShowFiles)
         {
             ShowImage = false;
         }
 
-        if (!string.IsNullOrEmpty(Folder))
+        _folders = await FolderService.GetFoldersAsync(ModuleState.SiteId);
+
+        if (!string.IsNullOrEmpty(Folder) && Folder != Constants.PackagesFolder)
         {
-            _folders = new List<Folder> { new Folder { FolderId = -1, Name = Folder } };
+            Folder folder = await FolderService.GetFolderAsync(ModuleState.SiteId, Folder);
-            FolderId = -1;
+            if (folder != null)
-        }
+            {
-        else
+                FolderId = folder.FolderId;
-        {
+            }
-            _folders = await FolderService.GetFoldersAsync(ModuleState.SiteId);
+            else
+            {
+                FolderId = -1;
+                _message = "Folder Path " + Folder + "Does Not Exist";
+                _messagetype = MessageType.Error;
+            }
         }
 
         if (FileId != -1)
@@ -175,6 +191,8 @@
             else
             {
                 FileId = -1; // file does not exist
+                _message = "FileId " + FileId.ToString() + "Does Not Exist";
+                _messagetype = MessageType.Error;
             }
         }
 
@@ -197,10 +215,10 @@
     private async Task GetFiles()
     {
         _haseditpermission = false;
-        if (!string.IsNullOrEmpty(Folder))
+        if (Folder == Constants.PackagesFolder)
         {
             _haseditpermission = UserSecurity.IsAuthorized(PageState.User, RoleNames.Host);
-            _files = await FileService.GetFilesAsync(Folder);
+            _files = new List<File>();
         }
         else
         {
@@ -296,7 +314,7 @@
             try
             {
                 string result;
-                if (!string.IsNullOrEmpty(Folder))
+                if (Folder == Constants.PackagesFolder)
                 {
                     result = await FileService.UploadFilesAsync(Folder, upload, _guid);
                 }
@@ -308,6 +326,11 @@
                 if (result == string.Empty)
                 {
                     await logger.LogInformation("File Upload Succeeded {Files}", upload);
+                    if (ShowSuccess)
+                    {
+                        _message = Localizer["Success.File.Upload"];
+                        _messagetype = MessageType.Success;
+                    }
 
                     // set FileId to first file in upload collection
                     await GetFiles();

Oqtane.Client/Resources/Modules/Controls/FileManager.resx

@@ -138,4 +138,7 @@
   <data name="Error.File.Delete" xml:space="preserve">
     <value>Error Deleting File</value>
   </data>
+  <data name="Success.File.Upload" xml:space="preserve">
+    <value>File Upload Succeeded</value>
+  </data>
 </root>

Oqtane.Server/Infrastructure/DatabaseManager.cs

@@ -209,7 +209,7 @@ namespace Oqtane.Infrastructure
                 bool installPackages = false;
 
                 // iterate database packages in installation folder
-                var packagesFolder = new DirectoryInfo(Path.Combine(_environment.ContentRootPath, "Packages"));
+                var packagesFolder = new DirectoryInfo(Path.Combine(_environment.ContentRootPath, Constants.PackagesFolder));
                 foreach (var package in packagesFolder.GetFiles("*.nupkg.bak"))
                 {
                     // determine if package needs to be upgraded or installed

Oqtane.Server/Infrastructure/InstallationManager.cs

@@ -190,7 +190,7 @@ namespace Oqtane.Infrastructure
             {
                 // get manifest with highest version
                 string packagename = "";
-                string[] packages = Directory.GetFiles(Path.Combine(_environment.ContentRootPath, "Packages"), PackageName + "*.log");
+                string[] packages = Directory.GetFiles(Path.Combine(_environment.ContentRootPath, Constants.PackagesFolder), PackageName + "*.log");
                 if (packages.Length > 0)
                 {
                     packagename = packages[packages.Length - 1]; // use highest version 
@@ -230,7 +230,7 @@ namespace Oqtane.Infrastructure
 
         public void UpgradeFramework()
         {
-            string folder = Path.Combine(_environment.ContentRootPath, "Packages");
+            string folder = Path.Combine(_environment.ContentRootPath, Constants.PackagesFolder);
             if (Directory.Exists(folder))
             {
                 // get package with highest version

Oqtane.Shared/Shared/Constants.cs

@@ -42,6 +42,7 @@ namespace Oqtane.Shared {
         public const string ContentUrl = "/api/file/download/";
         public const string ImageUrl = "/api/file/image/";
         public const int UserFolderCapacity = 20; // megabytes
+        public const string PackagesFolder = "Packages";
 
         [Obsolete("Use UserNames.Host instead.")]
         public const string HostUser = UserNames.Host;