diff --git a/.pa11yci-pr.conf.js b/.pa11yci-pr.conf.js index d8a635f0af9..71990e6a115 100644 --- a/.pa11yci-pr.conf.js +++ b/.pa11yci-pr.conf.js @@ -33,7 +33,8 @@ var dashboardSettings = [ url: '${HOST}/d/O6f11TZWk/panel-tests-bar-gauge?orgId=1&editview=permissions', wait: 500, rootElement: '.main-view', - threshold: 9, + // TODO: improve the accessibility of the permission tab https://github.com/grafana/grafana/issues/77203 + threshold: 11, }, { url: '${HOST}/d/O6f11TZWk/panel-tests-bar-gauge?orgId=1&editview=dashboard_json', diff --git a/pkg/services/dashboards/service/dashboard_service.go b/pkg/services/dashboards/service/dashboard_service.go index 66396ad25b9..c01469a4694 100644 --- a/pkg/services/dashboards/service/dashboard_service.go +++ b/pkg/services/dashboards/service/dashboard_service.go @@ -318,10 +318,7 @@ func (dr *DashboardServiceImpl) SaveProvisionedDashboard(ctx context.Context, dt } if dto.Dashboard.ID == 0 { - if err := dr.setDefaultPermissions(ctx, dto, dash, true); err != nil { - namespaceID, userID := dto.User.GetNamespacedID() - dr.log.Error("Could not make user admin", "dashboard", dash.Title, "namespaceID", namespaceID, "userID", userID, "error", err) - } + dr.setDefaultPermissions(ctx, dto, dash, true) } return dash, nil @@ -359,10 +356,7 @@ func (dr *DashboardServiceImpl) SaveFolderForProvisionedDashboards(ctx context.C } if dto.Dashboard.ID == 0 { - if err := dr.setDefaultPermissions(ctx, dto, dash, true); err != nil { - namespaceID, userID := dto.User.GetNamespacedID() - dr.log.Error("Could not make user admin", "dashboard", dash.Title, "namespaceID", namespaceID, "userID", userID, "error", err) - } + dr.setDefaultPermissions(ctx, dto, dash, true) } return dash, nil @@ -408,10 +402,7 @@ func (dr *DashboardServiceImpl) SaveDashboard(ctx context.Context, dto *dashboar // new dashboard created if dto.Dashboard.ID == 0 { - if err := dr.setDefaultPermissions(ctx, dto, dash, false); err != nil { - namespaceID, userID := dto.User.GetNamespacedID() - dr.log.Error("Could not make user admin", "dashboard", dash.Title, "namespaceID", namespaceID, "userID", userID, "error", err) - } + dr.setDefaultPermissions(ctx, dto, dash, false) } return dash, nil @@ -466,10 +457,7 @@ func (dr *DashboardServiceImpl) ImportDashboard(ctx context.Context, dto *dashbo return nil, err } - if err := dr.setDefaultPermissions(ctx, dto, dash, false); err != nil { - namespaceID, userID := dto.User.GetNamespacedID() - dr.log.Error("Could not make user admin", "dashboard", dash.Title, "namespaceID", namespaceID, "userID", userID, "error", err) - } + dr.setDefaultPermissions(ctx, dto, dash, false) return dash, nil } @@ -484,21 +472,23 @@ func (dr *DashboardServiceImpl) GetDashboardsByPluginID(ctx context.Context, que return dr.dashboardStore.GetDashboardsByPluginID(ctx, query) } -func (dr *DashboardServiceImpl) setDefaultPermissions(ctx context.Context, dto *dashboards.SaveDashboardDTO, dash *dashboards.Dashboard, provisioned bool) error { +func (dr *DashboardServiceImpl) setDefaultPermissions(ctx context.Context, dto *dashboards.SaveDashboardDTO, dash *dashboards.Dashboard, provisioned bool) { inFolder := dash.FolderID > 0 var permissions []accesscontrol.SetResourcePermissionCommand - namespaceID, userIDstr := dto.User.GetNamespacedID() - userID, err := identity.IntIdentifier(namespaceID, userIDstr) + if !provisioned { + namespaceID, userIDstr := dto.User.GetNamespacedID() + userID, err := identity.IntIdentifier(namespaceID, userIDstr) - if err != nil { - return err - } + if err != nil { + dr.log.Error("Could not make user admin", "dashboard", dash.Title, "namespaceID", namespaceID, "userID", userID, "error", err) + } - if !provisioned && namespaceID == identity.NamespaceUser { - permissions = append(permissions, accesscontrol.SetResourcePermissionCommand{ - UserID: userID, Permission: dashboards.PERMISSION_ADMIN.String(), - }) + if err != nil && namespaceID == identity.NamespaceUser && userID > 0 { + permissions = append(permissions, accesscontrol.SetResourcePermissionCommand{ + UserID: userID, Permission: dashboards.PERMISSION_ADMIN.String(), + }) + } } if !inFolder { @@ -513,12 +503,9 @@ func (dr *DashboardServiceImpl) setDefaultPermissions(ctx context.Context, dto * svc = dr.folderPermissions } - _, err = svc.SetPermissions(ctx, dto.OrgID, dash.UID, permissions...) - if err != nil { - return err + if _, err := svc.SetPermissions(ctx, dto.OrgID, dash.UID, permissions...); err != nil { + dr.log.Error("Could not set default permissions", "dashboard", dash.Title, "error", err) } - - return nil } func (dr *DashboardServiceImpl) GetDashboard(ctx context.Context, query *dashboards.GetDashboardQuery) (*dashboards.Dashboard, error) {