Merge branch 'main' into v14/bugfix/document-public-access-cancelled-server-requests

Author: madsrasmussen

package-lock.json

@@ -128,6 +128,7 @@
 	"workspaces": [
 		"./src/packages/data-type",
 		"./src/packages/dictionary",
+		"./src/packages/umbraco-news",
 		"./src/packages/webhook"
 	],
 	"scripts": {

package.json

@@ -1038,6 +1038,7 @@ export default {
 	language: {
 		cultureCode: 'Culture Code',
 		displayName: 'Culture Name',
+		noFallbackLanguages: 'There are no other languages to choose from',
 	},
 	lockout: {
 		lockoutWillOccur: "You've been idle and logout will automatically occur in",

src/assets/lang/en-us.ts

@@ -1057,6 +1057,7 @@ export default {
 	language: {
 		cultureCode: 'Culture Code',
 		displayName: 'Culture Name',
+		noFallbackLanguages: 'There are no other languages to choose from',
 	},
 	lockout: {
 		lockoutWillOccur: "You've been idle and logout will automatically occur in",

src/assets/lang/en.ts

@@ -1,5 +1,5 @@
 import type { UmbDuplicateToModalData, UmbDuplicateToModalValue } from './duplicate-to-modal.token.js';
-import { html, customElement, nothing } from '@umbraco-cms/backoffice/external/lit';
+import { html, customElement, nothing, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
 
@@ -9,11 +9,17 @@ import type { UmbTreeElement } from '@umbraco-cms/backoffice/tree';
 const elementName = 'umb-duplicate-to-modal';
 @customElement(elementName)
 export class UmbDuplicateToModalElement extends UmbModalBaseElement<UmbDuplicateToModalData, UmbDuplicateToModalValue> {
+	@state()
+	_destinationUnique?: string | null;
+
 	#onTreeSelectionChange(event: UmbSelectionChangeEvent) {
 		const target = event.target as UmbTreeElement;
 		const selection = target.getSelection();
-		if (selection.length === 0) throw new Error('Selection is required');
-		this.updateValue({ destination: { unique: selection[0] } });
+		this._destinationUnique = selection[0];
+
+		if (this._destinationUnique || this._destinationUnique === null) {
+			this.updateValue({ destination: { unique: this._destinationUnique } });
+		}
 	}
 
 	render() {
@@ -43,7 +49,8 @@ export class UmbDuplicateToModalElement extends UmbModalBaseElement<UmbDuplicate
 				color="positive"
 				look="primary"
 				label="Duplicate"
-				@click=${this._submitModal}></uui-button>
+				@click=${this._submitModal}
+				?disabled=${this._destinationUnique === undefined}></uui-button>
 		`;
 	}
 

src/packages/core/tree/entity-actions/duplicate-to/modal/duplicate-to-modal.element.ts

@@ -3,7 +3,7 @@ import type {
 	UmbDuplicateDocumentModalData,
 	UmbDuplicateDocumentModalValue,
 } from './duplicate-document-modal.token.js';
-import { html, customElement, nothing, css } from '@umbraco-cms/backoffice/external/lit';
+import { html, customElement, nothing, css, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
 
@@ -17,11 +17,17 @@ export class UmbDocumentDuplicateToModalElement extends UmbModalBaseElement<
 	UmbDuplicateDocumentModalData,
 	UmbDuplicateDocumentModalValue
 > {
+	@state()
+	_destinationUnique?: string | null;
+
 	#onTreeSelectionChange(event: UmbSelectionChangeEvent) {
 		const target = event.target as UmbTreeElement;
 		const selection = target.getSelection();
-		if (selection.length === 0) throw new Error('Selection is required');
-		this.updateValue({ destination: { unique: selection[0] } });
+		this._destinationUnique = selection[0];
+
+		if (this._destinationUnique || this._destinationUnique === null) {
+			this.updateValue({ destination: { unique: this._destinationUnique } });
+		}
 	}
 
 	#onRelateToOriginalChange(event: UUIBooleanInputEvent) {
@@ -72,7 +78,8 @@ export class UmbDocumentDuplicateToModalElement extends UmbModalBaseElement<
 				color="positive"
 				look="primary"
 				label="Duplicate"
-				@click=${this._submitModal}></uui-button>
+				@click=${this._submitModal}
+				?disabled=${this._destinationUnique === undefined}></uui-button>
 		`;
 	}
 

src/packages/documents/documents/entity-actions/duplicate/modal/duplicate-document-modal.element.ts

@@ -51,7 +51,7 @@ export class UmbLanguagePickerModalElement extends UmbModalBaseElement<
 	render() {
 		return html`<umb-body-layout headline="Select languages">
 			<uui-box>
-				${repeat(
+				${this.#filteredLanguages.length > 0 ? repeat(
 					this.#filteredLanguages,
 					(item) => item.unique,
 					(item) => html`
@@ -64,7 +64,9 @@ export class UmbLanguagePickerModalElement extends UmbModalBaseElement<
 							<uui-icon slot="icon" name="icon-globe"></uui-icon>
 						</uui-menu-item>
 					`,
-				)}
+				) : html`<umb-localize key="language_noFallbackLanguages">
+						There are no other languages to choose from
+				</umb-localize>`}
 			</uui-box>
 			<div slot="actions">
 				<uui-button label="Close" @click=${this.#close}></uui-button>

src/packages/language/modals/language-picker/language-picker-modal.element.ts

@@ -243,6 +243,7 @@ export class UmbInputTinyMceElement extends UUIFormControlMixin(UmbLitElement, '
 			paste_data_images: false,
 			language: this.#getLanguage(),
 			promotion: false,
+			convert_unsafe_embeds: true, // [JOV] Workaround for CVE-2024-29881
 
 			// Extend with configuration options
 			...configurationOptions,

src/packages/tiny-mce/components/input-tiny-mce/input-tiny-mce.element.ts

@@ -0,0 +1,8 @@
+{
+	"name": "@umbraco-backoffice/umbraco-news",
+	"private": true,
+	"type": "module",
+	"scripts": {
+		"build": "vite build"
+	}
+}

src/packages/umbraco-news/package.json

@@ -0,0 +1,12 @@
+import { defineConfig } from 'vite';
+import { rmSync } from 'fs';
+import { getDefaultConfig } from '../../vite-config-base';
+
+const dist = '../../../dist-cms/packages/umbraco-news';
+
+// delete the unbundled dist folder
+rmSync(dist, { recursive: true, force: true });
+
+export default defineConfig({
+	...getDefaultConfig({ dist, entry: ['umbraco-package.ts', 'manifests.ts'] }),
+});