Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

JS: fix VM validation inside dynamic object #1803

Merged
merged 1 commit into from
Apr 27, 2024
Merged

JS: fix VM validation inside dynamic object #1803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/Framework/Framework/Resources/Scripts/tests/stateManagement.data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,16 @@ initDotvvm({
"C": 4,
"D": 8,
}
},
tValidated: {
type: "object",
properties: {
RegexValidated: {
validationRules: [
{ ruleName: "regularExpression", errorMessage: "Must have even length", parameters: ["^(..)+$"] }
]
}
}
}
}
})
Expand Down
21 changes: 21 additions & 0 deletions src/Framework/Framework/Resources/Scripts/tests/validation.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ import { globalValidationObject as validation, ValidationErrorDescriptor } from
import { createComplexObservableSubViewmodel, createComplexObservableViewmodel, ObservableHierarchy, ObservableSubHierarchy } from "./observableHierarchies"
import { getErrors } from "../validation/error"
import { setLogger } from "../utils/logging";
import { runClientSideValidation } from '../validation/validation'
import dotvvm from '../dotvvm-root'
import { getStateManager } from "../dotvvm-base";
import { StateManager } from "../state-manager";

require("./stateManagement.data")


describe("DotVVM.Validation - public API", () => {
Expand Down Expand Up @@ -319,6 +325,21 @@ describe("DotVVM.Validation - public API", () => {
})
});


describe("DotVVM.Validation - view model validation", () => {
const s = getStateManager() as StateManager<any>
test("Validated object in dynamic", () => {
dotvvm.updateState(x => ({...x, Dynamic: { something: "abc", validatedObj: { $type: "tValidated", RegexValidated: "abcd" } } }))
s.doUpdateNow()
runClientSideValidation(s.stateObservable, {} as any)
expect(dotvvm.validation.errors).toHaveLength(0)
s.patchState({ Dynamic: { validatedObj: { RegexValidated: "abcde" }}})
s.doUpdateNow()
runClientSideValidation(s.stateObservable, {} as any)
expect(dotvvm.validation.errors).toHaveLength(1)
})
})

function SetupComplexObservableViewmodelWithErrorsOnProp1AndProp21() {
validation.removeErrors("/");
const vm = createComplexObservableViewmodel();
Expand Down
7 changes: 5 additions & 2 deletions src/Framework/Framework/Resources/Scripts/validation/validation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const createValidationHandler = (pathFunction: (context: KnockoutBindingContext)
}
})

const runClientSideValidation = (validationTarget: any, options: PostbackOptions) => {
export const runClientSideValidation = (validationTarget: any, options: PostbackOptions) => {

watchAndTriggerValidationErrorChanged(options,
() => {
Expand Down Expand Up @@ -171,6 +171,9 @@ function validateViewModel(viewModel: any, path: string): void {
}

function validateRecursive(observable: KnockoutObservable<any>, propertyValue: any, type: TypeDefinition, propertyPath: string) {
if (compileConstants.debug && !ko.isObservable(observable)) {
throw Error(`Property ${propertyPath} isn't a knockout observable and cannot be validated.`)
}
const lastSetError: CoerceResult = (observable as any)[lastSetErrorSymbol];
if (lastSetError && lastSetError.isError) {
ValidationError.attach(lastSetError.message, propertyPath, observable);
Expand Down Expand Up @@ -203,7 +206,7 @@ function validateRecursive(observable: KnockoutObservable<any>, propertyValue: a
validateViewModel(propertyValue, propertyPath);
} else {
for (const k of keys(propertyValue)) {
validateRecursive(ko.unwrap(propertyValue[k]), propertyValue[k], { type: "dynamic" }, propertyPath + "/" + k);
validateRecursive(propertyValue[k], ko.unwrap(propertyValue[k]), { type: "dynamic" }, propertyPath + "/" + k);
}
}
}
Expand Down