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

Boost: Fix Image CDN quality controls UI showing for the free version #35538

Merged
merged 4 commits into from
Feb 12, 2024
Merged

Boost: Fix Image CDN quality controls UI showing for the free version #35538

merged 4 commits into from
Feb 12, 2024

Conversation

dilirity
Copy link
Member

@dilirity dilirity commented Feb 8, 2024 •
edited
Loading

Proposed changes:

  • Fix showing quality control settings instead of upgrade CTA for the free version.

    Before

    CleanShot 2024-02-08 at 14 28 20

    After

    CleanShot 2024-02-08 at 14 28 53

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

n/a

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

no

Testing instructions:

  • Setup Boost (free);
  • Make sure the upgrade CTA is showing instead of the quality controls UI.

@dilirity dilirity added Admin Page React-powered dashboard under the Jetpack menu [Status] Needs Team Review [Plugin] Boost A feature to speed up the site and improve performance. [Feature] Image CDN labels Feb 8, 2024
@dilirity dilirity requested a review from a team February 8, 2024 12:30
@dilirity dilirity self-assigned this Feb 8, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 8, 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 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.

Boost plugin:

  • Next scheduled release: March 5, 2024.
  • Scheduled code freeze: February 26, 2024.

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

thingalon
thingalon requested changes Feb 9, 2024
View reviewed changes
projects/plugins/boost/app/assets/src/js/pages/index/index.tsx Outdated
@@ -30,7 +30,7 @@ const Index = () => {
const { canResizeImages } = Jetpack_Boost;

const premiumFeatures = usePremiumFeatures();
const isPremium = premiumFeatures !== false;
const isPremium = premiumFeatures.length > 0;
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
const isPremium = premiumFeatures.length > 0;
const isPremium = premiumFeatures.includes( 'image-cdn-quality' );

Each feature uses a different flag, so that we can mix and match what is in plans later. Might also be worth updating Boost Dev to allow us to turn on all premium features easily.

Copy link
Member Author

@dilirity dilirity Feb 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Nice! I didn't think of that, thanks.

Updated in 5d0c2d9.

@dilirity dilirity requested a review from thingalon February 9, 2024 08:50
pyronaur
pyronaur approved these changes Feb 9, 2024
View reviewed changes
Copy link
Member

@pyronaur pyronaur left a comment

Choose a reason for hiding this comment

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

:shipit:

@thingalon thingalon enabled auto-merge (squash) February 12, 2024 02:49
@thingalon thingalon merged commit b291b56 into trunk Feb 12, 2024
51 checks passed
@thingalon thingalon deleted the fix/boost/image-cdn-upgrade-always-showing branch February 12, 2024 02:54
@jeherve jeherve added the [Feature] Photon aka "Image CDN". Feature developed in the Image CDN package and shipped in multiple plugins label Feb 14, 2024
spsiddarthan pushed a commit that referenced this pull request Feb 15, 2024
@dilirity @spsiddarthan
Boost: Fix Image CDN quality controls UI showing for the free version (…
eeca48b 
…#35538)

* Fix isPremium check returning incorrect value

* add changelog

* Update isPremium check

---------

Co-authored-by: Mark George <thingalon@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thingalon thingalon thingalon approved these changes

@pyronaur pyronaur pyronaur approved these changes

Assignees

@dilirity dilirity

Labels
Admin Page React-powered dashboard under the Jetpack menu [Feature] Photon aka "Image CDN". Feature developed in the Image CDN package and shipped in multiple plugins [Plugin] Boost A feature to speed up the site and improve performance.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@dilirity @pyronaur @thingalon @jeherve