diff --git a/eq-author/src/App/dataSettings/SupplementaryDataPage/index.js b/eq-author/src/App/dataSettings/SupplementaryDataPage/index.js index e1694d7832..f969d71d8d 100644 --- a/eq-author/src/App/dataSettings/SupplementaryDataPage/index.js +++ b/eq-author/src/App/dataSettings/SupplementaryDataPage/index.js @@ -183,19 +183,21 @@ const SupplementaryDataPage = () => { }; if (surveyLoading) { - return Dataset page is loading...; + return ( + Supplementary data page is loading... + ); } if (surveyError) { - return Dataset page error; + return Supplementary data page error; } return ( <> unlinkDataset()} onClose={() => setShowUnlinkModal(false)} @@ -267,7 +269,8 @@ const SupplementaryDataPage = () => { - Dataset for survey ID {tableData.surveyId} + Dataset schema for survey ID{" "} + {tableData.surveyId} @@ -276,7 +279,7 @@ const SupplementaryDataPage = () => { data-test="btn-unlink-dataset" onClick={handleUnlinkClick} > - Unlink dataset + Unlink dataset schema @@ -311,9 +314,10 @@ const SupplementaryDataPage = () => { A respondent's answers to previous - questions are stored in supplementary datasets - as data fields. Data fields can be piped into - question and section pages using the toolbar. + questions are stored in supplementary dataset + schemas as data fields. Data fields can be piped + into question and section pages using the + toolbar. Data fields are defined as either: diff --git a/eq-author/src/App/dataSettings/SupplementaryDataPage/index.test.js b/eq-author/src/App/dataSettings/SupplementaryDataPage/index.test.js index 6852c7fe8a..f1d0044bd2 100644 --- a/eq-author/src/App/dataSettings/SupplementaryDataPage/index.test.js +++ b/eq-author/src/App/dataSettings/SupplementaryDataPage/index.test.js @@ -236,7 +236,7 @@ describe("Supplementary dataset page", () => { user, mocks ); - expect(getByText("Dataset for survey ID 068")).toBeTruthy(); + expect(getByText("Dataset schema for survey ID 068")).toBeTruthy(); expect(getByText("ID:")).toBeTruthy(); expect(getByText("Version:")).toBeTruthy(); expect(getByText("Date created:")).toBeTruthy(); @@ -246,7 +246,7 @@ describe("Supplementary dataset page", () => { }); describe("Unlink dataset", () => { - it("should display the Unlink dataset modal", async () => { + it("should display the Unlink dataset schema modal", async () => { useQuery.mockImplementation(() => ({ loading: false, error: false, @@ -315,7 +315,7 @@ describe("Supplementary dataset page", () => { expect(queryByTestId("modal")).not.toBeInTheDocument(); }); - it("should close the Unlink dataset modal", async () => { + it("should close the Unlink dataset schema modal", async () => { useQuery.mockImplementationOnce(() => ({ loading: false, error: false, diff --git a/eq-author/src/components/buttons/UnlinkButton/index.js b/eq-author/src/components/buttons/UnlinkButton/index.js index 42f0b15aa2..890b598c1b 100644 --- a/eq-author/src/components/buttons/UnlinkButton/index.js +++ b/eq-author/src/components/buttons/UnlinkButton/index.js @@ -18,7 +18,7 @@ const StyledUnlinkButton = styled(Button).attrs({ fill: ${colors.blue}; } - width: 11em; + width: 14em; height: 2.5em; align-items: center; margin: 0 0 0 auto; @@ -34,14 +34,18 @@ const StyledUnlinkButton = styled(Button).attrs({ `; const UnlinkTooltip = ({ children }) => ( - + {children} ); const UnlinkButton = ({ hideText, - iconText = "Unlink dataset", + iconText = "Unlink dataset schema", ...otherProps }) => { const Wrapper = hideText ? UnlinkTooltip : React.Fragment; @@ -68,7 +72,7 @@ UnlinkButton.propTypes = { UnlinkButton.defaultProps = { hideText: false, - iconText: "Unlink dataset", + iconText: "Unlink dataset schema", disabledIcon: false, };