From a51a0e458bee5598a7cea73f10b9f26d3fc0d056 Mon Sep 17 00:00:00 2001 From: "Suresh, Kamlesh" Date: Sun, 11 Oct 2020 16:04:28 -0400 Subject: [PATCH 1/4] fix --- MVMCoreUI/BaseControllers/ViewController.swift | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/MVMCoreUI/BaseControllers/ViewController.swift b/MVMCoreUI/BaseControllers/ViewController.swift index e7563faa..528c63cb 100644 --- a/MVMCoreUI/BaseControllers/ViewController.swift +++ b/MVMCoreUI/BaseControllers/ViewController.swift @@ -439,13 +439,17 @@ import UIKit MVMCoreUISession.sharedGlobal()?.splitViewController?.showRightPanel(animated: true) } } - + + // Override this method to avoid adding form params. + open func addFormParams(_ requestParameters: MVMCoreRequestParameters) { + formValidator?.addFormParams(requestParameters: requestParameters) + } //-------------------------------------------------- // MARK: - MVMCoreActionDelegateProtocol //-------------------------------------------------- open func handleOpenPage(for requestParameters: MVMCoreRequestParameters, actionInformation: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?) { - formValidator?.addFormParams(requestParameters: requestParameters) + addFormParams(requestParameters) requestParameters.parentPageType = loadObject?.pageJSON?.optionalStringForKey("parentPageType") MVMCoreActionHandler.defaultHandleOpenPage(for: requestParameters, additionalData: additionalData, delegateObject: delegateObject()) } From de20e77829fe7d737966750fc75911497359a5c4 Mon Sep 17 00:00:00 2001 From: "Chintakrinda, Arun Kumar (Arun)" Date: Mon, 12 Oct 2020 22:49:59 +0530 Subject: [PATCH 2/4] MoleculeName fix for MoleculeStackItem Bugfix: Headline body spilling @ traling --- MVMCoreUI/Atomic/Molecules/Items/MoleculeStackItemModel.swift | 2 ++ .../Molecules/VerticalCombinationViews/HeadlineBodyLink.swift | 1 + 2 files changed, 3 insertions(+) diff --git a/MVMCoreUI/Atomic/Molecules/Items/MoleculeStackItemModel.swift b/MVMCoreUI/Atomic/Molecules/Items/MoleculeStackItemModel.swift index 1f6e4d88..39fef8e2 100644 --- a/MVMCoreUI/Atomic/Molecules/Items/MoleculeStackItemModel.swift +++ b/MVMCoreUI/Atomic/Molecules/Items/MoleculeStackItemModel.swift @@ -20,6 +20,7 @@ import Foundation case spacing case percent case gone + case moleculeName } public override init(with moleculeModel: MoleculeModelProtocol) { @@ -39,6 +40,7 @@ import Foundation public override func encode(to encoder: Encoder) throws { try super.encode(to: encoder) var container = encoder.container(keyedBy: CodingKeys.self) + try container.encode(moleculeName, forKey: .moleculeName) try container.encodeIfPresent(spacing, forKey: .spacing) try container.encodeIfPresent(percent, forKey: .percent) try container.encode(gone, forKey: .gone) diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyLink.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyLink.swift index da5014a9..a4228ae9 100644 --- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyLink.swift +++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyLink.swift @@ -34,6 +34,7 @@ import UIKit headlineBody.topAnchor.constraint(equalTo: topAnchor, constant: 0).isActive = true headlineBody.leftAnchor.constraint(equalTo: leftAnchor).isActive = true + headlineBody.rightAnchor.constraint(lessThanOrEqualTo: rightAnchor).isActive = true var constraint = rightAnchor.constraint(equalTo: headlineBody.rightAnchor) constraint.priority = .defaultHigh constraint.isActive = true From bdc5084ad5325cf432fb2cb7c567b416625193fd Mon Sep 17 00:00:00 2001 From: "Suresh, Kamlesh" Date: Mon, 12 Oct 2020 17:44:59 -0400 Subject: [PATCH 3/4] comment --- MVMCoreUI/BaseControllers/ViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCoreUI/BaseControllers/ViewController.swift b/MVMCoreUI/BaseControllers/ViewController.swift index 528c63cb..ebcf9f6b 100644 --- a/MVMCoreUI/BaseControllers/ViewController.swift +++ b/MVMCoreUI/BaseControllers/ViewController.swift @@ -440,7 +440,7 @@ import UIKit } } - // Override this method to avoid adding form params. + /// Override this method to avoid adding form params. open func addFormParams(_ requestParameters: MVMCoreRequestParameters) { formValidator?.addFormParams(requestParameters: requestParameters) } From c30c442562d0546c4f11b6f3b343139e9bd24b46 Mon Sep 17 00:00:00 2001 From: "Chintakrinda, Arun Kumar (Arun)" Date: Tue, 13 Oct 2020 13:08:53 +0530 Subject: [PATCH 4/4] Changed as per MR comments --- .../Molecules/VerticalCombinationViews/HeadlineBodyLink.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyLink.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyLink.swift index a4228ae9..1683d8e9 100644 --- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyLink.swift +++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyLink.swift @@ -34,7 +34,7 @@ import UIKit headlineBody.topAnchor.constraint(equalTo: topAnchor, constant: 0).isActive = true headlineBody.leftAnchor.constraint(equalTo: leftAnchor).isActive = true - headlineBody.rightAnchor.constraint(lessThanOrEqualTo: rightAnchor).isActive = true + rightAnchor.constraint(greaterThanOrEqualTo: headlineBody.rightAnchor).isActive = true var constraint = rightAnchor.constraint(equalTo: headlineBody.rightAnchor) constraint.priority = .defaultHigh constraint.isActive = true