Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/action_modernize

MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryFieldModel.swift

@@ -96,6 +96,10 @@ import Foundation
         return text
     }
     
+    open func formFieldServerValue() -> AnyHashable? {
+        return formFieldValue()
+    }
+    
     public func setValidity(_ valid: Bool, errorMessage: String?) {
         
         if let ruleErrorMessage = errorMessage, fieldKey != nil {

MVMCoreUI/Atomic/Atoms/Selectors/CheckboxModel.swift

@@ -84,6 +84,13 @@
         return selected
     }
     
+    //--------------------------------------------------
+    // MARK: - Server Value
+    //--------------------------------------------------
+    open func formFieldServerValue() -> AnyHashable? {
+        return formFieldValue()
+    }
+    
     //--------------------------------------------------
     // MARK: - Initializer
     //--------------------------------------------------

MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxesModel.swift

@@ -25,7 +25,7 @@ import MVMCore
     public var readOnly: Bool = false
     
     //--------------------------------------------------
-    // MARK: - Methods
+    // MARK: - Form Validation
     //--------------------------------------------------
     
     /// Returns the fieldValue of the selected box, otherwise the text of the selected box.
@@ -37,6 +37,13 @@ import MVMCore
         return selectedBox?.fieldValue ?? selectedBox?.text
     }
     
+    //--------------------------------------------------
+    // MARK: - Server Value
+    //--------------------------------------------------
+    open func formFieldServerValue() -> AnyHashable? {
+        return formFieldValue()
+    }
+    
     //--------------------------------------------------
     // MARK: - Keys
     //--------------------------------------------------

MVMCoreUI/Atomic/Atoms/Selectors/RadioButtonModel.swift

@@ -64,6 +64,13 @@ open class RadioButtonModel: MoleculeModelProtocol, FormFieldProtocol {
         return fieldValue
     }
     
+    //--------------------------------------------------
+    // MARK: - Server Value
+    //--------------------------------------------------
+    open func formFieldServerValue() -> AnyHashable? {
+        return formFieldValue()
+    }
+    
     //--------------------------------------------------
     // MARK: - Codec
     //--------------------------------------------------

MVMCoreUI/Atomic/Atoms/Selectors/RadioButtonSelectionHelper.swift

@@ -83,4 +83,8 @@ extension RadioButtonSelectionHelper {
         guard enabled else { return nil }
         return selectedRadioButtonModel?.fieldValue
     }
+
+    open func formFieldServerValue() -> AnyHashable? {
+        return formFieldValue()
+    }
 }

MVMCoreUI/Atomic/Atoms/Selectors/RadioSwatchesModel.swift

@@ -21,11 +21,10 @@ import MVMCore
     public var baseValue: AnyHashable?
     public var enabled: Bool = true
     public var readOnly: Bool = false
-    
+
     //--------------------------------------------------
-    // MARK: - Methods
+    // MARK: - Form Validation
     //--------------------------------------------------
-    
     /// Returns the fieldValue of the selected swatch, otherwise the text of selected swatch.
     public func formFieldValue() -> AnyHashable? {
         guard enabled else { return nil }
@@ -35,6 +34,10 @@ import MVMCore
         return selectedSwatch?.fieldValue ?? selectedSwatch?.text
     }
     
+    open func formFieldServerValue() -> AnyHashable? {
+        return formFieldValue()
+    }
+    
     //--------------------------------------------------
     // MARK: - Keys
     //--------------------------------------------------

MVMCoreUI/Atomic/Atoms/Selectors/ToggleModel.swift

@@ -63,6 +63,13 @@ public class ToggleModel: MoleculeModelProtocol, FormFieldProtocol {
         return selected
     }
     
+    //--------------------------------------------------
+    // MARK: - Server Value
+    //--------------------------------------------------
+    open func formFieldServerValue() -> AnyHashable? {
+        return formFieldValue()
+    }
+    
     //--------------------------------------------------
     // MARK: - Initializer
     //--------------------------------------------------

MVMCoreUI/Atomic/Molecules/Items/CarouselItemModel.swift

@@ -25,11 +25,21 @@
     public var groupName: String = FormValidator.defaultGroupName
     public var baseValue: AnyHashable?
     
+    //--------------------------------------------------
+    // MARK: - Validation
+    //--------------------------------------------------
     public func formFieldValue() -> AnyHashable? {
         guard enabled else { return nil }
         return fieldValue
     }
     
+    //--------------------------------------------------
+    // MARK: - Server Value
+    //--------------------------------------------------
+    open func formFieldServerValue() -> AnyHashable? {
+        return formFieldValue()
+    }
+    
     //--------------------------------------------------
     // MARK: - Keys
     //--------------------------------------------------

MVMCoreUI/Atomic/Organisms/Carousel/CarouselModel.swift

@@ -47,6 +47,9 @@ import UIKit
         self.molecules = molecules
     }
     
+    //--------------------------------------------------
+    // MARK: - Validation
+    //--------------------------------------------------
     public func formFieldValue() -> AnyHashable? {
         guard enabled else { return nil }
         
@@ -63,6 +66,13 @@ import UIKit
         return fieldValue
     }
     
+    //--------------------------------------------------
+    // MARK: - Server Value
+    //--------------------------------------------------
+    open func formFieldServerValue() -> AnyHashable? {
+        return formFieldValue()
+    }
+    
     //--------------------------------------------------
     // MARK: - Keys
     //--------------------------------------------------

MVMCoreUI/FormUIHelpers/FormFieldProtocol.swift

@@ -23,11 +23,17 @@ public protocol FormFieldProtocol: FormItemProtocol {
     /// Returns the value of the field. Used for validations and possibly for sending to server.
     func formFieldValue() -> AnyHashable?
 
+    /// Returns the value of the field. Used  sending to server.
+    func formFieldServerValue() -> AnyHashable?
 }
 
 public extension FormFieldProtocol {
     
     var baseValue: AnyHashable? { nil }
+    
+    func formFieldServerValue() -> AnyHashable? {
+        return formFieldValue()
+    }
 }
 
 public class FormFieldValidity{

MVMCoreUI/FormUIHelpers/FormValidator.swift

@@ -209,7 +209,7 @@ public extension FormValidator {
         
         var extraParam: [String: Any] = [:]
         for (fieldKey, field) in fields {
-            if let formFieldValue = field.formFieldValue(),
+            if let formFieldValue = field.formFieldServerValue(),
                groupName == field.groupName {
                 extraParam[fieldKey] = formFieldValue
             }