Merge pull request #18461 from wordpress-mobile/Plans-on-JP-Domain-and-Plan-Selection

Plans on JP: Free domain selection and plan selection

Author: ravishanker

WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationActivity.kt

@@ -13,11 +13,13 @@ import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.ui.LocaleAwareActivity
 import org.wordpress.android.ui.ScrollableViewInitializedListener
 import org.wordpress.android.ui.domains.DomainRegistrationCheckoutWebViewActivity.OpenCheckout.CheckoutDetails
+import org.wordpress.android.ui.domains.DomainRegistrationCheckoutWebViewActivity.OpenPlans.PlanDetails
 import org.wordpress.android.ui.domains.DomainRegistrationNavigationAction.FinishDomainRegistration
 import org.wordpress.android.ui.domains.DomainRegistrationNavigationAction.OpenDomainRegistrationCheckout
 import org.wordpress.android.ui.domains.DomainRegistrationNavigationAction.OpenDomainRegistrationDetails
 import org.wordpress.android.ui.domains.DomainRegistrationNavigationAction.OpenDomainRegistrationResult
 import org.wordpress.android.ui.domains.DomainRegistrationNavigationAction.OpenDomainSuggestions
+import org.wordpress.android.ui.domains.DomainRegistrationNavigationAction.OpenFreeDomainWithAnnualPlan
 import org.wordpress.android.util.extensions.getSerializableExtraCompat
 import org.wordpress.android.viewmodel.observeEvent
 import javax.inject.Inject
@@ -27,7 +29,8 @@ class DomainRegistrationActivity : LocaleAwareActivity(), ScrollableViewInitiali
     enum class DomainRegistrationPurpose {
         AUTOMATED_TRANSFER,
         CTA_DOMAIN_CREDIT_REDEMPTION,
-        DOMAIN_PURCHASE
+        DOMAIN_PURCHASE,
+        FREE_DOMAIN_WITH_ANNUAL_PLAN
     }
 
     companion object {
@@ -46,6 +49,12 @@ class DomainRegistrationActivity : LocaleAwareActivity(), ScrollableViewInitiali
         }
     }
 
+    private val openPlans = registerForActivityResult(DomainRegistrationCheckoutWebViewActivity.OpenPlans()) {
+        it?.let {
+            viewModel.completeDomainRegistration(it)
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         with(DomainRegistrationActivityBinding.inflate(layoutInflater)) {
@@ -80,6 +89,7 @@ class DomainRegistrationActivity : LocaleAwareActivity(), ScrollableViewInitiali
         viewModel.onNavigation.observeEvent(this) {
             when (it) {
                 is OpenDomainSuggestions -> showDomainSuggestions()
+                is OpenFreeDomainWithAnnualPlan -> openFreeDomainWithAnnualPlanWebView(it.site, it.details)
                 is OpenDomainRegistrationCheckout -> openDomainRegistrationCheckoutWebView(it.site, it.details)
                 is OpenDomainRegistrationDetails -> showDomainRegistrationDetails(it.details)
                 is OpenDomainRegistrationResult -> showDomainRegistrationResult(it.event)
@@ -94,6 +104,10 @@ class DomainRegistrationActivity : LocaleAwareActivity(), ScrollableViewInitiali
         }
     }
 
+    private fun openFreeDomainWithAnnualPlanWebView(site: SiteModel, details: DomainProductDetails) {
+        openPlans.launch(PlanDetails(site, details.domainName))
+    }
+
     private fun openDomainRegistrationCheckoutWebView(site: SiteModel, details: DomainProductDetails) {
         openCheckout.launch(CheckoutDetails(site, details.domainName))
     }

WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationCheckoutWebViewActivity.kt

@@ -8,6 +8,7 @@ import androidx.activity.result.contract.ActivityResultContract
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.ui.WPWebViewActivity
 import org.wordpress.android.ui.domains.DomainRegistrationCheckoutWebViewActivity.OpenCheckout.CheckoutDetails
+import org.wordpress.android.ui.domains.DomainRegistrationCheckoutWebViewActivity.OpenPlans.PlanDetails
 import org.wordpress.android.ui.domains.DomainRegistrationCheckoutWebViewClient.DomainRegistrationCheckoutWebViewClientListener
 import org.wordpress.android.util.SiteUtils
 
@@ -29,6 +30,40 @@ class DomainRegistrationCheckoutWebViewActivity : WPWebViewActivity(), DomainReg
         finish()
     }
 
+    class OpenPlans : ActivityResultContract<PlanDetails, DomainRegistrationCompletedEvent?>() {
+        override fun createIntent(context: Context, input: PlanDetails) =
+            Intent(context, DomainRegistrationCheckoutWebViewActivity::class.java).apply {
+                putExtra(USE_GLOBAL_WPCOM_USER, true)
+                putExtra(URL_TO_LOAD, getPlansUrl(input.site))
+                putExtra(AUTHENTICATION_URL, WPCOM_LOGIN_URL)
+                putExtra(REGISTRATION_DOMAIN_NAME, input.domainName)
+                putExtra(REGISTRATION_EMAIL, input.site.email)
+            }
+
+        override fun parseResult(resultCode: Int, intent: Intent?): DomainRegistrationCompletedEvent? {
+            val data = intent?.takeIf { it.hasExtra(REGISTRATION_DOMAIN_NAME) && it.hasExtra(REGISTRATION_EMAIL) }
+            if (resultCode == RESULT_OK && data != null) {
+                val domainName = data.getStringExtra(REGISTRATION_DOMAIN_NAME).orEmpty()
+                val email = data.getStringExtra(REGISTRATION_EMAIL).orEmpty()
+                return DomainRegistrationCompletedEvent(domainName, email)
+            }
+            return null
+        }
+
+        data class PlanDetails(val site: SiteModel, val domainName: String)
+
+        private fun getPlansUrl(site: SiteModel) =
+            "https://wordpress.com/plans/yearly/" +
+                    SiteUtils.getHomeURLOrHostName(site) +
+                    "?domainAndPlanPackage=true" +
+                    "&jetpackAppPlans=true"
+
+        companion object {
+            const val REGISTRATION_DOMAIN_NAME = "REGISTRATION_DOMAIN_NAME"
+            const val REGISTRATION_EMAIL = "REGISTRATION_EMAIL"
+        }
+    }
+
     class OpenCheckout : ActivityResultContract<CheckoutDetails, DomainRegistrationCompletedEvent?>() {
         override fun createIntent(context: Context, input: CheckoutDetails) =
             Intent(context, DomainRegistrationCheckoutWebViewActivity::class.java).apply {

WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationCheckoutWebViewNavigationDelegate.kt

@@ -8,6 +8,7 @@ object DomainRegistrationCheckoutWebViewNavigationDelegate {
         UrlMatcher(
             ".*wordpress.com".toRegex(),
             listOf(
+                "/plans.*?.*".toRegex(),
                 "/automattic-domain-name-registration-agreement.*".toRegex(),
                 "/checkout.*".toRegex(),
                 "$optionalLanguagePath/tos.*".toRegex(),

WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationMainViewModel.kt

@@ -7,11 +7,13 @@ import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.ui.domains.DomainRegistrationActivity.DomainRegistrationPurpose
 import org.wordpress.android.ui.domains.DomainRegistrationActivity.DomainRegistrationPurpose.CTA_DOMAIN_CREDIT_REDEMPTION
 import org.wordpress.android.ui.domains.DomainRegistrationActivity.DomainRegistrationPurpose.DOMAIN_PURCHASE
+import org.wordpress.android.ui.domains.DomainRegistrationActivity.DomainRegistrationPurpose.FREE_DOMAIN_WITH_ANNUAL_PLAN
 import org.wordpress.android.ui.domains.DomainRegistrationNavigationAction.FinishDomainRegistration
 import org.wordpress.android.ui.domains.DomainRegistrationNavigationAction.OpenDomainRegistrationCheckout
 import org.wordpress.android.ui.domains.DomainRegistrationNavigationAction.OpenDomainRegistrationDetails
 import org.wordpress.android.ui.domains.DomainRegistrationNavigationAction.OpenDomainRegistrationResult
 import org.wordpress.android.ui.domains.DomainRegistrationNavigationAction.OpenDomainSuggestions
+import org.wordpress.android.ui.domains.DomainRegistrationNavigationAction.OpenFreeDomainWithAnnualPlan
 import org.wordpress.android.viewmodel.Event
 import javax.inject.Inject
 
@@ -45,6 +47,10 @@ class DomainRegistrationMainViewModel @Inject constructor(
                 analyticsTracker.trackDomainsRegistrationFormViewed()
                 Event(OpenDomainRegistrationCheckout(site, domainProductDetails))
             }
+            FREE_DOMAIN_WITH_ANNUAL_PLAN -> {
+                analyticsTracker.trackDomainsRegistrationFormViewed()
+                Event(OpenFreeDomainWithAnnualPlan(site, domainProductDetails))
+            }
             else -> {
                 analyticsTracker.trackDomainCreditNameSelected()
                 Event(OpenDomainRegistrationDetails(domainProductDetails))
@@ -55,7 +61,7 @@ class DomainRegistrationMainViewModel @Inject constructor(
     fun completeDomainRegistration(event: DomainRegistrationCompletedEvent) {
         // Called on checkout result
         _onNavigation.value = when (domainRegistrationPurpose) {
-            CTA_DOMAIN_CREDIT_REDEMPTION, DOMAIN_PURCHASE -> {
+            CTA_DOMAIN_CREDIT_REDEMPTION, DOMAIN_PURCHASE, FREE_DOMAIN_WITH_ANNUAL_PLAN -> {
                 analyticsTracker.trackDomainsRegistrationFormSubmitted()
                 Event(OpenDomainRegistrationResult(event))
             }

WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationNavigationAction.kt

@@ -5,6 +5,8 @@ import org.wordpress.android.fluxc.model.SiteModel
 sealed class DomainRegistrationNavigationAction {
     object OpenDomainSuggestions : DomainRegistrationNavigationAction()
 
+    data class OpenFreeDomainWithAnnualPlan(val site: SiteModel, val details: DomainProductDetails) :
+        DomainRegistrationNavigationAction()
     data class OpenDomainRegistrationCheckout(val site: SiteModel, val details: DomainProductDetails) :
         DomainRegistrationNavigationAction()
 

WordPress/src/main/java/org/wordpress/android/ui/domains/DomainSuggestionsFragment.kt

@@ -105,6 +105,7 @@ class DomainSuggestionsFragment : Fragment(R.layout.domain_suggestions_fragment)
         }
         viewModel.selectDomainButtonEnabledState.observe(viewLifecycleOwner) { selectDomainButton.isEnabled = it }
         viewModel.onDomainSelected.observeEvent(viewLifecycleOwner, mainViewModel::selectDomain)
+        viewModel.onFreeDomainSelected.observeEvent(viewLifecycleOwner, mainViewModel::selectDomain)
     }
 
     override fun onResume() {

WordPress/src/main/java/org/wordpress/android/ui/domains/DomainSuggestionsViewModel.kt

@@ -19,6 +19,7 @@ import org.wordpress.android.modules.BG_THREAD
 import org.wordpress.android.ui.domains.DomainRegistrationActivity.DomainRegistrationPurpose
 import org.wordpress.android.ui.domains.DomainRegistrationActivity.DomainRegistrationPurpose.CTA_DOMAIN_CREDIT_REDEMPTION
 import org.wordpress.android.ui.domains.DomainRegistrationActivity.DomainRegistrationPurpose.DOMAIN_PURCHASE
+import org.wordpress.android.ui.domains.DomainRegistrationActivity.DomainRegistrationPurpose.FREE_DOMAIN_WITH_ANNUAL_PLAN
 import org.wordpress.android.ui.domains.usecases.CreateCartUseCase
 import org.wordpress.android.util.AppLog
 import org.wordpress.android.util.AppLog.T
@@ -73,6 +74,9 @@ class DomainSuggestionsViewModel @Inject constructor(
     private val _onDomainSelected = MutableLiveData<Event<DomainProductDetails>>()
     val onDomainSelected: LiveData<Event<DomainProductDetails>> = _onDomainSelected
 
+    private val _onFreeDomainSelected = MutableLiveData<Event<DomainProductDetails>>()
+    val onFreeDomainSelected: LiveData<Event<DomainProductDetails>> = _onFreeDomainSelected
+
     private var searchQuery: String by Delegates.observable("") { _, oldValue, newValue ->
         if (newValue != oldValue) {
             if (isStarted && !isQueryTrackingCompleted) {
@@ -194,7 +198,7 @@ class DomainSuggestionsViewModel @Inject constructor(
                     relevance = it.relevance,
                     isSelected = _selectedSuggestion.value?.domainName == it.domain_name,
                     isCostVisible = siteDomainsFeatureConfig.isEnabled(),
-                    isFreeWithCredits = domainRegistrationPurpose == CTA_DOMAIN_CREDIT_REDEMPTION,
+                    isFreeWithCredits = domainRegistrationPurpose(),
                     isEnabled = true
                 )
             }
@@ -205,6 +209,9 @@ class DomainSuggestionsViewModel @Inject constructor(
             }
     }
 
+    private fun domainRegistrationPurpose() = domainRegistrationPurpose == CTA_DOMAIN_CREDIT_REDEMPTION ||
+                domainRegistrationPurpose == FREE_DOMAIN_WITH_ANNUAL_PLAN
+
     fun onDomainSuggestionSelected(selectedSuggestion: DomainSuggestionItem?) {
         _selectedSuggestion.postValue(selectedSuggestion)
         suggestions = suggestions.transform { list ->
@@ -216,7 +223,7 @@ class DomainSuggestionsViewModel @Inject constructor(
     fun onSelectDomainButtonClicked() {
         val selectedSuggestion = _selectedSuggestion.value ?: throw IllegalStateException("Selected suggestion is null")
         when (domainRegistrationPurpose) {
-            DOMAIN_PURCHASE -> createCart(selectedSuggestion)
+            DOMAIN_PURCHASE, FREE_DOMAIN_WITH_ANNUAL_PLAN -> createCart(selectedSuggestion)
             else -> selectDomain(selectedSuggestion)
         }
 
@@ -254,10 +261,20 @@ class DomainSuggestionsViewModel @Inject constructor(
             // TODO Handle failed cart creation
         } else {
             AppLog.d(T.DOMAIN_REGISTRATION, "Successful cart creation: ${event.cartDetails}")
-            selectDomain(selectedSuggestion)
+            if (domainRegistrationPurpose == FREE_DOMAIN_WITH_ANNUAL_PLAN) {
+                openPlans(selectedSuggestion)
+            } else {
+                selectDomain(selectedSuggestion)
+            }
         }
     }
 
+    private fun openPlans(selectedSuggestion: DomainSuggestionItem) {
+        val domainProductDetails = DomainProductDetails(selectedSuggestion.productId, selectedSuggestion.domainName)
+        _onFreeDomainSelected.postValue(Event(domainProductDetails))
+        // add tracking here
+    }
+
     private fun selectDomain(selectedSuggestion: DomainSuggestionItem) {
         val domainProductDetails = DomainProductDetails(selectedSuggestion.productId, selectedSuggestion.domainName)
         _onDomainSelected.postValue(Event(domainProductDetails))

WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteSourceManager.kt

@@ -11,7 +11,6 @@ import org.wordpress.android.ui.mysite.cards.blaze.PromoteWithBlazeCardSource
 import org.wordpress.android.ui.mysite.cards.dashboard.CardsSource
 import org.wordpress.android.ui.mysite.cards.dashboard.bloggingprompts.BloggingPromptCardSource
 import org.wordpress.android.ui.mysite.cards.dashboard.domain.DashboardCardDomainSource
-import org.wordpress.android.ui.mysite.cards.dashboard.plans.PlansCardDomainSource
 import org.wordpress.android.ui.mysite.cards.domainregistration.DomainRegistrationSource
 import org.wordpress.android.ui.mysite.cards.quickstart.QuickStartCardSource
 import org.wordpress.android.ui.mysite.dynamiccards.DynamicCardMenuViewModel.DynamicCardMenuInteraction
@@ -36,7 +35,6 @@ class MySiteSourceManager @Inject constructor(
     promoteWithBlazeCardSource: PromoteWithBlazeCardSource,
     private val selectedSiteRepository: SelectedSiteRepository,
     dashboardCardDomainSource: DashboardCardDomainSource,
-    plansCardDomainSource: PlansCardDomainSource,
     private val jetpackFeatureRemovalPhaseHelper: JetpackFeatureRemovalPhaseHelper
 ) {
     private val mySiteSources: List<MySiteSource<*>> = listOf(
@@ -51,7 +49,6 @@ class MySiteSourceManager @Inject constructor(
         bloggingPromptCardSource,
         promoteWithBlazeCardSource,
         dashboardCardDomainSource,
-        plansCardDomainSource
     )
 
     private val showDashboardCards: Boolean

WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteViewModel.kt

@@ -618,9 +618,7 @@ class MySiteViewModel @Inject constructor(
                     onMoreMenuClick = this::onDashboardCardDomainMoreMenuClick
                 ),
                 dashboardCardPlansBuilderParams = DashboardCardPlansBuilderParams(
-                    isEligible = dashboardCardPlansUtils.shouldShowCard(
-                        site, isDomainCreditAvailable, hasSiteCustomDomains
-                    ),
+                    isEligible = dashboardCardPlansUtils.shouldShowCard(site),
                     onClick = this::onDashboardCardPlansClick,
                     onHideMenuItemClick = this::onDashboardCardPlansHideMenuItemClick,
                     onMoreMenuClick = this::onDashboardCardPlansMoreMenuClick
@@ -1692,7 +1690,7 @@ class MySiteViewModel @Inject constructor(
     private fun onDashboardCardPlansClick() {
         val selectedSite = requireNotNull(selectedSiteRepository.getSelectedSite())
         dashboardCardPlansUtils.trackCardTapped(uiModel.value?.state as? SiteSelected)
-        _onNavigation.value = Event(SiteNavigationAction.OpenPaidDomainSearch(selectedSite))
+        _onNavigation.value = Event(SiteNavigationAction.OpenFreeDomainSearch(selectedSite))
     }
 
     private fun onDashboardCardPlansMoreMenuClick() {

WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteNavigationAction.kt

@@ -61,6 +61,7 @@ sealed class SiteNavigationAction {
 
     data class OpenDomainRegistration(val site: SiteModel) : SiteNavigationAction()
     data class OpenPaidDomainSearch(val site: SiteModel) : SiteNavigationAction()
+    data class OpenFreeDomainSearch(val site: SiteModel) : SiteNavigationAction()
     data class AddNewSite(val hasAccessToken: Boolean, val source: SiteCreationSource) : SiteNavigationAction()
     data class ShowQuickStartDialog(
         @StringRes val title: Int,