@umbraco-cms/backoffice 17.1.0 → 17.2.0-rc

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

@@ -4,22 +4,16 @@ 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_COLLECTION_CONTEXT } from '../../user-collection.context-token.js';
 import { UmbUserKind } from '../../../utils/index.js';
 import { css, html, customElement, state } from '../../../../../../external/lit/index.js';
 import { UmbTextStyles } from '../../../../../core/style/index.js';
-import { UmbLitElement } from '../../../../../core/lit-element/index.js';
 import { UmbUserGroupItemRepository } from '../../../../user-group/index.js';
+import { UmbCollectionViewElementBase } from '../../../../../core/collection/index.js';
 import './column-layouts/name/user-table-name-column-layout.element.js';
 import './column-layouts/status/user-table-status-column-layout.element.js';
-let UmbUserTableCollectionViewElement = class UmbUserTableCollectionViewElement extends UmbLitElement {
-    #userGroupItemRepository;
-    #collectionContext;
+let UmbUserTableCollectionViewElement = class UmbUserTableCollectionViewElement extends UmbCollectionViewElementBase {
     constructor() {
-        super();
-        this._tableConfig = {
-            allowSelection: true,
-        };
+        super(...arguments);
         this._tableColumns = [
             {
                 name: 'Name',
@@ -48,24 +42,20 @@ let UmbUserTableCollectionViewElement = class UmbUserTableCollectionViewElement
         this._tableItems = [];
         this._userGroupItems = [];
         this.#userGroupItemRepository = new UmbUserGroupItemRepository(this);
-        this._users = [];
-        this._selection = [];
-        this._itemHrefs = new Map();
-        this.consumeContext(UMB_USER_COLLECTION_CONTEXT, (instance) => {
-            this.#collectionContext = instance;
-            this.observe(this.#collectionContext?.selection.selection, (selection) => (this._selection = selection ?? []), 'umbCollectionSelectionObserver');
-            this.observe(this.#collectionContext?.items, async (items) => {
-                this._users = items ?? [];
-                await this.#updateItemHrefs();
-                this.#observeUserGroups();
-            }, 'umbCollectionItemsObserver');
-        });
+        this._items = [];
+    }
+    #userGroupItemRepository;
+    updated(changedProperties) {
+        if (changedProperties.has('_items')) {
+            this.#createTableItems();
+            this.#observeUserGroups();
+        }
     }
     async #observeUserGroups() {
-        if (this._users.length === 0)
+        if (this._items.length === 0)
             return;
         const userGroupsUniques = [
-            ...new Set(this._users.flatMap((user) => user.userGroupUniques.map((reference) => reference.unique))),
+            ...new Set(this._items.flatMap((user) => user.userGroupUniques.map((reference) => reference.unique))),
         ];
         const { asObservable } = await this.#userGroupItemRepository.requestItems(userGroupsUniques);
         this.observe(asObservable?.(), (userGroups) => {
@@ -80,21 +70,12 @@ let UmbUserTableCollectionViewElement = class UmbUserTableCollectionViewElement
         })
             .join(', ');
     }
-    async #updateItemHrefs() {
-        const hrefs = new Map();
-        for (const user of this._users) {
-            const href = await this.#collectionContext?.requestItemHref?.(user);
-            if (href && user.unique) {
-                hrefs.set(user.unique, href);
-            }
-        }
-        this._itemHrefs = hrefs;
-    }
     #createTableItems() {
-        this._tableItems = this._users.map((user) => {
+        this._tableItems = this._items.map((user) => {
             return {
                 id: user.unique,
                 icon: user.kind === UmbUserKind.API ? 'icon-unplug' : 'icon-user',
+                selectable: this._isSelectableItem(user),
                 data: [
                     {
                         columnAlias: 'userName',
@@ -135,15 +116,27 @@ let UmbUserTableCollectionViewElement = class UmbUserTableCollectionViewElement
     }
     #onSelected(event) {
         event.stopPropagation();
-        const table = event.target;
-        const selection = table.selection;
-        this.#collectionContext?.selection.setSelection(selection);
+        const itemId = event.getItemId();
+        // We get the same event for both single and multiple selection.
+        if (itemId) {
+            this._selectItem(itemId);
+        }
+        else {
+            const target = event.target;
+            this._setSelection(target.selection);
+        }
     }
     #onDeselected(event) {
         event.stopPropagation();
-        const table = event.target;
-        const selection = table.selection;
-        this.#collectionContext?.selection.setSelection(selection);
+        const itemId = event.getItemId();
+        // We get the same event for both single and multiple deselection.
+        if (itemId) {
+            this._deselectItem(itemId);
+        }
+        else {
+            const target = event.target;
+            this._setSelection(target.selection);
+        }
     }
     #onOrdering(event) {
         const table = event.target;
@@ -154,7 +147,11 @@ let UmbUserTableCollectionViewElement = class UmbUserTableCollectionViewElement
     render() {
         return html `
 			<umb-table
-				.config=${this._tableConfig}
+				.config=${{
+            allowSelection: this._selectable,
+            allowSelectAll: this._multiple,
+            selectOnly: this._selectOnly,
+        }}
 				.columns=${this._tableColumns}
 				.items=${this._tableItems}
 				.selection=${this._selection}
@@ -173,9 +170,6 @@ let UmbUserTableCollectionViewElement = class UmbUserTableCollectionViewElement
 		`,
     ]; }
 };
-__decorate([
-    state()
-], UmbUserTableCollectionViewElement.prototype, "_tableConfig", void 0);
 __decorate([
     state()
 ], UmbUserTableCollectionViewElement.prototype, "_tableColumns", void 0);
@@ -187,13 +181,7 @@ __decorate([
 ], UmbUserTableCollectionViewElement.prototype, "_userGroupItems", void 0);
 __decorate([
     state()
-], UmbUserTableCollectionViewElement.prototype, "_users", void 0);
-__decorate([
-    state()
-], UmbUserTableCollectionViewElement.prototype, "_selection", void 0);
-__decorate([
-    state()
-], UmbUserTableCollectionViewElement.prototype, "_itemHrefs", void 0);
+], UmbUserTableCollectionViewElement.prototype, "_items", void 0);
 UmbUserTableCollectionViewElement = __decorate([
     customElement('umb-user-table-collection-view')
 ], UmbUserTableCollectionViewElement);

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

@@ -1,7 +1,6 @@
 import type { UmbUserKindType } from '../../utils/index.js';
 import type { UUIAvatarElement } from '../../../../../external/uui/index.js';
 import { UmbLitElement } from '../../../../core/lit-element/index.js';
-declare const elementName = "umb-user-avatar";
 export declare class UmbUserAvatarElement extends UmbLitElement {
     #private;
     name?: string;
@@ -18,7 +17,6 @@ export declare class UmbUserAvatarElement extends UmbLitElement {
 }
 declare global {
     interface HTMLElementTagNameMap {
-        [elementName]: UmbUserAvatarElement;
+        'umb-user-avatar': UmbUserAvatarElement;
     }
 }
-export {};

package/dist-cms/packages/user/user/components/user-avatar/user-avatar.element.js

@@ -7,7 +7,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { UmbUserKind } from '../../utils/index.js';
 import { css, html, customElement, property, ifDefined, state, classMap, query, } from '../../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../core/lit-element/index.js';
-const elementName = 'umb-user-avatar';
 let UmbUserAvatarElement = class UmbUserAvatarElement extends UmbLitElement {
     constructor() {
         super(...arguments);
@@ -29,6 +28,7 @@ let UmbUserAvatarElement = class UmbUserAvatarElement extends UmbLitElement {
     #setImgSrcSizes() {
         if (this.#imgUrls.length === 0) {
             this._imgSrcSizes = [];
+            this._imgSrc = '';
             return;
         }
         this._imgSrcSizes = [
@@ -126,6 +126,6 @@ __decorate([
     query('uui-avatar')
 ], UmbUserAvatarElement.prototype, "avatarElement", void 0);
 UmbUserAvatarElement = __decorate([
-    customElement(elementName)
+    customElement('umb-user-avatar')
 ], UmbUserAvatarElement);
 export { UmbUserAvatarElement };

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

@@ -51,6 +51,7 @@ export declare class UmbUserInputElement extends UmbUserInputElement_base {
     get value(): string | undefined;
     private _items?;
     private _statuses?;
+    private _modalRoute?;
     constructor();
     protected getFormElement(): undefined;
     render(): import("lit-html").TemplateResult<1>;

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

@@ -5,7 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { UmbUserPickerInputContext } from './user-input.context.js';
-import { css, customElement, html, nothing, property, repeat, state } from '../../../../../external/lit/index.js';
+import { css, customElement, html, ifDefined, nothing, property, repeat, state, } from '../../../../../external/lit/index.js';
 import { splitStringToArray } from '../../../../core/utils/index.js';
 import { UmbChangeEvent } from '../../../../core/event/index.js';
 import { UmbLitElement } from '../../../../core/lit-element/index.js';
@@ -94,16 +94,16 @@ let UmbUserInputElement = class UmbUserInputElement extends UmbFormControlMixin(
         this.addValidator('valueMissing', () => this.requiredMessage ?? UMB_VALIDATION_EMPTY_LOCALIZATION_KEY, () => !this.readonly && !!this.required && (this.value === undefined || this.value === null || this.value === ''));
         this.addValidator('rangeUnderflow', () => this.minMessage, () => !!this.min && this.#pickerContext.getSelection().length < this.min);
         this.addValidator('rangeOverflow', () => this.maxMessage, () => !!this.max && this.#pickerContext.getSelection().length > this.max);
-        this.observe(this.#pickerContext.selection, (selection) => (this.value = selection.join(',')), '_observeSelection');
-        this.observe(this.#pickerContext.selectedItems, (selectedItems) => (this._items = selectedItems), '_observerItems');
-        this.observe(this.#pickerContext.statuses, (statuses) => (this._statuses = statuses), '_observeStatuses');
+        this.observe(this.#pickerContext.selection, (selection) => (this.value = selection.join(',')), null);
+        this.observe(this.#pickerContext.selectedItems, (selectedItems) => (this._items = selectedItems), null);
+        this.observe(this.#pickerContext.statuses, (statuses) => (this._statuses = statuses), null);
+        this.observe(this.#pickerContext.modalRoute, (modalRoute) => {
+            this._modalRoute = modalRoute;
+        }, null);
     }
     getFormElement() {
         return undefined;
     }
-    #openPicker() {
-        this.#pickerContext.openPicker({});
-    }
     #removeItem(unique) {
         this.#pickerContext.requestRemoveItem(unique);
     }
@@ -117,8 +117,8 @@ let UmbUserInputElement = class UmbUserInputElement extends UmbFormControlMixin(
 			<uui-button
 				id="btn-add"
 				look="placeholder"
+				href=${ifDefined(this._modalRoute)}
 				label=${this.localize.term('general_choose')}
-				@click=${this.#openPicker}
 				?disabled=${this.readonly}></uui-button>
 		`;
     }
@@ -193,6 +193,9 @@ __decorate([
 __decorate([
     state()
 ], UmbUserInputElement.prototype, "_statuses", void 0);
+__decorate([
+    state()
+], UmbUserInputElement.prototype, "_modalRoute", void 0);
 UmbUserInputElement = __decorate([
     customElement('umb-user-input')
 ], UmbUserInputElement);

package/dist-cms/packages/user/user/invite/collection-action/manifests.js

@@ -1,4 +1,5 @@
 import { UMB_COLLECTION_ALIAS_CONDITION } from '../../../../core/collection/index.js';
+import { UMB_IN_MODAL_CONDITION_ALIAS } from '../../../../core/modal/index.js';
 export const manifests = [
     {
         type: 'collectionAction',
@@ -16,6 +17,10 @@ export const manifests = [
                 alias: UMB_COLLECTION_ALIAS_CONDITION,
                 match: 'Umb.Collection.User',
             },
+            {
+                alias: UMB_IN_MODAL_CONDITION_ALIAS,
+                match: false,
+            },
         ],
     },
 ];

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

@@ -10,6 +10,7 @@ import { manifests as modalManifests } from './modals/manifests.js';
 import { manifests as propertyEditorManifests } from './property-editor/manifests.js';
 import { manifests as repositoryManifests } from './repository/manifests.js';
 import { manifests as workspaceManifests } from './workspace/manifests.js';
+import * as entryPointModule from './entry-point.js';
 export const manifests = [
     ...clientCredentialManifests,
     ...collectionManifests,
@@ -27,6 +28,6 @@ export const manifests = [
         name: 'User Backoffice Entry Point',
         alias: 'Umb.EntryPoint.User',
         type: 'backofficeEntryPoint',
-        js: () => import('./entry-point.js'),
+        js: entryPointModule,
     },
 ];

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

@@ -1,4 +1,4 @@
-import { UMB_USER_COLLECTION_MENU_ALIAS } from '../../collection/constants.js';
+import { UMB_USER_COLLECTION_ALIAS } from '../../collection/constants.js';
 import { UmbModalToken } from '../../../../core/modal/index.js';
 export const UMB_USER_PICKER_MODAL = new UmbModalToken(
 /* TODO: use constant. We had to use the string directly here to avoid a circular dependency.
@@ -6,11 +6,11 @@ export const UMB_USER_PICKER_MODAL = new UmbModalToken(
 'Umb.Modal.CollectionItemPicker', {
     modal: {
         type: 'sidebar',
-        size: 'small',
+        size: 'medium',
     },
     data: {
         collection: {
-            menuAlias: UMB_USER_COLLECTION_MENU_ALIAS,
+            alias: UMB_USER_COLLECTION_ALIAS,
         },
     },
 });

package/dist-cms/packages/user/user/repository/config/manifests.js

@@ -1,10 +1,11 @@
 import { UMB_USER_CONFIG_REPOSITORY_ALIAS, UMB_USER_CONFIG_STORE_ALIAS } from './constants.js';
+import { UmbUserConfigStore } from './user-config.store.js';
 export const manifests = [
     {
         type: 'store',
         alias: UMB_USER_CONFIG_STORE_ALIAS,
         name: 'User Config Store',
-        api: () => import('./user-config.store.js'),
+        api: UmbUserConfigStore,
     },
     {
         type: 'repository',

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

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

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

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

package/dist-cms/packages/user/user/workspace/user/components/user-workspace-assign-access/user-workspace-assign-access.element.js

@@ -53,6 +53,8 @@ let UmbUserWorkspaceAssignAccessElement = class UmbUserWorkspaceAssignAccessElem
         });
         // TODO make contexts method
         this.#workspaceContext?.updateProperty('documentStartNodeUniques', selection);
+        // When specific start nodes are selected, disable root access
+        this.#workspaceContext?.updateProperty('hasDocumentRootAccess', false);
     }
     #onAllowAllMediaChange(event) {
         event.stopPropagation();
@@ -71,6 +73,8 @@ let UmbUserWorkspaceAssignAccessElement = class UmbUserWorkspaceAssignAccessElem
         });
         // TODO make contexts method
         this.#workspaceContext?.updateProperty('mediaStartNodeUniques', selection);
+        // When specific start nodes are selected, disable root access
+        this.#workspaceContext?.updateProperty('hasMediaRootAccess', false);
     }
     render() {
         return html `

package/dist-cms/packages/user/user/workspace/user/components/user-workspace-avatar/user-workspace-avatar.element.d.ts

@@ -1,6 +1,6 @@
 import { nothing } from '../../../../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../../../core/lit-element/index.js';
-export declare class UmbUserAvatarElement extends UmbLitElement {
+export declare class UmbUserWorkspaceAvatarElement extends UmbLitElement {
     #private;
     private _user?;
     private _allowedFileTypes;
@@ -11,9 +11,9 @@ export declare class UmbUserAvatarElement extends UmbLitElement {
     render(): typeof nothing | import("lit-html").TemplateResult<1>;
     static styles: import("lit").CSSResult[];
 }
-export default UmbUserAvatarElement;
+export default UmbUserWorkspaceAvatarElement;
 declare global {
     interface HTMLElementTagNameMap {
-        'umb-user-workspace-avatar': UmbUserAvatarElement;
+        'umb-user-workspace-avatar': UmbUserWorkspaceAvatarElement;
     }
 }

package/dist-cms/packages/user/user/workspace/user/components/user-workspace-avatar/user-workspace-avatar.element.js

@@ -8,7 +8,7 @@ import { UMB_USER_WORKSPACE_CONTEXT } from '../../user-workspace.context-token.j
 import { css, html, customElement, query, nothing, state } from '../../../../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../../../core/lit-element/index.js';
 import { UmbTemporaryFileConfigRepository } from '../../../../../../core/temporary-file/index.js';
-let UmbUserAvatarElement = class UmbUserAvatarElement extends UmbLitElement {
+let UmbUserWorkspaceAvatarElement = class UmbUserWorkspaceAvatarElement extends UmbLitElement {
     #userWorkspaceContext;
     #temporaryFileConfigRepository;
     constructor() {
@@ -32,7 +32,7 @@ let UmbUserAvatarElement = class UmbUserAvatarElement extends UmbLitElement {
         this.#deleteAvatar = async () => {
             if (!this.#userWorkspaceContext)
                 return;
-            this.#userWorkspaceContext.deleteAvatar();
+            await this.#userWorkspaceContext.deleteAvatar();
         };
         this.consumeContext(UMB_USER_WORKSPACE_CONTEXT, (instance) => {
             this.#userWorkspaceContext = instance;
@@ -64,6 +64,9 @@ let UmbUserAvatarElement = class UmbUserAvatarElement extends UmbLitElement {
                 reject("Can't find avatar file field");
                 return;
             }
+            // Reset value to allow selecting the same file again
+            this._avatarFileField.value = '';
+            // Use { once: true } to auto-remove listener after first trigger
             this._avatarFileField.addEventListener('change', (event) => {
                 const target = event?.target;
                 const file = target.files?.[0];
@@ -72,7 +75,7 @@ let UmbUserAvatarElement = class UmbUserAvatarElement extends UmbLitElement {
                     return;
                 }
                 resolve(file);
-            });
+            }, { once: true });
             this._avatarFileField.click();
         });
     }
@@ -129,18 +132,18 @@ let UmbUserAvatarElement = class UmbUserAvatarElement extends UmbLitElement {
 };
 __decorate([
     state()
-], UmbUserAvatarElement.prototype, "_user", void 0);
+], UmbUserWorkspaceAvatarElement.prototype, "_user", void 0);
 __decorate([
     state()
-], UmbUserAvatarElement.prototype, "_allowedFileTypes", void 0);
+], UmbUserWorkspaceAvatarElement.prototype, "_allowedFileTypes", void 0);
 __decorate([
     query('#AvatarFileField')
-], UmbUserAvatarElement.prototype, "_avatarFileField", void 0);
+], UmbUserWorkspaceAvatarElement.prototype, "_avatarFileField", void 0);
 __decorate([
     query('uui-combobox')
-], UmbUserAvatarElement.prototype, "_selectElement", void 0);
-UmbUserAvatarElement = __decorate([
+], UmbUserWorkspaceAvatarElement.prototype, "_selectElement", void 0);
+UmbUserWorkspaceAvatarElement = __decorate([
     customElement('umb-user-workspace-avatar')
-], UmbUserAvatarElement);
-export { UmbUserAvatarElement };
-export default UmbUserAvatarElement;
+], UmbUserWorkspaceAvatarElement);
+export { UmbUserWorkspaceAvatarElement };
+export default UmbUserWorkspaceAvatarElement;

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

@@ -27,9 +27,7 @@ export declare class UmbUserWorkspaceContext extends UmbEntityNamedDetailWorkspa
     uploadAvatar(file: File): Promise<{
         error: Error | import("../../../../core/resources/index.js").UmbApiError | import("../../../../core/resources/index.js").UmbCancelError | import("../../../../core/resources/index.js").UmbError | undefined;
     }>;
-    deleteAvatar(): Promise<{
-        error: Error | import("../../../../core/resources/index.js").UmbApiError | import("../../../../core/resources/index.js").UmbCancelError | import("../../../../core/resources/index.js").UmbError | undefined;
-    }>;
+    deleteAvatar(): Promise<void>;
     destroy(): void;
 }
 export { UmbUserWorkspaceContext as api };

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

@@ -75,11 +75,11 @@ export class UmbUserWorkspaceContext extends UmbEntityNamedDetailWorkspaceContex
             throw new Error('Id is missing');
         return this.avatarRepository.uploadAvatar(unique, file);
     }
-    deleteAvatar() {
+    async deleteAvatar() {
         const unique = this.getUnique();
         if (!unique)
             throw new Error('Id is missing');
-        return this.avatarRepository.deleteAvatar(unique);
+        await this.avatarRepository.deleteAvatar(unique);
     }
     destroy() {
         this.avatarRepository.destroy();

package/dist-cms/packages/user/user-group/collection/filter/manifests.d.ts

@@ -0,0 +1 @@
+export declare const manifests: Array<UmbExtensionManifest>;

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

@@ -0,0 +1,16 @@
+import { UMB_USER_GROUP_COLLECTION_ALIAS } from '../constants.js';
+import { UMB_COLLECTION_ALIAS_CONDITION } from '../../../../core/collection/index.js';
+export const manifests = [
+    {
+        type: 'collectionTextFilter',
+        kind: 'default',
+        alias: 'Umb.Collection.TextFilter.UserGroup',
+        name: 'User Group Collection Text Filter',
+        conditions: [
+            {
+                alias: UMB_COLLECTION_ALIAS_CONDITION,
+                match: UMB_USER_GROUP_COLLECTION_ALIAS,
+            },
+        ],
+    },
+];

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

@@ -1,15 +1,15 @@
-import { manifests as repositoryManifests } from './repository/manifests.js';
-import { manifests as collectionViewManifests } from './views/manifests.js';
 import { manifests as collectionActionManifests } from './action/manifests.js';
 import { UMB_USER_GROUP_COLLECTION_ALIAS } from './constants.js';
+import { manifests as textFilterManifests } from './filter/manifests.js';
 import { UMB_USER_GROUP_COLLECTION_REPOSITORY_ALIAS } from './repository/constants.js';
+import { manifests as repositoryManifests } from './repository/manifests.js';
+import { manifests as collectionViewManifests } from './views/manifests.js';
 export const manifests = [
     {
         type: 'collection',
+        kind: 'default',
         alias: UMB_USER_GROUP_COLLECTION_ALIAS,
         name: 'User Group Collection',
-        api: () => import('./user-group-collection.context.js'),
-        element: () => import('./user-group-collection.element.js'),
         meta: {
             repositoryAlias: UMB_USER_GROUP_COLLECTION_REPOSITORY_ALIAS,
         },
@@ -17,4 +17,5 @@ export const manifests = [
     ...repositoryManifests,
     ...collectionViewManifests,
     ...collectionActionManifests,
+    ...textFilterManifests,
 ];

package/dist-cms/packages/user/user-group/collection/repository/user-group-collection.repository.js

@@ -1,6 +1,7 @@
 import { UMB_USER_GROUP_DETAIL_STORE_CONTEXT } from '../../repository/index.js';
 import { UmbUserGroupCollectionServerDataSource } from './user-group-collection.server.data-source.js';
 import { UmbControllerBase } from '../../../../../libs/class-api/index.js';
+import { UmbDeprecation } from '../../../../core/utils/index.js';
 export class UmbUserGroupCollectionRepository extends UmbControllerBase {
     #init;
     #detailStore;
@@ -17,6 +18,13 @@ export class UmbUserGroupCollectionRepository extends UmbControllerBase {
     }
     async requestCollection(filter = { skip: 0, take: 100 }) {
         await this.#init;
+        if (filter.query) {
+            new UmbDeprecation({
+                removeInVersion: '19.0.0',
+                deprecated: 'User Group requestCollection filter model .query property.',
+                solution: 'Use the .filter property instead',
+            }).warn();
+        }
         const { data, error } = await this.#collectionSource.getCollection(filter);
         if (data) {
             this.#detailStore?.appendItems(data.items);

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

@@ -17,7 +17,8 @@ export class UmbUserGroupCollectionServerDataSource {
         this.#host = host;
     }
     async getCollection(filter) {
-        const { data, error } = await tryExecute(this.#host, UserGroupService.getFilterUserGroup({ query: { skip: filter.skip, take: filter.take, filter: filter.query } }));
+        const filterText = filter.filter ?? filter.query ?? undefined;
+        const { data, error } = await tryExecute(this.#host, UserGroupService.getFilterUserGroup({ query: { skip: filter.skip, take: filter.take, filter: filterText } }));
         if (data) {
             const mappedItems = data.items.map((item) => {
                 const userGroup = {
@@ -34,6 +35,7 @@ export class UmbUserGroupCollectionServerDataSource {
                     mediaRootAccess: item.mediaRootAccess,
                     mediaStartNode: item.mediaStartNode ? { unique: item.mediaStartNode.id } : null,
                     name: item.name,
+                    description: item.description || null,
                     permissions: item.permissions,
                     sections: item.sections,
                     unique: item.id,

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

@@ -1,5 +1,5 @@
-export interface UmbUserGroupCollectionFilterModel {
-    skip?: number;
-    take?: number;
+import type { UmbCollectionFilterModel } from '../../../core/collection/index.js';
+export interface UmbUserGroupCollectionFilterModel extends UmbCollectionFilterModel {
+    /** @deprecated Use 'filter' property instead. Will be removed in version 19.0.0 */
     query?: string;
 }

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

@@ -1,3 +1,8 @@
-import type { UmbUserGroupCollectionContext } from './user-group-collection.context.js';
+import type { UmbUserGroupDetailModel } from '../types.js';
+import type { UmbUserGroupCollectionFilterModel } from './types.js';
+import type { UmbDefaultCollectionContext } from '../../../core/collection/index.js';
 import { UmbContextToken } from '../../../../libs/context-api/index.js';
-export declare const UMB_USER_GROUP_COLLECTION_CONTEXT: UmbContextToken<UmbUserGroupCollectionContext, UmbUserGroupCollectionContext>;
+/**
+ * @deprecated The context token is deprecated. Use UMB_COLLECTION_CONTEXT instead.
+ */
+export declare const UMB_USER_GROUP_COLLECTION_CONTEXT: UmbContextToken<UmbDefaultCollectionContext<UmbUserGroupDetailModel, UmbUserGroupCollectionFilterModel>, UmbDefaultCollectionContext<UmbUserGroupDetailModel, UmbUserGroupCollectionFilterModel>>;

package/dist-cms/packages/user/user-group/collection/user-group-collection.context-token.js

@@ -1,2 +1,5 @@
 import { UmbContextToken } from '../../../../libs/context-api/index.js';
+/**
+ * @deprecated The context token is deprecated. Use UMB_COLLECTION_CONTEXT instead.
+ */
 export const UMB_USER_GROUP_COLLECTION_CONTEXT = new UmbContextToken('UmbCollectionContext');