mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactored validate group with new valid that returns tuple

Browse Source 
update to set formfield validity after the group.validate occurs

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2022-01-12 15:55:23 -06:00
parent 7c05d9fcc7
commit 3fa1be0582
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
MVMCoreUI/FormUIHelpers/FormValidator.swift
View File

@ -111,11 +111,19 @@ import MVMCore
/// - counter: keeps track of how many times causes another group validation /// - counter: keeps track of how many times causes another group validation
/// - Returns: validity for the FormGroupRule.rules /// - Returns: validity for the FormGroupRule.rules
public func validateGroup(_ group: FormGroupRule, counter: Int = 0) throws -> Bool { public func validateGroup(_ group: FormGroupRule, counter: Int = 0) throws -> Bool {
let valid = group.validate(fields) let tuple = group.validate(fields)
group.rules.forEach { rule in
for formKey in rule.fields {
guard let formField = fields[formKey] as? FormRuleWatcherFieldProtocol,
let fieldValidity = tuple.fieldValidity[formKey] else { continue }
formField.setValidity(fieldValidity, rule: rule)
}
}
// Notify the group watchers of validity. // Notify the group watchers of validity.
for watcher in groupWatchers.filter({$0.groupName == group.groupName}) { for watcher in groupWatchers.filter({$0.groupName == group.groupName}) {
watcher.setValidity(valid) watcher.setValidity(tuple.valid)
} }
var ruleChange = false var ruleChange = false
@ -125,14 +133,14 @@ import MVMCore
//get the fieldKey for the effect //get the fieldKey for the effect
if let effected = fields[effect.fieldKey] { if let effected = fields[effect.fieldKey] {
//get the validity //get the validity
let validity = effect.validate(fields) let effectTuple = effect.validate(fields)
//set the effect with the validation //set the effect with the validation
effect.setEffect(validity: validity, field: effected, form: self, group: group) effect.setEffect(validity: effectTuple.valid, field: effected, form: self, group: group)
//update the group form rules //update the group form rules
if let ruleIds = effect.activatedRuleIds { if let ruleIds = effect.activatedRuleIds {
let didChange = self.updateRules(for: group, with: validity, for: effect.fieldKey, and: ruleIds) let didChange = self.updateRules(for: group, with: effectTuple.valid, for: effect.fieldKey, and: ruleIds)
if(didChange) { if(didChange) {
ruleChange = didChange ruleChange = didChange
} }
@ -147,7 +155,7 @@ import MVMCore
return try self.validateGroup(group, counter: counter + 1) return try self.validateGroup(group, counter: counter + 1)
} }
} else { } else {
return valid return tuple.valid
} }
} }