-
Notifications
You must be signed in to change notification settings - Fork 756
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implemented new resource manager as per feedback (#5240)
* initial swap of original frontent * Fixed msbuild issues * deleted files that should not get commited (build result) * ignore build results * Moved pre-packaging into UpdateFiles step * Implemented base layou * Initial attempt at PersonaBar integration * commit project file * integrated into persona bar * Completed main panes layout * Include Persona Bar panel * implemented logic for folders pane * Implemented expanding folders nesting * Implemented base logic for items list view * Implementented basics of cardview * Replaced png folder icons for svg icons * Implemented thumbnails in cardview * Ensure folder list chidren are collapsed when parent is collapsed * Implemented localization pattern * Resolved merge conflicts, I'll use PRs in the future to prevent this... * Implemented more list-view columns Closes #31 * Added a little whtiespace * Switched to non-beta dnn-elements v0.14.0 Switched to non-beta dnn-elements v0.14.0 * Implemented infinite scroll Implemented infinite scroll * Initial implementation of status bar * Implemented file search Implemented file search * Removed stray console.log * Implemented sorting Implemented sorting * Implemented multi-selection of items Implemented multi-selection of items * Implemented basics of action item with context menu in folder list * Implemented context menu in listview * Implemented context menu in cardview * Got creating a folder working * Got to create a actual folder * Handled creating folder as a children of the context one * Only show Add Folder if the user can do it * Finished Create Folder implementation * Bumped dnn-elements to v0.14.1 * re-architected actions/menus to support editing any type of item * commit missing files * Some more progress on item editor * Handles relation between allow/deny permissions * Finished initial implemenation of edit-folder * Added file editing capability Added file editing capability * Implemented item move feature Implemented item move feature * Implemented delete feature Implemented delete feature * Implemented delete feature Implemented delete feature * Implemented unlink feature Implemented unlink feature * Implemented Copy-Url feature Implemented Copy-Url feature Note that this only works over https (clipboard access) * Resolved a build issue caused by the latest rebase on Platform This branch was rebased on the platform repository and by mistake the package.json and some other files got mixed into this. This PR fixes that bad merge. * Bump stencil to 2.15.1 * Add localization to status bar * Add resx file * Add Cleanup component to manifest to ensure fresh start at 09.11.00 * Implement refresh and sync * Add jsdocs for groupId * Implement file download functionality * Clean up commented code * 'backup' * Fixed 2 build issues AEModule.build had 2 globs that would return some of the same files and have them duplicated in resources.zip files, which was not a major issue but found it while troubleshooting another issue. Also, WebFormsMVP had recently been made into a package but it was not added to the list of unversioned manifest and would get automatically versioned by the current DNN version upon build. * Resolved multiple build issues Resolved multiple build issues Docs were also uncommited, so this also pushes that * Made the yarn watch process work as the other modules now we can do `yarn watch --scope dnn-resource-manager` in order to view changes live on the test site :) * Forgot to commit the gitignore file too * Fixed wrong output path for yarn watch Also creates a specific file for the dnn watch, if not we would required to decrale the output folder in the package.json which sounds dirty. * Removed unecessary import * Provides the groupId in the API calls headers Provides the groupId in the API calls headers * Added upload feature to resource manager Added upload feature to resource manager * Update DNN Platform/Modules/ResourceManager/App_LocalResources/ResourceManager.resx Co-authored-by: David Poindexter <dpoindexter@nvisionative.com> * Update dnn-elements and resolve file upload modal close refresh * Implemented UI to manage folder mappings and folder providers Implemented UI to manage folder mappings and folder providers * rebuilt after rebase * Resolve bug with the dimissing of context menu on folder list * Added type/size verification before upload Before this PR, the upload would happen before the file type and size validation would happen. This valides those in the frontend first to save on an upload that would not succeed anyway. * Polished some UI for uploads and filenames. - Adds a green checkmark feedback on successful uploads - Makes the long filenames wrap in gridvriew * Added licenses * Changed package from resources to zip * Update DNN Platform/Modules/ResourceManager/ResourceManager.Web/package.json Co-authored-by: David Poindexter <dpoindexter@nvisionative.com> * Adjusted package.json and removed redundant license * Update DNN Platform/Modules/ResourceManager/ResourceManager.dnn Co-authored-by: Daniel Valadas <info@danielvaladas.com> * Update DNN Platform/Modules/ResourceManager/ResourceManager.dnn Co-authored-by: Daniel Valadas <info@danielvaladas.com> * Removed Persona Bar specific module for now * Removed persona bar specific code for now * Update SolutionInfo.cs * Corrected SolutionInfo.cs to end with a single new line * Fixed a yarn.lock typo and rebuilt Co-authored-by: David Poindexter <dpoindexter@nvisionative.com>
- Loading branch information
1 parent
66014ba
commit c709cf7
Showing
213 changed files
with
9,572 additions
and
10,316 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
/Scripts |
745 changes: 425 additions & 320 deletions
745
DNN Platform/Modules/ResourceManager/App_LocalResources/ResourceManager.resx
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
DNN Platform/Modules/ResourceManager/Components/PersonaBarMenuController.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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; | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file removed
BIN
-511 Bytes
DNN Platform/Modules/ResourceManager/Images/icon-asset-manager-azure-folder.png
Binary file not shown.
12 changes: 12 additions & 0 deletions
12
DNN Platform/Modules/ResourceManager/Images/icon-asset-manager-azure-folder.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed
BIN
-468 Bytes
DNN Platform/Modules/ResourceManager/Images/icon-asset-manager-database-folder.png
Binary file not shown.
11 changes: 11 additions & 0 deletions
11
DNN Platform/Modules/ResourceManager/Images/icon-asset-manager-database-folder.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed
BIN
-292 Bytes
DNN Platform/Modules/ResourceManager/Images/icon-asset-manager-secure-folder.png
Binary file not shown.
8 changes: 8 additions & 0 deletions
8
DNN Platform/Modules/ResourceManager/Images/icon-asset-manager-secure-folder.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed
BIN
-176 Bytes
DNN Platform/Modules/ResourceManager/Images/icon-asset-manager-standard-folder.png
Binary file not shown.
3 changes: 3 additions & 0 deletions
3
DNN Platform/Modules/ResourceManager/Images/icon-asset-manager-standard-folder.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
18
DNN Platform/Modules/ResourceManager/ResourceManager.Web/.babelrc
This file was deleted.
Oops, something went wrong.
15 changes: 15 additions & 0 deletions
15
DNN Platform/Modules/ResourceManager/ResourceManager.Web/.editorconfig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
2 changes: 0 additions & 2 deletions
2
DNN Platform/Modules/ResourceManager/ResourceManager.Web/.eslintignore
This file was deleted.
Oops, something went wrong.
43 changes: 0 additions & 43 deletions
43
DNN Platform/Modules/ResourceManager/ResourceManager.Web/.eslintrc.js
This file was deleted.
Oops, something went wrong.
26 changes: 26 additions & 0 deletions
26
DNN Platform/Modules/ResourceManager/ResourceManager.Web/.gitignore
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
12 changes: 0 additions & 12 deletions
12
...Modules/ResourceManager/ResourceManager.Web/app/action types/addAssetPanelActionsTypes.js
This file was deleted.
Oops, something went wrong.
13 changes: 0 additions & 13 deletions
13
...odules/ResourceManager/ResourceManager.Web/app/action types/addFolderPanelActionsTypes.js
This file was deleted.
Oops, something went wrong.
6 changes: 0 additions & 6 deletions
6
...m/Modules/ResourceManager/ResourceManager.Web/app/action types/dialogModalActionsTypes.js
This file was deleted.
Oops, something went wrong.
19 changes: 0 additions & 19 deletions
19
...m/Modules/ResourceManager/ResourceManager.Web/app/action types/folderPanelActionsTypes.js
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.