@umbraco-cms/backoffice 16.0.0-rc → 16.0.0-rc3

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

@@ -2,6 +2,8 @@ import type { UmbDocumentCollectionFilterModel, UmbDocumentCollectionItemModel }
 import { UmbDefaultCollectionContext } from '@umbraco-cms/backoffice/collection';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 export declare class UmbDocumentCollectionContext extends UmbDefaultCollectionContext<UmbDocumentCollectionItemModel, UmbDocumentCollectionFilterModel> {
+    #private;
     constructor(host: UmbControllerHost);
+    requestCollection(): Promise<void>;
 }
 export { UmbDocumentCollectionContext as api };

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

@@ -1,8 +1,31 @@
 import { UMB_DOCUMENT_TABLE_COLLECTION_VIEW_ALIAS } from './constants.js';
 import { UmbDefaultCollectionContext } from '@umbraco-cms/backoffice/collection';
+import { UMB_VARIANT_CONTEXT } from '@umbraco-cms/backoffice/variant';
+import { UmbStringState } from '@umbraco-cms/backoffice/observable-api';
 export class UmbDocumentCollectionContext extends UmbDefaultCollectionContext {
+    #variantContext;
+    #displayCulture = new UmbStringState(undefined);
+    #displayCultureObservable = this.#displayCulture.asObservable();
     constructor(host) {
         super(host, UMB_DOCUMENT_TABLE_COLLECTION_VIEW_ALIAS);
+        this.consumeContext(UMB_VARIANT_CONTEXT, async (variantContext) => {
+            this.#variantContext = variantContext;
+            this.#observeDisplayCulture();
+        });
+    }
+    #observeDisplayCulture() {
+        this.observe(this.#variantContext?.displayCulture, (displayCulture) => {
+            if (!displayCulture)
+                return;
+            if (this.#displayCulture.getValue() === displayCulture)
+                return;
+            this.#displayCulture.setValue(displayCulture);
+            this.setFilter({ orderCulture: displayCulture });
+        }, 'umbDocumentCollectionDisplayCultureObserver');
+    }
+    async requestCollection() {
+        await this.observe(this.#displayCultureObservable)?.asPromise();
+        await super.requestCollection();
     }
 }
 export { UmbDocumentCollectionContext as api };

package/dist-cms/packages/documents/documents/collection/views/table/column-layouts/document-entity-actions-table-column-view.element.js

@@ -19,6 +19,7 @@ let UmbDocumentEntityActionsTableColumnViewElement = class UmbDocumentEntityActi
     render() {
         if (!this._value)
             return nothing;
+        // TODO: Missing name to parse on
         return html `
 			<umb-entity-actions-table-column-view
 				.value=${{ unique: this._value.unique, entityType: this._value.entityType }}>

package/dist-cms/packages/documents/documents/components/input-document/input-document.context.js

@@ -1,6 +1,7 @@
 import { UMB_DOCUMENT_PICKER_MODAL, UMB_DOCUMENT_SEARCH_PROVIDER_ALIAS } from '../../constants.js';
 import { UMB_DOCUMENT_ITEM_REPOSITORY_ALIAS } from '../../item/constants.js';
 import { UmbPickerInputContext } from '@umbraco-cms/backoffice/picker-input';
+import { UMB_VARIANT_CONTEXT } from '@umbraco-cms/backoffice/variant';
 export class UmbDocumentPickerInputContext extends UmbPickerInputContext {
     constructor(host) {
         super(host, UMB_DOCUMENT_ITEM_REPOSITORY_ALIAS, UMB_DOCUMENT_PICKER_MODAL);
@@ -18,10 +19,13 @@ export class UmbDocumentPickerInputContext extends UmbPickerInputContext {
                 ...pickerData?.search,
             };
         }
+        const variantContext = await this.getContext(UMB_VARIANT_CONTEXT);
+        const culture = await variantContext?.getDisplayCulture();
         // pass allowedContentTypes to the search request args
         combinedPickerData.search.queryParams = {
             allowedContentTypes: args?.allowedContentTypes,
             includeTrashed: args?.includeTrashed,
+            culture,
             ...pickerData?.search?.queryParams,
         };
         await super.openPicker(combinedPickerData);

package/dist-cms/packages/documents/documents/entity-actions/duplicate/repository/document-duplicate.server.data-source.js

@@ -32,6 +32,6 @@ export class UmbDuplicateDocumentServerDataSource {
                 relateToOriginal: args.relateToOriginal,
                 includeDescendants: args.includeDescendants,
             },
-        }));
+        }), { disableNotifications: true });
     }
 }

package/dist-cms/packages/documents/documents/entity-actions/move-to/repository/document-move.server.data-source.js

@@ -32,6 +32,6 @@ export class UmbMoveDocumentServerDataSource {
             body: {
                 target: args.destination.unique ? { id: args.destination.unique } : null,
             },
-        }));
+        }), { disableNotifications: true });
     }
 }

package/dist-cms/packages/documents/documents/item/document-item-data-resolver.d.ts

@@ -12,10 +12,10 @@ type UmbDocumentItemDataResolverModel = Omit<UmbDocumentItemModel, 'parent' | 'h
 export declare class UmbDocumentItemDataResolver<DataType extends UmbDocumentItemDataResolverModel> extends UmbControllerBase {
     #private;
     readonly unique: import("rxjs").Observable<string | undefined>;
-    readonly name: import("rxjs").Observable<string | undefined>;
     readonly icon: import("rxjs").Observable<string | undefined>;
-    readonly state: import("rxjs").Observable<string | undefined>;
     readonly isTrashed: import("rxjs").Observable<boolean | undefined>;
+    readonly name: import("rxjs").Observable<string | undefined>;
+    readonly state: import("rxjs").Observable<string | undefined>;
     readonly isDraft: import("rxjs").Observable<boolean | undefined>;
     constructor(host: UmbControllerHost);
     /**

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

@@ -1,8 +1,7 @@
 import { UmbDocumentVariantState } from '../types.js';
 import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api';
-import { UMB_APP_LANGUAGE_CONTEXT } from '@umbraco-cms/backoffice/language';
-import { UmbBooleanState, UmbStringState } from '@umbraco-cms/backoffice/observable-api';
-import { UMB_PROPERTY_DATASET_CONTEXT } from '@umbraco-cms/backoffice/property';
+import { UmbBooleanState, UmbObjectState, UmbStringState } from '@umbraco-cms/backoffice/observable-api';
+import { UMB_VARIANT_CONTEXT } from '@umbraco-cms/backoffice/variant';
 /**
  * A controller for resolving data for a document item
  * @exports
@@ -10,46 +9,43 @@ import { UMB_PROPERTY_DATASET_CONTEXT } from '@umbraco-cms/backoffice/property';
  * @augments {UmbControllerBase}
  */
 export class UmbDocumentItemDataResolver extends UmbControllerBase {
-    #defaultCulture;
-    #appCulture;
-    #propertyDataSetCulture;
     #data;
-    #init;
-    #unique;
     #name;
-    #icon;
     #state;
-    #isTrashed;
     #isDraft;
+    #variantContext;
+    #fallbackCulture;
+    #displayCulture;
     constructor(host) {
         super(host);
-        this.#unique = new UmbStringState(undefined);
-        this.unique = this.#unique.asObservable();
+        this.#data = new UmbObjectState(undefined);
+        this.unique = this.#data.asObservablePart((x) => x?.unique);
+        this.icon = this.#data.asObservablePart((x) => x?.documentType.icon);
+        this.isTrashed = this.#data.asObservablePart((x) => x?.isTrashed);
         this.#name = new UmbStringState(undefined);
         this.name = this.#name.asObservable();
-        this.#icon = new UmbStringState(undefined);
-        this.icon = this.#icon.asObservable();
         this.#state = new UmbStringState(undefined);
         this.state = this.#state.asObservable();
-        this.#isTrashed = new UmbBooleanState(undefined);
-        this.isTrashed = this.#isTrashed.asObservable();
         this.#isDraft = new UmbBooleanState(undefined);
         this.isDraft = this.#isDraft.asObservable();
-        this.consumeContext(UMB_PROPERTY_DATASET_CONTEXT, (context) => {
-            this.#propertyDataSetCulture = context?.getVariantId();
-            this.#setVariantAwareValues();
+        this.consumeContext(UMB_VARIANT_CONTEXT, (context) => {
+            this.#variantContext = context;
+            this.#observeVariantContext();
         });
-        // We do not depend on this context because we know is it only available in some cases
-        this.#init = this.consumeContext(UMB_APP_LANGUAGE_CONTEXT, (context) => {
-            this.observe(context?.appLanguageCulture, (culture) => {
-                this.#appCulture = culture;
-                this.#setVariantAwareValues();
-            });
-            this.observe(context?.appDefaultLanguage, (value) => {
-                this.#defaultCulture = value?.unique;
-                this.#setVariantAwareValues();
-            });
-        }).asPromise();
+    }
+    #observeVariantContext() {
+        this.observe(this.#variantContext?.displayCulture, (displayCulture) => {
+            if (displayCulture === undefined)
+                return;
+            this.#displayCulture = displayCulture;
+            this.#setVariantAwareValues();
+        }, 'umbObserveVariantId');
+        this.observe(this.#variantContext?.fallbackCulture, (fallbackCulture) => {
+            if (fallbackCulture === undefined)
+                return;
+            this.#fallbackCulture = fallbackCulture;
+            this.#setVariantAwareValues();
+        }, 'umbObserveFallbackCulture');
     }
     /**
      * Get the current item
@@ -57,7 +53,7 @@ export class UmbDocumentItemDataResolver extends UmbControllerBase {
      * @memberof UmbDocumentItemDataResolver
      */
     getData() {
-        return this.#data;
+        return this.#data.getValue();
     }
     /**
      * Set the current item
@@ -65,18 +61,7 @@ export class UmbDocumentItemDataResolver extends UmbControllerBase {
      * @memberof UmbDocumentItemDataResolver
      */
     setData(data) {
-        this.#data = data;
-        if (!this.#data) {
-            this.#unique.setValue(undefined);
-            this.#name.setValue(undefined);
-            this.#icon.setValue(undefined);
-            this.#isTrashed.setValue(undefined);
-            this.#isDraft.setValue(undefined);
-            return;
-        }
-        this.#unique.setValue(this.#data.unique);
-        this.#icon.setValue(this.#data.documentType.icon);
-        this.#isTrashed.setValue(this.#data.isTrashed);
+        this.#data.setValue(data);
         this.#setVariantAwareValues();
     }
     /**
@@ -85,8 +70,7 @@ export class UmbDocumentItemDataResolver extends UmbControllerBase {
      * @memberof UmbDocumentItemDataResolver
      */
     async getUnique() {
-        await this.#init;
-        return this.#unique.getValue();
+        return await this.observe(this.unique).asPromise();
     }
     /**
      * Get the name of the item
@@ -94,8 +78,7 @@ export class UmbDocumentItemDataResolver extends UmbControllerBase {
      * @memberof UmbDocumentItemDataResolver
      */
     async getName() {
-        await this.#init;
-        return this.#name.getValue() || '';
+        return (await this.observe(this.name).asPromise()) || '';
     }
     /**
      * Get the icon of the item
@@ -103,8 +86,7 @@ export class UmbDocumentItemDataResolver extends UmbControllerBase {
      * @memberof UmbDocumentItemDataResolver
      */
     async getIcon() {
-        await this.#init;
-        return this.#data?.documentType.icon;
+        return await this.observe(this.icon).asPromise();
     }
     /**
      * Get the state of the item
@@ -112,8 +94,8 @@ export class UmbDocumentItemDataResolver extends UmbControllerBase {
      * @memberof UmbDocumentItemDataResolver
      */
     async getState() {
-        await this.#init;
-        return this.#getCurrentVariant()?.state;
+        const variant = await this.#getCurrentVariant();
+        return variant?.state;
     }
     /**
      * Get the isDraft of the item
@@ -121,8 +103,7 @@ export class UmbDocumentItemDataResolver extends UmbControllerBase {
      * @memberof UmbDocumentItemDataResolver
      */
     async getIsDraft() {
-        await this.#init;
-        return this.#isDraft.getValue() ?? false;
+        return (await this.observe(this.isDraft).asPromise()) ?? false;
     }
     /**
      * Get the isTrashed of the item
@@ -130,44 +111,50 @@ export class UmbDocumentItemDataResolver extends UmbControllerBase {
      * @memberof UmbDocumentItemDataResolver
      */
     async getIsTrashed() {
-        await this.#init;
-        return this.#data?.isTrashed ?? false;
+        return (await this.observe(this.isTrashed).asPromise()) ?? false;
     }
     #setVariantAwareValues() {
+        if (!this.#variantContext)
+            return;
+        if (!this.#displayCulture)
+            return;
+        if (!this.#fallbackCulture)
+            return;
+        if (!this.#data)
+            return;
         this.#setName();
         this.#setIsDraft();
         this.#setState();
     }
-    #setName() {
-        const variant = this.#getCurrentVariant();
+    async #setName() {
+        const variant = await this.#getCurrentVariant();
         if (variant) {
             this.#name.setValue(variant.name);
             return;
         }
-        const fallbackName = this.#findVariant(this.#defaultCulture)?.name;
+        const fallbackName = this.#findVariant(this.#fallbackCulture)?.name;
         this.#name.setValue(`(${fallbackName})`);
     }
-    #setIsDraft() {
-        const variant = this.#getCurrentVariant();
+    async #setIsDraft() {
+        const variant = await this.#getCurrentVariant();
         const isDraft = variant?.state === UmbDocumentVariantState.DRAFT || false;
         this.#isDraft.setValue(isDraft);
     }
-    #setState() {
-        const variant = this.#getCurrentVariant();
+    async #setState() {
+        const variant = await this.#getCurrentVariant();
         const state = variant?.state || UmbDocumentVariantState.NOT_CREATED;
         this.#state.setValue(state);
     }
     #findVariant(culture) {
-        return this.#data?.variants.find((x) => x.culture === culture);
+        return this.getData()?.variants.find((x) => x.culture === culture);
     }
-    #getCurrentVariant() {
+    async #getCurrentVariant() {
         if (this.#isInvariant()) {
-            return this.#data?.variants?.[0];
+            return this.getData()?.variants?.[0];
         }
-        const culture = this.#propertyDataSetCulture?.culture || this.#appCulture;
-        return this.#findVariant(culture);
+        return this.#findVariant(this.#displayCulture);
     }
     #isInvariant() {
-        return this.#data?.variants?.[0]?.culture === null;
+        return this.getData()?.variants?.[0]?.culture === null;
     }
 }

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

@@ -7,6 +7,10 @@ export declare class UmbDocumentItemRefElement extends UmbLitElement {
     set item(value: UmbDocumentItemModel | undefined);
     readonly: boolean;
     standalone: boolean;
+    selectOnly: boolean;
+    selectable: boolean;
+    selected: boolean;
+    disabled: boolean;
     private _unique;
     private _name;
     private _icon;

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

@@ -11,6 +11,7 @@ import { customElement, html, ifDefined, nothing, property, state } from '@umbra
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/router';
 import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/workspace';
+import { UmbDeselectedEvent, UmbSelectedEvent } from '@umbraco-cms/backoffice/event';
 let UmbDocumentItemRefElement = class UmbDocumentItemRefElement extends UmbLitElement {
     #item;
     get item() {
@@ -24,6 +25,10 @@ let UmbDocumentItemRefElement = class UmbDocumentItemRefElement extends UmbLitEl
         this.#item = new UmbDocumentItemDataResolver(this);
         this.readonly = false;
         this.standalone = false;
+        this.selectOnly = false;
+        this.selectable = false;
+        this.selected = false;
+        this.disabled = false;
         this._unique = '';
         this._name = '';
         this._icon = '';
@@ -50,6 +55,14 @@ let UmbDocumentItemRefElement = class UmbDocumentItemRefElement extends UmbLitEl
         const path = UMB_EDIT_DOCUMENT_WORKSPACE_PATH_PATTERN.generateLocal({ unique: this._unique });
         return `${this._editPath}/${path}`;
     }
+    #onSelected(event) {
+        event.stopPropagation();
+        this.dispatchEvent(new UmbSelectedEvent(this._unique));
+    }
+    #onDeselected(event) {
+        event.stopPropagation();
+        this.dispatchEvent(new UmbDeselectedEvent(this._unique));
+    }
     render() {
         if (!this.item)
             return nothing;
@@ -58,7 +71,13 @@ let UmbDocumentItemRefElement = class UmbDocumentItemRefElement extends UmbLitEl
 				name=${this._name}
 				href=${ifDefined(this.#getHref())}
 				?readonly=${this.readonly}
-				?standalone=${this.standalone}>
+				?standalone=${this.standalone}
+				?select-only=${this.selectOnly}
+				?selectable=${this.selectable}
+				?selected=${this.selected}
+				?disabled=${this.disabled}
+				@selected=${this.#onSelected}
+				@deselected=${this.#onDeselected}>
 				<slot name="actions" slot="actions"></slot>
 				${this.#renderIcon()}${this.#renderIsDraft()} ${this.#renderIsTrashed()}
 			</uui-ref-node>
@@ -84,11 +103,23 @@ __decorate([
     property({ type: Object })
 ], UmbDocumentItemRefElement.prototype, "item", null);
 __decorate([
-    property({ type: Boolean })
+    property({ type: Boolean, reflect: true })
 ], UmbDocumentItemRefElement.prototype, "readonly", void 0);
 __decorate([
     property({ type: Boolean })
 ], UmbDocumentItemRefElement.prototype, "standalone", void 0);
+__decorate([
+    property({ type: Boolean, attribute: 'select-only', reflect: true })
+], UmbDocumentItemRefElement.prototype, "selectOnly", void 0);
+__decorate([
+    property({ type: Boolean, reflect: true })
+], UmbDocumentItemRefElement.prototype, "selectable", void 0);
+__decorate([
+    property({ type: Boolean, reflect: true })
+], UmbDocumentItemRefElement.prototype, "selected", void 0);
+__decorate([
+    property({ type: Boolean, reflect: true })
+], UmbDocumentItemRefElement.prototype, "disabled", void 0);
 __decorate([
     state()
 ], UmbDocumentItemRefElement.prototype, "_unique", void 0);

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

@@ -14,4 +14,8 @@ export declare class UmbDocumentItemServerDataSource extends UmbItemServerDataSo
      * @memberof UmbDocumentItemServerDataSource
      */
     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;
+    }>;
 }

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

@@ -1,6 +1,7 @@
 import { UMB_DOCUMENT_ENTITY_TYPE } from '../../entity.js';
 import { DocumentService } from '@umbraco-cms/backoffice/external/backend-api';
 import { UmbItemServerDataSourceBase } from '@umbraco-cms/backoffice/repository';
+import { UmbItemDataApiGetRequestController } from '@umbraco-cms/backoffice/entity-item';
 /**
  * A data source for Document items that fetches data from the server
  * @class UmbDocumentItemServerDataSource
@@ -14,13 +15,21 @@ export class UmbDocumentItemServerDataSource extends UmbItemServerDataSourceBase
      */
     constructor(host) {
         super(host, {
-            getItems,
             mapper,
         });
     }
+    async getItems(uniques) {
+        if (!uniques)
+            throw new Error('Uniques are missing');
+        const itemRequestManager = new UmbItemDataApiGetRequestController(this, {
+            // eslint-disable-next-line local-rules/no-direct-api-import
+            api: (args) => DocumentService.getItemDocument({ query: { id: args.uniques } }),
+            uniques,
+        });
+        const { data, error } = await itemRequestManager.request();
+        return { data: this._getMappedItems(data), error };
+    }
 }
-/* eslint-disable local-rules/no-direct-api-import */
-const getItems = (uniques) => DocumentService.getItemDocument({ query: { id: uniques } });
 const mapper = (item) => {
     return {
         documentType: {

package/dist-cms/packages/documents/documents/modals/save-modal/document-save-modal.element.js

@@ -47,10 +47,6 @@ let UmbDocumentSaveModalElement = class UmbDocumentSaveModalElement extends UmbM
     }
     render() {
         return html `<uui-dialog-layout headline=${this.localize.term('content_saveModalTitle')}>
-			<p id="subtitle">
-				<umb-localize key="content_variantsToSave">Choose which variants to be saved.</umb-localize>
-			</p>
-
 			<umb-document-variant-language-picker
 				.selectionManager=${this.#selectionManager}
 				.variantLanguageOptions=${this._options}
@@ -59,7 +55,7 @@ let UmbDocumentSaveModalElement = class UmbDocumentSaveModalElement extends UmbM
 			<div slot="actions">
 				<uui-button label=${this.localize.term('general_close')} @click=${this.#close}></uui-button>
 				<uui-button
-					label="${this.localize.term('buttons_saveAndClose')}"
+					label="${this.localize.term('buttons_save')}"
 					look="primary"
 					color="positive"
 					@click=${this.#submit}></uui-button>

package/dist-cms/packages/documents/documents/picker/document-picker-search-result-item.element.d.ts

@@ -2,6 +2,7 @@ import type { UmbDocumentSearchItemModel } from '../search/types.js';
 import { nothing } from '@umbraco-cms/backoffice/external/lit';
 import { UmbPickerSearchResultItemElementBase } from '@umbraco-cms/backoffice/picker';
 export declare class UmbDocumentPickerSearchResultItemElement extends UmbPickerSearchResultItemElementBase<UmbDocumentSearchItemModel> {
+    #private;
     render(): typeof nothing | import("lit-html").TemplateResult<1>;
 }
 export { UmbDocumentPickerSearchResultItemElement as element };

package/dist-cms/packages/documents/documents/picker/document-picker-search-result-item.element.js

@@ -7,21 +7,28 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { customElement, html, nothing } from '@umbraco-cms/backoffice/external/lit';
 import { UmbPickerSearchResultItemElementBase } from '@umbraco-cms/backoffice/picker';
 let UmbDocumentPickerSearchResultItemElement = class UmbDocumentPickerSearchResultItemElement extends UmbPickerSearchResultItemElementBase {
+    #onSelected(event) {
+        if (event.unique !== this.item.unique)
+            return;
+        this.pickerContext?.selection.select(this.item.unique);
+    }
+    #onDeselected(event) {
+        if (event.unique !== this.item.unique)
+            return;
+        this.pickerContext?.selection.deselect(this.item.unique);
+    }
     render() {
         if (!this.item)
             return nothing;
-        const item = this.item;
         return html `
-			<umb-ref-item
-				name=${item.name}
-				id=${item.unique}
-				icon=${item.documentType.icon ?? 'icon-document'}
+			<umb-entity-item-ref
+				.item=${this.item}
 				select-only
-				selectable
+				?selectable=${!this.disabled}
 				?selected=${this._isSelected}
-				@deselected=${() => this.pickerContext?.selection.deselect(item.unique)}
-				@selected=${() => this.pickerContext?.selection.select(item.unique)}>
-			</umb-ref-item>
+				?disabled=${this.disabled}
+				@deselected=${this.#onDeselected}
+				@selected=${this.#onSelected}></umb-entity-item-ref>
 		`;
     }
 };

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

@@ -1,5 +1,8 @@
-import type { UmbDocumentDetailModel, UmbDocumentVariantModel } from '../types.js';
+import type { UmbDocumentDetailModel, UmbDocumentVariantModel, UmbDocumentWorkspaceContext } from '../types.js';
 import { UmbContentPropertyDatasetContext } from '@umbraco-cms/backoffice/content';
 import type { UmbDocumentTypeDetailModel } from '@umbraco-cms/backoffice/document-type';
+import type { UmbVariantId } from '@umbraco-cms/backoffice/variant';
+import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 export declare class UmbDocumentPropertyDatasetContext extends UmbContentPropertyDatasetContext<UmbDocumentDetailModel, UmbDocumentTypeDetailModel, UmbDocumentVariantModel> {
+    constructor(host: UmbControllerHost, dataOwner: UmbDocumentWorkspaceContext, variantId?: UmbVariantId);
 }

package/dist-cms/packages/documents/documents/property-dataset-context/document-property-dataset.context.js

@@ -1,3 +1,6 @@
 import { UmbContentPropertyDatasetContext } from '@umbraco-cms/backoffice/content';
 export class UmbDocumentPropertyDatasetContext extends UmbContentPropertyDatasetContext {
+    constructor(host, dataOwner, variantId) {
+        super(host, dataOwner, variantId);
+    }
 }

package/dist-cms/packages/documents/documents/publishing/publish/modal/document-publish-modal.element.js

@@ -75,22 +75,18 @@ let UmbDocumentPublishModalElement = class UmbDocumentPublishModalElement extend
         this.modalContext?.reject();
     }
     render() {
-        return html `<uui-dialog-layout headline=${this.localize.term('content_readyToPublish')}>
-			${when(!this._isInvariant, () => html ` <p id="subtitle">
-							<umb-localize key="content_variantsToPublish">Which variants would you like to publish?</umb-localize>
-						</p>
-						<umb-document-variant-language-picker
-							.selectionManager=${this.#selectionManager}
-							.variantLanguageOptions=${this._options}
-							.requiredFilter=${isNotPublishedMandatory}
-							.pickableFilter=${this.#pickableFilter}></umb-document-variant-language-picker>`)}
-
+        const headline = this.data?.headline ?? this.localize.term('content_publishModalTitle');
+        return html `<uui-dialog-layout headline=${headline}>
 			<p>
-				<umb-localize key="prompt_confirmPublish">
-					Publishing will make this page and all its published descendants visible on the site.
-				</umb-localize>
+				<umb-localize key="prompt_confirmPublish"></umb-localize>
 			</p>
 
+			${when(!this._isInvariant, () => html ` <umb-document-variant-language-picker
+						.selectionManager=${this.#selectionManager}
+						.variantLanguageOptions=${this._options}
+						.requiredFilter=${isNotPublishedMandatory}
+						.pickableFilter=${this.#pickableFilter}></umb-document-variant-language-picker>`)}
+
 			<div slot="actions">
 				<uui-button label=${this.localize.term('general_close')} @click=${this.#close}></uui-button>
 				<uui-button

package/dist-cms/packages/documents/documents/publishing/publish/modal/document-publish-modal.token.d.ts

@@ -2,6 +2,7 @@ import type { UmbDocumentVariantPickerData, UmbDocumentVariantPickerValue } from
 import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 export declare const UMB_DOCUMENT_PUBLISH_MODAL_ALIAS = "Umb.Modal.DocumentPublish";
 export interface UmbDocumentPublishModalData extends UmbDocumentVariantPickerData {
+    headline?: string;
     confirmLabel?: string;
 }
 export interface UmbDocumentPublishModalValue extends UmbDocumentVariantPickerValue {

package/dist-cms/packages/documents/documents/publishing/schedule-publish/modal/document-schedule-modal.element.js

@@ -119,16 +119,6 @@ let UmbDocumentScheduleModalElement = class UmbDocumentScheduleModalElement exte
     }
     render() {
         return html `<uui-dialog-layout headline=${this.localize.term('general_scheduledPublishing')}>
-			<p id="subtitle">
-				${when(this._options.length > 1, () => html `
-						<umb-localize key="content_languagesToSchedule">Which languages would you like to schedule?</umb-localize>
-					`, () => html `
-						<umb-localize key="content_schedulePublishHelp">
-							Select the date and time to publish and/or unpublish the content item.
-						</umb-localize>
-					`)}
-			</p>
-
 			${this.#renderOptions()}
 
 			<div slot="actions">

package/dist-cms/packages/documents/documents/publishing/unpublish/entity-action/unpublish.action.js

@@ -88,25 +88,11 @@ export class UmbUnpublishDocumentEntityAction extends UmbEntityActionBase {
             throw error;
         }
         if (!error) {
-            // If the content is invariant, we need to show a different notification
-            const isInvariant = options.length === 1 && options[0].culture === null;
-            if (isInvariant) {
-                notificationContext?.peek('positive', {
-                    data: {
-                        headline: localize.term('speechBubbles_editContentUnpublishedHeader'),
-                        message: localize.term('speechBubbles_editContentUnpublishedText'),
-                    },
-                });
-            }
-            else {
-                const documentVariants = documentData.variants.filter((variant) => result.selection.includes(variant.culture));
-                notificationContext?.peek('positive', {
-                    data: {
-                        headline: localize.term('speechBubbles_editContentUnpublishedHeader'),
-                        message: localize.term('speechBubbles_editVariantUnpublishedText', localize.list(documentVariants.map((v) => v.culture ?? v.name))),
-                    },
-                });
-            }
+            notificationContext?.peek('positive', {
+                data: {
+                    message: localize.term('speechBubbles_editContentUnpublishedHeader'),
+                },
+            });
             const actionEventContext = await this.getContext(UMB_ACTION_EVENT_CONTEXT);
             const event = new UmbRequestReloadStructureForEntityEvent({
                 unique: this.args.unique,