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.

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

Implemented new resource manager as per feedback #5240

Merged
merged 131 commits into from
Aug 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
c5d5a44
initial swap of original frontent
valadas Feb 17, 2022
dced0e4
Fixed msbuild issues
valadas Feb 17, 2022
1303232
deleted files that should not get commited (build result)
valadas Feb 17, 2022
021430b
ignore build results
valadas Feb 17, 2022
2613437
Merge branch 'develop' into resource-manager
valadas Feb 17, 2022
5e8dcf1
Moved pre-packaging into UpdateFiles step
valadas Feb 17, 2022
32363f5
Implemented base layou
valadas Feb 18, 2022
1bb46d6
Initial attempt at PersonaBar integration
valadas Feb 18, 2022
e21cefd
commit project file
valadas Feb 18, 2022
f8c81ae
integrated into persona bar
valadas Feb 18, 2022
3687c61
Completed main panes layout
valadas Feb 18, 2022
eb5d6d4
Include Persona Bar panel
valadas Feb 18, 2022
6bac339
implemented logic for folders pane
valadas Feb 20, 2022
50839e0
Implemented expanding folders nesting
valadas Feb 20, 2022
063b3fc
Implemented base logic for items list view
valadas Feb 20, 2022
9d4d1fe
Implementented basics of cardview
valadas Feb 21, 2022
e2a7d8f
Merge pull request #13 from valadas/rm/cardview
valadas Feb 21, 2022
223f4e9
Replaced png folder icons for svg icons
valadas Feb 21, 2022
6473cbf
Merge branch 'resource-manager' of https://github.com/valadas/Dnn.Pla…
valadas Feb 21, 2022
b97a4f2
Implemented thumbnails in cardview
valadas Feb 21, 2022
2656606
Ensure folder list chidren are collapsed when parent is collapsed
david-poindexter Feb 21, 2022
1e17027
Merge pull request #14 from david-poindexter/rm-treeview-collapse
valadas Feb 21, 2022
3c72a3b
Implemented localization pattern
valadas Feb 21, 2022
06cfc37
Merge branch 'resource-manager' of https://github.com/valadas/Dnn.Pla…
valadas Feb 21, 2022
23ed6dd
Resolved merge conflicts, I'll use PRs in the future to prevent this...
valadas Feb 21, 2022
0a4b898
Implemented more list-view columns
valadas Feb 21, 2022
23f2be2
Added a little whtiespace
valadas Feb 21, 2022
f57e555
Merge pull request #32 from valadas/rm/list-columns
valadas Feb 21, 2022
41556ba
Switched to non-beta dnn-elements v0.14.0
valadas Feb 21, 2022
b732433
Merge pull request #33 from valadas/rm/dnn-elements/0-14-0
valadas Feb 21, 2022
f62a769
Implemented infinite scroll
valadas Feb 28, 2022
8e64e7d
Merge pull request #35 from valadas/infinite-scroll
valadas Feb 28, 2022
07517d3
Initial implementation of status bar
david-poindexter Feb 28, 2022
c027210
Merge pull request #37 from david-poindexter/status-bar
valadas Feb 28, 2022
03e7270
Implemented file search
valadas Feb 28, 2022
5991855
Removed stray console.log
valadas Feb 28, 2022
f0c7e2e
Merge pull request #39 from valadas/file-search
valadas Feb 28, 2022
f91467f
Implemented sorting
valadas Mar 1, 2022
b1c68d7
Merge pull request #52 from valadas/sort-items
valadas Mar 1, 2022
c2ada2f
Implemented multi-selection of items
valadas Mar 2, 2022
61cacdf
Merge pull request #65 from valadas/multi-select
valadas Mar 2, 2022
e5976ee
Implemented basics of action item with context menu in folder list
valadas Mar 5, 2022
fe0e978
Implemented context menu in listview
valadas Mar 6, 2022
273716e
Implemented context menu in cardview
valadas Mar 6, 2022
1099d1f
Got creating a folder working
valadas Mar 6, 2022
6dd7914
Got to create a actual folder
valadas Mar 6, 2022
6ff0f00
Handled creating folder as a children of the context one
valadas Mar 6, 2022
70649da
Only show Add Folder if the user can do it
valadas Mar 6, 2022
80d8937
Finished Create Folder implementation
valadas Mar 7, 2022
e1781d7
Bumped dnn-elements to v0.14.1
valadas Mar 7, 2022
cd9b4c7
Merge pull request #66 from valadas/menu-item-create-folder
valadas Mar 14, 2022
dfa8ac8
Merge pull request #68 from valadas/dnn-elements-0-14-1
valadas Mar 14, 2022
04cba65
Merge remote-tracking branch 'upstream/develop' into resource-manager
valadas Mar 14, 2022
2647619
re-architected actions/menus to support editing any type of item
valadas Mar 15, 2022
1ad10d9
commit missing files
valadas Mar 15, 2022
726d771
Some more progress on item editor
valadas Mar 26, 2022
5530374
Handles relation between allow/deny permissions
valadas Mar 28, 2022
1561210
Finished initial implemenation of edit-folder
valadas Mar 29, 2022
bb137ad
Merge pull request #69 from valadas/edit-folder
valadas Mar 30, 2022
2b72d1d
Merge branch 'develop' into resource-manager
valadas Apr 14, 2022
2100f7a
Added file editing capability
valadas Apr 15, 2022
b4f36f9
Merge pull request #86 from valadas/rm-edit-file
valadas Apr 15, 2022
ef33bbd
Implemented item move feature
valadas Apr 15, 2022
b3820bf
Merge pull request #88 from valadas/rm-move-item-v3
valadas Apr 15, 2022
f6e3481
Implemented delete feature
valadas Apr 16, 2022
cf156b5
Implemented delete feature
valadas Apr 16, 2022
ab3a886
Merge pull request #89 from valadas/rm-delete
valadas Apr 16, 2022
a9753fc
Implemented unlink feature
valadas Apr 16, 2022
03751a9
Merge pull request #91 from valadas/rm-unlink
valadas Apr 16, 2022
d36b2e4
Implemented Copy-Url feature
valadas Apr 16, 2022
40a9619
Merge pull request #92 from valadas/rm-copy-url
valadas Apr 16, 2022
17387f3
Resolved a build issue caused by the latest rebase on Platform
valadas May 8, 2022
378e39d
Merge pull request #104 from valadas/fix-build
valadas May 8, 2022
4c801b0
Bump stencil to 2.15.1
david-poindexter May 8, 2022
ae8adf3
Merge pull request #105 from david-poindexter/stencil-bump
valadas May 8, 2022
c2537c4
Add localization to status bar
david-poindexter May 8, 2022
81fe289
Add resx file
david-poindexter May 8, 2022
8390247
Merge pull request #106 from david-poindexter/localize-status-bar
valadas May 8, 2022
15d4a76
Add Cleanup component to manifest to ensure fresh start at 09.11.00
david-poindexter May 8, 2022
b44e0ab
Merge pull request #107 from david-poindexter/manifest-cleanup
valadas May 8, 2022
0f63a5f
Implement refresh and sync
david-poindexter May 9, 2022
6f65ccd
Add jsdocs for groupId
david-poindexter May 9, 2022
8f1a997
Merge pull request #108 from david-poindexter/sync
valadas May 9, 2022
6d08332
Implement file download functionality
david-poindexter May 9, 2022
bcb9251
Clean up commented code
david-poindexter May 9, 2022
5601d43
Merge pull request #109 from david-poindexter/download
valadas May 9, 2022
06c38d6
Rebased on develop
valadas May 29, 2022
3f6a191
'backup'
valadas May 29, 2022
40750f3
Fixed 2 build issues
valadas May 31, 2022
d347c20
Resolved multiple build issues
valadas May 31, 2022
7c0247c
Merge pull request #110 from valadas/fix-build-v2
valadas May 31, 2022
2bd8de4
Made the yarn watch process work as the other modules
valadas May 31, 2022
3e6b2cf
Forgot to commit the gitignore file too
valadas May 31, 2022
28a565b
Merge remote-tracking branch 'origin/resource-manager' into yarn-watch
valadas May 31, 2022
bbf293f
Merge pull request #112 from valadas/yarn-watch
valadas May 31, 2022
47f66fe
Fixed wrong output path for yarn watch
valadas Jun 1, 2022
0821a51
Merge pull request #114 from valadas/fix-wrong-path
valadas Jun 1, 2022
6f128cd
Removed unecessary import
valadas Jun 1, 2022
7438588
Merge pull request #115 from valadas/fix-wrong-path
valadas Jun 1, 2022
9ea381a
Provides the groupId in the API calls headers
valadas Jun 1, 2022
d58c79f
Merge pull request #116 from valadas/groupid
valadas Jun 1, 2022
8f93719
Added upload feature to resource manager
valadas Jul 20, 2022
f125e42
Update DNN Platform/Modules/ResourceManager/App_LocalResources/Resour…
valadas Jul 20, 2022
ee814d5
Merge pull request #129 from valadas/rm-upload
valadas Jul 20, 2022
f91542b
Rebased
valadas Aug 29, 2022
afe13bd
Update dnn-elements and resolve file upload modal close refresh
david-poindexter Aug 29, 2022
c2cf7da
Merge pull request #141 from david-poindexter/file-upload-refresh
valadas Aug 29, 2022
52e8687
Implemented UI to manage folder mappings and folder providers
valadas Aug 29, 2022
9590599
Merge remote-tracking branch 'origin/resource-manager' into rm-folder…
valadas Aug 29, 2022
10fcb8e
rebuilt after rebase
valadas Aug 29, 2022
5be3959
Merge pull request #142 from valadas/rm-folder-mappings
valadas Aug 29, 2022
ddc6c6a
Resolve bug with the dimissing of context menu on folder list
david-poindexter Aug 29, 2022
d81dffd
Merge pull request #144 from david-poindexter/folder-context-menu-dimiss
valadas Aug 29, 2022
0c9d4cb
Added type/size verification before upload
valadas Aug 30, 2022
756a4bc
Merge pull request #145 from valadas/size-type-validation
valadas Aug 30, 2022
1e681a9
Polished some UI for uploads and filenames.
valadas Aug 30, 2022
fa4b90d
Merge pull request #147 from valadas/upload-ui-improvements
valadas Aug 30, 2022
abab2ed
Rebased
valadas Aug 30, 2022
a963976
Added licenses
valadas Aug 30, 2022
82aae3b
Changed package from resources to zip
valadas Aug 30, 2022
d031d39
Update DNN Platform/Modules/ResourceManager/ResourceManager.Web/packa…
valadas Aug 30, 2022
5a01153
Adjusted package.json and removed redundant license
valadas Aug 30, 2022
96ef228
Merge branch 'resource-manager' of https://github.com/valadas/Dnn.Pla…
valadas Aug 30, 2022
7d40b5a
Update DNN Platform/Modules/ResourceManager/ResourceManager.dnn
david-poindexter Aug 30, 2022
61a66b6
Update DNN Platform/Modules/ResourceManager/ResourceManager.dnn
david-poindexter Aug 30, 2022
cf01fb5
Removed Persona Bar specific module for now
valadas Aug 30, 2022
76a28ae
Merge branch 'resource-manager' of https://github.com/valadas/Dnn.Pla…
valadas Aug 30, 2022
3969bb6
Removed persona bar specific code for now
valadas Aug 30, 2022
1f66288
Update SolutionInfo.cs
valadas Aug 30, 2022
6ee8efb
Corrected SolutionInfo.cs to end with a single new line
valadas Aug 30, 2022
f78ac94
Fixed a yarn.lock typo and rebuilt
valadas Aug 30, 2022
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
1 change: 1 addition & 0 deletions DNN Platform/Modules/ResourceManager/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/Scripts

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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" />
Expand All @@ -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>
Expand Down Expand Up @@ -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">
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
57 changes: 35 additions & 22 deletions DNN Platform/Modules/ResourceManager/Module.build
Original file line number Diff line number Diff line change
@@ -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>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"/>
<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>
18 changes: 0 additions & 18 deletions DNN Platform/Modules/ResourceManager/ResourceManager.Web/.babelrc

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading