From 4763e01beee68c7c2622adc50862d0f23f60b928 Mon Sep 17 00:00:00 2001
From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Date: Fri, 27 Sep 2024 11:42:23 +0200
Subject: [PATCH] chore(sonarcloud): fix issues

---
 .../components/input-tiny-mce/input-tiny-mce.element.ts   | 4 ++--
 .../components/input-tiny-mce/input-tiny-mce.sanitizer.ts | 8 +-------
 .../tiny-mce/property-editor-ui-tiny-mce.element.ts       | 4 ++--
 .../packages/rte/tiptap/extensions/umb/link.extension.ts  | 2 +-
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/rte/tiny-mce/components/input-tiny-mce/input-tiny-mce.element.ts b/src/Umbraco.Web.UI.Client/src/packages/rte/tiny-mce/components/input-tiny-mce/input-tiny-mce.element.ts
index 8c20112d9a..3da7c60d86 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/rte/tiny-mce/components/input-tiny-mce/input-tiny-mce.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/rte/tiny-mce/components/input-tiny-mce/input-tiny-mce.element.ts
@@ -64,7 +64,7 @@ export class UmbInputTinyMceElement extends UUIFormControlMixin(UmbLitElement, '
 
 	override set value(newValue: FormDataEntryValue | FormData) {
 		super.value = newValue;
-		const newContent = newValue?.toString() ?? '';
+		const newContent = typeof newValue === 'string' ? newValue : '';
 
 		if (this.#editorRef && this.#editorRef.getContent() != newContent) {
 			this.#editorRef.setContent(newContent);
@@ -362,7 +362,7 @@ export class UmbInputTinyMceElement extends UUIFormControlMixin(UmbLitElement, '
 		//enable browser based spell checking
 		editor.getBody().setAttribute('spellcheck', 'true');
 		uriAttributeSanitizer(editor);
-		editor.setContent(this.value?.toString() ?? '');
+		editor.setContent(typeof this.value === 'string' ? this.value : '');
 	}
 
 	#onChange(value: string) {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/rte/tiny-mce/components/input-tiny-mce/input-tiny-mce.sanitizer.ts b/src/Umbraco.Web.UI.Client/src/packages/rte/tiny-mce/components/input-tiny-mce/input-tiny-mce.sanitizer.ts
index 57f799f9ed..d50a6ef6e3 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/rte/tiny-mce/components/input-tiny-mce/input-tiny-mce.sanitizer.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/rte/tiny-mce/components/input-tiny-mce/input-tiny-mce.sanitizer.ts
@@ -27,13 +27,7 @@ export const uriAttributeSanitizer = (editor: Editor) => {
 
 		return function parseUri(uri: string, tagName: string) {
 			uri = uri.replace(trimRegExp, '');
-			try {
-				// Might throw malformed URI sequence
-				uri = decodeURIComponent(uri);
-			} catch (ex) {
-				// Fallback to non UTF-8 decoder
-				uri = unescape(uri);
-			}
+			uri = decodeURIComponent(uri);
 
 			if (scriptUriRegExp.test(uri)) {
 				return;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/rte/tiny-mce/property-editors/tiny-mce/property-editor-ui-tiny-mce.element.ts b/src/Umbraco.Web.UI.Client/src/packages/rte/tiny-mce/property-editors/tiny-mce/property-editor-ui-tiny-mce.element.ts
index ea0ce31cf1..e84e389779 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/rte/tiny-mce/property-editors/tiny-mce/property-editor-ui-tiny-mce.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/rte/tiny-mce/property-editors/tiny-mce/property-editor-ui-tiny-mce.element.ts
@@ -10,11 +10,11 @@ import '../../components/input-tiny-mce/input-tiny-mce.element.js';
 @customElement('umb-property-editor-ui-tiny-mce')
 export class UmbPropertyEditorUITinyMceElement extends UmbRteBaseElement {
 	#onChange(event: CustomEvent & { target: UmbInputTinyMceElement }) {
-		const value = event.target.value;
+		const value = typeof event.target.value === 'string' ? event.target.value : '';
 
 		// Clone the DOM, to remove the classes and attributes on the original:
 		const div = document.createElement('div');
-		div.innerHTML = value.toString();
+		div.innerHTML = value;
 
 		// Loop through used, to remove the classes on these.
 		const blockEls = div.querySelectorAll(`umb-rte-block, umb-rte-block-inline`);
diff --git a/src/Umbraco.Web.UI.Client/src/packages/rte/tiptap/extensions/umb/link.extension.ts b/src/Umbraco.Web.UI.Client/src/packages/rte/tiptap/extensions/umb/link.extension.ts
index 78146a0da5..e7ef26bf85 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/rte/tiptap/extensions/umb/link.extension.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/rte/tiptap/extensions/umb/link.extension.ts
@@ -53,7 +53,7 @@ export default class UmbTiptapLinkExtensionApi extends UmbTiptapToolbarElementAp
 		let { queryString, url } = link;
 
 		// If an anchor exists, check that it is appropriately prefixed
-		if (queryString && !queryString?.startsWith('?') && !queryString?.startsWith('#')) {
+		if (!queryString?.startsWith('?') && !queryString?.startsWith('#')) {
 			queryString = (queryString?.startsWith('=') ? '#' : '?') + queryString;
 		}