From 0e5fd13028276bd0793fc7894cfacb115e64c350 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 5 Nov 2024 15:38:26 +0100 Subject: [PATCH] validation translators ctrl alias --- ...nt-values-validation-path-translator.controller.ts | 4 +++- .../abstract-array-path-translator.controller.ts | 11 ++++++++--- .../validation-path-translator-base.controller.ts | 6 +++--- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/validation/block-element-values-validation-path-translator.controller.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/validation/block-element-values-validation-path-translator.controller.ts index 2c2b9da88c..4eaa8b431c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block/validation/block-element-values-validation-path-translator.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/validation/block-element-values-validation-path-translator.controller.ts @@ -4,9 +4,11 @@ import { UmbDataPathPropertyValueQuery, } from '@umbraco-cms/backoffice/validation'; +const ctrlAlias = Symbol(); + export class UmbBlockElementValuesDataValidationPathTranslator extends UmbAbstractArrayValidationPathTranslator { constructor(host: UmbControllerHost) { - super(host, '$.values[', UmbDataPathPropertyValueQuery); + super(host, '$.values[', UmbDataPathPropertyValueQuery, ctrlAlias); } getDataFromIndex(index: number) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/validation/translators/abstract-array-path-translator.controller.ts b/src/Umbraco.Web.UI.Client/src/packages/core/validation/translators/abstract-array-path-translator.controller.ts index 121310af55..4e7200a340 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/validation/translators/abstract-array-path-translator.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/validation/translators/abstract-array-path-translator.controller.ts @@ -1,12 +1,17 @@ import { UmbValidationPathTranslatorBase } from './validation-path-translator-base.controller.js'; -import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; +import type { UmbControllerAlias, UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; export abstract class UmbAbstractArrayValidationPathTranslator extends UmbValidationPathTranslatorBase { #initialPathToMatch: string; #queryMethod: (data: unknown) => string; - constructor(host: UmbControllerHost, initialPathToMatch: string, queryMethod: (data: any) => string) { - super(host); + constructor( + host: UmbControllerHost, + initialPathToMatch: string, + queryMethod: (data: any) => string, + ctrlAlias?: UmbControllerAlias, + ) { + super(host, ctrlAlias); this.#initialPathToMatch = initialPathToMatch; this.#queryMethod = queryMethod; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/validation/translators/validation-path-translator-base.controller.ts b/src/Umbraco.Web.UI.Client/src/packages/core/validation/translators/validation-path-translator-base.controller.ts index 27dda12276..b9a9bacb8e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/validation/translators/validation-path-translator-base.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/validation/translators/validation-path-translator-base.controller.ts @@ -1,6 +1,6 @@ import { UMB_VALIDATION_CONTEXT } from '../index.js'; import type { UmbValidationMessageTranslator } from './validation-message-path-translator.interface.js'; -import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; +import type { UmbControllerAlias, UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; export abstract class UmbValidationPathTranslatorBase @@ -10,8 +10,8 @@ export abstract class UmbValidationPathTranslatorBase // protected _context?: typeof UMB_VALIDATION_CONTEXT.TYPE; - constructor(host: UmbControllerHost) { - super(host); + constructor(host: UmbControllerHost, ctrlAlias?: UmbControllerAlias) { + super(host, ctrlAlias); this.consumeContext(UMB_VALIDATION_CONTEXT, (context) => { this._context?.removeTranslator(this);