@umbraco-cms/backoffice 14.0.0-rc3 → 14.0.0-rc4

package/dist-cms/packages/search/examine-management-dashboard/views/section-view-examine-searchers.js

@@ -4,26 +4,32 @@ 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 { UMB_EXAMINE_FIELDS_SETTINGS_MODAL, UMB_EXAMINE_FIELDS_VIEWER_MODAL } from '../modal/index.js';
 import { UmbTextStyles } from '../../../core/style/index.js';
 import { css, html, nothing, customElement, state, query, property } from '../../../../external/lit/index.js';
-import { UMB_MODAL_MANAGER_CONTEXT, UMB_EXAMINE_FIELDS_SETTINGS_MODAL } from '../../../core/modal/index.js';
+import { UMB_MODAL_MANAGER_CONTEXT, UMB_WORKSPACE_MODAL, UmbModalRouteRegistrationController, } from '../../../core/modal/index.js';
 import { SearcherService } from '../../../../external/backend-api/index.js';
 import { UmbLitElement, umbFocus } from '../../../core/lit-element/index.js';
 import { tryExecuteAndNotify } from '../../../core/resources/index.js';
-import './modal-views/fields-viewer.element.js';
-import './modal-views/fields-settings-modal.element.js';
 let UmbDashboardExamineSearcherElement = class UmbDashboardExamineSearcherElement extends UmbLitElement {
-    constructor() {
-        super(...arguments);
-        this._searchLoading = false;
-    }
-    _onNameClick() {
-        // TODO:
-        alert('TODO: Open workspace for ' + this.searcherName);
-    }
     _onKeyPress(e) {
         e.key == 'Enter' ? this._onSearch() : undefined;
     }
+    #entityType;
+    constructor() {
+        super();
+        this._searchLoading = false;
+        this._workspacePath = 'aa';
+        this.#entityType = '';
+        new UmbModalRouteRegistrationController(this, UMB_WORKSPACE_MODAL)
+            .addAdditionalPath(':entityType')
+            .onSetup((routingInfo) => {
+            return { data: { entityType: routingInfo.entityType, preset: {} } };
+        })
+            .observeRouteBuilder((routeBuilder) => {
+            this._workspacePath = routeBuilder({ entityType: this.#entityType });
+        });
+    }
     async _onSearch() {
         if (!this._searchInput.value.length)
             return;
@@ -63,34 +69,43 @@ let UmbDashboardExamineSearcherElement = class UmbDashboardExamineSearcherElemen
         const modalContext = modalManager.open(this, UMB_EXAMINE_FIELDS_SETTINGS_MODAL, {
             value: { fields: this._exposedFields ?? [] },
         });
-        modalContext?.onSubmit().then((value) => {
-            this._exposedFields = value.fields;
-        });
+        await modalContext.onSubmit().catch(() => undefined);
+        const value = modalContext.getValue();
+        this._exposedFields = value?.fields;
     }
     async #onFieldViewClick(rowData) {
         const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
-        modalManager.open(this, 'umb-modal-element-fields-viewer', {
+        const modalContext = modalManager.open(this, UMB_EXAMINE_FIELDS_VIEWER_MODAL, {
             modal: {
                 type: 'sidebar',
                 size: 'medium',
             },
-            data: { ...rowData, name: this.getSearchResultNodeName(rowData) },
+            data: { searchResult: rowData, name: this.getSearchResultNodeName(rowData) },
         });
+        await modalContext.onSubmit().catch(() => undefined);
     }
     render() {
         return html `
-			<uui-box headline="Search">
-				<p>Search the ${this.searcherName} and view the results</p>
+			<uui-box headline=${this.localize.term('general_search')}>
+				<p>
+					<umb-localize key="examineManagement_searchDescription"
+						>Search the ${this.searcherName} and view the results</umb-localize
+					>
+				</p>
 				<div class="flex">
 					<uui-input
 						type="search"
 						id="search-input"
-						placeholder="Type to filter..."
-						label="Type to filter"
+						placeholder=${this.localize.term('placeholders_filter')}
+						label=${this.localize.term('placeholders_filter')}
 						@keypress=${this._onKeyPress}
 						${umbFocus()}>
 					</uui-input>
-					<uui-button color="positive" look="primary" label="Search" @click="${this._onSearch}"> Search </uui-button>
+					<uui-button
+						color="positive"
+						look="primary"
+						label=${this.localize.term('general_search')}
+						@click="${this._onSearch}"></uui-button>
 				</div>
 				${this.renderSearchResults()}
 			</uui-box>
@@ -101,30 +116,44 @@ let UmbDashboardExamineSearcherElement = class UmbDashboardExamineSearcherElemen
         const nodeNameField = searchResult.fields?.find((field) => field.name?.toUpperCase() === 'NODENAME');
         return nodeNameField?.values?.join(', ') ?? '';
     }
+    #getEntityTypeFromIndexType(indexType) {
+        switch (indexType) {
+            case 'content':
+                return 'document';
+            default:
+                return indexType;
+        }
+    }
     renderSearchResults() {
         if (this._searchLoading)
             return html `<uui-loader></uui-loader>`;
         if (!this._searchResults)
             return nothing;
         if (!this._searchResults.length) {
-            return html `<p>No results found</p>`;
+            return html `<p>${this.localize.term('examineManagement_noResults')}</p>`;
         }
         return html `<div class="table-container">
 			<uui-scroll-container>
 				<uui-table class="search">
 					<uui-table-head>
 						<uui-table-head-cell style="width:0">Score</uui-table-head-cell>
-						<uui-table-head-cell style="width:0">Id</uui-table-head-cell>
-						<uui-table-head-cell>Name</uui-table-head-cell>
-						<uui-table-head-cell>Fields</uui-table-head-cell>
+						<uui-table-head-cell style="width:0">${this.localize.term('general_id')}</uui-table-head-cell>
+						<uui-table-head-cell>${this.localize.term('general_name')}</uui-table-head-cell>
+						<uui-table-head-cell>${this.localize.term('examineManagement_fields')}</uui-table-head-cell>
 						${this.renderHeadCells()}
 					</uui-table-head>
 					${this._searchResults?.map((rowData) => {
+            const indexType = rowData.fields?.find((field) => field.name === '__IndexType')?.values?.join(', ') ?? '';
+            this.#entityType = this.#getEntityTypeFromIndexType(indexType);
+            const unique = rowData.fields?.find((field) => field.name === '__Key')?.values?.join(', ') ?? '';
             return html `<uui-table-row>
 							<uui-table-cell> ${rowData.score} </uui-table-cell>
 							<uui-table-cell> ${rowData.id} </uui-table-cell>
 							<uui-table-cell>
-								<uui-button look="secondary" label="Open workspace for this document" @click="${this._onNameClick}">
+								<uui-button
+									look="secondary"
+									label=${this.localize.term('actions_editContent')}
+									href=${this._workspacePath + this.#entityType + '/edit/' + unique}>
 									${this.getSearchResultNodeName(rowData)}
 								</uui-button>
 							</uui-table-cell>
@@ -132,9 +161,10 @@ let UmbDashboardExamineSearcherElement = class UmbDashboardExamineSearcherElemen
 								<uui-button
 									class="bright"
 									look="secondary"
-									label="Open sidebar to see all fields"
+									label=${this.localize.term('examineManagement_fieldValues')}
 									@click=${() => this.#onFieldViewClick(rowData)}>
-									${rowData.fields ? Object.keys(rowData.fields).length : ''} fields
+									${rowData.fields ? Object.keys(rowData.fields).length : ''}
+									${this.localize.term('examineManagement_fields')}
 								</uui-button>
 							</uui-table-cell>
 							${rowData.fields ? this.renderBodyCells(rowData.fields) : ''}
@@ -159,7 +189,7 @@ let UmbDashboardExamineSearcherElement = class UmbDashboardExamineSearcherElemen
 							<span>${field.name}</span>
 							<uui-button
 								look="secondary"
-								label="Close field ${field.name}"
+								label="${this.localize.term('actions_remove')} ${field.name}"
 								compact
 								@click="${() => {
                     this._exposedFields = this._exposedFields?.map((f) => {
@@ -277,6 +307,9 @@ __decorate([
 __decorate([
     query('#search-input')
 ], UmbDashboardExamineSearcherElement.prototype, "_searchInput", void 0);
+__decorate([
+    state()
+], UmbDashboardExamineSearcherElement.prototype, "_workspacePath", void 0);
 UmbDashboardExamineSearcherElement = __decorate([
     customElement('umb-dashboard-examine-searcher')
 ], UmbDashboardExamineSearcherElement);

package/dist-cms/packages/search/manifests.d.ts

@@ -1,2 +1,3 @@
 import type { ManifestTypes } from '../core/extension-registry/index.js';
+import './examine-management-dashboard/index.js';
 export declare const manifests: Array<ManifestTypes>;

package/dist-cms/packages/search/manifests.js

@@ -1,3 +1,5 @@
+import { manifests as examineManifests } from './examine-management-dashboard/manifests.js';
+import './examine-management-dashboard/index.js';
 export const manifests = [
     {
         type: 'headerApp',
@@ -35,10 +37,5 @@ export const manifests = [
             },
         ],
     },
-    {
-        type: 'modal',
-        alias: 'Umb.Modal.ExamineFieldsSettings',
-        name: 'Examine Field Settings Modal',
-        js: () => import('./examine-management-dashboard/views/modal-views/fields-settings-modal.element.js'),
-    },
+    ...examineManifests,
 ];

package/dist-cms/packages/search/umb-search-header-app.element.d.ts

@@ -1,11 +1,8 @@
-import type { CSSResultGroup } from '../../external/lit/index.js';
-import { UmbLitElement } from '../core/lit-element/index.js';
-export declare class UmbSearchHeaderAppElement extends UmbLitElement {
+import { UmbHeaderAppButtonElement } from '../core/components/index.js';
+export declare class UmbSearchHeaderAppElement extends UmbHeaderAppButtonElement {
     #private;
-    private _modalContext?;
-    constructor();
     render(): import("lit-html").TemplateResult<1>;
-    static styles: CSSResultGroup;
+    static styles: import("@lit/reactive-element/css-tag.js").CSSResultGroup;
 }
 export default UmbSearchHeaderAppElement;
 declare global {

package/dist-cms/packages/search/umb-search-header-app.element.js

@@ -5,19 +5,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { UMB_SEARCH_MODAL } from './search-modal/search-modal.token.js';
-import { UmbTextStyles } from '../core/style/index.js';
-import { css, html, customElement } from '../../external/lit/index.js';
+import { html, customElement } from '../../external/lit/index.js';
 import { UMB_MODAL_MANAGER_CONTEXT } from '../core/modal/index.js';
-import { UmbLitElement } from '../core/lit-element/index.js';
-let UmbSearchHeaderAppElement = class UmbSearchHeaderAppElement extends UmbLitElement {
-    constructor() {
-        super();
-        this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (_instance) => {
-            this._modalContext = _instance;
-        });
-    }
-    #onSearchClick() {
-        this._modalContext?.open(this, UMB_SEARCH_MODAL);
+import { UmbHeaderAppButtonElement } from '../core/components/index.js';
+let UmbSearchHeaderAppElement = class UmbSearchHeaderAppElement extends UmbHeaderAppButtonElement {
+    async #onSearchClick() {
+        const context = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
+        context.open(this, UMB_SEARCH_MODAL);
     }
     render() {
         return html `
@@ -26,15 +20,7 @@ let UmbSearchHeaderAppElement = class UmbSearchHeaderAppElement extends UmbLitEl
 			</uui-button>
 		`;
     }
-    static { this.styles = [
-        UmbTextStyles,
-        css `
-			uui-button {
-				font-size: 18px;
-				--uui-button-background-color: transparent;
-			}
-		`,
-    ]; }
+    static { this.styles = UmbHeaderAppButtonElement.styles; }
 };
 UmbSearchHeaderAppElement = __decorate([
     customElement('umb-search-header-app')

package/dist-cms/packages/static-file/tree/static-file-tree.server.data-source.js

@@ -1,4 +1,4 @@
-import { UMB_STATIC_FILE_ENTITY_TYPE, UMB_STATIC_FILE_FOLDER_ENTITY_TYPE } from '../entity.js';
+import { UMB_STATIC_FILE_ENTITY_TYPE, UMB_STATIC_FILE_FOLDER_ENTITY_TYPE, UMB_STATIC_FILE_ROOT_ENTITY_TYPE, } from '../entity.js';
 import { UmbServerFilePathUniqueSerializer } from '../../core/server-file-system/index.js';
 import { UmbTreeServerDataSourceBase } from '../../core/tree/index.js';
 import { StaticFileService, } from '../../../external/backend-api/index.js';
@@ -27,7 +27,7 @@ const getRootItems = (args) =>
 // eslint-disable-next-line local-rules/no-direct-api-import
 StaticFileService.getTreeStaticFileRoot({ skip: args.skip, take: args.take });
 const getChildrenOf = (args) => {
-    const parentPath = new UmbServerFilePathUniqueSerializer().toServerPath(args.parentUnique);
+    const parentPath = new UmbServerFilePathUniqueSerializer().toServerPath(args.parent.unique);
     if (parentPath === null) {
         return getRootItems(args);
     }
@@ -43,13 +43,16 @@ const getChildrenOf = (args) => {
 const getAncestorsOf = (args) => 
 // eslint-disable-next-line local-rules/no-direct-api-import
 StaticFileService.getTreeStaticFileAncestors({
-    descendantPath: args.descendantUnique,
+    descendantPath: args.treeItem.unique,
 });
 const mapper = (item) => {
     const serializer = new UmbServerFilePathUniqueSerializer();
     return {
         unique: serializer.toUnique(item.path),
-        parentUnique: item.parent ? serializer.toUnique(item.parent.path) : null,
+        parent: {
+            unique: item.parent ? serializer.toUnique(item.parent.path) : null,
+            entityType: item.parent ? UMB_STATIC_FILE_ENTITY_TYPE : UMB_STATIC_FILE_ROOT_ENTITY_TYPE,
+        },
         entityType: item.isFolder ? UMB_STATIC_FILE_FOLDER_ENTITY_TYPE : UMB_STATIC_FILE_ENTITY_TYPE,
         name: item.name,
         isFolder: item.isFolder,

package/dist-cms/packages/static-file/tree/types.d.ts

@@ -1,8 +1,8 @@
 import type { UmbStaticFileEntityType, UmbStaticFileFolderEntityType, UmbStaticFileRootEntityType } from '../entity.js';
-import type { UmbUniqueTreeItemModel, UmbUniqueTreeRootModel } from '../../core/tree/index.js';
-export interface UmbStaticFileTreeItemModel extends UmbUniqueTreeItemModel {
+import type { UmbTreeItemModel, UmbTreeRootModel } from '../../core/tree/index.js';
+export interface UmbStaticFileTreeItemModel extends UmbTreeItemModel {
     entityType: UmbStaticFileEntityType | UmbStaticFileFolderEntityType;
 }
-export interface UmbStaticFileTreeRootModel extends UmbUniqueTreeRootModel {
+export interface UmbStaticFileTreeRootModel extends UmbTreeRootModel {
     entityType: UmbStaticFileRootEntityType;
 }

package/dist-cms/packages/templating/partial-views/entity-actions/create/options-modal/index.d.ts

@@ -1,8 +1,6 @@
+import type { UmbEntityModel } from '../../../../../core/entity/index.js';
 import { UmbModalToken } from '../../../../../core/modal/index.js';
 export interface UmbPartialViewCreateOptionsModalData {
-    parent: {
-        unique: string | null;
-        entityType: string;
-    };
+    parent: UmbEntityModel;
 }
 export declare const UMB_PARTIAL_VIEW_CREATE_OPTIONS_MODAL: UmbModalToken<UmbPartialViewCreateOptionsModalData, unknown>;

package/dist-cms/packages/templating/partial-views/entity-actions/create/snippet-modal/create-from-snippet-modal.token.d.ts

@@ -1,8 +1,6 @@
+import type { UmbEntityModel } from '../../../../../core/entity/index.js';
 import { UmbModalToken } from '../../../../../core/modal/index.js';
 export interface UmbCreatePartialViewFromSnippetModalData {
-    parent: {
-        unique: string | null;
-        entityType: string;
-    };
+    parent: UmbEntityModel;
 }
 export declare const UMB_PARTIAL_VIEW_FROM_SNIPPET_MODAL: UmbModalToken<UmbCreatePartialViewFromSnippetModalData, string>;

package/dist-cms/packages/templating/partial-views/tree/partial-view-tree.server.data-source.js

@@ -1,4 +1,4 @@
-import { UMB_PARTIAL_VIEW_ENTITY_TYPE, UMB_PARTIAL_VIEW_FOLDER_ENTITY_TYPE } from '../entity.js';
+import { UMB_PARTIAL_VIEW_ENTITY_TYPE, UMB_PARTIAL_VIEW_FOLDER_ENTITY_TYPE, UMB_PARTIAL_VIEW_ROOT_ENTITY_TYPE, } from '../entity.js';
 import { UmbServerFilePathUniqueSerializer } from '../../../core/server-file-system/index.js';
 import { UmbTreeServerDataSourceBase } from '../../../core/tree/index.js';
 import { PartialViewService } from '../../../../external/backend-api/index.js';
@@ -27,7 +27,7 @@ const getRootItems = (args) =>
 // eslint-disable-next-line local-rules/no-direct-api-import
 PartialViewService.getTreePartialViewRoot({ skip: args.skip, take: args.take });
 const getChildrenOf = (args) => {
-    const parentPath = new UmbServerFilePathUniqueSerializer().toServerPath(args.parentUnique);
+    const parentPath = new UmbServerFilePathUniqueSerializer().toServerPath(args.parent.unique);
     if (parentPath === null) {
         return getRootItems(args);
     }
@@ -41,7 +41,7 @@ const getChildrenOf = (args) => {
     }
 };
 const getAncestorsOf = (args) => {
-    const descendantPath = new UmbServerFilePathUniqueSerializer().toServerPath(args.descendantUnique);
+    const descendantPath = new UmbServerFilePathUniqueSerializer().toServerPath(args.treeItem.unique);
     if (!descendantPath)
         throw new Error('Descendant path is not available');
     // eslint-disable-next-line local-rules/no-direct-api-import
@@ -53,7 +53,10 @@ const mapper = (item) => {
     const serializer = new UmbServerFilePathUniqueSerializer();
     return {
         unique: serializer.toUnique(item.path),
-        parentUnique: item.parent ? serializer.toUnique(item.parent?.path) : null,
+        parent: {
+            unique: item.parent ? serializer.toUnique(item.parent.path) : null,
+            entityType: item.parent ? UMB_PARTIAL_VIEW_ENTITY_TYPE : UMB_PARTIAL_VIEW_ROOT_ENTITY_TYPE,
+        },
         entityType: item.isFolder ? UMB_PARTIAL_VIEW_FOLDER_ENTITY_TYPE : UMB_PARTIAL_VIEW_ENTITY_TYPE,
         name: item.name,
         isFolder: item.isFolder,

package/dist-cms/packages/templating/partial-views/tree/types.d.ts

@@ -1,8 +1,8 @@
 import type { UmbPartialViewEntityType, UmbPartialViewFolderEntityType, UmbPartialViewRootEntityType } from '../entity.js';
-import type { UmbUniqueTreeItemModel, UmbUniqueTreeRootModel } from '../../../core/tree/index.js';
-export interface UmbPartialViewTreeItemModel extends UmbUniqueTreeItemModel {
+import type { UmbTreeItemModel, UmbTreeRootModel } from '../../../core/tree/index.js';
+export interface UmbPartialViewTreeItemModel extends UmbTreeItemModel {
     entityType: UmbPartialViewEntityType | UmbPartialViewFolderEntityType;
 }
-export interface UmbPartialViewTreeRootModel extends UmbUniqueTreeRootModel {
+export interface UmbPartialViewTreeRootModel extends UmbTreeRootModel {
     entityType: UmbPartialViewRootEntityType;
 }

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

@@ -7,8 +7,10 @@ export declare class UmbPartialViewWorkspaceContext extends UmbSubmittableWorksp
     #private;
     readonly repository: UmbPartialViewDetailRepository;
     readonly parentUnique: import("rxjs/internal/Observable").Observable<string | null | undefined>;
+    readonly parentEntityType: import("rxjs/internal/Observable").Observable<string | undefined>;
     readonly data: import("rxjs/internal/Observable").Observable<UmbPartialViewDetailModel | undefined>;
     readonly unique: import("rxjs/internal/Observable").Observable<string | undefined>;
+    readonly entityType: import("rxjs/internal/Observable").Observable<"partial-view" | undefined>;
     readonly name: import("rxjs/internal/Observable").Observable<string | undefined>;
     readonly content: import("rxjs/internal/Observable").Observable<string | undefined>;
     readonly isCodeEditorReady: import("rxjs/internal/Observable").Observable<boolean>;

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

@@ -7,8 +7,7 @@ import { loadCodeEditor } from '../../code-editor/index.js';
 import { tryExecuteAndNotify } from '../../../core/resources/index.js';
 import { PartialViewService } from '../../../../external/backend-api/index.js';
 import { UMB_ACTION_EVENT_CONTEXT } from '../../../core/action/index.js';
-import { UmbRequestReloadTreeItemChildrenEvent } from '../../../core/tree/index.js';
-import { UmbRequestReloadStructureForEntityEvent } from '../../../core/entity-action/index.js';
+import { UmbRequestReloadChildrenOfEntityEvent, UmbRequestReloadStructureForEntityEvent, } from '../../../core/entity-action/index.js';
 export class UmbPartialViewWorkspaceContext extends UmbSubmittableWorkspaceContextBase {
     #parent;
     #data;
@@ -18,9 +17,11 @@ export class UmbPartialViewWorkspaceContext extends UmbSubmittableWorkspaceConte
         this.repository = new UmbPartialViewDetailRepository(this);
         this.#parent = new UmbObjectState(undefined);
         this.parentUnique = this.#parent.asObservablePart((parent) => (parent ? parent.unique : undefined));
+        this.parentEntityType = this.#parent.asObservablePart((parent) => (parent ? parent.entityType : undefined));
         this.#data = new UmbObjectState(undefined);
         this.data = this.#data.asObservable();
         this.unique = this.#data.asObservablePart((data) => data?.unique);
+        this.entityType = this.#data.asObservablePart((data) => data?.entityType);
         this.name = this.#data.asObservablePart((data) => data?.name);
         this.content = this.#data.asObservablePart((data) => data?.content);
         this.#isCodeEditorReady = new UmbBooleanState(false);
@@ -138,7 +139,7 @@ export class UmbPartialViewWorkspaceContext extends UmbSubmittableWorkspaceConte
             this.#data.setValue(data);
             // TODO: this might not be the right place to alert the tree, but it works for now
             const eventContext = await this.getContext(UMB_ACTION_EVENT_CONTEXT);
-            const event = new UmbRequestReloadTreeItemChildrenEvent({
+            const event = new UmbRequestReloadChildrenOfEntityEvent({
                 entityType: parent.entityType,
                 unique: parent.unique,
             });

package/dist-cms/packages/templating/scripts/entity-actions/create/options-modal/index.d.ts

@@ -1,8 +1,6 @@
+import type { UmbEntityModel } from '../../../../../core/entity/index.js';
 import { UmbModalToken } from '../../../../../core/modal/index.js';
 export interface UmbScriptCreateOptionsModalData {
-    parent: {
-        unique: string | null;
-        entityType: string;
-    };
+    parent: UmbEntityModel;
 }
 export declare const UMB_SCRIPT_CREATE_OPTIONS_MODAL: UmbModalToken<UmbScriptCreateOptionsModalData, unknown>;

package/dist-cms/packages/templating/scripts/tree/script-tree.server.data-source.js

@@ -1,4 +1,4 @@
-import { UMB_SCRIPT_ENTITY_TYPE, UMB_SCRIPT_FOLDER_ENTITY_TYPE } from '../entity.js';
+import { UMB_SCRIPT_ENTITY_TYPE, UMB_SCRIPT_FOLDER_ENTITY_TYPE, UMB_SCRIPT_ROOT_ENTITY_TYPE } from '../entity.js';
 import { UmbServerFilePathUniqueSerializer } from '../../../core/server-file-system/index.js';
 import { UmbTreeServerDataSourceBase } from '../../../core/tree/index.js';
 import { ScriptService } from '../../../../external/backend-api/index.js';
@@ -27,7 +27,7 @@ const getRootItems = (args) =>
 // eslint-disable-next-line local-rules/no-direct-api-import
 ScriptService.getTreeScriptRoot({ skip: args.skip, take: args.take });
 const getChildrenOf = (args) => {
-    const parentPath = new UmbServerFilePathUniqueSerializer().toServerPath(args.parentUnique);
+    const parentPath = new UmbServerFilePathUniqueSerializer().toServerPath(args.parent.unique);
     if (parentPath === null) {
         return getRootItems(args);
     }
@@ -41,7 +41,7 @@ const getChildrenOf = (args) => {
     }
 };
 const getAncestorsOf = (args) => {
-    const descendantPath = new UmbServerFilePathUniqueSerializer().toServerPath(args.descendantUnique);
+    const descendantPath = new UmbServerFilePathUniqueSerializer().toServerPath(args.treeItem.unique);
     if (!descendantPath)
         throw new Error('Descendant path is not available');
     // eslint-disable-next-line local-rules/no-direct-api-import
@@ -53,7 +53,10 @@ const mapper = (item) => {
     const serializer = new UmbServerFilePathUniqueSerializer();
     return {
         unique: serializer.toUnique(item.path),
-        parentUnique: item.parent ? serializer.toUnique(item.parent.path) : null,
+        parent: {
+            unique: item.parent ? serializer.toUnique(item.parent.path) : null,
+            entityType: item.parent ? UMB_SCRIPT_ENTITY_TYPE : UMB_SCRIPT_ROOT_ENTITY_TYPE,
+        },
         entityType: item.isFolder ? UMB_SCRIPT_FOLDER_ENTITY_TYPE : UMB_SCRIPT_ENTITY_TYPE,
         name: item.name,
         isFolder: item.isFolder,

package/dist-cms/packages/templating/scripts/tree/types.d.ts

@@ -1,8 +1,8 @@
 import type { UmbScriptEntityType, UmbScriptFolderEntityType, UmbScriptRootEntityType } from '../entity.js';
-import type { UmbUniqueTreeItemModel, UmbUniqueTreeRootModel } from '../../../core/tree/index.js';
-export interface UmbScriptTreeItemModel extends UmbUniqueTreeItemModel {
+import type { UmbTreeItemModel, UmbTreeRootModel } from '../../../core/tree/index.js';
+export interface UmbScriptTreeItemModel extends UmbTreeItemModel {
     entityType: UmbScriptEntityType | UmbScriptFolderEntityType;
 }
-export interface UmbScriptTreeRootModel extends UmbUniqueTreeRootModel {
+export interface UmbScriptTreeRootModel extends UmbTreeRootModel {
     entityType: UmbScriptRootEntityType;
 }

package/dist-cms/packages/templating/scripts/workspace/script-workspace.context.d.ts

@@ -6,8 +6,10 @@ export declare class UmbScriptWorkspaceContext extends UmbSubmittableWorkspaceCo
     #private;
     readonly repository: UmbScriptDetailRepository;
     readonly parentUnique: import("rxjs/internal/Observable").Observable<string | null | undefined>;
+    readonly parentEntityType: import("rxjs/internal/Observable").Observable<string | undefined>;
     readonly data: import("rxjs/internal/Observable").Observable<UmbScriptDetailModel | undefined>;
     readonly unique: import("rxjs/internal/Observable").Observable<string | undefined>;
+    readonly entityType: import("rxjs/internal/Observable").Observable<"script" | undefined>;
     readonly name: import("rxjs/internal/Observable").Observable<string | undefined>;
     readonly content: import("rxjs/internal/Observable").Observable<string | undefined>;
     readonly isCodeEditorReady: import("rxjs/internal/Observable").Observable<boolean>;

package/dist-cms/packages/templating/scripts/workspace/script-workspace.context.js

@@ -6,8 +6,7 @@ import { UmbBooleanState, UmbObjectState } from '../../../../libs/observable-api
 import { UmbSubmittableWorkspaceContextBase, UmbWorkspaceIsNewRedirectController, UmbWorkspaceRouteManager, } from '../../../core/workspace/index.js';
 import { loadCodeEditor } from '../../code-editor/index.js';
 import { UMB_ACTION_EVENT_CONTEXT } from '../../../core/action/index.js';
-import { UmbRequestReloadTreeItemChildrenEvent } from '../../../core/tree/index.js';
-import { UmbRequestReloadStructureForEntityEvent } from '../../../core/entity-action/index.js';
+import { UmbRequestReloadChildrenOfEntityEvent, UmbRequestReloadStructureForEntityEvent, } from '../../../core/entity-action/index.js';
 export class UmbScriptWorkspaceContext extends UmbSubmittableWorkspaceContextBase {
     #parent;
     #data;
@@ -17,9 +16,11 @@ export class UmbScriptWorkspaceContext extends UmbSubmittableWorkspaceContextBas
         this.repository = new UmbScriptDetailRepository(this);
         this.#parent = new UmbObjectState(undefined);
         this.parentUnique = this.#parent.asObservablePart((parent) => (parent ? parent.unique : undefined));
+        this.parentEntityType = this.#parent.asObservablePart((parent) => (parent ? parent.entityType : undefined));
         this.#data = new UmbObjectState(undefined);
         this.data = this.#data.asObservable();
         this.unique = this.#data.asObservablePart((data) => data?.unique);
+        this.entityType = this.#data.asObservablePart((data) => data?.entityType);
         this.name = this.#data.asObservablePart((data) => data?.name);
         this.content = this.#data.asObservablePart((data) => data?.content);
         this.#isCodeEditorReady = new UmbBooleanState(false);
@@ -118,7 +119,7 @@ export class UmbScriptWorkspaceContext extends UmbSubmittableWorkspaceContextBas
             this.setIsNew(false);
             // TODO: this might not be the right place to alert the tree, but it works for now
             const eventContext = await this.getContext(UMB_ACTION_EVENT_CONTEXT);
-            const event = new UmbRequestReloadTreeItemChildrenEvent({
+            const event = new UmbRequestReloadChildrenOfEntityEvent({
                 entityType: parent.entityType,
                 unique: parent.unique,
             });

package/dist-cms/packages/templating/stylesheets/entity-actions/create/options-modal/index.d.ts

@@ -1,8 +1,6 @@
+import type { UmbEntityModel } from '../../../../../core/entity/index.js';
 import { UmbModalToken } from '../../../../../core/modal/index.js';
 export interface UmbStylesheetCreateOptionsModalData {
-    parent: {
-        unique: string | null;
-        entityType: string;
-    };
+    parent: UmbEntityModel;
 }
 export declare const UMB_STYLESHEET_CREATE_OPTIONS_MODAL: UmbModalToken<UmbStylesheetCreateOptionsModalData, unknown>;

package/dist-cms/packages/templating/stylesheets/tree/stylesheet-tree.server.data-source.js

@@ -1,4 +1,4 @@
-import { UMB_STYLESHEET_ENTITY_TYPE, UMB_STYLESHEET_FOLDER_ENTITY_TYPE } from '../entity.js';
+import { UMB_STYLESHEET_ENTITY_TYPE, UMB_STYLESHEET_FOLDER_ENTITY_TYPE, UMB_STYLESHEET_ROOT_ENTITY_TYPE, } from '../entity.js';
 import { UmbServerFilePathUniqueSerializer } from '../../../core/server-file-system/index.js';
 import { StylesheetService } from '../../../../external/backend-api/index.js';
 import { UmbTreeServerDataSourceBase } from '../../../core/tree/index.js';
@@ -27,7 +27,7 @@ const getRootItems = (args) =>
 // eslint-disable-next-line local-rules/no-direct-api-import
 StylesheetService.getTreeStylesheetRoot({ skip: args.skip, take: args.take });
 const getChildrenOf = (args) => {
-    const parentPath = new UmbServerFilePathUniqueSerializer().toServerPath(args.parentUnique);
+    const parentPath = new UmbServerFilePathUniqueSerializer().toServerPath(args.parent.unique);
     if (parentPath === null) {
         return getRootItems(args);
     }
@@ -41,7 +41,7 @@ const getChildrenOf = (args) => {
     }
 };
 const getAncestorsOf = (args) => {
-    const descendantPath = new UmbServerFilePathUniqueSerializer().toServerPath(args.descendantUnique);
+    const descendantPath = new UmbServerFilePathUniqueSerializer().toServerPath(args.treeItem.unique);
     if (!descendantPath)
         throw new Error('Descendant path is not available');
     // eslint-disable-next-line local-rules/no-direct-api-import
@@ -53,8 +53,11 @@ const mapper = (item) => {
     const serializer = new UmbServerFilePathUniqueSerializer();
     return {
         unique: serializer.toUnique(item.path),
-        parentUnique: item.parent ? serializer.toUnique(item.parent?.path) : null,
         entityType: item.isFolder ? UMB_STYLESHEET_FOLDER_ENTITY_TYPE : UMB_STYLESHEET_ENTITY_TYPE,
+        parent: {
+            unique: item.parent ? serializer.toUnique(item.parent.path) : null,
+            entityType: item.parent ? UMB_STYLESHEET_ENTITY_TYPE : UMB_STYLESHEET_ROOT_ENTITY_TYPE,
+        },
         name: item.name,
         isFolder: item.isFolder,
         hasChildren: item.hasChildren,

package/dist-cms/packages/templating/stylesheets/tree/types.d.ts

@@ -1,8 +1,8 @@
 import type { UmbStylesheetEntityType, UmbStylesheetFolderEntityType, UmbStylesheetRootEntityType } from '../entity.js';
-import type { UmbUniqueTreeItemModel, UmbUniqueTreeRootModel } from '../../../core/tree/index.js';
-export interface UmbStylesheetTreeItemModel extends UmbUniqueTreeItemModel {
+import type { UmbTreeItemModel, UmbTreeRootModel } from '../../../core/tree/index.js';
+export interface UmbStylesheetTreeItemModel extends UmbTreeItemModel {
     entityType: UmbStylesheetEntityType | UmbStylesheetFolderEntityType;
 }
-export interface UmbStylesheetTreeRootModel extends UmbUniqueTreeRootModel {
+export interface UmbStylesheetTreeRootModel extends UmbTreeRootModel {
     entityType: UmbStylesheetRootEntityType;
 }

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

@@ -6,8 +6,10 @@ export declare class UmbStylesheetWorkspaceContext extends UmbSubmittableWorkspa
     #private;
     readonly repository: UmbStylesheetDetailRepository;
     readonly parentUnique: import("rxjs/internal/Observable").Observable<string | null | undefined>;
+    readonly parentEntityType: import("rxjs/internal/Observable").Observable<string | undefined>;
     readonly data: import("rxjs/internal/Observable").Observable<UmbStylesheetDetailModel | undefined>;
     readonly unique: import("rxjs/internal/Observable").Observable<string | undefined>;
+    readonly entityType: import("rxjs/internal/Observable").Observable<"stylesheet" | undefined>;
     readonly name: import("rxjs/internal/Observable").Observable<string | undefined>;
     readonly content: import("rxjs/internal/Observable").Observable<string | undefined>;
     readonly isCodeEditorReady: import("rxjs/internal/Observable").Observable<boolean>;