yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve seen issue regarding destroyed validation context (#19359)

Browse Source 
maybe messages has been destroyed so enable it to be undefined
This commit is contained in:
Niels Lyngsø
2025-05-19 14:35:32 +02:00
committed by GitHub
parent 57bec5192b
commit 2dd2329067
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/packages/core/validation/controllers/bind-server-validation-to-form-control.controller.ts
View File

@@ -31,7 +31,7 @@ export class UmbBindServerValidationToFormControl extends UmbControllerBase {
this.#value = value; this.#value = value;
// Only remove server validations from validation context [NL] // Only remove server validations from validation context [NL]
const toRemove = this.#messages.filter((x) => x.type === 'server').map((msg) => msg.key); const toRemove = this.#messages.filter((x) => x.type === 'server').map((msg) => msg.key);
this.#context?.messages.removeMessageByKeys(toRemove); this.#context?.messages?.removeMessageByKeys(toRemove);
} }
} }
} }

8
src/Umbraco.Web.UI.Client/src/packages/core/validation/controllers/form-control-validator.controller.ts
View File

@@ -30,7 +30,7 @@ export class UmbFormControlValidator extends UmbControllerBase implements UmbVal
this.#context = context; this.#context = context;
context?.addValidator(this); context?.addValidator(this);
// If we have a message already, then un-pristine the control: // If we have a message already, then un-pristine the control:
if (dataPath && context?.messages.getHasMessagesOfPathAndDescendant(dataPath)) { if (dataPath && context?.messages?.getHasMessagesOfPathAndDescendant(dataPath)) {
formControl.pristine = false; formControl.pristine = false;
} }
}); });
@@ -46,11 +46,11 @@ export class UmbFormControlValidator extends UmbControllerBase implements UmbVal
if (this.#dataPath) { if (this.#dataPath) {
if (newVal) { if (newVal) {
this.#context?.messages.removeMessagesByTypeAndPath('client', this.#dataPath); this.#context?.messages?.removeMessagesByTypeAndPath('client', this.#dataPath);
} else { } else {
// We only want to add the message if it is not already there. (this could be a custom or server message that got binded to the control, we do not want that double.) // We only want to add the message if it is not already there. (this could be a custom or server message that got binded to the control, we do not want that double.)
if (!this.#context?.messages.getHasMessageOfPathAndBody(this.#dataPath, this.#control.validationMessage)) { if (!this.#context?.messages?.getHasMessageOfPathAndBody(this.#dataPath, this.#control.validationMessage)) {
this.#context?.messages.addMessage('client', this.#dataPath, this.#control.validationMessage); this.#context?.messages?.addMessage('client', this.#dataPath, this.#control.validationMessage);
} }
} }
} }

6
src/Umbraco.Web.UI.Client/src/packages/core/validation/controllers/validation.controller.ts
View File

@@ -27,7 +27,7 @@ export class UmbValidationController extends UmbControllerBase implements UmbVal
>; >;
#inUnprovidingState: boolean = false; #inUnprovidingState: boolean = false;
// @reprecated - Will be removed in v.17 // @deprecated - Will be removed in v.17
// Local version of the data send to the server, only use-case is for translation. // Local version of the data send to the server, only use-case is for translation.
#translationData = new UmbObjectState<any>(undefined); #translationData = new UmbObjectState<any>(undefined);
/** /**
@@ -81,7 +81,7 @@ export class UmbValidationController extends UmbControllerBase implements UmbVal
setVariantId(variantId: UmbVariantId): void { setVariantId(variantId: UmbVariantId): void {
this.#variantId = variantId; this.#variantId = variantId;
// @.culture == null && @.segment == null // @.culture == null && @.segment == null
this.messages.filter((msg) => { this.messages?.filter((msg) => {
// Figure out how many times '@.culture ==' is present in the path: // Figure out how many times '@.culture ==' is present in the path:
//const cultureMatches = (msg.path.match(/@\.culture ==/g) || []); //const cultureMatches = (msg.path.match(/@\.culture ==/g) || []);
// I like a Regex that finds all the @.culture == and @.segment == in the path. they are adjacent. and I like to know the value following '== ' // I like a Regex that finds all the @.culture == and @.segment == in the path. they are adjacent. and I like to know the value following '== '
@@ -113,7 +113,7 @@ export class UmbValidationController extends UmbControllerBase implements UmbVal
* @param translator * @param translator
*/ */
async addTranslator(translator: UmbValidationMessageTranslator) { async addTranslator(translator: UmbValidationMessageTranslator) {
this.messages.addTranslator(translator); this.messages?.addTranslator(translator);
} }
/** /**