Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Plans: Add Checklist to My Plan page (JP) #25870

Merged
merged 6 commits into from
Jul 10, 2018
Merged

Conversation

ockham
Copy link
Contributor

@ockham ockham commented Jul 4, 2018

Screenshot

image

Testing Instructions

  • Navigate to http://calypso.localhost:3000/plans/my-plan/<jpSite>
  • Verify that you see the checklist as in the screenshot above
  • Verify that the checklist is fully functional (Note that only the Jetpack Monitor task's 'Do it' button will currently start a Guided Tour)
  • Navigate that no checklist is shown for WP.com sites, i.e. http://calypso.localhost:3000/plans/my-plan/<wpcomSite>
  • Verify that the checklist is hidden behind a feature flag:
  • Apply the patch below and restart Calypso. Verify that the checklist is no longer shown on http://calypso.localhost:3000/plans/my-plan/<jpSite>
diff --git a/config/development.json b/config/development.json
index bc77f97..773cd30 100644
--- a/config/development.json
+++ b/config/development.json
@@ -68,7 +68,7 @@
                "help/courses": true,
                "i18n/community-translator": false,
                "jetpack/api-cache": true,
-               "jetpack/checklist": true,
+               "jetpack/checklist": false,
                "jetpack/connect-redirect-pressable-credential-approval": true,
                "jetpack/connect/remote-install": true,
                "jetpack/connect/mobile-app-flow": true,

Fixes #25871

@ockham ockham added Jetpack [Feature] Plans & Upgrades All of the plans on WordPress.com and flow for upgrading plans. [Status] In Progress Checklist labels Jul 4, 2018
@ockham ockham self-assigned this Jul 4, 2018
@matticbot
Copy link
Contributor

@ockham ockham force-pushed the add/checklist-to-my-plan-page branch 3 times, most recently from 4826c1d to bc92484 Compare July 6, 2018 13:53
@ockham ockham added [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. and removed [Status] In Progress labels Jul 6, 2018
@ockham ockham requested a review from a team July 6, 2018 14:57
@ockham ockham force-pushed the add/checklist-to-my-plan-page branch from 488799d to 5619fb6 Compare July 8, 2018 13:03

return (
<FormattedHeader
headerText={ translate( 'Welcome back!' ) }
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi! I've found a possible matching string that has already been translated 24 times:
translate( 'Welcome Back :)' ) ES Score: 15
See 1 additional suggestion in the PR translation status page

Help me improve these suggestions: react with 👎 if the suggestion doesn't make any sense, or with 👍 if it's a particularly good one (even if not implemented).

const { translate } = this.props;

if ( displayMode === 'free' ) {
return translate( 'Your site has been created!' );
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi! I've found a possible matching string that has already been translated 2 times:
translate( 'Your new site has been created!' ) ES Score: 10

Help me improve these suggestions: react with 👎 if the suggestion doesn't make any sense, or with 👍 if it's a particularly good one (even if not implemented).

@ockham ockham force-pushed the add/checklist-to-my-plan-page branch from 5619fb6 to 32dc24d Compare July 9, 2018 08:19
@sirreal
Copy link
Member

sirreal commented Jul 10, 2018

The checklist was showing for Atomic sites, I've just pushed a change to hide it for those sites.

@sirreal
Copy link
Member

sirreal commented Jul 10, 2018

A note on this flow:

  1. Connect a new Jetpack site via /jetpack/connect
  2. End of the flow is /plans/my-plan/:SITE_SLUG
  3. Guided tour starts
  4. End of guided tour is not the my-plan page.

Step 2 lands on the plans page. Presumably the intention is to incite users to investigate plans offerings.

By step 4 they've been whisked away through a series of steps. Now they don't see plans or the checklist added by this PR.

cc: @joanrho

Copy link
Member

@sirreal sirreal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few notes about functionality, likely none are introduced by this PR

  1. My first checklist item is for Jetpack Monitor. I click the task, enable the setting and return. I believe the settings API request hasn't completed and the checklist item remains unchecked. If I click again and return to the checklist, it is.
  2. Is "Automatic Plugin Updates" enabled? When I click that item, no help appears.
  3. The end of the checklist steps returns to /checklist/:SITE_SLUG rather than /plans/my-plan/:SITE_SLUG. It would be nice to "return" to where you started from.

Feature flag works well 👍

@sirreal sirreal added [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. and removed [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. labels Jul 10, 2018
Copy link
Member

@sirreal sirreal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the notes I mentioned aren't related to this PR, should be good to 🚢

@ockham
Copy link
Contributor Author

ockham commented Jul 10, 2018

  1. My first checklist item is for Jetpack Monitor. I click the task, enable the setting and return. I believe the settings API request hasn't completed and the checklist item remains unchecked. If I click again and return to the checklist, it is.

Yeah, I was thinking of adding some Redux logic to reflect that change right after it's been made (or maybe even show a loading spinner while the network request hasn't returned yet, see #25935).

  1. Is "Automatic Plugin Updates" enabled? When I click that item, no help appears.

The corresponding Guided Tour hasn't been merged yet (#25474).

  1. The end of the checklist steps returns to /checklist/:SITE_SLUG rather than /plans/my-plan/:SITE_SLUG. It would be nice to "return" to where you started from.

Ah yup, I forgot to add a note about that, sorry. Guided Tours right now hard-code where they finish, and right now, that points to /checklist/:site (where we had enabled the checklist earlier for testing, to align with WP.com checklists). We need to fix that by pointing to the 'My Plan' page instead (and probably add a redirect from /checklist/:site to that page for JP sites).

Thanks for reviewing! Going to merge & file cards/issues so we don't forget about items 1 and 3.

@ockham ockham merged commit 321b938 into master Jul 10, 2018
@ockham ockham deleted the add/checklist-to-my-plan-page branch July 10, 2018 09:20
@matticbot matticbot removed the [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. label Jul 10, 2018
@joanrho
Copy link
Contributor

joanrho commented Jul 10, 2018

@ockham Don't we end all Guided Tours with Notices that link to "Go back to checklist"?

@ockham
Copy link
Contributor Author

ockham commented Jul 11, 2018

@ockham Don't we end all Guided Tours with Notices that link to "Go back to checklist"?

Uh yeah -- I thought I'd just change the Jetpack specific ones to point to /plans/my-plan/:SITE_SLUG instead of /checklist/:SITE_SLUG. Think that's okay? Or am I missing something?

@joanrho
Copy link
Contributor

joanrho commented Jul 11, 2018

@ockham ah yes, that's exactly what we want to do, since /checklist doesn't have a home yet. Just confirming all GTs end in notices with the link back to My Plan page (our checklist).

@ockham
Copy link
Contributor Author

ockham commented Jul 12, 2018

Cool! FWIW, I've filed a card on the project board for this, https://github.com/Automattic/wp-calypso/projects/70#card-11207580

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Checklist [Feature] Plans & Upgrades All of the plans on WordPress.com and flow for upgrading plans. Jetpack
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants