@umbraco-cms/backoffice 16.0.0 → 16.1.0-rc

package/dist-cms/packages/documents/documents/entity-actions/move-to/repository/document-move.repository.d.ts

@@ -3,7 +3,7 @@ import { UmbRepositoryBase } from '@umbraco-cms/backoffice/repository';
 export declare class UmbMoveDocumentRepository extends UmbRepositoryBase implements UmbMoveRepository {
     #private;
     requestMoveTo(args: UmbMoveToRequestArgs): Promise<{
-        error: Error | import("@umbraco-cms/backoffice/resources").UmbError | import("@umbraco-cms/backoffice/resources").UmbApiError | import("@umbraco-cms/backoffice/resources").UmbCancelError | undefined;
+        error: import("@umbraco-cms/backoffice/resources").UmbApiError | import("@umbraco-cms/backoffice/resources").UmbCancelError | undefined;
     }>;
 }
 export { UmbMoveDocumentRepository as api };

package/dist-cms/packages/documents/documents/entity-actions/notifications/repository/document-notifications.repository.d.ts

@@ -9,11 +9,11 @@ export declare class UmbDocumentNotificationsRepository extends UmbControllerBas
         data: import("@umbraco-cms/backoffice/external/backend-api").DocumentNotificationResponseModel[];
         error?: undefined;
     } | {
-        error: Error | import("@umbraco-cms/backoffice/resources").UmbError | import("@umbraco-cms/backoffice/resources").UmbApiError | import("@umbraco-cms/backoffice/resources").UmbCancelError;
+        error: import("@umbraco-cms/backoffice/resources").UmbApiError | import("@umbraco-cms/backoffice/resources").UmbCancelError;
         data?: undefined;
     }>;
     updateNotifications(unique: string, documentName: string, data: UpdateDocumentNotificationsRequestModel): Promise<{
-        error: Error | import("@umbraco-cms/backoffice/resources").UmbError | import("@umbraco-cms/backoffice/resources").UmbApiError | import("@umbraco-cms/backoffice/resources").UmbCancelError | undefined;
+        error: import("@umbraco-cms/backoffice/resources").UmbApiError | import("@umbraco-cms/backoffice/resources").UmbCancelError | undefined;
     }>;
 }
 export { UmbDocumentNotificationsRepository as api };

package/dist-cms/packages/documents/documents/item/repository/document-item.server.data-source.d.ts

@@ -16,6 +16,6 @@ export declare class UmbDocumentItemServerDataSource extends UmbItemServerDataSo
     constructor(host: UmbControllerHost);
     getItems(uniques: Array<string>): Promise<{
         data: UmbDocumentItemModel[] | undefined;
-        error: Error | import("@umbraco-cms/backoffice/resources").UmbError | import("@umbraco-cms/backoffice/resources").UmbApiError | import("@umbraco-cms/backoffice/resources").UmbCancelError | undefined;
+        error: Error | import("@umbraco-cms/backoffice/resources").UmbApiError | import("@umbraco-cms/backoffice/resources").UmbCancelError | import("@umbraco-cms/backoffice/resources").UmbError | undefined;
     }>;
 }

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

@@ -37,7 +37,7 @@ export declare class UmbDocumentPublishingRepository extends UmbRepositoryBase {
      * @memberof UmbDocumentPublishingRepository
      */
     publishWithDescendants(id: string, variantIds: Array<UmbVariantId>, includeUnpublishedDescendants: boolean): Promise<{
-        error: Error | import("@umbraco-cms/backoffice/resources").UmbError | import("@umbraco-cms/backoffice/resources").UmbApiError | import("@umbraco-cms/backoffice/resources").UmbCancelError | undefined;
+        error: import("@umbraco-cms/backoffice/resources").UmbApiError | import("@umbraco-cms/backoffice/resources").UmbCancelError | undefined;
     } | {
         error: null;
     }>;

package/dist-cms/packages/documents/documents/publishing/repository/document-publishing.server.data-source.d.ts

@@ -48,7 +48,7 @@ export declare class UmbDocumentPublishingServerDataSource {
      * @memberof UmbDocumentPublishingServerDataSource
      */
     publishWithDescendants(unique: string, variantIds: Array<UmbVariantId>, includeUnpublishedDescendants: boolean): Promise<{
-        error: Error | import("@umbraco-cms/backoffice/resources").UmbError | import("@umbraco-cms/backoffice/resources").UmbApiError | import("@umbraco-cms/backoffice/resources").UmbCancelError | undefined;
+        error: import("@umbraco-cms/backoffice/resources").UmbApiError | import("@umbraco-cms/backoffice/resources").UmbCancelError | undefined;
     } | {
         error: null;
     }>;

package/dist-cms/packages/documents/documents/recycle-bin/repository/document-recycle-bin.server.data-source.d.ts

@@ -24,7 +24,7 @@ export declare class UmbDocumentRecycleBinServerDataSource implements UmbRecycle
         } | null;
         error?: undefined;
     } | {
-        error: Error | import("@umbraco-cms/backoffice/resources").UmbError | import("@umbraco-cms/backoffice/resources").UmbApiError | import("@umbraco-cms/backoffice/resources").UmbCancelError | undefined;
+        error: import("@umbraco-cms/backoffice/resources").UmbApiError | import("@umbraco-cms/backoffice/resources").UmbCancelError | undefined;
         data?: undefined;
     }>;
 }

package/dist-cms/packages/documents/documents/repository/detail/document-detail.server.data-source.d.ts

@@ -1,32 +1,22 @@
 import type { UmbDocumentDetailModel } from '../../types.js';
 import type { UmbDetailDataSource } from '@umbraco-cms/backoffice/repository';
-import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
+import { type UmbDeepPartialObject } from '@umbraco-cms/backoffice/utils';
+import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api';
 /**
  * A data source for the Document that fetches data from the server
  * @class UmbDocumentServerDataSource
  * @implements {RepositoryDetailDataSource}
  */
-export declare class UmbDocumentServerDataSource implements UmbDetailDataSource<UmbDocumentDetailModel> {
-    #private;
-    /**
-     * Creates an instance of UmbDocumentServerDataSource.
-     * @param {UmbControllerHost} host - The controller host for this controller to be appended to
-     * @memberof UmbDocumentServerDataSource
-     */
-    constructor(host: UmbControllerHost);
+export declare class UmbDocumentServerDataSource extends UmbControllerBase implements UmbDetailDataSource<UmbDocumentDetailModel> {
     /**
      * Creates a new Document scaffold
      * @param preset
      * @returns { UmbDocumentDetailModel }
      * @memberof UmbDocumentServerDataSource
      */
-    createScaffold(preset?: Partial<UmbDocumentDetailModel>): Promise<{
+    createScaffold(preset?: UmbDeepPartialObject<UmbDocumentDetailModel>): Promise<{
         data: UmbDocumentDetailModel;
     }>;
-    /**
-     * Creates a new variant scaffold.
-     * @returns A new variant scaffold.
-     */
     /**
      * Fetches a Document with the given id from the server
      * @param {string} unique
@@ -34,7 +24,7 @@ export declare class UmbDocumentServerDataSource implements UmbDetailDataSource<
      * @memberof UmbDocumentServerDataSource
      */
     read(unique: string): Promise<{
-        error: Error | import("@umbraco-cms/backoffice/resources").UmbError | import("@umbraco-cms/backoffice/resources").UmbApiError | import("@umbraco-cms/backoffice/resources").UmbCancelError | undefined;
+        error: import("@umbraco-cms/backoffice/resources").UmbApiError | import("@umbraco-cms/backoffice/resources").UmbCancelError | undefined;
         data?: undefined;
     } | {
         data: UmbDocumentDetailModel;
@@ -48,7 +38,7 @@ export declare class UmbDocumentServerDataSource implements UmbDetailDataSource<
      * @memberof UmbDocumentServerDataSource
      */
     create(model: UmbDocumentDetailModel, parentUnique?: string | null): Promise<{
-        error: Error | import("@umbraco-cms/backoffice/resources").UmbError | import("@umbraco-cms/backoffice/resources").UmbApiError | import("@umbraco-cms/backoffice/resources").UmbCancelError | undefined;
+        error: import("@umbraco-cms/backoffice/resources").UmbApiError | import("@umbraco-cms/backoffice/resources").UmbCancelError | undefined;
         data?: undefined;
     } | {
         data: UmbDocumentDetailModel;
@@ -61,7 +51,7 @@ export declare class UmbDocumentServerDataSource implements UmbDetailDataSource<
      * @memberof UmbDocumentServerDataSource
      */
     update(model: UmbDocumentDetailModel): Promise<{
-        error: Error | import("@umbraco-cms/backoffice/resources").UmbError | import("@umbraco-cms/backoffice/resources").UmbApiError | import("@umbraco-cms/backoffice/resources").UmbCancelError | undefined;
+        error: import("@umbraco-cms/backoffice/resources").UmbApiError | import("@umbraco-cms/backoffice/resources").UmbCancelError | undefined;
         data?: undefined;
     } | {
         data: UmbDocumentDetailModel;

package/dist-cms/packages/documents/documents/repository/detail/document-detail.server.data-source.js

@@ -2,21 +2,15 @@ import { UMB_DOCUMENT_ENTITY_TYPE, UMB_DOCUMENT_PROPERTY_VALUE_ENTITY_TYPE } fro
 import { UmbId } from '@umbraco-cms/backoffice/id';
 import { DocumentService } from '@umbraco-cms/backoffice/external/backend-api';
 import { tryExecute } from '@umbraco-cms/backoffice/resources';
+import { umbDeepMerge } from '@umbraco-cms/backoffice/utils';
+import { UmbDocumentTypeDetailServerDataSource } from '@umbraco-cms/backoffice/document-type';
+import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api';
 /**
  * A data source for the Document that fetches data from the server
  * @class UmbDocumentServerDataSource
  * @implements {RepositoryDetailDataSource}
  */
-export class UmbDocumentServerDataSource {
-    #host;
-    /**
-     * Creates an instance of UmbDocumentServerDataSource.
-     * @param {UmbControllerHost} host - The controller host for this controller to be appended to
-     * @memberof UmbDocumentServerDataSource
-     */
-    constructor(host) {
-        this.#host = host;
-    }
+export class UmbDocumentServerDataSource extends UmbControllerBase {
     /**
      * Creates a new Document scaffold
      * @param preset
@@ -24,40 +18,31 @@ export class UmbDocumentServerDataSource {
      * @memberof UmbDocumentServerDataSource
      */
     async createScaffold(preset = {}) {
-        const data = {
+        let documentTypeIcon = null;
+        let documentTypeCollection = null;
+        const documentTypeUnique = preset.documentType?.unique;
+        if (!documentTypeUnique) {
+            throw new Error('Document type unique is missing');
+        }
+        const { data } = await new UmbDocumentTypeDetailServerDataSource(this).read(documentTypeUnique);
+        documentTypeIcon = data?.icon ?? null;
+        documentTypeCollection = data?.collection ?? null;
+        const defaultData = {
             entityType: UMB_DOCUMENT_ENTITY_TYPE,
             unique: UmbId.new(),
             template: null,
             documentType: {
-                unique: '',
-                collection: null,
-                icon: null,
+                unique: documentTypeUnique,
+                collection: documentTypeCollection,
+                icon: documentTypeIcon,
             },
             isTrashed: false,
             values: [],
             variants: [],
-            ...preset,
-        };
-        return { data };
-    }
-    /**
-     * Creates a new variant scaffold.
-     * @returns A new variant scaffold.
-     */
-    /*
-    // TDOD: remove if not used
-    createVariantScaffold(): UmbDocumentVariantModel {
-        return {
-            state: null,
-            culture: null,
-            segment: null,
-            name: '',
-            publishDate: null,
-            createDate: null,
-            updateDate: null,
         };
+        const scaffold = umbDeepMerge(preset, defaultData);
+        return { data: scaffold };
     }
-    */
     /**
      * Fetches a Document with the given id from the server
      * @param {string} unique
@@ -67,7 +52,7 @@ export class UmbDocumentServerDataSource {
     async read(unique) {
         if (!unique)
             throw new Error('Unique is missing');
-        const { data, error } = await tryExecute(this.#host, DocumentService.getDocumentById({ path: { id: unique } }));
+        const { data, error } = await tryExecute(this, DocumentService.getDocumentById({ path: { id: unique } }));
         if (error || !data) {
             return { error };
         }
@@ -129,7 +114,7 @@ export class UmbDocumentServerDataSource {
             values: model.values,
             variants: model.variants,
         };
-        const { data, error } = await tryExecute(this.#host, DocumentService.postDocument({
+        const { data, error } = await tryExecute(this, DocumentService.postDocument({
             body: body,
         }));
         if (data) {
@@ -152,7 +137,7 @@ export class UmbDocumentServerDataSource {
             values: model.values,
             variants: model.variants,
         };
-        const { error } = await tryExecute(this.#host, DocumentService.putDocumentById({
+        const { error } = await tryExecute(this, DocumentService.putDocumentById({
             path: { id: model.unique },
             body: body,
         }));
@@ -170,6 +155,6 @@ export class UmbDocumentServerDataSource {
     async delete(unique) {
         if (!unique)
             throw new Error('Unique is missing');
-        return tryExecute(this.#host, DocumentService.deleteDocumentById({ path: { id: unique } }));
+        return tryExecute(this, DocumentService.deleteDocumentById({ path: { id: unique } }));
     }
 }

package/dist-cms/packages/documents/documents/search/document-search.server.data-source.d.ts

@@ -27,7 +27,7 @@ export declare class UmbDocumentSearchServerDataSource implements UmbSearchDataS
         };
         error?: undefined;
     } | {
-        error: Error | import("@umbraco-cms/backoffice/resources").UmbError | import("@umbraco-cms/backoffice/resources").UmbApiError | import("@umbraco-cms/backoffice/resources").UmbCancelError | undefined;
+        error: import("@umbraco-cms/backoffice/resources").UmbApiError | import("@umbraco-cms/backoffice/resources").UmbCancelError | undefined;
         data?: undefined;
     }>;
 }

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

@@ -29,12 +29,11 @@ let UmbDocumentTreeItemElement = class UmbDocumentTreeItemElement extends UmbTre
     }
     renderIconContainer() {
         const icon = this._icon;
-        const iconWithoutColor = icon?.split(' ')[0];
         return html `
 			<span id="icon-container" slot="icon" class=${classMap({ draft: this._isDraft })}>
-				${icon && iconWithoutColor
+				${icon
             ? html `
-							<umb-icon id="icon" slot="icon" name="${this._isActive ? iconWithoutColor : icon}"></umb-icon>
+							<umb-icon id="icon" slot="icon" name="${this._getIconToRender(icon)}"></umb-icon>
 							${this.#renderStateIcon()}
 						`
             : nothing}

package/dist-cms/packages/documents/documents/url/document-urls-data-resolver.js

@@ -1,6 +1,6 @@
 import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api';
 import { UmbArrayState } from '@umbraco-cms/backoffice/observable-api';
-import { UMB_PROPERTY_DATASET_CONTEXT } from '@umbraco-cms/backoffice/property';
+import { UMB_VARIANT_CONTEXT } from '@umbraco-cms/backoffice/variant';
 /**
  * A controller for resolving data for document urls
  * @exports
@@ -9,7 +9,7 @@ import { UMB_PROPERTY_DATASET_CONTEXT } from '@umbraco-cms/backoffice/property';
  */
 export class UmbDocumentUrlsDataResolver extends UmbControllerBase {
     #appCulture;
-    #propertyDataSetCulture;
+    #variantId;
     #data;
     #init;
     #urls;
@@ -22,11 +22,9 @@ export class UmbDocumentUrlsDataResolver extends UmbControllerBase {
          * @memberof UmbDocumentUrlsDataResolver
          */
         this.urls = this.#urls.asObservable();
-        // TODO: listen for UMB_VARIANT_CONTEXT when available
         this.#init = Promise.all([
-            this.consumeContext(UMB_PROPERTY_DATASET_CONTEXT, (context) => {
-                this.#propertyDataSetCulture = context?.getVariantId();
-                this.#setCultureAwareValues();
+            this.consumeContext(UMB_VARIANT_CONTEXT, async (context) => {
+                this.#variantId = await context?.getVariantId();
             }).asPromise(),
         ]);
     }
@@ -68,7 +66,7 @@ export class UmbDocumentUrlsDataResolver extends UmbControllerBase {
         this.#urls.setValue(data ?? []);
     }
     #getCurrentCulture() {
-        return this.#propertyDataSetCulture?.culture || this.#appCulture;
+        return this.#variantId?.culture || this.#appCulture;
     }
     #getDataForCurrentCulture() {
         const culture = this.#getCurrentCulture();

package/dist-cms/packages/documents/documents/url/repository/document-url.server.data-source.d.ts

@@ -16,6 +16,6 @@ export declare class UmbDocumentUrlServerDataSource extends UmbItemServerDataSou
     constructor(host: UmbControllerHost);
     getItems(uniques: Array<string>): Promise<{
         data: UmbDocumentUrlsModel[] | undefined;
-        error: Error | import("@umbraco-cms/backoffice/resources").UmbError | import("@umbraco-cms/backoffice/resources").UmbApiError | import("@umbraco-cms/backoffice/resources").UmbCancelError | undefined;
+        error: Error | import("@umbraco-cms/backoffice/resources").UmbApiError | import("@umbraco-cms/backoffice/resources").UmbCancelError | import("@umbraco-cms/backoffice/resources").UmbError | undefined;
     }>;
 }

package/dist-cms/packages/documents/documents/workspace/actions/save.action.js

@@ -2,6 +2,7 @@ import { UMB_DOCUMENT_WORKSPACE_CONTEXT } from '../document-workspace.context-to
 import { UmbVariantId } from '@umbraco-cms/backoffice/variant';
 import { UmbSaveWorkspaceAction, } from '@umbraco-cms/backoffice/workspace';
 export class UmbDocumentSaveWorkspaceAction extends UmbSaveWorkspaceAction {
+    #variants;
     constructor(host, args) {
         super(host, { workspaceContextToken: UMB_DOCUMENT_WORKSPACE_CONTEXT, ...args });
     }
@@ -16,17 +17,25 @@ export class UmbDocumentSaveWorkspaceAction extends UmbSaveWorkspaceAction {
     _gotWorkspaceContext() {
         super._gotWorkspaceContext();
         this.#observeVariants();
+        this.#observeReadOnlyGuardRules();
     }
     #observeVariants() {
         this.observe(this._workspaceContext?.variants, (variants) => {
-            const allVariantsAreReadOnly = variants?.filter((variant) => this._workspaceContext.readOnlyGuard.getIsPermittedForVariant(UmbVariantId.Create(variant))).length === variants?.length;
-            if (allVariantsAreReadOnly) {
-                this.disable();
-            }
-            else {
-                this.enable();
-            }
+            this.#variants = variants;
+            this.#checkReadOnlyGuardRules();
         }, 'saveWorkspaceActionVariantsObserver');
     }
+    #observeReadOnlyGuardRules() {
+        this.observe(this._workspaceContext?.readOnlyGuard.rules, () => this.#checkReadOnlyGuardRules(), 'umbObserveReadOnlyGuardRules');
+    }
+    #checkReadOnlyGuardRules() {
+        const allVariantsAreReadOnly = this.#variants?.filter((variant) => this._workspaceContext.readOnlyGuard.getIsPermittedForVariant(UmbVariantId.Create(variant))).length === this.#variants?.length;
+        if (allVariantsAreReadOnly) {
+            this.disable();
+        }
+        else {
+            this.enable();
+        }
+    }
 }
 export { UmbDocumentSaveWorkspaceAction as api };

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

@@ -17,11 +17,13 @@ let UmbDocumentWorkspaceEditorElement = class UmbDocumentWorkspaceEditorElement
     #workspaceRoute;
     #appCulture;
     #variants;
+    #isForbidden;
     constructor() {
         super();
         //
         // TODO: Refactor: when having a split view/variants context token, we can rename the split view/variants component to a generic and make this component generic as well. [NL]
         this.splitViewElement = new UmbDocumentWorkspaceSplitViewElement();
+        this.#isForbidden = false;
         this._gotWorkspaceRoute = (e) => {
             this.#workspaceRoute = e.target.absoluteRouterPath;
             this.#workspaceContext?.splitView.setWorkspaceRoute(this.#workspaceRoute);
@@ -39,6 +41,10 @@ let UmbDocumentWorkspaceEditorElement = class UmbDocumentWorkspaceEditorElement
                 this.#variants = variants;
                 this.#generateRoutes();
             }, '_observeVariants');
+            this.observe(this.#workspaceContext?.forbidden.isOn, (isForbidden) => {
+                this.#isForbidden = isForbidden ?? false;
+                this.#generateRoutes();
+            }, '_observeForbidden');
         });
     }
     #handleVariantFolderPart(index, folderPart) {
@@ -108,11 +114,14 @@ let UmbDocumentWorkspaceEditorElement = class UmbDocumentWorkspaceEditorElement
                     history.replaceState({}, '', `${this.#workspaceRoute}/${route?.path}`);
                 },
             });
-            routes.push({
-                path: `**`,
-                component: async () => (await import('@umbraco-cms/backoffice/router')).UmbRouteNotFoundElement,
-            });
         }
+        routes.push({
+            path: '**',
+            component: async () => {
+                const router = await import('@umbraco-cms/backoffice/router');
+                return this.#isForbidden ? router.UmbRouteForbiddenElement : router.UmbRouteNotFoundElement;
+            },
+        });
         this._routes = routes;
     }
     render() {

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

@@ -3,10 +3,11 @@ import type { ActiveVariant } from '@umbraco-cms/backoffice/workspace';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import './document-workspace-split-view-variant-selector.element.js';
 export declare class UmbDocumentWorkspaceSplitViewElement extends UmbLitElement {
+    #private;
     private _workspaceContext?;
     _variants?: Array<ActiveVariant>;
+    _icon?: string;
     constructor();
-    private _observeActiveVariantInfo;
     render(): typeof nothing | import("lit-html").TemplateResult<1>;
     static styles: import("lit").CSSResult[];
 }

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

@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { UMB_DOCUMENT_WORKSPACE_CONTEXT } from './document-workspace.context-token.js';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
-import { css, html, nothing, customElement, state, repeat } from '@umbraco-cms/backoffice/external/lit';
+import { css, html, nothing, customElement, state, repeat, ifDefined } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import './document-workspace-split-view-variant-selector.element.js';
 let UmbDocumentWorkspaceSplitViewElement = class UmbDocumentWorkspaceSplitViewElement extends UmbLitElement {
@@ -15,16 +15,20 @@ let UmbDocumentWorkspaceSplitViewElement = class UmbDocumentWorkspaceSplitViewEl
         // TODO: Refactor: use a split view workspace context token: [NL]
         this.consumeContext(UMB_DOCUMENT_WORKSPACE_CONTEXT, (context) => {
             this._workspaceContext = context;
-            this._observeActiveVariantInfo();
+            this.#observeActiveVariantInfo();
+            this.#observeIcon();
         });
     }
-    _observeActiveVariantInfo() {
-        if (!this._workspaceContext)
-            return;
-        this.observe(this._workspaceContext.splitView.activeVariantsInfo, (variants) => {
+    #observeActiveVariantInfo() {
+        this.observe(this._workspaceContext?.splitView.activeVariantsInfo, (variants) => {
             this._variants = variants;
         }, '_observeActiveVariantsInfo');
     }
+    #observeIcon() {
+        this.observe(this._workspaceContext?.contentTypeIcon, (icon) => {
+            this._icon = icon ?? undefined;
+        });
+    }
     render() {
         return this._variants
             ? html `<div id="splitViews">
@@ -32,6 +36,7 @@ let UmbDocumentWorkspaceSplitViewElement = class UmbDocumentWorkspaceSplitViewEl
 								<umb-workspace-split-view
 									.splitViewIndex=${view.index}
 									.displayNavigation=${view.index === this._variants.length - 1}>
+									<umb-icon slot="icon" name=${ifDefined(this._icon)}></umb-icon>
 									<umb-document-workspace-split-view-variant-selector
 										slot="variant-selector"></umb-document-workspace-split-view-variant-selector>
 								</umb-workspace-split-view>
@@ -68,6 +73,9 @@ let UmbDocumentWorkspaceSplitViewElement = class UmbDocumentWorkspaceSplitViewEl
 __decorate([
     state()
 ], UmbDocumentWorkspaceSplitViewElement.prototype, "_variants", void 0);
+__decorate([
+    state()
+], UmbDocumentWorkspaceSplitViewElement.prototype, "_icon", void 0);
 UmbDocumentWorkspaceSplitViewElement = __decorate([
     customElement('umb-document-workspace-split-view')
 ], UmbDocumentWorkspaceSplitViewElement);

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

@@ -21,10 +21,11 @@ export declare class UmbDocumentWorkspaceContext extends UmbContentDetailWorkspa
     readonly isTrashed: import("rxjs").Observable<boolean | undefined>;
     readonly contentTypeUnique: import("rxjs").Observable<string | undefined>;
     readonly contentTypeHasCollection: import("rxjs").Observable<boolean>;
+    readonly contentTypeIcon: import("rxjs").Observable<string | null>;
     readonly templateId: import("rxjs").Observable<string | null>;
     constructor(host: UmbControllerHost);
     resetState(): void;
-    load(unique: string): Promise<import("@umbraco-cms/backoffice/repository").UmbRepositoryResponse<UmbDocumentDetailModel> | import("@umbraco-cms/backoffice/repository").UmbRepositoryResponseWithAsObservable<UmbDocumentDetailModel>>;
+    load(unique: string): Promise<import("@umbraco-cms/backoffice/repository").UmbRepositoryResponse<UmbDocumentDetailModel> | import("@umbraco-cms/backoffice/repository").UmbRepositoryResponseWithAsObservable<UmbDocumentDetailModel, UmbDocumentDetailModel>>;
     create(parent: UmbEntityModel, documentTypeUnique: string, blueprintUnique?: string): Promise<UmbDocumentDetailModel | undefined>;
     getCollectionAlias(): string;
     /**

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

@@ -19,8 +19,6 @@ import { observeMultiple } from '@umbraco-cms/backoffice/observable-api';
 export class UmbDocumentWorkspaceContext extends UmbContentDetailWorkspaceContextBase {
     #isTrashedContext;
     #publishingContext;
-    #userCanCreate;
-    #userCanUpdate;
     constructor(host) {
         super(host, {
             entityType: UMB_DOCUMENT_ENTITY_TYPE,
@@ -43,10 +41,9 @@ export class UmbDocumentWorkspaceContext extends UmbContentDetailWorkspaceContex
         this.isTrashed = this._data.createObservablePartOfCurrent((data) => data?.isTrashed);
         this.contentTypeUnique = this._data.createObservablePartOfCurrent((data) => data?.documentType.unique);
         this.contentTypeHasCollection = this._data.createObservablePartOfCurrent((data) => !!data?.documentType.collection);
+        this.contentTypeIcon = this._data.createObservablePartOfCurrent((data) => data?.documentType.icon || null);
         this.templateId = this._data.createObservablePartOfCurrent((data) => data?.template?.unique || null);
         this.#isTrashedContext = new UmbIsTrashedEntityContext(this);
-        this.#userCanCreate = false;
-        this.#userCanUpdate = false;
         this.consumeContext(UMB_DOCUMENT_CONFIGURATION_CONTEXT, async (context) => {
             const config = await context?.getDocumentConfiguration();
             const allowSegmentCreation = config?.allowNonExistingSegmentsCreation ?? false;
@@ -72,35 +69,15 @@ export class UmbDocumentWorkspaceContext extends UmbContentDetailWorkspaceContex
         this.consumeContext(UMB_DOCUMENT_PUBLISHING_WORKSPACE_CONTEXT, (context) => {
             this.#publishingContext = context;
         });
-        createExtensionApiByAlias(this, UMB_DOCUMENT_USER_PERMISSION_CONDITION_ALIAS, [
-            {
-                config: {
-                    allOf: [UMB_USER_PERMISSION_DOCUMENT_CREATE],
-                },
-                onChange: (permitted) => {
-                    if (permitted === this.#userCanCreate)
-                        return;
-                    this.#userCanCreate = permitted;
-                    this.#setReadOnlyStateForUserPermission(UMB_USER_PERMISSION_DOCUMENT_CREATE, this.#userCanCreate, 'You do not have permission to create documents.');
-                },
-            },
-        ]);
-        createExtensionApiByAlias(this, UMB_DOCUMENT_USER_PERMISSION_CONDITION_ALIAS, [
-            {
-                config: {
-                    allOf: [UMB_USER_PERMISSION_DOCUMENT_UPDATE],
-                },
-                onChange: (permitted) => {
-                    if (permitted === this.#userCanUpdate)
-                        return;
-                    this.#userCanUpdate = permitted;
-                    this.#setReadOnlyStateForUserPermission(UMB_USER_PERMISSION_DOCUMENT_UPDATE, this.#userCanUpdate, 'You do not have permission to update documents.');
-                },
-            },
-        ]);
-        this.observe(this.variants, () => {
-            this.#setReadOnlyStateForUserPermission(UMB_USER_PERMISSION_DOCUMENT_CREATE, this.#userCanCreate, 'You do not have permission to create documents.');
-            this.#setReadOnlyStateForUserPermission(UMB_USER_PERMISSION_DOCUMENT_UPDATE, this.#userCanUpdate, 'You do not have permission to update documents.');
+        this.observe(this.isNew, (isNew) => {
+            if (isNew === undefined)
+                return;
+            if (isNew) {
+                this.#enforceUserPermission(UMB_USER_PERMISSION_DOCUMENT_CREATE, 'You do not have permission to create documents.');
+            }
+            else {
+                this.#enforceUserPermission(UMB_USER_PERMISSION_DOCUMENT_UPDATE, 'You do not have permission to update documents.');
+            }
         });
         this.routes.setRoutes([
             {
@@ -137,6 +114,20 @@ export class UmbDocumentWorkspaceContext extends UmbContentDetailWorkspaceContex
             },
         ]);
     }
+    #enforceUserPermission(verb, message) {
+        // We set the initial permission state to false because the condition is false by default and only execute the callback if it changes.
+        this.#handleUserPermissionChange(verb, false, message);
+        createExtensionApiByAlias(this, UMB_DOCUMENT_USER_PERMISSION_CONDITION_ALIAS, [
+            {
+                config: {
+                    allOf: [verb],
+                },
+                onChange: (permitted) => {
+                    this.#handleUserPermissionChange(verb, permitted, message);
+                },
+            },
+        ]);
+    }
     resetState() {
         super.resetState();
         this.#isTrashedContext.setIsTrashed(false);
@@ -168,7 +159,6 @@ export class UmbDocumentWorkspaceContext extends UmbContentDetailWorkspaceContex
             preset: {
                 documentType: {
                     unique: documentTypeUnique,
-                    collection: null,
                 },
             },
         });
@@ -313,7 +303,7 @@ export class UmbDocumentWorkspaceContext extends UmbContentDetailWorkspaceContex
     createPropertyDatasetContext(host, variantId) {
         return new UmbDocumentPropertyDatasetContext(host, this, variantId);
     }
-    async #setReadOnlyStateForUserPermission(identifier, permitted, message) {
+    async #handleUserPermissionChange(identifier, permitted, message) {
         if (permitted) {
             this.readOnlyGuard?.removeRule(identifier);
             return;
@@ -321,6 +311,9 @@ export class UmbDocumentWorkspaceContext extends UmbContentDetailWorkspaceContex
         this.readOnlyGuard?.addRule({
             unique: identifier,
             message,
+            /* This guard is a bit backwards. The rule is permitted to be read-only.
+            If the user does not have permission, we set it to true = permitted to be read-only. */
+            permitted: true,
         });
     }
     #preventEditInvariantFromNonDefault() {

package/dist-cms/packages/documents/section/manifests.js

@@ -1,6 +1,6 @@
 import { UMB_CONTENT_SECTION_ALIAS } from '@umbraco-cms/backoffice/content';
 import { UMB_DOCUMENT_ROOT_ENTITY_TYPE, UMB_CONTENT_MENU_ALIAS } from '@umbraco-cms/backoffice/document';
-import { UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS } from '@umbraco-cms/backoffice/section';
+import { UMB_SECTION_ALIAS_CONDITION_ALIAS, UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS, } from '@umbraco-cms/backoffice/section';
 export const manifests = [
     {
         type: 'section',
@@ -31,7 +31,7 @@ export const manifests = [
         },
         conditions: [
             {
-                alias: 'Umb.Condition.SectionAlias',
+                alias: UMB_SECTION_ALIAS_CONDITION_ALIAS,
                 match: UMB_CONTENT_SECTION_ALIAS,
             },
         ],

package/dist-cms/packages/embedded-media/repository/oembed.repository.d.ts

@@ -12,7 +12,7 @@ export declare class UmbOEmbedRepository extends UmbControllerBase implements Um
         data: import("@umbraco-cms/backoffice/external/backend-api").OEmbedResponseModel;
         error?: undefined;
     } | {
-        error: Error | import("@umbraco-cms/backoffice/resources").UmbError | import("@umbraco-cms/backoffice/resources").UmbApiError | import("@umbraco-cms/backoffice/resources").UmbCancelError;
+        error: import("@umbraco-cms/backoffice/resources").UmbApiError | import("@umbraco-cms/backoffice/resources").UmbCancelError;
         data?: undefined;
     }>;
 }

package/dist-cms/packages/health-check/manifests.js

@@ -1,3 +1,4 @@
+import { UMB_SECTION_ALIAS_CONDITION_ALIAS } from '@umbraco-cms/backoffice/section';
 import { UMB_SETTINGS_SECTION_ALIAS } from '@umbraco-cms/backoffice/settings';
 export const manifests = [
     {
@@ -13,7 +14,7 @@ export const manifests = [
         },
         conditions: [
             {
-                alias: 'Umb.Condition.SectionAlias',
+                alias: UMB_SECTION_ALIAS_CONDITION_ALIAS,
                 match: UMB_SETTINGS_SECTION_ALIAS,
             },
         ],