FolderRepo: Prevent no basic role user getting infinite api calls on provisioning settings endpoint #110486
+134
−13
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
Clarity-89
reviewed
Sep 3, 2025
Comment on lines
+9
to
+12
| const hasNoRole = contextSrv.user.orgRole === OrgRole.None; | ||
| const skip = !config.featureToggles.provisioning || hasNoRole; | ||
|
|
||
| const settingsQuery = useGetFrontendSettingsQuery(settings || skip ? skipToken : undefined); |
There was a problem hiding this comment.
Can we add the same check to BrowseView, so we don't call the /settings endpoint for users without a role?
Comment on lines
22
to
25
| !folder || | ||
| Boolean('parentUID' in folder && folder.parentUID) || | ||
| folder.managedBy !== ManagerKind.Repo || | ||
| isProvisionedInstance; |
There was a problem hiding this comment.
Nit: I think the list of conditions is getting large enough to be extracted into a function.
There was a problem hiding this comment.
good callout, moved into separate func
Clarity-89
approved these changes
Sep 3, 2025
tomratcliffe
reviewed
Sep 3, 2025
| // Skip render if parentUID is present, then we should skip rendering. we only display icon for root folders | ||
| const hasParent = folder && Boolean('parentUID' in folder && folder.parentUID); | ||
| // Skip render if folder is not managed by Repo | ||
| const isNotManaged = folder && folder.managedBy !== ManagerKind.Repo; |
There was a problem hiding this comment.
This means that #110467 is no longer needed, right?
There was a problem hiding this comment.
yes sorry! I meant to comment in your PR when I returned from doc appointment.
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 is this feature?
No basic roleassigned, they are seeing infinite api calls to /settings endpoint.Root cause:
BrowseDashboardsPagehas multiple subscribers (e.g., BrowseView → DashboardsTree → NameCell → FolderRepo), which ends up in an apparent “infinite” call pattern.Why do we need this feature?
Who is this feature for?
Which issue(s) does this PR fix?:
Fixes https://github.com/grafana/git-ui-sync-project/issues/474
Special notes for your reviewer:
Please check that: