@umbraco-cms/backoffice 14.0.0-f96e8145 → 14.0.0-ffdc9ddb

package/dist-cms/custom-elements.json

@@ -7561,7 +7561,7 @@
         {
           "name": "styles",
           "type": "array",
-          "default": "[null]"
+          "default": "[\"UUITextStyles\",null]"
         }
       ]
     },

package/dist-cms/libs/class-api/class.mixin.js

@@ -6,7 +6,7 @@ export const UmbClassMixin = (superClass) => {
         constructor(host, controllerAlias) {
             super();
             this._host = host;
-            this._controllerAlias = controllerAlias ?? undefined; // ?? Symbol();
+            this._controllerAlias = controllerAlias ?? Symbol(); // This will fallback to a Symbol, ensuring that this class is only appended to the controller host once.
         }
         getHostElement() {
             return this._host.getHostElement();

package/dist-cms/packages/core/collection/collection-selection-actions.element.d.ts

@@ -12,7 +12,7 @@ export declare class UmbCollectionSelectionActionsElement extends UmbLitElement
     private _handleClearSelection;
     private _observeCollectionContext;
     private _renderSelectionCount;
-    render(): typeof nothing | import("lit-html").TemplateResult<1>;
+    render(): import("lit-html").TemplateResult<1> | typeof nothing;
     static styles: import("@lit/reactive-element/css-tag").CSSResult[];
 }
 declare global {

package/dist-cms/packages/core/components/input-checkbox-list/input-checkbox-list.element.d.ts

@@ -15,7 +15,7 @@ export declare class UmbInputCheckboxListElement extends UmbInputCheckboxListEle
     set selected(keys: Array<string>);
     set value(keysString: string);
     protected getFormElement(): undefined;
-    render(): typeof nothing | import("lit-html").TemplateResult<1>;
+    render(): import("lit-html").TemplateResult<1> | typeof nothing;
     renderCheckbox(item: {
         key: string;
         checked: boolean;

package/dist-cms/packages/core/components/input-radio-button-list/input-radio-button-list.element.d.ts

@@ -15,7 +15,7 @@ export declare class UmbInputRadioButtonListElement extends UmbInputRadioButtonL
     set selected(key: string);
     set value(key: string);
     protected getFormElement(): undefined;
-    render(): typeof nothing | import("lit-html").TemplateResult<1>;
+    render(): import("lit-html").TemplateResult<1> | typeof nothing;
     renderRadioButton(item: {
         key: string;
         sortOrder: number;

package/dist-cms/packages/core/debug/debug.element.d.ts

@@ -9,7 +9,7 @@ export declare class UmbDebugElement extends UmbLitElement {
     private _modalContext?;
     constructor();
     connectedCallback(): void;
-    render(): typeof nothing | TemplateResult<1>;
+    render(): TemplateResult<1> | typeof nothing;
     private _toggleDebugPane;
     private _openDialog;
     private _renderDialog;

package/dist-cms/packages/core/modal/token/user-picker-modal.token.d.ts

@@ -1,6 +1,6 @@
 import { UmbModalToken, UmbPickerModalData } from '../index.js';
-import { UserResponseModel } from '../../../../external/backend-api/index.js';
-export type UmbUserPickerModalData = UmbPickerModalData<UserResponseModel>;
+import { UmbUserDetail } from '../../../users/users/index.js';
+export type UmbUserPickerModalData = UmbPickerModalData<UmbUserDetail>;
 export interface UmbUserPickerModalResult {
     selection: Array<string | null>;
 }

package/dist-cms/packages/core/tree/entity-tree-item/entity-tree-item.element.d.ts

@@ -7,7 +7,7 @@ export declare class UmbEntityTreeItemElement extends UmbLitElement implements U
     private _item?;
     get item(): EntityTreeItemResponseModel | undefined;
     set item(value: EntityTreeItemResponseModel | undefined);
-    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[];
 }
 declare global {

package/dist-cms/packages/core/tree/tree-item/tree-item.element.d.ts

@@ -3,7 +3,7 @@ import { TreeItemPresentationModel } from '../../../../external/backend-api/inde
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
 export declare class UmbTreeItemElement extends UmbLitElement {
     item?: TreeItemPresentationModel;
-    render(): typeof nothing | import("lit-html").TemplateResult<1>;
+    render(): import("lit-html").TemplateResult<1> | typeof nothing;
     static styles: import("@lit/reactive-element/css-tag").CSSResult[];
 }
 declare global {

package/dist-cms/packages/core/tree/tree-menu-item/tree-menu-item.element.d.ts

@@ -3,7 +3,7 @@ import { UmbLitElement } from '../../../../shared/lit-element/index.js';
 import { ManifestMenuItemTreeKind, UmbMenuItemExtensionElement } from '../../extension-registry/index.js';
 export declare class UmbMenuItemTreeElement extends UmbLitElement implements UmbMenuItemExtensionElement {
     manifest?: ManifestMenuItemTreeKind;
-    render(): typeof nothing | import("lit-html").TemplateResult<1>;
+    render(): import("lit-html").TemplateResult<1> | typeof nothing;
 }
 export default UmbMenuItemTreeElement;
 declare global {

package/dist-cms/packages/core/workspace/index.d.ts

@@ -1,10 +1,11 @@
-export * from './workspace-action/index.js';
 export * from './workspace-action-menu/index.js';
+export * from './workspace-action/index.js';
+export * from './workspace-context/index.js';
 export * from './workspace-editor/index.js';
 export * from './workspace-footer/index.js';
+export * from './workspace-is-new-redirect-controller/index.js';
 export * from './workspace-modal/index.js';
-export * from './workspace-context/index.js';
-export * from './workspace-variant/index.js';
-export * from './workspace-split-view-manager.class.js';
-export * from './workspace-property/index.js';
 export * from './workspace-property-layout/workspace-property-layout.element.js';
+export * from './workspace-property/index.js';
+export * from './workspace-split-view-manager.class.js';
+export * from './workspace-variant/index.js';

package/dist-cms/packages/core/workspace/index.js

@@ -1,10 +1,11 @@
-export * from './workspace-action/index.js';
 export * from './workspace-action-menu/index.js';
+export * from './workspace-action/index.js';
+export * from './workspace-context/index.js';
 export * from './workspace-editor/index.js';
 export * from './workspace-footer/index.js';
+export * from './workspace-is-new-redirect-controller/index.js';
 export * from './workspace-modal/index.js';
-export * from './workspace-context/index.js';
-export * from './workspace-variant/index.js';
-export * from './workspace-split-view-manager.class.js';
-export * from './workspace-property/index.js';
 export * from './workspace-property-layout/workspace-property-layout.element.js';
+export * from './workspace-property/index.js';
+export * from './workspace-split-view-manager.class.js';
+export * from './workspace-variant/index.js';

package/dist-cms/packages/core/workspace/workspace-context/workspace-context.d.ts

@@ -2,15 +2,15 @@ import { UmbEntityWorkspaceContextInterface } from './workspace-entity-context.i
 import { UmbControllerHostElement } from '../../../../libs/controller-api/index.js';
 import type { UmbEntityBase } from '../../../../shared/models/index.js';
 import { UmbModalContext } from '../../modal/index.js';
-export declare abstract class UmbWorkspaceContext<T, EntityType extends UmbEntityBase> implements UmbEntityWorkspaceContextInterface<EntityType> {
+export declare abstract class UmbWorkspaceContext<RepositoryType, EntityType extends UmbEntityBase> implements UmbEntityWorkspaceContextInterface<EntityType> {
     #private;
     readonly host: UmbControllerHostElement;
-    readonly repository: T;
+    readonly repository: RepositoryType;
     readonly modalContext?: UmbModalContext<{
         preset: object;
     }>;
     isNew: import("rxjs").Observable<boolean | undefined>;
-    constructor(host: UmbControllerHostElement, repository: T);
+    constructor(host: UmbControllerHostElement, repository: RepositoryType);
     getIsNew(): boolean | undefined;
     setIsNew(isNew: boolean): void;
     protected saveComplete(data: EntityType): void;

package/dist-cms/packages/core/workspace/workspace-is-new-redirect-controller/index.d.ts

@@ -0,0 +1 @@
+export * from './workspace-is-new-redirect-controller.js';

package/dist-cms/packages/core/workspace/workspace-is-new-redirect-controller/index.js

@@ -0,0 +1 @@
+export * from './workspace-is-new-redirect-controller.js';

package/dist-cms/packages/core/workspace/workspace-is-new-redirect-controller/workspace-is-new-redirect-controller.d.ts

@@ -0,0 +1,16 @@
+import { UmbWorkspaceContext } from '../workspace-context/index.js';
+import { UmbBaseController, type UmbControllerHost } from '../../../../libs/controller-api/index.js';
+import type { UmbEntityBase } from '../../../../shared/models/index.js';
+import { type UmbRouterSlotElement } from '../../../../shared/router/index.js';
+/**
+ * Observe the workspace context to see if the entity is new or not.
+ * If that changes redirect to the edit url.
+ *
+ * This requires that the edit URL, is edit/:id
+ * @param host
+ * @param workspaceContext
+ * @param router
+ */
+export declare class UmbWorkspaceIsNewRedirectController extends UmbBaseController {
+    constructor(host: UmbControllerHost, workspaceContext: UmbWorkspaceContext<unknown, UmbEntityBase>, router: UmbRouterSlotElement);
+}

package/dist-cms/packages/core/workspace/workspace-is-new-redirect-controller/workspace-is-new-redirect-controller.js

@@ -0,0 +1,31 @@
+import { UmbBaseController } from '../../../../libs/controller-api/index.js';
+import { createRoutePathBuilder } from '../../../../shared/router/index.js';
+import { ensurePathEndsWithSlash } from '../../../../shared/utils/index.js';
+/**
+ * Observe the workspace context to see if the entity is new or not.
+ * If that changes redirect to the edit url.
+ *
+ * This requires that the edit URL, is edit/:id
+ * @param host
+ * @param workspaceContext
+ * @param router
+ */
+export class UmbWorkspaceIsNewRedirectController extends UmbBaseController {
+    constructor(host, workspaceContext, router) {
+        super(host);
+        // Navigate to edit route when language is created:
+        this.observe(workspaceContext.isNew, (isNew) => {
+            if (isNew === false) {
+                const id = workspaceContext.getEntityId();
+                if (router && id) {
+                    const routerPath = router.absoluteRouterPath;
+                    if (routerPath) {
+                        const newPath = createRoutePathBuilder(ensurePathEndsWithSlash(routerPath) + 'edit/:id')({ id });
+                        window.history.pushState({}, '', newPath);
+                        this.destroy();
+                    }
+                }
+            }
+        }, '_observeIsNew');
+    }
+}

package/dist-cms/packages/core/workspace/workspace.element.d.ts

@@ -2,7 +2,7 @@ import { nothing } from '../../../external/lit/index.js';
 import { UmbLitElement } from '../../../shared/lit-element/index.js';
 export declare class UmbWorkspaceElement extends UmbLitElement {
     entityType: string;
-    render(): typeof nothing | import("lit-html").TemplateResult<1>;
+    render(): import("lit-html").TemplateResult<1> | typeof nothing;
     static styles: import("@lit/reactive-element/css-tag").CSSResult[];
 }
 export default UmbWorkspaceElement;

package/dist-cms/packages/documents/document-types/workspace/document-type-workspace.element.js

@@ -7,13 +7,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { UmbDocumentTypeWorkspaceContext } from './document-type-workspace.context.js';
 import { UUITextStyles } from '../../../../external/uui/index.js';
 import { html, customElement, state } from '../../../../external/lit/index.js';
-import { generateRoutePathBuilder } from '../../../../shared/router/index.js';
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
+import { UmbWorkspaceIsNewRedirectController } from '../../../core/workspace/index.js';
 export let UmbDocumentTypeWorkspaceElement = class UmbDocumentTypeWorkspaceElement extends UmbLitElement {
     constructor() {
         super(...arguments);
         this.#workspaceContext = new UmbDocumentTypeWorkspaceContext(this);
-        this.#routerPath = '';
         this._routes = [
             {
                 path: 'create/:parentId',
@@ -21,18 +20,7 @@ export let UmbDocumentTypeWorkspaceElement = class UmbDocumentTypeWorkspaceEleme
                 setup: (_component, info) => {
                     const parentId = info.match.params.parentId === 'null' ? null : info.match.params.parentId;
                     this.#workspaceContext.create(parentId);
-                    // Navigate to edit route when language is created:
-                    this.observe(this.#workspaceContext.isNew, (isNew) => {
-                        if (isNew === false) {
-                            const id = this.#workspaceContext.getEntityId();
-                            if (this.#routerPath && id) {
-                                const routeBasePath = this.#routerPath.endsWith('/') ? this.#routerPath : this.#routerPath + '/';
-                                // TODO: Revisit if this is the right way to change URL:
-                                const newPath = generateRoutePathBuilder(routeBasePath + 'edit/:id')({ id });
-                                window.history.pushState({}, '', newPath);
-                            }
-                        }
-                    }, '_observeIsNew');
+                    new UmbWorkspaceIsNewRedirectController(this, this.#workspaceContext, this.shadowRoot.querySelector('umb-router-slot'));
                 },
             },
             {
@@ -47,15 +35,8 @@ export let UmbDocumentTypeWorkspaceElement = class UmbDocumentTypeWorkspaceEleme
         ];
     }
     #workspaceContext;
-    #routerPath;
     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]; }
 };

package/dist-cms/packages/documents/documents/tree/tree-item/document-tree-item.element.d.ts

@@ -7,7 +7,7 @@ export declare class UmbDocumentTreeItemElement extends UmbLitElement implements
     private _item?;
     get item(): DocumentTreeItemResponseModel | undefined;
     set item(value: DocumentTreeItemResponseModel | undefined);
-    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 UmbDocumentTreeItemElement;

package/dist-cms/packages/documents/documents/workspace/document-workspace-split-view.element.d.ts

@@ -7,7 +7,7 @@ export declare class UmbDocumentWorkspaceSplitViewElement extends UmbLitElement
     _variants?: Array<ActiveVariant>;
     constructor();
     private _observeActiveVariantInfo;
-    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 UmbDocumentWorkspaceSplitViewElement;

package/dist-cms/packages/documents/documents/workspace/document-workspace.element.js

@@ -9,6 +9,7 @@ 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 './document-workspace-editor.element.js';
+import { UmbWorkspaceIsNewRedirectController } from '../../../core/workspace/index.js';
 export let UmbDocumentWorkspaceElement = class UmbDocumentWorkspaceElement extends UmbLitElement {
     constructor() {
         super(...arguments);
@@ -23,6 +24,7 @@ export let UmbDocumentWorkspaceElement = class UmbDocumentWorkspaceElement exten
                     const parentId = info.match.params.parentId === 'null' ? null : info.match.params.parentId;
                     const documentTypeKey = info.match.params.documentTypeKey;
                     this.#workspaceContext.create(documentTypeKey, parentId);
+                    new UmbWorkspaceIsNewRedirectController(this, this.#workspaceContext, this.shadowRoot.querySelector('umb-router-slot'));
                 },
             },
             {

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

@@ -4,7 +4,7 @@ export declare class UmbMediaWorkspaceEditorElement extends UmbLitElement {
     #private;
     _id?: string;
     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 UmbMediaWorkspaceEditorElement;

package/dist-cms/packages/search/examine-management-dashboard/views/modal-views/fields-viewer.element.d.ts

@@ -5,7 +5,7 @@ export declare class UmbModalElementFieldsViewerElement extends UmbModalBaseElem
     name: string;
 }> {
     private _handleClose;
-    render(): typeof nothing | import("lit-html").TemplateResult<1>;
+    render(): import("lit-html").TemplateResult<1> | typeof nothing;
     static styles: import("@lit/reactive-element/css-tag").CSSResult[];
 }
 declare global {

package/dist-cms/packages/settings/dashboards/health-check/views/health-check-group.element.d.ts

@@ -14,7 +14,7 @@ export declare class UmbDashboardHealthCheckGroupElement extends UmbLitElement {
     private _buttonHandler;
     private _onActionClick;
     render(): import("lit-html").TemplateResult<1>;
-    renderCheckResults(id: string): typeof nothing | import("lit-html").TemplateResult<1>;
+    renderCheckResults(id: string): import("lit-html").TemplateResult<1> | typeof nothing;
     private renderIcon;
     private renderActions;
     static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];

package/dist-cms/packages/settings/data-types/workspace/data-type-workspace.element.js

@@ -9,6 +9,7 @@ import { UUITextStyles } from '../../../../external/uui/index.js';
 import { html, customElement } from '../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
 import './data-type-workspace-editor.element.js';
+import { UmbWorkspaceIsNewRedirectController } from '../../../core/workspace/index.js';
 export let UmbDataTypeWorkspaceElement = class UmbDataTypeWorkspaceElement extends UmbLitElement {
     constructor() {
         super(...arguments);
@@ -21,6 +22,7 @@ export let UmbDataTypeWorkspaceElement = class UmbDataTypeWorkspaceElement exten
                 setup: (_component, info) => {
                     const parentId = info.match.params.parentId === 'null' ? null : info.match.params.parentId;
                     this.#workspaceContext.create(parentId);
+                    new UmbWorkspaceIsNewRedirectController(this, this.#workspaceContext, this.shadowRoot.querySelector('umb-router-slot'));
                 },
             },
             {

package/dist-cms/packages/settings/languages/workspace/language/language-workspace.element.js

@@ -7,14 +7,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { UmbLanguageWorkspaceContext } from './language-workspace.context.js';
 import { UUITextStyles } from '../../../../../external/uui/index.js';
 import { css, html, customElement, state } from '../../../../../external/lit/index.js';
-import { generateRoutePathBuilder } from '../../../../../shared/router/index.js';
 import { UmbLitElement } from '../../../../../shared/lit-element/index.js';
 import './language-workspace-editor.element.js';
+import { UmbWorkspaceIsNewRedirectController } from '../../../../core/workspace/index.js';
 export let UmbLanguageWorkspaceElement = class UmbLanguageWorkspaceElement extends UmbLitElement {
     constructor() {
         super(...arguments);
         this.#languageWorkspaceContext = new UmbLanguageWorkspaceContext(this);
-        this.#routerPath = '';
         this.#getComponentElement = async () => {
             if (this.#editorElement) {
                 return this.#editorElement;
@@ -36,18 +35,7 @@ export let UmbLanguageWorkspaceElement = class UmbLanguageWorkspaceElement exten
                 component: this.#getComponentElement,
                 setup: async () => {
                     this.#languageWorkspaceContext.create();
-                    // Navigate to edit route when language is created:
-                    this.observe(this.#languageWorkspaceContext.isNew, (isNew) => {
-                        if (isNew === false) {
-                            const isoCode = this.#languageWorkspaceContext.getEntityId();
-                            if (this.#routerPath && isoCode) {
-                                const routeBasePath = this.#routerPath.endsWith('/') ? this.#routerPath : this.#routerPath + '/';
-                                // TODO: Revisit if this is the right way to change URL:
-                                const newPath = generateRoutePathBuilder(routeBasePath + 'edit/:isoCode')({ isoCode });
-                                window.history.pushState({}, '', newPath);
-                            }
-                        }
-                    }, '_observeIsNew');
+                    new UmbWorkspaceIsNewRedirectController(this, this.#languageWorkspaceContext, this.shadowRoot.querySelector('umb-router-slot'));
                 },
             },
         ];
@@ -57,14 +45,9 @@ export let UmbLanguageWorkspaceElement = class UmbLanguageWorkspaceElement exten
      * Workspace editor element, lazy loaded but shared across several user flows.
      */
     #editorElement;
-    #routerPath;
     #getComponentElement;
     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/settings/languages/workspace/language-root/components/language-root-table-delete-column-layout.element.d.ts

@@ -5,7 +5,7 @@ export declare class UmbLanguageRootTableDeleteColumnLayoutElement extends UmbLi
     #private;
     value: LanguageResponseModel;
     _isOpen: boolean;
-    render(): typeof nothing | import("lit-html").TemplateResult<1>;
+    render(): import("lit-html").TemplateResult<1> | typeof nothing;
     static styles: import("@lit/reactive-element/css-tag").CSSResult[];
 }
 declare global {

package/dist-cms/packages/settings/languages/workspace/language-root/components/language-root-table-name-column-layout.element.d.ts

@@ -4,7 +4,7 @@ export declare class UmbLanguageRootTableNameColumnLayoutElement extends LitElem
         isoCode: string;
         name: string;
     };
-    render(): typeof nothing | import("lit-html").TemplateResult<1>;
+    render(): import("lit-html").TemplateResult<1> | typeof nothing;
     static styles: import("@lit/reactive-element/css-tag").CSSResult[];
 }
 declare global {

package/dist-cms/packages/settings/relation-types/workspace/relation-type-workspace.element.js

@@ -9,6 +9,7 @@ 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 './relation-type-workspace-editor.element.js';
+import { UmbWorkspaceIsNewRedirectController } from '../../../core/workspace/index.js';
 /**
  * @element umb-relation-type-workspace
  * @description - Element for displaying a Relation Type Workspace
@@ -27,6 +28,7 @@ export let UmbRelationTypeWorkspaceElement = class UmbRelationTypeWorkspaceEleme
                 setup: (_component, info) => {
                     const parentId = info.match.params.parentId;
                     this.#workspaceContext.createScaffold(parentId);
+                    new UmbWorkspaceIsNewRedirectController(this, this.#workspaceContext, this.shadowRoot.querySelector('umb-router-slot'));
                 },
             },
             {

package/dist-cms/packages/templating/components/file-system-tree-item/file-system-tree-item.element.d.ts

@@ -7,7 +7,7 @@ export declare class UmbFileSystemTreeItemElement extends UmbLitElement implemen
     private _item?;
     get item(): FileSystemTreeItemPresentationModel | undefined;
     set item(value: FileSystemTreeItemPresentationModel | undefined);
-    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[];
 }
 declare global {

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

@@ -9,13 +9,12 @@ 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 { 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',
@@ -23,6 +22,7 @@ export let UmbPartialViewsWorkspaceElement = class UmbPartialViewsWorkspaceEleme
                 setup: async (component, info) => {
                     const parentKey = info.match.params.parentKey;
                     this.#partialViewsWorkspaceContext.create(parentKey);
+                    new UmbWorkspaceIsNewRedirectController(this, this.#partialViewsWorkspaceContext, this.shadowRoot.querySelector('umb-router-slot'));
                 },
             },
             {
@@ -36,15 +36,9 @@ export let UmbPartialViewsWorkspaceElement = class UmbPartialViewsWorkspaceEleme
         ];
     }
     #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/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/create/create.action.js

@@ -6,7 +6,7 @@ export class UmbCreateEntityAction extends UmbEntityActionBase {
     // TODO: can we make this a generic create action
     async execute() {
         // TODO: get entity type from repository?
-        const url = `section/settings/workspace/template/create/${this.unique || 'root'}`;
+        const url = `section/settings/workspace/template/create/${this.unique || 'null'}`;
         // TODO: how do we handle this with a href?
         history.pushState(null, '', url);
     }

package/dist-cms/packages/templating/templates/modals/query-builder/query-builder.element.d.ts

@@ -1,5 +1,4 @@
 import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
-import './query-builder-filter.element.js';
 export interface TemplateQueryBuilderModalData {
     hidePartialViews?: boolean;
 }

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

@@ -10,7 +10,6 @@ import { css, html, customElement, state, query, queryAll } from '../../../../..
 import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
 import { UMB_DOCUMENT_PICKER_MODAL, UMB_MODAL_MANAGER_CONTEXT_TOKEN, } from '../../../../core/modal/index.js';
 import { UmbDocumentRepository } from '../../../../documents/documents/index.js';
-import './query-builder-filter.element.js';
 var SortOrder;
 (function (SortOrder) {
     SortOrder["Ascending"] = "ascending";

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

@@ -131,7 +131,7 @@ ${currentContent}`;
             return;
         this.setIsNew(true);
         this.#data.next({ ...data, id: '', name: '', alias: '', $type: 'TemplateResponseModel' });
-        if (!parentId || parentId === 'root')
+        if (!parentId)
             return;
         await this.setMasterTemplate(parentId);
     }

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

@@ -9,19 +9,20 @@ 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 === 'root' ? null : 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'));
                 },
             },
             {
@@ -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([