diff --git a/components/frontend/src/App.test.js b/components/frontend/src/App.test.js index d4817a8ab5..b828fcd7b5 100644 --- a/components/frontend/src/App.test.js +++ b/components/frontend/src/App.test.js @@ -80,6 +80,7 @@ async function selectDate(container) { } it("handles a date change", async () => { + jest.setTimeout(10000) const { container } = render() await selectDate(container) const expectedDate = dayjs().subtract(1, "month").date(15).toDate().toDateString() 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 && ", ", , ]) } 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") && ( - + 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