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

Jetpack Plans: introduce new package #23503

Merged
merged 14 commits into from
Apr 1, 2022
Merged

Jetpack Plans: introduce new package #23503

merged 14 commits into from
Apr 1, 2022

Conversation

mkm119
Copy link
Contributor

@mkm119 mkm119 commented Mar 18, 2022

This PR creates a new package with functionality to fetch Plans data from WPCOM. We have restored an existing branch and rebased it. Old PR link - #22650

For now, it copies the classes from the Jetpack plugin. Usage in the Jetpack plugin will be replaced in subsequent PRs as this must be synced with changes in WPCOM as well.

We need this to move the work on the standalone Publicize plugin.

Changes proposed in this Pull Request:

  • Create new Plans package

Jetpack product discussion

#23488 (comment)
p1647598368441399/1647597121.990859-slack-CBG1CP4EN

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

No

Testing instructions:

  • Nothing for now, the package is not used
  • Let's see if the tests pass

@matticbot
Copy link
Contributor

Caution: This PR has changes that must be merged to WordPress.com
Hello mkm119! These changes need to be synced to WordPress.com - If you 're an a11n, please commandeer and confirm D77046-code works as expected before merging this PR. Once this PR is merged, please commit the changes to WP.com. Thank you!
This revision will be updated with each commit to this PR

@mkm119 mkm119 requested a review from jeherve March 18, 2022 11:36
@github-actions github-actions bot added the [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ label Mar 18, 2022
@mkm119 mkm119 requested a review from danielpost March 18, 2022 11:37
@github-actions
Copy link
Contributor

github-actions bot commented Mar 18, 2022

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.

Copy link
Member

@jeherve jeherve left a comment

Choose a reason for hiding this comment

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

You'd want to bring in the changes from recent PRs, like #23189

@jeherve jeherve 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 Team Review labels Mar 18, 2022
@mkm119 mkm119 added [Status] Needs Team Review 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 Mar 21, 2022
@mkm119 mkm119 requested review from pablinos and a team April 1, 2022 07:24
Copy link
Contributor

@pablinos pablinos left a comment

Choose a reason for hiding this comment

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

There's something up with the changelog in the Jetpack plugin, and I'm not sure we're making changes to Jetpack the plugin. Do you think we should start using this in the same PR so there's not duplicate code? Git would be able to see that this is a code move too, and keep the history of the file.

@mkm119
Copy link
Contributor Author

mkm119 commented Apr 1, 2022

There's something up with the changelog in the Jetpack plugin, and I'm not sure we're making changes to Jetpack the plugin. Do you think we should start using this in the same PR so there's not duplicate code? Git would be able to see that this is a code move too, and keep the history of the file.

Are you suggesting removing the files from Jetpack plugin folder and updating the references in this PR itself? @pablinos

@pablinos
Copy link
Contributor

pablinos commented Apr 1, 2022

Are you suggesting removing the files from Jetpack plugin folder and updating the references in this PR itself?

Yes, that's right. I suppose it depends on how much bigger it makes the PR, but I think moving the files would probably be preferrable to copying and then deleting in a separate PR. @jeherve might have some thoughts on that.

@jeherve
Copy link
Member

jeherve commented Apr 1, 2022

I'm happy with both, personally; we can split this into 2 PRs if you'd like, but if we do it may help if you have some comments here on GitHub to highlight where you've diverted from the original files in Jetpack; that should make reviewing easier, by helping the reviewer quickly spot the changes you've made on top of copying the files.

@mkm119
Copy link
Contributor Author

mkm119 commented Apr 1, 2022

I think it might be better to split it into two PRs as we need to make reference changes across some 30 files which will increase the PR size. For this one, we should just focus on publishing the package first.

@pablinos
Copy link
Contributor

pablinos commented Apr 1, 2022

I think it might be better to split it into two PRs

Fair enough, we probably don't need the Jetpack plugin changelog then.

you've diverted from the original files in Jetpack

Have we diverted from the original files or is this just a copy and paste? If we end up with two divergent copies of the code, then we'll want to follow up with updating references in the Jetpack plugin as quickly as possible.

jeherve
jeherve previously approved these changes Apr 1, 2022
@jeherve jeherve added [Type] Feature Request [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Status] Ready to Merge Go ahead, you can push that green button! and removed [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Status] Needs Team Review labels Apr 1, 2022
@jeherve jeherve enabled auto-merge (squash) April 1, 2022 11:16
@jeherve jeherve dismissed pablinos’s stale review April 1, 2022 11:16

This should be good to go now.

@jeherve jeherve changed the title Extract/jetpack plans Jetpack Plans: introduce new package Apr 1, 2022
@jeherve jeherve merged commit fefa6e5 into master Apr 1, 2022
@jeherve jeherve deleted the extract/jetpack-plans branch April 1, 2022 13:24
@github-actions
Copy link
Contributor

github-actions bot commented Apr 1, 2022

Great news! One last step: head over to your WordPress.com diff, D77046-code, and deploy it.
Once you've done so, come back to this PR and add a comment with your changeset ID.

Thank you!

@github-actions github-actions bot removed the [Status] Ready to Merge Go ahead, you can push that green button! label Apr 1, 2022
@jeherve
Copy link
Member

jeherve commented Apr 1, 2022

r242972-wpcom

@mkm119 mkm119 mentioned this pull request Apr 5, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants