Skip to content

Commit 0b545ef

Browse files
authored
Merge branch 'prometheus:main' into fix/alerts-accordion-theme
2 parents 267a036 + 9ab60c5 commit 0b545ef

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

web/ui/mantine-ui/src/pages/AlertsPage.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,12 +217,12 @@ export default function AlertsPage() {
217217
// convenient to have in the same file IMO).
218218
const renderedPageItems = useMemo(
219219
() =>
220-
currentPageGroups.map((g, i) => (
220+
currentPageGroups.map((g) => (
221221
<Card
222222
shadow="xs"
223223
withBorder
224224
p="md"
225-
key={i} // TODO: Find a stable and definitely unique key.
225+
key={`${g.file}-${g.name}`}
226226
>
227227
<Group mb="sm" justify="space-between">
228228
<Group align="baseline">

web/ui/mantine-ui/src/pages/RulesPage.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,13 @@ export default function RulesPage() {
8686
(effectiveActivePage - 1) * ruleGroupsPerPage,
8787
effectiveActivePage * ruleGroupsPerPage
8888
)
89-
.map((g, i) => (
89+
.map((g) => (
9090
<Card
9191
shadow="xs"
9292
withBorder
9393
p="md"
94-
key={i} // TODO: Find a stable and definitely unique key.
94+
mb="md"
95+
key={`${g.file}-${g.name}`}
9596
>
9697
<Group mb="sm" justify="space-between">
9798
<Group align="baseline">

0 commit comments

Comments
 (0)