@umbraco-cms/backoffice 14.0.0-rc3 → 14.0.0-rc4

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

@@ -5,9 +5,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { getDisplayStateFromUserStatus } from '../../../utils.js';
+import { UMB_USER_COLLECTION_CONTEXT } from '../../user-collection.context-token.js';
 import { css, html, nothing, customElement, state, repeat, ifDefined } from '../../../../../../external/lit/index.js';
 import { UmbTextStyles } from '../../../../../core/style/index.js';
-import { UMB_COLLECTION_CONTEXT } from '../../../../../core/collection/index.js';
 import { UmbLitElement } from '../../../../../core/lit-element/index.js';
 import { UserStateModel } from '../../../../../../external/backend-api/index.js';
 import { UmbUserGroupCollectionRepository } from '../../../../user-group/index.js';
@@ -24,7 +24,7 @@ let UmbUserGridCollectionViewElement = class UmbUserGridCollectionViewElement ex
         this.#userGroups = [];
         // TODO: we need to use the item repository here
         this.#userGroupCollectionRepository = new UmbUserGroupCollectionRepository(this);
-        this.consumeContext(UMB_COLLECTION_CONTEXT, (instance) => {
+        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, (items) => (this._users = items), 'umbCollectionItemsObserver');
@@ -61,15 +61,15 @@ let UmbUserGridCollectionViewElement = class UmbUserGridCollectionViewElement ex
         const avatarUrls = [
             {
                 scale: '1x',
-                url: user.avatarUrls?.[0],
+                url: user.avatarUrls?.[1],
             },
             {
                 scale: '2x',
-                url: user.avatarUrls?.[1],
+                url: user.avatarUrls?.[2],
             },
             {
                 scale: '3x',
-                url: user.avatarUrls?.[2],
+                url: user.avatarUrls?.[3],
             },
         ];
         let avatarSrcset = '';
@@ -88,6 +88,7 @@ let UmbUserGridCollectionViewElement = class UmbUserGridCollectionViewElement ex
 				${this.#renderUserTag(user)} ${this.#renderUserGroupNames(user)} ${this.#renderUserLoginDate(user)}
 
 				<uui-avatar
+					style="font-size: 1.6rem;"
 					slot="avatar"
 					.name=${user.name || 'Unknown'}
 					img-src=${ifDefined(user.avatarUrls.length > 0 ? avatarUrls[0].url : undefined)}
@@ -110,7 +111,7 @@ let UmbUserGridCollectionViewElement = class UmbUserGridCollectionViewElement ex
     }
     #renderUserGroupNames(user) {
         const userGroupNames = this.#userGroups
-            .filter((userGroup) => user.userGroupUniques?.includes(userGroup.unique))
+            .filter((userGroup) => user.userGroupUniques?.map((reference) => reference.unique).includes(userGroup.unique))
             .map((userGroup) => userGroup.name)
             .join(', ');
         return html `<div>${userGroupNames}</div>`;

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

@@ -4,9 +4,9 @@ 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 { css, html, customElement, state } from '../../../../../../external/lit/index.js';
 import { UmbTextStyles } from '../../../../../core/style/index.js';
-import { UMB_COLLECTION_CONTEXT } from '../../../../../core/collection/index.js';
 import { UmbLitElement } from '../../../../../core/lit-element/index.js';
 import { UmbUserGroupItemRepository } from '../../../../user-group/index.js';
 import './column-layouts/name/user-table-name-column-layout.element.js';
@@ -44,7 +44,7 @@ let UmbUserTableCollectionViewElement = class UmbUserTableCollectionViewElement
         this.#userGroupItemRepository = new UmbUserGroupItemRepository(this);
         this._users = [];
         this._selection = [];
-        this.consumeContext(UMB_COLLECTION_CONTEXT, (instance) => {
+        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, (items) => {
@@ -56,17 +56,19 @@ let UmbUserTableCollectionViewElement = class UmbUserTableCollectionViewElement
     async #observeUserGroups() {
         if (this._users.length === 0)
             return;
-        const userGroupsUniques = [...new Set(this._users.flatMap((user) => user.userGroupUniques))];
+        const userGroupsUniques = [
+            ...new Set(this._users.flatMap((user) => user.userGroupUniques.map((reference) => reference.unique))),
+        ];
         const { asObservable } = await this.#userGroupItemRepository.requestItems(userGroupsUniques);
         this.observe(asObservable(), (userGroups) => {
             this._userGroupItems = userGroups;
             this.#createTableItems();
         }, 'umbUserGroupItemsObserver');
     }
-    #getUserGroupNames(uniques) {
-        return uniques
-            .map((unique) => {
-            return this._userGroupItems.find((x) => x.unique === unique)?.name;
+    #getUserGroupNames(references) {
+        return references
+            .map((reference) => {
+            return this._userGroupItems.find((x) => x.unique === reference.unique)?.name;
         })
             .join(', ');
     }

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

@@ -108,8 +108,8 @@ let UmbUserInputElement = class UmbUserInputElement extends UUIFormControlMixin(
 			<uui-button
 				id="btn-add"
 				look="placeholder"
-				@click=${this.#openPicker}
-				label="${this.localize.term('general_choose')}"></uui-button>
+				label=${this.localize.term('general_choose')}
+				@click=${this.#openPicker}></uui-button>
 		`;
     }
     #renderItems() {

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

@@ -1,12 +1,14 @@
 import { manifest as userAllowDisableActionManifest } from './user-allow-disable-action.condition.js';
 import { manifest as userAllowEnableActionManifest } from './user-allow-enable-action.condition.js';
 import { manifest as userAllowUnlockActionManifest } from './user-allow-unlock-action.condition.js';
+import { manifest as userAllowExternalLoginActionManifest } from './user-allow-external-login-action.condition.js';
 import { manifest as userAllowMfaActionManifest } from './user-allow-mfa-action.condition.js';
 import { manifest as userAllowDeleteActionManifest } from './user-allow-delete-action.condition.js';
 export const manifests = [
     userAllowDisableActionManifest,
     userAllowEnableActionManifest,
     userAllowUnlockActionManifest,
+    userAllowExternalLoginActionManifest,
     userAllowMfaActionManifest,
     userAllowDeleteActionManifest,
 ];

package/dist-cms/packages/user/user/conditions/user-allow-external-login-action.condition.d.ts

@@ -0,0 +1,7 @@
+import type { UmbControllerHost } from '../../../../libs/controller-api/index.js';
+import type { ManifestCondition } from '../../../../libs/extension-api/index.js';
+import { UmbConditionBase } from '../../../core/extension-registry/index.js';
+export declare class UmbUserAllowExternalLoginActionCondition extends UmbConditionBase<never> {
+    constructor(host: UmbControllerHost, args: any);
+}
+export declare const manifest: ManifestCondition;

package/dist-cms/packages/user/user/conditions/user-allow-external-login-action.condition.js

@@ -0,0 +1,15 @@
+import { UmbConditionBase, umbExtensionsRegistry } from '../../../core/extension-registry/index.js';
+export class UmbUserAllowExternalLoginActionCondition extends UmbConditionBase {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    constructor(host, args) {
+        super(host, args);
+        // Check if there are any MFA providers available
+        this.observe(umbExtensionsRegistry.byType('authProvider'), (exts) => (this.permitted = exts.length > 0 && exts.some((ext) => ext.meta?.linking?.allowManualLinking)), '_userAllowExternalLoginActionConditionProviders');
+    }
+}
+export const manifest = {
+    type: 'condition',
+    name: 'User Allow ExternalLogin Action Condition',
+    alias: 'Umb.Condition.User.AllowExternalLoginAction',
+    api: UmbUserAllowExternalLoginActionCondition,
+};

package/dist-cms/packages/user/user/entity-bulk-actions/disable/disable.action.js

@@ -1,8 +1,24 @@
 import { UmbDisableUserRepository } from '../../repository/index.js';
+import { UMB_ACTION_EVENT_CONTEXT } from '../../../../core/action/index.js';
 import { UmbEntityBulkActionBase } from '../../../../core/entity-bulk-action/index.js';
+import { UmbRequestReloadChildrenOfEntityEvent } from '../../../../core/entity-action/index.js';
+import { UMB_ENTITY_CONTEXT } from '../../../../core/entity/index.js';
 export class UmbDisableUserEntityBulkAction extends UmbEntityBulkActionBase {
     async execute() {
         const repository = new UmbDisableUserRepository(this._host);
         await repository.disable(this.selection);
+        const entityContext = await this.getContext(UMB_ENTITY_CONTEXT);
+        const entityType = entityContext.getEntityType();
+        const unique = entityContext.getUnique();
+        if (!entityType)
+            throw new Error('Entity type not found');
+        if (unique === undefined)
+            throw new Error('Entity unique not found');
+        const eventContext = await this.getContext(UMB_ACTION_EVENT_CONTEXT);
+        const event = new UmbRequestReloadChildrenOfEntityEvent({
+            entityType,
+            unique,
+        });
+        eventContext.dispatchEvent(event);
     }
 }

package/dist-cms/packages/user/user/entity-bulk-actions/enable/enable.action.js

@@ -1,8 +1,24 @@
 import { UmbEnableUserRepository } from '../../repository/index.js';
+import { UMB_ENTITY_CONTEXT } from '../../../../core/entity/index.js';
 import { UmbEntityBulkActionBase } from '../../../../core/entity-bulk-action/index.js';
+import { UMB_ACTION_EVENT_CONTEXT } from '../../../../core/action/index.js';
+import { UmbRequestReloadChildrenOfEntityEvent } from '../../../../core/entity-action/index.js';
 export class UmbEnableUserEntityBulkAction extends UmbEntityBulkActionBase {
     async execute() {
         const repository = new UmbEnableUserRepository(this._host);
         await repository.enable(this.selection);
+        const entityContext = await this.getContext(UMB_ENTITY_CONTEXT);
+        const entityType = entityContext.getEntityType();
+        const unique = entityContext.getUnique();
+        if (!entityType)
+            throw new Error('Entity type not found');
+        if (unique === undefined)
+            throw new Error('Entity unique not found');
+        const eventContext = await this.getContext(UMB_ACTION_EVENT_CONTEXT);
+        const event = new UmbRequestReloadChildrenOfEntityEvent({
+            entityType,
+            unique,
+        });
+        eventContext.dispatchEvent(event);
     }
 }

package/dist-cms/packages/user/user/entity-bulk-actions/manifests.js

@@ -1,11 +1,11 @@
 import { UMB_USER_COLLECTION_ALIAS } from '../collection/manifests.js';
 import { UMB_USER_ENTITY_TYPE } from '../entity.js';
 import { UmbEnableUserEntityBulkAction } from './enable/enable.action.js';
-import { UmbSetGroupUserEntityBulkAction } from './set-group/set-group.action.js';
 import { UmbUnlockUserEntityBulkAction } from './unlock/unlock.action.js';
 import { UmbDisableUserEntityBulkAction } from './disable/disable.action.js';
 import { UMB_COLLECTION_ALIAS_CONDITION } from '../../../core/collection/index.js';
 const entityActions = [
+    /* TODO: Implement SetGroup entity action
     {
         type: 'entityBulkAction',
         alias: 'Umb.EntityBulkAction.User.SetGroup',
@@ -23,6 +23,7 @@ const entityActions = [
             },
         ],
     },
+    */
     {
         type: 'entityBulkAction',
         alias: 'Umb.EntityBulkAction.User.Enable',

package/dist-cms/packages/user/user/entity-bulk-actions/set-group/set-group.action.js

@@ -2,6 +2,6 @@ import { UmbEntityBulkActionBase } from '../../../../core/entity-bulk-action/ind
 export class UmbSetGroupUserEntityBulkAction extends UmbEntityBulkActionBase {
     async execute() {
         //TODO: Implement
-        alert('Bulk set group is not implemented yet');
+        throw new Error('Bulk set group is not implemented yet');
     }
 }

package/dist-cms/packages/user/user/entity-bulk-actions/unlock/unlock.action.js

@@ -1,8 +1,24 @@
 import { UmbUnlockUserRepository } from '../../repository/index.js';
+import { UMB_ENTITY_CONTEXT } from '../../../../core/entity/index.js';
 import { UmbEntityBulkActionBase } from '../../../../core/entity-bulk-action/index.js';
+import { UMB_ACTION_EVENT_CONTEXT } from '../../../../core/action/index.js';
+import { UmbRequestReloadChildrenOfEntityEvent } from '../../../../core/entity-action/index.js';
 export class UmbUnlockUserEntityBulkAction extends UmbEntityBulkActionBase {
     async execute() {
         const repository = new UmbUnlockUserRepository(this._host);
         await repository.unlock(this.selection);
+        const entityContext = await this.getContext(UMB_ENTITY_CONTEXT);
+        const entityType = entityContext.getEntityType();
+        const unique = entityContext.getUnique();
+        if (!entityType)
+            throw new Error('Entity type not found');
+        if (unique === undefined)
+            throw new Error('Entity unique not found');
+        const eventContext = await this.getContext(UMB_ACTION_EVENT_CONTEXT);
+        const event = new UmbRequestReloadChildrenOfEntityEvent({
+            entityType,
+            unique,
+        });
+        eventContext.dispatchEvent(event);
     }
 }

package/dist-cms/packages/user/user/entity.d.ts

@@ -1,2 +1,4 @@
 export declare const UMB_USER_ENTITY_TYPE = "user";
+export declare const UMB_USER_ROOT_ENTITY_TYPE = "user-root";
 export type UmbUserEntityType = typeof UMB_USER_ENTITY_TYPE;
+export type UmbUserRootEntityType = typeof UMB_USER_ROOT_ENTITY_TYPE;

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

@@ -1 +1,2 @@
 export const UMB_USER_ENTITY_TYPE = 'user';
+export const UMB_USER_ROOT_ENTITY_TYPE = 'user-root';

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

@@ -8,7 +8,7 @@ export const inviteManifest = {
     api: UmbInviteUserCollectionAction,
     weight: 100,
     meta: {
-        label: 'Invite',
+        label: '#user_invite',
     },
     conditions: [
         {

package/dist-cms/packages/user/user/invite/modal/invite/user-invite-modal.element.js

@@ -23,7 +23,9 @@ let UmbInviteUserModalElement = class UmbInviteUserModalElement extends UmbModal
         const email = formData.get('email');
         //TODO: How should we handle pickers forms?
         const userGroupPicker = form.querySelector('#userGroups');
-        const userGroupUniques = userGroupPicker?.selection;
+        const userGroupUniques = userGroupPicker?.selection.map((unique) => {
+            return { unique };
+        });
         const message = formData.get('message');
         // TODO: figure out when to use email or username
         const { error } = await this.#inviteUserRepository.invite({

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

@@ -30,7 +30,9 @@ export class UmbInviteUserServerDataSource {
             email: request.email,
             userName: request.userName,
             name: request.name,
-            userGroupIds: request.userGroupUniques,
+            userGroupIds: request.userGroupUniques.map((reference) => {
+                return { id: reference.unique };
+            }),
             message: request.message,
         };
         const { data, error } = await tryExecuteAndNotify(this.#host, UserService.postUserInvite({

package/dist-cms/packages/user/user/invite/repository/types.d.ts

@@ -1,4 +1,5 @@
 import type { UmbUserDetailModel } from '../../types.js';
+import type { UmbReferenceByUnique } from '../../../../core/models/index.js';
 import type { UmbDataSourceResponse, UmbDataSourceErrorResponse } from '../../../../core/repository/index.js';
 export interface UmbInviteUserDataSource {
     invite(requestModel: UmbInviteUserRequestModel): Promise<UmbDataSourceResponse<UmbUserDetailModel>>;
@@ -8,7 +9,7 @@ export interface UmbInviteUserRequestModel {
     email: string;
     userName: string;
     name: string;
-    userGroupUniques: Array<string>;
+    userGroupUniques: Array<UmbReferenceByUnique>;
     message: string | null;
 }
 export interface UmbResendUserInviteRequestModel {

package/dist-cms/packages/user/user/modals/create/constants.d.ts

@@ -0,0 +1 @@
+export declare const UMB_CREATE_USER_MODAL_ALIAS = "Umb.Modal.User.Create";

package/dist-cms/packages/user/user/modals/create/constants.js

@@ -0,0 +1 @@
+export const UMB_CREATE_USER_MODAL_ALIAS = 'Umb.Modal.User.Create';

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

@@ -23,14 +23,16 @@ let UmbCreateUserModalElement = class UmbCreateUserModalElement extends UmbModal
         const name = formData.get('name');
         const email = formData.get('email');
         const userGroupPicker = form.querySelector('#userGroups');
-        const userGroups = userGroupPicker?.selection;
+        const userGroupReferences = userGroupPicker?.selection.map((unique) => {
+            return { unique };
+        });
         const { data: userScaffold } = await this.#userDetailRepository.createScaffold();
         if (!userScaffold)
             return;
         userScaffold.name = name;
         userScaffold.email = email;
         userScaffold.userName = email;
-        userScaffold.userGroupUniques = userGroups;
+        userScaffold.userGroupUniques = userGroupReferences;
         // TODO: figure out when to use email or username
         const { data } = await this.#userDetailRepository.create(userScaffold);
         if (data) {

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

@@ -1,5 +1,6 @@
+import { UMB_CREATE_USER_MODAL_ALIAS } from './constants.js';
 import { UmbModalToken } from '../../../../core/modal/index.js';
-export const UMB_CREATE_USER_MODAL = new UmbModalToken('Umb.Modal.User.Create', {
+export const UMB_CREATE_USER_MODAL = new UmbModalToken(UMB_CREATE_USER_MODAL_ALIAS, {
     modal: {
         type: 'dialog',
         size: 'small',

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

@@ -1,7 +1,8 @@
+import { UMB_CREATE_USER_MODAL_ALIAS } from './create/constants.js';
 const modals = [
     {
         type: 'modal',
-        alias: 'Umb.Modal.User.Create',
+        alias: UMB_CREATE_USER_MODAL_ALIAS,
         name: 'Create User Modal',
         js: () => import('./create/create-user-modal.element.js'),
     },

package/dist-cms/packages/user/user/modals/user-mfa/user-mfa-modal.element.d.ts

@@ -4,6 +4,7 @@ import { UmbLitElement } from '../../../../core/lit-element/index.js';
 import { type UmbModalContext } from '../../../../core/modal/index.js';
 type UmbMfaLoginProviderOption = UmbUserMfaProviderModel & {
     displayName: string;
+    existsOnServer: boolean;
 };
 export declare class UmbUserMfaModalElement extends UmbLitElement {
     #private;

package/dist-cms/packages/user/user/modals/user-mfa/user-mfa-modal.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 { UmbUserRepository } from '../../repository/index.js';
-import { css, customElement, html, property, repeat, state, when } from '../../../../../external/lit/index.js';
+import { css, customElement, html, nothing, property, repeat, state, when } from '../../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../core/lit-element/index.js';
 import { umbConfirmModal } from '../../../../core/modal/index.js';
 import { UmbTextStyles } from '../../../../core/style/index.js';
@@ -32,6 +32,7 @@ let UmbUserMfaModalElement = class UmbUserMfaModalElement extends UmbLitElement
             return manifestLoginProviders.map((manifestLoginProvider) => {
                 const serverLoginProvider = serverLoginProviders.find((serverLoginProvider) => serverLoginProvider.providerName === manifestLoginProvider.forProviderName);
                 return {
+                    existsOnServer: !!serverLoginProvider,
                     isEnabledOnUser: serverLoginProvider?.isEnabledOnUser ?? false,
                     providerName: serverLoginProvider?.providerName ?? manifestLoginProvider.forProviderName,
                     displayName: manifestLoginProvider.meta?.label ?? serverLoginProvider?.providerName ?? manifestLoginProvider.name,
@@ -65,6 +66,15 @@ let UmbUserMfaModalElement = class UmbUserMfaModalElement extends UmbLitElement
     #renderProvider(item) {
         return html `
 			<uui-box headline=${item.displayName}>
+				${when(item.existsOnServer, () => nothing, () => html `<div style="position:relative" slot="header-actions">
+							<uui-badge
+								style="cursor:default"
+								title="Warning: This provider is not configured on the server"
+								color="danger"
+								look="primary">
+								!
+							</uui-badge>
+						</div>`)}
 				${when(item.isEnabledOnUser, () => html `
 						<p style="margin-top:0">
 							<umb-localize key="user_2faProviderIsEnabled">This two-factor provider is enabled</umb-localize>

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

@@ -67,7 +67,11 @@ export class UmbUserServerDataSource {
             avatarUrls: data.avatarUrls,
             createDate: data.createDate,
             hasDocumentRootAccess: data.hasDocumentRootAccess,
-            documentStartNodeUniques: data.documentStartNodeIds,
+            documentStartNodeUniques: data.documentStartNodeIds.map((node) => {
+                return {
+                    unique: node.id,
+                };
+            }),
             email: data.email,
             entityType: UMB_USER_ENTITY_TYPE,
             failedLoginAttempts: data.failedLoginAttempts,
@@ -77,12 +81,20 @@ export class UmbUserServerDataSource {
             lastLoginDate: data.lastLoginDate || null,
             lastPasswordChangeDate: data.lastPasswordChangeDate || null,
             hasMediaRootAccess: data.hasMediaRootAccess,
-            mediaStartNodeUniques: data.mediaStartNodeIds,
+            mediaStartNodeUniques: data.mediaStartNodeIds.map((node) => {
+                return {
+                    unique: node.id,
+                };
+            }),
             name: data.name,
             state: data.state,
             unique: data.id,
             updateDate: data.updateDate,
-            userGroupUniques: data.userGroupIds,
+            userGroupUniques: data.userGroupIds.map((reference) => {
+                return {
+                    unique: reference.id,
+                };
+            }),
             userName: data.userName,
         };
         return { data: user };
@@ -100,7 +112,11 @@ export class UmbUserServerDataSource {
         const requestBody = {
             email: model.email,
             name: model.name,
-            userGroupIds: model.userGroupUniques,
+            userGroupIds: model.userGroupUniques.map((reference) => {
+                return {
+                    id: reference.unique,
+                };
+            }),
             userName: model.userName,
         };
         const { data, error } = await tryExecuteAndNotify(this.#host, UserService.postUser({
@@ -122,14 +138,26 @@ export class UmbUserServerDataSource {
             throw new Error('Unique is missing');
         // TODO: make data mapper to prevent errors
         const requestBody = {
-            documentStartNodeIds: model.documentStartNodeUniques,
+            documentStartNodeIds: model.documentStartNodeUniques.map((node) => {
+                return {
+                    id: node.unique,
+                };
+            }),
             email: model.email,
             hasDocumentRootAccess: model.hasDocumentRootAccess,
             hasMediaRootAccess: model.hasMediaRootAccess,
             languageIsoCode: model.languageIsoCode || '',
-            mediaStartNodeIds: model.mediaStartNodeUniques,
+            mediaStartNodeIds: model.mediaStartNodeUniques.map((node) => {
+                return {
+                    id: node.unique,
+                };
+            }),
             name: model.name,
-            userGroupIds: model.userGroupUniques,
+            userGroupIds: model.userGroupUniques.map((reference) => {
+                return {
+                    id: reference.unique,
+                };
+            }),
             userName: model.userName,
         };
         const { error } = await tryExecuteAndNotify(this.#host, UserService.putUserById({

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

@@ -26,7 +26,7 @@ export class UmbDisableUserServerDataSource {
             throw new Error('User ids are missing');
         return tryExecuteAndNotify(this.#host, UserService.postUserDisable({
             requestBody: {
-                userIds,
+                userIds: userIds.map((id) => ({ id })),
             },
         }));
     }

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

@@ -26,7 +26,7 @@ export class UmbEnableUserServerDataSource {
             throw new Error('User ids are missing');
         return tryExecuteAndNotify(this.#host, UserService.postUserEnable({
             requestBody: {
-                userIds,
+                userIds: userIds.map((id) => ({ id })),
             },
         }));
     }

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

@@ -28,8 +28,8 @@ export class UmbUserSetGroupsServerDataSource {
             throw new Error('User group ids are missing');
         return tryExecuteAndNotify(this.#host, UserService.postUserSetUserGroups({
             requestBody: {
-                userIds,
-                userGroupIds,
+                userIds: userIds.map((id) => ({ id })),
+                userGroupIds: userGroupIds.map((id) => ({ id })),
             },
         }));
     }

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

@@ -26,7 +26,7 @@ export class UmbUnlockUserServerDataSource {
             throw new Error('User ids are missing');
         return tryExecuteAndNotify(this.#host, UserService.postUserUnlock({
             requestBody: {
-                userIds,
+                userIds: userIds.map((id) => ({ id })),
             },
         }));
     }

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

@@ -7,7 +7,7 @@ const sectionsViews = [
         js: () => import('./users-section-view.element.js'),
         weight: 200,
         meta: {
-            label: 'Users',
+            label: '#general_users',
             pathname: 'users',
             icon: 'icon-user',
         },

package/dist-cms/packages/user/user/section-view/users-section-view.element.js

@@ -5,18 +5,22 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { UMB_USER_COLLECTION_ALIAS } from '../collection/manifests.js';
-import { UMB_USER_ENTITY_TYPE } from '../entity.js';
+import { UMB_USER_ENTITY_TYPE, UMB_USER_ROOT_ENTITY_TYPE } from '../entity.js';
 import { css, html, customElement } from '../../../../external/lit/index.js';
 import { UmbTextStyles } from '../../../core/style/index.js';
 import { UmbLitElement } from '../../../core/lit-element/index.js';
 import { UmbCollectionElement } from '../../../core/collection/index.js';
 import { UmbWorkspaceElement } from '../../../core/workspace/index.js';
+import { UmbEntityContext } from '../../../core/entity/index.js';
 let UmbSectionViewUsersElement = class UmbSectionViewUsersElement extends UmbLitElement {
     #routes = [
         {
             path: 'collection',
             component: () => {
                 const element = new UmbCollectionElement();
+                const entityContext = new UmbEntityContext(element);
+                entityContext.setEntityType(UMB_USER_ROOT_ENTITY_TYPE);
+                entityContext.setUnique(null);
                 element.setAttribute('alias', UMB_USER_COLLECTION_ALIAS);
                 return element;
             },

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

@@ -1,11 +1,12 @@
 import type { UmbUserEntityType } from './entity.js';
+import type { UmbReferenceByUnique } from '../../core/models/index.js';
 import { UserStateModel, type UserTwoFactorProviderModel } from '../../../external/backend-api/index.js';
 export type UmbUserStateEnum = UserStateModel;
 export declare const UmbUserStateEnum: typeof UserStateModel;
 export interface UmbUserDetailModel {
     avatarUrls: Array<string>;
     createDate: string | null;
-    documentStartNodeUniques: Array<string>;
+    documentStartNodeUniques: Array<UmbReferenceByUnique>;
     email: string;
     entityType: UmbUserEntityType;
     failedLoginAttempts: number;
@@ -16,12 +17,12 @@ export interface UmbUserDetailModel {
     lastLockoutDate: string | null;
     lastLoginDate: string | null;
     lastPasswordChangeDate: string | null;
-    mediaStartNodeUniques: Array<string>;
+    mediaStartNodeUniques: Array<UmbReferenceByUnique>;
     name: string;
     state: UmbUserStateEnum | null;
     unique: string;
     updateDate: string | null;
-    userGroupUniques: Array<string>;
+    userGroupUniques: Array<UmbReferenceByUnique>;
     userName: string;
 }
 export type UmbUserMfaProviderModel = UserTwoFactorProviderModel;

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

@@ -35,11 +35,14 @@ let UmbUserWorkspaceAccessElement = class UmbUserWorkspaceAccessElement extends
     #renderDocumentStartNodes() {
         return html ` <b><umb-localize key="sections_content">Content</umb-localize></b>
 			<umb-user-document-start-node
-				.uniques=${this._user?.documentStartNodeUniques || []}></umb-user-document-start-node>`;
+				.uniques=${this._user?.documentStartNodeUniques.map((reference) => reference.unique) ||
+            []}></umb-user-document-start-node>`;
     }
     #renderMediaStartNodes() {
         return html ` <b><umb-localize key="sections_media">Media</umb-localize></b>
-			<umb-user-media-start-node .uniques=${this._user?.mediaStartNodeUniques || []}></umb-user-media-start-node>`;
+			<umb-user-media-start-node
+				.uniques=${this._user?.mediaStartNodeUniques.map((reference) => reference.unique) ||
+            []}></umb-user-media-start-node>`;
     }
     static { this.styles = [
         UmbTextStyles,