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

package/dist-cms/packages/templating/partial-views/workspace/partial-views-workspace.context.d.ts

@@ -1,20 +1,22 @@
-import { UmbTemplateRepository } from '../repository/partial-views.repository.js';
-import { TemplateResponseModel } from '../../../../external/backend-api/index.js';
+import { UmbPartialViewsRepository } from '../repository/partial-views.repository.js';
+import { PartialViewDetails } from '../config.js';
 import { UmbControllerHostElement } from '../../../../libs/controller-api/index.js';
 import { UmbWorkspaceContext } from '../../../core/workspace/index.js';
-export declare class UmbPartialViewsWorkspaceContext extends UmbWorkspaceContext<UmbTemplateRepository, TemplateResponseModel> {
+export declare class UmbPartialViewsWorkspaceContext extends UmbWorkspaceContext<UmbPartialViewsRepository, PartialViewDetails> {
     #private;
     getEntityId(): string | undefined;
     getEntityType(): string;
     save(): Promise<void>;
     destroy(): void;
-    data: import("rxjs").Observable<TemplateResponseModel | undefined>;
+    data: import("rxjs").Observable<import("../../../../external/backend-api/index.js").TextFileResponseModelBaseModel | undefined>;
     name: import("rxjs").Observable<string | undefined>;
-    content: import("rxjs").Observable<string | null | undefined>;
+    content: import("rxjs").Observable<string | undefined>;
+    path: import("rxjs").Observable<string | undefined>;
+    isCodeEditorReady: import("rxjs").Observable<boolean>;
     constructor(host: UmbControllerHostElement);
-    getData(): TemplateResponseModel | undefined;
+    getData(): import("../../../../external/backend-api/index.js").TextFileResponseModelBaseModel | undefined;
     setName(value: string): void;
     setContent(value: string): void;
     load(entityKey: string): Promise<void>;
-    create(parentKey: string | null): Promise<void>;
+    create(parentKey: string | null, name?: string): Promise<void>;
 }

package/dist-cms/packages/templating/partial-views/workspace/partial-views-workspace.context.js

@@ -1,35 +1,72 @@
-import { UmbTemplateRepository } from '../repository/partial-views.repository.js';
-import { createObservablePart, UmbDeepState } from '../../../../libs/observable-api/index.js';
+import { UmbPartialViewsRepository } from '../repository/partial-views.repository.js';
+import { createObservablePart, UmbBooleanState, UmbDeepState } from '../../../../libs/observable-api/index.js';
 import { UmbWorkspaceContext } from '../../../core/workspace/index.js';
+import { loadCodeEditor } from '../../code-editor/index.js';
+// TODO: I think this should be named PartialViewWorkspace... not with an 's'
 export class UmbPartialViewsWorkspaceContext extends UmbWorkspaceContext {
     getEntityId() {
-        throw new Error('Method not implemented.');
+        return this.getData()?.path;
     }
     getEntityType() {
         throw new Error('Method not implemented.');
     }
     save() {
-        throw new Error('Method not implemented.');
+        const partialView = this.getData();
+        if (!partialView)
+            return Promise.reject('Something went wrong, there is no data for partial view you want to save...');
+        if (this.getIsNew()) {
+            const createRequestBody = {
+                name: partialView.name,
+                content: partialView.content,
+                parentPath: partialView.path + '/',
+            };
+            this.repository.create(createRequestBody);
+            console.log('create');
+            return Promise.resolve();
+        }
+        if (!partialView.path)
+            return Promise.reject('There is no path');
+        const updateRequestBody = {
+            name: partialView.name,
+            existingPath: partialView.path,
+            content: partialView.content,
+        };
+        this.repository.save(partialView.path, updateRequestBody);
+        return Promise.resolve();
     }
     destroy() {
         throw new Error('Method not implemented.');
     }
     #data;
+    #isCodeEditorReady;
     constructor(host) {
-        super(host, new UmbTemplateRepository(host));
+        super(host, 'Umb.Workspace.PartialViews', new UmbPartialViewsRepository(host));
         this.#data = new UmbDeepState(undefined);
         this.data = this.#data.asObservable();
         this.name = createObservablePart(this.#data, (data) => data?.name);
         this.content = createObservablePart(this.#data, (data) => data?.content);
+        this.path = createObservablePart(this.#data, (data) => data?.path);
+        this.#isCodeEditorReady = new UmbBooleanState(false);
+        this.isCodeEditorReady = this.#isCodeEditorReady.asObservable();
+        this.#loadCodeEditor();
+    }
+    async #loadCodeEditor() {
+        try {
+            await loadCodeEditor();
+            this.#isCodeEditorReady.next(true);
+        }
+        catch (error) {
+            console.error(error);
+        }
     }
     getData() {
         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 });
     }
     setContent(value) {
-        this.#data.next({ ...this.#data.value, $type: this.#data.value?.$type || '', content: value });
+        this.#data.next({ ...this.#data.value, content: value });
     }
     async load(entityKey) {
         const { data } = await this.repository.requestByKey(entityKey);
@@ -38,11 +75,16 @@ export class UmbPartialViewsWorkspaceContext extends UmbWorkspaceContext {
             this.#data.next(data);
         }
     }
-    async create(parentKey) {
-        const { data } = await this.repository.createScaffold(parentKey);
+    async create(parentKey, name = 'Empty') {
+        const { data } = await this.repository.createScaffold(parentKey, name);
+        const newPartial = {
+            ...data,
+            name: '',
+            path: parentKey ?? '',
+        };
         if (!data)
             return;
         this.setIsNew(true);
-        this.#data.next(data);
+        this.#data.next(newPartial);
     }
 }

package/dist-cms/packages/templating/partial-views/workspace/partial-views-workspace.element.d.ts

@@ -1,6 +1,7 @@
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
 import { UmbRoute } from '../../../../shared/router/index.js';
 import './partial-views-workspace-edit.element.js';
+import '../../components/insert-menu/templating-insert-menu.element.js';
 export declare class UmbPartialViewsWorkspaceElement extends UmbLitElement {
     #private;
     _routes: UmbRoute[];

package/dist-cms/packages/templating/partial-views/workspace/partial-views-workspace.element.js

@@ -9,20 +9,23 @@ import { UUITextStyles } from '../../../../external/uui/index.js';
 import { css, html, customElement, state } from '../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
 import './partial-views-workspace-edit.element.js';
+import '../../components/insert-menu/templating-insert-menu.element.js';
+import { UmbWorkspaceIsNewRedirectController } from '../../../core/workspace/index.js';
 export let UmbPartialViewsWorkspaceElement = class UmbPartialViewsWorkspaceElement extends UmbLitElement {
     constructor() {
         super(...arguments);
         this.#partialViewsWorkspaceContext = new UmbPartialViewsWorkspaceContext(this);
-        this.#routerPath = '';
         this.#element = document.createElement('umb-partial-views-workspace-edit');
-        this.#key = '';
         this._routes = [
             {
-                path: 'create/:parentKey',
+                path: 'create/:parentKey/:snippetName',
                 component: () => this.#element,
                 setup: async (component, info) => {
                     const parentKey = info.match.params.parentKey;
-                    this.#partialViewsWorkspaceContext.create(parentKey);
+                    const decodePath = decodeURIComponent(parentKey);
+                    const snippetName = info.match.params.snippetName;
+                    this.#partialViewsWorkspaceContext.create(decodePath === 'null' ? null : parentKey, snippetName);
+                    new UmbWorkspaceIsNewRedirectController(this, this.#partialViewsWorkspaceContext, this.shadowRoot.querySelector('umb-router-slot'));
                 },
             },
             {
@@ -30,21 +33,16 @@ export let UmbPartialViewsWorkspaceElement = class UmbPartialViewsWorkspaceEleme
                 component: () => this.#element,
                 setup: (component, info) => {
                     const key = info.match.params.key;
-                    this.#partialViewsWorkspaceContext.load(key);
+                    const decodePath = decodeURIComponent(key).replace('-cshtml', '.cshtml');
+                    this.#partialViewsWorkspaceContext.load(decodePath);
                 },
             },
         ];
     }
     #partialViewsWorkspaceContext;
-    #routerPath;
     #element;
-    #key;
     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>`;
     }
     static { this.styles = [UUITextStyles, css ``]; }
 };

package/dist-cms/packages/templating/stylesheets/manifests.d.ts

@@ -1 +1 @@
-export declare const manifests: (import("../../core/index.js").ManifestMenuItemTreeKind | import("../../core/index.js").ManifestRepository | import("../../core/index.js").ManifestTreeStore | import("../../core/index.js").ManifestTree | import("../../core/index.js").ManifestTreeItem | import("../../core/index.js").ManifestWorkspace | import("../../core/index.js").ManifestWorkspaceAction | import("../../core/index.js").ManifestWorkspaceEditorView)[];
+export declare const manifests: (import("../../core/index.js").ManifestMenuItemTreeKind | import("../../core/index.js").ManifestRepository | import("../../core/index.js").ManifestTree | import("../../core/index.js").ManifestTreeItem | import("../../core/index.js").ManifestTreeStore | import("../../core/index.js").ManifestWorkspace | import("../../core/index.js").ManifestWorkspaceAction | import("../../core/index.js").ManifestWorkspaceEditorView)[];

package/dist-cms/packages/templating/stylesheets/menu-item/manifests.js

@@ -9,8 +9,6 @@ const menuItem = {
         label: 'Stylesheets',
         icon: 'umb:folder',
         treeAlias: STYLESHEET_TREE_ALIAS,
-    },
-    conditions: {
         menus: ['Umb.Menu.Templating'],
     },
 };

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

@@ -15,7 +15,7 @@ const treeItem = {
     kind: 'fileSystem',
     alias: 'Umb.TreeItem.Stylesheet',
     name: 'Stylesheet Tree Item',
-    conditions: {
+    meta: {
         entityTypes: ['stylesheet-root', STYLESHEET_ENTITY_TYPE],
     },
 };

package/dist-cms/packages/templating/stylesheets/workspace/stylesheet-workspace.context.js

@@ -4,7 +4,7 @@ import { UmbObjectState } from '../../../../libs/observable-api/index.js';
 export class UmbStylesheetWorkspaceContext extends UmbWorkspaceContext {
     #data;
     constructor(host) {
-        super(host, new UmbStylesheetRepository(host));
+        super(host, 'Umb.Workspace.Stylesheet', new UmbStylesheetRepository(host));
         this.#data = new UmbObjectState(undefined);
         this.data = this.#data.asObservable();
     }

package/dist-cms/packages/templating/stylesheets/workspace/stylesheet-workspace.element.js

@@ -10,6 +10,7 @@ import { UmbStylesheetWorkspaceContext } from './stylesheet-workspace.context.js
 import { UUITextStyles } from '../../../../external/uui/index.js';
 import { css, 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 UmbStylesheetWorkspaceElement = class UmbStylesheetWorkspaceElement extends UmbLitElement {
     constructor() {
         super(...arguments);
@@ -23,6 +24,7 @@ export let UmbStylesheetWorkspaceElement = class UmbStylesheetWorkspaceElement e
                     const path = info.match.params.path;
                     const serverPath = serverFilePathFromUrlFriendlyPath(path);
                     this.#workspaceContext.load(serverPath);
+                    new UmbWorkspaceIsNewRedirectController(this, this.#workspaceContext, this.shadowRoot.querySelector('umb-router-slot'));
                 },
             },
         ];

package/dist-cms/packages/templating/templates/entity-actions/manifests.js

@@ -12,8 +12,6 @@ const entityActions = [
             label: 'Create',
             api: UmbCreateEntityAction,
             repositoryAlias: TEMPLATE_REPOSITORY_ALIAS,
-        },
-        conditions: {
             entityTypes: [TEMPLATE_ENTITY_TYPE, TEMPLATE_ROOT_ENTITY_TYPE],
         },
     },
@@ -26,8 +24,6 @@ const entityActions = [
             label: 'Delete',
             api: UmbDeleteEntityAction,
             repositoryAlias: TEMPLATE_REPOSITORY_ALIAS,
-        },
-        conditions: {
             entityTypes: [TEMPLATE_ENTITY_TYPE],
         },
     },

package/dist-cms/packages/templating/templates/manifests.d.ts

@@ -1 +1 @@
-export declare const manifests: (import("../../core/index.js").ManifestEntityAction | import("../../core/index.js").ManifestMenuItemTreeKind | import("../../core/index.js").ManifestModal | import("../../core/index.js").ManifestRepository | import("../../core/index.js").ManifestStore | import("../../core/index.js").ManifestTreeStore | import("../../core/index.js").ManifestItemStore | import("../../core/index.js").ManifestTree | import("../../core/index.js").ManifestTreeItem | 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").ManifestEntityAction | import("../../core/index.js").ManifestItemStore | import("../../core/index.js").ManifestMenuItemTreeKind | import("../../core/index.js").ManifestRepository | import("../../core/index.js").ManifestStore | import("../../core/index.js").ManifestTree | import("../../core/index.js").ManifestTreeItem | import("../../core/index.js").ManifestTreeStore | import("../../core/index.js").ManifestWorkspace | import("../../core/index.js").ManifestWorkspaceAction | import("../../core/index.js").ManifestWorkspaceEditorView)[];

package/dist-cms/packages/templating/templates/menu-item/manifests.js

@@ -9,8 +9,6 @@ const menuItem = {
         icon: 'umb:folder',
         entityType: 'template',
         treeAlias: 'Umb.Tree.Templates',
-    },
-    conditions: {
         menus: ['Umb.Menu.Templating'],
     },
 };

package/dist-cms/packages/templating/templates/modals/query-builder/query-builder-filter.element.js

@@ -5,7 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { UUITextStyles } from '../../../../../external/uui/index.js';
-import { css, html, customElement, property, query, state } from '../../../../../external/lit/index.js';
+import { css, html, customElement, property, query, state, } from '../../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../../shared/lit-element/index.js';
 import { TemplateQueryPropertyTypeModel, } from '../../../../../external/backend-api/index.js';
 export let UmbQueryBuilderFilterElement = class UmbQueryBuilderFilterElement extends UmbLitElement {
@@ -91,7 +91,7 @@ export let UmbQueryBuilderFilterElement = class UmbQueryBuilderFilterElement ext
 			<span>${this.unremovable ? 'where' : 'and'}</span>
 			<umb-button-with-dropdown look="outline" id="property-alias-dropdown" label="Property alias"
 				>${this.filter?.propertyAlias ?? ''}
-				<uui-combobox-list  slot="dropdown" @change=${this.#setPropertyAlias} class="options-list">
+				<uui-combobox-list slot="dropdown" @change=${this.#setPropertyAlias} class="options-list">
 					${this.settings?.properties?.map((property) => html `<uui-combobox-list-option tabindex="0" .value=${property.alias ?? ''}
 								>${property.alias}</uui-combobox-list-option
 							>`)}

package/dist-cms/packages/templating/templates/repository/manifests.d.ts

@@ -3,4 +3,4 @@ export declare const TEMPLATE_REPOSITORY_ALIAS = "Umb.Repository.Template";
 export declare const TEMPLATE_STORE_ALIAS = "Umb.Store.Template";
 export declare const TEMPLATE_TREE_STORE_ALIAS = "Umb.Store.TemplateTree";
 export declare const TEMPLATE_ITEM_STORE_ALIAS = "Umb.Store.TemplateItem";
-export declare const manifests: (ManifestRepository | ManifestStore | ManifestTreeStore | ManifestItemStore)[];
+export declare const manifests: (ManifestItemStore | ManifestRepository | ManifestStore | ManifestTreeStore)[];

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

@@ -127,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 };
     }

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

@@ -13,6 +13,7 @@ import { css, html, customElement, query, state, nothing } from '../../../../ext
 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;
@@ -30,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;

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');
@@ -130,7 +130,7 @@ ${currentContent}`;
         if (!data)
             return;
         this.setIsNew(true);
-        this.#data.next({ ...data, id: '', name: '', alias: '', $type: 'TemplateResponseModel' });
+        this.#data.next({ ...data, id: '', name: '', alias: '' });
         if (!parentId)
             return;
         await this.setMasterTemplate(parentId);

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

@@ -9,11 +9,11 @@ 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 = [
             {
@@ -22,6 +22,7 @@ export let UmbTemplateWorkspaceElement = class UmbTemplateWorkspaceElement exten
                 setup: (component, info) => {
                     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'));
                 },
             },
             {
@@ -38,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

@@ -7,7 +7,10 @@ export const dashboard = {
     meta: {
         label: '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/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/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;