Merge pull request #6038 from woocommerce/issue/5412-address-form-improvements

ealeksandrov · web-flow · commit b497e697519d · 2022-02-02T08:35:34.000+03:00
Order Creation: Address form improvements
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Details/Address Edit/AddressFormViewModelProtocol.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Details/Address Edit/AddressFormViewModelProtocol.swift
@@ -164,7 +164,7 @@ struct AddressFormFields {
             // When a country is selected, check if the new country has a state list.
             // If it has, clear the selected state and its name in fields.
             // If it doesn't only clear the selected state.
-            if selectedCountry?.states.isEmpty == false, selectedState != nil {
+            if selectedCountry?.states.isEmpty == false {
                 self.state = ""
             }
             self.selectedState = nil
@@ -189,8 +189,9 @@ struct AddressFormFields {
             return
         }
 
+        let initialStateValue = state // storing initial state value because it will be cleared by selectedCountry setter
         selectedCountry = allCountries.first { $0.code == country }
-        selectedState = selectedCountry?.states.first { $0.code == state }
+        selectedState = selectedCountry?.states.first { $0.code == initialStateValue }
     }
 }
 
@@ -430,8 +431,9 @@ private extension AddressFormViewModel {
     /// Calculates what navigation trailing item should be shown depending on our internal state.
     ///
     func bindNavigationTrailingItemPublisher() {
-        Publishers.CombineLatest3($fields, $secondaryFields, performingNetworkRequest)
-            .map { [originalAddress, secondaryOriginalAddress] fields, secondaryFields, performingNetworkRequest -> AddressFormNavigationItem in
+        Publishers.CombineLatest4($fields, $secondaryFields, $showDifferentAddressForm, performingNetworkRequest)
+            .map { [originalAddress, secondaryOriginalAddress]
+                fields, secondaryFields, showDifferentAddressForm, performingNetworkRequest -> AddressFormNavigationItem in
                 guard !performingNetworkRequest else {
                     return .loading
                 }
@@ -440,7 +442,13 @@ private extension AddressFormViewModel {
                     return .done(enabled: true)
                 }
 
-                return .done(enabled: originalAddress != fields.toAddress() || secondaryOriginalAddress != secondaryFields.toAddress())
+                let addressesAreDifferentButSecondAddressSwitchIsDisabled = secondaryOriginalAddress != .empty &&
+                originalAddress != secondaryOriginalAddress &&
+                !showDifferentAddressForm
+
+                return .done(enabled: addressesAreDifferentButSecondAddressSwitchIsDisabled ||
+                             originalAddress != fields.toAddress() ||
+                             secondaryOriginalAddress != secondaryFields.toAddress())
             }
             .assign(to: &$navigationTrailingItem)
     }
diff --git a/WooCommerce/WooCommerce.xcodeproj/project.pbxproj b/WooCommerce/WooCommerce.xcodeproj/project.pbxproj
@@ -986,6 +986,7 @@
 		AE457813275644590092F687 /* OrderStatusSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE457812275644590092F687 /* OrderStatusSection.swift */; };
 		AE6DBE3B2732CAAD00957E7A /* AdaptiveStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE6DBE3A2732CAAD00957E7A /* AdaptiveStack.swift */; };
 		AE77EA5027A47C99006A21BD /* View+AddingDividers.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE77EA4F27A47C99006A21BD /* View+AddingDividers.swift */; };
+		AE90475C27A99D6000073E1D /* CreateOrderAddressFormViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE90475B27A99D6000073E1D /* CreateOrderAddressFormViewModelTests.swift */; };
 		AE9E04752776213E003FA09E /* OrderCustomerSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE9E04742776213E003FA09E /* OrderCustomerSection.swift */; };
 		AEA622B2274669D3002A9B57 /* AddOrderCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEA622B1274669D3002A9B57 /* AddOrderCoordinator.swift */; };
 		AEA622B427466B78002A9B57 /* BottomSheetOrderType.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEA622B327466B78002A9B57 /* BottomSheetOrderType.swift */; };
@@ -2573,6 +2574,7 @@
 		AE457812275644590092F687 /* OrderStatusSection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderStatusSection.swift; sourceTree = "<group>"; };
 		AE6DBE3A2732CAAD00957E7A /* AdaptiveStack.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdaptiveStack.swift; sourceTree = "<group>"; };
 		AE77EA4F27A47C99006A21BD /* View+AddingDividers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+AddingDividers.swift"; sourceTree = "<group>"; };
+		AE90475B27A99D6000073E1D /* CreateOrderAddressFormViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateOrderAddressFormViewModelTests.swift; sourceTree = "<group>"; };
 		AE9E04742776213E003FA09E /* OrderCustomerSection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderCustomerSection.swift; sourceTree = "<group>"; };
 		AEA622B1274669D3002A9B57 /* AddOrderCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddOrderCoordinator.swift; sourceTree = "<group>"; };
 		AEA622B327466B78002A9B57 /* BottomSheetOrderType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomSheetOrderType.swift; sourceTree = "<group>"; };
@@ -6211,6 +6213,7 @@
 				CC53FB3D2758E2D500C4CA4F /* ProductRowViewModelTests.swift */,
 				CC53FB3F2759042600C4CA4F /* AddProductToOrderViewModelTests.swift */,
 				CC13C0CC278E086D00C0B5B5 /* AddProductVariationToOrderViewModelTests.swift */,
+				AE90475B27A99D6000073E1D /* CreateOrderAddressFormViewModelTests.swift */,
 			);
 			path = "Order Creation";
 			sourceTree = "<group>";
@@ -9227,6 +9230,7 @@
 				023EC2E024DA87460021DA91 /* ProductInventorySettingsViewModelTests.swift in Sources */,
 				AEB73C1725CD8E5800A8454A /* AttributePickerViewModelTests.swift in Sources */,
 				02DE5CAB279F8754007CBEF3 /* Double+RoundingTests.swift in Sources */,
+				AE90475C27A99D6000073E1D /* CreateOrderAddressFormViewModelTests.swift in Sources */,
 				B56C721421B5BBC000E5E85B /* MockStoresManager.swift in Sources */,
 				26B119C024D0C69500FED5C7 /* SurveyViewControllerTests.swift in Sources */,
 				D8AB131E225DC25F002BB5D1 /* MockOrders.swift in Sources */,
diff --git a/WooCommerce/WooCommerceTests/ViewRelated/Orders/Order Creation/CreateOrderAddressFormViewModelTests.swift b/WooCommerce/WooCommerceTests/ViewRelated/Orders/Order Creation/CreateOrderAddressFormViewModelTests.swift

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ struct AddressFormFields {`
`164`	`164`	`// When a country is selected, check if the new country has a state list.`
`165`	`165`	`// If it has, clear the selected state and its name in fields.`
`166`	`166`	`// If it doesn't only clear the selected state.`
`167`		`- if selectedCountry?.states.isEmpty == false, selectedState != nil {`
	`167`	`+ if selectedCountry?.states.isEmpty == false {`
`168`	`168`	`self.state = ""`
`169`	`169`	`}`
`170`	`170`	`self.selectedState = nil`
`@@ -189,8 +189,9 @@ struct AddressFormFields {`
`189`	`189`	`return`
`190`	`190`	`}`
`191`	`191`
	`192`	`+ let initialStateValue = state // storing initial state value because it will be cleared by selectedCountry setter`
`192`	`193`	`selectedCountry = allCountries.first { $0.code == country }`
`193`		`- selectedState = selectedCountry?.states.first { $0.code == state }`
	`194`	`+ selectedState = selectedCountry?.states.first { $0.code == initialStateValue }`
`194`	`195`	`}`
`195`	`196`	`}`
`196`	`197`
`@@ -430,8 +431,9 @@ private extension AddressFormViewModel {`
`430`	`431`	`/// Calculates what navigation trailing item should be shown depending on our internal state.`
`431`	`432`	`///`
`432`	`433`	`func bindNavigationTrailingItemPublisher() {`
`433`		`- Publishers.CombineLatest3($fields, $secondaryFields, performingNetworkRequest)`
`434`		`- .map { [originalAddress, secondaryOriginalAddress] fields, secondaryFields, performingNetworkRequest -> AddressFormNavigationItem in`
	`434`	`+ Publishers.CombineLatest4($fields, $secondaryFields, $showDifferentAddressForm, performingNetworkRequest)`
	`435`	`+ .map { [originalAddress, secondaryOriginalAddress]`
	`436`	`+ fields, secondaryFields, showDifferentAddressForm, performingNetworkRequest -> AddressFormNavigationItem in`
`435`	`437`	`guard !performingNetworkRequest else {`
`436`	`438`	`return .loading`
`437`	`439`	`}`
`@@ -440,7 +442,13 @@ private extension AddressFormViewModel {`
`440`	`442`	`return .done(enabled: true)`
`441`	`443`	`}`
`442`	`444`
`443`		`- return .done(enabled: originalAddress != fields.toAddress() \|\| secondaryOriginalAddress != secondaryFields.toAddress())`
	`445`	`+ let addressesAreDifferentButSecondAddressSwitchIsDisabled = secondaryOriginalAddress != .empty &&`
	`446`	`+ originalAddress != secondaryOriginalAddress &&`
	`447`	`+ !showDifferentAddressForm`
	`448`	`+`
	`449`	`+ return .done(enabled: addressesAreDifferentButSecondAddressSwitchIsDisabled \|\|`
	`450`	`+ originalAddress != fields.toAddress() \|\|`
	`451`	`+ secondaryOriginalAddress != secondaryFields.toAddress())`
`444`	`452`	`}`
`445`	`453`	`.assign(to: &$navigationTrailingItem)`
`446`	`454`	`}`