From 770bdb528311e06b51bf0e2934e0f4314fb5d693 Mon Sep 17 00:00:00 2001
From: Frank Niessink <frank@niessink.com>
Date: Wed, 29 Jan 2025 08:51:49 +0100
Subject: [PATCH] When adding multiple sources to one metric, the source names
would not be comma-separated in the sources column.
Fixes #10735.
---
components/frontend/src/measurement/MeasurementSources.js | 3 ++-
components/frontend/src/measurement/MeasurementSources.test.js | 3 +--
components/frontend/src/subject/SubjectTableRow.js | 2 +-
docs/src/changelog.md | 1 +
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/components/frontend/src/measurement/MeasurementSources.js b/components/frontend/src/measurement/MeasurementSources.js
index 692554ff76..049ff10b0c 100644
--- a/components/frontend/src/measurement/MeasurementSources.js
+++ b/components/frontend/src/measurement/MeasurementSources.js
@@ -2,7 +2,8 @@ import { SourceStatus } from "./SourceStatus"
export function MeasurementSources({ metric }) {
const sources = metric.latest_measurement?.sources ?? []
- return sources.map((source) => [
+ return sources.map((source, index) => [
+ index > 0 && ", ",
<SourceStatus key={source.source_uuid} metric={metric} measurement_source={source} />,
])
}
diff --git a/components/frontend/src/measurement/MeasurementSources.test.js b/components/frontend/src/measurement/MeasurementSources.test.js
index f29d12d022..e996e7543a 100644
--- a/components/frontend/src/measurement/MeasurementSources.test.js
+++ b/components/frontend/src/measurement/MeasurementSources.test.js
@@ -39,7 +39,6 @@ it("renders multiple measurement sources", async () => {
sources: [{ source_uuid: "source_uuid1" }, { source_uuid: "source_uuid2" }],
},
)
- expect(screen.getAllByText(/Source name 1/).length).toBe(1)
- expect(screen.getAllByText(/Source name 2/).length).toBe(1)
+ expect(screen.getAllByText(/Source name 1, Source name 2/).length).toBe(1)
await expectNoAccessibilityViolations(container)
})
diff --git a/components/frontend/src/subject/SubjectTableRow.js b/components/frontend/src/subject/SubjectTableRow.js
index e46a38fa90..38677c585f 100644
--- a/components/frontend/src/subject/SubjectTableRow.js
+++ b/components/frontend/src/subject/SubjectTableRow.js
@@ -293,7 +293,7 @@ export function SubjectTableRow({
)}
{nrDates === 1 && settings.hiddenColumns.excludes("status") && (
<TableCell>
- <Typography sx={{ paddingLeft: "10px", fontSize: "24px" }}>
+ <Typography sx={{ paddingLeft: "6px", fontSize: "24px" }}>
<StatusIcon status={metric.status} statusStart={metric.status_start} />
</Typography>
</TableCell>
diff --git a/docs/src/changelog.md b/docs/src/changelog.md
index fa3df7402d..ede08b127e 100644
--- a/docs/src/changelog.md
+++ b/docs/src/changelog.md
@@ -21,6 +21,7 @@ If your currently installed *Quality-time* version is not the latest version, pl
### Fixed
- Fix accessibility issues found by the application test. Fixes [#6354](https://github.com/ICTU/quality-time/issues/6354).
+- When adding multiple sources to one metric, the source names would not be comma-separated in the sources column. Fixes [#10735](https://github.com/ICTU/quality-time/issues/10735).
### Changed