Reverts UI updates from publish with descendants dialog (15) (#18646)

* Reverts UI updates from publish with descendants dialog.

* Removed unused variable.

Author: AndyButland

src/Umbraco.Cms.Api.Management/Controllers/Document/PublishDocumentWithDescendantsController.cs

@@ -69,11 +69,6 @@ private static PublishBranchFilter BuildPublishBranchFilter(PublishDocumentWithD
             publishBranchFilter |= PublishBranchFilter.IncludeUnpublished;
         }
 
-        if (requestModel.ForceRepublish)
-        {
-            publishBranchFilter |= PublishBranchFilter.ForceRepublish;
-        }
-
         return publishBranchFilter;
     }
 }

src/Umbraco.Cms.Api.Management/OpenApi.json

@@ -42795,17 +42795,13 @@
       "PublishDocumentWithDescendantsRequestModel": {
         "required": [
           "cultures",
-          "forceRepublish",
           "includeUnpublishedDescendants"
         ],
         "type": "object",
         "properties": {
           "includeUnpublishedDescendants": {
             "type": "boolean"
           },
-          "forceRepublish": {
-            "type": "boolean"
-          },
           "cultures": {
             "type": "array",
             "items": {

src/Umbraco.Cms.Api.Management/ViewModels/Document/PublishDocumentWithDescendantsRequestModel.cs

@@ -4,7 +4,5 @@ public class PublishDocumentWithDescendantsRequestModel
 {
     public bool IncludeUnpublishedDescendants { get; set; }
 
-    public bool ForceRepublish { get; set; }
-
     public required IEnumerable<string> Cultures { get; set; }
 }

src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts

@@ -298,9 +298,6 @@ export default {
 		removeTextBox: 'Fjern denne tekstboks',
 		contentRoot: 'Indholdsrod',
 		includeUnpublished: 'Inkluder ikke-udgivet indhold.',
-		forceRepublish: 'Udgiv uændrede elementer.',
-		forceRepublishWarning: 'ADVARSEL: Udgivelse af alle sider under denne i indholdstræet, uanset om de er ændret eller ej, kan være en ressourcekrævende og langvarig proces.',
-		forceRepublishAdvisory: 'Dette bør ikke være nødvendigt under normale omstændigheder, så fortsæt kun med denne handling, hvis du er sikker på, at det er nødvendigt.',
 		isSensitiveValue:
 			'Denne værdi er skjult.Hvis du har brug for adgang til at se denne værdi, bedes du\n      kontakte din web-administrator.\n    ',
 		isSensitiveValue_short: 'Denne værdi er skjult.',

src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts

@@ -320,9 +320,6 @@ export default {
 		removeTextBox: 'Remove this text box',
 		contentRoot: 'Content root',
 		includeUnpublished: 'Include unpublished content items.',
-		forceRepublish: 'Publish unchanged items.',
-		forceRepublishWarning: 'WARNING: Publishing all pages below this one in the content tree, whether or not they have changed, can be an expensive and long-running operation.',
-		forceRepublishAdvisory: 'This should not be necessary in normal circumstances so please only proceed with this option selected if you are certain it is required.',
 		isSensitiveValue:
 			'This value is hidden. If you need access to view this value please contact your\n      website administrator.\n    ',
 		isSensitiveValue_short: 'This value is hidden.',

src/Umbraco.Web.UI.Client/src/assets/lang/en.ts

@@ -317,9 +317,6 @@ export default {
 		removeTextBox: 'Remove this text box',
 		contentRoot: 'Content root',
 		includeUnpublished: 'Include unpublished content items.',
-		forceRepublish: 'Publish unchanged items.',
-		forceRepublishWarning: 'WARNING: Publishing all pages below this one in the content tree, whether or not they have changed, can be an expensive and long-running operation.',
-		forceRepublishAdvisory: 'This should not be necessary in normal circumstances so please only proceed with this option selected if you are certain it is required.',
 		isSensitiveValue:
 			'This value is hidden. If you need access to view this value please contact your\n      website administrator.\n    ',
 		isSensitiveValue_short: 'This value is hidden.',

src/Umbraco.Web.UI.Client/src/external/backend-api/src/types.gen.ts

@@ -2050,7 +2050,6 @@ export type PublishDocumentRequestModel = {
 
 export type PublishDocumentWithDescendantsRequestModel = {
     includeUnpublishedDescendants: boolean;
-    forceRepublish: boolean;
     cultures: Array<(string)>;
 };
 

src/Umbraco.Web.UI.Client/src/packages/documents/documents/publishing/publish-with-descendants/modal/document-publish-with-descendants-modal.element.ts

@@ -5,7 +5,7 @@ import type {
 	UmbDocumentPublishWithDescendantsModalValue,
 } from './document-publish-with-descendants-modal.token.js';
 import { css, customElement, html, state } from '@umbraco-cms/backoffice/external/lit';
-import { umbConfirmModal, UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
+import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { UmbSelectionManager } from '@umbraco-cms/backoffice/utils';
 
@@ -18,7 +18,6 @@ export class UmbDocumentPublishWithDescendantsModalElement extends UmbModalBaseE
 > {
 	#selectionManager = new UmbSelectionManager<string>(this);
 	#includeUnpublishedDescendants = false;
-	#forceRepublish = false;
 
 	@state()
 	_options: Array<UmbDocumentVariantOptionModel> = [];
@@ -84,25 +83,11 @@ export class UmbDocumentPublishWithDescendantsModalElement extends UmbModalBaseE
 		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();
 	}
@@ -143,14 +128,6 @@ export class UmbDocumentPublishWithDescendantsModalElement extends UmbModalBaseE
 					@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">
 				<uui-button label=${this.localize.term('general_close')} @click=${this.#close}></uui-button>
 				<uui-button

src/Umbraco.Web.UI.Client/src/packages/documents/documents/publishing/publish-with-descendants/modal/document-publish-with-descendants-modal.token.ts

@@ -8,7 +8,6 @@ export interface UmbDocumentPublishWithDescendantsModalData extends UmbDocumentV
 
 export interface UmbDocumentPublishWithDescendantsModalValue extends UmbDocumentVariantPickerValue {
 	includeUnpublishedDescendants?: boolean;
-	forceRepublish?: boolean;
 }
 
 export const UMB_DOCUMENT_PUBLISH_WITH_DESCENDANTS_MODAL = new UmbModalToken<

src/Umbraco.Web.UI.Client/src/packages/documents/documents/publishing/repository/document-publishing.repository.ts

@@ -71,14 +71,12 @@ export class UmbDocumentPublishingRepository extends UmbRepositoryBase {
 	 * @param id
 	 * @param variantIds
 	 * @param includeUnpublishedDescendants
-	 * @param forceRepublish
 	 * @memberof UmbDocumentPublishingRepository
 	 */
 	async publishWithDescendants(
 		id: string,
 		variantIds: Array<UmbVariantId>,
 		includeUnpublishedDescendants: boolean,
-		forceRepublish: boolean,
 	) {
 		if (!id) throw new Error('id is missing');
 		if (!variantIds) throw new Error('variant IDs are missing');
@@ -88,7 +86,6 @@ export class UmbDocumentPublishingRepository extends UmbRepositoryBase {
 			id,
 			variantIds,
 			includeUnpublishedDescendants,
-			forceRepublish,
 		);
 
 		if (!error) {