@umbraco-cms/backoffice 14.0.0-b0704cee → 14.0.0-c26a40c4

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

@@ -9,14 +9,14 @@ import { css, html, nothing, customElement, state } from '../../../../external/l
 // TODO: import from package when available
 //import { UmbUserInputElement } from '../../users/components/user-input/user-input.element.js';
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
-import { UMB_ENTITY_WORKSPACE_CONTEXT } from '../../../core/workspace/index.js';
+import { UMB_WORKSPACE_CONTEXT } from '../../../core/workspace/index.js';
 import { UMB_CONFIRM_MODAL, UMB_MODAL_MANAGER_CONTEXT_TOKEN, } from '../../../core/modal/index.js';
 export let UmbUserGroupWorkspaceEditorElement = class UmbUserGroupWorkspaceEditorElement extends UmbLitElement {
     #workspaceContext;
     #modalContext;
     constructor() {
         super();
-        this.consumeContext(UMB_ENTITY_WORKSPACE_CONTEXT, (instance) => {
+        this.consumeContext(UMB_WORKSPACE_CONTEXT, (instance) => {
             this.#workspaceContext = instance;
             this.observe(this.#workspaceContext.data, (userGroup) => (this._userGroup = userGroup));
             this.observe(this.#workspaceContext.userIds, (userKeys) => (this._userKeys = userKeys));

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

@@ -7,7 +7,7 @@ export class UmbUserGroupWorkspaceContext extends UmbWorkspaceContext {
     #userIds;
     #userRepository;
     constructor(host) {
-        super(host, new UmbUserGroupRepository(host));
+        super(host, 'Umb.Workspace.UserGroup', new UmbUserGroupRepository(host));
         this.#data = new UmbObjectState(undefined);
         this.data = this.#data.asObservable();
         this.#userIds = new UmbArrayState([]);

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

@@ -9,6 +9,7 @@ import { UmbUserGroupWorkspaceEditorElement } from './user-group-workspace-edito
 import { UUITextStyles } from '../../../../external/uui/index.js';
 import { html, customElement, state } from '../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
+import { UmbWorkspaceIsNewRedirectController } from '../../../core/workspace/index.js';
 export let UmbUserGroupWorkspaceElement = class UmbUserGroupWorkspaceElement extends UmbLitElement {
     constructor() {
         super(...arguments);
@@ -20,6 +21,7 @@ export let UmbUserGroupWorkspaceElement = class UmbUserGroupWorkspaceElement ext
                 component: () => this.#element,
                 setup: (component, info) => {
                     this.#workspaceContext.create();
+                    new UmbWorkspaceIsNewRedirectController(this, this.#workspaceContext, this.shadowRoot.querySelector('umb-router-slot'));
                 },
             },
             {

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

@@ -1,8 +1,8 @@
-import { UmbUserCollectionFilterModel } from '../types.js';
+import { UmbUserCollectionFilterModel, UmbUserDetail } from '../types.js';
 import { UmbCollectionContext } from '../../../core/collection/index.js';
-import { UserOrderModel, UserResponseModel, UserStateModel } from '../../../../external/backend-api/index.js';
+import { UserOrderModel, UserStateModel } from '../../../../external/backend-api/index.js';
 import { UmbControllerHostElement } from '../../../../libs/controller-api/index.js';
-export declare class UmbUserCollectionContext extends UmbCollectionContext<UserResponseModel, UmbUserCollectionFilterModel> {
+export declare class UmbUserCollectionContext extends UmbCollectionContext<UmbUserDetail, UmbUserCollectionFilterModel> {
     constructor(host: UmbControllerHostElement);
     setStateFilter(selection: Array<UserStateModel>): void;
     setOrderByFilter(orderBy: UserOrderModel): void;

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

@@ -37,7 +37,7 @@ export let UmbUserCollectionGridViewElement = class UmbUserCollectionGridViewEle
     #renderUserCard(user) {
         return html `
 			<uui-card-user
-				.name=${user.name}
+				.name=${user.name ?? 'Unnamed user'}
 				selectable
 				?select-only=${this._selection.length > 0}
 				?selected=${this.#collectionContext?.isSelected(user.id ?? '')}

package/dist-cms/packages/users/users/manifests.d.ts

@@ -1 +1 @@
-export declare const manifests: (import("../../core/index.js").ManifestEntityBulkAction | import("../../core/index.js").ManifestModal | import("../../core/index.js").ManifestRepository | import("../../core/index.js").ManifestSectionView | import("../../core/index.js").ManifestStore | import("../../core/index.js").ManifestItemStore | import("../../core/index.js").ManifestWorkspace | import("../../core/index.js").ManifestWorkspaceAction | import("../../core/index.js").ManifestWorkspaceEditorView)[];
+export declare const manifests: (import("../../core/index.js").ManifestModal | import("../../core/index.js").ManifestEntityBulkAction | import("../../core/index.js").ManifestItemStore | import("../../core/index.js").ManifestRepository | import("../../core/index.js").ManifestSectionView | import("../../core/index.js").ManifestStore | import("../../core/index.js").ManifestWorkspace | import("../../core/index.js").ManifestWorkspaceAction | import("../../core/index.js").ManifestWorkspaceEditorView)[];

package/dist-cms/packages/users/users/repository/manifests.d.ts

@@ -1,3 +1,3 @@
 import type { ManifestStore, ManifestRepository, ManifestItemStore } from '../../../core/extension-registry/index.js';
 export declare const USER_REPOSITORY_ALIAS = "Umb.Repository.User";
-export declare const manifests: (ManifestRepository | ManifestStore | ManifestItemStore)[];
+export declare const manifests: (ManifestItemStore | ManifestRepository | ManifestStore)[];

package/dist-cms/packages/users/users/repository/sources/user-collection.server.data.d.ts

@@ -1,6 +1,5 @@
-import type { UmbUserCollectionFilterModel } from '../../types.js';
+import type { UmbUserCollectionFilterModel, UmbUserDetail } from '../../types.js';
 import { UmbCollectionDataSource } from '../../../../../shared/repository/index.js';
-import { UserResponseModel } from '../../../../../external/backend-api/index.js';
 import { UmbControllerHostElement } from '../../../../../libs/controller-api/index.js';
 /**
  * A data source for the User that fetches data from the server
@@ -8,7 +7,7 @@ import { UmbControllerHostElement } from '../../../../../libs/controller-api/ind
  * @class UmbUserCollectionServerDataSource
  * @implements {RepositoryDetailDataSource}
  */
-export declare class UmbUserCollectionServerDataSource implements UmbCollectionDataSource<UserResponseModel> {
+export declare class UmbUserCollectionServerDataSource implements UmbCollectionDataSource<UmbUserDetail> {
     #private;
     /**
      * Creates an instance of UmbUserCollectionServerDataSource.
@@ -16,6 +15,21 @@ export declare class UmbUserCollectionServerDataSource implements UmbCollectionD
      * @memberof UmbUserCollectionServerDataSource
      */
     constructor(host: UmbControllerHostElement);
-    getCollection(): Promise<import("../../../../../shared/repository/index.js").DataSourceResponse<import("../../../../../external/backend-api/index.js").PagedUserResponseModel>>;
+    getCollection(): Promise<import("../../../../../shared/repository/index.js").DataSourceResponse<import("../../../../../shared/repository/index.js").UmbPagedData<object & import("../../../../../external/backend-api/index.js").UserPresentationBaseModel & {
+        id?: string | undefined;
+        languageIsoCode?: string | null | undefined;
+        contentStartNodeIds?: string[] | undefined;
+        mediaStartNodeIds?: string[] | undefined;
+        avatarUrls?: string[] | undefined;
+        state?: import("../../../../../external/backend-api/index.js").UserStateModel | undefined;
+        failedLoginAttempts?: number | undefined;
+        createDate?: string | undefined;
+        updateDate?: string | undefined;
+        lastLoginDate?: string | null | undefined;
+        lastLockoutDate?: string | null | undefined;
+        lastPasswordChangeDate?: string | null | undefined;
+    } & {
+        entityType: "user";
+    }>>>;
     filterCollection(filter: UmbUserCollectionFilterModel): Promise<import("../../../../../shared/repository/index.js").DataSourceResponse<any>>;
 }

package/dist-cms/packages/users/users/repository/sources/user-collection.server.data.js

@@ -1,3 +1,4 @@
+import { extendDataSourcePagedResponseData } from '../../../../../shared/repository/index.js';
 import { UserResource } from '../../../../../external/backend-api/index.js';
 import { tryExecuteAndNotify } from '../../../../../shared/resources/index.js';
 /**
@@ -16,10 +17,14 @@ export class UmbUserCollectionServerDataSource {
     constructor(host) {
         this.#host = host;
     }
-    getCollection() {
-        return tryExecuteAndNotify(this.#host, UserResource.getUser({}));
+    async getCollection() {
+        const response = await tryExecuteAndNotify(this.#host, UserResource.getUser({}));
+        return extendDataSourcePagedResponseData(response, {
+            entityType: 'user',
+        });
     }
     filterCollection(filter) {
         return tryExecuteAndNotify(this.#host, UserResource.getUserFilter(filter));
+        // TODO: Most likely missing the right type, and should then extend the data set with entityType.
     }
 }

package/dist-cms/packages/users/users/repository/sources/user.server.data.d.ts

@@ -17,7 +17,22 @@ export declare class UmbUserServerDataSource implements UmbUserDetailDataSource
      */
     constructor(host: UmbControllerHostElement);
     createScaffold(parentId: string | null): Promise<DataSourceResponse<UserPresentationBaseModel>>;
-    get(id: string): Promise<DataSourceResponse<import("../../../../../external/backend-api/index.js").UserResponseModel>>;
+    get(id: string): Promise<DataSourceResponse<object & UserPresentationBaseModel & {
+        id?: string | undefined;
+        languageIsoCode?: string | null | undefined;
+        contentStartNodeIds?: string[] | undefined;
+        mediaStartNodeIds?: string[] | undefined;
+        avatarUrls?: string[] | undefined;
+        state?: import("../../../../../external/backend-api/index.js").UserStateModel | undefined;
+        failedLoginAttempts?: number | undefined;
+        createDate?: string | undefined;
+        updateDate?: string | undefined;
+        lastLoginDate?: string | null | undefined;
+        lastLockoutDate?: string | null | undefined;
+        lastPasswordChangeDate?: string | null | undefined;
+    } & {
+        entityType: "user";
+    }>>;
     insert(data: CreateUserRequestModel): Promise<DataSourceResponse<import("../../../../../external/backend-api/index.js").CreateUserResponseModel>>;
     update(id: string, data: UpdateUserRequestModel): Promise<DataSourceResponse<any>>;
     delete(id: string): Promise<DataSourceResponse<any>>;

package/dist-cms/packages/users/users/repository/sources/user.server.data.js

@@ -1,3 +1,4 @@
+import { extendDataSourceResponseData } from '../../../../../shared/repository/index.js';
 import { UserResource, } from '../../../../../external/backend-api/index.js';
 import { tryExecuteAndNotify } from '../../../../../shared/resources/index.js';
 /**
@@ -20,10 +21,13 @@ export class UmbUserServerDataSource {
     createScaffold(parentId) {
         throw new Error('Method not implemented.');
     }
-    get(id) {
+    async get(id) {
         if (!id)
             throw new Error('Id is missing');
-        return tryExecuteAndNotify(this.#host, UserResource.getUserById({ id }));
+        const response = await tryExecuteAndNotify(this.#host, UserResource.getUserById({ id }));
+        return extendDataSourceResponseData(response, {
+            entityType: 'user',
+        });
     }
     insert(data) {
         return tryExecuteAndNotify(this.#host, UserResource.postUser({ requestBody: data }));

package/dist-cms/packages/users/users/repository/user.repository.d.ts

@@ -1,12 +1,12 @@
-import { UmbUserCollectionFilterModel, UmbUserDetailRepository } from '../types.js';
+import { UmbUserCollectionFilterModel, UmbUserDetail, UmbUserDetailRepository } from '../types.js';
 import type { UmbControllerHostElement } from '../../../../libs/controller-api/index.js';
 import { UmbCollectionRepository, UmbItemRepository } from '../../../../shared/repository/index.js';
-import { CreateUserRequestModel, InviteUserRequestModel, UpdateUserRequestModel, UserItemResponseModel, UserResponseModel } from '../../../../external/backend-api/index.js';
+import { CreateUserRequestModel, InviteUserRequestModel, UpdateUserRequestModel, UserItemResponseModel } from '../../../../external/backend-api/index.js';
 export declare class UmbUserRepository implements UmbUserDetailRepository, UmbCollectionRepository, UmbItemRepository<UserItemResponseModel> {
     #private;
     constructor(host: UmbControllerHostElement);
-    requestCollection(filter?: UmbUserCollectionFilterModel): Promise<import("../../../../shared/repository/index.js").DataSourceResponse<import("../../../../shared/repository/index.js").UmbPagedData<UserResponseModel>>>;
-    filterCollection(filter: UmbUserCollectionFilterModel): Promise<import("../../../../shared/repository/index.js").DataSourceResponse<import("../../../../shared/repository/index.js").UmbPagedData<UserResponseModel>>>;
+    requestCollection(filter?: UmbUserCollectionFilterModel): Promise<import("../../../../shared/repository/index.js").DataSourceResponse<import("../../../../shared/repository/index.js").UmbPagedData<UmbUserDetail>>>;
+    filterCollection(filter: UmbUserCollectionFilterModel): Promise<import("../../../../shared/repository/index.js").DataSourceResponse<import("../../../../shared/repository/index.js").UmbPagedData<UmbUserDetail>>>;
     requestItems(ids: Array<string>): Promise<{
         data: import("../../../../external/backend-api/index.js").ItemResponseModelBaseModel[] | undefined;
         error: import("../../../../external/backend-api/index.js").ApiError | import("../../../../external/backend-api/index.js").CancelError | undefined;
@@ -15,7 +15,7 @@ export declare class UmbUserRepository implements UmbUserDetailRepository, UmbCo
     items(ids: Array<string>): Promise<import("rxjs").Observable<import("../../../../external/backend-api/index.js").ItemResponseModelBaseModel[]>>;
     createScaffold(parentId: string | null): Promise<import("../../../../shared/repository/index.js").DataSourceResponse<import("../../../../external/backend-api/index.js").UserPresentationBaseModel>>;
     requestById(id: string): Promise<{
-        data: UserResponseModel | undefined;
+        data: UmbUserDetail | undefined;
         error: import("../../../../external/backend-api/index.js").ApiError | import("../../../../external/backend-api/index.js").CancelError | undefined;
     }>;
     setUserGroups(userIds: Array<string>, userGroupIds: Array<string>): Promise<{
@@ -24,7 +24,7 @@ export declare class UmbUserRepository implements UmbUserDetailRepository, UmbCo
     byId(id: string): Promise<import("rxjs").Observable<any>>;
     create(userRequestData: CreateUserRequestModel): Promise<{
         data: {
-            user: UserResponseModel;
+            user: UmbUserDetail;
             createData: import("../../../../external/backend-api/index.js").CreateUserResponseModel;
         };
         error: import("../../../../external/backend-api/index.js").ApiError | import("../../../../external/backend-api/index.js").CancelError | undefined;
@@ -34,10 +34,10 @@ export declare class UmbUserRepository implements UmbUserDetailRepository, UmbCo
     }>;
     invite(inviteRequestData: InviteUserRequestModel): Promise<{
         data: any;
-        error: any;
+        error: import("../../../../external/backend-api/index.js").ApiError | import("../../../../external/backend-api/index.js").CancelError | undefined;
     }>;
     save(id: string, user: UpdateUserRequestModel): Promise<{
-        data: UserResponseModel | undefined;
+        data: UmbUserDetail | undefined;
         error: import("../../../../external/backend-api/index.js").ApiError | import("../../../../external/backend-api/index.js").CancelError | undefined;
     }>;
     delete(id: string): Promise<{

package/dist-cms/packages/users/users/repository/user.repository.js

@@ -132,7 +132,11 @@ export class UmbUserRepository {
         const { data, error } = await this.#detailSource.update(id, user);
         if (data) {
             this.#detailStore?.append(data);
-            const notification = { data: { message: `User saved` } };
+        }
+        if (!error) {
+            const notification = {
+                data: { message: this.#host.localize?.term('speechBubbles_editUserSaved') ?? 'User saved' },
+            };
             this.#notificationContext?.peek('positive', notification);
         }
         return { data, error };

package/dist-cms/packages/users/users/repository/user.store.d.ts

@@ -1,7 +1,7 @@
+import { type UmbUserDetail } from '../index.js';
 import { UmbContextToken } from '../../../../libs/context-api/index.js';
 import { UmbStoreBase } from '../../../core/store/index.js';
-import type { UmbControllerHostElement } from '../../../../libs/controller-api/index.js';
-import { UserResponseModel } from '../../../../external/backend-api/index.js';
+import { type UmbControllerHostElement } from '../../../../libs/controller-api/index.js';
 export declare const UMB_USER_STORE_CONTEXT_TOKEN: UmbContextToken<UmbUserStore>;
 /**
  * @export
@@ -13,20 +13,20 @@ export declare class UmbUserStore extends UmbStoreBase {
     constructor(host: UmbControllerHostElement);
     /**
      * Append a user to the store
-     * @param {UserResponseModel} user
+     * @param {UmbUserDetail} user
      * @memberof UmbUserStore
      */
-    append(user: UserResponseModel): void;
+    append(user: UmbUserDetail): void;
     /**
      * Get a user by id
      * @param {id} string id.
      * @memberof UmbUserStore
      */
-    byId(id: UserResponseModel['id']): import("rxjs").Observable<any>;
+    byId(id: UmbUserDetail['id']): import("rxjs").Observable<any>;
     /**
      * Removes data-types in the store with the given uniques
      * @param {string[]} uniques
      * @memberof UmbUserStore
      */
-    remove(uniques: Array<UserResponseModel['id']>): void;
+    remove(uniques: Array<UmbUserDetail['id']>): void;
 }

package/dist-cms/packages/users/users/repository/user.store.js

@@ -9,13 +9,13 @@ export const UMB_USER_STORE_CONTEXT_TOKEN = new UmbContextToken('UmbUserStore');
  * @description - Data Store for Users
  */
 export class UmbUserStore extends UmbStoreBase {
-    //#data = new UmbArrayState<UserResponseModel>([], (x) => x.id);
+    //#data = new UmbArrayState<UmbUserDetail>([], (x) => x.id);
     constructor(host) {
         super(host, UMB_USER_STORE_CONTEXT_TOKEN.toString(), new UmbArrayState([], (x) => x.id));
     }
     /**
      * Append a user to the store
-     * @param {UserResponseModel} user
+     * @param {UmbUserDetail} user
      * @memberof UmbUserStore
      */
     append(user) {

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

@@ -11,9 +11,12 @@ const sectionsViews = [
             pathname: 'users',
             icon: 'umb:user',
         },
-        conditions: {
-            sections: [UMB_USER_SECTION_ALIAS],
-        },
+        conditions: [
+            {
+                alias: 'Umb.Condition.SectionAlias',
+                match: UMB_USER_SECTION_ALIAS,
+            },
+        ],
     },
 ];
 export const manifests = [...sectionsViews];

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

@@ -1,5 +1,8 @@
 import type { CreateUserRequestModel, CreateUserResponseModel, DirectionModel, InviteUserRequestModel, UpdateUserRequestModel, UserOrderModel, UserResponseModel, UserStateModel } from '../../../external/backend-api/index.js';
-import { UmbDataSource, UmbDataSourceErrorResponse, UmbDetailRepository } from '../../../shared/repository/index.js';
+import { DataSourceResponse, UmbDataSource, UmbDataSourceErrorResponse, UmbDetailRepository } from '../../../shared/repository/index.js';
+export type UmbUserDetail = UserResponseModel & {
+    entityType: 'user';
+};
 export interface UmbCreateUserResponseModel {
     user: UserResponseModel;
     createData: CreateUserResponseModel;
@@ -13,8 +16,8 @@ export interface UmbUserCollectionFilterModel {
     userStates?: UserStateModel[];
     filter?: string;
 }
-export interface UmbUserDetailDataSource extends UmbDataSource<CreateUserRequestModel, CreateUserResponseModel, UpdateUserRequestModel, UserResponseModel> {
-    invite(data: InviteUserRequestModel): Promise<any>;
+export interface UmbUserDetailDataSource extends UmbDataSource<CreateUserRequestModel, CreateUserResponseModel, UpdateUserRequestModel, UmbUserDetail> {
+    invite(data: InviteUserRequestModel): Promise<DataSourceResponse<any>>;
 }
 export interface UmbUserSetGroupDataSource {
     setGroups(userIds: string[], userGroupIds: string[]): Promise<UmbDataSourceErrorResponse>;

package/dist-cms/packages/users/users/workspace/actions/user-workspace-action-save.element.js

@@ -7,11 +7,11 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { css, html, customElement, state } from '../../../../../external/lit/index.js';
 import { UUITextStyles } from '../../../../../external/uui/index.js';
 import { UmbLitElement } from '../../../../../shared/lit-element/index.js';
-import { UMB_ENTITY_WORKSPACE_CONTEXT } from '../../../../core/workspace/index.js';
+import { UMB_WORKSPACE_CONTEXT } from '../../../../core/workspace/index.js';
 export let UmbUserWorkspaceActionSaveElement = class UmbUserWorkspaceActionSaveElement extends UmbLitElement {
     constructor() {
         super();
-        this.consumeContext(UMB_ENTITY_WORKSPACE_CONTEXT, (instance) => {
+        this.consumeContext(UMB_WORKSPACE_CONTEXT, (instance) => {
             this._workspaceContext = instance;
         });
     }

package/dist-cms/packages/users/users/workspace/manifests.js

@@ -20,9 +20,12 @@ const workspaceActions = [
             color: 'positive',
             api: UmbSaveWorkspaceAction,
         },
-        conditions: {
-            workspaces: ['Umb.Workspace.User'],
-        },
+        conditions: [
+            {
+                alias: 'Umb.Condition.WorkspaceAlias',
+                match: workspace.alias,
+            },
+        ],
     },
 ];
 export const manifests = [workspace, ...workspaceViews, ...workspaceActions];

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

@@ -4,6 +4,7 @@ export declare class UmbUserWorkspaceEditorElement extends UmbLitElement {
     #private;
     private _currentUser?;
     private _user?;
+    private languages;
     constructor();
     render(): TemplateResult<1>;
     static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];

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

@@ -7,9 +7,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { getLookAndColorFromUserStatus } from '../../utils.js';
 import { UUIInputEvent, UUITextStyles } from '../../../../external/uui/index.js';
 import { css, html, nothing, customElement, state, ifDefined, repeat, } from '../../../../external/lit/index.js';
+import { firstValueFrom } from '../../../../external/rxjs/index.js';
 import { UMB_CHANGE_PASSWORD_MODAL } from '../../../core/modal/index.js';
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
-import { UMB_ENTITY_WORKSPACE_CONTEXT } from '../../../core/workspace/index.js';
+import { UMB_WORKSPACE_CONTEXT } from '../../../core/workspace/index.js';
 import { UserStateModel } from '../../../../external/backend-api/index.js';
 import { createExtensionClass } from '../../../../libs/extension-api/index.js';
 import { umbExtensionsRegistry } from '../../../core/extension-registry/index.js';
@@ -18,16 +19,16 @@ import { UMB_AUTH } from '../../../../shared/auth/index.js';
 export let UmbUserWorkspaceEditorElement = class UmbUserWorkspaceEditorElement extends UmbLitElement {
     #auth;
     #modalContext;
-    #languages = []; //TODO Add languages
     #workspaceContext;
     #userRepository;
     constructor() {
         super();
+        this.languages = [];
         this.consumeContext(UMB_AUTH, (instance) => {
             this.#auth = instance;
             this.#observeCurrentUser();
         });
-        this.consumeContext(UMB_ENTITY_WORKSPACE_CONTEXT, (workspaceContext) => {
+        this.consumeContext(UMB_WORKSPACE_CONTEXT, (workspaceContext) => {
             this.#workspaceContext = workspaceContext;
             this.#observeUser();
         });
@@ -52,7 +53,36 @@ export let UmbUserWorkspaceEditorElement = class UmbUserWorkspaceEditorElement e
     #observeCurrentUser() {
         if (!this.#auth)
             return;
-        this.observe(this.#auth.currentUser, (currentUser) => (this._currentUser = currentUser));
+        this.observe(this.#auth.currentUser, async (currentUser) => {
+            this._currentUser = currentUser;
+            if (!currentUser) {
+                return;
+            }
+            // Find all translations and make a unique list of iso codes
+            const translations = await firstValueFrom(umbExtensionsRegistry.extensionsOfType('translations'));
+            this.languages = translations
+                .filter((isoCode) => isoCode !== undefined)
+                .map((translation) => ({
+                value: translation.meta.culture.toLowerCase(),
+                name: translation.name,
+                selected: false,
+            }));
+            const currentUserLanguageCode = currentUser.languageIsoCode?.toLowerCase();
+            // Set the current user's language as selected
+            const currentUserLanguage = this.languages.find((language) => language.value === currentUserLanguageCode);
+            if (currentUserLanguage) {
+                currentUserLanguage.selected = true;
+            }
+            else {
+                // If users language code did not fit any of the options. We will create an option that fits, named unknown.
+                // In this way the user can keep their choice though a given language was not present at this time.
+                this.languages.push({
+                    value: currentUserLanguageCode ?? 'en-us',
+                    name: currentUserLanguageCode ? `${currentUserLanguageCode} (unknown)` : 'Unknown',
+                    selected: true,
+                });
+            }
+        });
     }
     #onUserStatusChange() {
         if (!this._user || !this._user.id)
@@ -81,6 +111,12 @@ export let UmbUserWorkspaceEditorElement = class UmbUserWorkspaceEditorElement e
             }
         }
     }
+    #onLanguageChange(event) {
+        const target = event.composedPath()[0];
+        if (typeof target?.value === 'string') {
+            this.#workspaceContext?.updateProperty('languageIsoCode', target.value);
+        }
+    }
     #onPasswordChange() {
         // TODO: check if current user is admin
         this.#modalContext?.open(UMB_CHANGE_PASSWORD_MODAL, {
@@ -114,12 +150,18 @@ export let UmbUserWorkspaceEditorElement = class UmbUserWorkspaceEditorElement e
         if (!this._user)
             return nothing;
         return html ` <uui-box>
-				<div slot="headline">Profile</div>
+				<div slot="headline"><umb-localize key="user_profile">Profile</umb-localize></div>
 				<umb-workspace-property-layout label="Email">
-					<uui-input slot="editor" name="email" label="email" readonly value=${this._user.email}></uui-input>
+					<uui-input slot="editor" name="email" label="email" readonly value=${ifDefined(this._user.email)}></uui-input>
 				</umb-workspace-property-layout>
 				<umb-workspace-property-layout label="Language" description="The language of the UI in the Backoffice">
-					<uui-select slot="editor" name="language" label="language" .options=${this.#languages}> </uui-select>
+					<uui-select
+						slot="editor"
+						name="language"
+						label="language"
+						.options=${this.languages}
+						@change="${this.#onLanguageChange}">
+					</uui-select>
 				</umb-workspace-property-layout>
 			</uui-box>
 			<uui-box>
@@ -135,7 +177,7 @@ export let UmbUserWorkspaceEditorElement = class UmbUserWorkspaceEditorElement e
 						label="Content start node"
 						description="Limit the content tree to specific start nodes">
 						<umb-property-editor-ui-document-picker
-							.value=${this._user.contentStartNodeIds}
+							.value=${this._user.contentStartNodeIds ?? []}
 							@property-value-change=${(e) => this.#workspaceContext?.updateProperty('contentStartNodeIds', e.target.value)}
 							slot="editor"></umb-property-editor-ui-document-picker>
 					</umb-workspace-property-layout>
@@ -316,6 +358,9 @@ __decorate([
 __decorate([
     state()
 ], UmbUserWorkspaceEditorElement.prototype, "_user", void 0);
+__decorate([
+    state()
+], UmbUserWorkspaceEditorElement.prototype, "languages", void 0);
 UmbUserWorkspaceEditorElement = __decorate([
     customElement('umb-user-workspace-editor')
 ], UmbUserWorkspaceEditorElement);

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

@@ -1,16 +1,16 @@
 import { UmbUserRepository } from '../repository/user.repository.js';
+import { type UmbUserDetail } from '../index.js';
 import { UmbEntityWorkspaceContextInterface, UmbWorkspaceContext } from '../../../core/workspace/index.js';
 import type { UmbControllerHostElement } from '../../../../libs/controller-api/index.js';
-import { UserResponseModel } from '../../../../external/backend-api/index.js';
-export declare class UmbUserWorkspaceContext extends UmbWorkspaceContext<UmbUserRepository, UserResponseModel> implements UmbEntityWorkspaceContextInterface<UserResponseModel | undefined> {
+export declare class UmbUserWorkspaceContext extends UmbWorkspaceContext<UmbUserRepository, UmbUserDetail> implements UmbEntityWorkspaceContextInterface<UmbUserDetail | undefined> {
     #private;
     constructor(host: UmbControllerHostElement);
-    data: import("rxjs").Observable<UserResponseModel | undefined>;
+    data: import("rxjs/internal/Observable.js").Observable<UmbUserDetail | undefined>;
     load(id: string): Promise<void>;
     getEntityId(): string | undefined;
     getEntityType(): string;
-    getData(): UserResponseModel | undefined;
-    updateProperty<PropertyName extends keyof UserResponseModel>(propertyName: PropertyName, value: UserResponseModel[PropertyName]): void;
+    getData(): UmbUserDetail | undefined;
+    updateProperty<PropertyName extends keyof UmbUserDetail>(propertyName: PropertyName, value: UmbUserDetail[PropertyName]): void;
     save(): Promise<void>;
     destroy(): void;
 }

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

@@ -1,11 +1,18 @@
 import { UmbUserRepository } from '../repository/user.repository.js';
 import { UmbWorkspaceContext } from '../../../core/workspace/index.js';
 import { UmbObjectState } from '../../../../libs/observable-api/index.js';
+import { UmbContextConsumerController } from '../../../../libs/context-api/index.js';
+import { UMB_AUTH } from '../../../../shared/auth/index.js';
+import { firstValueFrom } from '../../../../external/rxjs/index.js';
 export class UmbUserWorkspaceContext extends UmbWorkspaceContext {
+    #authContext;
     constructor(host) {
-        super(host, new UmbUserRepository(host));
+        super(host, 'Umb.Workspace.User', new UmbUserRepository(host));
         this.#data = new UmbObjectState(undefined);
         this.data = this.#data.asObservable();
+        new UmbContextConsumerController(host, UMB_AUTH, (auth) => {
+            this.#authContext = auth;
+        });
     }
     #data;
     async load(id) {
@@ -41,6 +48,16 @@ export class UmbUserWorkspaceContext extends UmbWorkspaceContext {
         }
         // If it went well, then its not new anymore?.
         this.setIsNew(false);
+        // If we are saving the current user, we need to refetch it
+        await this.#reloadCurrentUser(this.#data.value.id);
+    }
+    async #reloadCurrentUser(savedUserId) {
+        if (!this.#authContext)
+            return;
+        const currentUser = await firstValueFrom(this.#authContext.currentUser);
+        if (currentUser?.id === savedUserId) {
+            await this.#authContext.fetchCurrentUser();
+        }
     }
     destroy() {
         this.#data.complete();

package/dist-cms/shared/auth/auth.context.d.ts

@@ -7,6 +7,7 @@ export declare class UmbAuthContext implements IUmbAuth {
     #private;
     readonly currentUser: import("rxjs/internal/Observable.js").Observable<UmbLoggedInUser | undefined>;
     readonly isLoggedIn: ReplaySubject<boolean>;
+    readonly languageIsoCode: import("rxjs/internal/Observable.js").Observable<string>;
     constructor(host: UmbControllerHostElement, authFlow: UmbAuthFlow);
     setInitialState(): Promise<void>;
     fetchCurrentUser(): Promise<UmbLoggedInUser | undefined>;

package/dist-cms/shared/auth/auth.context.js

@@ -10,6 +10,7 @@ export class UmbAuthContext {
         this.#currentUser = new UmbObjectState(undefined);
         this.currentUser = this.#currentUser.asObservable();
         this.isLoggedIn = new ReplaySubject(1);
+        this.languageIsoCode = this.#currentUser.asObservablePart((user) => user?.languageIsoCode ?? 'en-us');
         this.#host = host;
         this.#authFlow = authFlow;
         this.isLoggedIn.subscribe((isLoggedIn) => {
@@ -23,8 +24,6 @@ export class UmbAuthContext {
     }
     async fetchCurrentUser() {
         const { data } = await tryExecuteAndNotify(this.#host, UserResource.getUserCurrent());
-        if (!data)
-            return;
         this.#currentUser.next(data);
         return data;
     }

package/dist-cms/shared/auth/auth.interface.d.ts

@@ -19,6 +19,10 @@ export interface IUmbAuth {
      * Get the current user model of the current user.
      */
     get currentUser(): Observable<UmbLoggedInUser | undefined>;
+    /**
+     * Get the current user's language ISO code.
+     */
+    languageIsoCode: Observable<string>;
     /**
      * Make a server request for the current user and save the state
      */

package/dist-cms/shared/repository/data-source/data-source-response.interface.d.ts

@@ -1,5 +1,5 @@
 import type { ApiError, CancelError } from '../../../external/backend-api/index.js';
-export interface DataSourceResponse<T = undefined> extends UmbDataSourceErrorResponse {
+export interface DataSourceResponse<T = unknown> extends UmbDataSourceErrorResponse {
     data?: T;
 }
 export interface UmbDataSourceErrorResponse {