@umbraco-cms/backoffice 14.0.0--preview004-a5715beb → 14.0.0--preview004-3f36df26

package/dist-cms/packages/dictionary/dictionary/workspace/dictionary-workspace.element.js

@@ -9,6 +9,7 @@ import { UmbDictionaryWorkspaceEditorElement } from './dictionary-workspace-edit
 import { UmbTextStyles } from '../../../../shared/style/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 UmbWorkspaceDictionaryElement = class UmbWorkspaceDictionaryElement extends UmbLitElement {
     constructor() {
         super(...arguments);
@@ -26,9 +27,10 @@ export let UmbWorkspaceDictionaryElement = class UmbWorkspaceDictionaryElement e
             {
                 path: 'create/:parentId',
                 component: () => this.#element,
-                setup: (_component, info) => {
+                setup: async (_component, info) => {
                     const parentId = info.match.params.parentId === 'null' ? null : info.match.params.parentId;
-                    this.#workspaceContext.create(parentId);
+                    await this.#workspaceContext.create(parentId);
+                    new UmbWorkspaceIsNewRedirectController(this, this.#workspaceContext, this.shadowRoot.querySelector('umb-router-slot'));
                 },
             },
         ];

package/dist-cms/packages/templating/scripts/workspace/scripts-workspace-edit.element.d.ts

@@ -1,4 +1,3 @@
-import { PropertyValueMap } from '../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
 export declare class UmbScriptsWorkspaceEditElement extends UmbLitElement {
     #private;
@@ -12,7 +11,6 @@ export declare class UmbScriptsWorkspaceEditElement extends UmbLitElement {
     private _modalContext?;
     private inputQuery$;
     constructor();
-    protected willUpdate(_changedProperties: PropertyValueMap<any> | Map<PropertyKey, unknown>): void;
     render(): import("lit-html").TemplateResult<1>;
     static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];
 }

package/dist-cms/packages/templating/scripts/workspace/scripts-workspace-edit.element.js

@@ -43,6 +43,7 @@ export let UmbScriptsWorkspaceEditElement = class UmbScriptsWorkspaceEditElement
             });
             this.observe(this.#scriptsWorkspaceContext.path, (path) => {
                 this._path = path;
+                this._dirName = this._path?.substring(0, this._path?.lastIndexOf('\\'))?.replace(/\\/g, '/');
             });
             this.observe(this.#scriptsWorkspaceContext.isNew, (isNew) => {
                 this.#isNew = !!isNew;
@@ -55,11 +56,6 @@ export let UmbScriptsWorkspaceEditElement = class UmbScriptsWorkspaceEditElement
             });
         });
     }
-    willUpdate(_changedProperties) {
-        if (_changedProperties.has('_path')) {
-            this._dirName = this._path?.substring(0, this._path?.lastIndexOf('/'));
-        }
-    }
     #onNameInput(event) {
         const target = event.target;
         const value = target.value;

package/dist-cms/packages/templating/stylesheets/workspace/stylesheet-workspace-editor.element.d.ts

@@ -4,6 +4,7 @@ export declare class UmbStylesheetWorkspaceEditorElement extends UmbLitElement {
     private get _name();
     private set _name(value);
     private _path?;
+    private _dirName?;
     private inputQuery$;
     constructor();
     render(): import("lit-html").TemplateResult<1>;

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

@@ -34,8 +34,11 @@ export let UmbStylesheetWorkspaceEditorElement = class UmbStylesheetWorkspaceEdi
     #observeNameAndPath() {
         if (!this.#workspaceContext)
             return;
-        this.observe(this.#workspaceContext.name, (name) => (this._name = name ?? ''), '_observeName');
-        this.observe(this.#workspaceContext.path, (path) => (this._path = path ?? ''), '_observePath');
+        this.observe(this.#workspaceContext.path, (path) => {
+            this._path = path;
+            this._dirName = this._path?.substring(0, this._path?.lastIndexOf('\\') + 1)?.replace(/\\/g, '/');
+        }, '_observeStylesheetPath');
+        this.observe(this.#workspaceContext.name, (name) => (this._name = name), '_observeStylesheetName');
     }
     #onNameChange(event) {
         const target = event.target;
@@ -53,7 +56,7 @@ export let UmbStylesheetWorkspaceEditorElement = class UmbStylesheetWorkspaceEdi
 						.value=${this._name}
 						@input="${this.#onNameChange}">
 					</uui-input>
-					<small>/css/${this._path}</small>
+					<small>/css/${this._dirName}${this._name}.css</small>
 				</div>
 
 				<div slot="footer-info">
@@ -101,6 +104,9 @@ __decorate([
 __decorate([
     state()
 ], UmbStylesheetWorkspaceEditorElement.prototype, "_path", void 0);
+__decorate([
+    state()
+], UmbStylesheetWorkspaceEditorElement.prototype, "_dirName", void 0);
 UmbStylesheetWorkspaceEditorElement = __decorate([
     customElement('umb-stylesheet-workspace-editor')
 ], UmbStylesheetWorkspaceEditorElement);

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

@@ -7,7 +7,7 @@ import { UmbContextToken } from '../../../../libs/context-api/index.js';
 export type RichTextRuleModelSortable = RichTextRuleModel & {
     sortOrder?: number;
 };
-export declare class UmbStylesheetWorkspaceContext extends UmbWorkspaceContext<UmbStylesheetRepository, StylesheetDetails> implements UmbSaveableWorkspaceContextInterface {
+export declare class UmbStylesheetWorkspaceContext extends UmbWorkspaceContext<UmbStylesheetRepository, StylesheetDetails> implements UmbSaveableWorkspaceContextInterface<StylesheetDetails | undefined> {
     #private;
     data: import("rxjs").Observable<import("../../../../external/backend-api/index.js").TextFileResponseModelBaseModel | undefined>;
     rules: import("rxjs").Observable<RichTextRuleModelSortable[]>;

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

@@ -34,7 +34,10 @@ export class UmbStylesheetWorkspaceContext extends UmbWorkspaceContext {
         return 'stylesheet';
     }
     getEntityId() {
-        return this.getData()?.path || '';
+        const path = this.getData()?.path;
+        const name = this.getData()?.name;
+        // TODO: %2F is a slash (/). Should we make it an actual slash in the URL? (%2F for now so that the server can find the correct stylesheet via URL)
+        return path && name ? `${path}%2F${name}` : name || '';
     }
     getData() {
         return this.#data.getValue();
@@ -115,18 +118,23 @@ export class UmbStylesheetWorkspaceContext extends UmbWorkspaceContext {
                 content: stylesheet.content,
                 parentPath: stylesheet.path ?? '',
             };
-            this.repository.create(createRequestBody);
+            const { error } = await this.repository.create(createRequestBody);
+            if (!error) {
+                this.setIsNew(false);
+            }
+            return Promise.resolve();
+        }
+        else {
+            if (!stylesheet.path)
+                return Promise.reject('There is no path');
+            const updateRequestBody = {
+                name: stylesheet.name,
+                existingPath: stylesheet.path,
+                content: stylesheet.content,
+            };
+            this.repository.save(stylesheet.path, updateRequestBody);
             return Promise.resolve();
         }
-        if (!stylesheet.path)
-            return Promise.reject('There is no path');
-        const updateRequestBody = {
-            name: stylesheet.name,
-            existingPath: stylesheet.path,
-            content: stylesheet.content,
-        };
-        this.repository.save(stylesheet.path, updateRequestBody);
-        return Promise.resolve();
     }
     async create(parentKey) {
         const newStylesheet = {