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

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>
v11.4.x
grafana-delivery-bot[bot] 5 months ago committed by GitHub
parent 96c8b4bcdf
commit 30e5410f4e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 13
      public/app/features/dashboard-scene/scene/setDashboardPanelContext.ts

@ -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;
}

Loading…
Cancel
Save