feat: disable edit/duplicate entry for repeat panel #21257
Merged
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
|
This code is sadly duplicated for react panels, so needs to be updated here as well: https://github.com/grafana/grafana/blob/master/public/app/features/dashboard/utils/getPanelMenu.ts#L110 |
okhowang
force-pushed
the
disable-repeat-edit
branch
from
924c4a1
to
109ac70
Compare
|
react panel updated, |
torkelo
requested changes
Dec 26, 2019
| return ( | ||
| dashboard.meta.canEdit && | ||
| dashboard.meta.focusPanelId && | ||
| !dashboard.panels.find(e => e.id === dashboard.meta.focusPanelId)?.repeatPanelId |
There was a problem hiding this comment.
can you use getPanelById on daashboard model? and not use the ? makes it a bit hard to read. Mabe this should be a function on the the DashboardModel itself, canEditPanel(panelId) can be reused from all locations then
There was a problem hiding this comment.
apologize for be unfamiliar with code.
I have added two method canEditPanel and canEditPanelById in DashboardModel.
and use them in all branch
okhowang
force-pushed
the
disable-repeat-edit
branch
2 times, most recently
from
cf7ea05
to
968f696
Compare
okhowang
force-pushed
the
disable-repeat-edit
branch
from
968f696
to
420e881
Compare
|
can we merge this pr? |
torkelo
approved these changes
Jan 3, 2020
|
Looks like there is a conflict in one file so can’t merge, if you can please try to merge with master and fix conflict otherwise I can do that next week |
|
conflict resolved |
ryantxu
added a commit
that referenced
this pull request
Jan 4, 2020
* origin/master: NewsPanel: update default feed url (#21342) docs: fix influxdb templated dashboard link (#21336) Docs: Update Windows.md (#21333) Arrow: don't export arrow... breaking phantomjs e2e test (#21331) DataFrame: round trip metadata to arrow Table (#21277) Prometheus: user metrics metadata to inform query hints (#21304) Panel: disable edit/duplicate/delete entry for repeat panel (#21257) Prometheus: Disable suggestions at beginning of value (#21302) grafana/ui: Do not build in strict mode as grafana/ui depends on non-strict libs (#21319)
ryantxu
added a commit
that referenced
this pull request
Jan 6, 2020
* origin/master: (43 commits) Docs: Use https scheme for Grafana playground links (#21360) fix docs links (#21359) AddDatasourcePage: Refactoring & more Phantom plugins (#21261) Chore: Remove empty flot.pie file (#21356) Docs: Fix link (#21358) Docs: Fix InfluxDB templated dashboard link (#21343) Rendering: Fix panel PNG rendering when using sub url & serve_from_sub_path = true (#21306) NewsPanel: update default feed url (#21342) docs: fix influxdb templated dashboard link (#21336) Docs: Update Windows.md (#21333) Arrow: don't export arrow... breaking phantomjs e2e test (#21331) DataFrame: round trip metadata to arrow Table (#21277) Prometheus: user metrics metadata to inform query hints (#21304) Panel: disable edit/duplicate/delete entry for repeat panel (#21257) Prometheus: Disable suggestions at beginning of value (#21302) grafana/ui: Do not build in strict mode as grafana/ui depends on non-strict libs (#21319) Docs: Update security.md (#20981) @grafana/data: use timeZone parameter rather than isUtc (#21276) Units: support dynamic count and currency units (#21279) Docs: Added sudo and removed $ where inconsistent. (#21314) ...
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.
What this PR does / why we need it:
avoid incorrect modify repeated panel
Which issue(s) this PR fixes:
Partially
resolve#21142Special notes for your reviewer: