Dashboard: add My Plan page by keoshi · Pull Request #10556 · Automattic/jetpack

keoshi · 2018-11-07T13:24:22Z

Changes proposed in this Pull Request:

Adds a new My Plan page that solely focuses on the features for the current plan.
Adds a new option in the main navigation so people can open this new view.
Cleans up styles.
Adds tests for this change.
Bonus: fix track event name for Plans.

Could be a fix for #10381

Help!: I can't get the Dashboard option on the split button to remain selected when jumping into this new section, even though I added the new URL param to the window.wpNavMenuClassChange function.

Testing instructions:

Fire up this PR!
Go to your Jetpack dashboard.
Select My Plan.
Ensure the content is correctly split up between that section and Plans.

Proposed changelog entry for your changes:

Add My Plan page to the dashboard

jetpackbot · 2018-11-07T13:25:43Z

Thank you for the great PR description!

When this PR is ready for review, please apply the [Status] Needs Review label. If you are an a11n, please have someone from your team review the code if possible. The Jetpack team will also review this PR and merge it to be included in the next Jetpack release.

Scheduled Jetpack release: January 10, 2019.
Scheduled code freeze: January 3, 2019

Generated by 🚫 dangerJS

rickybanister · 2018-11-07T14:31:35Z

Nice!

If we merge this we'll also have to update referrer links from wpcom to go to this tab instead of the old plans tab.

What shows if you don't have a paid plan? Is the tab still there?

keoshi · 2018-11-07T14:35:30Z

If we merge this we'll also have to update referrer links from wpcom to go to this tab instead of the old plans tab.

Yes!

What shows if you don't have a paid plan? Is the tab still there?

No logic was applied to the tab, so the same content that already existed will be visible (promo for paid plans):

rickybanister · 2018-11-07T15:03:03Z

Great!

jeherve · 2018-11-26T15:23:45Z

Help!: I can't get the Dashboard option on the split button to remain selected when jumping into this new section, even though I added the new URL param to the window.wpNavMenuClassChange function.

I took care of that for you in 4ba94b0

jeherve

This worked well overall. 👍

I noticed that when in Dev mode, we show the Activity Log card. That seems like a mistake:

That is, however, not a problem introduced in this PR. It exists with the current stable as well.

When we ship this, we'll most likely need to update the upgrade flows in Calypso as well, so you land on my-plan when you click on "Back to my site" after purchasing a plan in Calypso.

joanrho · 2018-11-30T17:18:53Z

@keoshi just to clarify—this PR takes all the "Current plan" content that currently lives within the Jetpack Dashboard > Plans tab and moves it out into its own new "My Plan" section? And then the plans grid/support card/mobile apps card would be the only things left in that "Plans" tab?

keoshi · 2018-11-30T17:20:04Z

Yeah, exactly @joanrho. It pretty much mirrors the IA we have in Calypso.

joanrho · 2018-11-30T17:52:02Z

@keoshi excellent! Just tested and works great.

This is a great stepping stone to updating all of the Jetpack Dashboard-side UI that needs to be updated to match the new work Luna and I have done in Calypso > My Plan.

Let's ship this first and then plan to update the card layouts/add illos/update feature descriptions next.

oskosk · 2018-12-03T15:06:48Z

_inc/client/components/navigation/index.jsx

+
 	trackPlansClick = () => {
-		this.trackNavClick( 'dashboard' );
+		this.trackNavClick( 'plans' );


This event name change may be of interest to @Automattic/luna

True, very valid point. cc @johnHackworth so you're aware:

Before, both links had a path param that was dashboard.

This introduces differentiation in tracking between all three tabs:

“At a Glance” is dashboard

“My Plan” is my-plan (new tab)

“Plans” is plans

oskosk

Tested an works great!

* Add first version of the Changelog and testing list for 6.9 * Changelog: add #10710 * changelog: add #10538 * changelog: add #10741 * changelog: add #10749 * changelog: add #10664 * changelog: add #10224 * changelog: add #10788 * Changelog: add #10560 * Chanegelog: add #10812 * changelog: add #10556 * Changelog: add #10668 * Changelog: add #10846 * Changelog: add #10947 * Changelog: add #10962 * Changelog: add #10956 * Changelog: add #10940 * Changelog: add #10934 * Changelog: add #10912 * changelog: add #10866 * changelog: add #10924 * Changelog: add #10936 * Changelog: add #10833 * changelog: add #10867 * Changelog: add #10960 * Changelog: add #10888 * changelog: add #10840 * changelog: add #10972 * Changelog: add #10979 * changelog: add #10909 * Changelog: add #10958 * Changelog: add #10981 * Changelog: add #10564 * Changelog: add #10809 * Changelog: add #10982 * Changelog: add #10706 * Changelog: add #10978 * Changelog: add #10132 * Changelog: add #11022 * Changelog: add #11024 * Changelog: add #10875 * Changelog: add #11030 * Changelog: add #11053 * Changelog: add #10880 * Changelog: add #9359 * Changelog: add #11037 * Update block list * Changelog: add #11060 * Changelog: add #10755 * changelog: add #11000 * Changelog: add #10786 * Changelog: add #10945 * Changelog: add #10597

keoshi added 10 commits November 7, 2018 13:07

Add my-plan component

4f8f0f2

Remove unused references from Plans page

1e882e4

Move and rename my plan header and my plan body components

6b18fd8

Clean up repeated styles

10e062c

Include my plan styles

154d2da

Add my plan route

901167f

Add my plan component and references to main file

34f450b

Add my plan navigation item

b647c60

Bonus: fix track event name for Plans

277ef29

Update tests to include My Plan

88f61bb

keoshi self-assigned this Nov 7, 2018

keoshi requested review from a team and rickybanister November 7, 2018 13:24

keoshi mentioned this pull request Nov 7, 2018

Post-purchase: Put plan features above plans grid #10381

Closed

keoshi added Plans [Status] Needs Review This PR is ready for review. and removed [Status] Needs Copy Review Copy has been added. Marketing will be notified for a copy review. labels Nov 7, 2018

keoshi added 3 commits November 7, 2018 13:32

Fix missing variable in Plans page

00980eb

Fix option name in test

2053d45

Fix navigation item number

5c49185

jeherve mentioned this pull request Nov 9, 2018

Improve Jetpack plans page in wp-admin #10582

Closed

Dash nav: keep the Dashboard tab highlighted when on My Plan page

4ba94b0

keoshi requested a review from joanrho November 26, 2018 15:15

jeherve removed the [Status] Needs Review This PR is ready for review. label Nov 26, 2018

jeherve approved these changes Nov 26, 2018

View reviewed changes

keoshi mentioned this pull request Nov 30, 2018

Thank you card: improve Jetpack set up experience Automattic/wp-calypso#28911

Merged

joanrho approved these changes Nov 30, 2018

View reviewed changes

keoshi added [Status] Ready to Merge Go ahead, you can push that green button! and removed [Status] Needs Design Review Design has been added. Needs a review! labels Nov 30, 2018

oskosk reviewed Dec 3, 2018

View reviewed changes

oskosk approved these changes Dec 3, 2018

View reviewed changes

keoshi merged commit 314fdaa into master Dec 5, 2018

matticbot added the [Status] Needs Changelog label Dec 5, 2018

ghost removed the [Status] Ready to Merge Go ahead, you can push that green button! label Dec 5, 2018

keoshi deleted the add/my-plan-page branch December 5, 2018 14:27

jeherve added [Status] Has Changelog and removed [Status] Needs Changelog labels Dec 7, 2018

jeherve added a commit that referenced this pull request Dec 19, 2018

changelog: add #10556

8e1e5ad

jeherve added a commit that referenced this pull request Jan 3, 2019

changelog: add #10556

fca224f

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Dashboard: add My Plan page#10556

Dashboard: add My Plan page#10556
keoshi merged 14 commits intomasterfrom
add/my-plan-page

keoshi commented Nov 7, 2018

Uh oh!

jetpackbot commented Nov 7, 2018 •

edited

Loading

Uh oh!

rickybanister commented Nov 7, 2018

Uh oh!

keoshi commented Nov 7, 2018

Uh oh!

rickybanister commented Nov 7, 2018

Uh oh!

jeherve commented Nov 26, 2018

Uh oh!

jeherve left a comment

Uh oh!

joanrho commented Nov 30, 2018 •

edited

Loading

Uh oh!

keoshi commented Nov 30, 2018

Uh oh!

joanrho commented Nov 30, 2018

Uh oh!

oskosk Dec 3, 2018

Uh oh!

keoshi Dec 3, 2018 •

edited

Loading

Uh oh!

oskosk left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Conversation

keoshi commented Nov 7, 2018

Changes proposed in this Pull Request:

Testing instructions:

Proposed changelog entry for your changes:

Uh oh!

jetpackbot commented Nov 7, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rickybanister commented Nov 7, 2018

Uh oh!

keoshi commented Nov 7, 2018

Uh oh!

rickybanister commented Nov 7, 2018

Uh oh!

jeherve commented Nov 26, 2018

Uh oh!

jeherve left a comment

Choose a reason for hiding this comment

Uh oh!

joanrho commented Nov 30, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

keoshi commented Nov 30, 2018

Uh oh!

joanrho commented Nov 30, 2018

Uh oh!

oskosk Dec 3, 2018

Choose a reason for hiding this comment

Uh oh!

keoshi Dec 3, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

oskosk left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

jetpackbot commented Nov 7, 2018 •

edited

Loading

joanrho commented Nov 30, 2018 •

edited

Loading

keoshi Dec 3, 2018 •

edited

Loading