PMM-14014 Incorrect open source link in help section #846
Conversation
This file contains hidden or 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
dmitri-saricev-3pillargloball
changed the title
dmitri-saricev-3pillargloball
assigned
dmitri-saricev-3pillargloball,
matejkubinec and
YashSartanpara1 and unassigned
dmitri-saricev-3pillargloball,
matejkubinec and
YashSartanpara1
dmitri-saricev-3pillargloball
requested review from
YashSartanpara1 and
matejkubinec
| const licenseUrl = licenseInfo.licenseUrl ?? ''; | ||
| const isDefaultGrafanaUpgradeLink = | ||
| licenseUrl === '/graph/admin/upgrading' || | ||
| /grafana\.com\/grafana\/.*upgrade|admin\/upgrading/i.test(licenseUrl); |
There was a problem hiding this comment.
Why is there a need to this additional check with regex?
|
|
||
| if (buildInfo.hasUpdate) { | ||
| // Consider it OSS if edition explicitly contains "open source" | ||
| const isOssEdition = /open\s*source/i.test(buildInfo.edition ?? ''); |
There was a problem hiding this comment.
I think we don't need to check for the OSS version as PMM will always be using that one.
| id: 'updateVersion', | ||
| text: `New version available!`, | ||
| icon: 'download-alt', | ||
| text: 'New version available!', |
There was a problem hiding this comment.
If possible could we keep changes to this file at minimum (newlines, comments, refactoring, prop reordering, etc.)?
The reasoning is when we pull in changes from upstream we want to avoid dealing with additional conflicts.
| const isOssEdition = /open\s*source/i.test(buildInfo.edition ?? ''); | ||
|
|
||
| if (isDefaultGrafanaUpgradeLink || isOssEdition) { | ||
| // Replace with Percona OSS link |
There was a problem hiding this comment.
Could you add a // @PERCONA comment here, since it is a change in upstream code?
Generally everything outside of public/app/percona is upstream code (with some exceptions that should be marked with @PERCONA)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
What this PR does / why we need it:
Incorrect open source link in Help section
Which issue(s) this PR fixes:
https://perconadev.atlassian.net/browse/PMM-14014
Was issue:
Resolved Issue:
Fixes #
Special notes for your reviewer:
FB:
Percona-Lab/pmm-submodules#4045