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.

Sign up for GitHub

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

Jump to bottom

Load Odyssey Stats for simple sites #36628

Merged
merged 7 commits into from
Apr 1, 2024
Merged

Load Odyssey Stats for simple sites #36628

merged 7 commits into from
Apr 1, 2024

Conversation

candy02058912
Copy link
Contributor

@candy02058912 candy02058912 commented Mar 28, 2024 •
edited
Loading

Fixes https://github.com/Automattic/dotcom-forge/issues/6213

Warning

Automattic/wp-calypso#88788 and #36633 needs to be merged first.

Proposed changes:

  • Load Odyssey Stats for WP.com Simple Site Classic view

Other information:

  • Have you written new tests for your changes, if applicable?
  • Have you checked the E2E test CI results, and verified that your changes do not break them?
  • Have you tested your changes on WordPress.com, if applicable (if so, you'll see a generated comment below with a script to run)?

Jetpack product discussion

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

Testing instructions:

See testing instructions in Automattic/wp-calypso#88788

@candy02058912 candy02058912 added the DO NOT MERGE don't merge it! label Mar 28, 2024
@candy02058912 candy02058912 requested review from a team March 28, 2024 07:41
@candy02058912 candy02058912 self-assigned this Mar 28, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Mar 28, 2024 •
edited
Loading

Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.

  • To test on WoA, go to the Plugins menu on a WordPress.com Simple site. Click on the "Upload" button and follow the upgrade flow to be able to upload, install, and activate the Jetpack Beta plugin. Once the plugin is active, go to Jetpack > Jetpack Beta, select your plugin, and enable the add/wpcom-simple-odyssey-stats branch.

    • For jetpack-mu-wpcom changes, also add define( 'JETPACK_MU_WPCOM_LOAD_VIA_BETA_PLUGIN', true ); to your wp-config.php file.

  • To test on Simple, run the following command on your sandbox:

    bin/jetpack-downloader test jetpack-mu-wpcom-plugin add/wpcom-simple-odyssey-stats

Interested in more tips and information?

  • In your local development environment, use the jetpack rsync command to sync your changes to a WoA dev blog.
  • Read more about our development workflow here: PCYsg-eg0-p2
  • Figure out when your changes will be shipped to customers here: PCYsg-eg5-p2

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Mar 28, 2024 •
edited
Loading

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.
  • ✅ 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 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 reviewed, it can then be merged.
If you need an extra review from someone familiar with the codebase, you can update the labels from "[Status] Needs Team Review" to "[Status] Needs Review", and in that case Jetpack Approvers will do a final review of your PR.

Mu Wpcom plugin:

  • Next scheduled release: May 7, 2024.
  • Scheduled code freeze: April 29, 2024.

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

@candy02058912 candy02058912 mentioned this pull request Mar 28, 2024
Merged
7 tasks
@candy02058912 candy02058912 marked this pull request as ready for review March 28, 2024 11:19
@github-actions github-actions bot added the [Plugin] mu wpcom jetpack-mu-wpcom plugin label Mar 28, 2024
taipeicoder
taipeicoder reviewed Apr 1, 2024
View reviewed changes
projects/packages/jetpack-mu-wpcom/.phan/config.php
return make_phan_config( dirname( __DIR__ ) );
$root = dirname( __DIR__, 4 );

return make_phan_config(
Copy link
Contributor

Choose a reason for hiding this comment

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

@candy02058912 curious to what's this for?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's the new static analyzer tool we're using pdWQjU-Jb-p2

taipeicoder
taipeicoder approved these changes Apr 1, 2024
View reviewed changes
Copy link
Contributor

@taipeicoder taipeicoder left a comment

Choose a reason for hiding this comment

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

Works as intended 👍
There are a couple of issues that we can address in later PRs:

The "Get Yoast" button does nothing when clicked. We can probably hide it?
Screenshot 2024-04-01 at 12 03 21 PM

The "Import existing subscribers" lands in an error page. I remember it was supposed to open a modal.
Screenshot 2024-04-01 at 12 02 32 PM

@candy02058912
Copy link
Contributor Author

The "Get Yoast" button does nothing when clicked. We can probably hide it?

Issue to track this: https://github.com/Automattic/dotcom-forge/issues/6355

@candy02058912
Copy link
Contributor Author

The "Import existing subscribers" lands in an error page. I remember it was supposed to open a modal.

Tracking this here: https://github.com/Automattic/dotcom-forge/issues/6358

@candy02058912 candy02058912 merged commit f8c3448 into trunk Apr 1, 2024
54 of 55 checks passed
@candy02058912 candy02058912 deleted the add/wpcom-simple-odyssey-stats branch April 1, 2024 09:06
@fushar
Copy link
Contributor

fushar commented Apr 2, 2024

Sorry for the late review.

Are these unextrapolated time fields expected for this PR / iteration? @candy02058912 @taipeicoder

image

@taipeicoder
Copy link
Contributor

Sorry for the late review.

Are these unextrapolated time fields expected for this PR / iteration? @candy02058912 @taipeicoder

image

Yes! There's a follow-up issue https://github.com/Automattic/dotcom-forge/issues/6334.

@kangzj
Copy link
Contributor

kangzj commented Apr 2, 2024

Love it. Thanks for working on this 👍

@candy02058912 candy02058912 removed the DO NOT MERGE don't merge it! label Apr 3, 2024
TimBroddin pushed a commit that referenced this pull request Apr 10, 2024
@candy02058912 @DustyReagan @TimBroddin
Load Odyssey Stats for simple sites (#36628)
d09cee5 
* Load Odyssey Stats for simple sites

* Changelog

* Fix file name to wpcom-simple-odyssey-stats.php

* Make Phan happy

* Run tools/fixup-project-versions.sh to make linter happy

* Add wpcom_is_nav_redesign_enabled check

---------

Co-authored-by: DustyReagan <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DustyReagan DustyReagan DustyReagan left review comments

@taipeicoder taipeicoder taipeicoder approved these changes

Assignees

@candy02058912 candy02058912

Labels
[mu wpcom Feature] Wpcom Simple Odyssey Stats [Package] Jetpack mu wpcom WordPress.com Features [Plugin] mu wpcom jetpack-mu-wpcom plugin
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@candy02058912 @fushar @taipeicoder @kangzj @DustyReagan