@umbraco-cms/backoffice 14.0.0-bd6f74b3 → 14.0.0-c074e160

package/dist-cms/packages/documents/document-types/repository/document-type.repository.d.ts

@@ -24,6 +24,11 @@ export declare class UmbDocumentTypeRepository implements UmbTreeRepository<Enti
         error: import("../../../../external/backend-api/index.js").ApiError | import("../../../../external/backend-api/index.js").CancelError | undefined;
         asObservable: () => import("rxjs").Observable<EntityTreeItemResponseModel[]>;
     }>;
+    requestItems(ids: Array<string>): Promise<{
+        data: import("../../../../external/backend-api/index.js").DocumentTypeItemResponseModel[] | undefined;
+        error: import("../../../../external/backend-api/index.js").ApiError | import("../../../../external/backend-api/index.js").CancelError | undefined;
+        asObservable: () => import("rxjs").Observable<import("../../../../external/backend-api/index.js").DocumentTypeItemResponseModel[]>;
+    }>;
     requestItemsLegacy(ids: Array<string>): Promise<{
         data: any[] | undefined;
         error: import("../../../../external/backend-api/index.js").ApiError | import("../../../../external/backend-api/index.js").CancelError | undefined;
@@ -38,33 +43,12 @@ export declare class UmbDocumentTypeRepository implements UmbTreeRepository<Enti
     requestById(id: string): Promise<{
         data: DocumentTypeResponseModel | undefined;
         error: import("../../../../external/backend-api/index.js").ApiError | import("../../../../external/backend-api/index.js").CancelError | undefined;
-        asObservable: () => import("rxjs").Observable<any>;
+        asObservable: () => import("rxjs").Observable<DocumentTypeResponseModel | undefined>;
     }>;
-    byId(id: string): Promise<import("rxjs").Observable<any>>;
+    byId(id: string): Promise<import("rxjs").Observable<DocumentTypeResponseModel | undefined>>;
     requestAllowedChildTypesOf(id: string): Promise<import("../../../../shared/repository/index.js").DataSourceResponse<any>>;
     create(documentType: ItemType): Promise<{
-        data: {
-            alias?: string | undefined;
-            name?: string | undefined;
-            description?: string | null | undefined;
-            icon?: string | undefined;
-            allowedAsRoot?: boolean | undefined;
-            variesByCulture?: boolean | undefined;
-            variesBySegment?: boolean | undefined;
-            isElement?: boolean | undefined;
-            properties?: import("../../../../external/backend-api/index.js").PropertyTypeModelBaseModel[] | undefined;
-            containers?: import("../../../../external/backend-api/index.js").PropertyTypeContainerModelBaseModel[] | undefined;
-            allowedContentTypes?: import("../../../../external/backend-api/index.js").ContentTypeSortModel[] | undefined;
-            compositions?: import("../../../../external/backend-api/index.js").ContentTypeCompositionModel[] | undefined;
-            id?: string | undefined;
-            allowedTemplateIds?: string[] | undefined;
-            defaultTemplateId?: string | null | undefined;
-            cleanup?: import("../../../../external/backend-api/index.js").ContentTypeCleanupModel | undefined;
-        };
-        error?: undefined;
-    } | {
         error: import("../../../../external/backend-api/index.js").ApiError | import("../../../../external/backend-api/index.js").CancelError | undefined;
-        data?: undefined;
     }>;
     save(id: string, item: UpdateDocumentTypeRequestModel): Promise<{
         error: import("../../../../external/backend-api/index.js").ApiError | import("../../../../external/backend-api/index.js").CancelError | undefined;

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

@@ -2,6 +2,8 @@ import { UmbDocumentTypeTreeServerDataSource } from './sources/document-type.tre
 import { UmbDocumentTypeServerDataSource } from './sources/document-type.server.data.js';
 import { UMB_DOCUMENT_TYPE_TREE_STORE_CONTEXT_TOKEN } from './document-type.tree.store.js';
 import { UMB_DOCUMENT_TYPE_STORE_CONTEXT_TOKEN } from './document-type.store.js';
+import { UMB_DOCUMENT_TYPE_ITEM_STORE_CONTEXT_TOKEN } from './document-type-item.store.js';
+import { UmbDocumentTypeItemServerDataSource } from './sources/document-type-item.server.data.js';
 import { UmbContextConsumerController } from '../../../../libs/context-api/index.js';
 import { UMB_NOTIFICATION_CONTEXT_TOKEN } from '../../../core/notification/index.js';
 export class UmbDocumentTypeRepository {
@@ -11,12 +13,15 @@ export class UmbDocumentTypeRepository {
     #treeStore;
     #detailDataSource;
     #detailStore;
+    #itemSource;
+    #itemStore;
     #notificationContext;
     constructor(host) {
         this.#host = host;
         // TODO: figure out how spin up get the correct data source
         this.#treeSource = new UmbDocumentTypeTreeServerDataSource(this.#host);
         this.#detailDataSource = new UmbDocumentTypeServerDataSource(this.#host);
+        this.#itemSource = new UmbDocumentTypeItemServerDataSource(this.#host);
         this.#init = Promise.all([
             new UmbContextConsumerController(this.#host, UMB_DOCUMENT_TYPE_TREE_STORE_CONTEXT_TOKEN, (instance) => {
                 this.#treeStore = instance;
@@ -24,12 +29,14 @@ export class UmbDocumentTypeRepository {
             new UmbContextConsumerController(this.#host, UMB_DOCUMENT_TYPE_STORE_CONTEXT_TOKEN, (instance) => {
                 this.#detailStore = instance;
             }),
+            new UmbContextConsumerController(this.#host, UMB_DOCUMENT_TYPE_ITEM_STORE_CONTEXT_TOKEN, (instance) => {
+                this.#itemStore = instance;
+            }),
             new UmbContextConsumerController(this.#host, UMB_NOTIFICATION_CONTEXT_TOKEN, (instance) => {
                 this.#notificationContext = instance;
             }),
         ]);
     }
-    // TODO: Trash
     // TODO: Move
     async requestTreeRoot() {
         await this.#init;
@@ -60,6 +67,16 @@ export class UmbDocumentTypeRepository {
         }
         return { data, error, asObservable: () => this.#treeStore.childrenOf(parentId) };
     }
+    async requestItems(ids) {
+        if (!ids)
+            throw new Error('Document Type Ids are missing');
+        await this.#init;
+        const { data, error } = await this.#itemSource.getItems(ids);
+        if (data) {
+            this.#itemStore?.appendItems(data);
+        }
+        return { data, error, asObservable: () => this.#itemStore.items(ids) };
+    }
     async requestItemsLegacy(ids) {
         await this.#init;
         if (!ids) {
@@ -117,25 +134,13 @@ export class UmbDocumentTypeRepository {
     // Could potentially be general methods:
     async create(documentType) {
         if (!documentType || !documentType.id)
-            throw new Error('Template is missing');
+            throw new Error('Document Type is missing');
         await this.#init;
-        const { error, data } = await this.#detailDataSource.insert(documentType);
-        if (!error && data) {
-            // TODO: The parts here is a hack, when we can trust the IDs we send, then this should be removed/changed:
-            const splitResultUrl = data.split('/');
-            const newId = splitResultUrl[splitResultUrl.length - 1];
-            // Temporary hack while we are not in control of IDs:
-            const newDocument = { ...(await this.requestById(newId)).data };
-            if (newDocument) {
-                const notification = { data: { message: `Document Type created` } };
-                this.#notificationContext?.peek('positive', notification);
-                await this.requestRootTreeItems();
-                // TODO: currently we cannot put this data into our store, cause we don't have the right ID, as the server currently changes it (and other ids of it, container-id and property-id)
-                //this.#detailStore?.append(newDocument);
-                //const treeItem = createTreeItem(newDocument);
-                //this.#treeStore?.appendItems([treeItem]);
-                return { data: newDocument };
-            }
+        const { error } = await this.#detailDataSource.insert(documentType);
+        if (!error) {
+            this.#detailStore?.append(documentType);
+            const treeItem = createTreeItem(documentType);
+            this.#treeStore?.appendItems([treeItem]);
         }
         return { error };
     }
@@ -170,9 +175,10 @@ export class UmbDocumentTypeRepository {
             // TODO: we currently don't use the detail store for anything.
             // Consider to look up the data before fetching from the server.
             // Consider notify a workspace if a template is deleted from the store while someone is editing it.
+            // TODO: would be nice to align the stores on methods/methodNames.
             this.#detailStore?.remove([id]);
             this.#treeStore?.removeItem(id);
-            // TODO: would be nice to align the stores on methods/methodNames.
+            this.#itemStore?.removeItem(id);
         }
         return { error };
     }

package/dist-cms/packages/documents/document-types/repository/document-type.store.d.ts

@@ -8,7 +8,7 @@ import { UmbControllerHostElement } from '../../../../libs/controller-api/index.
  * @extends {UmbStoreBase}
  * @description - Data Store for Document Types
  */
-export declare class UmbDocumentTypeStore extends UmbStoreBase {
+export declare class UmbDocumentTypeStore extends UmbStoreBase<DocumentTypeResponseModel> {
     /**
      * Creates an instance of UmbDocumentTypeStore.
      * @param {UmbControllerHostElement} host
@@ -26,7 +26,7 @@ export declare class UmbDocumentTypeStore extends UmbStoreBase {
      * @param {DocumentTypeModel} document
      * @memberof UmbDocumentTypeStore
      */
-    byId(id: DocumentTypeResponseModel['id']): import("rxjs").Observable<any>;
+    byId(id: DocumentTypeResponseModel['id']): import("rxjs").Observable<DocumentTypeResponseModel | undefined>;
     /**
      * Removes document-types in the store with the given uniques
      * @param {string[]} uniques
@@ -34,4 +34,4 @@ export declare class UmbDocumentTypeStore extends UmbStoreBase {
      */
     remove(uniques: Array<DocumentTypeResponseModel['id']>): void;
 }
-export declare const UMB_DOCUMENT_TYPE_STORE_CONTEXT_TOKEN: UmbContextToken<UmbDocumentTypeStore>;
+export declare const UMB_DOCUMENT_TYPE_STORE_CONTEXT_TOKEN: UmbContextToken<UmbDocumentTypeStore, UmbDocumentTypeStore>;

package/dist-cms/packages/documents/document-types/repository/document-type.tree.store.d.ts

@@ -15,4 +15,4 @@ export declare class UmbDocumentTypeTreeStore extends UmbEntityTreeStore {
      */
     constructor(host: UmbControllerHostElement);
 }
-export declare const UMB_DOCUMENT_TYPE_TREE_STORE_CONTEXT_TOKEN: UmbContextToken<UmbDocumentTypeTreeStore>;
+export declare const UMB_DOCUMENT_TYPE_TREE_STORE_CONTEXT_TOKEN: UmbContextToken<UmbDocumentTypeTreeStore, UmbDocumentTypeTreeStore>;

package/dist-cms/packages/documents/document-types/repository/index.d.ts

@@ -0,0 +1,3 @@
+export * from './document-type.repository.js';
+export * from './document-type.store.js';
+export * from './document-type.tree.store.js';

package/dist-cms/packages/documents/document-types/repository/index.js

@@ -0,0 +1,3 @@
+export * from './document-type.repository.js';
+export * from './document-type.store.js';
+export * from './document-type.tree.store.js';

package/dist-cms/packages/documents/document-types/repository/manifests.d.ts

@@ -1,5 +1,6 @@
-import { ManifestRepository, ManifestStore, ManifestTreeStore } from '../../../core/extension-registry/index.js';
+import { ManifestItemStore, ManifestRepository, ManifestStore, ManifestTreeStore } from '../../../core/extension-registry/index.js';
 export declare const DOCUMENT_TYPE_REPOSITORY_ALIAS = "Umb.Repository.DocumentType";
 export declare const DOCUMENT_TYPE_STORE_ALIAS = "Umb.Store.DocumentType";
 export declare const DOCUMENT_TYPE_TREE_STORE_ALIAS = "Umb.Store.DocumentTypeTree";
-export declare const manifests: (ManifestRepository | ManifestStore | ManifestTreeStore)[];
+export declare const DOCUMENT_TYPE_ITEM_STORE_ALIAS = "Umb.Store.DocumentTypeItem";
+export declare const manifests: (ManifestItemStore | ManifestRepository | ManifestStore | ManifestTreeStore)[];

package/dist-cms/packages/documents/document-types/repository/manifests.js

@@ -1,3 +1,4 @@
+import { UmbDocumentTypeItemStore } from './document-type-item.store.js';
 import { UmbDocumentTypeRepository } from './document-type.repository.js';
 import { UmbDocumentTypeStore } from './document-type.store.js';
 import { UmbDocumentTypeTreeStore } from './document-type.tree.store.js';
@@ -10,6 +11,7 @@ const repository = {
 };
 export const DOCUMENT_TYPE_STORE_ALIAS = 'Umb.Store.DocumentType';
 export const DOCUMENT_TYPE_TREE_STORE_ALIAS = 'Umb.Store.DocumentTypeTree';
+export const DOCUMENT_TYPE_ITEM_STORE_ALIAS = 'Umb.Store.DocumentTypeItem';
 const store = {
     type: 'store',
     alias: DOCUMENT_TYPE_STORE_ALIAS,
@@ -22,4 +24,10 @@ const treeStore = {
     name: 'Document Type Tree Store',
     class: UmbDocumentTypeTreeStore,
 };
-export const manifests = [repository, store, treeStore];
+const itemStore = {
+    type: 'itemStore',
+    alias: DOCUMENT_TYPE_ITEM_STORE_ALIAS,
+    name: 'Document Type Item Store',
+    class: UmbDocumentTypeItemStore,
+};
+export const manifests = [repository, store, treeStore, itemStore];

package/dist-cms/packages/documents/document-types/repository/sources/document-type-item.server.data.d.ts

@@ -0,0 +1,25 @@
+import type { UmbItemDataSource } from '../../../../../shared/repository/index.js';
+import { DocumentTypeItemResponseModel } from '../../../../../external/backend-api/index.js';
+import { UmbControllerHostElement } from '../../../../../libs/controller-api/index.js';
+/**
+ * A data source for Document Type items that fetches data from the server
+ * @export
+ * @class UmbDocumentTypeItemServerDataSource
+ * @implements {UmbItemDataSource}
+ */
+export declare class UmbDocumentTypeItemServerDataSource implements UmbItemDataSource<DocumentTypeItemResponseModel> {
+    #private;
+    /**
+     * Creates an instance of UmbDocumentTypeItemServerDataSource.
+     * @param {UmbControllerHostElement} host
+     * @memberof UmbDocumentTypeItemServerDataSource
+     */
+    constructor(host: UmbControllerHostElement);
+    /**
+     * Fetches the items for the given ids from the server
+     * @param {Array<string>} ids
+     * @return {*}
+     * @memberof UmbDocumentTypeItemServerDataSource
+     */
+    getItems(ids: Array<string>): Promise<import("../../../../../shared/repository/index.js").DataSourceResponse<DocumentTypeItemResponseModel[]>>;
+}

package/dist-cms/packages/documents/document-types/repository/sources/document-type-item.server.data.js

@@ -0,0 +1,32 @@
+import { DocumentTypeResource } from '../../../../../external/backend-api/index.js';
+import { tryExecuteAndNotify } from '../../../../../shared/resources/index.js';
+/**
+ * A data source for Document Type items that fetches data from the server
+ * @export
+ * @class UmbDocumentTypeItemServerDataSource
+ * @implements {UmbItemDataSource}
+ */
+export class UmbDocumentTypeItemServerDataSource {
+    #host;
+    /**
+     * Creates an instance of UmbDocumentTypeItemServerDataSource.
+     * @param {UmbControllerHostElement} host
+     * @memberof UmbDocumentTypeItemServerDataSource
+     */
+    constructor(host) {
+        this.#host = host;
+    }
+    /**
+     * Fetches the items for the given ids from the server
+     * @param {Array<string>} ids
+     * @return {*}
+     * @memberof UmbDocumentTypeItemServerDataSource
+     */
+    async getItems(ids) {
+        if (!ids)
+            throw new Error('Ids are missing');
+        return tryExecuteAndNotify(this.#host, DocumentTypeResource.getDocumentTypeItem({
+            id: ids,
+        }));
+    }
+}

package/dist-cms/packages/documents/document-types/repository/sources/document-type.server.data.js

@@ -72,18 +72,7 @@ export class UmbDocumentTypeServerDataSource {
      */
     async insert(documentType) {
         if (!documentType)
-            throw new Error('Document is missing');
-        //if (!document.id) throw new Error('ID is missing');
-        documentType = { ...documentType };
-        // TODO: Hack to remove some props that ruins the document-type post end-point.
-        documentType.id = undefined;
-        // TODO: Investigate if this matters (should go away anyway when we have the end-point accepts us defining the ids.)
-        documentType.properties = documentType.properties?.map((prop) => {
-            return {
-                ...prop,
-                id: undefined,
-            };
-        });
+            throw new Error('Document Type is missing');
         return tryExecuteAndNotify(this.#host, DocumentTypeResource.postDocumentType({
             requestBody: documentType,
         }));

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

@@ -4,8 +4,8 @@ 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 { UUIInputEvent, UUITextStyles } from '../../../../external/uui/index.js';
-import { css, html, customElement, state } from '../../../../external/lit/index.js';
+import { UUIInputEvent } from '../../../../external/uui/index.js';
+import { css, html, customElement, state, ifDefined } from '../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
 import { UMB_MODAL_MANAGER_CONTEXT_TOKEN, UMB_ICON_PICKER_MODAL, } from '../../../core/modal/index.js';
 import { UMB_WORKSPACE_CONTEXT } from '../../../core/workspace/index.js';
@@ -85,15 +85,16 @@ export let UmbDocumentTypeWorkspaceEditorElement = class UmbDocumentTypeWorkspac
         return html `
 			<umb-workspace-editor alias="Umb.Workspace.DocumentType">
 				<div id="header" slot="header">
-					<uui-button id="icon" @click=${this._handleIconClick} compact>
-						<uui-icon name="${this._icon}" style="color: ${this._iconColorAlias}"></uui-icon>
+					<uui-button id="icon" @click=${this._handleIconClick} label="icon" compact>
+						<uui-icon name="${ifDefined(this._icon)}" style="color: ${this._iconColorAlias}"></uui-icon>
 					</uui-button>
 
-					<uui-input id="name" .value=${this._name} @input="${this.#onNameChange}">
+					<uui-input id="name" .value=${this._name} @input="${this.#onNameChange}" label="name">
 						<!-- TODO: should use UUI-LOCK-INPUT, but that does not fire an event when its locked/unlocked -->
 						<uui-input
 							name="alias"
 							slot="append"
+							label="alias"
 							@input=${this.#onAliasChange}
 							.value=${this._alias}
 							placeholder="Enter alias..."
@@ -123,7 +124,6 @@ export let UmbDocumentTypeWorkspaceEditorElement = class UmbDocumentTypeWorkspac
 		`;
     }
     static { this.styles = [
-        UUITextStyles,
         css `
 			:host {
 				display: block;

package/dist-cms/packages/documents/document-types/workspace/document-type-workspace.context.d.ts

@@ -1,10 +1,11 @@
 import { UmbDocumentTypeRepository } from '../repository/document-type.repository.js';
 import { UmbContentTypePropertyStructureManager } from '../../../core/content-type/index.js';
-import { UmbWorkspaceContext, UmbEntityWorkspaceContextInterface } from '../../../core/workspace/index.js';
+import { UmbWorkspaceContext, UmbSaveableWorkspaceContextInterface } from '../../../core/workspace/index.js';
 import type { ContentTypeCompositionModel, ContentTypeSortModel, DocumentTypeResponseModel } from '../../../../external/backend-api/index.js';
 import { UmbControllerHostElement } from '../../../../libs/controller-api/index.js';
+import { UmbContextToken } from '../../../../libs/context-api/index.js';
 type EntityType = DocumentTypeResponseModel;
-export declare class UmbDocumentTypeWorkspaceContext extends UmbWorkspaceContext<UmbDocumentTypeRepository, EntityType> implements UmbEntityWorkspaceContextInterface<EntityType | undefined> {
+export declare class UmbDocumentTypeWorkspaceContext extends UmbWorkspaceContext<UmbDocumentTypeRepository, EntityType> implements UmbSaveableWorkspaceContextInterface<EntityType | undefined> {
     readonly data: () => import("rxjs").Observable<DocumentTypeResponseModel | undefined>;
     readonly name: import("rxjs").Observable<string | undefined>;
     readonly alias: import("rxjs").Observable<string | undefined>;
@@ -48,4 +49,5 @@ export declare class UmbDocumentTypeWorkspaceContext extends UmbWorkspaceContext
     save(): Promise<void>;
     destroy(): void;
 }
+export declare const UMB_DOCUMENT_TYPE_WORKSPACE_CONTEXT: UmbContextToken<UmbSaveableWorkspaceContextInterface<unknown>, UmbDocumentTypeWorkspaceContext>;
 export {};

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

@@ -1,29 +1,30 @@
 import { UmbDocumentTypeRepository } from '../repository/document-type.repository.js';
 import { UmbContentTypePropertyStructureManager } from '../../../core/content-type/index.js';
 import { UmbWorkspaceContext } from '../../../core/workspace/index.js';
+import { UmbContextToken } from '../../../../libs/context-api/index.js';
 export class UmbDocumentTypeWorkspaceContext extends UmbWorkspaceContext {
     constructor(host) {
         super(host, 'Umb.Workspace.DocumentType', new UmbDocumentTypeRepository(host));
         this.structure = new UmbContentTypePropertyStructureManager(this.host, this.repository);
         // General for content types:
-        this.data = this.structure.ownerDocumentType;
-        this.name = this.structure.ownerDocumentTypeObservablePart((data) => data?.name);
-        this.alias = this.structure.ownerDocumentTypeObservablePart((data) => data?.alias);
-        this.description = this.structure.ownerDocumentTypeObservablePart((data) => data?.description);
-        this.icon = this.structure.ownerDocumentTypeObservablePart((data) => data?.icon);
-        this.allowedAsRoot = this.structure.ownerDocumentTypeObservablePart((data) => data?.allowedAsRoot);
-        this.variesByCulture = this.structure.ownerDocumentTypeObservablePart((data) => data?.variesByCulture);
-        this.variesBySegment = this.structure.ownerDocumentTypeObservablePart((data) => data?.variesBySegment);
-        this.isElement = this.structure.ownerDocumentTypeObservablePart((data) => data?.isElement);
-        this.allowedContentTypes = this.structure.ownerDocumentTypeObservablePart((data) => data?.allowedContentTypes);
-        this.compositions = this.structure.ownerDocumentTypeObservablePart((data) => data?.compositions);
+        this.data = this.structure.ownerContentType;
+        this.name = this.structure.ownerContentTypeObservablePart((data) => data?.name);
+        this.alias = this.structure.ownerContentTypeObservablePart((data) => data?.alias);
+        this.description = this.structure.ownerContentTypeObservablePart((data) => data?.description);
+        this.icon = this.structure.ownerContentTypeObservablePart((data) => data?.icon);
+        this.allowedAsRoot = this.structure.ownerContentTypeObservablePart((data) => data?.allowedAsRoot);
+        this.variesByCulture = this.structure.ownerContentTypeObservablePart((data) => data?.variesByCulture);
+        this.variesBySegment = this.structure.ownerContentTypeObservablePart((data) => data?.variesBySegment);
+        this.isElement = this.structure.ownerContentTypeObservablePart((data) => data?.isElement);
+        this.allowedContentTypes = this.structure.ownerContentTypeObservablePart((data) => data?.allowedContentTypes);
+        this.compositions = this.structure.ownerContentTypeObservablePart((data) => data?.compositions);
         // Document type specific:
-        this.allowedTemplateIds = this.structure.ownerDocumentTypeObservablePart((data) => data?.allowedTemplateIds);
-        this.defaultTemplateId = this.structure.ownerDocumentTypeObservablePart((data) => data?.defaultTemplateId);
-        this.cleanup = this.structure.ownerDocumentTypeObservablePart((data) => data?.defaultTemplateId);
+        this.allowedTemplateIds = this.structure.ownerContentTypeObservablePart((data) => data?.allowedTemplateIds);
+        this.defaultTemplateId = this.structure.ownerContentTypeObservablePart((data) => data?.defaultTemplateId);
+        this.cleanup = this.structure.ownerContentTypeObservablePart((data) => data?.defaultTemplateId);
     }
     getData() {
-        return this.structure.getOwnerDocumentType() || {};
+        return this.structure.getOwnerContentType() || {};
     }
     getEntityId() {
         return this.getData().id;
@@ -32,42 +33,42 @@ export class UmbDocumentTypeWorkspaceContext extends UmbWorkspaceContext {
         return 'document-type';
     }
     setName(name) {
-        this.structure.updateOwnerDocumentType({ name });
+        this.structure.updateOwnerContentType({ name });
     }
     setAlias(alias) {
-        this.structure.updateOwnerDocumentType({ alias });
+        this.structure.updateOwnerContentType({ alias });
     }
     setDescription(description) {
-        this.structure.updateOwnerDocumentType({ description });
+        this.structure.updateOwnerContentType({ description });
     }
     // TODO: manage setting icon color alias?
     setIcon(icon) {
-        this.structure.updateOwnerDocumentType({ icon });
+        this.structure.updateOwnerContentType({ icon });
     }
     setAllowedAsRoot(allowedAsRoot) {
-        this.structure.updateOwnerDocumentType({ allowedAsRoot });
+        this.structure.updateOwnerContentType({ allowedAsRoot });
     }
     setVariesByCulture(variesByCulture) {
-        this.structure.updateOwnerDocumentType({ variesByCulture });
+        this.structure.updateOwnerContentType({ variesByCulture });
     }
     setVariesBySegment(variesBySegment) {
-        this.structure.updateOwnerDocumentType({ variesBySegment });
+        this.structure.updateOwnerContentType({ variesBySegment });
     }
     setIsElement(isElement) {
-        this.structure.updateOwnerDocumentType({ isElement });
+        this.structure.updateOwnerContentType({ isElement });
     }
     setAllowedContentTypes(allowedContentTypes) {
-        this.structure.updateOwnerDocumentType({ allowedContentTypes });
+        this.structure.updateOwnerContentType({ allowedContentTypes });
     }
     setCompositions(compositions) {
-        this.structure.updateOwnerDocumentType({ compositions });
+        this.structure.updateOwnerContentType({ compositions });
     }
     // Document type specific:
     setAllowedTemplateIds(allowedTemplateIds) {
-        this.structure.updateOwnerDocumentType({ allowedTemplateIds });
+        this.structure.updateOwnerContentType({ allowedTemplateIds });
     }
     setDefaultTemplateId(defaultTemplateId) {
-        this.structure.updateOwnerDocumentType({ defaultTemplateId });
+        this.structure.updateOwnerContentType({ defaultTemplateId });
     }
     async create(parentId) {
         const { data } = await this.structure.createScaffold(parentId);
@@ -103,5 +104,7 @@ export class UmbDocumentTypeWorkspaceContext extends UmbWorkspaceContext {
     }
     destroy() {
         this.structure.destroy();
+        super.destroy();
     }
 }
+export const UMB_DOCUMENT_TYPE_WORKSPACE_CONTEXT = new UmbContextToken('UmbWorkspaceContext', (context) => context.getEntityType?.() === 'document-type');

package/dist-cms/packages/documents/document-types/workspace/document-type-workspace.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 { UmbDocumentTypeWorkspaceContext } from './document-type-workspace.context.js';
-import { UUITextStyles } from '../../../../external/uui/index.js';
+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';
@@ -38,7 +38,7 @@ export let UmbDocumentTypeWorkspaceElement = class UmbDocumentTypeWorkspaceEleme
     render() {
         return html ` <umb-router-slot .routes=${this._routes}></umb-router-slot> `;
     }
-    static { this.styles = [UUITextStyles]; }
+    static { this.styles = [UmbTextStyles]; }
 };
 __decorate([
     state()

package/dist-cms/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-properties.element.d.ts

@@ -1,7 +1,7 @@
+import './document-type-workspace-view-edit-property.element.js';
 import { UmbContentTypePropertyStructureHelper, PropertyContainerTypes } from '../../../../../core/content-type/index.js';
 import { UmbLitElement } from '../../../../../../shared/lit-element/index.js';
-import { PropertyTypeModelBaseModel } from '../../../../../../external/backend-api/index.js';
-import './document-type-workspace-view-edit-property.element.js';
+import { DocumentTypeResponseModel, PropertyTypeModelBaseModel } from '../../../../../../external/backend-api/index.js';
 export declare class UmbDocumentTypeWorkspaceViewEditPropertiesElement extends UmbLitElement {
     #private;
     private _containerId;
@@ -13,7 +13,10 @@ export declare class UmbDocumentTypeWorkspaceViewEditPropertiesElement extends U
     set containerType(value: PropertyContainerTypes | undefined);
     _propertyStructureHelper: UmbContentTypePropertyStructureHelper;
     _propertyStructure: Array<PropertyTypeModelBaseModel>;
+    _ownerDocumentTypes?: DocumentTypeResponseModel[];
+    protected _modalRouteNewProperty?: string;
     constructor();
+    connectedCallback(): void;
     render(): import("lit-html").TemplateResult<1>;
     static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];
 }

package/dist-cms/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-properties.element.js

@@ -4,13 +4,14 @@ 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 './document-type-workspace-view-edit-property.element.js';
 import { css, html, customElement, property, state, repeat, ifDefined } from '../../../../../../external/lit/index.js';
-import { UUITextStyles } from '../../../../../../external/uui/index.js';
+import { UmbTextStyles } from "../../../../../../shared/style/index.js";
 import { UmbContentTypePropertyStructureHelper } from '../../../../../core/content-type/index.js';
 import { UmbSorterController } from '../../../../../core/sorter/index.js';
 import { UmbLitElement } from '../../../../../../shared/lit-element/index.js';
-import './document-type-workspace-view-edit-property.element.js';
 import { UMB_WORKSPACE_CONTEXT } from '../../../../../core/workspace/index.js';
+import { UMB_PROPERTY_SETTINGS_MODAL, UmbModalRouteRegistrationController } from '../../../../../core/modal/index.js';
 const SORTER_CONFIG = {
     compareElementToModel: (element, model) => {
         return element.getAttribute('data-umb-property-id') === model.id;
@@ -79,31 +80,71 @@ export let UmbDocumentTypeWorkspaceViewEditPropertiesElement = class UmbDocument
             this._propertyStructure = propertyStructure;
             this.#propertySorter.setModel(this._propertyStructure);
         });
+        // Note: Route for adding a new property
+        new UmbModalRouteRegistrationController(this, UMB_PROPERTY_SETTINGS_MODAL)
+            .addAdditionalPath('new-property')
+            .onSetup(async () => {
+            const documentTypeId = this._ownerDocumentTypes?.find((types) => types.containers?.find((containers) => containers.id === this.containerId))?.id;
+            if (documentTypeId === undefined)
+                return false;
+            const propertyData = await this._propertyStructureHelper.createPropertyScaffold(this._containerId);
+            if (propertyData === undefined)
+                return false;
+            return { propertyData, documentTypeId };
+        })
+            .onSubmit((result) => {
+            this.#addProperty(result);
+        })
+            .observeRouteBuilder((routeBuilder) => {
+            this._modalRouteNewProperty = routeBuilder(null);
+        });
+    }
+    connectedCallback() {
+        super.connectedCallback();
+        const doctypes = this._propertyStructureHelper.ownerDocumentTypes;
+        if (!doctypes)
+            return;
+        this.observe(doctypes, (documents) => {
+            this._ownerDocumentTypes = documents;
+        }, 'observeOwnerDocumentTypes');
     }
-    async #onAddProperty() {
-        const property = await this._propertyStructureHelper.addProperty(this._containerId);
-        if (!property)
+    async #addProperty(propertyData) {
+        const propertyPlaceholder = await this._propertyStructureHelper.addProperty(this._containerId);
+        if (!propertyPlaceholder)
             return;
-        // TODO: Figure out how we from this location can get into the route modal, via URL.
-        // The modal is registered by the document-type-workspace-view-edit-property element, therefor a bit hard to get the URL from here.
+        this._propertyStructureHelper.partialUpdateProperty(propertyPlaceholder.id, propertyData);
     }
     render() {
         return html `<div id="property-list">
-				${repeat(this._propertyStructure, (property) => property.id ?? '' + property.containerId ?? '' + property.sortOrder ?? '', (property) => html `<document-type-workspace-view-edit-property
+				${repeat(this._propertyStructure, (property) => property.id ?? '' + property.containerId ?? '' + property.sortOrder ?? '', (property) => {
+            // Note: This piece might be moved into the property component
+            const inheritedFromDocument = this._ownerDocumentTypes?.find((types) => types.containers?.find((containers) => containers.id === property.containerId));
+            return html `<document-type-workspace-view-edit-property
 							class="property"
-							data-umb-property-id=${property.id}
-							data-property-container-is=${property.containerId}
-							data-container-id=${this.containerId}
-							?inherited=${ifDefined(property.containerId !== this.containerId)}
+							data-umb-property-id=${ifDefined(property.id)}
+							owner-document-type-id=${ifDefined(inheritedFromDocument?.id)}
+							owner-document-type-name=${ifDefined(inheritedFromDocument?.name)}
+							?inherited=${property.containerId !== this.containerId}
 							.property=${property}
 							@partial-property-update=${(event) => {
-            this._propertyStructureHelper.partialUpdateProperty(property.id, event.detail);
-        }}></document-type-workspace-view-edit-property>`)}
+                this._propertyStructureHelper.partialUpdateProperty(property.id, event.detail);
+            }}
+							@property-delete=${() => {
+                this._propertyStructureHelper.removeProperty(property.id);
+            }}>
+						</document-type-workspace-view-edit-property>`;
+        })}
 			</div>
-			<uui-button id="add" look="placeholder" @click=${this.#onAddProperty}> Add property </uui-button> `;
+			<uui-button
+				label=${this.localize.term('contentTypeEditor_addProprety')}
+				id="add"
+				look="placeholder"
+				href=${ifDefined(this._modalRouteNewProperty)}>
+				<umb-localize key="contentTypeEditor_addProprety">Add property</umb-localize>
+			</uui-button> `;
     }
     static { this.styles = [
-        UUITextStyles,
+        UmbTextStyles,
         css `
 			#add {
 				width: 100%;
@@ -123,6 +164,12 @@ __decorate([
 __decorate([
     state()
 ], UmbDocumentTypeWorkspaceViewEditPropertiesElement.prototype, "_propertyStructure", void 0);
+__decorate([
+    state()
+], UmbDocumentTypeWorkspaceViewEditPropertiesElement.prototype, "_ownerDocumentTypes", void 0);
+__decorate([
+    state()
+], UmbDocumentTypeWorkspaceViewEditPropertiesElement.prototype, "_modalRouteNewProperty", void 0);
 UmbDocumentTypeWorkspaceViewEditPropertiesElement = __decorate([
     customElement('umb-document-type-workspace-view-edit-properties')
 ], UmbDocumentTypeWorkspaceViewEditPropertiesElement);