@umbraco-cms/backoffice 14.0.0--preview004-14ef63c3 → 14.0.0--preview004-53edbae7

package/dist-cms/packages/core/extension-registry/models/user-permission.model.d.ts

@@ -4,8 +4,10 @@ export interface ManifestUserPermission extends ManifestBase {
     meta: MetaUserPermission;
 }
 export interface MetaUserPermission {
-    label: string;
     entityType: string;
+    label?: string;
+    labelKey?: string;
     description?: string;
+    descriptionKey?: string;
     group?: string;
 }

package/dist-cms/packages/documents/documents/user-permissions/manifests.js

@@ -21,8 +21,8 @@ const permissions = [
         name: 'Read Document User Permission',
         meta: {
             entityType: 'document',
-            label: 'Read',
-            description: 'Allow access to browse documents',
+            labelKey: 'actions_browse',
+            descriptionKey: 'actionDescriptions_browse',
         },
     },
     {
@@ -31,8 +31,8 @@ const permissions = [
         name: 'Create Document Blueprint User Permission',
         meta: {
             entityType: 'document',
-            label: 'Create Content Template',
-            description: 'Allow access to create a Content Template',
+            labelKey: 'actions_createblueprint',
+            descriptionKey: 'actionDescriptions_createblueprint',
         },
     },
     {
@@ -41,8 +41,8 @@ const permissions = [
         name: 'Delete Document User Permission',
         meta: {
             entityType: 'document',
-            label: 'Delete',
-            description: 'Allow access to delete a document',
+            labelKey: 'actions_delete',
+            descriptionKey: 'actionDescriptions_delete',
         },
     },
     {
@@ -51,8 +51,8 @@ const permissions = [
         name: 'Create Document User Permission',
         meta: {
             entityType: 'document',
-            label: 'Create',
-            description: 'Allow access to create a document',
+            labelKey: 'actions_create',
+            descriptionKey: 'actionDescriptions_create',
         },
     },
     {
@@ -61,8 +61,8 @@ const permissions = [
         name: 'Document Notifications User Permission',
         meta: {
             entityType: 'document',
-            label: 'Notifications',
-            description: 'Allow access to setup notifications for documents',
+            labelKey: 'actions_notify',
+            descriptionKey: 'actionDescriptions_notify',
         },
     },
     {
@@ -71,8 +71,8 @@ const permissions = [
         name: 'Publish Document User Permission',
         meta: {
             entityType: 'document',
-            label: 'Publish',
-            description: 'Allow access to publish a document',
+            labelKey: 'actions_publish',
+            descriptionKey: 'actionDescriptions_publish',
         },
     },
     {
@@ -81,8 +81,8 @@ const permissions = [
         name: 'Document Permissions User Permission',
         meta: {
             entityType: 'document',
-            label: 'Permissions',
-            description: 'Allow access to change permissions for a document',
+            labelKey: 'actions_setPermissions',
+            descriptionKey: 'actionDescriptions_rights',
         },
     },
     {
@@ -91,8 +91,8 @@ const permissions = [
         name: 'Send Document For Approval User Permission',
         meta: {
             entityType: 'document',
-            label: 'Send For Approval',
-            description: 'Allow access to send a document for approval before publishing',
+            labelKey: 'actions_sendtopublish',
+            descriptionKey: 'actionDescriptions_sendtopublish',
         },
     },
     {
@@ -101,8 +101,8 @@ const permissions = [
         name: 'Unpublish Document User Permission',
         meta: {
             entityType: 'document',
-            label: 'Unpublish',
-            description: 'Allow access to unpublish a document',
+            labelKey: 'actions_unpublish',
+            descriptionKey: 'actionDescriptions_unpublish',
         },
     },
     {
@@ -111,8 +111,8 @@ const permissions = [
         name: 'Update Document User Permission',
         meta: {
             entityType: 'document',
-            label: 'Update',
-            description: 'Allow access to save a document',
+            labelKey: 'actions_update',
+            descriptionKey: 'actionDescriptions_update',
         },
     },
     {
@@ -121,8 +121,8 @@ const permissions = [
         name: 'Copy Document User Permission',
         meta: {
             entityType: 'document',
-            label: 'Copy',
-            description: 'Allow access to copy a document',
+            labelKey: 'actions_copy',
+            descriptionKey: 'actionDescriptions_copy',
             group: 'structure',
         },
     },
@@ -132,8 +132,8 @@ const permissions = [
         name: 'Move Document User Permission',
         meta: {
             entityType: 'document',
-            label: 'Move',
-            description: 'Allow access to move a document',
+            labelKey: 'actions_move',
+            descriptionKey: 'actionDescriptions_move',
             group: 'structure',
         },
     },
@@ -143,8 +143,8 @@ const permissions = [
         name: 'Sort Document User Permission',
         meta: {
             entityType: 'document',
-            label: 'Sort',
-            description: 'Allow access to sort documents',
+            labelKey: 'actions_sort',
+            descriptionKey: 'actionDescriptions_sort',
             group: 'structure',
         },
     },
@@ -154,8 +154,8 @@ const permissions = [
         name: 'Document Culture And Hostnames User Permission',
         meta: {
             entityType: 'document',
-            label: 'Culture And Hostnames',
-            description: 'Allow access to set culture and hostnames for documents',
+            labelKey: 'actions_assigndomain',
+            descriptionKey: 'actionDescriptions_assignDomain',
             group: 'administration',
         },
     },
@@ -165,8 +165,8 @@ const permissions = [
         name: 'Document Public Access User Permission',
         meta: {
             entityType: 'document',
-            label: 'Public Access',
-            description: 'Allow access to set and change access restrictions for a document',
+            labelKey: 'actions_protect',
+            descriptionKey: 'actionDescriptions_protect',
             group: 'administration',
         },
     },
@@ -176,8 +176,8 @@ const permissions = [
         name: 'Document Rollback User Permission',
         meta: {
             entityType: 'document',
-            label: 'Rollback',
-            description: 'Allow access to roll back a document to a previous state',
+            labelKey: 'actions_rollback',
+            descriptionKey: 'actionDescriptions_rollback',
             group: 'administration',
         },
     },

package/dist-cms/packages/users/user-groups/workspace/components/user-group-default-permission-list.element.js

@@ -5,10 +5,11 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { UMB_USER_GROUP_WORKSPACE_CONTEXT } from '../user-group-workspace.context.js';
-import { html, customElement, state, ifDefined } from '../../../../../external/lit/index.js';
+import { html, customElement, state, ifDefined, nothing } from '../../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../../shared/lit-element/index.js';
 import { UmbTextStyles } from '../../../../../shared/style/index.js';
 import { umbExtensionsRegistry } from '../../../../core/extension-registry/index.js';
+import { groupBy } from '../../../../../external/lodash/index.js';
 export let UmbUserGroupDefaultPermissionListElement = class UmbUserGroupDefaultPermissionListElement extends UmbLitElement {
     #userGroupWorkspaceContext;
     constructor() {
@@ -33,23 +34,35 @@ export let UmbUserGroupDefaultPermissionListElement = class UmbUserGroupDefaultP
             ? this.#userGroupWorkspaceContext?.addPermission(userPermissionManifest.alias)
             : this.#userGroupWorkspaceContext?.removePermission(userPermissionManifest.alias);
     }
-    #isAllowed(userPermissionManifest) {
-        return this._userGroup?.permissions?.includes(userPermissionManifest.alias);
+    #isAllowed(permissionAlias) {
+        return this._userGroup?.permissions?.includes(permissionAlias);
     }
     render() {
-        return html ` ${this._entityTypes.map((entityType) => this.#renderPermissionsForEntityType(entityType))} `;
+        return html ` ${this._entityTypes.map((entityType) => this.#renderPermissionsByEntityType(entityType))} `;
     }
-    #renderPermissionsForEntityType(entityType) {
-        return html ` <h4><umb-localize .key=${`user_permissionsEntityGroup_${entityType}`}>${entityType}</umb-localize></h4>
-			${this._manifests
-            .filter((manifest) => manifest.meta.entityType === entityType)
-            .map((manifest) => this.#renderPermission(manifest))}`;
+    #renderPermissionsByEntityType(entityType) {
+        const permissionsForEntityType = this._manifests.filter((manifest) => manifest.meta.entityType === entityType);
+        return html `
+			<h4><umb-localize .key=${`user_permissionsEntityGroup_${entityType}`}>${entityType}</umb-localize></h4>
+			${this.#renderGroupedPermissions(permissionsForEntityType)}
+		`;
+    }
+    #renderGroupedPermissions(permissions) {
+        const groupedPermissions = groupBy(permissions, (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}
+					${manifests.map((manifest) => html ` ${this.#renderPermission(manifest)} `)}
+				`)}
+		`;
     }
     #renderPermission(manifest) {
         return html ` <umb-user-permission-setting
-			label=${manifest.meta.label}
-			description=${ifDefined(manifest.meta.description)}
-			?allowed=${this.#isAllowed(manifest)}
+			label=${ifDefined(manifest.meta.labelKey ? this.localize.term(manifest.meta.labelKey) : manifest.meta.label)}
+			description=${ifDefined(manifest.meta.descriptionKey ? this.localize.term(manifest.meta.descriptionKey) : manifest.meta.description)}
+			?allowed=${this.#isAllowed(manifest.alias)}
 			@change=${(event) => this.#onChangeUserPermission(event, manifest)}></umb-user-permission-setting>`;
     }
     static { this.styles = [UmbTextStyles]; }