@umbraco-cms/backoffice 15.2.2 → 15.3.0-rc

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

@@ -14,8 +14,16 @@ let UmbDocumentSaveModalElement = class UmbDocumentSaveModalElement extends UmbM
         super(...arguments);
         this.#selectionManager = new UmbSelectionManager(this);
         this._options = [];
+        this.#pickableFilter = (option) => {
+            if (!option.variant) {
+                // If not data present, then its not pickable.
+                return false;
+            }
+            return this.data?.pickableFilter ? this.data.pickableFilter(option) : true;
+        };
     }
     #selectionManager;
+    #pickableFilter;
     firstUpdated() {
         this.#configureSelectionManager();
     }
@@ -25,8 +33,9 @@ let UmbDocumentSaveModalElement = class UmbDocumentSaveModalElement extends UmbM
         // Only display variants that are relevant to pick from, i.e. variants that are draft or published with pending changes:
         this._options = this.data?.options ?? [];
         let selected = this.value?.selection ?? [];
+        const validOptions = this._options.filter((o) => this.#pickableFilter(o));
         // Filter selection based on options:
-        selected = selected.filter((s) => this._options.some((o) => o.unique === s));
+        selected = selected.filter((s) => validOptions.some((o) => o.unique === s));
         this.#selectionManager.setSelection(selected);
     }
     #submit() {
@@ -45,7 +54,7 @@ let UmbDocumentSaveModalElement = class UmbDocumentSaveModalElement extends UmbM
 			<umb-document-variant-language-picker
 				.selectionManager=${this.#selectionManager}
 				.variantLanguageOptions=${this._options}
-				.pickableFilter=${this.data?.pickableFilter}></umb-document-variant-language-picker>
+				.pickableFilter=${this.#pickableFilter}></umb-document-variant-language-picker>
 
 			<div slot="actions">
 				<uui-button label=${this.localize.term('general_close')} @click=${this.#close}></uui-button>

package/dist-cms/packages/documents/documents/modals/shared/document-variant-language-picker.element.d.ts

@@ -8,7 +8,7 @@ export declare class UmbDocumentVariantLanguagePickerElement extends UmbLitEleme
     set selectionManager(value: UmbSelectionManager<string>);
     get selectionManager(): UmbSelectionManager<string>;
     _selection: Array<string>;
-    _isAllSelected?: boolean;
+    _isAllSelected: boolean;
     /**
      * A filter function that determines if an item is pickableFilter or not.
      * @memberof UmbDocumentVariantLanguagePickerElement

package/dist-cms/packages/documents/documents/modals/shared/document-variant-language-picker.element.js

@@ -15,6 +15,7 @@ let UmbDocumentVariantLanguagePickerElement = class UmbDocumentVariantLanguagePi
         super(...arguments);
         this.variantLanguageOptions = [];
         this._selection = [];
+        this._isAllSelected = false;
     }
     static { UmbDocumentVariantLanguagePickerElement_1 = this; }
     #selectionManager;
@@ -30,6 +31,9 @@ let UmbDocumentVariantLanguagePickerElement = class UmbDocumentVariantLanguagePi
     }
     updated(_changedProperties) {
         super.updated(_changedProperties);
+        if (_changedProperties.has('variantLanguageOptions')) {
+            this._isAllSelected = this.#isAllSelected();
+        }
         if (this.selectionManager && this.pickableFilter) {
             this.#selectionManager.setAllowLimitation((unique) => {
                 const option = this.variantLanguageOptions.find((o) => o.unique === unique);
@@ -52,7 +56,7 @@ let UmbDocumentVariantLanguagePickerElement = class UmbDocumentVariantLanguagePi
         const allUniques = this.variantLanguageOptions.map((o) => o.unique);
         const filter = this.selectionManager.getAllowLimitation();
         const allowedUniques = allUniques.filter((unique) => filter(unique));
-        return this._selection.length === allowedUniques.length;
+        return this._selection.length !== 0 && this._selection.length === allowedUniques.length;
     }
     render() {
         if (this.variantLanguageOptions.length === 0) {
@@ -116,16 +120,18 @@ let UmbDocumentVariantLanguagePickerElement = class UmbDocumentVariantLanguagePi
 			.required {
 				color: var(--uui-color-danger);
 				--uui-menu-item-color-hover: var(--uui-color-danger-emphasis);
+				--uui-menu-item-color-disabled: var(--uui-color-danger);
 			}
 			.label {
-				padding: 0.5rem 0;
+				padding: var(--uui-size-space-3) 0;
 			}
 			.label-status {
-				font-size: 0.8rem;
+				font-size: var(--uui-type-small-size);
 			}
 
 			uui-menu-item {
 				--uui-menu-item-flat-structure: 1;
+				--uui-menu-item-border-radius: var(--uui-border-radius);
 			}
 
 			uui-checkbox {

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

@@ -0,0 +1,12 @@
+import type { UmbDocumentSearchItemModel } from '../search/types.js';
+import { nothing } from '../../../../external/lit/index.js';
+import { UmbPickerSearchResultItemElementBase } from '../../../core/picker/index.js';
+export declare class UmbDocumentPickerSearchResultItemElement extends UmbPickerSearchResultItemElementBase<UmbDocumentSearchItemModel> {
+    render(): typeof nothing | import("lit-html").TemplateResult<1>;
+}
+export { UmbDocumentPickerSearchResultItemElement as element };
+declare global {
+    interface HTMLElementTagNameMap {
+        'umb-document-picker-search-result-item': UmbDocumentPickerSearchResultItemElement;
+    }
+}

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

@@ -0,0 +1,32 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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 { customElement, html, nothing } from '../../../../external/lit/index.js';
+import { UmbPickerSearchResultItemElementBase } from '../../../core/picker/index.js';
+let UmbDocumentPickerSearchResultItemElement = class UmbDocumentPickerSearchResultItemElement extends UmbPickerSearchResultItemElementBase {
+    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'}
+				select-only
+				selectable
+				?selected=${this._isSelected}
+				@deselected=${() => this.pickerContext?.selection.deselect(item.unique)}
+				@selected=${() => this.pickerContext?.selection.select(item.unique)}>
+			</umb-ref-item>
+		`;
+    }
+};
+UmbDocumentPickerSearchResultItemElement = __decorate([
+    customElement('umb-document-picker-search-result-item')
+], UmbDocumentPickerSearchResultItemElement);
+export { UmbDocumentPickerSearchResultItemElement };
+export { UmbDocumentPickerSearchResultItemElement as element };

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

@@ -5,6 +5,7 @@ export const manifests = [
         kind: 'default',
         alias: 'Umb.PickerSearchResultItem.Document',
         name: 'Document Picker Search Result Item',
+        element: () => import('./document-picker-search-result-item.element.js'),
         forEntityTypes: [UMB_DOCUMENT_ENTITY_TYPE],
     },
 ];

package/dist-cms/packages/documents/documents/publishing/pending-changes/document-published-pending-changes.manager.js

@@ -46,6 +46,9 @@ export class UmbDocumentPublishedPendingChangesManager extends UmbControllerBase
             // remove dates from the comparison
             mergedDataClone.variants.forEach((variant) => this.#cleanVariantForComparison(variant));
             publishedDataClone.variants.forEach((variant) => this.#cleanVariantForComparison(variant));
+            // remove template from the comparison (doesn't affect publishable changes, and the published version is coming through as null)
+            mergedDataClone.template = null;
+            publishedDataClone.template = null;
             const hasChanges = jsonStringComparison(mergedDataClone, publishedDataClone) === false;
             if (hasChanges) {
                 return { variantId };

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

@@ -7,6 +7,8 @@ import { UmbVariantId } from '../../../../../core/variant/index.js';
 import { UMB_MODAL_MANAGER_CONTEXT } from '../../../../../core/modal/index.js';
 import { UMB_ACTION_EVENT_CONTEXT } from '../../../../../core/action/index.js';
 import { UMB_CURRENT_USER_CONTEXT } from '../../../../../user/current-user/index.js';
+import { UMB_NOTIFICATION_CONTEXT } from '../../../../../core/notification/index.js';
+import { UmbLocalizationController } from '../../../../../../libs/localization-api/index.js';
 export class UmbPublishDocumentEntityAction extends UmbEntityActionBase {
     constructor(host, args) {
         super(host, args);
@@ -14,6 +16,8 @@ export class UmbPublishDocumentEntityAction extends UmbEntityActionBase {
     async execute() {
         if (!this.args.unique)
             throw new Error('The document unique identifier is missing');
+        const notificationContext = await this.getContext(UMB_NOTIFICATION_CONTEXT);
+        const localize = new UmbLocalizationController(this);
         const languageRepository = new UmbLanguageCollectionRepository(this._host);
         const { data: languageData } = await languageRepository.requestCollection({});
         const documentRepository = new UmbDocumentDetailRepository(this._host);
@@ -52,7 +56,15 @@ export class UmbPublishDocumentEntityAction extends UmbEntityActionBase {
         if (options.length === 1) {
             const variantId = UmbVariantId.Create(documentData.variants[0]);
             const publishingRepository = new UmbDocumentPublishingRepository(this._host);
-            await publishingRepository.publish(this.args.unique, [{ variantId }]);
+            const { error } = await publishingRepository.publish(this.args.unique, [{ variantId }]);
+            if (!error) {
+                notificationContext.peek('positive', {
+                    data: {
+                        headline: localize.term('speechBubbles_editContentPublishedHeader'),
+                        message: localize.term('speechBubbles_editContentPublishedText'),
+                    },
+                });
+            }
             actionEventContext.dispatchEvent(event);
             return;
         }
@@ -89,7 +101,16 @@ export class UmbPublishDocumentEntityAction extends UmbEntityActionBase {
         const variantIds = result?.selection.map((x) => UmbVariantId.FromString(x)) ?? [];
         if (variantIds.length) {
             const publishingRepository = new UmbDocumentPublishingRepository(this._host);
-            await publishingRepository.publish(this.args.unique, variantIds.map((variantId) => ({ variantId })));
+            const { error } = await publishingRepository.publish(this.args.unique, variantIds.map((variantId) => ({ variantId })));
+            if (!error) {
+                const documentVariants = documentData.variants.filter((variant) => result.selection.includes(variant.culture));
+                notificationContext.peek('positive', {
+                    data: {
+                        headline: localize.term('speechBubbles_editContentPublishedHeader'),
+                        message: localize.term('speechBubbles_editVariantPublishedText', localize.list(documentVariants.map((v) => v.culture ?? v.name))),
+                    },
+                });
+            }
             actionEventContext.dispatchEvent(event);
         }
     }

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

@@ -10,11 +10,14 @@ import { UmbLocalizationController } from '../../../../../../libs/localization-a
 import { UMB_ENTITY_CONTEXT } from '../../../../../core/entity/index.js';
 import { UMB_ACTION_EVENT_CONTEXT } from '../../../../../core/action/index.js';
 import { UmbRequestReloadChildrenOfEntityEvent } from '../../../../../core/entity-action/index.js';
+import { UMB_NOTIFICATION_CONTEXT } from '../../../../../core/notification/index.js';
 export class UmbDocumentPublishEntityBulkAction extends UmbEntityBulkActionBase {
     async execute() {
         const entityContext = await this.getContext(UMB_ENTITY_CONTEXT);
         const entityType = entityContext.getEntityType();
         const unique = entityContext.getUnique();
+        const notificationContext = await this.getContext(UMB_NOTIFICATION_CONTEXT);
+        const localize = new UmbLocalizationController(this);
         if (!entityType)
             throw new Error('Entity type not found');
         if (unique === undefined)
@@ -41,6 +44,8 @@ export class UmbDocumentPublishEntityBulkAction extends UmbEntityBulkActionBase
                 publishDate: null,
                 updateDate: null,
                 segment: null,
+                scheduledPublishDate: null,
+                scheduledUnpublishDate: null,
             },
             unique: new UmbVariantId(language.unique, null).toString(),
             culture: language.unique,
@@ -69,10 +74,20 @@ export class UmbDocumentPublishEntityBulkAction extends UmbEntityBulkActionBase
             if (confirm !== false) {
                 const variantId = new UmbVariantId(options[0].language.unique, null);
                 const publishingRepository = new UmbDocumentPublishingRepository(this._host);
+                let documentCnt = 0;
                 for (let i = 0; i < this.selection.length; i++) {
                     const id = this.selection[i];
-                    await publishingRepository.publish(id, [{ variantId }]);
+                    const { error } = await publishingRepository.publish(id, [{ variantId }]);
+                    if (!error) {
+                        documentCnt++;
+                    }
                 }
+                notificationContext.peek('positive', {
+                    data: {
+                        headline: localize.term('speechBubbles_editContentPublishedHeader'),
+                        message: localize.term('speechBubbles_editMultiContentPublishedText', documentCnt),
+                    },
+                });
                 eventContext.dispatchEvent(event);
             }
             return;
@@ -100,10 +115,20 @@ export class UmbDocumentPublishEntityBulkAction extends UmbEntityBulkActionBase
         const variantIds = result?.selection.map((x) => UmbVariantId.FromString(x)) ?? [];
         const repository = new UmbDocumentPublishingRepository(this._host);
         if (variantIds.length) {
+            let documentCnt = 0;
             for (const unique of this.selection) {
-                await repository.publish(unique, variantIds.map((variantId) => ({ variantId })));
-                eventContext.dispatchEvent(event);
+                const { error } = await repository.publish(unique, variantIds.map((variantId) => ({ variantId })));
+                if (!error) {
+                    documentCnt++;
+                }
             }
+            notificationContext.peek('positive', {
+                data: {
+                    headline: localize.term('speechBubbles_editContentPublishedHeader'),
+                    message: localize.term('speechBubbles_editMultiVariantPublishedText', documentCnt, localize.list(variantIds.map((v) => v.culture ?? ''))),
+                },
+            });
+            eventContext.dispatchEvent(event);
         }
     }
 }

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

@@ -16,8 +16,15 @@ let UmbDocumentPublishModalElement = class UmbDocumentPublishModalElement extend
         super(...arguments);
         this.#selectionManager = new UmbSelectionManager(this);
         this._options = [];
+        this.#pickableFilter = (option) => {
+            if (!option.variant || option.variant.state === UmbDocumentVariantState.NOT_CREATED) {
+                return false;
+            }
+            return this.data?.pickableFilter ? this.data.pickableFilter(option) : true;
+        };
     }
     #selectionManager;
+    #pickableFilter;
     firstUpdated() {
         this.#configureSelectionManager();
     }
@@ -31,8 +38,9 @@ let UmbDocumentPublishModalElement = class UmbDocumentPublishModalElement extend
                 isNotPublishedMandatory(option) ||
                 option.variant?.state !== UmbDocumentVariantState.NOT_CREATED) ?? [];
         let selected = this.value?.selection ?? [];
+        const validOptions = this._options.filter((o) => this.#pickableFilter(o));
         // Filter selection based on options:
-        selected = selected.filter((s) => this._options.some((o) => o.unique === s));
+        selected = selected.filter((s) => validOptions.some((o) => o.unique === s));
         // Additionally select mandatory languages:
         // [NL]: I think for now lets make it an active choice to select the languages. If you just made them, they would be selected. So it just to underline the act of actually selecting these languages.
         /*
@@ -67,7 +75,7 @@ let UmbDocumentPublishModalElement = class UmbDocumentPublishModalElement extend
 				.selectionManager=${this.#selectionManager}
 				.variantLanguageOptions=${this._options}
 				.requiredFilter=${isNotPublishedMandatory}
-				.pickableFilter=${this.data?.pickableFilter}></umb-document-variant-language-picker>
+				.pickableFilter=${this.#pickableFilter}></umb-document-variant-language-picker>
 
 			<div slot="actions">
 				<uui-button label=${this.localize.term('general_close')} @click=${this.#close}></uui-button>
@@ -78,14 +86,14 @@ let UmbDocumentPublishModalElement = class UmbDocumentPublishModalElement extend
 					?disabled=${this._hasNotSelectedMandatory}
 					@click=${this.#submit}></uui-button>
 			</div>
-		</umb-body-layout> `;
+		</umb-body-layout>`;
     }
     static { this.styles = [
         UmbTextStyles,
         css `
 			:host {
 				display: block;
-				width: 400px;
+				min-width: 460px;
 				max-width: 90vw;
 			}
 		`,

package/dist-cms/packages/documents/documents/publishing/publish/workspace-action/save-and-publish.action.d.ts

@@ -1,7 +1,8 @@
-import { UmbWorkspaceActionBase } from '../../../../../core/workspace/index.js';
+import { UmbWorkspaceActionBase, type UmbWorkspaceActionArgs } from '../../../../../core/workspace/index.js';
 import type { UmbControllerHost } from '../../../../../../libs/controller-api/index.js';
 export declare class UmbDocumentSaveAndPublishWorkspaceAction extends UmbWorkspaceActionBase {
-    constructor(host: UmbControllerHost, args: any);
+    constructor(host: UmbControllerHost, args: UmbWorkspaceActionArgs<never>);
+    hasAdditionalOptions(): Promise<boolean>;
     execute(): Promise<void>;
 }
 export { UmbDocumentSaveAndPublishWorkspaceAction as api };

package/dist-cms/packages/documents/documents/publishing/publish/workspace-action/save-and-publish.action.js

@@ -1,6 +1,7 @@
 import { UmbDocumentUserPermissionCondition } from '../../../user-permissions/conditions/document-user-permission.condition.js';
 import { UMB_USER_PERMISSION_DOCUMENT_PUBLISH, UMB_USER_PERMISSION_DOCUMENT_UPDATE, } from '../../../user-permissions/constants.js';
 import { UMB_DOCUMENT_PUBLISHING_WORKSPACE_CONTEXT } from '../../workspace-context/constants.js';
+import { UMB_DOCUMENT_WORKSPACE_CONTEXT } from '../../../constants.js';
 import { UmbWorkspaceActionBase } from '../../../../../core/workspace/index.js';
 export class UmbDocumentSaveAndPublishWorkspaceAction extends UmbWorkspaceActionBase {
     constructor(host, args) {
@@ -24,6 +25,11 @@ export class UmbDocumentSaveAndPublishWorkspaceAction extends UmbWorkspaceAction
             },
         });
     }
+    async hasAdditionalOptions() {
+        const workspaceContext = await this.getContext(UMB_DOCUMENT_WORKSPACE_CONTEXT);
+        const variantOptions = await this.observe(workspaceContext.variantOptions).asPromise();
+        return variantOptions?.length > 1;
+    }
     async execute() {
         const workspaceContext = await this.getContext(UMB_DOCUMENT_PUBLISHING_WORKSPACE_CONTEXT);
         return workspaceContext.saveAndPublish();

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

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { UmbDocumentVariantState } from '../../../types.js';
 import { isNotPublishedMandatory } from '../../utils.js';
 import { css, customElement, html, state } from '../../../../../../external/lit/index.js';
-import { UmbModalBaseElement } from '../../../../../core/modal/index.js';
+import { umbConfirmModal, UmbModalBaseElement } from '../../../../../core/modal/index.js';
 import { UmbTextStyles } from '../../../../../core/style/index.js';
 import { UmbSelectionManager } from '../../../../../core/utils/index.js';
 import '../../../modals/shared/document-variant-language-picker.element.js';
@@ -16,10 +16,20 @@ let UmbDocumentPublishWithDescendantsModalElement = class UmbDocumentPublishWith
         super(...arguments);
         this.#selectionManager = new UmbSelectionManager(this);
         this.#includeUnpublishedDescendants = false;
+        this.#forceRepublish = false;
         this._options = [];
+        this.#pickableFilter = (option) => {
+            if (!option.variant) {
+                // If not data present, then its not pickable.
+                return false;
+            }
+            return this.data?.pickableFilter ? this.data.pickableFilter(option) : true;
+        };
     }
     #selectionManager;
     #includeUnpublishedDescendants;
+    #forceRepublish;
+    #pickableFilter;
     firstUpdated() {
         this.#configureSelectionManager();
     }
@@ -30,8 +40,9 @@ let UmbDocumentPublishWithDescendantsModalElement = class UmbDocumentPublishWith
         this._options =
             this.data?.options.filter((option) => isNotPublishedMandatory(option) || option.variant?.state !== UmbDocumentVariantState.NOT_CREATED) ?? [];
         let selected = this.value?.selection ?? [];
+        const validOptions = this._options.filter((o) => this.#pickableFilter(o));
         // Filter selection based on options:
-        selected = selected.filter((s) => this._options.some((o) => o.unique === s));
+        selected = selected.filter((s) => validOptions.some((o) => o.unique === s));
         // Additionally select mandatory languages:
         // [NL]: I think for now lets make it an active choice to select the languages. If you just made them, they would be selected. So it just to underline the act of actually selecting these languages.
         /*
@@ -50,10 +61,25 @@ let UmbDocumentPublishWithDescendantsModalElement = class UmbDocumentPublishWith
             this._hasNotSelectedMandatory = missingMandatoryOptions.some((option) => !selection.includes(option.unique));
         }, 'observeSelection');
     }
-    #submit() {
+    #onIncludeUnpublishedDescendantsChange() {
+        this.#includeUnpublishedDescendants = !this.#includeUnpublishedDescendants;
+    }
+    async #onForceRepublishChange() {
+        this.#forceRepublish = !this.#forceRepublish;
+    }
+    async #submit() {
+        if (this.#forceRepublish) {
+            await umbConfirmModal(this, {
+                headline: this.localize.term('content_forceRepublishWarning'),
+                content: this.localize.term('content_forceRepublishAdvisory'),
+                color: 'warning',
+                confirmLabel: this.localize.term('actions_publish'),
+            });
+        }
         this.value = {
             selection: this.#selectionManager.getSelection(),
             includeUnpublishedDescendants: this.#includeUnpublishedDescendants,
+            forceRepublish: this.#forceRepublish,
         };
         this.modalContext?.submit();
     }
@@ -82,14 +108,22 @@ let UmbDocumentPublishWithDescendantsModalElement = class UmbDocumentPublishWith
 				.selectionManager=${this.#selectionManager}
 				.variantLanguageOptions=${this._options}
 				.requiredFilter=${isNotPublishedMandatory}
-				.pickableFilter=${this.data?.pickableFilter}></umb-document-variant-language-picker>
+				.pickableFilter=${this.#pickableFilter}></umb-document-variant-language-picker>
 
 			<uui-form-layout-item>
 				<uui-toggle
 					id="includeUnpublishedDescendants"
 					label=${this.localize.term('content_includeUnpublished')}
 					?checked=${this.value?.includeUnpublishedDescendants}
-					@change=${() => (this.#includeUnpublishedDescendants = !this.#includeUnpublishedDescendants)}></uui-toggle>
+					@change=${this.#onIncludeUnpublishedDescendantsChange}></uui-toggle>
+			</uui-form-layout-item>
+
+			<uui-form-layout-item>
+				<uui-toggle
+					id="forceRepublish"
+					label=${this.localize.term('content_forceRepublish')}
+					?checked=${this.value?.forceRepublish}
+					@change=${this.#onForceRepublishChange}></uui-toggle>
 			</uui-form-layout-item>
 
 			<div slot="actions">
@@ -108,7 +142,7 @@ let UmbDocumentPublishWithDescendantsModalElement = class UmbDocumentPublishWith
         css `
 			:host {
 				display: block;
-				width: 400px;
+				min-width: 460px;
 				max-width: 90vw;
 			}
 		`,

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

@@ -5,5 +5,6 @@ export interface UmbDocumentPublishWithDescendantsModalData extends UmbDocumentV
 }
 export interface UmbDocumentPublishWithDescendantsModalValue extends UmbDocumentVariantPickerValue {
     includeUnpublishedDescendants?: boolean;
+    forceRepublish?: boolean;
 }
 export declare const UMB_DOCUMENT_PUBLISH_WITH_DESCENDANTS_MODAL: UmbModalToken<UmbDocumentPublishWithDescendantsModalData, UmbDocumentPublishWithDescendantsModalValue>;

package/dist-cms/packages/documents/documents/publishing/publish-with-descendants/workspace-action/manifests.js

@@ -1,4 +1,4 @@
-import { UMB_USER_PERMISSION_DOCUMENT_PUBLISH, UMB_USER_PERMISSION_DOCUMENT_UPDATE, } from '../../../user-permissions/constants.js';
+import { UMB_DOCUMENT_USER_PERMISSION_CONDITION_ALIAS, UMB_USER_PERMISSION_DOCUMENT_PUBLISH, UMB_USER_PERMISSION_DOCUMENT_UPDATE, } from '../../../user-permissions/constants.js';
 import { UMB_WORKSPACE_ENTITY_IS_NEW_CONDITION_ALIAS } from '../../../../../core/workspace/index.js';
 import { UMB_ENTITY_IS_NOT_TRASHED_CONDITION_ALIAS } from '../../../../../core/recycle-bin/index.js';
 export const manifests = [
@@ -16,7 +16,7 @@ export const manifests = [
         },
         conditions: [
             {
-                alias: 'Umb.Condition.UserPermission.Document',
+                alias: UMB_DOCUMENT_USER_PERMISSION_CONDITION_ALIAS,
                 allOf: [UMB_USER_PERMISSION_DOCUMENT_UPDATE, UMB_USER_PERMISSION_DOCUMENT_PUBLISH],
             },
             {

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

@@ -14,9 +14,7 @@ export declare class UmbDocumentPublishingRepository extends UmbRepositoryBase {
      * @returns {*}
      * @memberof UmbDocumentPublishingRepository
      */
-    publish(unique: string, variants: Array<UmbDocumentVariantPublishModel>): Promise<{
-        error: import("../../../../../external/backend-api/index.js").ApiError | import("../../../../../external/backend-api/index.js").CancelError | undefined;
-    }>;
+    publish(unique: string, variants: Array<UmbDocumentVariantPublishModel>): Promise<import("../../../../core/repository/index.js").UmbDataSourceResponse<string>>;
     /**
      * Unpublish one or more variants of a Document
      * @param {string} id
@@ -32,9 +30,10 @@ export declare class UmbDocumentPublishingRepository extends UmbRepositoryBase {
      * @param id
      * @param variantIds
      * @param includeUnpublishedDescendants
+     * @param forceRepublish
      * @memberof UmbDocumentPublishingRepository
      */
-    publishWithDescendants(id: string, variantIds: Array<UmbVariantId>, includeUnpublishedDescendants: boolean): Promise<{
+    publishWithDescendants(id: string, variantIds: Array<UmbVariantId>, includeUnpublishedDescendants: boolean, forceRepublish: boolean): Promise<{
         error: import("../../../../../external/backend-api/index.js").ApiError | import("../../../../../external/backend-api/index.js").CancelError | undefined;
     }>;
     /**

package/dist-cms/packages/documents/documents/publishing/repository/document-publishing.repository.js

@@ -4,6 +4,9 @@ import { UMB_NOTIFICATION_CONTEXT } from '../../../../core/notification/index.js
 export class UmbDocumentPublishingRepository extends UmbRepositoryBase {
     #init;
     #publishingDataSource;
+    /**
+     * @deprecated The calling workspace context should be used instead to show notifications
+     */
     #notificationContext;
     constructor(host) {
         super(host);
@@ -29,12 +32,7 @@ export class UmbDocumentPublishingRepository extends UmbRepositoryBase {
         if (!variants.length)
             throw new Error('variant IDs are missing');
         await this.#init;
-        const { error } = await this.#publishingDataSource.publish(unique, variants);
-        if (!error) {
-            const notification = { data: { message: `Document published` } };
-            this.#notificationContext?.peek('positive', notification);
-        }
-        return { error };
+        return this.#publishingDataSource.publish(unique, variants);
     }
     /**
      * Unpublish one or more variants of a Document
@@ -52,6 +50,7 @@ export class UmbDocumentPublishingRepository extends UmbRepositoryBase {
         const { error } = await this.#publishingDataSource.unpublish(id, variantIds);
         if (!error) {
             const notification = { data: { message: `Document unpublished` } };
+            // TODO: Move this to the calling workspace context [JOV]
             this.#notificationContext?.peek('positive', notification);
         }
         return { error };
@@ -61,17 +60,19 @@ export class UmbDocumentPublishingRepository extends UmbRepositoryBase {
      * @param id
      * @param variantIds
      * @param includeUnpublishedDescendants
+     * @param forceRepublish
      * @memberof UmbDocumentPublishingRepository
      */
-    async publishWithDescendants(id, variantIds, includeUnpublishedDescendants) {
+    async publishWithDescendants(id, variantIds, includeUnpublishedDescendants, forceRepublish) {
         if (!id)
             throw new Error('id is missing');
         if (!variantIds)
             throw new Error('variant IDs are missing');
         await this.#init;
-        const { error } = await this.#publishingDataSource.publishWithDescendants(id, variantIds, includeUnpublishedDescendants);
+        const { error } = await this.#publishingDataSource.publishWithDescendants(id, variantIds, includeUnpublishedDescendants, forceRepublish);
         if (!error) {
             const notification = { data: { message: `Document published with descendants` } };
+            // TODO: Move this to the calling workspace context [JOV]
             this.#notificationContext?.peek('positive', notification);
         }
         return { error };

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

@@ -37,9 +37,10 @@ export declare class UmbDocumentPublishingServerDataSource {
      * @param unique
      * @param variantIds
      * @param includeUnpublishedDescendants
+     * @param forceRepublish
      * @memberof UmbDocumentPublishingServerDataSource
      */
-    publishWithDescendants(unique: string, variantIds: Array<UmbVariantId>, includeUnpublishedDescendants: boolean): Promise<UmbDataSourceResponse<string>>;
+    publishWithDescendants(unique: string, variantIds: Array<UmbVariantId>, includeUnpublishedDescendants: boolean, forceRepublish: boolean): Promise<UmbDataSourceResponse<string>>;
     /**
      * Get the published Document by its unique
      * @param {string} unique - Document unique

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

@@ -68,14 +68,16 @@ export class UmbDocumentPublishingServerDataSource {
      * @param unique
      * @param variantIds
      * @param includeUnpublishedDescendants
+     * @param forceRepublish
      * @memberof UmbDocumentPublishingServerDataSource
      */
-    async publishWithDescendants(unique, variantIds, includeUnpublishedDescendants) {
+    async publishWithDescendants(unique, variantIds, includeUnpublishedDescendants, forceRepublish) {
         if (!unique)
             throw new Error('Id is missing');
         const requestBody = {
             cultures: variantIds.map((variant) => variant.toCultureString()),
             includeUnpublishedDescendants,
+            forceRepublish,
         };
         return tryExecuteAndNotify(this.#host, DocumentService.putDocumentByIdPublishWithDescendants({ id: unique, requestBody }));
     }
@@ -114,6 +116,8 @@ export class UmbDocumentPublishingServerDataSource {
                     publishDate: variant.publishDate || null,
                     createDate: variant.createDate,
                     updateDate: variant.updateDate,
+                    scheduledPublishDate: variant.scheduledPublishDate || null,
+                    scheduledUnpublishDate: variant.scheduledUnpublishDate || null,
                 };
             }),
             urls: data.urls.map((url) => {

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

@@ -1,15 +1,17 @@
-import { type UmbDocumentVariantOptionModel } from '../../../types.js';
 import type { UmbDocumentScheduleModalData, UmbDocumentScheduleModalValue } from './document-schedule-modal.token.js';
 import { UmbModalBaseElement } from '../../../../../core/modal/index.js';
 export declare class UmbDocumentScheduleModalElement extends UmbModalBaseElement<UmbDocumentScheduleModalData, UmbDocumentScheduleModalValue> {
     #private;
-    _options: Array<UmbDocumentVariantOptionModel>;
-    _selection: UmbDocumentScheduleModalValue['selection'];
-    _isAllSelected?: boolean;
+    private _options;
+    private _hasNotSelectedMandatory?;
+    private readonly _selection;
+    private _isAllSelected;
+    private _internalValues;
+    private _submitButtonState?;
     constructor();
     firstUpdated(): void;
     render(): import("lit-html").TemplateResult<1>;
-    static styles: import("lit").CSSResult[];
+    static readonly styles: import("lit").CSSResult[];
 }
 export default UmbDocumentScheduleModalElement;
 declare global {