@umbraco-cms/backoffice 17.0.0-beta → 17.0.0-rc2

package/dist-cms/packages/user/user-group/workspace/user-group/user-group-workspace-editor.element.d.ts

@@ -1,6 +1,5 @@
 import { UmbLitElement } from '../../../../core/lit-element/index.js';
-import './components/user-group-entity-user-permission-list.element.js';
-import './components/user-group-granular-permission-list.element.js';
+import './components/user-group-entity-type-permission-groups.element.js';
 export declare class UmbUserGroupWorkspaceEditorElement extends UmbLitElement {
     #private;
     private _isNew?;
@@ -8,7 +7,7 @@ export declare class UmbUserGroupWorkspaceEditorElement extends UmbLitElement {
     private _name?;
     private _alias?;
     private _aliasCanBeChanged?;
-    private _icon;
+    private _icon?;
     private _sections;
     private _languages;
     private _hasAccessToAllLanguages;

package/dist-cms/packages/user/user-group/workspace/user-group/user-group-workspace-editor.element.js

@@ -11,15 +11,13 @@ import { UmbLitElement, umbFocus } from '../../../../core/lit-element/index.js';
 import { UmbTextStyles } from '../../../../core/style/index.js';
 import { umbOpenModal } from '../../../../core/modal/index.js';
 import { UMB_ICON_PICKER_MODAL } from '../../../../core/icon-registry/index.js';
-import './components/user-group-entity-user-permission-list.element.js';
-import './components/user-group-granular-permission-list.element.js';
+import './components/user-group-entity-type-permission-groups.element.js';
 let UmbUserGroupWorkspaceEditorElement = class UmbUserGroupWorkspaceEditorElement extends UmbLitElement {
     #workspaceContext;
     constructor() {
         super();
         this._isNew = false;
         this._aliasCanBeChanged = true;
-        this._icon = null;
         this._sections = [];
         this._languages = [];
         this._hasAccessToAllLanguages = false;
@@ -31,21 +29,19 @@ let UmbUserGroupWorkspaceEditorElement = class UmbUserGroupWorkspaceEditorElemen
         });
     }
     #observeUserGroup() {
-        if (!this.#workspaceContext)
-            return;
-        this.observe(this.#workspaceContext.isNew, (value) => (this._isNew = value), '_observeIsNew');
-        this.observe(this.#workspaceContext.unique, (value) => (this._unique = value ?? undefined), '_observeUnique');
-        this.observe(this.#workspaceContext.name, (value) => (this._name = value), '_observeName');
-        this.observe(this.#workspaceContext.alias, (value) => (this._alias = value), '_observeAlias');
-        this.observe(this.#workspaceContext.aliasCanBeChanged, (value) => (this._aliasCanBeChanged = value), '_observeAliasCanBeChanged');
-        this.observe(this.#workspaceContext.icon, (value) => (this._icon = value), '_observeIcon');
-        this.observe(this.#workspaceContext.sections, (value) => (this._sections = value), '_observeSections');
-        this.observe(this.#workspaceContext.languages, (value) => (this._languages = value), '_observeLanguages');
-        this.observe(this.#workspaceContext.hasAccessToAllLanguages, (value) => (this._hasAccessToAllLanguages = value), '_observeHasAccessToAllLanguages');
-        this.observe(this.#workspaceContext.documentRootAccess, (value) => (this._documentRootAccess = value), '_observeDocumentRootAccess');
-        this.observe(this.#workspaceContext.documentStartNode, (value) => (this._documentStartNode = value), '_observeDocumentStartNode');
-        this.observe(this.#workspaceContext.mediaRootAccess, (value) => (this._mediaRootAccess = value), '_observeMediaRootAccess');
-        this.observe(this.#workspaceContext.mediaStartNode, (value) => (this._mediaStartNode = value), '_observeMediaStartNode');
+        this.observe(this.#workspaceContext?.isNew, (value) => (this._isNew = value), '_observeIsNew');
+        this.observe(this.#workspaceContext?.unique, (value) => (this._unique = value ?? undefined), '_observeUnique');
+        this.observe(this.#workspaceContext?.name, (value) => (this._name = value), '_observeName');
+        this.observe(this.#workspaceContext?.alias, (value) => (this._alias = value), '_observeAlias');
+        this.observe(this.#workspaceContext?.aliasCanBeChanged, (value) => (this._aliasCanBeChanged = value), '_observeAliasCanBeChanged');
+        this.observe(this.#workspaceContext?.icon, (value) => (this._icon = value), '_observeIcon');
+        this.observe(this.#workspaceContext?.sections, (value) => (this._sections = value ?? []), '_observeSections');
+        this.observe(this.#workspaceContext?.languages, (value) => (this._languages = value ?? []), '_observeLanguages');
+        this.observe(this.#workspaceContext?.hasAccessToAllLanguages, (value) => (this._hasAccessToAllLanguages = value ?? false), '_observeHasAccessToAllLanguages');
+        this.observe(this.#workspaceContext?.documentRootAccess, (value) => (this._documentRootAccess = value ?? false), '_observeDocumentRootAccess');
+        this.observe(this.#workspaceContext?.documentStartNode, (value) => (this._documentStartNode = value), '_observeDocumentStartNode');
+        this.observe(this.#workspaceContext?.mediaRootAccess, (value) => (this._mediaRootAccess = value ?? false), '_observeMediaRootAccess');
+        this.observe(this.#workspaceContext?.mediaStartNode, (value) => (this._mediaStartNode = value), '_observeMediaStartNode');
     }
     #onSectionsChange(event) {
         event.stopPropagation();
@@ -166,20 +162,7 @@ let UmbUserGroupWorkspaceEditorElement = class UmbUserGroupWorkspaceEditorElemen
 						${this.#renderLanguageAccess()} ${this.#renderDocumentAccess()} ${this.#renderMediaAccess()}
 					</uui-box>
 
-					<uui-box>
-						<div slot="headline"><umb-localize key="user_permissionsDefault"></umb-localize></div>
-
-						<umb-property-layout
-							label=${this.localize.term('user_entityPermissionsLabel')}
-							description=${this.localize.term('user_entityPermissionsDescription')}>
-							<umb-user-group-entity-user-permission-list slot="editor"></umb-user-group-entity-user-permission-list>
-						</umb-property-layout>
-					</uui-box>
-
-					<uui-box>
-						<div slot="headline"><umb-localize key="user_permissionsGranular"></umb-localize></div>
-						<umb-user-group-granular-permission-list></umb-user-group-granular-permission-list>
-					</uui-box>
+					${this.#renderPermissionGroups()}
 				</umb-stack>
 			</div>
 		`;
@@ -257,6 +240,9 @@ let UmbUserGroupWorkspaceEditorElement = class UmbUserGroupWorkspaceEditorElemen
 			</umb-property-layout>
 		`;
     }
+    #renderPermissionGroups() {
+        return html `<umb-user-group-entity-type-permission-groups></umb-user-group-entity-type-permission-groups> `;
+    }
     static { this.styles = [
         UmbTextStyles,
         css `

package/dist-cms/packages/user/user-permission/components/input-entity-user-permission/input-entity-user-permission.element.d.ts

@@ -6,9 +6,9 @@ export declare class UmbInputEntityUserPermissionElement extends UmbInputEntityU
     set entityType(value: string);
     private _entityType;
     allowedVerbs: Array<string>;
-    private _manifests;
+    private _groupedPermissions;
     protected getFormElement(): undefined;
-    render(): import("lit-html").TemplateResult<1>;
+    render(): unknown;
     disconnectedCallback(): void;
     static styles: import("lit").CSSResult;
 }

package/dist-cms/packages/user/user-permission/components/input-entity-user-permission/input-entity-user-permission.element.js

@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { UmbChangeEvent } from '../../../../core/event/index.js';
 import { umbExtensionsRegistry } from '../../../../core/extension-registry/index.js';
-import { html, customElement, property, state, nothing, ifDefined, css } from '../../../../../external/lit/index.js';
+import { html, customElement, property, state, ifDefined, css, repeat } from '../../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../core/lit-element/index.js';
 import { UmbFormControlMixin } from '../../../../core/validation/index.js';
 let UmbInputEntityUserPermissionElement = class UmbInputEntityUserPermissionElement extends UmbFormControlMixin(UmbLitElement) {
@@ -14,7 +14,7 @@ let UmbInputEntityUserPermissionElement = class UmbInputEntityUserPermissionElem
         super(...arguments);
         this._entityType = '';
         this.allowedVerbs = [];
-        this._manifests = [];
+        this._groupedPermissions = [];
     }
     get entityType() {
         return this._entityType;
@@ -34,8 +34,12 @@ let UmbInputEntityUserPermissionElement = class UmbInputEntityUserPermissionElem
     }
     #observeEntityUserPermissions() {
         this.#manifestObserver?.destroy();
-        this.#manifestObserver = this.observe(umbExtensionsRegistry.byType('entityUserPermission'), (userPermissionManifests) => {
-            this._manifests = userPermissionManifests.filter((manifest) => manifest.forEntityTypes.includes(this.entityType));
+        this.#manifestObserver = this.observe(umbExtensionsRegistry.byTypeAndFilter('entityUserPermission', (manifest) => manifest.forEntityTypes.includes(this.entityType)), (manifests) => {
+            // TODO: groupBy is not known by TS yet
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-expect-error
+            const groupedPermissions = Object.groupBy(manifests, (manifest) => manifest.meta.group);
+            this._groupedPermissions = Object.entries(groupedPermissions);
         }, 'umbUserPermissionManifestsObserver');
     }
     #onChangeUserPermission(event, permissionVerbs) {
@@ -59,21 +63,14 @@ let UmbInputEntityUserPermissionElement = class UmbInputEntityUserPermissionElem
         this.dispatchEvent(new UmbChangeEvent());
     }
     render() {
-        return html `${this.#renderGroupedPermissions(this._manifests)} `;
-    }
-    #renderGroupedPermissions(permissionManifests) {
-        // TODO: groupBy is not known by TS yet
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-expect-error
-        const groupedPermissions = Object.groupBy(permissionManifests, (manifest) => manifest.meta.group);
-        return html `
-			${Object.entries(groupedPermissions).map(([group, manifests]) => html `
-					${group !== 'undefined'
-            ? html ` <h5><umb-localize .key=${`actionCategories_${group}`}>${group}</umb-localize></h5> `
-            : nothing}
-					<div>${manifests.map((manifest) => html ` ${this.#renderPermission(manifest)} `)}</div>
-				`)}
-		`;
+        return repeat(this._groupedPermissions, ([group, manifests]) => {
+            const headline = group !== 'undefined' ? `#actionCategories_${group}` : `#actionCategories_general`;
+            return html `
+				<umb-property-layout label=${headline}>
+					<div slot="editor">${repeat(manifests, (manifest) => html ` ${this.#renderPermission(manifest)} `)}</div>
+				</umb-property-layout>
+			`;
+        });
     }
     #renderPermission(manifest) {
         return html ` <umb-input-user-permission-verb
@@ -100,7 +97,7 @@ __decorate([
 ], UmbInputEntityUserPermissionElement.prototype, "allowedVerbs", void 0);
 __decorate([
     state()
-], UmbInputEntityUserPermissionElement.prototype, "_manifests", void 0);
+], UmbInputEntityUserPermissionElement.prototype, "_groupedPermissions", void 0);
 UmbInputEntityUserPermissionElement = __decorate([
     customElement('umb-input-entity-user-permission')
 ], UmbInputEntityUserPermissionElement);

package/dist-cms/packages/user/user-permission/modals/settings/entity-user-permission-settings-modal.token.js

@@ -2,5 +2,6 @@ import { UmbModalToken } from '../../../../core/modal/index.js';
 export const UMB_ENTITY_USER_PERMISSION_MODAL = new UmbModalToken('Umb.Modal.EntityUserPermissionSettings', {
     modal: {
         type: 'sidebar',
+        size: 'medium',
     },
 });

package/dist-cms/packages/user/user-permission/user-granular-permission.extension.d.ts

@@ -1,6 +1,7 @@
 import type { ManifestElement } from '../../../libs/extension-api/index.js';
 export interface ManifestGranularUserPermission extends ManifestElement {
     type: 'userGranularPermission';
+    forEntityTypes?: Array<string>;
     meta: MetaGranularUserPermission;
 }
 export interface MetaGranularUserPermission {