Merge pull request #3085 from ONSdigital/EAR-2112-looping-grand-calcu…

…lated-summary EAR-2112 - Looping grand calculated summary
ONSdigital · Dec 13, 2023 · 15a7fa1 · 15a7fa1
2 parents 200fd2e + 836f416
commit 15a7fa1
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 3 deletions.
diff --git a/eq-author/src/App/page/Design/CalculatedSummaryPageEditor/AnswerSelector/SelectedAnswer.js b/eq-author/src/App/page/Design/CalculatedSummaryPageEditor/AnswerSelector/SelectedAnswer.js
@@ -34,6 +34,7 @@ const Chip = styled(MenuItemType)`
   color: ${colors.text};
   float: right;
   font-size: 0.8em;
+  margin-left: 0.8em;
 `;
 
 const CloseButton = styled.button`
@@ -76,13 +77,16 @@ const SelectedAnswer = ({
   displayName,
   properties,
   type: answerType,
+  page,
   insideListCollectorFolder,
   onRemove,
 }) => {
   const unitType = properties.unit || false;
 
   const [showDeleteModal, setShowDeleteModal] = useState(false);
 
+  const pageType = page?.pageType;
+
   return (
     <>
       <Modal
@@ -95,6 +99,9 @@ const SelectedAnswer = ({
       <Wrapper>
         <Title>{displayName}</Title>
         {unitType && <Chip data-test="unit-type">{unitType}</Chip>}
+        {pageType === "CalculatedSummaryPage" && (
+          <Chip>Calculated summary</Chip>
+        )}
         {insideListCollectorFolder && <Chip>List collector follow-up</Chip>}
         <Chip>{answerType}</Chip>
         <CloseButton
@@ -114,6 +121,7 @@ SelectedAnswer.propTypes = {
   type: PropType.string.isRequired,
   insideListCollectorFolder: PropType.bool,
   properties: PropType.object.isRequired, // eslint-disable-line
+  page: PropType.object, // eslint-disable-line
 };
 
 export default SelectedAnswer;
diff --git a/...hor/src/App/page/Design/CalculatedSummaryPageEditor/AnswerSelector/SelectedAnswer.test.js b/...hor/src/App/page/Design/CalculatedSummaryPageEditor/AnswerSelector/SelectedAnswer.test.js
@@ -4,7 +4,7 @@ import { render } from "tests/utils/rtl";
 import SelectedAnswer from "./SelectedAnswer";
 
 describe("Selected answer", () => {
-  let mockProperties, mockOnRemove, mockDisplayName, mockType;
+  let mockProperties, mockOnRemove, mockDisplayName, mockType, mockPage;
 
   beforeEach(() => {
     mockProperties = {
@@ -55,4 +55,41 @@ describe("Selected answer", () => {
 
     expect(unitType).not.toBeInTheDocument();
   });
+
+  it("displays the calculated summary page type", () => {
+    mockType = "Number";
+    mockPage = {
+      pageType: "CalculatedSummaryPage",
+    };
+
+    const { getByText } = render(
+      <SelectedAnswer
+        properties={mockProperties}
+        onRemove={mockOnRemove}
+        displayName={mockDisplayName}
+        type={mockType}
+        page={mockPage}
+      />
+    );
+
+    const pageType = getByText("Calculated summary");
+    expect(pageType).toBeInTheDocument();
+  });
+
+  it("displays the list collector follow-up page type", () => {
+    mockType = "Number";
+
+    const { getByText } = render(
+      <SelectedAnswer
+        properties={mockProperties}
+        onRemove={mockOnRemove}
+        displayName={mockDisplayName}
+        type={mockType}
+        insideListCollectorFolder
+      />
+    );
+
+    const pageType = getByText("List collector follow-up");
+    expect(pageType).toBeInTheDocument();
+  });
 });
diff --git a/eq-author/src/App/page/Design/CalculatedSummaryPageEditor/AnswerSelector/index.js b/eq-author/src/App/page/Design/CalculatedSummaryPageEditor/AnswerSelector/index.js
@@ -100,6 +100,7 @@ AnswerSelector.fragments = {
         properties
         page {
           id
+          pageType
           folder {
             id
             ... on ListCollectorFolder {

diff --git a/...c/App/page/Design/CalculatedSummaryPageEditor/updateCalculatedSummaryPageMutation.graphql b/...c/App/page/Design/CalculatedSummaryPageEditor/updateCalculatedSummaryPageMutation.graphql
@@ -22,6 +22,13 @@ mutation UpdateCalculatedSummaryPage(
       page {
         id
         displayName
+        pageType
+        folder {
+          id
+          ... on ListCollectorFolder {
+            listId
+          }
+        }
         section {
           id
           displayName

diff --git a/...r/src/App/page/Design/CalculatedSummaryPageEditor/withUpdateCalculatedSummaryPage.test.js b/...r/src/App/page/Design/CalculatedSummaryPageEditor/withUpdateCalculatedSummaryPage.test.js
@@ -11,7 +11,7 @@ describe("withUpdateCalculatedSummaryPage", () => {
       props = mapMutateToProps({ mutate });
       page = {
         displayName: "123",
-        summaryAnswers: [],
+        summaryAnswers: [{ id: "1" }],
       };
     });
 
@@ -22,7 +22,7 @@ describe("withUpdateCalculatedSummaryPage", () => {
     it("should call mutate", () => {
       props.onUpdateCalculatedSummaryPage(page);
       expect(mutate).toHaveBeenCalledWith({
-        variables: { input: { summaryAnswers: [] } },
+        variables: { input: { summaryAnswers: ["1"] } },
       });
     });
   });

diff --git a/eq-author/src/components/ContentPickerv3/ListAnswerPicker.js b/eq-author/src/components/ContentPickerv3/ListAnswerPicker.js
@@ -65,6 +65,7 @@ const TableHeadCol = styled.div`
 
 const VariableItem = styled(SubMenuItem)`
   display: table-row;
+  height: 3.5em;
 `;
 
 const VariableItemList = styled.ul`