@umbraco-cms/backoffice 14.0.0-3aaba617 → 14.0.0-3e938fa1

package/dist-cms/packages/templating/templates/workspace/template-workspace-editor.element.js

@@ -5,6 +5,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { UMB_MODAL_TEMPLATING_INSERT_SECTION_MODAL } from '../../modals/insert-section-modal/insert-section-modal.element.js';
+import { UMB_TEMPLATE_QUERY_BUILDER_MODAL } from '../modals/modal-tokens.js';
+import { getQuerySnippet } from '../../utils.js';
 import { camelCase } from '../../../../external/lodash/index.js';
 import { UUITextStyles } from '../../../../external/uui/index.js';
 import { css, html, customElement, query, state, nothing } from '../../../../external/lit/index.js';
@@ -99,6 +101,13 @@ export let UmbTemplateWorkspaceEditorElement = class UmbTemplateWorkspaceEditorE
             this.#templateWorkspaceContext?.setMasterTemplate(data.selection[0] ?? '');
         });
     }
+    #openQueryBuilder() {
+        const queryBuilderModal = this._modalContext?.open(UMB_TEMPLATE_QUERY_BUILDER_MODAL);
+        queryBuilderModal?.onSubmit().then((queryBuilderModalResult) => {
+            if (queryBuilderModalResult.value)
+                this._codeEditor?.insert(getQuerySnippet(queryBuilderModalResult.value));
+        });
+    }
     #renderMasterTemplatePicker() {
         return html `
 			<uui-button-group>
@@ -129,7 +138,12 @@ export let UmbTemplateWorkspaceEditorElement = class UmbTemplateWorkspaceEditorE
     render() {
         // TODO: add correct UI elements
         return html `<umb-workspace-editor alias="Umb.Workspace.Template">
-			<uui-input placeholder="Enter name..." slot="header" .value=${this._name} @input=${this.#onNameInput}
+			<uui-input
+				placeholder="Enter name..."
+				slot="header"
+				.value=${this._name}
+				@input=${this.#onNameInput}
+				label="template name"
 				><umb-template-alias-input
 					slot="append"
 					.value=${this._alias ?? ''}
@@ -140,9 +154,13 @@ export let UmbTemplateWorkspaceEditorElement = class UmbTemplateWorkspaceEditorE
 					${this.#renderMasterTemplatePicker()}
 					<div>
 						<umb-templating-insert-menu @insert=${this.#insertSnippet}></umb-templating-insert-menu>
-						<!-- <uui-button look="secondary" id="query-builder-button" label="Query builder">
+						<uui-button
+							look="secondary"
+							id="query-builder-button"
+							label="Query builder"
+							@click=${this.#openQueryBuilder}>
 							<uui-icon name="umb:wand"></uui-icon>Query builder
-						</uui-button> -->
+						</uui-button>
 						<uui-button
 							look="secondary"
 							id="sections-button"

package/dist-cms/packages/templating/templates/workspace/template-workspace.context.js

@@ -62,13 +62,13 @@ ${currentContent}`;
         return this.#data.getValue();
     }
     setName(value) {
-        this.#data.next({ ...this.#data.value, $type: this.#data.value?.$type || '', name: value });
+        this.#data.next({ ...this.#data.value, name: value });
     }
     setAlias(value) {
-        this.#data.next({ ...this.#data.value, $type: this.#data.value?.$type || '', alias: value });
+        this.#data.next({ ...this.#data.value, alias: value });
     }
     setContent(value) {
-        this.#data.next({ ...this.#data.value, $type: this.#data.value?.$type || '', content: value });
+        this.#data.next({ ...this.#data.value, content: value });
     }
     getLayoutBlockRegexPattern() {
         return new RegExp('(@{[\\s\\S][^if]*?Layout\\s*?=\\s*?)("[^"]*?"|null)(;[\\s\\S]*?})', 'gi');
@@ -114,6 +114,7 @@ ${currentContent}`;
             else {
                 this.repository.requestRootTreeItems();
             }
+            return;
         }
         if (template?.id) {
             await this.repository.save(template.id, {
@@ -121,7 +122,7 @@ ${currentContent}`;
                 content: template.content,
                 alias: template.alias,
             });
-            this.repository.requestTreeItemsOf(this.#masterTemplate.value?.id ?? '');
+            this.repository.requestTreeItemsOf(this.#masterTemplate.value?.id ?? null);
         }
     }
     async create(parentId = null) {
@@ -129,8 +130,8 @@ ${currentContent}`;
         if (!data)
             return;
         this.setIsNew(true);
-        this.#data.next({ ...data, id: '', name: '', alias: '', $type: 'TemplateResponseModel' });
-        if (!parentId || parentId === 'root')
+        this.#data.next({ ...data, id: '', name: '', alias: '' });
+        if (!parentId)
             return;
         await this.setMasterTemplate(parentId);
     }

package/dist-cms/packages/templating/templates/workspace/template-workspace.element.d.ts

@@ -1,5 +1,6 @@
 import type { UmbRoute } from '../../../../shared/router/index.js';
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
+import '../../components/insert-menu/templating-insert-menu.element.js';
 import './template-workspace-editor.element.js';
 export declare class UmbTemplateWorkspaceElement extends UmbLitElement {
     #private;

package/dist-cms/packages/templating/templates/workspace/template-workspace.element.js

@@ -7,20 +7,22 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { UmbTemplateWorkspaceContext } from './template-workspace.context.js';
 import { html, customElement, state } from '../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
+import '../../components/insert-menu/templating-insert-menu.element.js';
 import './template-workspace-editor.element.js';
+import { UmbWorkspaceIsNewRedirectController } from '../../../core/workspace/index.js';
 export let UmbTemplateWorkspaceElement = class UmbTemplateWorkspaceElement extends UmbLitElement {
     constructor() {
         super(...arguments);
         this.#templateWorkspaceContext = new UmbTemplateWorkspaceContext(this);
-        this.#routerPath = '';
         this.#element = document.createElement('umb-template-workspace-editor');
         this._routes = [
             {
-                path: 'create/:parentKey',
+                path: 'create/:parentId',
                 component: () => this.#element,
                 setup: (component, info) => {
-                    const parentKey = info.match.params.parentKey;
-                    this.#templateWorkspaceContext.create(parentKey);
+                    const parentId = info.match.params.parentId === 'null' ? null : info.match.params.parentId;
+                    this.#templateWorkspaceContext.create(parentId);
+                    new UmbWorkspaceIsNewRedirectController(this, this.#templateWorkspaceContext, this.shadowRoot.querySelector('umb-router-slot'));
                 },
             },
             {
@@ -37,14 +39,9 @@ export let UmbTemplateWorkspaceElement = class UmbTemplateWorkspaceElement exten
         this.#templateWorkspaceContext.load(entityId);
     }
     #templateWorkspaceContext;
-    #routerPath;
     #element;
     render() {
-        return html `<umb-router-slot
-			.routes=${this._routes}
-			@init=${(event) => {
-            this.#routerPath = event.target.absoluteRouterPath;
-        }}></umb-router-slot>`;
+        return html `<umb-router-slot .routes=${this._routes}></umb-router-slot>`;
     }
 };
 __decorate([

package/dist-cms/packages/umbraco-news/manifests.js

@@ -6,7 +6,6 @@ export const dashboard = {
     weight: 20,
     meta: {
         label: 'Welcome',
-        pathname: 'welcome',
     },
     conditions: {
         sections: ['Umb.Section.Content'],

package/dist-cms/packages/umbraco-news/umbraco-news-dashboard.element.js

@@ -4,6 +4,7 @@ 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 { UUITextStyles } from '../../external/uui/index.js';
 import { UMB_AUTH } from '../../shared/auth/index.js';
 import { css, html, customElement, state } from '../../external/lit/index.js';
 import { UmbLitElement } from '../../shared/lit-element/index.js';
@@ -26,19 +27,22 @@ export let UmbUmbracoNewsDashboardElement = class UmbUmbracoNewsDashboardElement
     }
     render() {
         return html `
-			<uui-box>
-				<h1>Welcome, ${this.name}</h1>
-				<p>This is a preview version of Umbraco, where you can have a first-hand look at the new Backoffice.</p>
-				<p>There is currently very limited functionality.</p>
+			<uui-box class="uui-text">
+				<h1 class="uui-h2" style="margin-top: var(--uui-size-layout-1);">Welcome, ${this.name}</h1>
+				<p class="uui-lead">
+					This is a preview version of Umbraco, where you can have a first-hand look at the new Backoffice.
+				</p>
 				<p>
+					There is currently very limited functionality.<br />
 					Please refer to the
-					<a target="_blank" href="http://docs.umbraco.com/umbraco-backoffice/">documentation</a> to learn more about
+					<a target="_blank" href="https://docs.umbraco.com/umbraco-backoffice/">documentation</a> to learn more about
 					what is possible.
 				</p>
 			</uui-box>
 		`;
     }
     static { this.styles = [
+        UUITextStyles,
         css `
 			:host {
 				display: block;

package/dist-cms/packages/users/current-user/current-user-history.store.js

@@ -5,7 +5,7 @@ export class UmbCurrentUserHistoryStore extends UmbStoreBase {
     constructor(host) {
         super(host, UMB_CURRENT_USER_HISTORY_STORE_CONTEXT_TOKEN.toString(), new UmbArrayState([]));
         this.history = this._data.asObservable();
-        this.latestHistory = this._data.getObservablePart((historyItems) => historyItems.slice(-10));
+        this.latestHistory = this._data.asObservablePart((historyItems) => historyItems.slice(-10));
         if (!('navigation' in window))
             return;
         window.navigation.addEventListener('navigate', (event) => {

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

@@ -18,13 +18,9 @@ export let UmbCurrentUserModalElement = class UmbCurrentUserModalElement extends
             this.#auth = instance;
             this._observeCurrentUser();
         });
-        this.consumeContext(UMB_AUTH, (instance) => {
-            this.#auth = instance;
-        });
         this.consumeContext(UMB_APP, (instance) => {
             this.#appContext = instance;
         });
-        this._observeCurrentUser();
     }
     async _observeCurrentUser() {
         if (!this.#auth)
@@ -52,8 +48,16 @@ export let UmbCurrentUserModalElement = class UmbCurrentUserModalElement extends
 					<umb-extension-slot id="userProfileApps" type="userProfileApp"></umb-extension-slot>
 				</div>
 				<div slot="actions">
-					<uui-button @click=${this._close} look="secondary">Close</uui-button>
-					<uui-button @click=${this._logout} look="primary" color="danger">Logout</uui-button>
+					<uui-button @click=${this._close} look="secondary" .label=${this.localize.term('general_close')}>
+						${this.localize.term('general_close')}
+					</uui-button>
+					<uui-button
+						@click=${this._logout}
+						look="primary"
+						color="danger"
+						.label=${this.localize.term('general_logout')}>
+						${this.localize.term('general_logout')}
+					</uui-button>
 				</div>
 			</umb-body-layout>
 		`;

package/dist-cms/packages/users/current-user/user-profile-apps/user-profile-app-profile.element.js

@@ -19,7 +19,6 @@ export let UmbUserProfileAppProfileElement = class UmbUserProfileAppProfileEleme
             this._auth = instance;
             this._observeCurrentUser();
         });
-        this._observeCurrentUser();
     }
     async _observeCurrentUser() {
         if (!this._auth)
@@ -44,10 +43,13 @@ export let UmbUserProfileAppProfileElement = class UmbUserProfileAppProfileEleme
     }
     render() {
         return html `
-			<uui-box>
-				<b slot="headline">Your profile</b>
-				<uui-button look="primary" @click=${this._edit}>Edit</uui-button>
-				<uui-button look="primary" @click=${this._changePassword}>Change password</uui-button>
+			<uui-box .headline=${this.localize.term('user_yourProfile')}>
+				<uui-button look="primary" label=${this.localize.term('general_edit')} @click=${this._edit}>
+					${this.localize.term('general_edit')}
+				</uui-button>
+				<uui-button look="primary" label=${this.localize.term('general_changePassword')} @click=${this._changePassword}>
+					${this.localize.term('general_changePassword')}
+				</uui-button>
 			</uui-box>
 		`;
     }

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

@@ -17,7 +17,7 @@ export class UmbUserGroupItemStore extends UmbStoreBase {
         super(host, UMB_USER_GROUP_ITEM_STORE_CONTEXT_TOKEN.toString(), new UmbArrayState([], (x) => x.id));
     }
     items(ids) {
-        return this._data.getObservablePart((items) => items.filter((item) => ids.includes(item.id ?? '')));
+        return this._data.asObservablePart((items) => items.filter((item) => ids.includes(item.id ?? '')));
     }
 }
 export const UMB_USER_GROUP_ITEM_STORE_CONTEXT_TOKEN = new UmbContextToken('UmbUserGroupItemStore');

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

@@ -48,7 +48,7 @@ export class UmbUserGroupStore extends UmbStoreBase {
             .then((data) => {
             this.#groups.append([data]);
         });
-        return this.#groups.getObservablePart((userGroups) => userGroups.find((userGroup) => userGroup.id === id));
+        return this.#groups.asObservablePart((userGroups) => userGroups.find((userGroup) => userGroup.id === id));
     }
     async save(userGroups) {
         // TODO: use Fetcher API.

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

@@ -5,7 +5,7 @@ export declare class UmbUserGroupWorkspaceEditorElement extends UmbLitElement {
     private _userGroup?;
     private _userKeys?;
     constructor();
-    render(): typeof nothing | import("lit-html").TemplateResult<1>;
+    render(): import("lit-html").TemplateResult<1> | typeof nothing;
     static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];
 }
 export default UmbUserGroupWorkspaceEditorElement;

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/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-item.store.js

@@ -17,7 +17,7 @@ export class UmbUserItemStore extends UmbStoreBase {
         super(host, UMB_USER_ITEM_STORE_CONTEXT_TOKEN.toString(), new UmbArrayState([], (x) => x.id));
     }
     items(ids) {
-        return this._data.getObservablePart((items) => items.filter((item) => ids.includes(item.id ?? '')));
+        return this._data.asObservablePart((items) => items.filter((item) => ids.includes(item.id ?? '')));
     }
 }
 export const UMB_USER_ITEM_STORE_CONTEXT_TOKEN = new UmbContextToken('UmbUserItemStore');

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) {
@@ -27,7 +27,7 @@ export class UmbUserStore extends UmbStoreBase {
      * @memberof UmbUserStore
      */
     byId(id) {
-        return this._data.getObservablePart((x) => x.find((y) => y.id === id));
+        return this._data.asObservablePart((x) => x.find((y) => y.id === id));
     }
     /**
      * Removes data-types in the store with the given uniques

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/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[];