Dev to main #3185
Merged
Dev to main #3185
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
# What this PR does Adds labels implementation for integrations: - ability to create/update labels on creating/updating integration - ability to associate labels to integrations - cache for label reprs on OnCall side - feature flag to enable/disable labels ## Which issue(s) this PR fixes grafana/oncall-private#2157 ## Checklist - [x] Unit, integration, and e2e (if applicable) tests updated - [x] Documentation added (or `pr:no public docs` PR label added if not required) - [x] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not required) --------- Co-authored-by: Maxim <[email protected]> Co-authored-by: Rares Mardare <[email protected]>
Co-authored-by: grafanabot <[email protected]> Co-authored-by: Jack Baldry <[email protected]>
# What this PR does - Added mechanism to prevent concurrency conflicts when multiple network requests are fired and the order of resolving is reversed. This resulted in flickering the results data, thus showing discrepancy between the filters (e.g. the search input) and the table data. Within `RemoteFilters` and `UsersFilters` we're setting an ID for each network result, and whenever we get to hit the store, we'll compare that ID with the latest generated ID, thus if they match, we're all good, if they don't, that means that network request should be discarded and its data shouldn't be passed to the store. This was implemented for: - Users page - Schedules page (and more to come) Fixes grafana/oncall-private#2108
# What this PR does - Replaced `LoadingPlaceholder` with normal `Text` on the Escalations page - Changed the copy for the loading indicator on Schedules Both changes have been done to be consistent with the style used on the other pages.
# What this PR does Fixes #2320 ## Checklist - [x] Unit, integration, and e2e (if applicable) tests updated - [x] Documentation added (or `pr:no public docs` PR label added if not required) - [x] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not required)
Co-authored-by: grafanabot <[email protected]> Co-authored-by: Jack Baldry <[email protected]>
# What this PR does Adds check for basic role permissions on get/create/update labels ## Which issue(s) this PR fixes grafana/oncall-private#2194 ## Checklist - [x] Unit, integration, and e2e (if applicable) tests updated - [x] Documentation added (or `pr:no public docs` PR label added if not required) - [x] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not required)
# What this PR does Update calls used for access control to match changes in Grafana: grafana/grafana#76187 grafana/grafana#76237 ## Which issue(s) this PR fixes ## Checklist - [x] Unit, integration, and e2e (if applicable) tests updated - [x] Documentation added (or `pr:no public docs` PR label added if not required) - [x] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not required)
mderynck
added
the
pr:no public docs
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
Which issue(s) this PR fixes
Checklist
pr:no public docsPR label added if not required)CHANGELOG.mdupdated (orpr:no changelogPR label added if not required)