{state.selectedItems.length > 0 &&
diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-actions-bar/readme.md b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-actions-bar/readme.md
index a0e66126c2b..182fa0271e1 100644
--- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-actions-bar/readme.md
+++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-actions-bar/readme.md
@@ -15,6 +15,7 @@
- dnn-vertical-overflow-menu
- [dnn-action-create-folder](../actions/dnn-action-create-folder)
+- [dnn-action-edit-item](../actions/dnn-action-edit-item)
- dnn-collapsible
### Graph
@@ -22,12 +23,23 @@
graph TD;
dnn-rm-actions-bar --> dnn-vertical-overflow-menu
dnn-rm-actions-bar --> dnn-action-create-folder
+ dnn-rm-actions-bar --> dnn-action-edit-item
dnn-rm-actions-bar --> dnn-collapsible
dnn-action-create-folder --> dnn-modal
- dnn-action-create-folder --> dnn-rm-edit-folder
- dnn-rm-edit-folder --> dnn-button
+ dnn-action-create-folder --> dnn-rm-create-folder
+ dnn-rm-create-folder --> dnn-button
dnn-button --> dnn-modal
dnn-button --> dnn-button
+ dnn-action-edit-item --> dnn-modal
+ dnn-action-edit-item --> dnn-rm-edit-folder
+ dnn-rm-edit-folder --> dnn-tabs
+ dnn-rm-edit-folder --> dnn-tab
+ dnn-rm-edit-folder --> dnn-permissions-grid
+ dnn-rm-edit-folder --> dnn-button
+ dnn-permissions-grid --> dnn-checkbox
+ dnn-permissions-grid --> dnn-button
+ dnn-permissions-grid --> dnn-searchbox
+ dnn-permissions-grid --> dnn-collapsible
dnn-rm-right-pane --> dnn-rm-actions-bar
style dnn-rm-actions-bar fill:#f9f,stroke:#333,stroke-width:4px
```
diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-create-folder/dnn-rm-create-folder.scss b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-create-folder/dnn-rm-create-folder.scss
new file mode 100644
index 00000000000..898f5863232
--- /dev/null
+++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-create-folder/dnn-rm-create-folder.scss
@@ -0,0 +1,19 @@
+:host {
+ display: block;
+}
+
+.form{
+ label{
+ font-weight: bold;
+ margin-top: 0.5em;
+ }
+ display: grid;
+ grid-template-columns: 1fr;
+}
+
+.controls{
+ margin-top: 2em;
+ display: flex;
+ justify-content: flex-end;
+ gap: 1em;
+}
\ No newline at end of file
diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-create-folder/dnn-rm-create-folder.tsx b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-create-folder/dnn-rm-create-folder.tsx
new file mode 100644
index 00000000000..6df3fca6c12
--- /dev/null
+++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-create-folder/dnn-rm-create-folder.tsx
@@ -0,0 +1,166 @@
+import { Component, Host, h, Element, State, Event, EventEmitter } from '@stencil/core';
+import { CreateNewFolderRequest, FolderMappingInfo, ItemsClient } from '../../services/ItemsClient';
+import state from '../../store/store';
+
+@Component({
+ tag: 'dnn-rm-create-folder',
+ styleUrl: 'dnn-rm-create-folder.scss',
+ shadow: true,
+})
+export class DnnRmCreateFolder {
+
+ /**
+ * Fires when there is a possibility that some folders have changed.
+ * Can be used to force parts of the UI to refresh.
+ */
+ @Event() dnnRmFoldersChanged: EventEmitter;
+
+ @Element() el : HTMLDnnRmCreateFolderElement
+
+ @State() folderMappings: FolderMappingInfo[];
+
+ @State() newFolderRequest: CreateNewFolderRequest = {
+ FolderMappingId: -1,
+ FolderName: "",
+ ParentFolderId: state.currentItems.folder.folderId,
+ }
+
+ private readonly itemsClient: ItemsClient;
+ private nameField: HTMLInputElement;
+
+ constructor(){
+ this.itemsClient = new ItemsClient(state.moduleId);
+ }
+
+ componentWillLoad() {
+ this.itemsClient.getFolderMappings()
+ .then(data => {
+ this.folderMappings = data.sort((a, b) => a.FolderMappingID - b.FolderMappingID);
+ this.newFolderRequest = {
+ ...this.newFolderRequest,
+ FolderMappingId: this.folderMappings[0].FolderMappingID,
+ ParentFolderId: state.currentItems.folder.folderId,
+ };
+ })
+ .catch(reason => console.error(reason));
+ }
+
+ componentDidLoad() {
+ setTimeout(() => {
+ this.nameField.focus();
+ }, 350);
+ }
+
+ private handleCancel(): void {
+ const modal = this.el.parentElement as HTMLDnnModalElement;
+ modal.hide().then(() => {
+ setTimeout(() => {
+ document.body.removeChild(modal);
+ }, 300);
+ });
+ }
+
+ private handleTypeChanged(e: Event): void {
+ const select = e.target as HTMLSelectElement;
+ const option = select.options[select.selectedIndex] as HTMLOptionElement;
+ const newValue = Number.parseInt(option.value);
+ this.newFolderRequest = {
+ ...this.newFolderRequest,
+ FolderMappingId: newValue,
+ };
+ }
+
+ private handleSave(): void {
+ this.itemsClient.createNewFolder(this.newFolderRequest)
+ .then(() => {
+ this.dnnRmFoldersChanged.emit();
+ state.currentItems = {
+ ...state.currentItems,
+ items: [],
+ };
+ const modal = this.el.parentElement as HTMLDnnModalElement;
+ modal.hide().then(() => {
+ setTimeout(() => {
+ document.body.removeChild(modal);
+ }, 300);
+ });
+ })
+ .catch(error => alert(error));
+ }
+
+ private canChooseFolderProvider() {
+ return this.folderMappings &&
+ this.folderMappings.find(f => f.FolderMappingID == state.currentItems.folder.folderMappingId).IsDefault;
+ }
+
+ render() {
+ return (
+
+
+ );
+ }
+}
diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-create-folder/readme.md b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-create-folder/readme.md
new file mode 100644
index 00000000000..be5ce70478c
--- /dev/null
+++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-create-folder/readme.md
@@ -0,0 +1,37 @@
+# dnn-rm-edit-folder
+
+
+
+
+
+
+## Events
+
+| Event | Description | Type |
+| --------------------- | ------------------------------------------------------------------------------------------------------------------ | ------------------- |
+| `dnnRmFoldersChanged` | Fires when there is a possibility that some folders have changed. Can be used to force parts of the UI to refresh. | `CustomEvent` |
+
+
+## Dependencies
+
+### Used by
+
+ - [dnn-action-create-folder](../actions/dnn-action-create-folder)
+
+### Depends on
+
+- dnn-button
+
+### Graph
+```mermaid
+graph TD;
+ dnn-rm-create-folder --> dnn-button
+ dnn-button --> dnn-modal
+ dnn-button --> dnn-button
+ dnn-action-create-folder --> dnn-rm-create-folder
+ style dnn-rm-create-folder fill:#f9f,stroke:#333,stroke-width:4px
+```
+
+----------------------------------------------
+
+*Built with [StencilJS](https://stenciljs.com/)*
diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-edit-folder/dnn-rm-edit-folder.scss b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-edit-folder/dnn-rm-edit-folder.scss
index 898f5863232..22d9a69b89e 100644
--- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-edit-folder/dnn-rm-edit-folder.scss
+++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-edit-folder/dnn-rm-edit-folder.scss
@@ -1,14 +1,33 @@
:host {
display: block;
}
+.general{
+ display: flex;
+ .left{
+ max-width: 256px;
+ border-right: 1px solid lightgray;
+ padding: 1em;
+ img{
+ width: 100%;
+ }
+ }
+ .right{
+ padding: 1em;
+ }
+}
.form{
+ display: grid;
+ grid-template-columns: 1fr 2fr;
+ align-items: flex-end;
label{
font-weight: bold;
- margin-top: 0.5em;
+ text-align: right;
+ margin-right: 0.5em;
+ &::after{
+ content: ':';
+ }
}
- display: grid;
- grid-template-columns: 1fr;
}
.controls{
@@ -16,4 +35,4 @@
display: flex;
justify-content: flex-end;
gap: 1em;
-}
\ No newline at end of file
+}
diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-edit-folder/dnn-rm-edit-folder.tsx b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-edit-folder/dnn-rm-edit-folder.tsx
index 64f3b26c4a1..043187f1c7f 100644
--- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-edit-folder/dnn-rm-edit-folder.tsx
+++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-edit-folder/dnn-rm-edit-folder.tsx
@@ -1,58 +1,112 @@
-import { Component, Host, h, Element, State, Event, EventEmitter } from '@stencil/core';
-import { CreateNewFolderRequest, FolderMappingInfo, ItemsClient } from '../../services/ItemsClient';
+import { IRoleGroup } from '@dnncommunity/dnn-elements/dist/types/components/dnn-permissions-grid/role-group-interface';
+import { IRole } from '@dnncommunity/dnn-elements/dist/types/components/dnn-permissions-grid/role-interface';
+import { Component, Element, Event, EventEmitter, Host, h, State, Prop } from '@stencil/core';
import state from '../../store/store';
-
+import { FolderDetails, ItemsClient, SaveFolderDetailsRequest } from '../../services/ItemsClient';
+import { IPermissions, IRolePermission, IUserPermission } from '@dnncommunity/dnn-elements/dist/types/components/dnn-permissions-grid/permissions-interface';
+import { ISearchedUser } from '@dnncommunity/dnn-elements/dist/types/components/dnn-permissions-grid/searched-user-interface';
@Component({
tag: 'dnn-rm-edit-folder',
styleUrl: 'dnn-rm-edit-folder.scss',
shadow: true,
})
export class DnnRmEditFolder {
+
+ /** The ID of the folder to edit. */
+ @Prop() folderId!: number;
/**
* Fires when there is a possibility that some folders have changed.
* Can be used to force parts of the UI to refresh.
*/
- @Event() dnnRmFoldersChanged: EventEmitter;
-
- @Element() el : HTMLDnnRmEditFolderElement
-
- @State() folderMappings: FolderMappingInfo[];
-
- @State() newFolderRequest: CreateNewFolderRequest = {
- FolderMappingId: -1,
- FolderName: "",
- ParentFolderId: state.currentItems.folder.folderId,
- }
+ @Event() dnnRmFoldersChanged: EventEmitter;
+
+ @Element() el: HTMLDnnRmEditFolderElement;
- private readonly itemsClient: ItemsClient;
- private nameField: HTMLInputElement;
+ @State() roleGroups: IRoleGroup[] = [];
+ @State() roles: IRole[] = [];
+ @State() folderIconUrl: string;
+ @State() folderDetails: FolderDetails;
+ @State() foundUsers: ISearchedUser[];
- constructor(){
+ private itemsClient: ItemsClient;
+
+ constructor() {
this.itemsClient = new ItemsClient(state.moduleId);
}
componentWillLoad() {
- this.itemsClient.getFolderMappings()
- .then(data => {
- this.folderMappings = data.sort((a, b) => a.FolderMappingID - b.FolderMappingID);
- this.newFolderRequest = {
- ...this.newFolderRequest,
- FolderMappingId: this.folderMappings[0].FolderMappingID,
- ParentFolderId: state.currentItems.folder.folderId,
- };
- })
- .catch(reason => console.error(reason));
- }
+ this.itemsClient.getFolderDetails(this.folderId)
+ .then(data => {
+ this.folderDetails = {
+ ...data,
+ permissions: {
+ ...data.permissions,
+ permissionDefinitions: data.permissions.permissionDefinitions.sort(a => {
+ switch (a.permissionName) {
+ case "View Folder":
+ return -1;
+ case "Browse Folder":
+ return 0;
+ case "Write to Folder":
+ return 1;
+ default:
+ break;
+ }
+ }),
+ rolePermissions: [
+ ...data.permissions.rolePermissions.map(rp => {
+ return {
+ ...rp,
+ permissions: rp.permissions.sort(a => {
+ switch (a.permissionName) {
+ case "View Folder":
+ return -1;
+ case "Browse Folder":
+ return 0;
+ case "Write to Folder":
+ return 1;
+ }
+ }),
+ };
+ }),
+ ],
+ userPermissions: [
+ ...data.permissions.userPermissions.map(up => {
+ return {
+ ...up,
+ permissions: up.permissions.sort(a => {
+ switch (a.permissionName) {
+ case "View Folder":
+ return -1;
+ case "Browse Folder":
+ return 0;
+ case "Write to Folder":
+ return 1;
+ }
+ }),
+ };
+ }),
+ ],
+ },
+ };
+ })
+ .catch(error => alert(error));
+
+ this.itemsClient.getFolderIconUrl(this.folderId)
+ .then(data => this.folderIconUrl = data)
+ .catch(error => alert(error));
- componentDidLoad() {
- setTimeout(() => {
- this.nameField.focus();
- }, 350);
- console.log({...state});
+ this.itemsClient.getRoleGroups()
+ .then(data => this.roleGroups = data)
+ .catch(error => alert(error));
+
+ this.itemsClient.getRoles()
+ .then(data => this.roles = data)
+ .catch(error => alert(error));
}
- private handleCancel(): void {
+ private closeModal(): void {
const modal = this.el.parentElement as HTMLDnnModalElement;
modal.hide().then(() => {
setTimeout(() => {
@@ -61,101 +115,218 @@ export class DnnRmEditFolder {
});
}
- private handleTypeChanged(e: Event): void {
- const select = e.target as HTMLSelectElement;
- const option = select.options[select.selectedIndex] as HTMLOptionElement;
- const newValue = Number.parseInt(option.value);
- this.newFolderRequest = {
- ...this.newFolderRequest,
- FolderMappingId: newValue,
+ private handleSave(): void {
+ const folderDetails: SaveFolderDetailsRequest = {
+ folderId: this.folderId,
+ folderName: this.folderDetails.folderName,
+ permissions: this.folderDetails.permissions,
};
+ this.itemsClient.saveFolderDetails(folderDetails)
+ .then(() => {
+ this.dnnRmFoldersChanged.emit();
+ this.closeModal();
+ })
+ .catch(error => alert(error));
}
- private handleSave(): void {
- this.itemsClient.createNewFolder(this.newFolderRequest)
- .then(() => {
- this.dnnRmFoldersChanged.emit();
- state.currentItems = {
- ...state.currentItems,
- items: [],
- };
- const modal = this.el.parentElement as HTMLDnnModalElement;
- modal.hide().then(() => {
- setTimeout(() => {
- document.body.removeChild(modal);
- }, 300);
- });
- })
- .catch(error => alert(error));
+ private handlePermissionsChanged(newPermissions: IPermissions): void {
+ newPermissions.rolePermissions.forEach(rolePermission => this.adjustRelatedPermissions(rolePermission));
+ newPermissions.userPermissions.forEach(userPermission => this.adjustRelatedPermissions(userPermission));
+ this.folderDetails = {
+ ...this.folderDetails,
+ permissions: newPermissions,
+ };
+ }
+
+ private adjustRelatedPermissions(permission: IRolePermission | IUserPermission): void {
+ const permissionId =
+ {
+ view: this.folderDetails.permissions.permissionDefinitions.find(p => p.permissionName === 'View Folder').permissionId,
+ browse: this.folderDetails.permissions.permissionDefinitions.find(p => p.permissionName === 'Browse Folder').permissionId,
+ write: this.folderDetails.permissions.permissionDefinitions.find(p => p.permissionName === 'Write to Folder').permissionId,
+ };
+
+ const viewPermission = permission.permissions.find(p => p.permissionId == permissionId.view);
+ // If view permission is denied, then deny all other permissions
+ if (viewPermission && viewPermission.allowAccess == false){
+ // Deny all permissions
+ permission.permissions = [
+ {
+ allowAccess: false,
+ fullControl: false,
+ permissionId: permissionId.view,
+ permissionCode: null,
+ permissionKey: null,
+ permissionName: "View Folder",
+ view: false,
+ },
+ {
+ allowAccess: false,
+ fullControl: false,
+ permissionId: permissionId.browse,
+ permissionCode: null,
+ permissionKey: null,
+ permissionName: "Browse Folder",
+ view: false,
+ },
+ {
+ allowAccess: false,
+ fullControl: false,
+ permissionId: permissionId.write,
+ permissionCode: null,
+ permissionKey: null,
+ permissionName: "Write to Folder",
+ view: false,
+ },
+ ]
+ }
+
+ // If browse was denied, then deny write
+ const browsePermission = permission.permissions.find(p => p.permissionId == permissionId.browse);
+ if (browsePermission && browsePermission.allowAccess == false){
+ // Deny write
+ permission.permissions = [
+ ...permission.permissions.filter(p => p.permissionId != permissionId.write),
+ {
+ allowAccess: false,
+ fullControl: false,
+ permissionId: permissionId.write,
+ permissionCode: null,
+ permissionKey: null,
+ permissionName: "Write to Folder",
+ view: false,
+ }
+ ]
+ }
+
+ // If browse was allowed, then allow view
+ if (browsePermission && browsePermission.allowAccess == true){
+ // Allow browse
+ permission.permissions = [
+ {
+ allowAccess: true,
+ fullControl: false,
+ permissionId: permissionId.view,
+ permissionCode: null,
+ permissionKey: null,
+ permissionName: "Browse Folder",
+ view: false,
+ },
+ ...permission.permissions.filter(p => p.permissionId != permissionId.view),
+ ];
+ }
+
+ // If write was allowed, then allow all other permissions
+ const writePermission = permission.permissions.find(p => p.permissionId == permissionId.write);
+ if (writePermission && writePermission.allowAccess == true){
+ // Allow all permissions
+ permission.permissions = [
+ {
+ allowAccess: true,
+ fullControl: false,
+ permissionId: permissionId.view,
+ permissionCode: null,
+ permissionKey: null,
+ permissionName: "View Folder",
+ view: false,
+ },
+ {
+ allowAccess: true,
+ fullControl: false,
+ permissionId: permissionId.browse,
+ permissionCode: null,
+ permissionKey: null,
+ permissionName: "Browse Folder",
+ view: false,
+ },
+ {
+ allowAccess: true,
+ fullControl: false,
+ permissionId: permissionId.write,
+ permissionCode: null,
+ permissionKey: null,
+ permissionName: "Write to Folder",
+ view: false,
+ },
+ ]
+ }
}
- private canChooseFolderProvider() {
- return this.folderMappings &&
- this.folderMappings.find(f => f.FolderMappingID == state.currentItems.folder.folderMappingId).IsDefault;
+ private handleUserSearchQueryChanged(detail: string): void {
+ this.itemsClient.searchUsers(detail)
+ .then(data => this.foundUsers = data)
+ .catch(error => alert(error));
}
render() {
return (
-
+
+
+
+ {this.folderDetails && this.folderDetails.permissions && this.roleGroups && this.roles &&
+ this.handlePermissionsChanged(e.detail)}
+ onUserSearchQueryChanged={e => this.handleUserSearchQueryChanged(e.detail)}
+ />
+ }
+
+
this.handleCancel()}
+ onClick={() => this.closeModal()}
>
{state.localization.Cancel}
this.handleSave()}
>
{state.localization.Save}
diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-edit-folder/readme.md b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-edit-folder/readme.md
index d34fa1b4186..53e91756e31 100644
--- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-edit-folder/readme.md
+++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-edit-folder/readme.md
@@ -5,6 +5,13 @@
+## Properties
+
+| Property | Attribute | Description | Type | Default |
+| ----------------------- | ----------- | ----------------------------- | -------- | ----------- |
+| `folderId` _(required)_ | `folder-id` | The ID of the folder to edit. | `number` | `undefined` |
+
+
## Events
| Event | Description | Type |
@@ -16,19 +23,29 @@
### Used by
- - [dnn-action-create-folder](../actions/dnn-action-create-folder)
+ - [dnn-action-edit-item](../actions/dnn-action-edit-item)
### Depends on
+- dnn-tabs
+- dnn-tab
+- dnn-permissions-grid
- dnn-button
### Graph
```mermaid
graph TD;
+ dnn-rm-edit-folder --> dnn-tabs
+ dnn-rm-edit-folder --> dnn-tab
+ dnn-rm-edit-folder --> dnn-permissions-grid
dnn-rm-edit-folder --> dnn-button
+ dnn-permissions-grid --> dnn-checkbox
+ dnn-permissions-grid --> dnn-button
+ dnn-permissions-grid --> dnn-searchbox
+ dnn-permissions-grid --> dnn-collapsible
dnn-button --> dnn-modal
dnn-button --> dnn-button
- dnn-action-create-folder --> dnn-rm-edit-folder
+ dnn-action-edit-item --> dnn-rm-edit-folder
style dnn-rm-edit-folder fill:#f9f,stroke:#333,stroke-width:4px
```
diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-files-pane/dnn-rm-files-pane.tsx b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-files-pane/dnn-rm-files-pane.tsx
index 148a9a8bd91..e7d671c89a7 100644
--- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-files-pane/dnn-rm-files-pane.tsx
+++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-files-pane/dnn-rm-files-pane.tsx
@@ -27,6 +27,12 @@ export class DnnRmFilesPane {
this.checkIfMoreItemsNeeded();
}
+ @Listen("dnnRmFoldersChanged", {target: "document"})
+ handleFoldersChanged(){
+ state.currentItems.items = [];
+ this.checkIfMoreItemsNeeded();
+ }
+
componentDidUpdate() {
const loadedFilesHeight = this.loadedFilesArea.getBoundingClientRect().height;
const heightPerItem = loadedFilesHeight / state.currentItems.items.length;
diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-files-pane/readme.md b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-files-pane/readme.md
index 700f908cd1a..23130d24d9e 100644
--- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-files-pane/readme.md
+++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-files-pane/readme.md
@@ -31,11 +31,22 @@ graph TD;
dnn-rm-items-listview --> dnn-collapsible
dnn-rm-items-listview --> dnn-rm-folder-context-menu
dnn-rm-folder-context-menu --> dnn-action-create-folder
+ dnn-rm-folder-context-menu --> dnn-action-edit-item
dnn-action-create-folder --> dnn-modal
- dnn-action-create-folder --> dnn-rm-edit-folder
- dnn-rm-edit-folder --> dnn-button
+ dnn-action-create-folder --> dnn-rm-create-folder
+ dnn-rm-create-folder --> dnn-button
dnn-button --> dnn-modal
dnn-button --> dnn-button
+ dnn-action-edit-item --> dnn-modal
+ dnn-action-edit-item --> dnn-rm-edit-folder
+ dnn-rm-edit-folder --> dnn-tabs
+ dnn-rm-edit-folder --> dnn-tab
+ dnn-rm-edit-folder --> dnn-permissions-grid
+ dnn-rm-edit-folder --> dnn-button
+ dnn-permissions-grid --> dnn-checkbox
+ dnn-permissions-grid --> dnn-button
+ dnn-permissions-grid --> dnn-searchbox
+ dnn-permissions-grid --> dnn-collapsible
dnn-rm-items-cardview --> dnn-collapsible
dnn-rm-items-cardview --> dnn-rm-folder-context-menu
dnn-rm-right-pane --> dnn-rm-files-pane
diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-folder-list-item/dnn-rm-folder-list-item.tsx b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-folder-list-item/dnn-rm-folder-list-item.tsx
index 9d27ecc51ed..57f93e4c647 100644
--- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-folder-list-item/dnn-rm-folder-list-item.tsx
+++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-folder-list-item/dnn-rm-folder-list-item.tsx
@@ -15,6 +15,9 @@ export class DnnRmFolderListItem {
/** If true, this node will be expanded on load. */
@Prop({mutable: true}) expanded = false;
+
+ /** The ID of the parent folder. */
+ @Prop() parentFolderId!: number;
/** Fires when a context menu is opened for this item. Emits the folder ID. */
@Event() dnnRmcontextMenuOpened: EventEmitter;
@@ -26,22 +29,12 @@ export class DnnRmFolderListItem {
}
}
- private dismissContextMenu() {
- if (this.contextMenu && this.contextMenu.expanded){
- this.contextMenu.expanded = false;
- requestAnimationFrame(() => {
- this.contextMenu.style.display = "none";
- });
- }
- }
-
@State() folderIconUrl: string;
@Element() el!: HTMLDnnRmFolderListItemElement;
private itemsClient: ItemsClient;
private internalServicesClient: InternalServicesClient;
- private contextMenu: HTMLDnnCollapsibleElement;
constructor(){
this.itemsClient = new ItemsClient(state.moduleId);
@@ -96,11 +89,27 @@ export class DnnRmFolderListItem {
private handleContextMenu(e: MouseEvent): void {
e.preventDefault();
- this.contextMenu.style.display = "block";
- this.contextMenu.style.left = `${e.pageX}px`;
- this.contextMenu.style.top = `${e.pageY}px`;
- this.contextMenu.expanded = true;
- this.dnnRmcontextMenuOpened.emit(Number.parseInt(this.folder.data.key));
+ this.itemsClient.getFolderItem(Number.parseInt(this.folder.data.key))
+ .then(item => {
+ const collapsible = document.createElement("dnn-collapsible");
+ const folderContextMenu = document.createElement("dnn-rm-folder-context-menu");
+ collapsible.appendChild(folderContextMenu);
+ folderContextMenu.item = item;
+ collapsible.style.left = `${e.pageX}px`;
+ collapsible.style.top = `${e.pageY}px`;
+ collapsible.style.display = "block";
+ this.el.shadowRoot.appendChild(collapsible);
+ setTimeout(() => {
+ collapsible.expanded = true;
+ }, 100);
+ this.dnnRmcontextMenuOpened.emit(Number.parseInt(this.folder.data.key));
+ })
+ .catch(reason => console.error(reason));
+ }
+
+ private dismissContextMenu() {
+ const existingMenus = this.el.shadowRoot.querySelectorAll(".contextMenu");
+ existingMenus?.forEach(contextMenu => this.el.shadowRoot.removeChild(contextMenu));
}
render() {
@@ -131,13 +140,14 @@ export class DnnRmFolderListItem {
,
this.folder.children && this.folder.children.length > 0 && this.folder.children.map(child =>
-
+
)
]}
- this.contextMenu = el}>
-
);
}
diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-folder-list-item/readme.md b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-folder-list-item/readme.md
index 15af50e763d..89ef76e4c8d 100644
--- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-folder-list-item/readme.md
+++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-folder-list-item/readme.md
@@ -7,10 +7,11 @@
## Properties
-| Property | Attribute | Description | Type | Default |
-| --------------------- | ---------- | -------------------------------------------- | ---------------- | ----------- |
-| `expanded` | `expanded` | If true, this node will be expanded on load. | `boolean` | `false` |
-| `folder` _(required)_ | -- | The basic information about the folder | `FolderTreeItem` | `undefined` |
+| Property | Attribute | Description | Type | Default |
+| ----------------------------- | ------------------ | -------------------------------------------- | ---------------- | ----------- |
+| `expanded` | `expanded` | If true, this node will be expanded on load. | `boolean` | `false` |
+| `folder` _(required)_ | -- | The basic information about the folder | `FolderTreeItem` | `undefined` |
+| `parentFolderId` _(required)_ | `parent-folder-id` | The ID of the parent folder. | `number` | `undefined` |
## Events
@@ -29,22 +30,33 @@
### Depends on
-- dnn-treeview-item
-- [dnn-rm-folder-list-item](.)
- dnn-collapsible
- [dnn-rm-folder-context-menu](../context-menus/dnn-rm-folder-context-menu)
+- dnn-treeview-item
+- [dnn-rm-folder-list-item](.)
### Graph
```mermaid
graph TD;
dnn-rm-folder-list-item --> dnn-rm-folder-list-item
- dnn-treeview-item --> dnn-collapsible
dnn-rm-folder-context-menu --> dnn-action-create-folder
+ dnn-rm-folder-context-menu --> dnn-action-edit-item
dnn-action-create-folder --> dnn-modal
- dnn-action-create-folder --> dnn-rm-edit-folder
- dnn-rm-edit-folder --> dnn-button
+ dnn-action-create-folder --> dnn-rm-create-folder
+ dnn-rm-create-folder --> dnn-button
dnn-button --> dnn-modal
dnn-button --> dnn-button
+ dnn-action-edit-item --> dnn-modal
+ dnn-action-edit-item --> dnn-rm-edit-folder
+ dnn-rm-edit-folder --> dnn-tabs
+ dnn-rm-edit-folder --> dnn-tab
+ dnn-rm-edit-folder --> dnn-permissions-grid
+ dnn-rm-edit-folder --> dnn-button
+ dnn-permissions-grid --> dnn-checkbox
+ dnn-permissions-grid --> dnn-button
+ dnn-permissions-grid --> dnn-searchbox
+ dnn-permissions-grid --> dnn-collapsible
+ dnn-treeview-item --> dnn-collapsible
dnn-rm-folder-list --> dnn-rm-folder-list-item
style dnn-rm-folder-list-item fill:#f9f,stroke:#333,stroke-width:4px
```
diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-folder-list/dnn-rm-folder-list.tsx b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-folder-list/dnn-rm-folder-list.tsx
index fc6520ea678..f023bfd47f6 100644
--- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-folder-list/dnn-rm-folder-list.tsx
+++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-folder-list/dnn-rm-folder-list.tsx
@@ -57,6 +57,7 @@ export class DnnRmFolderList {
{state.rootFolders && state.rootFolders.Tree.children.map(item =>
diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-folder-list/readme.md b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-folder-list/readme.md
index affba828b43..0679bdf88ea 100644
--- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-folder-list/readme.md
+++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-folder-list/readme.md
@@ -19,17 +19,28 @@
```mermaid
graph TD;
dnn-rm-folder-list --> dnn-rm-folder-list-item
- dnn-rm-folder-list-item --> dnn-treeview-item
- dnn-rm-folder-list-item --> dnn-rm-folder-list-item
dnn-rm-folder-list-item --> dnn-collapsible
dnn-rm-folder-list-item --> dnn-rm-folder-context-menu
- dnn-treeview-item --> dnn-collapsible
+ dnn-rm-folder-list-item --> dnn-treeview-item
+ dnn-rm-folder-list-item --> dnn-rm-folder-list-item
dnn-rm-folder-context-menu --> dnn-action-create-folder
+ dnn-rm-folder-context-menu --> dnn-action-edit-item
dnn-action-create-folder --> dnn-modal
- dnn-action-create-folder --> dnn-rm-edit-folder
- dnn-rm-edit-folder --> dnn-button
+ dnn-action-create-folder --> dnn-rm-create-folder
+ dnn-rm-create-folder --> dnn-button
dnn-button --> dnn-modal
dnn-button --> dnn-button
+ dnn-action-edit-item --> dnn-modal
+ dnn-action-edit-item --> dnn-rm-edit-folder
+ dnn-rm-edit-folder --> dnn-tabs
+ dnn-rm-edit-folder --> dnn-tab
+ dnn-rm-edit-folder --> dnn-permissions-grid
+ dnn-rm-edit-folder --> dnn-button
+ dnn-permissions-grid --> dnn-checkbox
+ dnn-permissions-grid --> dnn-button
+ dnn-permissions-grid --> dnn-searchbox
+ dnn-permissions-grid --> dnn-collapsible
+ dnn-treeview-item --> dnn-collapsible
dnn-rm-left-pane --> dnn-rm-folder-list
style dnn-rm-folder-list fill:#f9f,stroke:#333,stroke-width:4px
```
diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-items-cardview/dnn-rm-items-cardview.tsx b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-items-cardview/dnn-rm-items-cardview.tsx
index 1bed17459fd..a80e0153018 100644
--- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-items-cardview/dnn-rm-items-cardview.tsx
+++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-items-cardview/dnn-rm-items-cardview.tsx
@@ -36,7 +36,7 @@ export class DnnRmItemsCardview {
const collapsible = document.createElement("dnn-collapsible");
const folderContextMenu = document.createElement("dnn-rm-folder-context-menu");
collapsible.appendChild(folderContextMenu);
- folderContextMenu.clickedFolderId = item.itemId;
+ folderContextMenu.item = item;
collapsible.style.left = `${e.pageX}px`;
collapsible.style.top = `${e.pageY}px`;
collapsible.style.display = "block";
diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-items-cardview/readme.md b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-items-cardview/readme.md
index b3085d8c942..6b0f2ccd9a5 100644
--- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-items-cardview/readme.md
+++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-items-cardview/readme.md
@@ -29,11 +29,22 @@ graph TD;
dnn-rm-items-cardview --> dnn-collapsible
dnn-rm-items-cardview --> dnn-rm-folder-context-menu
dnn-rm-folder-context-menu --> dnn-action-create-folder
+ dnn-rm-folder-context-menu --> dnn-action-edit-item
dnn-action-create-folder --> dnn-modal
- dnn-action-create-folder --> dnn-rm-edit-folder
- dnn-rm-edit-folder --> dnn-button
+ dnn-action-create-folder --> dnn-rm-create-folder
+ dnn-rm-create-folder --> dnn-button
dnn-button --> dnn-modal
dnn-button --> dnn-button
+ dnn-action-edit-item --> dnn-modal
+ dnn-action-edit-item --> dnn-rm-edit-folder
+ dnn-rm-edit-folder --> dnn-tabs
+ dnn-rm-edit-folder --> dnn-tab
+ dnn-rm-edit-folder --> dnn-permissions-grid
+ dnn-rm-edit-folder --> dnn-button
+ dnn-permissions-grid --> dnn-checkbox
+ dnn-permissions-grid --> dnn-button
+ dnn-permissions-grid --> dnn-searchbox
+ dnn-permissions-grid --> dnn-collapsible
dnn-rm-files-pane --> dnn-rm-items-cardview
style dnn-rm-items-cardview fill:#f9f,stroke:#333,stroke-width:4px
```
diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-items-listview/dnn-rm-items-listview.tsx b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-items-listview/dnn-rm-items-listview.tsx
index 99a5a805c59..301e7ccb026 100644
--- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-items-listview/dnn-rm-items-listview.tsx
+++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-items-listview/dnn-rm-items-listview.tsx
@@ -80,7 +80,7 @@ export class DnnRmItemsListview {
if (item.isFolder){
const collapsible = document.createElement("dnn-collapsible");
const folderContextMenu = document.createElement("dnn-rm-folder-context-menu");
- folderContextMenu.clickedFolderId = item.itemId;
+ folderContextMenu.item = item;
collapsible.appendChild(folderContextMenu);
collapsible.style.left = `${e.pageX}px`;
collapsible.style.top = `${e.pageY}px`;
diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-items-listview/readme.md b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-items-listview/readme.md
index 54ca9a797f7..d3d18becb62 100644
--- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-items-listview/readme.md
+++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-items-listview/readme.md
@@ -29,11 +29,22 @@ graph TD;
dnn-rm-items-listview --> dnn-collapsible
dnn-rm-items-listview --> dnn-rm-folder-context-menu
dnn-rm-folder-context-menu --> dnn-action-create-folder
+ dnn-rm-folder-context-menu --> dnn-action-edit-item
dnn-action-create-folder --> dnn-modal
- dnn-action-create-folder --> dnn-rm-edit-folder
- dnn-rm-edit-folder --> dnn-button
+ dnn-action-create-folder --> dnn-rm-create-folder
+ dnn-rm-create-folder --> dnn-button
dnn-button --> dnn-modal
dnn-button --> dnn-button
+ dnn-action-edit-item --> dnn-modal
+ dnn-action-edit-item --> dnn-rm-edit-folder
+ dnn-rm-edit-folder --> dnn-tabs
+ dnn-rm-edit-folder --> dnn-tab
+ dnn-rm-edit-folder --> dnn-permissions-grid
+ dnn-rm-edit-folder --> dnn-button
+ dnn-permissions-grid --> dnn-checkbox
+ dnn-permissions-grid --> dnn-button
+ dnn-permissions-grid --> dnn-searchbox
+ dnn-permissions-grid --> dnn-collapsible
dnn-rm-files-pane --> dnn-rm-items-listview
style dnn-rm-items-listview fill:#f9f,stroke:#333,stroke-width:4px
```
diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-left-pane/readme.md b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-left-pane/readme.md
index 2ad5e6b62f5..a510e505c12 100644
--- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-left-pane/readme.md
+++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-left-pane/readme.md
@@ -20,17 +20,28 @@
graph TD;
dnn-rm-left-pane --> dnn-rm-folder-list
dnn-rm-folder-list --> dnn-rm-folder-list-item
- dnn-rm-folder-list-item --> dnn-treeview-item
- dnn-rm-folder-list-item --> dnn-rm-folder-list-item
dnn-rm-folder-list-item --> dnn-collapsible
dnn-rm-folder-list-item --> dnn-rm-folder-context-menu
- dnn-treeview-item --> dnn-collapsible
+ dnn-rm-folder-list-item --> dnn-treeview-item
+ dnn-rm-folder-list-item --> dnn-rm-folder-list-item
dnn-rm-folder-context-menu --> dnn-action-create-folder
+ dnn-rm-folder-context-menu --> dnn-action-edit-item
dnn-action-create-folder --> dnn-modal
- dnn-action-create-folder --> dnn-rm-edit-folder
- dnn-rm-edit-folder --> dnn-button
+ dnn-action-create-folder --> dnn-rm-create-folder
+ dnn-rm-create-folder --> dnn-button
dnn-button --> dnn-modal
dnn-button --> dnn-button
+ dnn-action-edit-item --> dnn-modal
+ dnn-action-edit-item --> dnn-rm-edit-folder
+ dnn-rm-edit-folder --> dnn-tabs
+ dnn-rm-edit-folder --> dnn-tab
+ dnn-rm-edit-folder --> dnn-permissions-grid
+ dnn-rm-edit-folder --> dnn-button
+ dnn-permissions-grid --> dnn-checkbox
+ dnn-permissions-grid --> dnn-button
+ dnn-permissions-grid --> dnn-searchbox
+ dnn-permissions-grid --> dnn-collapsible
+ dnn-treeview-item --> dnn-collapsible
dnn-resource-manager --> dnn-rm-left-pane
style dnn-rm-left-pane fill:#f9f,stroke:#333,stroke-width:4px
```
diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-right-pane/readme.md b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-right-pane/readme.md
index fdfc430a43f..cc0ac3bc187 100644
--- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-right-pane/readme.md
+++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-right-pane/readme.md
@@ -25,17 +25,29 @@ graph TD;
dnn-rm-right-pane --> dnn-rm-status-bar
dnn-rm-actions-bar --> dnn-vertical-overflow-menu
dnn-rm-actions-bar --> dnn-action-create-folder
+ dnn-rm-actions-bar --> dnn-action-edit-item
dnn-rm-actions-bar --> dnn-collapsible
dnn-action-create-folder --> dnn-modal
- dnn-action-create-folder --> dnn-rm-edit-folder
- dnn-rm-edit-folder --> dnn-button
+ dnn-action-create-folder --> dnn-rm-create-folder
+ dnn-rm-create-folder --> dnn-button
dnn-button --> dnn-modal
dnn-button --> dnn-button
+ dnn-action-edit-item --> dnn-modal
+ dnn-action-edit-item --> dnn-rm-edit-folder
+ dnn-rm-edit-folder --> dnn-tabs
+ dnn-rm-edit-folder --> dnn-tab
+ dnn-rm-edit-folder --> dnn-permissions-grid
+ dnn-rm-edit-folder --> dnn-button
+ dnn-permissions-grid --> dnn-checkbox
+ dnn-permissions-grid --> dnn-button
+ dnn-permissions-grid --> dnn-searchbox
+ dnn-permissions-grid --> dnn-collapsible
dnn-rm-files-pane --> dnn-rm-items-listview
dnn-rm-files-pane --> dnn-rm-items-cardview
dnn-rm-items-listview --> dnn-collapsible
dnn-rm-items-listview --> dnn-rm-folder-context-menu
dnn-rm-folder-context-menu --> dnn-action-create-folder
+ dnn-rm-folder-context-menu --> dnn-action-edit-item
dnn-rm-items-cardview --> dnn-collapsible
dnn-rm-items-cardview --> dnn-rm-folder-context-menu
dnn-resource-manager --> dnn-rm-right-pane
diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/services/ItemsClient.ts b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/services/ItemsClient.ts
index 719127f837a..82c671f073b 100644
--- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/services/ItemsClient.ts
+++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/services/ItemsClient.ts
@@ -1,4 +1,8 @@
import { DnnServicesFramework } from "@dnncommunity/dnn-elements";
+import { IPermissions } from "@dnncommunity/dnn-elements/dist/types/components/dnn-permissions-grid/permissions-interface";
+import { IRoleGroup } from "@dnncommunity/dnn-elements/dist/types/components/dnn-permissions-grid/role-group-interface";
+import { IRole } from "@dnncommunity/dnn-elements/dist/types/components/dnn-permissions-grid/role-interface";
+import { ISearchedUser } from "@dnncommunity/dnn-elements/dist/types/components/dnn-permissions-grid/searched-user-interface";
import { SortFieldInfo } from "../enums/SortField";
export class ItemsClient{
@@ -118,7 +122,7 @@ export class ItemsClient{
});
}
- public createNewFolder(request: CreateNewFolderRequest, groupId = 1){
+ public createNewFolder(request: CreateNewFolderRequest, groupId = 0){
return new Promise((resolve, reject) => {
const url = `${this.requestUrl}CreateNewFolder`;
const headers = this.sf.getModuleHeaders();
@@ -141,6 +145,120 @@ export class ItemsClient{
});
}
+
+ public getFolderItem(folderId: number, groupId = 0){
+ return new Promise- ((resolve, reject) => {
+ const url = `${this.requestUrl}GetFolderItem?folderId=${folderId}`;
+ const headers = this.sf.getModuleHeaders();
+ headers.append("groupId", groupId.toString());
+ fetch(url, {
+ headers,
+ })
+ .then(response => {
+ if (response.status == 200){
+ response.json().then(data => resolve(data));
+ }
+ else{
+ response.json().then(error => reject(error.ExceptionMessage || error.message));
+ }
+ })
+ .catch(reason => reject(reason));
+ });
+ }
+
+ public getFolderDetails(folderId: number){
+ return new Promise
((resolve, reject) => {
+ const url = `${this.requestUrl}GetFolderDetails?folderId=${folderId}`;
+ fetch(url, {
+ headers: this.sf.getModuleHeaders(),
+ })
+ .then(response => {
+ if (response.status == 200){
+ response.json().then(data => resolve(data));
+ }
+ else{
+ response.json().then(error => reject(error.ExceptionMessage || error.message));
+ }
+ })
+ .catch(reason => reject(reason));
+ });
+ }
+
+ public getRoleGroups(){
+ return new Promise((resolve, reject) => {
+ const url = `${this.requestUrl}GetRoleGroups`;
+ fetch(url, {
+ headers: this.sf.getModuleHeaders(),
+ })
+ .then(response => {
+ if (response.status == 200){
+ response.json().then(data => resolve(data));
+ }
+ else{
+ response.json().then(error => reject(error.ExceptionMessage || error.message));
+ }
+ })
+ .catch(reason => reject(reason));
+ });
+ }
+
+ public getRoles(){
+ return new Promise((resolve, reject) => {
+ const url = `${this.requestUrl}GetRoles`;
+ fetch(url, {
+ headers: this.sf.getModuleHeaders(),
+ })
+ .then(response => {
+ if (response.status == 200){
+ response.json().then(data => resolve(data));
+ }
+ else{
+ response.json().then(error => reject(error.ExceptionMessage || error.message));
+ }
+ })
+ .catch(reason => reject(reason));
+ });
+ }
+
+ public searchUsers(query: string) {
+ return new Promise((resolve, reject) => {
+ const url = `${this.requestUrl}GetSuggestionUsers?keyword=${query}&count=50`;
+ fetch(url, {
+ headers: this.sf.getModuleHeaders(),
+ })
+ .then(response => {
+ if (response.status == 200){
+ response.json().then(data => resolve(data));
+ }
+ else{
+ response.json().then(error => reject(error.ExceptionMessage || error.message));
+ }
+ })
+ .catch(reason => reject(reason));
+ });
+ }
+
+ public saveFolderDetails(request: SaveFolderDetailsRequest){
+ return new Promise((resolve, reject) => {
+ const url = `${this.requestUrl}SaveFolderDetails`;
+ const headers = this.sf.getModuleHeaders();
+ headers.append("Content-Type", "application/json");
+ fetch(url, {
+ method: "POST",
+ body: JSON.stringify(request),
+ headers,
+ })
+ .then(response => {
+ if (response.status == 200){
+ resolve();
+ }
+ else{
+ response.json().then(error => reject(error.ExceptionMessage || error.message));
+ }
+ })
+ .catch(reason => reject(reason));
+ });
+ }
}
export interface GetFolderContentResponse{
@@ -228,4 +346,22 @@ export interface CreateNewFolderResponse{
/** The ID of the folder mapping. */
FolderMappingID: number,
+}
+
+export interface FolderDetails{
+ folderId: number;
+ folderName: string;
+ createdOnDate: string;
+ createdBy: string;
+ lastModifiedOnDate: string;
+ lastModifiedBy: string;
+ type: string;
+ isVersioned: boolean;
+ permissions: IPermissions;
+}
+
+export interface SaveFolderDetailsRequest{
+ folderId: number;
+ folderName: string;
+ permissions: IPermissions;
}
\ No newline at end of file
diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/services/LocalizationClient.ts b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/services/LocalizationClient.ts
index e30b0fe894b..cdc013a57c2 100644
--- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/services/LocalizationClient.ts
+++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/services/LocalizationClient.ts
@@ -43,80 +43,84 @@ export class LocalizationClient{
}
}
-export interface LocalizedStrings {
- AddAsset: String;
- AddFolder: String;
- AssetsPanelEmpty_Subtitle: String;
- AssetsPanelEmpty_Title: String;
- Cancel: String;
- Close: String;
- Database: String;
- DeleteFileDialogHeader: String;
- DeleteFileDialogMessage: String;
- DeleteFolderDialogHeader: String;
- DeleteFolderDialogMessage: String;
- FileAlreadyExistsMessage: String;
- FileUploadedMessage: String;
- FileUploadStoppedMessage: String;
- FolderNamePlaceholder: String;
- FolderNameRequiredMessage: String;
- FolderParent: String;
- FolderTypeRequiredMessage: String;
- Name: String;
- Save: String;
- Secure: String;
- Standard: String;
- Type: String;
- "UserHasNoPermissionToDeleteFolder.Error": String;
- "UserHasNoPermissionToDownloadError": String;
- FileUploadPanelMessage: String;
- AssetsPanelNoSearchResults: String;
- SearchInputPlaceholder: String;
- Search: String;
- UrlCopiedMessage: String;
- Created: String;
- Description: String;
- LastModified: String;
- Size: String;
- Title: String;
- URL: String;
- ItemNameRequiredMessage: String;
- "UserHasNoPermissionToReadFileProperties.Error": String;
- GenericErrorMessage: String;
- Items: String;
- ItemSavedMessage: String;
- FolderType: String;
- CreatedOnDate: String;
- ItemName: String;
- LastModifiedOnDate: String;
- FileSizeErrorMessage: String;
- "UserHasNoPermissionToDeleteFile.Error": String;
- "UserHasNoPermissionToManageFileProperties.Error": String;
- "UserHasNoPermissionToManageFolder.Error": String;
- NoFolderSelected: String;
- SearchFolder: String;
- DisabledForAnonymousUsersMessage: String;
- "UserHasNoPermissionToAddFolders.Error": String;
- "GroupIconCantBeDeleted.Error": String;
- InvalidExtensionMessage: String;
- Refresh: String;
- SyncThisFolder: String;
- SyncThisFolderAndSubfolders: String;
- ManageFolderTypes: String;
- AddFolderType: String;
- FolderProvider: String;
- FolderTypeDefinitions: String;
- EditFolderType: String;
- RemoveFolderType: String;
- RemoveFolderTypeDialogBody: String;
- RemoveFolderTypeDialogHeader: String;
- MappedPath: String;
- MoveItem: String;
- NewLocation: String;
- SortField_ItemName: String;
- SortField_LastModifiedOnDate: String;
- SortField_Size: String;
- SortField_ParentFolder: String;
- SortField_CreatedOnDate: String;
- Sort: String;
+export interface LocalizedStrings {
+ AddAsset: string;
+ AddFolder: string;
+ AssetsPanelEmpty_Subtitle: string;
+ AssetsPanelEmpty_Title: string;
+ Cancel: string;
+ Close: string;
+ Database: string;
+ DeleteFileDialogHeader: string;
+ DeleteFileDialogMessage: string;
+ DeleteFolderDialogHeader: string;
+ DeleteFolderDialogMessage: string;
+ Edit: string;
+ FileAlreadyExistsMessage: string;
+ FileUploadedMessage: string;
+ FileUploadStoppedMessage: string;
+ FolderNamePlaceholder: string;
+ FolderNameRequiredMessage: string;
+ FolderId: string;
+ FolderParent: string;
+ FolderTypeRequiredMessage: string;
+ General: string;
+ Name: string;
+ Permissions: string;
+ Save: string;
+ Secure: string;
+ Standard: string;
+ Type: string;
+ "UserHasNoPermissionToDeleteFolder.Error": string;
+ "UserHasNoPermissionToDownloadError": string;
+ FileUploadPanelMessage: string;
+ AssetsPanelNoSearchResults: string;
+ SearchInputPlaceholder: string;
+ Search: string;
+ UrlCopiedMessage: string;
+ Created: string;
+ Description: string;
+ LastModified: string;
+ Size: string;
+ Title: string;
+ URL: string;
+ ItemNameRequiredMessage: string;
+ "UserHasNoPermissionToReadFileProperties.Error": string;
+ GenericErrorMessage: string;
+ Items: string;
+ ItemSavedMessage: string;
+ FolderType: string;
+ CreatedOnDate: string;
+ ItemName: string;
+ LastModifiedOnDate: string;
+ FileSizeErrorMessage: string;
+ "UserHasNoPermissionToDeleteFile.Error": string;
+ "UserHasNoPermissionToManageFileProperties.Error": string;
+ "UserHasNoPermissionToManageFolder.Error": string;
+ NoFolderSelected: string;
+ SearchFolder: string;
+ DisabledForAnonymousUsersMessage: string;
+ "UserHasNoPermissionToAddFolders.Error": string;
+ "GroupIconCantBeDeleted.Error": string;
+ InvalidExtensionMessage: string;
+ Refresh: string;
+ SyncThisFolder: string;
+ SyncThisFolderAndSubfolders: string;
+ ManageFolderTypes: string;
+ AddFolderType: string;
+ FolderProvider: string;
+ FolderTypeDefinitions: string;
+ EditFolderType: string;
+ RemoveFolderType: string;
+ RemoveFolderTypeDialogBody: string;
+ RemoveFolderTypeDialogHeader: string;
+ MappedPath: string;
+ MoveItem: string;
+ NewLocation: string;
+ SortField_ItemName: string;
+ SortField_LastModifiedOnDate: string;
+ SortField_Size: string;
+ SortField_ParentFolder: string;
+ SortField_CreatedOnDate: string;
+ Sort: string;
};
\ No newline at end of file
diff --git a/DNN Platform/Modules/ResourceManager/Services/Dto/RoleGroupDto.cs b/DNN Platform/Modules/ResourceManager/Services/Dto/RoleGroupDto.cs
new file mode 100644
index 00000000000..4dfbbeceff1
--- /dev/null
+++ b/DNN Platform/Modules/ResourceManager/Services/Dto/RoleGroupDto.cs
@@ -0,0 +1,83 @@
+// 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.Services.Dto
+{
+ using System;
+ using System.Collections.Generic;
+ using System.Linq;
+ using System.Runtime.Serialization;
+ using System.Web;
+
+ using DotNetNuke.Security.Roles;
+
+ ///
+ /// A data-transfer-object for role groups.
+ ///
+ [DataContract]
+ public class RoleGroupDto
+ {
+ ///
+ /// Initializes a new instance of the
+ public RoleGroupDto()
+ {
+ this.Id = -2;
+ }
+
+ ///
+ /// Gets or sets the ID for this role group.
+ ///
+ [DataMember(Name = "id")]
+ public int Id { get; set; }
+
+ ///
+ /// Gets or sets the name of the role group.
+ ///
+ [DataMember(Name = "name")]
+ public string Name { get; set; }
+
+ ///
+ /// Gets or sets a value indicating how many roles are associated with this group.
+ ///
+ [DataMember(Name = "rolesCount")]
+ public int RolesCount { get; set; }
+
+ ///
+ /// Gets or sets the description for this role group.
+ ///
+ [DataMember(Name = "description")]
+ public string Description { get; set; }
+
+ ///
+ /// Converts a
+ /// The role group to convert from.
+ ///
+ /// Converts this
+ ///
+ /// Gets an item representation for a provided folder ID.
+ ///
+ /// The ID of the folder to get.
+ /// An Item viewmodel.
+ [HttpGet]
+ public IHttpActionResult GetFolderItem(int folderId)
+ {
+ var folder = FolderManager.Instance.GetFolder(folderId);
+ var item = this.GetItemViewModel(folder);
+ return this.Ok(item);
}
///
@@ -518,6 +533,103 @@ public IHttpActionResult GetFolderIconUrl(int folderId)
var folderMappingId = FolderManager.Instance.GetFolder(folderId).FolderMappingID;
var url = GetFolderIconUrl(this.PortalSettings.PortalId, folderMappingId);
return this.Ok(new { url });
+ }
+
+ ///
+ /// Gets a list of role groups.
+ ///
+ /// A collection of role groups.
+ [HttpGet]
+ [ValidateAntiForgeryToken]
+ public IHttpActionResult GetRoleGroups()
+ {
+ if (!this.UserInfo.IsInRole(this.PortalSettings.AdministratorRoleName))
+ {
+ return this.Unauthorized();
+ }
+
+ var groups = RoleController.GetRoleGroups(this.PortalSettings.PortalId)
+ .Cast()
+ .Select(RoleGroupDto.FromRoleGroupInfo);
+
+ return this.Ok(groups);
+ }
+
+ ///
+ /// Gets the roles for a rolegroup.
+ ///
+ /// A collection of roles.
+ [HttpGet]
+ [ValidateAntiForgeryToken]
+ public IHttpActionResult GetRoles()
+ {
+ var matchedRoles = RoleController.Instance.GetRoles(this.PortalSettings.PortalId)
+ .Where(r => r.Status == RoleStatus.Approved)
+ .OrderBy(r => r.RoleName)
+ .Select(r => new
+ {
+ IsSystemRole = r.IsSystemRole,
+ RoleGroupId = r.RoleGroupID,
+ RoleId = r.RoleID,
+ RoleName = r.RoleName,
+ })
+ .ToList();
+
+ return this.Ok(matchedRoles);
+ }
+
+ ///
+ /// Gets a list of users that match the search keyword.
+ ///
+ /// The keyword to search for.
+ /// The amount of results to return.
+ /// A collection of users.
+ [HttpGet]
+ [ValidateAntiForgeryToken]
+ public IHttpActionResult GetSuggestionUsers(string keyword, int count)
+ {
+ try
+ {
+ if (string.IsNullOrEmpty(keyword))
+ {
+ return this.Ok(new List());
+ }
+
+ var displayMatch = keyword + "%";
+ var totalRecords = 0;
+ var totalRecords2 = 0;
+ var matchedUsers = UserController.GetUsersByDisplayName(
+ this.PortalSettings.PortalId,
+ displayMatch,
+ 0,
+ count,
+ ref totalRecords,
+ false,
+ false);
+ matchedUsers.AddRange(
+ UserController.GetUsersByUserName(
+ this.PortalSettings.PortalId,
+ displayMatch,
+ 0,
+ count,
+ ref totalRecords2,
+ false,
+ false));
+ var finalUsers = matchedUsers
+ .Cast()
+ .Where(x => x.Membership.Approved)
+ .Select(u => new
+ {
+ userId = u.UserID,
+ displayName = $"{u.DisplayName}",
+ });
+
+ return this.Ok(finalUsers.ToList().GroupBy(x => x.userId).Select(group => group.First()));
+ }
+ catch (Exception ex)
+ {
+ return this.InternalServerError(new Exception(ex.Message));
+ }
}
private static string GetFileIconUrl(string extension)
{state.localization.AddFolder}
+
+ {state.currentItems.folder.folderName.length > 0 &&[
+ ,
+ {state.currentItems.folder.folderName}
+ ]}
+
+ this.nameField = el}
+ value={this.newFolderRequest.FolderName}
+ onInput={e => this.newFolderRequest = {
+ ...this.newFolderRequest,
+ FolderName: (e.target as HTMLInputElement).value,
+ }}
+ />
+ {!this.newFolderRequest.FolderName &&
+ {state.localization.FolderNameRequiredMessage}
+ }
+ {this.canChooseFolderProvider() &&
+ [
+ ,
+
+ ]
+ }
+ {this.canChooseFolderProvider() && this.folderMappings.find(m => m.FolderMappingID == this.newFolderRequest.FolderMappingId).IsDefault == false &&[
+ ,
+ this.newFolderRequest = {
+ ...this.newFolderRequest,
+ MappedName: (e.target as HTMLInputElement).value,
+ }}
+ />
+ ]}
+
+
+ this.handleCancel()}
+ >
+ {state.localization.Cancel}
+
+ this.handleSave()}
+ >
+ {state.localization.Save}
+
+
+ {state.localization.AddFolder}
-
- {state.currentItems.folder.folderName.length > 0 &&[
- ,
- {state.currentItems.folder.folderName}
- ]}
-
- this.nameField = el}
- value={this.newFolderRequest.FolderName}
- onInput={e => this.newFolderRequest = {
- ...this.newFolderRequest,
- FolderName: (e.target as HTMLInputElement).value,
- }}
- />
- {!this.newFolderRequest.FolderName &&
- {state.localization.FolderNameRequiredMessage}
- }
- {this.canChooseFolderProvider() &&
- [
- ,
-
- ]
- }
- {this.canChooseFolderProvider() && this.folderMappings.find(m => m.FolderMappingID == this.newFolderRequest.FolderMappingId).IsDefault == false &&[
- ,
- this.newFolderRequest = {
- ...this.newFolderRequest,
- MappedName: (e.target as HTMLInputElement).value,
- }}
- />
- ]}
-
+ {state.localization?.Edit}
+
+
+
+ {this.folderIconUrl &&
+ 
+ }
+ {this.folderDetails &&
+
+
+
+ {this.folderDetails.folderId}
+
+
+ {this.folderDetails.createdBy}
+
+
+ {this.folderDetails.createdOnDate}
+
+
+ {this.folderDetails.lastModifiedBy}
+
+
+ {this.folderDetails.lastModifiedOnDate}
+
+ }
+
+
+
+
+
+ this.folderDetails = {
+ ...this.folderDetails,
+ folderName: (e.target as HTMLInputElement).value,
+ }
+ }
+ />
+
+