simplify args

Author: madsrasmussen

src/Umbraco.Web.UI.Client/src/libs/localization-api/localization.controller.test.ts

@@ -312,31 +312,9 @@ describe('UmbLocalizeController', () => {
 			expect(controller.string(str)).to.equal('close');
 		});
 
-		it('should replace tokens in each key with the provided values', async () => {
+		it('should replace tokens in each key with the provided args', async () => {
 			const str = '#withInlineToken #withInlineTokenLegacy';
-			expect(
-				controller.string(str, { withInlineToken: ['value1', 'value2'], withInlineTokenLegacy: ['value3', 'value4'] }),
-			).to.equal('value1 value2 value3 value4');
-		});
-	});
-
-	describe('getKeysFromString', () => {
-		it('should return an empty array if the input is not a string', async () => {
-			// @ts-expect-error
-			expect(controller.getKeysFromString(123)).to.deep.equal([]);
-			// @ts-expect-error
-			expect(controller.getKeysFromString({})).to.deep.equal([]);
-			// @ts-expect-error
-			expect(controller.getKeysFromString(undefined)).to.deep.equal([]);
-		});
-
-		it('should return an empty array if the input is an empty string', async () => {
-			expect(controller.getKeysFromString('')).to.deep.equal([]);
-		});
-
-		it('should return an array of keys', async () => {
-			const str = '#close #logout';
-			expect(controller.getKeysFromString(str)).to.deep.equal(['close', 'logout']);
+			expect(controller.string(str, 'value1', 'value2')).to.equal('value1 value2 value1 value2');
 		});
 	});
 

src/Umbraco.Web.UI.Client/src/libs/localization-api/localization.controller.ts

@@ -191,10 +191,10 @@ export class UmbLocalizationController<LocalizationSetType extends UmbLocalizati
 	 * If the term is found in the localization set, it will be replaced with the localized term.
 	 * If the term is not found, the original term will be returned.
 	 * @param {string} text The text to translate.
-	 * @param {Record<string, Array<string>>} argsMap An object where the keys are the terms to translate and the values are arrays of arguments to pass to the term function.
+	 * @param {...any} args The arguments to parse for this localization entry.
 	 * @returns {string} The translated text.
 	 */
-	string(text: unknown, argsMap?: Record<string, Array<string>>): string {
+	string(text: unknown, ...args: any): string {
 		if (typeof text !== 'string') {
 			return '';
 		}
@@ -204,7 +204,6 @@ export class UmbLocalizationController<LocalizationSetType extends UmbLocalizati
 
 		const localizedText = text.replace(regex, (match: string) => {
 			const key = match.slice(1);
-			const args = argsMap?.[key] || [];
 
 			// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 			// @ts-ignore
@@ -215,19 +214,4 @@ export class UmbLocalizationController<LocalizationSetType extends UmbLocalizati
 
 		return localizedText;
 	}
-
-	/**
-	 * Extracts all keys from a string that start with a `#` character.
-	 * @param {string} text The text to parse.
-	 * @returns {Array<string>} An array of keys.
-	 */
-	getKeysFromString(text: string): Array<string> {
-		if (typeof text !== 'string') {
-			return [];
-		}
-
-		const regex = /#\w+/g;
-		const keys = text.match(regex) || [];
-		return keys.map((key) => key.slice(1));
-	}
 }

src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/delete/delete.action.ts

@@ -7,8 +7,6 @@ import type { UmbDetailRepository, UmbItemRepository } from '@umbraco-cms/backof
 import { UMB_ACTION_EVENT_CONTEXT } from '@umbraco-cms/backoffice/action';
 import { UmbLocalizationController } from '@umbraco-cms/backoffice/localization-api';
 
-type UmbLocalizeStringArgsMap = Record<string, Array<string>>;
-
 export class UmbDeleteEntityAction extends UmbEntityActionBase<MetaEntityActionDeleteKind> {
 	// TODO: make base type for item and detail models
 	#localize = new UmbLocalizationController(this);
@@ -28,22 +26,10 @@ export class UmbDeleteEntityAction extends UmbEntityActionBase<MetaEntityActionD
 		const headline = this.args.meta.confirm?.headline ?? '#actions_delete';
 		const message = this.args.meta.confirm?.message ?? '#defaultdialogs_confirmdelete';
 
-		/* We need to replace the token in a translation with the item name.
-		 A string can potentially consist of multiple translation keys.
-		 First we find all the translation keys in message. */
-		const keysFromMessageString = this.#localize.getKeysFromString(message);
-
-		// Second we create a map of the translation keys found in the message and the arguments that should replace the tokens.
-		// This will enable the localize service to pass and replace the tokens in the all the translations with the item name.
-		const argsMap: UmbLocalizeStringArgsMap = keysFromMessageString.reduce((acc: UmbLocalizeStringArgsMap, key) => {
-			acc[key] = [item.name];
-			return acc;
-		}, {});
-
 		// TODO: handle items with variants
 		await umbConfirmModal(this._host, {
 			headline: this.#localize.string(headline),
-			content: this.#localize.string(message, argsMap),
+			content: this.#localize.string(message, item.name),
 			color: 'danger',
 			confirmLabel: '#general_delete',
 		});