From e3ea36b810fd93decc5b4c37ea3e99b8f975f7f9 Mon Sep 17 00:00:00 2001 From: Farhanam76 Date: Thu, 29 Aug 2024 12:06:47 +0100 Subject: [PATCH 1/5] Changed text 'dataset' to 'schema' --- .../src/App/dataSettings/SupplementaryDataPage/index.js | 6 +++--- .../SupplementaryDataPage/schemaVersionsTable.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eq-author/src/App/dataSettings/SupplementaryDataPage/index.js b/eq-author/src/App/dataSettings/SupplementaryDataPage/index.js index 4c3f7cdba8..20ebc81907 100644 --- a/eq-author/src/App/dataSettings/SupplementaryDataPage/index.js +++ b/eq-author/src/App/dataSettings/SupplementaryDataPage/index.js @@ -220,16 +220,16 @@ const SupplementaryDataPage = () => { {!tableData && ( <> - Select a supplementary dataset to link to + Select a supplementary schema to link to - Linking to a supplementary dataset will allow you + Linking to a supplementary schema will allow you to pipe data that respondents have provided in previous questionnaires into question titles or percentage answer type labels. - Only one dataset can be linked per questionnaire. + Only one schema can be linked per questionnaire. Select a survey ID { return ( <> - Datasets for survey ID {surveyId} + Schemas for survey ID {surveyId} @@ -77,7 +77,7 @@ const SchemaVersionTable = ({ surveyId, linkSupplementaryData }) => { Date created - Link dataset + Link schema From 446376cde1373da657efd98fc6982c85d09def7e Mon Sep 17 00:00:00 2001 From: Farhanam76 Date: Thu, 29 Aug 2024 14:38:59 +0100 Subject: [PATCH 2/5] updated test for supplementary data --- .../App/dataSettings/SupplementaryDataPage/index.test.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eq-author/src/App/dataSettings/SupplementaryDataPage/index.test.js b/eq-author/src/App/dataSettings/SupplementaryDataPage/index.test.js index c3b823eb5f..8f054b1bd4 100644 --- a/eq-author/src/App/dataSettings/SupplementaryDataPage/index.test.js +++ b/eq-author/src/App/dataSettings/SupplementaryDataPage/index.test.js @@ -139,9 +139,9 @@ describe("Supplementary dataset page", () => { user, mocks ); - expect(getByText("Select a supplementary dataset to link to")).toBeTruthy(); + expect(getByText("Select a supplementary schema to link to")).toBeTruthy(); expect( - getByText("Only one dataset can be linked per questionnaire.") + getByText("Only one schema can be linked per questionnaire.") ).toBeTruthy(); }); @@ -166,7 +166,7 @@ describe("Supplementary dataset page", () => { const select = getByTestId("list-select"); fireEvent.change(select, { target: { value: "121" } }); await waitFor(() => { - expect(getByText("Datasets for survey ID 121")).toBeTruthy(); + expect(getByText("Schemas for survey ID 121")).toBeTruthy(); expect(getByTestId("datasets-table")).toBeTruthy(); expect(findAllByText("Date created")).toBeTruthy(); expect(getAllByTestId("dataset-row")).toBeTruthy(); From 9f48aae53bcf8fd7202e6842092dde33990e863e Mon Sep 17 00:00:00 2001 From: Farhanam76 Date: Fri, 30 Aug 2024 10:51:53 +0100 Subject: [PATCH 3/5] Updated text changes to 'dataset schema' --- .../App/dataSettings/SupplementaryDataPage/index.js | 13 +++++++------ .../SupplementaryDataPage/index.test.js | 8 +++++--- .../SupplementaryDataPage/schemaVersionsTable.js | 4 ++-- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/eq-author/src/App/dataSettings/SupplementaryDataPage/index.js b/eq-author/src/App/dataSettings/SupplementaryDataPage/index.js index 20ebc81907..e1694d7832 100644 --- a/eq-author/src/App/dataSettings/SupplementaryDataPage/index.js +++ b/eq-author/src/App/dataSettings/SupplementaryDataPage/index.js @@ -220,16 +220,17 @@ const SupplementaryDataPage = () => { {!tableData && ( <> - Select a supplementary schema to link to + Select a supplementary dataset schema to link to - Linking to a supplementary schema will allow you - to pipe data that respondents have provided in - previous questionnaires into question titles or - percentage answer type labels. + Linking to a supplementary dataset schema will + allow you to pipe data that respondents have + provided in previous questionnaires into question + titles or percentage answer type labels. - Only one schema can be linked per questionnaire. + Only one dataset schema can be linked per + questionnaire. Select a survey ID { user, mocks ); - expect(getByText("Select a supplementary schema to link to")).toBeTruthy(); expect( - getByText("Only one schema can be linked per questionnaire.") + getByText("Select a supplementary dataset schema to link to") + ).toBeTruthy(); + expect( + getByText("Only one dataset schema can be linked per questionnaire.") ).toBeTruthy(); }); @@ -166,7 +168,7 @@ describe("Supplementary dataset page", () => { const select = getByTestId("list-select"); fireEvent.change(select, { target: { value: "121" } }); await waitFor(() => { - expect(getByText("Schemas for survey ID 121")).toBeTruthy(); + expect(getByText("Datasets schema for survey ID 121")).toBeTruthy(); expect(getByTestId("datasets-table")).toBeTruthy(); expect(findAllByText("Date created")).toBeTruthy(); expect(getAllByTestId("dataset-row")).toBeTruthy(); diff --git a/eq-author/src/App/dataSettings/SupplementaryDataPage/schemaVersionsTable.js b/eq-author/src/App/dataSettings/SupplementaryDataPage/schemaVersionsTable.js index 670ee4e008..e4c5a29e7a 100644 --- a/eq-author/src/App/dataSettings/SupplementaryDataPage/schemaVersionsTable.js +++ b/eq-author/src/App/dataSettings/SupplementaryDataPage/schemaVersionsTable.js @@ -68,7 +68,7 @@ const SchemaVersionTable = ({ surveyId, linkSupplementaryData }) => { return ( <> - Schemas for survey ID {surveyId} + Datasets schema for survey ID {surveyId}
@@ -77,7 +77,7 @@ const SchemaVersionTable = ({ surveyId, linkSupplementaryData }) => { Date created - Link schema + Link dataset schema From 58e73638964e528a8a84783b7e993f6a89943127 Mon Sep 17 00:00:00 2001 From: Farhanam76 Date: Tue, 10 Sep 2024 10:48:28 +0100 Subject: [PATCH 4/5] made the word schema plural --- .../src/App/dataSettings/SupplementaryDataPage/index.test.js | 2 +- .../dataSettings/SupplementaryDataPage/schemaVersionsTable.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eq-author/src/App/dataSettings/SupplementaryDataPage/index.test.js b/eq-author/src/App/dataSettings/SupplementaryDataPage/index.test.js index 3a7db4d36b..e4d35c44e1 100644 --- a/eq-author/src/App/dataSettings/SupplementaryDataPage/index.test.js +++ b/eq-author/src/App/dataSettings/SupplementaryDataPage/index.test.js @@ -168,7 +168,7 @@ describe("Supplementary dataset page", () => { const select = getByTestId("list-select"); fireEvent.change(select, { target: { value: "121" } }); await waitFor(() => { - expect(getByText("Datasets schema for survey ID 121")).toBeTruthy(); + expect(getByText("Datasets schemas for survey ID 121")).toBeTruthy(); expect(getByTestId("datasets-table")).toBeTruthy(); expect(findAllByText("Date created")).toBeTruthy(); expect(getAllByTestId("dataset-row")).toBeTruthy(); diff --git a/eq-author/src/App/dataSettings/SupplementaryDataPage/schemaVersionsTable.js b/eq-author/src/App/dataSettings/SupplementaryDataPage/schemaVersionsTable.js index e4c5a29e7a..4cffde9923 100644 --- a/eq-author/src/App/dataSettings/SupplementaryDataPage/schemaVersionsTable.js +++ b/eq-author/src/App/dataSettings/SupplementaryDataPage/schemaVersionsTable.js @@ -68,7 +68,7 @@ const SchemaVersionTable = ({ surveyId, linkSupplementaryData }) => { return ( <> - Datasets schema for survey ID {surveyId} + Datasets schemas for survey ID {surveyId}
From 436c13723d41b6ef4116db12f2a4c1b007584c0b Mon Sep 17 00:00:00 2001 From: Farhanam76 Date: Tue, 10 Sep 2024 14:30:33 +0100 Subject: [PATCH 5/5] removed plural --- .../src/App/dataSettings/SupplementaryDataPage/index.test.js | 2 +- .../dataSettings/SupplementaryDataPage/schemaVersionsTable.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eq-author/src/App/dataSettings/SupplementaryDataPage/index.test.js b/eq-author/src/App/dataSettings/SupplementaryDataPage/index.test.js index e4d35c44e1..6852c7fe8a 100644 --- a/eq-author/src/App/dataSettings/SupplementaryDataPage/index.test.js +++ b/eq-author/src/App/dataSettings/SupplementaryDataPage/index.test.js @@ -168,7 +168,7 @@ describe("Supplementary dataset page", () => { const select = getByTestId("list-select"); fireEvent.change(select, { target: { value: "121" } }); await waitFor(() => { - expect(getByText("Datasets schemas for survey ID 121")).toBeTruthy(); + expect(getByText("Dataset schemas for survey ID 121")).toBeTruthy(); expect(getByTestId("datasets-table")).toBeTruthy(); expect(findAllByText("Date created")).toBeTruthy(); expect(getAllByTestId("dataset-row")).toBeTruthy(); diff --git a/eq-author/src/App/dataSettings/SupplementaryDataPage/schemaVersionsTable.js b/eq-author/src/App/dataSettings/SupplementaryDataPage/schemaVersionsTable.js index 4cffde9923..ffd3f02e5a 100644 --- a/eq-author/src/App/dataSettings/SupplementaryDataPage/schemaVersionsTable.js +++ b/eq-author/src/App/dataSettings/SupplementaryDataPage/schemaVersionsTable.js @@ -68,7 +68,7 @@ const SchemaVersionTable = ({ surveyId, linkSupplementaryData }) => { return ( <> - Datasets schemas for survey ID {surveyId} + Dataset schemas for survey ID {surveyId}