@umbraco-cms/backoffice 14.0.0-7247a987 → 14.0.0-78252bab

package/dist-cms/packages/templating/templates/repository/template.repository.js

@@ -4,6 +4,7 @@ import { UmbTemplateTreeServerDataSource } from './sources/template.tree.server.
 import { UmbTemplateDetailServerDataSource } from './sources/template.detail.server.data.js';
 import { UMB_TEMPLATE_ITEM_STORE_CONTEXT_TOKEN } from './template-item.store.js';
 import { UmbTemplateItemServerDataSource } from './sources/template.item.server.data.js';
+import { UmbTemplateQueryBuilderServerDataSource } from './sources/template.query-builder.server.data.js';
 import { UMB_NOTIFICATION_CONTEXT_TOKEN } from '../../../core/notification/index.js';
 import { UmbContextConsumerController } from '../../../../libs/context-api/index.js';
 export class UmbTemplateRepository {
@@ -16,11 +17,13 @@ export class UmbTemplateRepository {
     #treeStore;
     #store;
     #notificationContext;
+    #queryBuilderSource;
     constructor(host) {
         this.#host = host;
         this.#treeDataSource = new UmbTemplateTreeServerDataSource(this.#host);
         this.#detailDataSource = new UmbTemplateDetailServerDataSource(this.#host);
         this.#itemSource = new UmbTemplateItemServerDataSource(this.#host);
+        this.#queryBuilderSource = new UmbTemplateQueryBuilderServerDataSource(this.#host);
         this.#init = Promise.all([
             new UmbContextConsumerController(this.#host, UMB_TEMPLATE_ITEM_STORE_CONTEXT_TOKEN, (instance) => {
                 this.#itemStore = instance;
@@ -105,20 +108,6 @@ export class UmbTemplateRepository {
         }
         return { data, error, asObservable: () => this.#treeStore.items([id]) };
     }
-    // ITEMS:
-    async requestItems(ids) {
-        if (!ids)
-            throw new Error('Ids are missing');
-        await this.#init;
-        const { data, error } = await this.#itemSource.getItems(ids);
-        if (data) {
-            this.#itemStore?.appendItems(data);
-        }
-        return { data, error, asObservable: () => this.#itemStore.items(ids) };
-    }
-    async items(uniques) {
-        throw new Error('items method is not implemented in UmbTemplateRepository');
-    }
     async byId(id) {
         if (!id)
             throw new Error('Key is missing');
@@ -138,7 +127,7 @@ export class UmbTemplateRepository {
         }
         // TODO: we currently don't use the detail store for anything.
         // Consider to look up the data before fetching from the server
-        //this.#store?.append({ ...template, $type: 'EntityTreeItemResponseModel' });
+        //this.#store?.append({ ...template });
         // TODO: Update tree store with the new item? or ask tree to request the new item?
         return { error };
     }
@@ -179,4 +168,29 @@ export class UmbTemplateRepository {
         this.#treeStore?.removeItem(id);
         return { error };
     }
+    //#endregion
+    //#region TEMPLATE_QUERY:
+    async getTemplateQuerySettings() {
+        await this.#init;
+        return this.#queryBuilderSource.getTemplateQuerySettings();
+    }
+    async postTemplateQueryExecute({ requestBody }) {
+        await this.#init;
+        return this.#queryBuilderSource.postTemplateQueryExecute({ requestBody });
+    }
+    //#endregion
+    //#region ITEMS:
+    async requestItems(ids) {
+        if (!ids)
+            throw new Error('Ids are missing');
+        await this.#init;
+        const { data, error } = await this.#itemSource.getItems(ids);
+        if (data) {
+            this.#itemStore?.appendItems(data);
+        }
+        return { data, error, asObservable: () => this.#itemStore.items(ids) };
+    }
+    async items(uniques) {
+        throw new Error('items method is not implemented in UmbTemplateRepository');
+    }
 }

package/dist-cms/packages/templating/templates/repository/template.store.js

@@ -30,10 +30,10 @@ export class UmbTemplateStore extends UmbStoreBase {
      * @memberof UmbTemplateStore
      */
     byId(id) {
-        return this._data.getObservablePart((x) => x.find((y) => y.id === id));
+        return this._data.asObservablePart((x) => x.find((y) => y.id === id));
     }
     items(uniques) {
-        return this._data.getObservablePart((x) => x.filter((y) => uniques.includes(y.id)));
+        return this._data.asObservablePart((x) => x.filter((y) => uniques.includes(y.id)));
     }
     /**
      * Removes templates in the store with the given uniques

package/dist-cms/packages/templating/templates/tree/manifests.js

@@ -13,7 +13,7 @@ const treeItem = {
     kind: 'entity',
     alias: 'Umb.TreeItem.Template',
     name: 'Template Tree Item',
-    conditions: {
+    meta: {
         entityTypes: [TEMPLATE_ROOT_ENTITY_TYPE, TEMPLATE_ENTITY_TYPE],
     },
 };

package/dist-cms/packages/templating/templates/workspace/manifests.js

@@ -21,9 +21,12 @@ const workspaceActions = [
             label: 'Save',
             api: UmbSaveWorkspaceAction,
         },
-        conditions: {
-            workspaces: ['Umb.Workspace.Template'],
-        },
+        conditions: [
+            {
+                alias: 'Umb.Condition.WorkspaceAlias',
+                match: workspace.alias,
+            },
+        ],
     },
 ];
 export const manifests = [workspace, ...workspaceViews, ...workspaceActions];

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

@@ -5,12 +5,15 @@ 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';
 import { UMB_MODAL_MANAGER_CONTEXT_TOKEN, UMB_TEMPLATE_PICKER_MODAL, } from '../../../core/modal/index.js';
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
 import { Subject, debounceTime } from '../../../../external/rxjs/index.js';
+import { UMB_WORKSPACE_CONTEXT } from '../../../core/workspace/index.js';
 export let UmbTemplateWorkspaceEditorElement = class UmbTemplateWorkspaceEditorElement extends UmbLitElement {
     #templateWorkspaceContext;
     #isNew;
@@ -28,7 +31,7 @@ export let UmbTemplateWorkspaceEditorElement = class UmbTemplateWorkspaceEditorE
         this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
             this._modalContext = instance;
         });
-        this.consumeContext('UmbEntityWorkspaceContext', (workspaceContext) => {
+        this.consumeContext(UMB_WORKSPACE_CONTEXT, (workspaceContext) => {
             this.#templateWorkspaceContext = workspaceContext;
             this.observe(this.#templateWorkspaceContext.name, (name) => {
                 this._name = name;
@@ -99,6 +102,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 +139,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 +155,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

@@ -7,7 +7,7 @@ export class UmbTemplateWorkspaceContext extends UmbWorkspaceContext {
     #masterTemplate;
     #isCodeEditorReady;
     constructor(host) {
-        super(host, new UmbTemplateRepository(host));
+        super(host, 'Umb.Workspace.Template', new UmbTemplateRepository(host));
         this.#data = new UmbDeepState(undefined);
         this.data = this.#data.asObservable();
         this.#masterTemplate = new UmbObjectState(null);
@@ -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,9 +6,11 @@ export const dashboard = {
     weight: 20,
     meta: {
         label: 'Welcome',
-        pathname: 'welcome',
-    },
-    conditions: {
-        sections: ['Umb.Section.Content'],
     },
+    conditions: [
+        {
+            alias: 'Umb.Condition.SectionAlias',
+            match: '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/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/user-groups/repository/manifests.d.ts

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

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/section-view/manifests.js

@@ -11,9 +11,12 @@ const sectionsViews = [
             pathname: 'user-groups',
             icon: 'umb:users',
         },
-        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/user-groups/workspace/actions/workspace-action-user-group-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 UmbWorkspaceActionUserGroupSaveElement = class UmbWorkspaceActionUserGroupSaveElement 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/user-groups/workspace/manifests.js

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

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-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>>;
 }