From f10e04cef53bad8debfec1f76ef3f4835c73f047 Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Tue, 13 Sep 2022 12:25:57 -0500
Subject: [PATCH] updated tests for new logic

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 .../CheckBoxGroupViewController.swift         | 10 ++++---
 .../CheckboxViewController.swift              |  4 ++-
 .../ModelScrollViewController.swift           |  7 ++---
 .../RadioBoxGroupViewController.swift         |  2 +-
 .../RadioButtonViewController.swift           | 10 +++++--
 .../RadioSwatchGroupViewController.swift      | 26 +------------------
 6 files changed, 24 insertions(+), 35 deletions(-)

diff --git a/VDSSample/ViewControllers/CheckBoxGroupViewController.swift b/VDSSample/ViewControllers/CheckBoxGroupViewController.swift
index 5213fbf..9518cf4 100644
--- a/VDSSample/ViewControllers/CheckBoxGroupViewController.swift
+++ b/VDSSample/ViewControllers/CheckBoxGroupViewController.swift
@@ -98,9 +98,11 @@ class  CheckboxGroupViewController: ModelScrollViewController<DefaultCheckboxGro
         checkboxGroup
             .publisher(for: .valueChanged)
             .sink { group in
-                group.model.selectors.forEach { checkbox in
-                    print("\(checkbox.labelText!) selected: \(checkbox.selected)")
-                }
+                let selected = group.selectedModelHandlers?
+                                    .compactMap{$0.labelText}
+                                    .joined(separator: ", ") ?? "none"
+                
+                print("Selected: \(selected)")
             }.store(in: &subscribers)
 
         //setup UI
@@ -114,6 +116,8 @@ class  CheckboxGroupViewController: ModelScrollViewController<DefaultCheckboxGro
     
     override func updateView(viewModel: DefaultCheckboxGroupModel) {
         print("\(Self.self) updateView(viewModel)")
+        showErrorSwitch.isOn = viewModel.hasError
+        disabledSwitch.isOn = viewModel.disabled
         checkboxGroup.set(with: viewModel)
     }
     
diff --git a/VDSSample/ViewControllers/CheckboxViewController.swift b/VDSSample/ViewControllers/CheckboxViewController.swift
index 451bdfa..2c9310a 100644
--- a/VDSSample/ViewControllers/CheckboxViewController.swift
+++ b/VDSSample/ViewControllers/CheckboxViewController.swift
@@ -103,7 +103,7 @@ class  CheckboxViewController: ModelScrollViewController<DefaultCheckboxModel> {
         checkbox
             .publisher(for: .valueChanged)
             .sink { checkbox in
-                print("checkbox selected: \(checkbox.model.selected)")
+                print("checkbox selected: \(checkbox.isSelected)")
             }.store(in: &subscribers)
         
         //setup UI
@@ -118,6 +118,8 @@ class  CheckboxViewController: ModelScrollViewController<DefaultCheckboxModel> {
     
     override func updateView(viewModel: DefaultCheckboxModel) {
         print("\(Self.self) updateView(viewModel)")
+        showErrorSwitch.isOn = viewModel.hasError
+        disabledSwitch.isOn = viewModel.disabled
         checkbox.set(with: viewModel)
     }
         
diff --git a/VDSSample/ViewControllers/ModelScrollViewController.swift b/VDSSample/ViewControllers/ModelScrollViewController.swift
index f734dfe..7600283 100644
--- a/VDSSample/ViewControllers/ModelScrollViewController.swift
+++ b/VDSSample/ViewControllers/ModelScrollViewController.swift
@@ -21,10 +21,11 @@ public class ModelScrollViewController<ModelType: Modelable>: UIViewController,
     //--------------------------------------------------
     // MARK: - Combine Properties
     //--------------------------------------------------
-    @Published public var model: ModelType = ModelType()
-    public var modelPublisher: Published<ModelType>.Publisher { $model }
+    public var modelSubject = CurrentValueSubject<ModelType, Never>(ModelType())
+    public var modelPublisher: AnyPublisher<ModelType, Never> { modelSubject.eraseToAnyPublisher() }
     public var subscribers = Set<AnyCancellable>()
-        
+    public var firstRender: Bool = false
+
     //--------------------------------------------------
     // MARK: - Properties
     //--------------------------------------------------
diff --git a/VDSSample/ViewControllers/RadioBoxGroupViewController.swift b/VDSSample/ViewControllers/RadioBoxGroupViewController.swift
index e6fb9b3..d2b54b5 100644
--- a/VDSSample/ViewControllers/RadioBoxGroupViewController.swift
+++ b/VDSSample/ViewControllers/RadioBoxGroupViewController.swift
@@ -113,7 +113,7 @@ class  RadioBoxGroupViewController: ModelScrollViewController<DefaultRadioBoxGro
         radioBoxGroup
             .publisher(for: .valueChanged)
             .sink { group in
-                print("Selected: \(group.selectedModel?.text ?? "none")")
+                print("Selected: \(group.selectedModelHandler?.text ?? "none")")
             }.store(in: &subscribers)
 
         //set UI values
diff --git a/VDSSample/ViewControllers/RadioButtonViewController.swift b/VDSSample/ViewControllers/RadioButtonViewController.swift
index b8a08bd..099fd44 100644
--- a/VDSSample/ViewControllers/RadioButtonViewController.swift
+++ b/VDSSample/ViewControllers/RadioButtonViewController.swift
@@ -84,7 +84,13 @@ class  RadioButtonViewController: ModelScrollViewController<DefaultRadioButtonGr
         model2.value = "model 2 Value"
         model2.labelText = "iPhone 11 Bundle 2"
         model2.childText = "Apple iPhone 11 - 128 GB\nOtterbox Case Black\nScreen Protector"
-        defaultModel.selectors = [model1, model2]
+        
+        var model3 = DefaultRadioButtonModel()
+        model3.inputId = "model3"
+        model3.value = "model 3 Value"
+        model3.labelText = "iPhone 11 Bundle 3"
+        model3.childText = "Apple iPhone 11 - 256 GB\nOtterbox Case Black\nScreen Protector"
+        defaultModel.selectors = [model1, model2, model3]
         set(with: defaultModel)
 
         //update the model
@@ -100,7 +106,7 @@ class  RadioButtonViewController: ModelScrollViewController<DefaultRadioButtonGr
         radioButtonGroup
             .publisher(for: .valueChanged)
             .sink { group in
-                print("Selected: \(group.selectedModel?.labelText ?? "none")")
+                print("Selected: \(group.selectedModelHandler?.labelText ?? "none")")
             }.store(in: &subscribers)
 
         //set UI values
diff --git a/VDSSample/ViewControllers/RadioSwatchGroupViewController.swift b/VDSSample/ViewControllers/RadioSwatchGroupViewController.swift
index 8a0b4d7..5d82cd4 100644
--- a/VDSSample/ViewControllers/RadioSwatchGroupViewController.swift
+++ b/VDSSample/ViewControllers/RadioSwatchGroupViewController.swift
@@ -20,10 +20,6 @@ class  RadioSwatchGroupViewController: ModelScrollViewController<DefaultRadioSwa
     var disabledSwitch = UISwitch()
     var strikeThroughSwitch = UISwitch()
     var surfacePickerSelectorView = PickerSelectorView(title: "light")
-    var textField = TextField()
-    var subTextField = TextField()
-    var subTextRightField = TextField()
-    var showErrorSwitch = UISwitch()
     
     var radioSwatchGroup = RadioSwatchGroup()
         
@@ -39,7 +35,6 @@ class  RadioSwatchGroupViewController: ModelScrollViewController<DefaultRadioSwa
         addFormRow(label: "Disabled", view: disabledSwitch)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Strikethrough", view: strikeThroughSwitch)
-        addFormRow(label: "Text", view: textField)
 
         disabledSwitch
             .publisher(for: .valueChanged)
@@ -63,23 +58,6 @@ class  RadioSwatchGroupViewController: ModelScrollViewController<DefaultRadioSwa
                     self?.model.selectors = selectors
                 }
             }.store(in: &subscribers)
-
-        textField
-            .textPublisher
-            .sink { [weak self] text in
-                let selectors = self?.model.selectors.compactMap { existing in
-                    if existing.inputId == self?.model.selectors.first?.inputId {
-                        return existing.copyWith {
-                            $0.text = text
-                        }
-                    } else {
-                        return existing
-                    }
-                }
-                if let selectors {
-                    self?.model.selectors = selectors
-                }
-            }.store(in: &subscribers)
                 
         surfacePickerSelectorView.button
             .publisher(for: .touchUpInside)
@@ -88,7 +66,6 @@ class  RadioSwatchGroupViewController: ModelScrollViewController<DefaultRadioSwa
             }.store(in: &subscribers)
     }
     
-
     func setupModel(){
         var defaultModel = DefaultRadioSwatchGroupModel()
         
@@ -149,13 +126,12 @@ class  RadioSwatchGroupViewController: ModelScrollViewController<DefaultRadioSwa
         radioSwatchGroup
             .publisher(for: .valueChanged)
             .sink { group in
-                print("Selected: \(group.selectedModel?.text ?? "none")")
+                print("Selected: \(group.selectedModelHandler?.text ?? "none")")
             }.store(in: &subscribers)
         
         //set UI values
         surfacePickerSelectorView.text = model.surface.rawValue
         disabledSwitch.isOn = model.disabled
-        textField.text = model1.text
     }
     
     override func updateView(viewModel: ModelType) {