Stats: make nudges collapsible #20765

kbrown9 · 2021-08-19T15:37:40Z

Changes proposed in this Pull Request:

Add the ability to collapse the nudges UI.

Jetpack product discussion

pbNhbs-189-p2#comment-3564

Does this pull request change what data or activity we track or use?

no

Testing instructions:

Install this branch of Jetpack. Activate Jetpack and connect (a site or user connection is fine).
In wp-admin, navigate to Jetpack -> Site Stats.
- If the stats chart isn't available yet, the collapse toggle isn't displayed.
- If the stats chart is available, the collapse toggle is displayed.
The Nudges UI should be expanded by default.
Collapse the nudges UI by clicking on the triangle icon.
Reload the page to verify that the collapsed state persists.
Expand the nudges UI by clicking on the triangle icon.
Reload the page to verify that the expanded state persists.

Update Jetpack

If Jetpack is updated, the nudges collapse state will be reset.

In wp-admin, navigate to Jetpack -> Site Stats. Collapse the nudges.
Increase the Jetpack version in the jetpack.php file here.
In wp-admin, navigate to Jetpack -> Site Stats. Verify that the nudges are expanded.

Screenshots

Expanded

Collapsed

github-actions · 2021-08-19T15:40:56Z

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

✅ Include a description of your PR changes.
✅ All commits were linted before commit.
✅ Add a "[Status]" label (In Progress, Needs Team Review, ...).
✅ Add testing instructions.
✅ Specify whether this PR includes any changes to data or privacy.
✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖

The e2e test report can be found here. Please note that it can take a few minutes after the e2e tests checks are complete for the report to be available.

Once your PR is ready for review, check one last time that all required checks (other than "Required review") appearing at the bottom of this PR are passing or skipped.
Then, add the "[Status] Needs Team review" label and ask someone from your team review the code.
Once you’ve done so, switch to the "[Status] Needs Review" label; someone from Jetpack Crew will then review this PR and merge it to be included in the next Jetpack release.

Jetpack plugin:

Next scheduled release: September 7, 2021.
Scheduled code freeze: August 30, 2021.

…_collapse

…yet. * Remove the collapse_nudges setting when Jetpack is updated.

…_collapse

projects/plugins/jetpack/modules/stats.php

jeherve · 2021-08-26T10:45:05Z

projects/plugins/jetpack/_inc/lib/class.core-rest-api-endpoints.php

@@ -2670,6 +2670,13 @@ public static function get_updateable_data_list( $selector = '' ) {
 				'validate_callback' => __CLASS__ . '::validate_posint',
 				'jp_group'          => 'stats',
 			),
+			'collapse_nudges'                      => array(
+				'description'       => esc_html__( 'Collapse upsell nudges', 'jetpack' ),


I'd suggest using "upgrade" instead of "upsell" everywhere, to remain consistent.

Suggested change

'description' => esc_html__( 'Collapse upsell nudges', 'jetpack' ),

'description' => esc_html__( 'Collapse upgrade nudges', 'jetpack' ),

Good suggestion - fixed in c9d0b67.

projects/plugins/jetpack/modules/stats/class-jetpack-stats-upgrade-nudges.php

leogermani · 2021-08-26T12:40:57Z

projects/plugins/jetpack/class.jetpack.php

@@ -3390,6 +3390,13 @@ public static function do_version_bump( $version, $old_version ) {

 			// If an admin page is visited after the update, the 'current_screen' action will fire.
 			add_action( 'current_screen', 'Jetpack::set_update_modal_display' );
+
+			// Expand stats page nudges.


What do you think about hooking into updating_jetpack_version action and keeping all the logic in the Nudges class, instead of adding this code here?

I think it's much better to keep this logic in the Nudges class as you suggested. I made that change in commit c9d0b67.

I had to set up the updating_jetpack_version hook in the stats_load method, because the Nudges initialization happens too late.

* Make text consistent: upsell -> upgrade. * Move version update hook to the stats module files.

…_collapse

leogermani

Tests well for me with the latest changes

…_collapse

* master: (34 commits) Fix issue templates (#20880) Social Icon Widget: Fix Icons Not Saving (#20862) Dashboard: Add a specific message for a site that is too new to have a rewind status (#20863) Add additional properties to WC Analytics events (#20812) Connection: add spinner for the "Connect" button (#20872) Update storybook monorepo to v6.3.7 (#20877) Lightweight PHPCS (#20876) Recommendations: Add Jetpack Product Suggestions step (#20814) Update babel monorepo (#20875) Update wordpress monorepo (#20873) cli: Check subprocess exit statuses in docker commands (#20861) Facebook Widget: Fix URL error when adding widget (#20864) Stats: make nudges collapsible (#20765) Remove temporary Newspack block override css (#20868) Allow ZIP uploads via Calypso (#20860) Sync Package Release v1.26.0 (#20870) Connection: remove in-place in secondary flows (#20739) BUILD_DIR -> BUILD_BASE in initial checks (#20857) E2E tests: Fix missing action for atomic workflow (#20866) Boost: Fix skip proxy origins to load css during critical CSS generation (#20793) ...

Stats: make nudges collapsible

f23a6c7

kbrown9 added [Type] Enhancement Changes to an existing feature — removing, adding, or changing parts of it [Feature] Stats Data Feature that enables users to track their site's traffic and gain insights on popular content. [Status] In Progress labels Aug 19, 2021

kbrown9 self-assigned this Aug 19, 2021

github-actions bot added the [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ label Aug 19, 2021

kbrown9 added 3 commits August 23, 2021 10:13

Adjust styles.

6c9586b

Merge remote-tracking branch 'origin/master' into update/stats_upsell…

4b22fb6

…_collapse

* Don't show the collapse toggle if the stats chart isn't available …

ae3deb9

…yet. * Remove the collapse_nudges setting when Jetpack is updated.

kbrown9 added this to the jetpack/10.1 milestone Aug 25, 2021

Merge remote-tracking branch 'origin/master' into update/stats_upsell…

ab0cce4

…_collapse

kbrown9 added the [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. label Aug 25, 2021

kbrown9 requested a review from leogermani August 25, 2021 20:57

jeherve reviewed Aug 26, 2021

View reviewed changes

jeherve removed the [Status] In Progress label Aug 26, 2021

leogermani reviewed Aug 26, 2021

View reviewed changes

kbrown9 added [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! and removed [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. labels Aug 26, 2021

kbrown9 added 2 commits August 26, 2021 14:38

Respond to review comments:

c9d0b67

* Make text consistent: upsell -> upgrade. * Move version update hook to the stats module files.

Merge remote-tracking branch 'origin/master' into update/stats_upsell…

4776091

…_collapse

kbrown9 added [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. and removed [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! labels Aug 27, 2021

leogermani approved these changes Aug 30, 2021

View reviewed changes

leogermani added [Status] Ready to Merge Go ahead, you can push that green button! and removed [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. labels Aug 30, 2021

Merge remote-tracking branch 'origin/master' into update/stats_upsell…

0ba0c60

…_collapse

sdixon194 enabled auto-merge (squash) August 30, 2021 14:45

sdixon194 merged commit cea0d3e into master Aug 30, 2021

sdixon194 deleted the update/stats_upsell_collapse branch August 30, 2021 14:56

github-actions bot removed the [Status] Ready to Merge Go ahead, you can push that green button! label Aug 30, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Stats: make nudges collapsible #20765

Stats: make nudges collapsible #20765

kbrown9 commented Aug 19, 2021 •

edited

Loading

github-actions bot commented Aug 19, 2021 •

edited

Loading

jeherve Aug 26, 2021 •

edited

Loading

kbrown9 Aug 26, 2021

leogermani Aug 26, 2021

kbrown9 Aug 26, 2021

leogermani left a comment

	'description' => esc_html__( 'Collapse upsell nudges', 'jetpack' ),
	'description' => esc_html__( 'Collapse upgrade nudges', 'jetpack' ),

Stats: make nudges collapsible #20765

Stats: make nudges collapsible #20765

Conversation

kbrown9 commented Aug 19, 2021 • edited Loading

Changes proposed in this Pull Request:

Jetpack product discussion

Does this pull request change what data or activity we track or use?

Testing instructions:

Update Jetpack

Screenshots

Expanded

Collapsed

github-actions bot commented Aug 19, 2021 • edited Loading

jeherve Aug 26, 2021 • edited Loading

Choose a reason for hiding this comment

kbrown9 Aug 26, 2021

Choose a reason for hiding this comment

leogermani Aug 26, 2021

Choose a reason for hiding this comment

kbrown9 Aug 26, 2021

Choose a reason for hiding this comment

leogermani left a comment

Choose a reason for hiding this comment

kbrown9 commented Aug 19, 2021 •

edited

Loading

github-actions bot commented Aug 19, 2021 •

edited

Loading

jeherve Aug 26, 2021 •

edited

Loading