move user-permission parts to user-permission folder

src/Umbraco.Web.UI.Client/src/packages/core/modal/common/manifests.ts

@@ -61,12 +61,6 @@ const modals: Array<ManifestModal> = [
 		name: 'Tree Picker Modal',
 		loader: () => import('./tree-picker/tree-picker-modal.element.js'),
 	},
-	{
-		type: 'modal',
-		alias: 'Umb.Modal.EntityUserPermissionSettings',
-		name: 'Entity User Permission Settings Modal',
-		loader: () => import('./entity-user-permission-settings/entity-user-permission-settings-modal.element.js'),
-	},
 ];
 
 export const manifests = [...modals];

src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/permissions.action.ts

@@ -25,14 +25,12 @@ export class UmbDocumentPermissionsEntityAction extends UmbEntityActionBase<UmbD
 		if (!this.#modalContext) return;
 
 		// TODO: we don't get "type" as part of the item
-		//const { data, error } = await this.repository.requestItems([this.unique]);
+		const { data, error } = await this.repository.requestItems([this.unique]);
 
-		/*
 		const modalContext = this.#modalContext.open(UMB_ENTITY_USER_PERMISSION_MODAL, {
 			unique: this.unique,
 			entityType: ['document'],
 		});
-		*/
 
 		// const { selection } = await modalContext.onSubmit();
 		// console.log(selection);

src/Umbraco.Web.UI.Client/src/packages/users/manifests.ts

@@ -2,10 +2,17 @@ import { manifests as userGroupManifests } from './user-groups/manifests.js';
 import { manifests as userManifests } from './users/manifests.js';
 import { manifests as userSectionManifests } from './user-section/manifests.js';
 import { manifests as currentUserManifests } from './current-user/manifests.js';
+import { manifests as userPermissionManifests } from './user-permission/manifests.js';
 
 // We need to load any components that are not loaded by the user management bundle to register them in the browser.
 import './user-groups/components/index.js';
 import './users/components/index.js';
 import './user-permission/components/index.js';
 
-export const manifests = [...userGroupManifests, ...userManifests, ...userSectionManifests, ...currentUserManifests];
+export const manifests = [
+	...userGroupManifests,
+	...userManifests,
+	...userSectionManifests,
+	...currentUserManifests,
+	...userPermissionManifests,
+];

src/Umbraco.Web.UI.Client/src/packages/users/user-permission/manifests.ts

@@ -1,3 +1,4 @@
 import { manifest as userPermissionConditionManifest } from './conditions/user-permission.condition.js';
+import { manifests as userPermissionModalManifests } from './modals/manifests.js';
 
-export const manifests = [userPermissionConditionManifest];
+export const manifests = [userPermissionConditionManifest, ...userPermissionModalManifests];

src/Umbraco.Web.UI.Client/src/packages/users/user-permission/modals/entity-user-permission-settings/entity-user-permission-settings-modal.element.ts

@@ -1,4 +1,4 @@
-import { html, customElement, property, state, css } from '@umbraco-cms/backoffice/external/lit';
+import { html, customElement, property, state, css, ifDefined } from '@umbraco-cms/backoffice/external/lit';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import {
 	UmbEntityUserPermissionSettingsModalData,
@@ -39,9 +39,10 @@ export class UmbEntityUserPermissionSettingsModalElement extends UmbLitElement {
 	render() {
 		return html`
 			<umb-body-layout headline="Hello">
+				debugger
 				<uui-box>
 					<umb-entity-user-permission-settings
-						entity-type=${this.data?.entityType}></umb-entity-user-permission-settings>
+						.entityType=${this.data?.entityType}></umb-entity-user-permission-settings>
 
 					Render user permissions for ${this.data?.entityType} ${this.data?.unique}
 					${this._userPermissionManifests.map((permission) => this.#renderPermission(permission))}
@@ -73,7 +74,7 @@ export class UmbEntityUserPermissionSettingsModalElement extends UmbLitElement {
 		return html`<div
 			style="display: flex; align-items:center; border-bottom: 1px solid var(--uui-color-divider); padding: 9px 0 12px 0;">
 			<uui-toggle
-				label=${userPermissionManifest.meta.label}
+				label=${ifDefined(userPermissionManifest.meta.label)}
 				?checked=${this.#isAllowed(userPermissionManifest)}
 				@change=${(event: UUIBooleanInputEvent) => this.#onChangeUserPermission(event, userPermissionManifest)}>
 				<div class="permission-meta">

src/Umbraco.Web.UI.Client/src/packages/users/user-permission/modals/manifests.ts

@@ -0,0 +1,8 @@
+export const manifests = [
+	{
+		type: 'modal',
+		alias: 'Umb.Modal.EntityUserPermissionSettings',
+		name: 'Entity User Permission Settings Modal',
+		loader: () => import('./entity-user-permission-settings/entity-user-permission-settings-modal.element.js'),
+	},
+];