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

External media: Show connection upgrade screen in transition from Photos to Picker #40416

Merged
merged 12 commits into from
Dec 5, 2024

Conversation

bogiii
Copy link
Contributor

@bogiii bogiii commented Dec 2, 2024

Proposed changes:

  • Created GooglePhotosAuthUpgrade component
  • Catch the error when a connection is not valid and show the upgrade screen
  • Adjust the GooglePhotosAuth style, reducing the margin around the paragraphs

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

pdtkmj-36s-p2#comment-5923

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

Testing instructions:

  • Make sure that your Google Photos connection is established
  • Turn ON google-photos-picker feature
  • Go to post/page editor and choose image block
  • Select Google Photos
  • Check if you see a connection Upgrade screen
Screenshot 2024-12-03 at 18 15 06
Before After
Screenshot 2024-12-03 at 18 14 15 Screenshot 2024-12-03 at 18 13 04

@bogiii bogiii requested a review from ouikhuan December 2, 2024 18:09
@bogiii bogiii self-assigned this Dec 2, 2024
@bogiii bogiii marked this pull request as ready for review December 2, 2024 18:10
Copy link
Contributor

github-actions bot commented Dec 2, 2024

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 update/external-media-google-photos-picker-4 branch.

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

    bin/jetpack-downloader test jetpack update/external-media-google-photos-picker-4
    

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 bot added [Extension] External Media Extend all block editor media tools to support external providers [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Status] In Progress labels Dec 2, 2024
Copy link
Contributor

github-actions bot commented Dec 2, 2024

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 a "[Type]" label (Bug, Enhancement, Janitorial, Task).
  • ✅ 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.


Follow this PR Review Process:

  1. Ensure all required checks appearing at the bottom of this PR are passing.
  2. Choose a review path based on your changes:
    • A. Team Review: add the "[Status] Needs Team Review" label
      • For most changes, including minor cross-team impacts.
      • Example: Updating a team-specific component or a small change to a shared library.
    • B. Crew Review: add the "[Status] Needs Review" label
      • For significant changes to core functionality.
      • Example: Major updates to a shared library or complex features.
    • C. Both: Start with Team, then request Crew
      • For complex changes or when you need extra confidence.
      • Example: Refactor affecting multiple systems.
  3. Get at least one approval before merging.

Still unsure? Reach out in #jetpack-developers for guidance!


Jetpack plugin:

The Jetpack plugin has different release cadences depending on the platform:

  • WordPress.com Simple releases happen semi-continuously (PCYsg-Jjm-p2).
  • WoA releases happen weekly.
  • Releases to self-hosted sites happen monthly. The next release is scheduled for January 7, 2025 (scheduled code freeze on undefined).

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

@bogiii bogiii force-pushed the update/external-media-google-photos-picker-4 branch from ba0e88f to 9881046 Compare December 3, 2024 13:19
@bogiii bogiii force-pushed the update/external-media-google-photos-picker-4 branch from 9881046 to 3f382a9 Compare December 3, 2024 15:17
@bogiii
Copy link
Contributor Author

bogiii commented Dec 3, 2024

The PR has been updated to handle recent changes when the endpoint is unavailable and returns status 404.

It is ready for review: @ouikhuan

Copy link
Contributor

@ouikhuan ouikhuan left a comment

Choose a reason for hiding this comment

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

In my latest test, it looks like the COOKIE won't be stored anymore, but if I understand correctly the PR has been rebased and your previous changes should be included, right?

@bogiii bogiii requested a review from ouikhuan December 4, 2024 11:20
Copy link
Contributor

@ouikhuan ouikhuan left a comment

Choose a reason for hiding this comment

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

Tested the following scenario and everything works as expected:

  • Old connection, with new picker feature on
  • Old connection, with picker feature flag off
  • New connection with picker feature flag on
  • New connection, with picker feature flag off

Great work!

@bogiii bogiii merged commit c5d6a4b into trunk Dec 5, 2024
59 checks passed
@bogiii bogiii deleted the update/external-media-google-photos-picker-4 branch December 5, 2024 10:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Extension] External Media Extend all block editor media tools to support external providers [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants