Implemented new resource manager as per feedback

DNN Platform/Modules/ResourceManager/.gitignore

@@ -0,0 +1 @@
+/Scripts

DNN Platform/Modules/ResourceManager/Components/ItemsManager.cs

@@ -133,7 +133,7 @@ public void SaveFileDetails(IFileInfo file, FileDetailsRequest fileDetails)
         public void SaveFolderDetails(IFolderInfo folder, FolderDetailsRequest folderDetails)
         {
             this.assetManager.RenameFolder(folderDetails.FolderId, folderDetails.FolderName);
-            folder.FolderPermissions.Clear();
+            folder.FolderPermissions.Clear();
             folder.FolderPermissions.AddRange(folderDetails.Permissions.RolePermissions.ToPermissionInfos(folderDetails.FolderId));
             folder.FolderPermissions.AddRange(folderDetails.Permissions.UserPermissions.ToPermissionInfos(folderDetails.FolderId));
             FolderManager.Instance.UpdateFolder(folder);

DNN Platform/Modules/ResourceManager/Components/PermissionHelper.cs

@@ -229,7 +229,7 @@ public static ArrayList ToPermissionInfos(this IList<UserPermission> permissions
                         AllowAccess = p.AllowAccess,
                         FolderID = folderId,
                         PermissionID = p.PermissionId,
-                        RoleID = Null.NullInteger,
+                        RoleID = int.Parse(Globals.glbRoleNothing),
                         UserID = permission.UserId,
                     });
                 }

DNN Platform/Modules/ResourceManager/Components/PersonaBarMenuController.cs

@@ -0,0 +1,38 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information
+
+namespace Dnn.Modules.ResourceManager.Components
+{
+    using System.Collections.Generic;
+    using System.Linq;
+
+    using Dnn.PersonaBar.Library.Controllers;
+    using Dnn.PersonaBar.Library.Model;
+    using DotNetNuke.Entities.Portals;
+    using DotNetNuke.Entities.Users;
+
+    /// <summary>
+    /// Manages the behaviour of the Resource Manager persona bar menu item.
+    /// </summary>
+    public class PersonaBarMenuController : IMenuItemController
+    {
+        /// <inheritdoc/>
+        public IDictionary<string, object> GetSettings(MenuItem menuItem)
+        {
+            return null;
+        }
+
+        /// <inheritdoc/>
+        public void UpdateParameters(MenuItem menuItem)
+        {
+        }
+
+        /// <inheritdoc/>
+        public bool Visible(MenuItem menuItem)
+        {
+            var user = UserController.Instance.GetCurrentUserInfo();
+            return user.Roles.Contains(PortalSettings.Current.AdministratorRoleName) || user.IsSuperUser;
+        }
+    }
+}

DNN Platform/Modules/ResourceManager/Dnn.Modules.ResourceManager.csproj

@@ -107,6 +107,7 @@
     <Compile Include="Components\Models\ThumbnailContent.cs" />
     <Compile Include="Components\PermissionHelper.cs" />
     <Compile Include="Components\PermissionsManager.cs" />
+    <Compile Include="Components\PersonaBarMenuController.cs" />
     <Compile Include="Components\ResourceManagerController.cs" />
     <Compile Include="Components\SearchController.cs" />
     <Compile Include="Components\SettingsManager.cs" />
@@ -133,6 +134,7 @@
     <Compile Include="Services\Dto\MoveFolderRequest.cs" />
     <Compile Include="Services\Dto\Permission.cs" />
     <Compile Include="Services\Dto\Permissions.cs" />
+    <Compile Include="Services\Dto\RoleGroupDto.cs" />
     <Compile Include="Services\Dto\RolePermission.cs" />
     <Compile Include="Services\Dto\ThumbnailDownloadRequest.cs" />
     <Compile Include="Services\Dto\UserPermission.cs" />
@@ -147,13 +149,6 @@
     <Compile Include="Settings.ascx.designer.cs">
       <DependentUpon>Settings.ascx</DependentUpon>
     </Compile>
-    <Compile Include="View.ascx.cs">
-      <DependentUpon>View.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="View.ascx.designer.cs">
-      <DependentUpon>View.ascx</DependentUpon>
-    </Compile>
     <AdditionalFiles Include="..\..\..\stylecop.json">
       <Link>stylecop.json</Link>
     </AdditionalFiles>
@@ -196,9 +191,7 @@
     <Content Include="License.txt" />
     <Content Include="module.css" />
     <Content Include="ReleaseNotes.txt" />
-    <Content Include="Scripts\dnn.Localization.js" />
     <Content Include="Settings.ascx" />
-    <Content Include="View.ascx" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="ResourceManager.dnn">
@@ -217,6 +210,10 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\Dnn.AdminExperience\Library\Dnn.PersonaBar.Library\Dnn.PersonaBar.Library.csproj">
+      <Project>{8b50ba8b-0a08-41b8-81b8-ea70707c7379}</Project>
+      <Name>Dnn.PersonaBar.Library</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\DotNetNuke.Abstractions\DotNetNuke.Abstractions.csproj">
       <Project>{6928A9B1-F88A-4581-A132-D3EB38669BB0}</Project>
       <Name>DotNetNuke.Abstractions</Name>
@@ -257,6 +254,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
+    <Content Include="View.html" />
     <Content Include="web.config" />
     <None Include="web.Debug.config">
       <DependentUpon>web.config</DependentUpon>
@@ -269,6 +267,9 @@
     <Analyzer Include="..\..\..\packages\StyleCop.Analyzers.1.1.118\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
     <Analyzer Include="..\..\..\packages\StyleCop.Analyzers.1.1.118\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Scripts\" />
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

DNN Platform/Modules/ResourceManager/Module.build

@@ -1,23 +1,36 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" 
-  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <RootDirectory>$(MSBuildProjectDirectory)\..\..\..</RootDirectory>
-    <ReactDirectory>$(MSBuildProjectDirectory)\ResourceManager.Web</ReactDirectory>
-  </PropertyGroup>
-  <Import Project="..\..\..\DNN_Platform.build" />
-  <PropertyGroup>
-    <Extension>zip</Extension>
-    <DNNFileName>ResourceManager</DNNFileName>
-    <PackageName>DNNCE_ResourceManager</PackageName>
-    <ModuleFolderName>$(WebsitePath)\DesktopModules\ResourceManager</ModuleFolderName>
-    <InstallPath>$(WebsiteInstallPath)\Module</InstallPath>
-  </PropertyGroup>
-  <Import Project="$(BuildScriptsPath)\Package.Targets" />
-  <Import Project="$(BuildScriptsPath)\Module.Build"/>
-  <Target Name="UpdateFiles">
-    <ItemGroup>
-      <Resources Remove="web.config" />
-    </ItemGroup>
-  </Target>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" 
+    xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <RootDirectory>$(MSBuildProjectDirectory)\..\..\..</RootDirectory>
+        <ReactDirectory>$(MSBuildProjectDirectory)\ResourceManager.Web</ReactDirectory>
+    </PropertyGroup>
+    <Import Project="..\..\..\DNN_Platform.build" />
+    <PropertyGroup>
+        <Extension>resources</Extension>
+        <DNNFileName>ResourceManager</DNNFileName>
+        <PackageName>DNNCE_ResourceManager</PackageName>
+        <ModuleFolderName>$(WebsitePath)\DesktopModules\ResourceManager</ModuleFolderName>
+        <InstallPath>$(WebsiteInstallPath)\Module</InstallPath>
+    </PropertyGroup>
+    <Import Project="$(BuildScriptsPath)\Package.Targets" />
+    <Import Project="$(BuildScriptsPath)\Module.Build"/>
+    <ItemGroup>
+        <Scripts Include="$(MSBuildProjectDirectory)\Scripts\**\*.*" />
+    </ItemGroup>
+    <Target Name="UpdateFiles">
+        <PropertyGroup>
+            <ComponentsDestinationFolder>$(MSBuildProjectDirectory)\Scripts\dnn-resource-manager</ComponentsDestinationFolder>
+        </PropertyGroup>
+        <ItemGroup>
+            <ComponentsSource Include="$(MSBuildProjectDirectory)\ResourceManager.Web\dist\dnn-resource-manager\**\*" />
+        </ItemGroup>
+        <RemoveDir Directories="$(ComponentsDestinationFolder)" />
+        <Copy SourceFiles="@(ComponentsSource)" DestinationFolder="$(ComponentsDestinationFolder)" />
+        <ItemGroup>
+            <Resources Remove="web.config" />
+            <Resources Remove="web.Debug.config" />
+            <Resources Remove="web.Release.config" />
+        </ItemGroup>
+    </Target>
 </Project>

DNN Platform/Modules/ResourceManager/ResourceManager.Web/.editorconfig

@@ -0,0 +1,15 @@
+# http://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+insert_final_newline = false
+trim_trailing_whitespace = false

DNN Platform/Modules/ResourceManager/ResourceManager.Web/.gitignore

@@ -0,0 +1,26 @@
+dist/
+www/
+loader/
+
+*~
+*.sw[mnpcod]
+*.log
+*.lock
+*.tmp
+*.tmp.*
+log.txt
+*.sublime-project
+*.sublime-workspace
+
+.stencil/
+.idea/
+.vscode/
+.sass-cache/
+.versions/
+node_modules/
+$RECYCLE.BIN/
+
+.DS_Store
+Thumbs.db
+UserInterfaceState.xcuserstate
+.env

DNN Platform/Modules/ResourceManager/ResourceManager.Web/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.