Skip to content

Conversation

caddoo
Copy link
Contributor

@caddoo caddoo commented Oct 12, 2023

Description:

This is an addition to the professional services plugin that will show premium plugins in the reporting menu with an empty widget if:

  • That plugin is not activated
  • Ads for professional services are available.

The content / title of the widgets is being worked on in a seperate PR.

In this PR I have force disabled showing the menu items intentionally so we can merge this without impact, there are unit test s for the logic around whether to show the item or not.

Once approved / merged, the follow up for the promotional page can be added.

Screenshot when the logic is used without being fixed as false.
image

Review

@caddoo caddoo force-pushed the dev-17228-add-menu-item-for-premium-plugins branch from 061223c to 6a9be62 Compare October 12, 2023 03:46
@caddoo caddoo force-pushed the dev-17228-add-menu-item-for-premium-plugins branch from 6a9be62 to ec46e0e Compare October 12, 2023 04:06
@caddoo caddoo added not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. Needs Review PRs that need a code review labels Oct 12, 2023
@caddoo caddoo requested a review from a team October 12, 2023 04:12
@caddoo caddoo marked this pull request as ready for review October 12, 2023 04:13
@sgiehl
Copy link
Member

sgiehl commented Oct 12, 2023

@caddoo Please avoid creating PRs for 4.x-dev unless features are meant to go into a 4.x release ONLY.
5.x-dev is the default branch on purpose. Any development should be done for that branch and if needed we can backport the changes to 4.x-dev afterwards.

@sgiehl sgiehl added this to the 4.15.2 milestone Oct 12, 2023
@caddoo
Copy link
Contributor Author

caddoo commented Oct 12, 2023

@caddoo Please avoid creating PRs for 4.x-dev unless features are meant to go into a 4.x release ONLY.
5.x-dev is the default branch on purpose. Any development should be done for that branch and if needed we can backport the changes to 4.x-dev afterwards.

I went for 4.x-dev first, due to us wanting to push it to that version first. Is there a reason it should be the other way?

@bx80
Copy link
Contributor

bx80 commented Oct 12, 2023

Always writing PRs for 5.x first ensures that nothing goes into 4.x that doesn't already exist in 5.x (so we don't unintentionally drop features) and that the technical design of the PR is build around 5.x capabilities first, rather than potentially writing for 4.x deprecated methods and then having a different solution for 5.x which increases review work and bug potential.

I've reviewed this change, it works well and I can't see any issues, if you want to provide a 5.x version then I can review that too and get them both merged.

@michalkleiner
Copy link
Contributor

With my work being dependent on this, should I create a PR on top of this or wait until a 5.x version exists, have my part tested and reviewed for 5.x first, and then backport?

@bx80
Copy link
Contributor

bx80 commented Oct 12, 2023

@michalkleiner If @caddoo can provide a 5.x version of this PR soon then it's probably easiest to create your 5.x version based on 5.x-dev after it's merged.

@caddoo caddoo force-pushed the dev-17228-add-menu-item-for-premium-plugins branch from fac829f to 61c324a Compare October 16, 2023 07:33
@michalkleiner michalkleiner changed the title Add premium plugin menu items to professional services Add premium plugin menu items to professional services [4.x] Oct 16, 2023
Copy link
Contributor

@bx80 bx80 left a comment

Choose a reason for hiding this comment

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

This looks good to me, the relevant tests are all passing and the concept has already been reviewed approved in the 5.x PR 👍

@bx80 bx80 merged commit d3263a0 into 4.x-dev Oct 17, 2023
@bx80 bx80 deleted the dev-17228-add-menu-item-for-premium-plugins branch October 17, 2023 01:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Needs Review PRs that need a code review not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org.
Development

Successfully merging this pull request may close these issues.

4 participants