[license] Allow usage of charts an tree view pro package for old premium licenses #13619
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
flaviendelangle
added
bug 🐛
flaviendelangle
requested review from
joserodolfofreitas,
michelengelen and
alexfauquette
|
Deploy preview: https://deploy-preview-13619--material-ui-x.netlify.app/ |
joserodolfofreitas
approved these changes
Jun 25, 2024
Comment on lines
181
to
183
| if (license.planVersion === 'initial' && license.scope === 'pro') { | ||
| // 'charts-pro' or 'tree-view-pro' can only be used with a newer license | ||
| if (productScope === 'charts' || productScope === 'tree-view') { |
There was a problem hiding this comment.
Suggestion to be more robust to upcomming changes. Otherwise each new product will have to be added in this condition
Suggested change
| if (license.planVersion === 'initial' && license.scope === 'pro') { | |
| // 'charts-pro' or 'tree-view-pro' can only be used with a newer license | |
| if (productScope === 'charts' || productScope === 'tree-view') { | |
| const initialProductScopes = ['data-grid', 'date-pickers']; | |
| if (license.planVersion === 'initial' && license.scope === 'pro') { | |
| // Other pro packages can only be used with a newer license | |
| if (!initialProScopes.includes(productScope)) { |
There was a problem hiding this comment.
I did some changes to rely on the package name instead of creating the licenseScope and productScope abstractions that don't bring a lot of value and add a lot of complexity to the code.
I'd be curious to have your opinion.
flaviendelangle
force-pushed
the
fix-license-v2
branch
7 times, most recently
from
edc81cc to
43e8d5b
Compare
flaviendelangle
force-pushed
the
fix-license-v2
branch
from
43e8d5b to
f8c3dca
Compare
flaviendelangle
commented
Jun 25, 2024
| } | ||
|
|
||
| if (!acceptedScopes.includes(license.scope)) { | ||
| return { status: LICENSE_STATUS.OutOfScope }; | ||
| // 'charts-pro' or 'tree-view-pro' can only be used with a newer Pro license |
There was a problem hiding this comment.
The order change is here to make sure that a pro license used on a premium package always have the OutOfScope status and not the NotAvailableInInitialProPlan
alexfauquette
approved these changes
Jun 26, 2024
This was referenced Jul 20, 2024
DungTiger
pushed a commit
to DungTiger/mui-x
that referenced
this pull request
Jul 23, 2024
…ium licenses (mui#13619) Signed-off-by: Flavien DELANGLE <flaviendelangle@gmail.com> Co-authored-by: Alexandre Fauquette <45398769+alexfauquette@users.noreply.github.com>
This was referenced Jul 27, 2024
thomasmoon
pushed a commit
to thomasmoon/mui-x
that referenced
this pull request
Sep 9, 2024
…ium licenses (mui#13619) Signed-off-by: Flavien DELANGLE <flaviendelangle@gmail.com> Co-authored-by: Alexandre Fauquette <45398769+alexfauquette@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A follow-up on #13459.