Enable site creation for WP users with no sites #22415

alpavanoglu · 2024-01-18T13:17:51Z

Fixes: #22368
Refs: pcdRpT-5mv-p2

Testing Steps

Main Functionality

Install WordPress and login with an account with no sites.
✅ (Regression) Expect the "My Site" tab to appear after login with an option to create a site ("Add new site").
"Add new site" > "Create WordPress.com site" and proceed until domain selection screen.
✅ Search for a domain and select one. Verify that Plan selection screen does not appear.
✅ Tap on "Done". Verify a site is created, and after the flow is dismissed, jetpack feature removal overlay appears.
✅ After dismissing the overlay, Quick start flow should not appear.
Tap the ••• button on top right in My Site screen.
Tap "Add new site"
✅ Verify that the Jetpack migration screen appears this time as the user has a site at this point.

Regression for Jetpack

Install Jetpack and login with an account with no sites.
✅ (Regression) Expect the "My Site" tab to appear after login with an option to create a site ("Add new site").
✅ "Add new site" > "Create WordPress.com site" and proceed until domain selection screen.
✅ Search for a domain and select one. Verify that Plan selection screen appears.
Complete the flow.
✅ Quick start flow should appear.
Tap on "Show me around" and expect the quick start to function normally.

Regression Notes

Potential unintended areas of impact
Quick start may appear and highlight features that aren't available on WordPress app.
What I did to test those areas of impact (or what existing automated tests I relied on)
Manually tested.
What automated tests I added (or what prevented me from doing so)

PR submission checklist:

I have completed the Regression Notes.
I have considered adding unit tests for my changes.
I have considered adding accessibility improvements for my changes.
I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

UI Changes testing checklist:

Portrait and landscape orientations.
Light and dark modes.
Fonts: Larger, smaller and bold text.
High contrast.
VoiceOver.
Languages with large words or with letters/accents not frequently used in English.
Right-to-left languages. (Even if translation isn’t complete, formatting should still respect the right-to-left layout)
iPhone and iPad.
Multi-tasking: Split view and Slide over. (iPad)

dangermattic · 2024-01-18T13:19:20Z

	2 Warnings
⚠️	View files have been modified, but no screenshot is included in the pull request. Consider adding some for clarity.
⚠️	This PR is assigned to the milestone 24.2. This milestone is due in less than 4 days. Please make sure to get it merged by then or assign it to a milestone with a later deadline.

Generated by 🚫 Danger

wpmobilebot · 2024-01-18T13:26:50Z

📲 You can test the changes from this Pull Request in WordPress Alpha by scanning the QR code below to install the corresponding build.

	App Name	WordPress Alpha
	Configuration	Release-Alpha
	Build Number	pr22415-6ee4ae9
	Version	24.1
	Bundle ID	org.wordpress.alpha
	Commit	`6ee4ae9`
	App Center Build	WPiOS - One-Offs #8651

Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

wpmobilebot · 2024-01-18T13:27:40Z

📲 You can test the changes from this Pull Request in Jetpack Alpha by scanning the QR code below to install the corresponding build.

	App Name	Jetpack Alpha
	Configuration	Release-Alpha
	Build Number	pr22415-6ee4ae9
	Version	24.1
	Bundle ID	com.jetpack.alpha
	Commit	`6ee4ae9`
	App Center Build	jetpack-installable-builds #7679

Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

hassaanelgarem

There are two acceptance criteria mentioned in the issue #22368 that are not met.

Features removal modal should be shown right after site creation.
Plan sales should be disabled on the WordPress app.

Features removal modal should be shown right after site creation.

Reproduction steps:

Fresh install the app
Sign up
Choose to create a new site
Notice that a fullscreen modal is shown, after dismissing it, the site creation flow is shown. The fullscreen modal should be shown after site creation is complete not before.

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-01-19.at.02.20.42.mp4

Plan sales should be disabled on the WordPress app.

Plans and domains are being promoted inside the WordPress app.

Domains	Plans

WordPress/Classes/ViewRelated/Site Creation/Final Assembly/SiteAssemblyWizardContent.swift

WordPress/Classes/ViewRelated/Blog/Blog List/BlogListViewController+SiteCreation.swift

hassaanelgarem · 2024-01-19T00:30:41Z

RELEASE-NOTES.txt

@@ -11,6 +11,7 @@
 * [**] Block Editor: Media uploads that failed due to lack of internet connectivity automatically retry once a connection is re-established [https://github.com/wordpress-mobile/WordPress-iOS/pull/22238]
 * [**] Block Editor: Manually retrying a single failed media upload will retry all failed media uploads in a post [https://github.com/wordpress-mobile/WordPress-iOS/pull/22240]
 * [*] [internal] Drop iOS 14 Support: Remove deprecated UIDocumentPickerViewController API [#22286]
+* [**] Site creation is re-enabled for WordPress users with no sites. [#22415]


I wonder if this should be marked internal?

I am really not sure. If you think that makes more sense I'll do that.

hassaanelgarem · 2024-01-19T00:47:05Z

@alpavanoglu FYI, looks like the tests are failing to build

mokagio · 2024-01-22T00:42:36Z

I'm going to bump this to the next release because we'll be code freezing 24.1 today and this hasn't been approved yet.

If these changes cannot wait two weeks and it's important that it makes it into this release, let me know and we'll organize a new beta once ready.

hassaanelgarem

Notice that a fullscreen modal is shown, after dismissing it, the site creation flow is shown. The fullscreen modal should be shown after site creation is complete not before.

@alpavanoglu I am still seeing the modal before the site creation flow starts. I also see the compliance popover. After the site creation flow is done, I see another feature removal modal.

Plans and domains are being promoted inside the WordPress app.

Domains are still being promoted inside the app. If I choose a paid domain, the step passes normally, but I end up with a free domain.

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-01-22.at.03.40.42.mp4

hassaanelgarem · 2024-01-22T02:05:23Z

WordPress/Classes/ViewRelated/Site Creation/Final Assembly/SiteAssemblyWizardContent.swift

+                )
+                let overlayViewController = JetpackFullscreenOverlayViewController(with: viewModel)
+                let navigationViewController = UINavigationController(rootViewController: overlayViewController)
+                JetpackFeaturesRemovalCoordinator.presentOverlay(


I don't think there's a need to manually trigger an overlay.
Correctly configuring MySiteViewController.willDisplayPostSignupFlow before triggering the site creation flow should stop the overlay from being presented at the wrong time and should then automatically be displayed after the site is created.

hassaanelgarem · 2024-01-22T02:07:31Z

WordPress/Classes/ViewRelated/Site Creation/Wizard/SiteCreationWizardLauncher.swift

@@ -7,7 +7,7 @@ final class SiteCreationWizardLauncher {
    }()

    let steps: [SiteCreationStep] = {
-        if RemoteFeatureFlag.plansInSiteCreation.enabled() {
+        if RemoteFeatureFlag.plansInSiteCreation.enabled() && !AppConfiguration.isWordPress {


[Nit] I think this is more readable:

Suggested change

if RemoteFeatureFlag.plansInSiteCreation.enabled() && !AppConfiguration.isWordPress {

if RemoteFeatureFlag.plansInSiteCreation.enabled() && AppConfiguration.isJetpack {

…roller`

hassaanelgarem

I've left some comments and suggestions.
I've also applied one of the suggestions and a change related to the compliance popover and pushed it to this branch: suggestion/alp-site-creation-pr

I haven't done proper testing on that branch, but here's the happy scenario:

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-01-31.at.02.17.03.mp4

hassaanelgarem · 2024-01-30T23:20:04Z

WordPress/Classes/ViewRelated/Site Creation/Final Assembly/SiteAssemblyWizardContent.swift

@@ -255,6 +255,10 @@ final class SiteAssemblyWizardContent: UIViewController {

        self.errorStateViewController = errorStateViewController
    }
+
+    private func shouldPresentJetpackFeaturesRemovalOverlay() -> Bool {


I guess this should be removed?

hassaanelgarem · 2024-01-30T23:22:50Z

WordPress/Classes/ViewRelated/Domains/DomainSelectionViewController.swift

@@ -281,7 +281,7 @@ final class DomainSelectionViewController: CollapsableHeaderViewController {
        let type: DomainsServiceRemote.DomainSuggestionType
        switch domainSelectionType {
        case .siteCreation:
-            type = RemoteFeatureFlag.plansInSiteCreation.enabled() ? .freeAndPaid : .wordPressDotComAndDotBlogSubdomains
+            type = (RemoteFeatureFlag.plansInSiteCreation.enabled() && AppConfiguration.isJetpack) ? .freeAndPaid : .wordPressDotComAndDotBlogSubdomains


This line feels clunky. What do you think about splitting into two lines? Or extracting the isEnabled logic to a computed variable?

hassaanelgarem · 2024-01-30T23:48:39Z

WordPress/Classes/ViewRelated/Site Creation/Final Assembly/SiteAssemblyWizardContent.swift

        dismissTapped(viaDone: true) { [blog, weak self] in
+            RootViewCoordinator.shared.isSiteCreationActive = false
            RootViewCoordinator.sharedPresenter.showBlogDetails(for: blog)
+            RootViewCoordinator.shared.reloadUIIfNeeded(blog: blog)


Moving the reload trigger outside the completion fixes the glitch of showing an invalid state for a split second before reloading.

Suggested change

dismissTapped(viaDone: true) { [blog, weak self] in

RootViewCoordinator.shared.isSiteCreationActive = false

RootViewCoordinator.sharedPresenter.showBlogDetails(for: blog)

RootViewCoordinator.shared.reloadUIIfNeeded(blog: blog)

RootViewCoordinator.shared.isSiteCreationActive = false

RootViewCoordinator.shared.reloadUIIfNeeded(blog: blog)

dismissTapped(viaDone: true) { [blog, weak self] in

RootViewCoordinator.sharedPresenter.showBlogDetails(for: blog)

hassaanelgarem · 2024-01-30T23:50:10Z

WordPress/Classes/ViewRelated/Blog/My Site/MySiteViewController.swift

-            launchSiteCreation: { [weak self] in self?.launchSiteCreationFromNoSites() },
+            launchSiteCreation: {
+                [weak self] in self?.launchSiteCreationFromNoSites()
+                RootViewCoordinator.shared.isSiteCreationActive = true


I'm worried we're not setting for all possible flows of starting site creation. Can you double check? 🙏

I've added the call to all the places that present SiteCreationWizardLauncher.ui.

hassaanelgarem · 2024-01-30T23:53:39Z

.../Classes/ViewRelated/NUX/Post Signup Interstitial/PostSignUpInterstitialViewController.swift

+        complianceCoordinator = CompliancePopoverCoordinator()
+        complianceCoordinator?.presentIfNeeded()


I don't think it makes sense to show this popover during sign-up. Can we maintain the current behavior of showing it from My Site, and avoid showing it at the wrong time?

I've created a branch with an alternate solution for the compliance popover issue.
Check suggestion/alp-site-creation-pr

…o task/reenable-site-creation-wp # Conflicts: # WordPress/Classes/ViewRelated/Blog/My Site/MySiteViewController.swift

alpavanoglu · 2024-01-31T11:35:58Z

WordPress/Classes/ViewRelated/Site Creation/Final Assembly/SiteAssemblyWizardContent.swift

@@ -268,6 +268,7 @@ private extension SiteAssemblyWizardContent {

    func dismissTapped(viaDone: Bool = false, completion: (() -> Void)? = nil) {
        // TODO : using viaDone, capture analytics event via #10335
+        RootViewCoordinator.shared.isSiteCreationActive = false


I added this as a safety measure. I left the one below in place regardless as we need to set the state before reloading the UI.

hassaanelgarem

Thanks on working on the fixes @alpavanoglu!
The happy scenario works as expected 🚀

I did however notice the following:

Install the WP app
Sign up
Tap on "Create a new site"
Cancel the flow
We land on My Site, but the features removal overlay is never shown and the UI is never reloaded even though it should.

The following flow works as expected:

Install the WP app
Sign up
Tap on "Not right now"
The overlay is shown and the UI is reloaded.

I would expect both flows to behave the same.

peril-wordpress-mobile · 2024-02-01T15:48:41Z

	Warnings
⚠️	This PR is assigned to a milestone which is closing in less than 4 days Please, make sure to get it merged by then or assign it to a later expiring milestone

Generated by 🚫 dangerJS

alpavanoglu · 2024-02-01T16:13:29Z

To resolve the issue Hassaan raised above, I added a force-reload on Site creation cancellation only for WordPress app with an account with 0 blogs to o minimize regression possibilities.

I tested the following cases again:

Sign up -> Create a site -> Complete the flow.
Sign up -> Not now
Sign up -> Create a site -> Cancel

At the end of each of these cases, Jetpack Migration Overlay appears as expected.

hassaanelgarem

Works as expected 🚀
Left one comment on the code.

hassaanelgarem · 2024-02-01T23:23:00Z

WordPress/Classes/ViewRelated/Site Creation/Site Intent/SiteIntentViewController.swift

@@ -110,6 +110,7 @@ class SiteIntentViewController: CollapsableHeaderViewController {
    @objc
    private func closeButtonTapped(_ sender: Any) {
        SiteCreationAnalyticsHelper.trackSiteIntentCanceled()
+        RootViewCoordinator.shared.reloadPostSiteCreationCancellationIfNeeded()


Right now we always reload the UI if some conditions are met, even if the UI shouldn't be reloaded.
I think we can just do this:

Suggested change

RootViewCoordinator.shared.reloadPostSiteCreationCancellationIfNeeded()

RootViewCoordinator.shared.isSiteCreationActive = false

RootViewCoordinator.shared.reloadUIIfNeeded(blog: blog)

We can either pass a nil value for the blog or fetch the current blog for consistency. There shouldn't be a need for the isWordPress or blog count condition.

I tried this but reloadUIIfNeeded does not reload still. iirc guard newUIType != oldUIType was falling into else. That's why I force the reload. However we don't reload in any case. The new function checks if the user has blogs and is on WordPress app. Since this function is only invoked from SiteIntentViewController, and that can only happen if the user has specifically 0 blogs and taps "close" on the first site creation screen, it will run on this very specific case and nothing else. Not on Jetpack app, not if the user has already a site.

@alpavanoglu I tried it locally and it works as expected:

Screen.Recording.2.mov

I tested it and it does work indeed. Perhaps I mistakenly tried the same account and the overlay was already shown once. I pushed the changes

hassaanelgarem

🚀

...ess/Classes/ViewRelated/Jetpack/Branding/Coordinator/JetpackFeaturesRemovalCoordinator.swift

salimbraksa · 2024-02-02T11:31:06Z

Tap on "Done". Verify a site is created, and after the flow is dismissed, jetpack feature removal overlay appears.

Maybe I'm missing something but the features removal overlay didnt appear the site was created.

Other than that, the rest of the steps worked as described in the Test Instructions.

trim.EE0DEAB7-D38F-4057-99A8-7D1864099F46.MOV

hassaanelgarem · 2024-02-02T14:24:26Z

Maybe I'm missing something but the features removal overlay didnt appear the site was created.

@salimbraksa was it a fresh install?

salimbraksa · 2024-02-02T14:29:00Z

was it a fresh install?

@hassaanelgarem No, it wasn't, but I tried signing out and login again, assuming that may reset the catch.

I clean installed the app and everything worked as expected. cc @alpavanoglu

Enable site creation for WP users with no sites

61f0f31

alpavanoglu added Login WordPress App labels Jan 18, 2024

alpavanoglu added this to the 24.1 milestone Jan 18, 2024

alpavanoglu requested a review from hassaanelgarem January 18, 2024 13:17

alpavanoglu marked this pull request as draft January 18, 2024 13:42

alpavanoglu added 2 commits January 18, 2024 14:42

Pass in blog to check for domains

75e8418

Update passed blog values to fetch from core data

8ebc238

alpavanoglu marked this pull request as ready for review January 18, 2024 19:53

Update release notes

da3ced6

alpavanoglu requested a review from salimbraksa January 18, 2024 19:54

hassaanelgarem reviewed Jan 19, 2024

View reviewed changes

WordPress/Classes/ViewRelated/Site Creation/Final Assembly/SiteAssemblyWizardContent.swift Outdated Show resolved Hide resolved

WordPress/Classes/ViewRelated/Blog/Blog List/BlogListViewController+SiteCreation.swift Outdated Show resolved Hide resolved

hassaanelgarem reviewed Jan 19, 2024

View reviewed changes

alpavanoglu added 4 commits January 19, 2024 14:43

Address change requests

272ac13

Remove unused blog instances

760e5b7

Disable plan step for WordPress app

151d3c4

Fix tests

5fce8cf

mokagio modified the milestones: 24.1, 24.2 Jan 22, 2024

hassaanelgarem reviewed Jan 22, 2024

View reviewed changes

alpavanoglu added 4 commits January 28, 2024 21:11

Add compliancePopoverCoordinator to `PostSignUpInterstitialViewCont…

2d9c826

…roller`

Temp

1914910

Fix overlay presentation on sign up

5cff94e

Update for change request

3d1bb4e

hassaanelgarem reviewed Jan 31, 2024

View reviewed changes

alpavanoglu added 6 commits January 31, 2024 12:03

Apply change requests

3dd9716

Merge branch 'trunk' of github.com:wordpress-mobile/WordPress-iOS int…

cf69359

…o task/reenable-site-creation-wp # Conflicts: # WordPress/Classes/ViewRelated/Blog/My Site/MySiteViewController.swift

Refactor popover display logic

49c4920

Combine overlay logic in MySiteOverlaysCoordinator

e0f7f63

Add isSiteCreationActive calls to site creation call sites

fed4475

Set isSiteCreationActive to false on dismiss

d6ee40c

alpavanoglu commented Jan 31, 2024

View reviewed changes

hassaanelgarem reviewed Feb 1, 2024

View reviewed changes

Add refresh UI call to site creation cancellation

ffe97ce

hassaanelgarem reviewed Feb 1, 2024

View reviewed changes

Remove reloadPostSiteCreationCancellationIfNeeded

56c1015

hassaanelgarem approved these changes Feb 2, 2024

View reviewed changes

...ess/Classes/ViewRelated/Jetpack/Branding/Coordinator/JetpackFeaturesRemovalCoordinator.swift Outdated Show resolved Hide resolved

Add private access modifier back to hasBlog

6ee4ae9

salimbraksa approved these changes Feb 2, 2024

View reviewed changes

alpavanoglu merged commit 5354a08 into trunk Feb 2, 2024
22 checks passed

alpavanoglu deleted the task/reenable-site-creation-wp branch February 2, 2024 14:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Enable site creation for WP users with no sites #22415

Enable site creation for WP users with no sites #22415

alpavanoglu commented Jan 18, 2024 •

edited

Loading

dangermattic commented Jan 18, 2024 •

edited

Loading

wpmobilebot commented Jan 18, 2024 •

edited

Loading

wpmobilebot commented Jan 18, 2024 •

edited

Loading

hassaanelgarem left a comment •

edited

Loading

hassaanelgarem Jan 19, 2024

alpavanoglu Jan 19, 2024

hassaanelgarem commented Jan 19, 2024

mokagio commented Jan 22, 2024

hassaanelgarem left a comment

hassaanelgarem Jan 22, 2024

hassaanelgarem Jan 22, 2024

hassaanelgarem left a comment

hassaanelgarem Jan 30, 2024

hassaanelgarem Jan 30, 2024

hassaanelgarem Jan 30, 2024

hassaanelgarem Jan 30, 2024

alpavanoglu Jan 31, 2024

hassaanelgarem Jan 30, 2024

hassaanelgarem Jan 31, 2024

alpavanoglu Jan 31, 2024

hassaanelgarem left a comment

peril-wordpress-mobile bot commented Feb 1, 2024

alpavanoglu commented Feb 1, 2024

hassaanelgarem left a comment

hassaanelgarem Feb 1, 2024

alpavanoglu Feb 2, 2024

hassaanelgarem Feb 2, 2024

alpavanoglu Feb 2, 2024

hassaanelgarem left a comment

salimbraksa commented Feb 2, 2024 •

edited

Loading

hassaanelgarem commented Feb 2, 2024

salimbraksa commented Feb 2, 2024

	if RemoteFeatureFlag.plansInSiteCreation.enabled() && !AppConfiguration.isWordPress {
	if RemoteFeatureFlag.plansInSiteCreation.enabled() && AppConfiguration.isJetpack {

		complianceCoordinator = CompliancePopoverCoordinator()
		complianceCoordinator?.presentIfNeeded()

	RootViewCoordinator.shared.reloadPostSiteCreationCancellationIfNeeded()
	RootViewCoordinator.shared.isSiteCreationActive = false
	RootViewCoordinator.shared.reloadUIIfNeeded(blog: blog)

Enable site creation for WP users with no sites #22415

Enable site creation for WP users with no sites #22415

Conversation

alpavanoglu commented Jan 18, 2024 • edited Loading

Testing Steps

Main Functionality

Regression for Jetpack

Regression Notes

dangermattic commented Jan 18, 2024 • edited Loading

wpmobilebot commented Jan 18, 2024 • edited Loading

wpmobilebot commented Jan 18, 2024 • edited Loading

hassaanelgarem left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hassaanelgarem commented Jan 19, 2024

mokagio commented Jan 22, 2024

hassaanelgarem left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hassaanelgarem left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hassaanelgarem left a comment

Choose a reason for hiding this comment

peril-wordpress-mobile bot commented Feb 1, 2024

alpavanoglu commented Feb 1, 2024

hassaanelgarem left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hassaanelgarem left a comment

Choose a reason for hiding this comment

salimbraksa commented Feb 2, 2024 • edited Loading

hassaanelgarem commented Feb 2, 2024

salimbraksa commented Feb 2, 2024

alpavanoglu commented Jan 18, 2024 •

edited

Loading

dangermattic commented Jan 18, 2024 •

edited

Loading

wpmobilebot commented Jan 18, 2024 •

edited

Loading

wpmobilebot commented Jan 18, 2024 •

edited

Loading

hassaanelgarem left a comment •

edited

Loading

salimbraksa commented Feb 2, 2024 •

edited

Loading