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

move server modal validator

Browse Source
This commit is contained in:
Niels Lyngsø
2024-08-07 19:43:14 +02:00
parent 95a61c503d
commit 24429d912a
6 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/packages/core/validation/context/index.ts
View File

@@ -1,4 +1,2 @@
export * from './validation.context.js';
export * from './validation.context-token.js';
export * from './server-model-validation.context.js';
export * from './server-model-validation.context-token.js';

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

@@ -30,7 +30,6 @@ export class UmbBindServerValidationToFormControl extends UmbControllerBase {
// If not valid lets see if we should remove server validation [NL]
if (!jsonStringComparison(this.#value, value)) {
this.#value = value;
console.log('remove messages');
// Only remove server validations from validation context [NL]
this.#messages.forEach((message) => {
if (message.type === 'server') {
@@ -51,7 +50,6 @@ export class UmbBindServerValidationToFormControl extends UmbControllerBase {
context.messages.messagesOfTypeAndPath('server', dataPath),
(messages) => {
this.#messages = messages;
console.log('messages', messages);
this.#isValid = messages.length === 0;
if (!this.#isValid) {
this.#setup();

4
src/Umbraco.Web.UI.Client/src/packages/core/validation/controllers/index.ts
View File

@@ -1,3 +1,5 @@
export * from './bind-server-validation-to-form-control.controller.js';
export * from './observe-validation-state.controller.js';
export * from './form-control-validator.controller.js';
export * from './observe-validation-state.controller.js';
export * from './server-model-validation.context-token.js';
export * from './server-model-validation.context.js';

2
src/Umbraco.Web.UI.Client/src/packages/core/validation/context/server-model-validation.context-token.ts → src/Umbraco.Web.UI.Client/src/packages/core/validation/controllers/server-model-validation.context-token.ts
View File

@@ -1,4 +1,4 @@
import type { UmbServerModelValidationContext } from './index.js';
import type { UmbServerModelValidationContext } from './server-model-validation.context.js';
import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
export const UMB_SERVER_MODEL_VALIDATION_CONTEXT = new UmbContextToken<UmbServerModelValidationContext>(

4
src/Umbraco.Web.UI.Client/src/packages/core/validation/context/server-model-validation.context.ts → src/Umbraco.Web.UI.Client/src/packages/core/validation/controllers/server-model-validation.context.ts
View File

@@ -1,7 +1,7 @@
import type { UmbValidationMessageTranslator } from '../translators/validation-message-translator.interface.js';
import type { UmbValidator } from '../interfaces/validator.interface.js';
import { UmbDataPathPropertyValueFilter } from '../utils/data-path-property-value-filter.function.js';
import { UMB_VALIDATION_CONTEXT } from './validation.context-token.js';
import { UMB_VALIDATION_CONTEXT } from '../context/validation.context-token.js';
import { UMB_SERVER_MODEL_VALIDATION_CONTEXT } from './server-model-validation.context-token.js';
import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
@@ -76,8 +76,6 @@ export class UmbServerModelValidationContext
});
}
// Check if there are missing properties:
console.log('send data:', this.#data);
console.log('error response:', errorBody);
if (errorBody?.missingProperties) {
// Retrieve the variants of he send data, as those are the once we will declare as missing properties:
errorBody.missingProperties.forEach((alias) => {

2
src/Umbraco.Web.UI.Client/src/packages/core/validation/translators/variant-values-validation-message-translator.controller.ts
View File

@@ -1,4 +1,4 @@
import type { UmbServerModelValidationContext } from '../context/server-model-validation.context.js';
import type { UmbServerModelValidationContext } from '../controllers/server-model-validation.context.js';
import { UmbDataPathPropertyValueFilter } from '../utils/data-path-property-value-filter.function.js';
import type { UmbValidationMessageTranslator } from './validation-message-translator.interface.js';
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';