Domain: Refactor to use a common domain selection view (#22254)

wordpress-mobile · Dec 22, 2023 · 7720c9e · 7720c9e
2 parents 2b6639d + 1b8ecaf
commit 7720c9e
Show file tree

Hide file tree

Showing 31 changed files with 547 additions and 1,513 deletions.
diff --git a/Modules/Sources/DesignSystem/Foundation/Color+DesignSystem.swift b/Modules/Sources/DesignSystem/Foundation/Color+DesignSystem.swift
@@ -40,6 +40,10 @@ public extension Color {
         private static func colorWithModuleBundle(colorName: String) -> Color {
             Color(colorName, bundle: .module)
         }
+
+        public static func custom(_ colorName: String) -> Color {
+            return colorWithModuleBundle(colorName: colorName)
+        }
     }
 }
 

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,6 +1,7 @@
 24.0
 -----
 * [**] [internal] A minor refactor in authentication flow, including but not limited to social sign-in and two factor authentication. [#22086]
+* [**] [internal] Refactor domain selection flows to use the same domain selection UI. [22254]
 
 23.9
 -----

diff --git a/WordPress/Classes/Services/SiteAddressService.swift b/WordPress/Classes/Services/SiteAddressService.swift
@@ -17,18 +17,13 @@ struct SiteAddressServiceResult {
 typealias SiteAddressServiceCompletion = (Result<SiteAddressServiceResult, Error>) -> Void
 
 protocol SiteAddressService {
-    func addresses(for query: String, segmentID: Int64, completion: @escaping SiteAddressServiceCompletion)
-    func addresses(for query: String, completion: @escaping SiteAddressServiceCompletion)
+    func addresses(for query: String, type: DomainsServiceRemote.DomainSuggestionType, completion: @escaping SiteAddressServiceCompletion)
 }
 
 // MARK: - MockSiteAddressService
 
 final class MockSiteAddressService: SiteAddressService {
-    func addresses(for query: String, segmentID: Int64, completion: @escaping SiteAddressServiceCompletion) {
-        completion(.success(SiteAddressServiceResult(hasExactMatch: true, domainSuggestions: mockAddresses)))
-    }
-
-    func addresses(for query: String, completion: @escaping SiteAddressServiceCompletion) {
+    func addresses(for query: String, type: DomainsServiceRemote.DomainSuggestionType, completion: @escaping SiteAddressServiceCompletion) {
         completion(.success(SiteAddressServiceResult(hasExactMatch: true, domainSuggestions: mockAddresses)))
     }
 
@@ -51,11 +46,6 @@ final class DomainsServiceAdapter: SiteAddressService {
 
     // MARK: Properties
 
-    /// Checks if the Domain Purchasing Feature Flag and AB Experiment are enabled
-    private var domainPurchasingEnabled: Bool {
-        RemoteFeatureFlag.plansInSiteCreation.enabled()
-    }
-
     /**
      Corresponds to:
 
@@ -98,38 +88,18 @@ final class DomainsServiceAdapter: SiteAddressService {
 
     // MARK: SiteAddressService
 
-    func addresses(for query: String, segmentID: Int64, completion: @escaping SiteAddressServiceCompletion) {
-
-        domainsService.getDomainSuggestions(query: query,
-                                            segmentID: segmentID,
-                                            quantity: domainRequestQuantity,
-                                            success: { domainSuggestions in
-                                                completion(Result.success(self.sortSuggestions(for: query, suggestions: domainSuggestions)))
-                                            },
-                                            failure: { error in
-                                                if (error as NSError).code == DomainsServiceAdapter.emptyResultsErrorCode {
-                                                    completion(Result.success(SiteAddressServiceResult()))
-                                                    return
-                                                }
-
-                                                completion(Result.failure(error))
-                                            })
-    }
-
-    func addresses(for query: String, completion: @escaping SiteAddressServiceCompletion) {
-        let domainSuggestionType: DomainsServiceRemote.DomainSuggestionType = domainPurchasingEnabled
-        ? .freeAndPaid
-        : .wordPressDotComAndDotBlogSubdomains
+    func addresses(for query: String, type: DomainsServiceRemote.DomainSuggestionType, completion: @escaping SiteAddressServiceCompletion) {
         domainsService.getDomainSuggestions(query: query,
                                             quantity: domainRequestQuantity,
-                                            domainSuggestionType: domainSuggestionType,
+                                            domainSuggestionType: type,
                                             success: { domainSuggestions in
-            if self.domainPurchasingEnabled {
+            switch type {
+            case .freeAndPaid:
                 let hasExactMatch = domainSuggestions.contains { domain -> Bool in
                     return domain.domainNameStrippingSubdomain.caseInsensitiveCompare(query) == .orderedSame
                 }
                 completion(Result.success(.init(hasExactMatch: hasExactMatch, domainSuggestions: domainSuggestions)))
-            } else {
+            default:
                 completion(Result.success(self.sortSuggestions(for: query, suggestions: domainSuggestions)))
             }
         },

diff --git a/...ViewRelated/Blog/Blog Dashboard/Cards/Free to Paid Plans/FreeToPaidPlansCoordinator.swift b/...ViewRelated/Blog/Blog Dashboard/Cards/Free to Paid Plans/FreeToPaidPlansCoordinator.swift
@@ -11,10 +11,11 @@ import SwiftUI
         blog: Blog
     ) {
         let coordinator = RegisterDomainCoordinator(site: blog)
-        let domainSuggestionsViewController = RegisterDomainSuggestionsViewController.instance(
-            coordinator: coordinator,
+        let domainSuggestionsViewController = DomainSelectionViewController(
+            service: DomainsServiceAdapter(coreDataStack: ContextManager.shared),
             domainSelectionType: .purchaseWithPaidPlan,
-            includeSupportButton: false
+            includeSupportButton: false,
+            coordinator: coordinator
         )
 
         let purchaseCallback = { (checkoutViewController: UIViewController, domainName: String) in

diff --git a/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController+DomainCredit.swift b/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController+DomainCredit.swift
diff --git a/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m b/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m
@@ -1035,15 +1035,6 @@ - (void)configureTableViewData
         [marr addNullableObject:[self jetpackCardSectionViewModel]];
     }
 
-    // This code will be removed in a future PR.
-//    if ([DomainCreditEligibilityChecker canRedeemDomainCreditWithBlog:self.blog]) {
-//        if (!self.hasLoggedDomainCreditPromptShownEvent) {
-//            [WPAnalytics track:WPAnalyticsStatDomainCreditPromptShown];
-//            self.hasLoggedDomainCreditPromptShownEvent = YES;
-//        }
-//        [marr addNullableObject:[self domainCreditSectionViewModel]];
-//    }
-
     if ([self shouldShowQuickStartChecklist]) {
         [marr addNullableObject:[self quickStartSectionViewModel]];
     }

diff --git a/WordPress/Classes/ViewRelated/Domains/Domain registration/RegisterDomain.storyboard b/WordPress/Classes/ViewRelated/Domains/Domain registration/RegisterDomain.storyboard
diff --git a/.../Domain registration/RegisterDomainDetails/ViewModel/RegisterDomainDetailsViewModel.swift b/.../Domain registration/RegisterDomainDetails/ViewModel/RegisterDomainDetailsViewModel.swift
@@ -47,7 +47,7 @@ class RegisterDomainDetailsViewModel {
 
     var registerDomainDetailsService: RegisterDomainDetailsServiceProxyProtocol = RegisterDomainDetailsServiceProxy()
 
-    let domain: FullyQuotedDomainSuggestion
+    let domain: DomainSuggestion
     let siteID: Int
     let domainPurchasedCallback: ((String) -> Void)
 
@@ -68,7 +68,7 @@ class RegisterDomainDetailsViewModel {
         }
     }
 
-    init(siteID: Int, domain: FullyQuotedDomainSuggestion, domainPurchasedCallback: @escaping ((String) -> Void)) {
+    init(siteID: Int, domain: DomainSuggestion, domainPurchasedCallback: @escaping ((String) -> Void)) {
         self.siteID = siteID
         self.domain = domain
         self.domainPurchasedCallback = domainPurchasedCallback
@@ -193,7 +193,7 @@ class RegisterDomainDetailsViewModel {
 
             registerDomainService.purchaseDomainUsingCredits(
                 siteID: siteID,
-                domainSuggestion: domainSuggestion.remoteSuggestion(),
+                domainSuggestion: domainSuggestion,
                 domainContactInformation: contactInformation,
                 privacyProtectionEnabled: privacyEnabled,
                 success: { domain in

diff --git a/...Domain registration/RegisterDomainSuggestions/DomainSuggestionViewControllerWrapper.swift b/...Domain registration/RegisterDomainSuggestions/DomainSuggestionViewControllerWrapper.swift
@@ -2,14 +2,14 @@ import SwiftUI
 import UIKit
 import WordPressKit
 
-/// Makes RegisterDomainSuggestionsViewController available to SwiftUI
+/// Makes DomainSelectionViewController available to SwiftUI
 struct DomainSuggestionViewControllerWrapper: UIViewControllerRepresentable {
 
     private let blog: Blog
     private let domainSelectionType: DomainSelectionType
     private let onDismiss: () -> Void
 
-    private var domainSuggestionViewController: RegisterDomainSuggestionsViewController
+    private var domainSuggestionViewController: DomainSelectionViewController
 
     init(blog: Blog, domainSelectionType: DomainSelectionType, onDismiss: @escaping () -> Void) {
         self.blog = blog