public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v11.5.x] RBAC: Don't check folder access if annotationPermissionUpdate FT is enabled (#100117)

Browse Source 
RBAC: Don't check folder access if `annotationPermissionUpdate` FT is enabled (#99717)

don't check folder access if annotation permission update is enabled

(cherry picked from commit 095593c018)

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
This commit is contained in:
grafana-delivery-bot[bot]
2025-02-05 13:36:15 +02:00
committed by GitHub
co-authored by Ieva
parent 6b4c70d6a3
commit 967a5d3fc3
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/dashboard-scene/scene/setDashboardPanelContext.ts
+10 -3
View File
@@ -18,7 +18,12 @@ export function setDashboardPanelContext(vizPanel: VizPanel, context: PanelConte
const builtInLayer = getBuiltInAnnotationsLayer(dashboard);
// When there is no builtin annotations query we disable the ability to add annotations
if (!builtInLayer || !dashboard.canEditDashboard()) {
if (!builtInLayer) {
return false;
}
// If feature flag is enabled we pass the info of whether annotation can be added through the dashboard permissions
if (!config.featureToggles.annotationPermissionUpdate && !dashboard.canEditDashboard()) {
return false;
}
@@ -29,7 +34,8 @@ export function setDashboardPanelContext(vizPanel: VizPanel, context: PanelConte
context.canEditAnnotations = (dashboardUID?: string) => {
const dashboard = getDashboardSceneFor(vizPanel);
if (!dashboard.canEditDashboard()) {
// If feature flag is enabled we pass the info of whether annotation can be edited through the dashboard permissions
if (!config.featureToggles.annotationPermissionUpdate && !dashboard.canEditDashboard()) {
return false;
}
@@ -43,7 +49,8 @@ export function setDashboardPanelContext(vizPanel: VizPanel, context: PanelConte
context.canDeleteAnnotations = (dashboardUID?: string) => {
const dashboard = getDashboardSceneFor(vizPanel);
if (!dashboard.canEditDashboard()) {
// If feature flag is enabled we pass the info of whether annotation can be deleted through the dashboard permissions
if (!config.featureToggles.annotationPermissionUpdate && !dashboard.canEditDashboard()) {
return false;
}