@umbraco-cms/backoffice 17.1.0 → 17.2.0-rc

package/dist-cms/packages/user/user-group/collection/views/user-group-table-collection-view.element.js

@@ -4,13 +4,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { UMB_USER_GROUP_COLLECTION_CONTEXT } from '../user-group-collection.context-token.js';
 import { UmbTextStyles } from '../../../../core/style/index.js';
 import { html, customElement, state } from '../../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../core/lit-element/index.js';
+import { createExtensionApiByAlias } from '../../../../core/extension-registry/index.js';
+import { UMB_COLLECTION_CONTEXT } from '../../../../core/collection/index.js';
 import '../components/user-group-table-name-column-layout.element.js';
 import '../components/user-group-table-sections-column-layout.element.js';
-import { createExtensionApiByAlias } from '../../../../core/extension-registry/index.js';
 let UmbUserGroupCollectionTableViewElement = class UmbUserGroupCollectionTableViewElement extends UmbLitElement {
     #collectionContext;
     // TODO: hardcoded dependencies on document and media modules. We should figure out how these dependencies can be added through extensions.
@@ -29,6 +29,10 @@ let UmbUserGroupCollectionTableViewElement = class UmbUserGroupCollectionTableVi
                 alias: 'userGroupName',
                 elementName: 'umb-user-group-table-name-column-layout',
             },
+            {
+                name: this.localize.term('general_description'),
+                alias: 'description',
+            },
             {
                 name: this.localize.term('main_sections'),
                 alias: 'userGroupSections',
@@ -52,7 +56,7 @@ let UmbUserGroupCollectionTableViewElement = class UmbUserGroupCollectionTableVi
         this._selection = [];
         this.#documentStartNodeMap = new Map();
         this.#mediaStartNodeMap = new Map();
-        this.consumeContext(UMB_USER_GROUP_COLLECTION_CONTEXT, (instance) => {
+        this.consumeContext(UMB_COLLECTION_CONTEXT, (instance) => {
             this.#collectionContext = instance;
             this.observe(this.#collectionContext?.selection.selection, (selection) => (this._selection = selection?.filter((x) => x !== undefined && x !== null) ?? []), 'umbCollectionSelectionObserver');
             this.observe(this.#collectionContext?.items, async (items) => {
@@ -90,6 +94,10 @@ let UmbUserGroupCollectionTableViewElement = class UmbUserGroupCollectionTableVi
                             name: userGroup.name,
                         },
                     },
+                    {
+                        columnAlias: 'description',
+                        value: userGroup.description ?? '',
+                    },
                     {
                         columnAlias: 'userGroupSections',
                         value: userGroup.sections,

package/dist-cms/packages/user/user-group/components/user-group-ref/user-group-ref.element.d.ts

@@ -13,6 +13,7 @@ export declare class UmbUserGroupRefElement extends UmbUserGroupRefElement_base
     mediaRootAccess: boolean;
     get mediaStartNode(): string | null | undefined;
     set mediaStartNode(value: string | null | undefined);
+    description: string | null;
     get sections(): Array<string>;
     set sections(value: Array<string>);
     get userPermissionAliases(): Array<string>;

package/dist-cms/packages/user/user-group/components/user-group-ref/user-group-ref.element.js

@@ -18,6 +18,7 @@ let UmbUserGroupRefElement = class UmbUserGroupRefElement extends UmbElementMixi
         super(...arguments);
         this.documentRootAccess = false;
         this.mediaRootAccess = false;
+        this.description = null;
         this._documentLabel = '';
         this._mediaLabel = '';
         this._sectionLabels = [];
@@ -107,18 +108,13 @@ let UmbUserGroupRefElement = class UmbUserGroupRefElement extends UmbElementMixi
 		`;
     }
     #renderDetails() {
-        const hasSections = this._sectionLabels.length;
-        const hasDocument = !!this._documentLabel || this.documentRootAccess;
-        const hasMedia = !!this._mediaLabel || this.mediaRootAccess;
-        const hasUserPermissions = this._userPermissionLabels.length;
-        if (!hasSections && !hasDocument && !hasMedia && !hasUserPermissions)
-            return;
-        return html `
-			<div id="details">
-				${this.#renderSections()} ${this.#renderDocumentStartNode()} ${this.#renderMediaStartNode()}
-				${this.#renderUserPermissions()}
-			</div>
-		`;
+        const content = this.description
+            ? html `<small>${this.description}</small>`
+            : html `
+					${this.#renderSections()} ${this.#renderDocumentStartNode()} ${this.#renderMediaStartNode()}
+					${this.#renderUserPermissions()}
+				`;
+        return html `<div id="details">${content}</div>`;
     }
     #renderSections() {
         if (!this._sectionLabels.length)
@@ -194,6 +190,9 @@ __decorate([
 __decorate([
     property()
 ], UmbUserGroupRefElement.prototype, "mediaStartNode", null);
+__decorate([
+    property({ type: String })
+], UmbUserGroupRefElement.prototype, "description", void 0);
 __decorate([
     property({ type: Array })
 ], UmbUserGroupRefElement.prototype, "sections", null);

package/dist-cms/packages/user/user-group/manifests.js

@@ -6,6 +6,7 @@ import { manifests as modalManifests } from './modals/manifests.js';
 import { manifests as repositoryManifests } from './repository/manifests.js';
 import { manifests as sectionViewManifests } from './workspace/user-group-root/manifests.js';
 import { manifests as workspaceManifests } from './workspace/manifests.js';
+import * as entryPointModule from './entry-point.js';
 export const manifests = [
     ...collectionManifests,
     ...entityActionManifests,
@@ -19,6 +20,6 @@ export const manifests = [
         name: 'User Group Backoffice Entry Point',
         alias: 'Umb.EntryPoint.UserGroup',
         type: 'backofficeEntryPoint',
-        js: () => import('./entry-point.js'),
+        js: entryPointModule,
     },
 ];

package/dist-cms/packages/user/user-group/modals/user-group-picker/user-group-picker-modal.element.js

@@ -89,6 +89,7 @@ let UmbUserGroupPickerModalElement = class UmbUserGroupPickerModalElement extend
 								?mediaRootAccess=${userGroup.mediaRootAccess}
 								.mediaStartNode=${!userGroup.mediaRootAccess ? userGroup.mediaStartNode?.unique : null}
 								.sections=${userGroup.sections}
+								.description=${userGroup.description}
 								@selected=${(event) => this.#onSelected(event, userGroup)}
 								@deselected=${(event) => this.#onDeselected(event, userGroup)}>
 								${when(userGroup.icon, () => html `<umb-icon name=${userGroup.icon} slot="icon"></umb-icon>`)}

package/dist-cms/packages/user/user-group/repository/detail/manifests.js

@@ -1,4 +1,5 @@
 import { UMB_USER_GROUP_DETAIL_REPOSITORY_ALIAS, UMB_USER_GROUP_DETAIL_STORE_ALIAS } from './constants.js';
+import { UmbUserGroupDetailStore } from './user-group-detail.store.js';
 export const manifests = [
     {
         type: 'repository',
@@ -10,6 +11,6 @@ export const manifests = [
         type: 'store',
         alias: UMB_USER_GROUP_DETAIL_STORE_ALIAS,
         name: 'User Group Detail Store',
-        api: () => import('./user-group-detail.store.js'),
+        api: UmbUserGroupDetailStore,
     },
 ];

package/dist-cms/packages/user/user-group/repository/detail/user-group-detail.server.data-source.js

@@ -35,6 +35,7 @@ export class UmbUserGroupServerDataSource extends UmbControllerBase {
             permissions: [],
             sections: [],
             unique: UmbId.new(),
+            description: '',
         };
         return { data };
     }
@@ -82,6 +83,7 @@ export class UmbUserGroupServerDataSource extends UmbControllerBase {
             permissions,
             sections: data.sections,
             unique: data.id,
+            description: data.description ?? null,
         };
         return { data: userGroup };
     }
@@ -116,6 +118,7 @@ export class UmbUserGroupServerDataSource extends UmbControllerBase {
             name: model.name,
             permissions,
             sections: model.sections,
+            description: model.description,
         };
         const { data, error } = await tryExecute(this, UserGroupService.postUserGroup({
             body,
@@ -157,6 +160,7 @@ export class UmbUserGroupServerDataSource extends UmbControllerBase {
             name: model.name,
             permissions,
             sections: model.sections,
+            description: model.description,
         };
         const { error } = await tryExecute(this, UserGroupService.putUserGroupById({
             path: { id: model.unique },

package/dist-cms/packages/user/user-group/repository/item/manifests.js

@@ -1,4 +1,5 @@
 import { UMB_USER_GROUP_ITEM_REPOSITORY_ALIAS, UMB_USER_GROUP_STORE_ALIAS } from './constants.js';
+import { UmbUserGroupItemStore } from './user-group-item.store.js';
 export const manifests = [
     {
         type: 'repository',
@@ -10,6 +11,6 @@ export const manifests = [
         type: 'itemStore',
         alias: UMB_USER_GROUP_STORE_ALIAS,
         name: 'User Group Item Store',
-        api: () => import('./user-group-item.store.js'),
+        api: UmbUserGroupItemStore,
     },
 ];

package/dist-cms/packages/user/user-group/types.d.ts

@@ -21,4 +21,5 @@ export interface UmbUserGroupDetailModel {
     permissions: Array<any>;
     sections: Array<string>;
     unique: string;
+    description: string | null;
 }

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

@@ -6,6 +6,7 @@ export declare class UmbUserGroupWorkspaceEditorElement extends UmbLitElement {
     private _alias?;
     private _aliasCanBeChanged?;
     private _icon?;
+    private _description?;
     constructor();
     render(): import("lit-html").TemplateResult<1>;
     static styles: import("lit").CSSResult[];

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

@@ -22,12 +22,17 @@ let UmbUserGroupWorkspaceEditorElement = class UmbUserGroupWorkspaceEditorElemen
             this.#observeUserGroup();
         });
     }
+    #onDescriptionChange(event) {
+        const value = event.target.value.toString();
+        this.#workspaceContext?.setDescription(value);
+    }
     #observeUserGroup() {
         this.observe(this.#workspaceContext?.isNew, (value) => (this._isNew = value), '_observeIsNew');
         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?.description, (value) => (this._description = value || ''), '_observeDescription');
     }
     #onNameAndAliasChange(event) {
         this.#workspaceContext?.updateProperty('name', event.target.value ?? '');
@@ -64,16 +69,25 @@ let UmbUserGroupWorkspaceEditorElement = class UmbUserGroupWorkspaceEditorElemen
 					<umb-icon name=${this._icon || ''}></umb-icon>
 				</uui-button>
 
-				<umb-input-with-alias
-					id="name"
-					label=${this.localize.term('placeholders_entername')}
-					.value=${this._name}
-					alias=${ifDefined(this._alias)}
-					?auto-generate-alias=${this._isNew}
-					?alias-readonly=${this._aliasCanBeChanged === false}
-					@change=${this.#onNameAndAliasChange}
-					${umbFocus()}>
-				</umb-input-with-alias>
+				<div id="editors">
+					<umb-input-with-alias
+						id="name"
+						label=${this.localize.term('placeholders_entername')}
+						.value=${this._name}
+						alias=${ifDefined(this._alias)}
+						?auto-generate-alias=${this._isNew}
+						?alias-readonly=${this._aliasCanBeChanged === false}
+						@change=${this.#onNameAndAliasChange}
+						${umbFocus()}>
+					</umb-input-with-alias>
+
+					<uui-input
+						id="description"
+						.label=${this.localize.term('placeholders_enterDescription')}
+						.value=${this._description}
+						.placeholder=${this.localize.term('placeholders_enterDescription')}
+						@input=${this.#onDescriptionChange}></uui-input>
+				</div>
 			</div>
 		`;
     }
@@ -94,9 +108,11 @@ let UmbUserGroupWorkspaceEditorElement = class UmbUserGroupWorkspaceEditorElemen
 			}
 
 			#icon {
-				font-size: var(--uui-size-5);
-				height: 30px;
-				width: 30px;
+				font-size: var(--uui-size-8);
+				height: 60px;
+				width: 60px;
+				--uui-button-border-color: transparent;
+				--uui-button-border-color-hover: var(--uui-color-border);
 			}
 
 			#name {
@@ -104,6 +120,21 @@ let UmbUserGroupWorkspaceEditorElement = class UmbUserGroupWorkspaceEditorElemen
 				flex: 1 1 auto;
 				align-items: center;
 			}
+
+			#editors {
+				width: 100%;
+				display: flex;
+				flex: 1 1 auto;
+				flex-direction: column;
+				gap: 1px;
+			}
+
+			#description {
+				width: 100%;
+				margin-top: -1px;
+				--uui-input-height: var(--uui-size-8);
+				--uui-input-border-color: transparent;
+			}
 		`,
     ]; }
 };
@@ -122,6 +153,9 @@ __decorate([
 __decorate([
     state()
 ], UmbUserGroupWorkspaceEditorElement.prototype, "_icon", void 0);
+__decorate([
+    state()
+], UmbUserGroupWorkspaceEditorElement.prototype, "_description", void 0);
 UmbUserGroupWorkspaceEditorElement = __decorate([
     customElement('umb-user-group-workspace-editor')
 ], UmbUserGroupWorkspaceEditorElement);

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

@@ -21,6 +21,7 @@ export declare class UmbUserGroupWorkspaceContext extends UmbEntityNamedDetailWo
     readonly mediaRootAccess: import("rxjs").Observable<boolean>;
     readonly fallbackPermissions: import("rxjs").Observable<string[]>;
     readonly permissions: import("rxjs").Observable<any[]>;
+    readonly description: import("rxjs").Observable<string>;
     constructor(host: UmbControllerHost);
     updateProperty<Alias extends keyof UmbUserGroupDetailModel>(alias: Alias, value: UmbUserGroupDetailModel[Alias]): void;
     /**
@@ -45,5 +46,11 @@ export declare class UmbUserGroupWorkspaceContext extends UmbEntityNamedDetailWo
      * @memberof UmbUserGroupWorkspaceContext
      */
     setFallbackPermissions(fallbackPermissions: Array<string>): void;
+    /**
+     * Sets the description
+     * @param {string} description - The description
+     * @memberof UmbUserGroupWorkspaceContext
+     */
+    setDescription(description: string): void;
 }
 export { UmbUserGroupWorkspaceContext as api };

package/dist-cms/packages/user/user-group/workspace/user-group/user-group-workspace.context.js

@@ -22,6 +22,7 @@ export class UmbUserGroupWorkspaceContext extends UmbEntityNamedDetailWorkspaceC
         this.mediaRootAccess = this._data.createObservablePartOfCurrent((data) => data?.mediaRootAccess || false);
         this.fallbackPermissions = this._data.createObservablePartOfCurrent((data) => data?.fallbackPermissions || []);
         this.permissions = this._data.createObservablePartOfCurrent((data) => data?.permissions || []);
+        this.description = this._data.createObservablePartOfCurrent((data) => data?.description || '');
         this.routes.setRoutes([
             {
                 path: 'create',
@@ -74,5 +75,13 @@ export class UmbUserGroupWorkspaceContext extends UmbEntityNamedDetailWorkspaceC
     setFallbackPermissions(fallbackPermissions) {
         this._data.updateCurrent({ fallbackPermissions });
     }
+    /**
+     * Sets the description
+     * @param {string} description - The description
+     * @memberof UmbUserGroupWorkspaceContext
+     */
+    setDescription(description) {
+        this._data.updateCurrent({ description });
+    }
 }
 export { UmbUserGroupWorkspaceContext as api };

package/dist-cms/packages/user/user-permission/fallback-permission-condition/manifests.js

@@ -1,9 +1,10 @@
 import { UMB_FALLBACK_USER_PERMISSION_CONDITION_ALIAS } from './constants.js';
+import { UmbFallbackUserPermissionCondition } from './fallback-user-permission.condition.js';
 export const manifests = [
     {
         type: 'condition',
         name: 'User Fallback Permission Condition',
         alias: UMB_FALLBACK_USER_PERMISSION_CONDITION_ALIAS,
-        api: () => import('./fallback-user-permission.condition.js'),
+        api: UmbFallbackUserPermissionCondition,
     },
 ];

package/dist-cms/packages/webhook/manifests.js

@@ -2,6 +2,7 @@ import { manifests as webhookDeliveryManifests } from './webhook-delivery/manife
 import { manifests as webhookEventManifests } from './webhook-event/manifests.js';
 import { manifests as webhookManifests } from './webhook/manifests.js';
 import { manifests as webhookRootManifests } from './webhook-root/manifests.js';
+import * as entryPointModule from './entry-point.js';
 export const manifests = [
     ...webhookDeliveryManifests,
     ...webhookEventManifests,
@@ -11,6 +12,6 @@ export const manifests = [
         name: 'Webhook Backoffice Entry Point',
         alias: 'Umb.EntryPoint.Webhook',
         type: 'backofficeEntryPoint',
-        js: () => import('./entry-point.js'),
+        js: entryPointModule,
     },
 ];

package/dist-cms/packages/webhook/webhook/repository/detail/manifests.js

@@ -1,3 +1,4 @@
+import { UmbWebhookDetailStore } from './webhook-detail.store.js';
 export const UMB_WEBHOOK_DETAIL_REPOSITORY_ALIAS = 'Umb.Repository.Webhook.Detail';
 export const UMB_WEBHOOK_DETAIL_STORE_ALIAS = 'Umb.Store.Webhook.Detail';
 export const manifests = [
@@ -11,6 +12,6 @@ export const manifests = [
         type: 'store',
         alias: UMB_WEBHOOK_DETAIL_STORE_ALIAS,
         name: 'Webhook Detail Store',
-        api: () => import('./webhook-detail.store.js'),
+        api: UmbWebhookDetailStore,
     },
 ];

package/dist-cms/packages/webhook/webhook/repository/item/manifests.js

@@ -1,3 +1,4 @@
+import { UmbWebhookItemStore } from './webhook-item.store.js';
 export const UMB_WEBHOOK_ITEM_REPOSITORY_ALIAS = 'Umb.Repository.WebhookItem';
 export const UMB_WEBHOOK_STORE_ALIAS = 'Umb.Store.WebhookItem';
 export const manifests = [
@@ -11,6 +12,6 @@ export const manifests = [
         type: 'itemStore',
         alias: UMB_WEBHOOK_STORE_ALIAS,
         name: 'Webhook Item Store',
-        api: () => import('./webhook-item.store.js'),
+        api: UmbWebhookItemStore,
     },
 ];

package/dist-cms/packages/webhook/webhook-event/repository/manifests.js

@@ -1,3 +1,4 @@
+import { UmbWebhookEventStore } from './webhook-event.store.js';
 export const UMB_WEBHOOK_EVENT_REPOSITORY_ALIAS = 'Umb.Repository.Webhook.Event';
 export const UMB_WEBHOOK_EVENT_STORE_ALIAS = 'Umb.Store.Webhook.Event';
 export const manifests = [
@@ -11,6 +12,6 @@ export const manifests = [
         type: 'store',
         alias: UMB_WEBHOOK_EVENT_STORE_ALIAS,
         name: 'Webhook Event Store',
-        api: () => import('./webhook-event.store.js'),
+        api: UmbWebhookEventStore,
     },
 ];