From a29185196b1440aeabefc47590fe8db70435a77d Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Wed, 27 Mar 2024 15:13:01 +0000
Subject: [PATCH 001/215] Add piping for answer labels in list additional pages

---
 eq-author-api/schema/resolvers/utils/folderGetters.js     | 8 ++++++++
 .../customKeywords/validatePipingAnswerInLabel.js         | 7 +++++--
 .../src/App/page/Design/answers/BasicAnswer/index.js      | 7 ++++++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/eq-author-api/schema/resolvers/utils/folderGetters.js b/eq-author-api/schema/resolvers/utils/folderGetters.js
index b51ce09db0..27c685d4e8 100644
--- a/eq-author-api/schema/resolvers/utils/folderGetters.js
+++ b/eq-author-api/schema/resolvers/utils/folderGetters.js
@@ -10,9 +10,17 @@ const getFolderById = (ctx, id) => find(getFolders(ctx), { id });
 const getFolderByPageId = (ctx, id) =>
   find(getFolders(ctx), ({ pages }) => pages && some(pages, { id }));
 
+const getFolderByAnswerId = (ctx, id) =>
+  find(
+    getFolders(ctx),
+    ({ pages }) =>
+      pages && some(pages, ({ answers }) => answers && some(answers, { id }))
+  );
+
 module.exports = {
   getFolders,
   getFoldersBySectionId,
   getFolderById,
   getFolderByPageId,
+  getFolderByAnswerId,
 };
diff --git a/eq-author-api/src/validation/customKeywords/validatePipingAnswerInLabel.js b/eq-author-api/src/validation/customKeywords/validatePipingAnswerInLabel.js
index 96937ccc6e..552c7c1109 100644
--- a/eq-author-api/src/validation/customKeywords/validatePipingAnswerInLabel.js
+++ b/eq-author-api/src/validation/customKeywords/validatePipingAnswerInLabel.js
@@ -9,6 +9,7 @@ const {
   idExists,
   getListByAnswerId,
   getSupplementaryDataAsCollectionListbyFieldId,
+  getFolderByAnswerId,
 } = require("../../../schema/resolvers/utils");
 
 const pipedAnswerIdRegex =
@@ -31,6 +32,7 @@ module.exports = (ajv) =>
         rootData: questionnaire,
       }
     ) {
+      const folder = getFolderByAnswerId({ questionnaire }, parentData.id);
       isValid.errors = [];
       const pipedIdList = [];
 
@@ -78,8 +80,9 @@ module.exports = (ajv) =>
         if (list) {
           if (!(dataPiped === "supplementary" && list.listName === "")) {
             if (
-              list.id !== parentData.repeatingLabelAndInputListId ||
-              !parentData.repeatingLabelAndInput
+              !folder.listId &&
+              (list.id !== parentData.repeatingLabelAndInputListId ||
+                !parentData.repeatingLabelAndInput)
             ) {
               return hasError(PIPING_TITLE_DELETED);
             }
diff --git a/eq-author/src/App/page/Design/answers/BasicAnswer/index.js b/eq-author/src/App/page/Design/answers/BasicAnswer/index.js
index f2b766905a..842e129e71 100644
--- a/eq-author/src/App/page/Design/answers/BasicAnswer/index.js
+++ b/eq-author/src/App/page/Design/answers/BasicAnswer/index.js
@@ -124,7 +124,12 @@ export const StatelessBasicAnswer = ({
           controls={pipingControls}
           size="large"
           allowableTypes={[ANSWER, METADATA]}
-          listId={answer.repeatingLabelAndInputListId ?? null}
+          listId={
+            (answer.repeatingLabelAndInputListId ||
+              page.section?.repeatingSectionListId ||
+              page.folder?.listId) ??
+            null
+          }
           hasLabelErrors={hasLabelErrors(answer.validationErrorInfo?.errors)}
           autoFocus={!answer.label}
         />

From f9dc7fa5cb79948a09bdb6d43a70c0f9e83906ce Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Tue, 9 Apr 2024 08:55:59 +0100
Subject: [PATCH 002/215] Add strong tags for highlighted text in rich text
 editors

---
 .../src/components/RichTextEditor/Toolbar.js  |  4 +--
 .../src/components/RichTextEditor/index.js    |  2 +-
 .../RichTextEditor/utils/convert.js           | 27 +++++++++++++++++--
 .../utils/createFormatStripper.js             |  2 +-
 4 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/eq-author/src/components/RichTextEditor/Toolbar.js b/eq-author/src/components/RichTextEditor/Toolbar.js
index c37639a989..73919cd328 100644
--- a/eq-author/src/components/RichTextEditor/Toolbar.js
+++ b/eq-author/src/components/RichTextEditor/Toolbar.js
@@ -31,11 +31,11 @@ export const styleButtons = [
     style: "BOLD",
   },
   {
-    id: "emphasis",
+    id: "highlight",
     title: "Highlight",
     icon: iconEmphasis,
     type: STYLE_INLINE,
-    style: "ITALIC",
+    style: "HIGHLIGHT",
   },
 ];
 
diff --git a/eq-author/src/components/RichTextEditor/index.js b/eq-author/src/components/RichTextEditor/index.js
index d595305eb8..3aa6b685f0 100644
--- a/eq-author/src/components/RichTextEditor/index.js
+++ b/eq-author/src/components/RichTextEditor/index.js
@@ -32,7 +32,7 @@ import PasteModal, {
 } from "components/modals/PasteModal";
 
 const styleMap = {
-  ITALIC: {
+  HIGHLIGHT: {
     backgroundColor: "#cbe2c8",
   },
 };
diff --git a/eq-author/src/components/RichTextEditor/utils/convert.js b/eq-author/src/components/RichTextEditor/utils/convert.js
index 3abf1dce9d..7c9e3769fc 100644
--- a/eq-author/src/components/RichTextEditor/utils/convert.js
+++ b/eq-author/src/components/RichTextEditor/utils/convert.js
@@ -1,3 +1,4 @@
+import React from "react";
 import { convertToHTML, convertFromHTML } from "draft-convert";
 
 export const toHTML = (entityMap) => {
@@ -6,7 +7,18 @@ export const toHTML = (entityMap) => {
     return mapper ? mapper(entity) : originalText;
   };
 
-  const convert = convertToHTML({ entityToHTML });
+  // Adds strong tags with class names to text based on the text's style
+  const styleToHTML = (style) => {
+    if (style === "BOLD") {
+      return <strong className="bold" />;
+    }
+
+    if (style === "HIGHLIGHT") {
+      return <strong className="highlight" />;
+    }
+  };
+
+  const convert = convertToHTML({ styleToHTML, entityToHTML });
 
   return (editorState) => convert(editorState.getCurrentContent());
 };
@@ -21,5 +33,16 @@ export const fromHTML = (nodeToFn) => {
     return entity || null;
   };
 
-  return convertFromHTML({ htmlToEntity });
+  // Applies specific styles based on tags and class names - buttons in the toolbar are activated based on these styles
+  const htmlToStyle = (nodeName, node, currentStyle) => {
+    if (nodeName === "strong" && node.className === "highlight") {
+      return currentStyle.add("HIGHLIGHT").remove("BOLD");
+    }
+    if (nodeName === "strong" && node.className === "bold") {
+      return currentStyle.add("BOLD");
+    }
+    return currentStyle;
+  };
+
+  return convertFromHTML({ htmlToStyle, htmlToEntity });
 };
diff --git a/eq-author/src/components/RichTextEditor/utils/createFormatStripper.js b/eq-author/src/components/RichTextEditor/utils/createFormatStripper.js
index 1dec08f961..7c75b29e86 100644
--- a/eq-author/src/components/RichTextEditor/utils/createFormatStripper.js
+++ b/eq-author/src/components/RichTextEditor/utils/createFormatStripper.js
@@ -5,7 +5,7 @@ import { filterConfig as linkFilterConfig } from "components/RichTextEditor/Link
 
 const mapper = {
   bold: { format: "BOLD", type: "styles" },
-  emphasis: { format: "ITALIC", type: "styles" },
+  highlight: { format: "HIGHLIGHT", type: "styles" },
   list: { format: "unordered-list-item", type: "blocks" },
   heading: { format: "header-two", type: "blocks" },
 };

From 8adada303e3c5a037e2bebfcbab2da0325c027d1 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Tue, 9 Apr 2024 09:07:56 +0100
Subject: [PATCH 003/215] Update snapshot

---
 .../__snapshots__/RichTextEditor.test.js.snap             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eq-author/src/components/RichTextEditor/__snapshots__/RichTextEditor.test.js.snap b/eq-author/src/components/RichTextEditor/__snapshots__/RichTextEditor.test.js.snap
index 044c021cca..dec5001f28 100644
--- a/eq-author/src/components/RichTextEditor/__snapshots__/RichTextEditor.test.js.snap
+++ b/eq-author/src/components/RichTextEditor/__snapshots__/RichTextEditor.test.js.snap
@@ -160,7 +160,7 @@ exports[`components/RichTextEditor should allow multiline input 1`] = `
           blockStyleFn={[Function]}
           customStyleMap={
             Object {
-              "ITALIC": Object {
+              "HIGHLIGHT": Object {
                 "backgroundColor": "#cbe2c8",
               },
             }
@@ -497,7 +497,7 @@ exports[`components/RichTextEditor should render 1`] = `
           blockStyleFn={[Function]}
           customStyleMap={
             Object {
-              "ITALIC": Object {
+              "HIGHLIGHT": Object {
                 "backgroundColor": "#cbe2c8",
               },
             }
@@ -892,7 +892,7 @@ exports[`components/RichTextEditor should render existing content 1`] = `
           blockStyleFn={[Function]}
           customStyleMap={
             Object {
-              "ITALIC": Object {
+              "HIGHLIGHT": Object {
                 "backgroundColor": "#cbe2c8",
               },
             }
@@ -1279,7 +1279,7 @@ exports[`components/RichTextEditor should show as disabled and readonly when dis
           blockStyleFn={[Function]}
           customStyleMap={
             Object {
-              "ITALIC": Object {
+              "HIGHLIGHT": Object {
                 "backgroundColor": "#cbe2c8",
               },
             }

From 9783e7bb44ba43ed3e7fd3d1e2a2288f53c5e370 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Tue, 9 Apr 2024 12:17:16 +0100
Subject: [PATCH 004/215] Add conversion tests for bold and highlight styles

---
 .../RichTextEditor/utils/convert.test.js      | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/eq-author/src/components/RichTextEditor/utils/convert.test.js b/eq-author/src/components/RichTextEditor/utils/convert.test.js
index f1206f0365..ed11151e04 100644
--- a/eq-author/src/components/RichTextEditor/utils/convert.test.js
+++ b/eq-author/src/components/RichTextEditor/utils/convert.test.js
@@ -33,6 +33,30 @@ describe("convert", () => {
 
       expect(html).toEqual(htmlEntity);
     });
+
+    it("should convert BOLD style to HTML", () => {
+      const rawBoldText = new Raw()
+        .addBlock("Test text")
+        .addInlineStyle("BOLD", 0, 4); // Applies BOLD style to first four characters in "Test text"
+      const expectedHtmlBold = `<p><strong class="bold">Test</strong> text</p>`;
+
+      const convert = toHTML({});
+      const convertedHtml = convert(rawBoldText.toEditorState());
+
+      expect(convertedHtml).toEqual(expectedHtmlBold);
+    });
+
+    it("should convert HIGHLIGHT style to HTML", () => {
+      const rawHighlightText = new Raw()
+        .addBlock("Test text")
+        .addInlineStyle("HIGHLIGHT", 0, 4); // Applies HIGHLIGHT style to first four characters in "Test text"
+      const expectedHtmlHighlight = `<p><strong class="highlight">Test</strong> text</p>`;
+
+      const convert = toHTML({});
+      const convertedHtml = convert(rawHighlightText.toEditorState());
+
+      expect(convertedHtml).toEqual(expectedHtmlHighlight);
+    });
   });
 
   describe("fromHTML", () => {
@@ -54,5 +78,31 @@ describe("convert", () => {
 
       expect(stateToRaw(editorState)).toEqual(rawEntity.toRawContentState());
     });
+
+    it("should convert BOLD from HTML", () => {
+      const htmlBold = `<p><strong class="bold">Test</strong> text</p>`;
+      const rawBoldText = new Raw()
+        .addBlock("Test text")
+        .addInlineStyle("BOLD", 0, 4); // Applies BOLD style to first four characters in "Test text"
+
+      const convert = fromHTML({});
+      const editorState = EditorState.createWithContent(convert(htmlBold));
+
+      expect(stateToRaw(editorState)).toEqual(rawBoldText.toRawContentState());
+    });
+
+    it("should convert HIGHLIGHT from HTML", () => {
+      const htmlHighlight = `<p><strong class="highlight">Test</strong> text</p>`;
+      const rawHighlightText = new Raw()
+        .addBlock("Test text")
+        .addInlineStyle("HIGHLIGHT", 0, 4); // Applies HIGHLIGHT style to first four characters in "Test text"
+
+      const convert = fromHTML({});
+      const editorState = EditorState.createWithContent(convert(htmlHighlight));
+
+      expect(stateToRaw(editorState)).toEqual(
+        rawHighlightText.toRawContentState()
+      );
+    });
   });
 });

From f59a34a350b24909218e1f5088bf49db3fb0c936 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Thu, 11 Apr 2024 10:29:05 +0100
Subject: [PATCH 005/215] Display toolbar buttons as inactive based on prop

---
 .../Design/QuestionPageEditor/MetaEditor.js   |  1 +
 .../src/components/RichTextEditor/Toolbar.js  |  4 +--
 .../src/components/RichTextEditor/index.js    | 27 ++++++++++++++-----
 .../RichTextEditor/utils/convert.js           | 27 ++-----------------
 .../utils/createFormatStripper.js             |  8 +++---
 5 files changed, 30 insertions(+), 37 deletions(-)

diff --git a/eq-author/src/App/page/Design/QuestionPageEditor/MetaEditor.js b/eq-author/src/App/page/Design/QuestionPageEditor/MetaEditor.js
index 5ee3304c56..c592c7fb1a 100644
--- a/eq-author/src/App/page/Design/QuestionPageEditor/MetaEditor.js
+++ b/eq-author/src/App/page/Design/QuestionPageEditor/MetaEditor.js
@@ -56,6 +56,7 @@ export class StatelessMetaEditor extends React.Component {
           listId={
             (page.section?.repeatingSectionListId || page.folder.listId) ?? null
           }
+          usesHighlightStyle
           errorValidationMsg={this.errorMsg("title")}
         />
       </div>
diff --git a/eq-author/src/components/RichTextEditor/Toolbar.js b/eq-author/src/components/RichTextEditor/Toolbar.js
index 73919cd328..449eef275c 100644
--- a/eq-author/src/components/RichTextEditor/Toolbar.js
+++ b/eq-author/src/components/RichTextEditor/Toolbar.js
@@ -31,11 +31,11 @@ export const styleButtons = [
     style: "BOLD",
   },
   {
-    id: "highlight",
+    id: "emphasis",
     title: "Highlight",
     icon: iconEmphasis,
     type: STYLE_INLINE,
-    style: "HIGHLIGHT",
+    style: "BOLD",
   },
 ];
 
diff --git a/eq-author/src/components/RichTextEditor/index.js b/eq-author/src/components/RichTextEditor/index.js
index 3aa6b685f0..dcc9b4157e 100644
--- a/eq-author/src/components/RichTextEditor/index.js
+++ b/eq-author/src/components/RichTextEditor/index.js
@@ -31,10 +31,13 @@ import PasteModal, {
   preserveRichFormatting,
 } from "components/modals/PasteModal";
 
-const styleMap = {
-  HIGHLIGHT: {
-    backgroundColor: "#cbe2c8",
-  },
+const styleMap = (usesHighlightStyle) => {
+  return {
+    BOLD: {
+      backgroundColor: usesHighlightStyle && "#cbe2c8",
+      fontWeight: !usesHighlightStyle && "bold",
+    },
+  };
 };
 
 const heading = css`
@@ -178,6 +181,7 @@ class RichTextEditor extends React.Component {
     linkLimit: PropTypes.number,
     withoutMargin: PropTypes.bool,
     isRepeatingSection: PropTypes.bool,
+    usesHighlightStyle: PropTypes.bool,
     allCalculatedSummaryPages: PropTypes.array, //eslint-disable-line
   };
 
@@ -371,8 +375,17 @@ class RichTextEditor extends React.Component {
   hasInlineStyle = (editorState, style) =>
     editorState.getCurrentInlineStyle().has(style);
 
-  isActiveControl = ({ style, type }) => {
+  isActiveControl = ({ id, style, type }) => {
     const { editorState } = this.state;
+    const { usesHighlightStyle } = this.props;
+
+    // Displays bold button as inactive when highlight style is used, and emphasis button as inactive when highlight style is not used
+    if (
+      (usesHighlightStyle && id === "bold") ||
+      (!usesHighlightStyle && id === "emphasis")
+    ) {
+      return false;
+    }
 
     return type === STYLE_BLOCK
       ? this.hasBlockStyle(editorState, style)
@@ -485,6 +498,7 @@ class RichTextEditor extends React.Component {
       withoutMargin,
       allCalculatedSummaryPages,
       isRepeatingSection,
+      usesHighlightStyle, // Uses highlight style instead of bold for strong tags when true
       ...otherProps
     } = this.props;
 
@@ -530,6 +544,7 @@ class RichTextEditor extends React.Component {
                 linkLimit={linkLimit}
                 allCalculatedSummaryPages={allCalculatedSummaryPages}
                 isRepeatingSection={isRepeatingSection}
+                usesHighlightStyle={usesHighlightStyle}
                 {...otherProps}
               />
 
@@ -539,7 +554,7 @@ class RichTextEditor extends React.Component {
                 editorState={editorState}
                 onChange={this.handleChange}
                 ref={this.setEditorInstance}
-                customStyleMap={styleMap}
+                customStyleMap={styleMap(usesHighlightStyle)}
                 blockStyleFn={getBlockStyle}
                 handleReturn={multiline ? undefined : this.handleReturn}
                 handlePastedText={
diff --git a/eq-author/src/components/RichTextEditor/utils/convert.js b/eq-author/src/components/RichTextEditor/utils/convert.js
index 7c9e3769fc..3abf1dce9d 100644
--- a/eq-author/src/components/RichTextEditor/utils/convert.js
+++ b/eq-author/src/components/RichTextEditor/utils/convert.js
@@ -1,4 +1,3 @@
-import React from "react";
 import { convertToHTML, convertFromHTML } from "draft-convert";
 
 export const toHTML = (entityMap) => {
@@ -7,18 +6,7 @@ export const toHTML = (entityMap) => {
     return mapper ? mapper(entity) : originalText;
   };
 
-  // Adds strong tags with class names to text based on the text's style
-  const styleToHTML = (style) => {
-    if (style === "BOLD") {
-      return <strong className="bold" />;
-    }
-
-    if (style === "HIGHLIGHT") {
-      return <strong className="highlight" />;
-    }
-  };
-
-  const convert = convertToHTML({ styleToHTML, entityToHTML });
+  const convert = convertToHTML({ entityToHTML });
 
   return (editorState) => convert(editorState.getCurrentContent());
 };
@@ -33,16 +21,5 @@ export const fromHTML = (nodeToFn) => {
     return entity || null;
   };
 
-  // Applies specific styles based on tags and class names - buttons in the toolbar are activated based on these styles
-  const htmlToStyle = (nodeName, node, currentStyle) => {
-    if (nodeName === "strong" && node.className === "highlight") {
-      return currentStyle.add("HIGHLIGHT").remove("BOLD");
-    }
-    if (nodeName === "strong" && node.className === "bold") {
-      return currentStyle.add("BOLD");
-    }
-    return currentStyle;
-  };
-
-  return convertFromHTML({ htmlToStyle, htmlToEntity });
+  return convertFromHTML({ htmlToEntity });
 };
diff --git a/eq-author/src/components/RichTextEditor/utils/createFormatStripper.js b/eq-author/src/components/RichTextEditor/utils/createFormatStripper.js
index 7c75b29e86..78608c6645 100644
--- a/eq-author/src/components/RichTextEditor/utils/createFormatStripper.js
+++ b/eq-author/src/components/RichTextEditor/utils/createFormatStripper.js
@@ -4,10 +4,10 @@ import { filterConfig as pipedFilterConfig } from "components/RichTextEditor/ent
 import { filterConfig as linkFilterConfig } from "components/RichTextEditor/LinkPlugin";
 
 const mapper = {
-  bold: { format: "BOLD", type: "styles" },
-  highlight: { format: "HIGHLIGHT", type: "styles" },
-  list: { format: "unordered-list-item", type: "blocks" },
-  heading: { format: "header-two", type: "blocks" },
+  bold: { id: "bold", format: "BOLD", type: "styles" },
+  emphasis: { id: "emphasis", format: "BOLD", type: "styles" },
+  list: { id: "list", format: "unordered-list-item", type: "blocks" },
+  heading: { id: "heading", format: "header-two", type: "blocks" },
 };
 
 export default function createFormatStripper(controls) {

From 8deb8b8458bc6483f25eacc0e20f237c81a839f9 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Thu, 11 Apr 2024 10:29:15 +0100
Subject: [PATCH 006/215] Add migration

---
 .../migrations/convertEmTagsToStrongTags.js   | 19 +++++++++++++++++++
 eq-author-api/migrations/index.js             |  1 +
 2 files changed, 20 insertions(+)
 create mode 100644 eq-author-api/migrations/convertEmTagsToStrongTags.js

diff --git a/eq-author-api/migrations/convertEmTagsToStrongTags.js b/eq-author-api/migrations/convertEmTagsToStrongTags.js
new file mode 100644
index 0000000000..e693ddebf1
--- /dev/null
+++ b/eq-author-api/migrations/convertEmTagsToStrongTags.js
@@ -0,0 +1,19 @@
+const convertEmTagsToStrongTags = (inputData) => {
+  if (inputData !== null && inputData !== undefined) {
+    if (typeof inputData === "string") {
+      inputData = inputData
+        .replace(/<em>/g, "<strong>")
+        .replace(/<\/em>/g, "</strong>");
+    } else if (Array.isArray(inputData)) {
+      inputData = inputData.map((item) => convertEmTagsToStrongTags(item));
+    } else if (typeof inputData === "object") {
+      Object.keys(inputData).forEach((key) => {
+        inputData[key] = convertEmTagsToStrongTags(inputData[key]);
+      });
+    }
+  }
+
+  return inputData;
+};
+
+module.exports = (questionnaire) => convertEmTagsToStrongTags(questionnaire);
diff --git a/eq-author-api/migrations/index.js b/eq-author-api/migrations/index.js
index 65a48a73e3..cc793812be 100644
--- a/eq-author-api/migrations/index.js
+++ b/eq-author-api/migrations/index.js
@@ -54,6 +54,7 @@ const migrations = [
   require("./addAdditonalContentsToAddItemPage"),
   require("./updateHealthThemeToPandemicMonitoring"),
   require("./addAllowableDataVersions"),
+  require("./convertEmTagsToStrongTags"),
 ];
 
 const currentVersion = migrations.length;

From ef2b0e567323443861e3e1a581d375f011f128a1 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Thu, 11 Apr 2024 15:16:42 +0100
Subject: [PATCH 007/215] Display bold and highlight buttons as inactive based
 on controls

---
 .../Design/QuestionPageEditor/MetaEditor.js   |  1 -
 .../src/components/RichTextEditor/Toolbar.js  |  4 ++--
 .../src/components/RichTextEditor/index.js    | 21 ++++++++-----------
 .../utils/createFormatStripper.js             |  2 +-
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/eq-author/src/App/page/Design/QuestionPageEditor/MetaEditor.js b/eq-author/src/App/page/Design/QuestionPageEditor/MetaEditor.js
index c592c7fb1a..5ee3304c56 100644
--- a/eq-author/src/App/page/Design/QuestionPageEditor/MetaEditor.js
+++ b/eq-author/src/App/page/Design/QuestionPageEditor/MetaEditor.js
@@ -56,7 +56,6 @@ export class StatelessMetaEditor extends React.Component {
           listId={
             (page.section?.repeatingSectionListId || page.folder.listId) ?? null
           }
-          usesHighlightStyle
           errorValidationMsg={this.errorMsg("title")}
         />
       </div>
diff --git a/eq-author/src/components/RichTextEditor/Toolbar.js b/eq-author/src/components/RichTextEditor/Toolbar.js
index 449eef275c..1ede91c766 100644
--- a/eq-author/src/components/RichTextEditor/Toolbar.js
+++ b/eq-author/src/components/RichTextEditor/Toolbar.js
@@ -31,7 +31,7 @@ export const styleButtons = [
     style: "BOLD",
   },
   {
-    id: "emphasis",
+    id: "highlight",
     title: "Highlight",
     icon: iconEmphasis,
     type: STYLE_INLINE,
@@ -86,7 +86,7 @@ class ToolBar extends React.Component {
     selectionIsCollapsed: PropTypes.bool.isRequired,
     controls: PropTypes.shape({
       bold: PropTypes.bool,
-      emphasis: PropTypes.bool,
+      highlight: PropTypes.bool,
       heading: PropTypes.bool,
       list: PropTypes.bool,
       piping: PropTypes.bool,
diff --git a/eq-author/src/components/RichTextEditor/index.js b/eq-author/src/components/RichTextEditor/index.js
index dcc9b4157e..47e16b64db 100644
--- a/eq-author/src/components/RichTextEditor/index.js
+++ b/eq-author/src/components/RichTextEditor/index.js
@@ -31,11 +31,11 @@ import PasteModal, {
   preserveRichFormatting,
 } from "components/modals/PasteModal";
 
-const styleMap = (usesHighlightStyle) => {
+const styleMap = (controls) => {
   return {
     BOLD: {
-      backgroundColor: usesHighlightStyle && "#cbe2c8",
-      fontWeight: !usesHighlightStyle && "bold",
+      backgroundColor: controls.highlight && "#cbe2c8",
+      fontWeight: controls.bold && "bold",
     },
   };
 };
@@ -161,7 +161,7 @@ class RichTextEditor extends React.Component {
       piping: PropTypes.bool,
       link: PropTypes.bool,
       bold: PropTypes.bool,
-      emphasis: PropTypes.bool,
+      highlight: PropTypes.bool,
       list: PropTypes.bool,
       heading: PropTypes.bool,
     }),
@@ -181,7 +181,6 @@ class RichTextEditor extends React.Component {
     linkLimit: PropTypes.number,
     withoutMargin: PropTypes.bool,
     isRepeatingSection: PropTypes.bool,
-    usesHighlightStyle: PropTypes.bool,
     allCalculatedSummaryPages: PropTypes.array, //eslint-disable-line
   };
 
@@ -377,12 +376,12 @@ class RichTextEditor extends React.Component {
 
   isActiveControl = ({ id, style, type }) => {
     const { editorState } = this.state;
-    const { usesHighlightStyle } = this.props;
+    const { controls } = this.props;
 
-    // Displays bold button as inactive when highlight style is used, and emphasis button as inactive when highlight style is not used
+    // Displays bold and highlight buttons as inactive when the control is not enabled
     if (
-      (usesHighlightStyle && id === "bold") ||
-      (!usesHighlightStyle && id === "emphasis")
+      (id === "bold" && !controls.bold) ||
+      (id === "highlight" && !controls.highlight)
     ) {
       return false;
     }
@@ -498,7 +497,6 @@ class RichTextEditor extends React.Component {
       withoutMargin,
       allCalculatedSummaryPages,
       isRepeatingSection,
-      usesHighlightStyle, // Uses highlight style instead of bold for strong tags when true
       ...otherProps
     } = this.props;
 
@@ -544,7 +542,6 @@ class RichTextEditor extends React.Component {
                 linkLimit={linkLimit}
                 allCalculatedSummaryPages={allCalculatedSummaryPages}
                 isRepeatingSection={isRepeatingSection}
-                usesHighlightStyle={usesHighlightStyle}
                 {...otherProps}
               />
 
@@ -554,7 +551,7 @@ class RichTextEditor extends React.Component {
                 editorState={editorState}
                 onChange={this.handleChange}
                 ref={this.setEditorInstance}
-                customStyleMap={styleMap(usesHighlightStyle)}
+                customStyleMap={styleMap(this.props.controls)}
                 blockStyleFn={getBlockStyle}
                 handleReturn={multiline ? undefined : this.handleReturn}
                 handlePastedText={
diff --git a/eq-author/src/components/RichTextEditor/utils/createFormatStripper.js b/eq-author/src/components/RichTextEditor/utils/createFormatStripper.js
index 78608c6645..760e5ccf06 100644
--- a/eq-author/src/components/RichTextEditor/utils/createFormatStripper.js
+++ b/eq-author/src/components/RichTextEditor/utils/createFormatStripper.js
@@ -5,7 +5,7 @@ import { filterConfig as linkFilterConfig } from "components/RichTextEditor/Link
 
 const mapper = {
   bold: { id: "bold", format: "BOLD", type: "styles" },
-  emphasis: { id: "emphasis", format: "BOLD", type: "styles" },
+  highlight: { id: "highlight", format: "BOLD", type: "styles" },
   list: { id: "list", format: "unordered-list-item", type: "blocks" },
   heading: { id: "heading", format: "header-two", type: "blocks" },
 };

From e14ef87bf42382d8a7ca5abc8c014a99b55f7ece Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Fri, 12 Apr 2024 11:53:27 +0100
Subject: [PATCH 008/215] Update rich text editor controls for heading and
 non-heading tags

---
 .../src/App/Submission/Design/SubmissionEditor/index.js     | 1 -
 eq-author/src/App/history/HistoryItem.js                    | 1 -
 eq-author/src/App/history/HistoryPage.js                    | 1 -
 .../CollapsiblesEditor/CollapsibleEditor/index.js           | 2 --
 .../src/App/introduction/Design/IntroductionEditor/index.js | 6 ++----
 .../App/page/Design/CalculatedSummaryPageEditor/index.js    | 2 +-
 .../ListCollectorPageEditors/AddItemPageEditor/index.js     | 3 ++-
 .../ConfirmationPageEditor/index.js                         | 3 ++-
 .../ListCollectorPageEditors/QualifierPageEditor/index.js   | 3 ++-
 .../src/App/page/Design/QuestionPageEditor/MetaEditor.js    | 2 +-
 .../QuestionProperties/AdditionalContentOptions.js          | 4 +---
 eq-author/src/App/questionConfirmation/Design/Editor.js     | 2 +-
 .../Design/SectionEditor/SectionIntroduction/index.js       | 3 +--
 eq-author/src/App/section/Design/SectionEditor/index.js     | 2 +-
 14 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/eq-author/src/App/Submission/Design/SubmissionEditor/index.js b/eq-author/src/App/Submission/Design/SubmissionEditor/index.js
index f0bf85dbc1..db12aa13fb 100644
--- a/eq-author/src/App/Submission/Design/SubmissionEditor/index.js
+++ b/eq-author/src/App/Submission/Design/SubmissionEditor/index.js
@@ -46,7 +46,6 @@ const InlineField = styled(Field)`
 const contentControls = {
   heading: true,
   bold: true,
-  emphasis: true,
   list: true,
   link: true,
 };
diff --git a/eq-author/src/App/history/HistoryItem.js b/eq-author/src/App/history/HistoryItem.js
index 9d891a881c..448bb8f645 100644
--- a/eq-author/src/App/history/HistoryItem.js
+++ b/eq-author/src/App/history/HistoryItem.js
@@ -160,7 +160,6 @@ const HistoryItem = ({
               value={noteState}
               controls={{
                 heading: true,
-                emphasis: true,
                 list: true,
                 bold: true,
               }}
diff --git a/eq-author/src/App/history/HistoryPage.js b/eq-author/src/App/history/HistoryPage.js
index 5f3592c74a..2fd38793d2 100644
--- a/eq-author/src/App/history/HistoryPage.js
+++ b/eq-author/src/App/history/HistoryPage.js
@@ -124,7 +124,6 @@ const HistoryPageContent = ({ match }) => {
               value={noteState.value}
               controls={{
                 heading: true,
-                emphasis: true,
                 list: true,
                 bold: true,
               }}
diff --git a/eq-author/src/App/introduction/Design/IntroductionEditor/CollapsiblesEditor/CollapsibleEditor/index.js b/eq-author/src/App/introduction/Design/IntroductionEditor/CollapsiblesEditor/CollapsibleEditor/index.js
index c128cf98bb..4ad7f2d30d 100644
--- a/eq-author/src/App/introduction/Design/IntroductionEditor/CollapsiblesEditor/CollapsibleEditor/index.js
+++ b/eq-author/src/App/introduction/Design/IntroductionEditor/CollapsiblesEditor/CollapsibleEditor/index.js
@@ -28,7 +28,6 @@ const Detail = styled.div`
   position: relative;
 `;
 
-
 const DetailHeader = styled.div`
   position: absolute;
   top: 0.5em;
@@ -100,7 +99,6 @@ export const CollapsibleEditor = ({
         onUpdate={onChangeUpdate}
         multiline
         controls={{
-          emphasis: true,
           piping: true,
           list: true,
           bold: true,
diff --git a/eq-author/src/App/introduction/Design/IntroductionEditor/index.js b/eq-author/src/App/introduction/Design/IntroductionEditor/index.js
index 28761ce7a2..197dbf9b2a 100644
--- a/eq-author/src/App/introduction/Design/IntroductionEditor/index.js
+++ b/eq-author/src/App/introduction/Design/IntroductionEditor/index.js
@@ -45,13 +45,12 @@ const SectionDescription = styled.p`
 `;
 
 const titleControls = {
-  emphasis: true,
+  highlight: true,
   piping: true,
 };
 
 const descriptionControls = {
   bold: true,
-  emphasis: true,
   piping: true,
   list: true,
   link: true,
@@ -165,9 +164,8 @@ const IntroductionEditor = ({ introduction, history }) => {
             }
             controls={{
               heading: true,
-              bold: true,
               link: true,
-              emphasis: true,
+              highlight: true,
               piping: true,
             }}
             testSelector="txt-intro-title"
diff --git a/eq-author/src/App/page/Design/CalculatedSummaryPageEditor/index.js b/eq-author/src/App/page/Design/CalculatedSummaryPageEditor/index.js
index da49dbf9e8..49b2b5bd8a 100644
--- a/eq-author/src/App/page/Design/CalculatedSummaryPageEditor/index.js
+++ b/eq-author/src/App/page/Design/CalculatedSummaryPageEditor/index.js
@@ -36,7 +36,7 @@ import CommentFragment from "graphql/fragments/comment.graphql";
 import AnswerFragment from "graphql/fragments/answer.graphql";
 
 const titleControls = {
-  emphasis: true,
+  highlight: true,
   piping: true,
 };
 
diff --git a/eq-author/src/App/page/Design/ListCollectorPageEditors/AddItemPageEditor/index.js b/eq-author/src/App/page/Design/ListCollectorPageEditors/AddItemPageEditor/index.js
index 0acf6ff1c8..95eb8f6456 100644
--- a/eq-author/src/App/page/Design/ListCollectorPageEditors/AddItemPageEditor/index.js
+++ b/eq-author/src/App/page/Design/ListCollectorPageEditors/AddItemPageEditor/index.js
@@ -59,7 +59,7 @@ const StyledCollapsible = styled(Collapsible)`
   margin-top: 1em;
 `;
 const titleControls = {
-  emphasis: true,
+  highlight: true,
   piping: true,
 };
 
@@ -148,6 +148,7 @@ const AddItemPageEditor = ({ fetchAnswers, page }) => {
             })
           }
           errorValidationMsg={getErrorMessage("title")}
+          size="large"
           controls={titleControls}
           allowableTypes={[ANSWER, METADATA, VARIABLES]}
           testSelector="add-item-question"
diff --git a/eq-author/src/App/page/Design/ListCollectorPageEditors/ConfirmationPageEditor/index.js b/eq-author/src/App/page/Design/ListCollectorPageEditors/ConfirmationPageEditor/index.js
index faa5ab56ed..9fee4ce250 100644
--- a/eq-author/src/App/page/Design/ListCollectorPageEditors/ConfirmationPageEditor/index.js
+++ b/eq-author/src/App/page/Design/ListCollectorPageEditors/ConfirmationPageEditor/index.js
@@ -54,7 +54,7 @@ const HorizontalSeparator = styled.hr`
 `;
 
 const titleControls = {
-  emphasis: true,
+  highlight: true,
   piping: true,
 };
 
@@ -124,6 +124,7 @@ const ConfirmationPageEditor = ({ page, onUpdateOption }) => {
             })
           }
           errorValidationMsg={getErrorMessage("title")}
+          size="large"
           controls={titleControls}
           allowableTypes={[ANSWER, METADATA, VARIABLES]}
           testSelector="confirmation-question"
diff --git a/eq-author/src/App/page/Design/ListCollectorPageEditors/QualifierPageEditor/index.js b/eq-author/src/App/page/Design/ListCollectorPageEditors/QualifierPageEditor/index.js
index 3072731050..c871e17509 100644
--- a/eq-author/src/App/page/Design/ListCollectorPageEditors/QualifierPageEditor/index.js
+++ b/eq-author/src/App/page/Design/ListCollectorPageEditors/QualifierPageEditor/index.js
@@ -55,7 +55,7 @@ const HorizontalSeparator = styled.hr`
 `;
 
 const titleControls = {
-  emphasis: true,
+  highlight: true,
   piping: true,
 };
 
@@ -127,6 +127,7 @@ const QualifierPageEditor = ({ page, onUpdateOption }) => {
             })
           }
           errorValidationMsg={getErrorMessage("title")}
+          size="large"
           controls={titleControls}
           allowableTypes={[ANSWER, METADATA, VARIABLES]}
           testSelector="qualifier-question"
diff --git a/eq-author/src/App/page/Design/QuestionPageEditor/MetaEditor.js b/eq-author/src/App/page/Design/QuestionPageEditor/MetaEditor.js
index 5ee3304c56..18b3e5f835 100644
--- a/eq-author/src/App/page/Design/QuestionPageEditor/MetaEditor.js
+++ b/eq-author/src/App/page/Design/QuestionPageEditor/MetaEditor.js
@@ -19,7 +19,7 @@ import {
 } from "components/ContentPickerSelectv3/content-types";
 
 const titleControls = {
-  emphasis: true,
+  highlight: true,
   piping: true,
 };
 
diff --git a/eq-author/src/App/page/Design/QuestionPageEditor/QuestionProperties/AdditionalContentOptions.js b/eq-author/src/App/page/Design/QuestionPageEditor/QuestionProperties/AdditionalContentOptions.js
index e572e787e1..1b413e2139 100644
--- a/eq-author/src/App/page/Design/QuestionPageEditor/QuestionProperties/AdditionalContentOptions.js
+++ b/eq-author/src/App/page/Design/QuestionPageEditor/QuestionProperties/AdditionalContentOptions.js
@@ -26,20 +26,18 @@ import {
 
 const contentControls = {
   bold: true,
-  emphasis: true,
   list: true,
   link: true,
 };
 
 const descriptionControls = {
-  emphasis: true,
+  bold: true,
   piping: true,
   link: true,
 };
 
 const definitionControls = {
   list: true,
-  emphasis: true,
   bold: true,
   link: true,
 };
diff --git a/eq-author/src/App/questionConfirmation/Design/Editor.js b/eq-author/src/App/questionConfirmation/Design/Editor.js
index c302441ae5..ff775621de 100644
--- a/eq-author/src/App/questionConfirmation/Design/Editor.js
+++ b/eq-author/src/App/questionConfirmation/Design/Editor.js
@@ -65,7 +65,7 @@ export class UnwrappedEditor extends React.Component {
           label="Confirmation question"
           value={title}
           onUpdate={this.handleRichTextUpdate}
-          controls={{ bold: true, emphasis: true, piping: true }}
+          controls={{ highlight: true, piping: true }}
           size="large"
           testSelector="txt-confirmation-title"
           data-test="title-input"
diff --git a/eq-author/src/App/section/Design/SectionEditor/SectionIntroduction/index.js b/eq-author/src/App/section/Design/SectionEditor/SectionIntroduction/index.js
index b4c36fabc7..d5fd0b3019 100644
--- a/eq-author/src/App/section/Design/SectionEditor/SectionIntroduction/index.js
+++ b/eq-author/src/App/section/Design/SectionEditor/SectionIntroduction/index.js
@@ -57,7 +57,7 @@ const SectionIntroduction = ({
           size="large"
           testSelector="txt-introduction-title"
           value={section?.introductionTitle}
-          controls={{ piping: true }}
+          controls={{ highlight: true, piping: true }}
           listId={section?.repeatingSectionListId ?? null}
           errorValidationMsg={introductionTitleErrorMessage}
         />
@@ -74,7 +74,6 @@ const SectionIntroduction = ({
             bold: true,
             list: true,
             piping: true,
-            emphasis: true,
             link: true,
           }}
           listId={section?.repeatingSectionListId ?? null}
diff --git a/eq-author/src/App/section/Design/SectionEditor/index.js b/eq-author/src/App/section/Design/SectionEditor/index.js
index f5cd59c166..518c07f0b7 100644
--- a/eq-author/src/App/section/Design/SectionEditor/index.js
+++ b/eq-author/src/App/section/Design/SectionEditor/index.js
@@ -32,7 +32,7 @@ import {
 } from "constants/modal-content";
 
 const titleControls = {
-  emphasis: true,
+  highlight: true,
   piping: true,
 };
 

From 0f9b33f040bdeb9afe6758c5d80f5a93f10e993f Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Fri, 12 Apr 2024 13:10:18 +0100
Subject: [PATCH 009/215] Fix migration to prevent wrapping text in two strong
 tags when original text was wrapped in strong and em tags

---
 eq-author-api/migrations/convertEmTagsToStrongTags.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/eq-author-api/migrations/convertEmTagsToStrongTags.js b/eq-author-api/migrations/convertEmTagsToStrongTags.js
index e693ddebf1..f113983e34 100644
--- a/eq-author-api/migrations/convertEmTagsToStrongTags.js
+++ b/eq-author-api/migrations/convertEmTagsToStrongTags.js
@@ -1,7 +1,13 @@
 const convertEmTagsToStrongTags = (inputData) => {
   if (inputData !== null && inputData !== undefined) {
     if (typeof inputData === "string") {
+      /* 
+        Removes em tags wrapped in strong tags and em tags wrapped around strong tags before converting em tags 
+        Prevents wrapping text in two strong tags when it was previously wrapped in both strong and em tags
+      */
       inputData = inputData
+        .replace(/<strong><em>|<em><strong>/g, "<strong>")
+        .replace(/<\/em><\/strong>|<\/strong><\/em>/g, "</strong>")
         .replace(/<em>/g, "<strong>")
         .replace(/<\/em>/g, "</strong>");
     } else if (Array.isArray(inputData)) {

From 468c6983fa56961fce7f368e16d0ab4791a28d55 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Fri, 12 Apr 2024 15:25:13 +0100
Subject: [PATCH 010/215] Add migration tests

---
 .../convertEmTagsToStrongTags.test.js         | 78 +++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 eq-author-api/migrations/convertEmTagsToStrongTags.test.js

diff --git a/eq-author-api/migrations/convertEmTagsToStrongTags.test.js b/eq-author-api/migrations/convertEmTagsToStrongTags.test.js
new file mode 100644
index 0000000000..e9e004e7ea
--- /dev/null
+++ b/eq-author-api/migrations/convertEmTagsToStrongTags.test.js
@@ -0,0 +1,78 @@
+const convertEmTagsToStrongTags = require("./convertEmTagsToStrongTags");
+
+describe("convertEmTagsToStrongTags", () => {
+  it("should replace em tags with strong tags in a string", () => {
+    const emText = "<em>Question 1</em>";
+
+    expect(convertEmTagsToStrongTags(emText)).toEqual(
+      "<strong>Question 1</strong>"
+    );
+  });
+
+  it("should not replace strong tags", () => {
+    const strongText = "<strong>Question 1</strong>";
+
+    expect(convertEmTagsToStrongTags(strongText)).toEqual(strongText);
+  });
+
+  it("should replace em tags with strong tags in an array of strings", () => {
+    const emArray = ["<em>Question 1</em>", "<em>Question 2</em>"];
+
+    expect(convertEmTagsToStrongTags(emArray)).toEqual([
+      "<strong>Question 1</strong>",
+      "<strong>Question 2</strong>",
+    ]);
+  });
+
+  it("should replace em tags with strong tags in an object", () => {
+    const page = {
+      title: "<em>Test title</em>",
+      description: "<em>Test description</em>",
+      answers: [
+        {
+          label: "<em>Answer 1</em>",
+        },
+        {
+          label: "<em>Answer 2</em>",
+        },
+      ],
+    };
+
+    expect(convertEmTagsToStrongTags(page)).toEqual({
+      title: "<strong>Test title</strong>",
+      description: "<strong>Test description</strong>",
+      answers: [
+        {
+          label: "<strong>Answer 1</strong>",
+        },
+        {
+          label: "<strong>Answer 2</strong>",
+        },
+      ],
+    });
+  });
+
+  it("should not wrap text in two strong tags when text is wrapped in strong and em tags", () => {
+    const emTagsWrappedInStrong = "<strong><em>Question 1</em></strong>";
+    const strongTagsWrappedInEm = "<em><strong>Question 2</strong></em>";
+
+    expect(convertEmTagsToStrongTags(emTagsWrappedInStrong)).toEqual(
+      "<strong>Question 1</strong>"
+    );
+    expect(convertEmTagsToStrongTags(strongTagsWrappedInEm)).toEqual(
+      "<strong>Question 2</strong>"
+    );
+  });
+
+  it("should return undefined if inputData is undefined", () => {
+    expect(convertEmTagsToStrongTags(undefined)).toBeUndefined(); // convertEmTagsToStrongTags returns inputData, which is undefined
+  });
+
+  it("should return null if inputData is null", () => {
+    expect(convertEmTagsToStrongTags(null)).toBeNull(); // convertEmTagsToStrongTags returns inputData, which is null
+  });
+
+  it("should return inputData if inputData is not string, array, or object", () => {
+    expect(convertEmTagsToStrongTags(true)).toEqual(true);
+  });
+});

From b1a8435bc2c4b58af6de61569603cee405e8a95c Mon Sep 17 00:00:00 2001
From: sudeep <sudeep.kunhikannan@ons.gov.uk>
Date: Mon, 15 Apr 2024 10:49:04 +0100
Subject: [PATCH 011/215] display supplementary data list items

Signed-off-by: sudeep <sudeep.kunhikannan@ons.gov.uk>
---
 eq-author/src/components/RichTextEditor/PipingMenu.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/eq-author/src/components/RichTextEditor/PipingMenu.js b/eq-author/src/components/RichTextEditor/PipingMenu.js
index 189cc4d0e4..7b9d2883f7 100644
--- a/eq-author/src/components/RichTextEditor/PipingMenu.js
+++ b/eq-author/src/components/RichTextEditor/PipingMenu.js
@@ -126,13 +126,7 @@ const PipingMenu = ({
 
   let allSupplementaryData = questionnaire?.supplementaryData?.data || [];
 
-  if (
-    allSupplementaryData &&
-    !(
-      pageType === "Introduction" &&
-      questionnaire?.sections[0]?.repeatingSection
-    )
-  ) {
+  if (allSupplementaryData && !(pageType === "Introduction")) {
     allSupplementaryData = allSupplementaryData.filter(
       (list) => list.listName === "" || list.id === listId
     );

From 334a049728d2693568bd3d403c7a5f91ac76fce8 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Mon, 15 Apr 2024 10:29:48 +0100
Subject: [PATCH 012/215] Update failing tests

---
 .../__snapshots__/index.test.js.snap          |   1 -
 .../__snapshots__/index.test.js.snap          |  10 +-
 .../__snapshots__/MetaEditor.test.js.snap     |  18 +--
 .../Design/__snapshots__/Editor.test.js.snap  |   6 +-
 .../__snapshots__/SectionEditor.test.js.snap  |   4 +-
 .../RichTextEditor/RichTextEditor.test.js     |   6 +-
 .../src/components/RichTextEditor/Toolbar.js  |   2 +-
 .../__snapshots__/RichTextEditor.test.js.snap | 106 ++++++++++++------
 .../RichTextEditor/utils/convert.test.js      |  50 ---------
 9 files changed, 93 insertions(+), 110 deletions(-)

diff --git a/eq-author/src/App/introduction/Design/IntroductionEditor/CollapsiblesEditor/CollapsibleEditor/__snapshots__/index.test.js.snap b/eq-author/src/App/introduction/Design/IntroductionEditor/CollapsiblesEditor/CollapsibleEditor/__snapshots__/index.test.js.snap
index 7dedc8e7b0..55042802f1 100644
--- a/eq-author/src/App/introduction/Design/IntroductionEditor/CollapsiblesEditor/CollapsibleEditor/__snapshots__/index.test.js.snap
+++ b/eq-author/src/App/introduction/Design/IntroductionEditor/CollapsiblesEditor/CollapsibleEditor/__snapshots__/index.test.js.snap
@@ -53,7 +53,6 @@ exports[`CollapsibleEditor should render 1`] = `
     controls={
       Object {
         "bold": true,
-        "emphasis": true,
         "link": true,
         "list": true,
         "piping": true,
diff --git a/eq-author/src/App/introduction/Design/IntroductionEditor/__snapshots__/index.test.js.snap b/eq-author/src/App/introduction/Design/IntroductionEditor/__snapshots__/index.test.js.snap
index 2a54fe0262..db7dc21d69 100644
--- a/eq-author/src/App/introduction/Design/IntroductionEditor/__snapshots__/index.test.js.snap
+++ b/eq-author/src/App/introduction/Design/IntroductionEditor/__snapshots__/index.test.js.snap
@@ -22,9 +22,8 @@ exports[`IntroductionEditor should render 1`] = `
         autoFocus={false}
         controls={
           Object {
-            "bold": true,
-            "emphasis": true,
             "heading": true,
+            "highlight": true,
             "link": true,
             "piping": true,
           }
@@ -178,7 +177,6 @@ exports[`IntroductionEditor should render 1`] = `
         controls={
           Object {
             "bold": true,
-            "emphasis": true,
             "link": true,
             "list": true,
             "piping": true,
@@ -281,7 +279,7 @@ exports[`IntroductionEditor should render 1`] = `
         autoFocus={false}
         controls={
           Object {
-            "emphasis": true,
+            "highlight": true,
             "piping": true,
           }
         }
@@ -303,7 +301,6 @@ exports[`IntroductionEditor should render 1`] = `
         controls={
           Object {
             "bold": true,
-            "emphasis": true,
             "link": true,
             "list": true,
             "piping": true,
@@ -348,7 +345,7 @@ exports[`IntroductionEditor should render 1`] = `
         autoFocus={false}
         controls={
           Object {
-            "emphasis": true,
+            "highlight": true,
             "piping": true,
           }
         }
@@ -370,7 +367,6 @@ exports[`IntroductionEditor should render 1`] = `
         controls={
           Object {
             "bold": true,
-            "emphasis": true,
             "link": true,
             "list": true,
             "piping": true,
diff --git a/eq-author/src/App/page/Design/QuestionPageEditor/__snapshots__/MetaEditor.test.js.snap b/eq-author/src/App/page/Design/QuestionPageEditor/__snapshots__/MetaEditor.test.js.snap
index b0cea0380c..c9cc37b197 100644
--- a/eq-author/src/App/page/Design/QuestionPageEditor/__snapshots__/MetaEditor.test.js.snap
+++ b/eq-author/src/App/page/Design/QuestionPageEditor/__snapshots__/MetaEditor.test.js.snap
@@ -13,7 +13,7 @@ exports[`MetaEditor should be able to display both deleted metadata and deleted
     autoFocus={false}
     controls={
       Object {
-        "emphasis": true,
+        "highlight": true,
         "piping": true,
       }
     }
@@ -55,7 +55,7 @@ exports[`MetaEditor should display the correct error message when piping answer
     autoFocus={false}
     controls={
       Object {
-        "emphasis": true,
+        "highlight": true,
         "piping": true,
       }
     }
@@ -96,7 +96,7 @@ exports[`MetaEditor should display the correct error message when piping answer
     autoFocus={false}
     controls={
       Object {
-        "emphasis": true,
+        "highlight": true,
         "piping": true,
       }
     }
@@ -137,7 +137,7 @@ exports[`MetaEditor should display the correct error message when the definition
     autoFocus={false}
     controls={
       Object {
-        "emphasis": true,
+        "highlight": true,
         "piping": true,
       }
     }
@@ -174,7 +174,7 @@ exports[`MetaEditor should display the correct error message when the definition
     autoFocus={false}
     controls={
       Object {
-        "emphasis": true,
+        "highlight": true,
         "piping": true,
       }
     }
@@ -211,7 +211,7 @@ exports[`MetaEditor should display the correct error message when the descriptio
     autoFocus={false}
     controls={
       Object {
-        "emphasis": true,
+        "highlight": true,
         "piping": true,
       }
     }
@@ -248,7 +248,7 @@ exports[`MetaEditor should display the correct error message when the includes/e
     autoFocus={false}
     controls={
       Object {
-        "emphasis": true,
+        "highlight": true,
         "piping": true,
       }
     }
@@ -285,7 +285,7 @@ exports[`MetaEditor should display the correct error message when the title is m
     autoFocus={false}
     controls={
       Object {
-        "emphasis": true,
+        "highlight": true,
         "piping": true,
       }
     }
@@ -326,7 +326,7 @@ exports[`MetaEditor should render 1`] = `
     autoFocus={false}
     controls={
       Object {
-        "emphasis": true,
+        "highlight": true,
         "piping": true,
       }
     }
diff --git a/eq-author/src/App/questionConfirmation/Design/__snapshots__/Editor.test.js.snap b/eq-author/src/App/questionConfirmation/Design/__snapshots__/Editor.test.js.snap
index 5cd2c2a363..ac6e5068f1 100644
--- a/eq-author/src/App/questionConfirmation/Design/__snapshots__/Editor.test.js.snap
+++ b/eq-author/src/App/questionConfirmation/Design/__snapshots__/Editor.test.js.snap
@@ -6,8 +6,7 @@ exports[`Editor Editor Component should autoFocus the title when there is not on
     autoFocus={true}
     controls={
       Object {
-        "bold": true,
-        "emphasis": true,
+        "highlight": true,
         "piping": true,
       }
     }
@@ -88,8 +87,7 @@ exports[`Editor Editor Component should render 1`] = `
     autoFocus={false}
     controls={
       Object {
-        "bold": true,
-        "emphasis": true,
+        "highlight": true,
         "piping": true,
       }
     }
diff --git a/eq-author/src/App/section/Design/SectionEditor/__snapshots__/SectionEditor.test.js.snap b/eq-author/src/App/section/Design/SectionEditor/__snapshots__/SectionEditor.test.js.snap
index 724d1e6a90..e47a4df53c 100644
--- a/eq-author/src/App/section/Design/SectionEditor/__snapshots__/SectionEditor.test.js.snap
+++ b/eq-author/src/App/section/Design/SectionEditor/__snapshots__/SectionEditor.test.js.snap
@@ -24,7 +24,7 @@ exports[`SectionEditor should render 1`] = `
       autoFocus={false}
       controls={
         Object {
-          "emphasis": true,
+          "highlight": true,
           "piping": true,
         }
       }
@@ -152,7 +152,7 @@ exports[`SectionEditor should render 2`] = `
       autoFocus={false}
       controls={
         Object {
-          "emphasis": true,
+          "highlight": true,
           "piping": true,
         }
       }
diff --git a/eq-author/src/components/RichTextEditor/RichTextEditor.test.js b/eq-author/src/components/RichTextEditor/RichTextEditor.test.js
index a7aaf4e7b5..f5966c8f1c 100644
--- a/eq-author/src/components/RichTextEditor/RichTextEditor.test.js
+++ b/eq-author/src/components/RichTextEditor/RichTextEditor.test.js
@@ -31,7 +31,7 @@ const content = `
   <ul>
     <li>Regular</li>
     <li><strong>Bold</strong></li>
-    <li><em>Emphasis</em></li>
+    <li><strong>Highlight</strong></li>
   </ul>
 `;
 
@@ -43,6 +43,10 @@ describe("components/RichTextEditor", function () {
       id: "test",
       name: "test-name",
       testSelector: "test-selector-foo",
+      controls: {
+        bold: true,
+        highlight: false,
+      },
     };
     editorFocus = jest.fn();
     editorInstance = {
diff --git a/eq-author/src/components/RichTextEditor/Toolbar.js b/eq-author/src/components/RichTextEditor/Toolbar.js
index 1ede91c766..1b5b068c64 100644
--- a/eq-author/src/components/RichTextEditor/Toolbar.js
+++ b/eq-author/src/components/RichTextEditor/Toolbar.js
@@ -35,7 +35,7 @@ export const styleButtons = [
     title: "Highlight",
     icon: iconEmphasis,
     type: STYLE_INLINE,
-    style: "BOLD",
+    style: "BOLD", // BOLD style wraps text in strong tags - used for highlighting
   },
 ];
 
diff --git a/eq-author/src/components/RichTextEditor/__snapshots__/RichTextEditor.test.js.snap b/eq-author/src/components/RichTextEditor/__snapshots__/RichTextEditor.test.js.snap
index dec5001f28..fd25fa0fae 100644
--- a/eq-author/src/components/RichTextEditor/__snapshots__/RichTextEditor.test.js.snap
+++ b/eq-author/src/components/RichTextEditor/__snapshots__/RichTextEditor.test.js.snap
@@ -31,7 +31,12 @@ exports[`components/RichTextEditor should allow multiline input 1`] = `
       >
         <ToolBar
           autoFocus={false}
-          controls={Object {}}
+          controls={
+            Object {
+              "bold": true,
+              "highlight": false,
+            }
+          }
           editorState={
             EditorState {
               "_immutable": Immutable.Record {
@@ -160,8 +165,9 @@ exports[`components/RichTextEditor should allow multiline input 1`] = `
           blockStyleFn={[Function]}
           customStyleMap={
             Object {
-              "HIGHLIGHT": Object {
-                "backgroundColor": "#cbe2c8",
+              "BOLD": Object {
+                "backgroundColor": false,
+                "fontWeight": "bold",
               },
             }
           }
@@ -368,7 +374,12 @@ exports[`components/RichTextEditor should render 1`] = `
       >
         <ToolBar
           autoFocus={false}
-          controls={Object {}}
+          controls={
+            Object {
+              "bold": true,
+              "highlight": false,
+            }
+          }
           editorState={
             EditorState {
               "_immutable": Immutable.Record {
@@ -497,8 +508,9 @@ exports[`components/RichTextEditor should render 1`] = `
           blockStyleFn={[Function]}
           customStyleMap={
             Object {
-              "HIGHLIGHT": Object {
-                "backgroundColor": "#cbe2c8",
+              "BOLD": Object {
+                "backgroundColor": false,
+                "fontWeight": "bold",
               },
             }
           }
@@ -706,7 +718,12 @@ exports[`components/RichTextEditor should render existing content 1`] = `
       >
         <ToolBar
           autoFocus={false}
-          controls={Object {}}
+          controls={
+            Object {
+              "bold": true,
+              "highlight": false,
+            }
+          }
           editorState={
             EditorState {
               "_immutable": Immutable.Record {
@@ -732,53 +749,59 @@ exports[`components/RichTextEditor should render existing content 1`] = `
                     "123": Immutable.Record {
                       "key": "123",
                       "type": "unordered-list-item",
-                      "text": "Emphasis",
+                      "text": "Highlight",
                       "characterList": Immutable.List [
                         Immutable.Record {
                           "style": Immutable.OrderedSet [
-                            "ITALIC",
+                            "BOLD",
+                          ],
+                          "entity": null,
+                        },
+                        Immutable.Record {
+                          "style": Immutable.OrderedSet [
+                            "BOLD",
                           ],
                           "entity": null,
                         },
                         Immutable.Record {
                           "style": Immutable.OrderedSet [
-                            "ITALIC",
+                            "BOLD",
                           ],
                           "entity": null,
                         },
                         Immutable.Record {
                           "style": Immutable.OrderedSet [
-                            "ITALIC",
+                            "BOLD",
                           ],
                           "entity": null,
                         },
                         Immutable.Record {
                           "style": Immutable.OrderedSet [
-                            "ITALIC",
+                            "BOLD",
                           ],
                           "entity": null,
                         },
                         Immutable.Record {
                           "style": Immutable.OrderedSet [
-                            "ITALIC",
+                            "BOLD",
                           ],
                           "entity": null,
                         },
                         Immutable.Record {
                           "style": Immutable.OrderedSet [
-                            "ITALIC",
+                            "BOLD",
                           ],
                           "entity": null,
                         },
                         Immutable.Record {
                           "style": Immutable.OrderedSet [
-                            "ITALIC",
+                            "BOLD",
                           ],
                           "entity": null,
                         },
                         Immutable.Record {
                           "style": Immutable.OrderedSet [
-                            "ITALIC",
+                            "BOLD",
                           ],
                           "entity": null,
                         },
@@ -853,12 +876,12 @@ exports[`components/RichTextEditor should render existing content 1`] = `
                   "123": Immutable.List [
                     Immutable.Record {
                       "start": 0,
-                      "end": 8,
+                      "end": 9,
                       "decoratorKey": null,
                       "leaves": Immutable.List [
                         Immutable.Record {
                           "start": 0,
-                          "end": 8,
+                          "end": 9,
                         },
                       ],
                     },
@@ -881,7 +904,7 @@ exports[`components/RichTextEditor should render existing content 1`] = `
   <ul>
     <li>Regular</li>
     <li><strong>Bold</strong></li>
-    <li><em>Emphasis</em></li>
+    <li><strong>Highlight</strong></li>
   </ul>
 "
           visible={false}
@@ -892,8 +915,9 @@ exports[`components/RichTextEditor should render existing content 1`] = `
           blockStyleFn={[Function]}
           customStyleMap={
             Object {
-              "HIGHLIGHT": Object {
-                "backgroundColor": "#cbe2c8",
+              "BOLD": Object {
+                "backgroundColor": false,
+                "fontWeight": "bold",
               },
             }
           }
@@ -953,53 +977,59 @@ exports[`components/RichTextEditor should render existing content 1`] = `
                     "123": Immutable.Record {
                       "key": "123",
                       "type": "unordered-list-item",
-                      "text": "Emphasis",
+                      "text": "Highlight",
                       "characterList": Immutable.List [
                         Immutable.Record {
                           "style": Immutable.OrderedSet [
-                            "ITALIC",
+                            "BOLD",
                           ],
                           "entity": null,
                         },
                         Immutable.Record {
                           "style": Immutable.OrderedSet [
-                            "ITALIC",
+                            "BOLD",
                           ],
                           "entity": null,
                         },
                         Immutable.Record {
                           "style": Immutable.OrderedSet [
-                            "ITALIC",
+                            "BOLD",
                           ],
                           "entity": null,
                         },
                         Immutable.Record {
                           "style": Immutable.OrderedSet [
-                            "ITALIC",
+                            "BOLD",
                           ],
                           "entity": null,
                         },
                         Immutable.Record {
                           "style": Immutable.OrderedSet [
-                            "ITALIC",
+                            "BOLD",
                           ],
                           "entity": null,
                         },
                         Immutable.Record {
                           "style": Immutable.OrderedSet [
-                            "ITALIC",
+                            "BOLD",
                           ],
                           "entity": null,
                         },
                         Immutable.Record {
                           "style": Immutable.OrderedSet [
-                            "ITALIC",
+                            "BOLD",
                           ],
                           "entity": null,
                         },
                         Immutable.Record {
                           "style": Immutable.OrderedSet [
-                            "ITALIC",
+                            "BOLD",
+                          ],
+                          "entity": null,
+                        },
+                        Immutable.Record {
+                          "style": Immutable.OrderedSet [
+                            "BOLD",
                           ],
                           "entity": null,
                         },
@@ -1074,12 +1104,12 @@ exports[`components/RichTextEditor should render existing content 1`] = `
                   "123": Immutable.List [
                     Immutable.Record {
                       "start": 0,
-                      "end": 8,
+                      "end": 9,
                       "decoratorKey": null,
                       "leaves": Immutable.List [
                         Immutable.Record {
                           "start": 0,
-                          "end": 8,
+                          "end": 9,
                         },
                       ],
                     },
@@ -1150,7 +1180,12 @@ exports[`components/RichTextEditor should show as disabled and readonly when dis
       >
         <ToolBar
           autoFocus={false}
-          controls={Object {}}
+          controls={
+            Object {
+              "bold": true,
+              "highlight": false,
+            }
+          }
           editorState={
             EditorState {
               "_immutable": Immutable.Record {
@@ -1279,8 +1314,9 @@ exports[`components/RichTextEditor should show as disabled and readonly when dis
           blockStyleFn={[Function]}
           customStyleMap={
             Object {
-              "HIGHLIGHT": Object {
-                "backgroundColor": "#cbe2c8",
+              "BOLD": Object {
+                "backgroundColor": false,
+                "fontWeight": "bold",
               },
             }
           }
diff --git a/eq-author/src/components/RichTextEditor/utils/convert.test.js b/eq-author/src/components/RichTextEditor/utils/convert.test.js
index ed11151e04..f1206f0365 100644
--- a/eq-author/src/components/RichTextEditor/utils/convert.test.js
+++ b/eq-author/src/components/RichTextEditor/utils/convert.test.js
@@ -33,30 +33,6 @@ describe("convert", () => {
 
       expect(html).toEqual(htmlEntity);
     });
-
-    it("should convert BOLD style to HTML", () => {
-      const rawBoldText = new Raw()
-        .addBlock("Test text")
-        .addInlineStyle("BOLD", 0, 4); // Applies BOLD style to first four characters in "Test text"
-      const expectedHtmlBold = `<p><strong class="bold">Test</strong> text</p>`;
-
-      const convert = toHTML({});
-      const convertedHtml = convert(rawBoldText.toEditorState());
-
-      expect(convertedHtml).toEqual(expectedHtmlBold);
-    });
-
-    it("should convert HIGHLIGHT style to HTML", () => {
-      const rawHighlightText = new Raw()
-        .addBlock("Test text")
-        .addInlineStyle("HIGHLIGHT", 0, 4); // Applies HIGHLIGHT style to first four characters in "Test text"
-      const expectedHtmlHighlight = `<p><strong class="highlight">Test</strong> text</p>`;
-
-      const convert = toHTML({});
-      const convertedHtml = convert(rawHighlightText.toEditorState());
-
-      expect(convertedHtml).toEqual(expectedHtmlHighlight);
-    });
   });
 
   describe("fromHTML", () => {
@@ -78,31 +54,5 @@ describe("convert", () => {
 
       expect(stateToRaw(editorState)).toEqual(rawEntity.toRawContentState());
     });
-
-    it("should convert BOLD from HTML", () => {
-      const htmlBold = `<p><strong class="bold">Test</strong> text</p>`;
-      const rawBoldText = new Raw()
-        .addBlock("Test text")
-        .addInlineStyle("BOLD", 0, 4); // Applies BOLD style to first four characters in "Test text"
-
-      const convert = fromHTML({});
-      const editorState = EditorState.createWithContent(convert(htmlBold));
-
-      expect(stateToRaw(editorState)).toEqual(rawBoldText.toRawContentState());
-    });
-
-    it("should convert HIGHLIGHT from HTML", () => {
-      const htmlHighlight = `<p><strong class="highlight">Test</strong> text</p>`;
-      const rawHighlightText = new Raw()
-        .addBlock("Test text")
-        .addInlineStyle("HIGHLIGHT", 0, 4); // Applies HIGHLIGHT style to first four characters in "Test text"
-
-      const convert = fromHTML({});
-      const editorState = EditorState.createWithContent(convert(htmlHighlight));
-
-      expect(stateToRaw(editorState)).toEqual(
-        rawHighlightText.toRawContentState()
-      );
-    });
   });
 });

From 164f09253bf5f2e056d94d6888d6dfab4a663901 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Mon, 15 Apr 2024 15:15:12 +0100
Subject: [PATCH 013/215] Add highlight to preview pages

---
 eq-author/src/App/history/HistoryItem.js           | 14 --------------
 .../Preview/IntroductionPreview/index.js           |  5 -----
 .../App/page/Preview/CalculatedSummaryPreview.js   | 10 ++++------
 .../App/page/Preview/ListCollectorPagePreview.js   |  5 -----
 .../AddItemPagePreview/index.js                    |  5 -----
 .../ConfirmationPagePreview/index.js               |  5 -----
 .../QualifierPagePreview/index.js                  |  5 -----
 .../src/App/page/Preview/QuestionPagePreview.js    |  5 -----
 .../src/App/questionConfirmation/Preview/index.js  |  5 -----
 .../src/App/section/Preview/SectionIntroPreview.js |  5 -----
 .../src/components/preview/elements/PageTitle.js   |  5 +++++
 11 files changed, 9 insertions(+), 60 deletions(-)

diff --git a/eq-author/src/App/history/HistoryItem.js b/eq-author/src/App/history/HistoryItem.js
index 448bb8f645..63fb59e5eb 100644
--- a/eq-author/src/App/history/HistoryItem.js
+++ b/eq-author/src/App/history/HistoryItem.js
@@ -69,16 +69,6 @@ const EventText = styled.div`
   p {
     margin: 0 0 1em;
     word-break: break-all;
-    em {
-      background-color: ${colors.highlightGreen};
-      font-style: normal;
-    }
-  }
-  h2 {
-    em {
-      background-color: ${colors.highlightGreen};
-      font-style: normal;
-    }
   }
   ul {
     margin-top: 0;
@@ -89,10 +79,6 @@ const EventText = styled.div`
       span {
         font-weight: bold;
       }
-      em {
-        background-color: ${colors.highlightGreen};
-        font-style: normal;
-      }
     }
   }
 `;
diff --git a/eq-author/src/App/introduction/Preview/IntroductionPreview/index.js b/eq-author/src/App/introduction/Preview/IntroductionPreview/index.js
index ca5d3e124e..948b0079d2 100644
--- a/eq-author/src/App/introduction/Preview/IntroductionPreview/index.js
+++ b/eq-author/src/App/introduction/Preview/IntroductionPreview/index.js
@@ -22,11 +22,6 @@ const Container = styled.div`
   p:last-of-type {
     margin-bottom: 0;
   }
-  em {
-    background-color: ${colors.highlightGreen};
-    padding: 0 0.125em;
-    font-style: normal;
-  }
   span[data-piped] {
     background-color: #e0e0e0;
     padding: 0 0.125em;
diff --git a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
index 089727839a..93bbddb0d8 100644
--- a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
+++ b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
@@ -25,11 +25,6 @@ const Container = styled.div`
   p:last-of-type {
     margin-bottom: 0;
   }
-  em {
-    background-color: #dce5b0;
-    padding: 0 0.125em;
-    font-style: normal;
-  }
   span[data-piped] {
     background-color: #e0e0e0;
     padding: 0 0.125em;
@@ -130,7 +125,10 @@ const CalculatedSummaryPagePreview = ({ page }) => {
                   <Grid>
                     <Column cols={7}>
                       <SummaryTotalLabel data-test="total-title">
-                        {page.totalTitle.replace(/<\/?p>/g, "")}
+                        {
+                          /* Removes all HTML tags */
+                          page.totalTitle.replace(/<[^>]*>/g, "")
+                        }
                       </SummaryTotalLabel>
                     </Column>
                     <Column cols={3}>
diff --git a/eq-author/src/App/page/Preview/ListCollectorPagePreview.js b/eq-author/src/App/page/Preview/ListCollectorPagePreview.js
index 54e0588e39..29af97a7fd 100644
--- a/eq-author/src/App/page/Preview/ListCollectorPagePreview.js
+++ b/eq-author/src/App/page/Preview/ListCollectorPagePreview.js
@@ -33,11 +33,6 @@ const Container = styled.div`
   p:last-of-type {
     margin-bottom: 0;
   }
-  em {
-    background-color: #dce5b0;
-    padding: 0 0.125em;
-    font-style: normal;
-  }
   span[data-piped] {
     background-color: #e0e0e0;
     padding: 0 0.125em;
diff --git a/eq-author/src/App/page/Preview/ListCollectorPagePreviews/AddItemPagePreview/index.js b/eq-author/src/App/page/Preview/ListCollectorPagePreviews/AddItemPagePreview/index.js
index 1c53a4e552..561256ae12 100644
--- a/eq-author/src/App/page/Preview/ListCollectorPagePreviews/AddItemPagePreview/index.js
+++ b/eq-author/src/App/page/Preview/ListCollectorPagePreviews/AddItemPagePreview/index.js
@@ -32,11 +32,6 @@ const Container = styled.div`
   p:last-of-type {
     margin-bottom: 0;
   }
-  em {
-    background-color: ${colors.highlightGreen};
-    padding: 0 0.125em;
-    font-style: normal;
-  }
   span[data-piped] {
     background-color: ${colors.pipingGrey};
     padding: 0 0.125em;
diff --git a/eq-author/src/App/page/Preview/ListCollectorPagePreviews/ConfirmationPagePreview/index.js b/eq-author/src/App/page/Preview/ListCollectorPagePreviews/ConfirmationPagePreview/index.js
index b21ea8d406..74a582950f 100644
--- a/eq-author/src/App/page/Preview/ListCollectorPagePreviews/ConfirmationPagePreview/index.js
+++ b/eq-author/src/App/page/Preview/ListCollectorPagePreviews/ConfirmationPagePreview/index.js
@@ -20,11 +20,6 @@ const Container = styled.div`
   p:last-of-type {
     margin-bottom: 0;
   }
-  em {
-    background-color: ${colors.highlightGreen};
-    padding: 0 0.125em;
-    font-style: normal;
-  }
   span[data-piped] {
     background-color: ${colors.pipingGrey};
     padding: 0 0.125em;
diff --git a/eq-author/src/App/page/Preview/ListCollectorPagePreviews/QualifierPagePreview/index.js b/eq-author/src/App/page/Preview/ListCollectorPagePreviews/QualifierPagePreview/index.js
index e357b302e0..6ed7a44812 100644
--- a/eq-author/src/App/page/Preview/ListCollectorPagePreviews/QualifierPagePreview/index.js
+++ b/eq-author/src/App/page/Preview/ListCollectorPagePreviews/QualifierPagePreview/index.js
@@ -20,11 +20,6 @@ const Container = styled.div`
   p:last-of-type {
     margin-bottom: 0;
   }
-  em {
-    background-color: ${colors.highlightGreen};
-    padding: 0 0.125em;
-    font-style: normal;
-  }
   span[data-piped] {
     background-color: ${colors.pipingGrey};
     padding: 0 0.125em;
diff --git a/eq-author/src/App/page/Preview/QuestionPagePreview.js b/eq-author/src/App/page/Preview/QuestionPagePreview.js
index 0c777197c2..2a1ec23e99 100644
--- a/eq-author/src/App/page/Preview/QuestionPagePreview.js
+++ b/eq-author/src/App/page/Preview/QuestionPagePreview.js
@@ -29,11 +29,6 @@ const Container = styled.div`
   p:last-of-type {
     margin-bottom: 0;
   }
-  em {
-    background-color: #dce5b0;
-    padding: 0 0.125em;
-    font-style: normal;
-  }
   span[data-piped] {
     background-color: #e0e0e0;
     padding: 0 0.125em;
diff --git a/eq-author/src/App/questionConfirmation/Preview/index.js b/eq-author/src/App/questionConfirmation/Preview/index.js
index 87b986557e..0202fc969f 100644
--- a/eq-author/src/App/questionConfirmation/Preview/index.js
+++ b/eq-author/src/App/questionConfirmation/Preview/index.js
@@ -32,11 +32,6 @@ const Container = styled.div`
   p:last-of-type {
     margin-bottom: 0;
   }
-  em {
-    background-color: #dce5b0;
-    padding: 0 0.125em;
-    font-style: normal;
-  }
   span[data-piped] {
     background-color: #5f7682;
     border-radius: 4px;
diff --git a/eq-author/src/App/section/Preview/SectionIntroPreview.js b/eq-author/src/App/section/Preview/SectionIntroPreview.js
index 67bb401b56..ba33dc7334 100644
--- a/eq-author/src/App/section/Preview/SectionIntroPreview.js
+++ b/eq-author/src/App/section/Preview/SectionIntroPreview.js
@@ -15,11 +15,6 @@ const Wrapper = styled.div`
   p:last-of-type {
     margin-bottom: 0;
   }
-  em {
-    background-color: #dce5b0;
-    padding: 0 0.125em;
-    font-style: normal;
-  }
   span[data-piped] {
     background-color: #e0e0e0;
     padding: 0 0.125em;
diff --git a/eq-author/src/components/preview/elements/PageTitle.js b/eq-author/src/components/preview/elements/PageTitle.js
index 4e4a56f613..d77f2589d3 100644
--- a/eq-author/src/components/preview/elements/PageTitle.js
+++ b/eq-author/src/components/preview/elements/PageTitle.js
@@ -8,6 +8,11 @@ const Title = styled.h1`
   font-size: 1.4em;
   margin: 0 0 1em;
   word-wrap: break-word;
+  strong {
+    background-color: #dce5b0;
+    padding: 0 0.125em;
+    font-style: normal;
+  }
 `;
 
 const PageTitle = ({ title, missingText = "Missing Page Title" }) => {

From 7e62b41bffb9156c10b32e3f1ed14e75b5cf8597 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Tue, 16 Apr 2024 11:07:14 +0100
Subject: [PATCH 014/215] Add mutually exclusive answers to logic selector

---
 .../schema/resolvers/logic/binaryExpression2/index.js  |  9 ++++++---
 .../src/businessLogic/answerTypeToConditions.js        |  1 +
 .../MultipleChoiceAnswerOptionsSelector.js             | 10 ++++++----
 .../src/App/page/Logic/BinaryExpressionEditor/index.js |  2 ++
 eq-author/src/constants/answer-types.js                |  3 ++-
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/eq-author-api/schema/resolvers/logic/binaryExpression2/index.js b/eq-author-api/schema/resolvers/logic/binaryExpression2/index.js
index 53c331fcbf..9638041f68 100644
--- a/eq-author-api/schema/resolvers/logic/binaryExpression2/index.js
+++ b/eq-author-api/schema/resolvers/logic/binaryExpression2/index.js
@@ -91,9 +91,12 @@ Resolvers.LeftSide2 = {
   __resolveType: ({ type, sideType }) => {
     if (sideType === "Answer") {
       if (
-        [answerTypes.RADIO, answerTypes.CHECKBOX, answerTypes.SELECT].includes(
-          type
-        )
+        [
+          answerTypes.RADIO,
+          answerTypes.CHECKBOX,
+          answerTypes.SELECT,
+          answerTypes.MUTUALLY_EXCLUSIVE,
+        ].includes(type)
       ) {
         return "MultipleChoiceAnswer";
       }
diff --git a/eq-author-api/src/businessLogic/answerTypeToConditions.js b/eq-author-api/src/businessLogic/answerTypeToConditions.js
index b5195f0ecc..51bdcf0aef 100644
--- a/eq-author-api/src/businessLogic/answerTypeToConditions.js
+++ b/eq-author-api/src/businessLogic/answerTypeToConditions.js
@@ -31,6 +31,7 @@ const answerConditions = {
     conditions.COUNT_OF,
   ],
   [answerTypes.SELECT]: [conditions.ONE_OF, conditions.UNANSWERED],
+  [answerTypes.MUTUALLY_EXCLUSIVE]: [conditions.ONE_OF, conditions.UNANSWERED],
 };
 
 const isAnswerTypeSupported = (answerType) =>
diff --git a/eq-author/src/App/page/Logic/BinaryExpressionEditor/MultipleChoiceAnswerOptionsSelector.js b/eq-author/src/App/page/Logic/BinaryExpressionEditor/MultipleChoiceAnswerOptionsSelector.js
index 2b73ffd5a1..ae0c39fae4 100644
--- a/eq-author/src/App/page/Logic/BinaryExpressionEditor/MultipleChoiceAnswerOptionsSelector.js
+++ b/eq-author/src/App/page/Logic/BinaryExpressionEditor/MultipleChoiceAnswerOptionsSelector.js
@@ -16,7 +16,7 @@ import {
   ERR_COUNT_OF_GREATER_THAN_AVAILABLE_OPTIONS,
 } from "constants/validationMessages";
 import { colors } from "constants/theme";
-import { RADIO, SELECT } from "constants/answer-types";
+import { RADIO, SELECT, MUTUALLY_EXCLUSIVE } from "constants/answer-types";
 import { Select } from "components/Forms";
 
 import TextButton from "components/buttons/TextButton";
@@ -32,6 +32,8 @@ const answerConditions = {
   NOTANYOF: "NotAnyOf",
 };
 
+const exclusiveAnswers = [RADIO, SELECT, MUTUALLY_EXCLUSIVE];
+
 const MultipleChoiceAnswerOptions = styled.div`
   align-items: center;
   display: inline-flex;
@@ -206,7 +208,7 @@ class MultipleChoiceAnswerOptionsSelector extends React.Component {
     return message ? <ValidationError>{message}</ValidationError> : null;
   };
 
-  renderRadioOptionSelector(hasError) {
+  renderExclusiveOptionSelector(hasError) {
     const { expression } = this.props;
     const options = get(expression, "left.options", []);
 
@@ -331,8 +333,8 @@ class MultipleChoiceAnswerOptionsSelector extends React.Component {
     const hasConditionError =
       errors.filter(({ field }) => field === "condition").length > 0;
 
-    if (answerType === RADIO || answerType === SELECT) {
-      return this.renderRadioOptionSelector(hasError);
+    if (exclusiveAnswers.includes(answerType)) {
+      return this.renderExclusiveOptionSelector(hasError);
     } else {
       return this.renderCheckboxOptionSelector(hasError, hasConditionError);
     }
diff --git a/eq-author/src/App/page/Logic/BinaryExpressionEditor/index.js b/eq-author/src/App/page/Logic/BinaryExpressionEditor/index.js
index a7a95d8eb5..53123572c7 100644
--- a/eq-author/src/App/page/Logic/BinaryExpressionEditor/index.js
+++ b/eq-author/src/App/page/Logic/BinaryExpressionEditor/index.js
@@ -14,6 +14,7 @@ import {
   CHECKBOX,
   DATE,
   SELECT,
+  MUTUALLY_EXCLUSIVE,
 } from "constants/answer-types";
 
 import { TEXT, TEXT_OPTIONAL } from "constants/metadata-types";
@@ -110,6 +111,7 @@ const ANSWER_TYPE_TO_RIGHT_EDITOR = {
   [RADIO]: MultipleChoiceAnswerOptionsSelector,
   [SELECT]: MultipleChoiceAnswerOptionsSelector,
   [CHECKBOX]: MultipleChoiceAnswerOptionsSelector,
+  [MUTUALLY_EXCLUSIVE]: MultipleChoiceAnswerOptionsSelector,
   [NUMBER]: NumberAnswerSelector,
   [PERCENTAGE]: NumberAnswerSelector,
   [CURRENCY]: NumberAnswerSelector,
diff --git a/eq-author/src/constants/answer-types.js b/eq-author/src/constants/answer-types.js
index c0f3ac7aee..11860d9757 100644
--- a/eq-author/src/constants/answer-types.js
+++ b/eq-author/src/constants/answer-types.js
@@ -11,6 +11,7 @@ export const DATE_RANGE = "DateRange";
 export const UNIT = "Unit";
 export const DURATION = "Duration";
 export const SELECT = "Select";
+export const MUTUALLY_EXCLUSIVE = "MutuallyExclusive";
 
 export const ROUTING_ANSWER_TYPES = [
   RADIO,
@@ -21,6 +22,7 @@ export const ROUTING_ANSWER_TYPES = [
   UNIT,
   DATE,
   SELECT,
+  MUTUALLY_EXCLUSIVE,
 ];
 
 export const ROUTING_METADATA_TYPES = [TEXT.value, TEXT_OPTIONAL.value];
@@ -28,7 +30,6 @@ export const ROUTING_METADATA_TYPES = [TEXT.value, TEXT_OPTIONAL.value];
 export const RADIO_OPTION = "RadioOption";
 export const CHECKBOX_OPTION = "CheckboxOption";
 export const SELECT_OPTION = "SelectOption";
-export const MUTUALLY_EXCLUSIVE = "MutuallyExclusive";
 export const MUTUALLY_EXCLUSIVE_OPTION = "MutuallyExclusiveOption";
 
 export const ANSWER_OPTION_TYPES = {

From 4cbd93c3f50b646e64ed77372d1c13addfc70c5d Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Tue, 16 Apr 2024 11:12:18 +0100
Subject: [PATCH 015/215] Fix selecting mutually exclusive options in logic
 page

---
 eq-author-api/schema/resolvers/logic/binaryExpression2/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eq-author-api/schema/resolvers/logic/binaryExpression2/index.js b/eq-author-api/schema/resolvers/logic/binaryExpression2/index.js
index 9638041f68..127f1dc64f 100644
--- a/eq-author-api/schema/resolvers/logic/binaryExpression2/index.js
+++ b/eq-author-api/schema/resolvers/logic/binaryExpression2/index.js
@@ -37,6 +37,7 @@ const isLeftSideAnswerTypeCompatible = (
     [answerTypes.CHECKBOX]: "SelectedOptions",
     [answerTypes.DATE]: "DateValue",
     [answerTypes.SELECT]: "SelectedOptions",
+    [answerTypes.MUTUALLY_EXCLUSIVE]: "SelectedOptions",
   };
 
   if (secondaryCondition) {

From 9e89e4ff13c59199da1643bfa591dc39ff6b1910 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Wed, 17 Apr 2024 10:57:01 +0100
Subject: [PATCH 016/215] Remove answer types from content picker based on
 mutually exclusive answers

---
 .../getQuestionnaireQuery.graphql             |  3 ++
 .../RoutingAnswerContentPicker.js             |  4 ++-
 .../Logic/BinaryExpressionEditor/index.js     |  1 +
 eq-author/src/utils/getContentBeforeEntity.js | 29 +++++++++++++++++--
 4 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/eq-author/src/App/QuestionnaireDesignPage/getQuestionnaireQuery.graphql b/eq-author/src/App/QuestionnaireDesignPage/getQuestionnaireQuery.graphql
index 73a2b2f701..8bacacc678 100644
--- a/eq-author/src/App/QuestionnaireDesignPage/getQuestionnaireQuery.graphql
+++ b/eq-author/src/App/QuestionnaireDesignPage/getQuestionnaireQuery.graphql
@@ -365,6 +365,9 @@ fragment Answers on Answer {
   type
   properties
   advancedProperties
+  page {
+    id
+  }
   ... on BasicAnswer {
     secondaryQCode
   }
diff --git a/eq-author/src/App/page/Logic/BinaryExpressionEditor/RoutingAnswerContentPicker.js b/eq-author/src/App/page/Logic/BinaryExpressionEditor/RoutingAnswerContentPicker.js
index 4eba90fc6b..30fd0ad2b7 100644
--- a/eq-author/src/App/page/Logic/BinaryExpressionEditor/RoutingAnswerContentPicker.js
+++ b/eq-author/src/App/page/Logic/BinaryExpressionEditor/RoutingAnswerContentPicker.js
@@ -26,6 +26,7 @@ export const preprocessMetadata = (metadata) =>
 const RoutingAnswerContentPicker = ({
   includeSelf,
   selectedContentDisplayName,
+  expressionGroup,
   ...otherProps
 }) => {
   const { questionnaire } = useQuestionnaire();
@@ -38,8 +39,9 @@ const RoutingAnswerContentPicker = ({
         id: pageId,
         includeTargetPage: includeSelf,
         preprocessAnswers,
+        expressionGroup,
       }),
-    [questionnaire, pageId, includeSelf]
+    [questionnaire, pageId, includeSelf, expressionGroup]
   );
 
   const filteredPreviousAnswers = previousAnswers.map((answer) => {
diff --git a/eq-author/src/App/page/Logic/BinaryExpressionEditor/index.js b/eq-author/src/App/page/Logic/BinaryExpressionEditor/index.js
index 53123572c7..e7de84795e 100644
--- a/eq-author/src/App/page/Logic/BinaryExpressionEditor/index.js
+++ b/eq-author/src/App/page/Logic/BinaryExpressionEditor/index.js
@@ -213,6 +213,7 @@ export const UnwrappedBinaryExpressionEditor = ({
                 ? expression.left
                 : undefined
             }
+            expressionGroup={expressionGroup}
             onSubmit={handleLeftSideChange}
             selectedId={expression?.left?.id}
             data-test="routing-answer-picker"
diff --git a/eq-author/src/utils/getContentBeforeEntity.js b/eq-author/src/utils/getContentBeforeEntity.js
index 472dcf38cc..ab68375d17 100644
--- a/eq-author/src/utils/getContentBeforeEntity.js
+++ b/eq-author/src/utils/getContentBeforeEntity.js
@@ -2,13 +2,16 @@ import { remove } from "lodash";
 
 import isListCollectorPageType from "utils/isListCollectorPageType";
 
+import { MUTUALLY_EXCLUSIVE } from "constants/answer-types";
+
 const identity = (x) => x;
 
 const getContentBeforeEntity = (
   questionnaire,
   id,
   preprocessAnswers,
-  includeTarget
+  includeTarget,
+  expressionGroup
 ) => {
   const sections = [];
 
@@ -37,9 +40,27 @@ const getContentBeforeEntity = (
           return sections;
         }
 
-        const answers =
+        let answers =
           !isListCollectorPageType(page.pageType) &&
           (page?.answers?.flatMap(preprocessAnswers) || []);
+
+        if (expressionGroup?.operator === "And") {
+          expressionGroup.expressions.forEach((expression) => {
+            if (expression?.left?.page?.id) {
+              answers = answers.filter((answer) => {
+                if (expression.left.page.id === answer.page.id) {
+                  if (expression.left.type === MUTUALLY_EXCLUSIVE) {
+                    return false;
+                  } else {
+                    return answer.type !== MUTUALLY_EXCLUSIVE;
+                  }
+                }
+                return true;
+              });
+            }
+          });
+        }
+
         if (answers.length) {
           sections[sections.length - 1].folders[
             sections[sections.length - 1].folders.length - 1
@@ -75,6 +96,7 @@ export default ({
   id,
   preprocessAnswers = identity,
   includeTargetPage = false,
+  expressionGroup,
 } = {}) => {
   if (!questionnaire || !id || questionnaire?.introduction?.id === id) {
     return [];
@@ -85,7 +107,8 @@ export default ({
       questionnaire,
       id,
       preprocessAnswers,
-      includeTargetPage
+      includeTargetPage,
+      expressionGroup
     ).filter(({ folders }) => folders.length)
   );
 };

From d91022e0fa11918bcfd2c1d27a8fdbb724d53ae5 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Wed, 17 Apr 2024 13:34:23 +0100
Subject: [PATCH 017/215] Add import folder button

---
 .../src/components/modals/ImportContentModal/index.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/eq-author/src/components/modals/ImportContentModal/index.js b/eq-author/src/components/modals/ImportContentModal/index.js
index 4cda609df9..e990e32458 100644
--- a/eq-author/src/components/modals/ImportContentModal/index.js
+++ b/eq-author/src/components/modals/ImportContentModal/index.js
@@ -37,6 +37,7 @@ const ImportQuestionReviewModal = ({
   onCancel,
   onBack,
   onSelectQuestions,
+  onSelectFolders,
   onSelectSections,
 }) => (
   <Wizard
@@ -60,8 +61,7 @@ const ImportQuestionReviewModal = ({
     </Header>
     <Content>
       <ContentHeading>
-        *Select individual questions or entire sections to be imported, you
-        cannot choose both*
+        Select sections, folders or question to import
       </ContentHeading>
 
       <Container>
@@ -71,6 +71,12 @@ const ImportQuestionReviewModal = ({
         >
           Questions
         </Button>
+        <Button
+          onClick={onSelectFolders}
+          data-test="content-modal-select-folders-button"
+        >
+          Folders
+        </Button>
         <Button
           onClick={onSelectSections}
           data-test="content-modal-select-sections-button"
@@ -87,6 +93,7 @@ ImportQuestionReviewModal.propTypes = {
   onCancel: PropTypes.func.isRequired,
   onBack: PropTypes.func.isRequired,
   onSelectQuestions: PropTypes.func.isRequired,
+  onSelectFolders: PropTypes.func.isRequired,
   onSelectSections: PropTypes.func.isRequired,
   questionnaire: PropTypes.shape({
     title: PropTypes.string.isRequired,

From 4525988b97532b7fac37c50fae07604de56ab7b4 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Thu, 18 Apr 2024 12:08:04 +0100
Subject: [PATCH 018/215] Add folder select modal

---
 eq-author/src/App/importingContent/index.js   |  75 +++++++
 .../src/components/FolderPicker/Item/index.js | 162 ++++++++++++++
 .../src/components/FolderPicker/List/index.js |  22 ++
 .../SelectedFoldersContext/index.js           |   6 +
 .../src/components/FolderPicker/index.js      | 200 ++++++++++++++++++
 eq-author/src/graphql/importFolders.graphql   | 128 +++++++++++
 6 files changed, 593 insertions(+)
 create mode 100644 eq-author/src/components/FolderPicker/Item/index.js
 create mode 100644 eq-author/src/components/FolderPicker/List/index.js
 create mode 100644 eq-author/src/components/FolderPicker/SelectedFoldersContext/index.js
 create mode 100644 eq-author/src/components/FolderPicker/index.js
 create mode 100644 eq-author/src/graphql/importFolders.graphql

diff --git a/eq-author/src/App/importingContent/index.js b/eq-author/src/App/importingContent/index.js
index ce31b7d29f..c20812ee03 100644
--- a/eq-author/src/App/importingContent/index.js
+++ b/eq-author/src/App/importingContent/index.js
@@ -19,6 +19,7 @@ import {
 import GET_QUESTIONNAIRE_LIST from "graphql/getQuestionnaireList.graphql";
 import GET_QUESTIONNAIRE from "graphql/getQuestionnaire.graphql";
 import IMPORT_QUESTIONS from "graphql/importQuestions.graphql";
+import IMPORT_FOLDERS from "graphql/importFolders.graphql";
 import IMPORT_SECTIONS from "graphql/importSections.graphql";
 
 import QuestionnaireSelectModal from "components/modals/QuestionnaireSelectModal";
@@ -26,6 +27,7 @@ import ReviewQuestionsModal from "components/modals/ImportQuestionReviewModal";
 import ReviewSectionsModal from "components/modals/ImportSectionReviewModal";
 import SelectContentModal from "components/modals/ImportContentModal";
 import QuestionPicker from "components/QuestionPicker";
+import FolderPicker from "components/FolderPicker";
 import SectionPicker from "components/SectionPicker";
 import ExtraSpaceConfirmationModal from "components-themed/Modal";
 
@@ -53,6 +55,8 @@ const ImportingContent = ({
   const [selectingQuestionnaire, setSelectingQuestionnaire] = useState(true);
   const [reviewingQuestions, setReviewingQuestions] = useState(false);
   const [selectingQuestions, setSelectingQuestions] = useState(false);
+  const [reviewingFolders, setReviewingFolders] = useState(false);
+  const [selectingFolders, setSelectingFolders] = useState(false);
   const [reviewingSections, setReviewingSections] = useState(false);
   const [selectingSections, setSelectingSections] = useState(false);
   const [selectingContent, setSelectingContent] = useState(false);
@@ -69,6 +73,8 @@ const ImportingContent = ({
   const [questionnaireImportingFrom, setQuestionnaireImportingFrom] =
     useState(null);
 
+  const [foldersToImport, setFoldersToImport] = useState([]);
+
   const [sectionsToImport, setSectionsToImport] = useState([]);
 
   const {
@@ -84,6 +90,7 @@ const ImportingContent = ({
    */
 
   const [importQuestions] = useMutation(IMPORT_QUESTIONS);
+  const [importFolders] = useMutation(IMPORT_FOLDERS);
   const [importSections] = useMutation(IMPORT_SECTIONS);
 
   // Global
@@ -96,6 +103,8 @@ const ImportingContent = ({
     stopImporting();
     setReviewingSections(false);
     setSelectingSections(false);
+    setSelectingFolders(false);
+    setReviewingFolders(false);
     setSelectingContent(false);
     setShowQuestionExtraSpaceModal(false);
     setShowSectionExtraSpaceModal(false);
@@ -118,6 +127,8 @@ const ImportingContent = ({
     setReviewingQuestions(true);
     setReviewingSections(false);
     setSelectingSections(false);
+    setSelectingFolders(false);
+    setReviewingFolders(false);
     setSelectingContent(false);
   };
 
@@ -127,6 +138,8 @@ const ImportingContent = ({
     setReviewingQuestions(true);
     setReviewingSections(false);
     setSelectingSections(false);
+    setSelectingFolders(false);
+    setReviewingFolders(false);
     setSelectingContent(false);
   };
 
@@ -137,6 +150,8 @@ const ImportingContent = ({
     setSelectingQuestions(true);
     setReviewingSections(false);
     setSelectingSections(false);
+    setSelectingFolders(false);
+    setReviewingFolders(false);
     setSelectingContent(false);
   };
 
@@ -149,6 +164,20 @@ const ImportingContent = ({
     setSelectingContent(false);
   };
 
+  // Selecting folders to import
+
+  const onSelectFolders = () => {
+    setReviewingQuestions(false);
+    setSelectingQuestions(false);
+    setSelectingFolders(true);
+    setReviewingFolders(false);
+    setReviewingSections(false);
+    setSelectingSections(false);
+    setSelectingContent(false);
+  };
+
+  // TODO: Reviewing folders to import
+
   const onRemoveAllSelectedContent = () => {
     if (reviewingQuestions) {
       setQuestionsToImport([]);
@@ -218,6 +247,8 @@ const ImportingContent = ({
       setSelectingQuestions(false);
       setReviewingSections(false);
       setSelectingSections(false);
+      setSelectingFolders(false);
+      setReviewingFolders(false);
       setSelectingContent(false);
       setShowQuestionExtraSpaceModal(true);
     } else {
@@ -316,6 +347,8 @@ const ImportingContent = ({
     setReviewingSections(true);
     setSelectingQuestions(false);
     setReviewingQuestions(false);
+    setSelectingFolders(false);
+    setReviewingFolders(false);
     setSelectingContent(false);
   };
 
@@ -325,6 +358,8 @@ const ImportingContent = ({
     setReviewingSections(true);
     setSelectingQuestions(false);
     setReviewingQuestions(false);
+    setSelectingFolders(false);
+    setReviewingFolders(false);
     setSelectingContent(false);
   };
 
@@ -335,6 +370,8 @@ const ImportingContent = ({
     setSelectingSections(true);
     setSelectingQuestions(false);
     setReviewingQuestions(false);
+    setSelectingFolders(false);
+    setReviewingFolders(false);
     setSelectingContent(false);
   };
 
@@ -344,6 +381,8 @@ const ImportingContent = ({
     setReviewingSections(false);
     setSelectingQuestions(false);
     setReviewingQuestions(false);
+    setSelectingFolders(false);
+    setReviewingFolders(false);
     setSelectingContent(false);
   };
 
@@ -363,6 +402,8 @@ const ImportingContent = ({
       setReviewingSections(false);
       setSelectingSections(false);
       setSelectingContent(false);
+      setSelectingFolders(false);
+      setReviewingFolders(false);
       setShowQuestionExtraSpaceModal(false);
       setShowSectionExtraSpaceModal(true);
     } else {
@@ -459,6 +500,7 @@ const ImportingContent = ({
           onCancel={onGlobalCancel}
           onBack={onBackFromReviewingQuestions}
           onSelectQuestions={onSelectQuestions}
+          onSelectFolders={onSelectFolders}
           onSelectSections={onSelectSections}
         />
       )}
@@ -511,6 +553,39 @@ const ImportingContent = ({
           }}
         </Query>
       )}
+      {selectingFolders && (
+        <Query
+          query={GET_QUESTIONNAIRE}
+          variables={{
+            input: { questionnaireId: questionnaireImportingFrom.id },
+          }}
+        >
+          {({ loading, error, data }) => {
+            if (loading) {
+              return <React.Fragment />;
+            }
+
+            if (error || !data) {
+              return <React.Fragment />;
+            }
+
+            const { sections } = data.questionnaire;
+
+            return (
+              <FolderPicker
+                title="Select the folder(s) to import"
+                isOpen={selectingFolders}
+                sections={sections}
+                startingSelectedFolders={foldersToImport}
+                showSearch
+                onClose={onGlobalCancel}
+                // onCancel={onFolderPickerCancel}
+                // onSubmit={onFolderPickerSubmit}
+              />
+            );
+          }}
+        </Query>
+      )}
       {reviewingSections && (
         <ReviewSectionsModal
           isOpen={reviewingSections}
diff --git a/eq-author/src/components/FolderPicker/Item/index.js b/eq-author/src/components/FolderPicker/Item/index.js
new file mode 100644
index 0000000000..1854539ba7
--- /dev/null
+++ b/eq-author/src/components/FolderPicker/Item/index.js
@@ -0,0 +1,162 @@
+import React from "react";
+import PropTypes from "prop-types";
+import styled from "styled-components";
+import { colors, focusStyle } from "constants/theme";
+
+const Item = styled.div`
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  padding-left: 1.5em;
+  border-bottom: 1px solid ${colors.lightGrey};
+  cursor: pointer;
+  height: 3em;
+  &:hover {
+    background-color: ${colors.lighterGrey};
+  }
+
+  &:focus {
+    ${focusStyle}
+  }
+
+  ${({ unselectable }) =>
+    unselectable &&
+    `
+    cursor: default;
+    &:hover {
+        background-color: transparent;
+    }
+
+    &:focus{
+      outline: none;
+      box-shadow: none;
+      border-color: ${colors.lightGrey};
+    }
+  `}
+
+  ${({ variant }) =>
+    variant === "heading" &&
+    `
+        height: 2em; 
+        background-color: ${colors.lightMediumGrey};
+
+        cursor: default;
+
+        &:hover {
+            background-color: ${colors.lightMediumGrey};
+        }
+    `}
+
+  ${(props) =>
+    props["aria-selected"] &&
+    !props.heading &&
+    `
+        background-color: ${colors.primary};
+
+        &:hover {
+            background: ${colors.mediumBlue};
+        }
+
+        ${Title} {
+            color: ${colors.white};
+        }
+
+        ${Subtitle} {
+            color: ${colors.white};
+        }
+    `}
+`;
+
+const ListItem = styled.li`
+  list-style: none;
+  margin: 0;
+  padding: 0;
+
+  ol.sublist li *,
+  ul.sublist li * {
+    padding-left: 2.1rem;
+  }
+
+  &${Item}:first-of-type .heading {
+    border-top: 1px solid ${colors.lightGrey};
+  }
+`;
+const Heading = styled.h3`
+  font-size: 1em;
+  font-weight: bold;
+  color: ${colors.darkGrey};
+  margin: 0;
+`;
+
+const Title = styled.span`
+  font-size: 1em;
+  margin: 0;
+  padding: 0;
+  color: ${colors.black};
+  display: flex;
+  align-items: center;
+
+  svg {
+    width: 1.75em;
+    height: 1.75em;
+    fill: ${colors.darkGrey};
+    margin-right: 1em;
+    margin-left: -0.2em;
+  }
+`;
+
+const Subtitle = styled.span`
+  font-size: 0.9em;
+  margin: 0;
+  color: ${colors.darkGrey};
+`;
+
+const WrappedItem = ({
+  title,
+  subtitle,
+  variant,
+  selected,
+  unselectable = false,
+  onClick,
+  children,
+  dataTest,
+}) => {
+  const onEnterUp = (keyCode, callback) => {
+    if (keyCode === 13) {
+      callback();
+    }
+  };
+
+  return (
+    <ListItem data-test={dataTest}>
+      <Item
+        variant={variant}
+        className={`${variant}`}
+        aria-selected={selected}
+        unselectable={unselectable}
+        tabIndex={unselectable ? -1 : 0}
+        onClick={onClick}
+        onKeyUp={({ keyCode }) => onEnterUp(keyCode, onClick)}
+        data-test="folder-picker-item"
+      >
+        {variant !== "heading" && subtitle && <Subtitle>{subtitle}</Subtitle>}
+        {variant !== "heading" && <Title>{title}</Title>}
+        {variant === "heading" && <Heading>{title}</Heading>}
+      </Item>
+      {children}
+    </ListItem>
+  );
+};
+WrappedItem.propTypes = {
+  icon: PropTypes.node,
+  unselectable: PropTypes.bool,
+  title: PropTypes.string.isRequired,
+  subtitle: PropTypes.string,
+  variant: PropTypes.string,
+  selected: PropTypes.bool,
+  onClick: PropTypes.func,
+  children: PropTypes.node,
+  dataTest: PropTypes.string,
+};
+
+export default WrappedItem;
diff --git a/eq-author/src/components/FolderPicker/List/index.js b/eq-author/src/components/FolderPicker/List/index.js
new file mode 100644
index 0000000000..0ced1e35cc
--- /dev/null
+++ b/eq-author/src/components/FolderPicker/List/index.js
@@ -0,0 +1,22 @@
+import React from "react";
+import styled from "styled-components";
+import PropTypes from "prop-types";
+
+const OrderedList = styled.ol`
+  padding: 0;
+  margin: 0;
+`;
+
+const List = ({ children, className }) => {
+  return (
+    <OrderedList className={className} data-test="folder-picker-list">
+      {children}
+    </OrderedList>
+  );
+};
+List.propTypes = {
+  children: PropTypes.node.isRequired,
+  className: PropTypes.string,
+};
+
+export default List;
diff --git a/eq-author/src/components/FolderPicker/SelectedFoldersContext/index.js b/eq-author/src/components/FolderPicker/SelectedFoldersContext/index.js
new file mode 100644
index 0000000000..de81628b66
--- /dev/null
+++ b/eq-author/src/components/FolderPicker/SelectedFoldersContext/index.js
@@ -0,0 +1,6 @@
+import React from "react";
+
+const SelectedFolders = React.createContext({});
+
+export const SelectedFoldersProvider = SelectedFolders.Provider;
+export default SelectedFolders;
diff --git a/eq-author/src/components/FolderPicker/index.js b/eq-author/src/components/FolderPicker/index.js
new file mode 100644
index 0000000000..24e35d2cbf
--- /dev/null
+++ b/eq-author/src/components/FolderPicker/index.js
@@ -0,0 +1,200 @@
+import React, { useState, useEffect, useContext } from "react";
+import styled from "styled-components";
+import PropTypes from "prop-types";
+
+import searchByFolderTitleOrShortCode from "../../utils/searchFunctions/searchByFolderTitleOrShortCode";
+import { getFolders } from "utils/questionnaireUtils";
+
+import { colors } from "constants/theme";
+
+import SelectedFolderContext, {
+  SelectedFoldersProvider,
+} from "./SelectedFoldersContext";
+
+import Modal from "components/modals/Modal";
+import SearchBar from "components/SearchBar";
+import Button from "components/buttons/Button";
+import ButtonGroup from "components/buttons/ButtonGroup";
+import ScrollPane from "components/ScrollPane";
+import NoSearchResults from "components/NoSearchResults";
+
+import Item from "./Item";
+import List from "./List";
+
+const StyledModal = styled(Modal)`
+  .Modal {
+    padding: 0;
+    padding-top: 1em;
+    width: 45em;
+  }
+`;
+
+const Header = styled.header`
+  margin: 0 1.5em;
+
+  > * {
+    margin-bottom: 2em;
+  }
+`;
+
+const Main = styled.main`
+  overflow: hidden;
+  height: 25em;
+`;
+
+const Footer = styled.footer`
+  padding: 1.5em;
+`;
+
+const Title = styled.h2`
+  font-weight: bold;
+  font-size: 1.2em;
+  color: ${colors.darkGrey};
+  margin-bottom: 0.75em;
+`;
+
+const isSelected = (items, target) => items.find(({ id }) => id === target.id);
+
+const Folder = ({ folder }) => {
+  const { title, alias, displayName } = folder;
+  const { selectedFolders, updateSelectedFolders } = useContext(
+    SelectedFolderContext
+  );
+
+  const itemSelected = isSelected(selectedFolders, folder);
+
+  const handleClick = () => {
+    if (itemSelected) {
+      const selectionWithoutThisFolder = selectedFolders.filter(
+        (selectedFolder) => selectedFolder.id !== folder.id
+      );
+      updateSelectedFolders(selectionWithoutThisFolder);
+    } else {
+      updateSelectedFolders([...selectedFolders, folder]);
+    }
+  };
+
+  return (
+    <Item
+      title={title || alias || displayName}
+      subtitle={title && alias}
+      onClick={handleClick}
+      selected={Boolean(itemSelected)}
+      dataTest="folder-picker-item"
+    />
+  );
+};
+Folder.propTypes = {
+  folder: PropTypes.object, // eslint-disable-line
+};
+
+const Section = ({ section }) => {
+  const { displayName, folders } = section;
+
+  const numOfFoldersInSection = getFolders({ sections: [section] }).length;
+
+  if (numOfFoldersInSection > 0) {
+    return (
+      <Item variant="heading" title={displayName} unselectable>
+        <List>
+          {folders.map((folder) => {
+            return <Folder key={`folder-${folder.id}`} folder={folder} />;
+          })}
+        </List>
+      </Item>
+    );
+  }
+};
+
+const FolderPicker = ({
+  title,
+  sections,
+  showSearch,
+  isOpen,
+  onClose,
+  onCancel,
+  onSubmit,
+  startingSelectedFolders = [],
+}) => {
+  const [searchTerm, setSearchTerm] = useState("");
+  const [filteredSections, updateFilteredSections] = useState([]);
+  const [selectedFolders, updateSelectedFolders] = useState([]);
+
+  useEffect(() => {
+    updateFilteredSections(
+      searchByFolderTitleOrShortCode(sections, searchTerm)
+    );
+  }, [sections, searchTerm]);
+
+  useEffect(() => {
+    updateSelectedFolders(startingSelectedFolders);
+  }, [startingSelectedFolders]);
+
+  const handleSubmit = (selection) => {
+    onSubmit(selection);
+  };
+
+  return (
+    <StyledModal isOpen={isOpen} onClose={onClose} hasCloseButton>
+      <Header>
+        <Title>{title}</Title>
+        {showSearch && (
+          <SearchBar
+            size="large"
+            onChange={({ value }) => setSearchTerm(value)}
+            placeholder="Search folders"
+          />
+        )}
+      </Header>
+      <Main>
+        {searchTerm === "" ||
+        (searchTerm !== "" &&
+          searchByFolderTitleOrShortCode(sections, searchTerm).length > 0) ? (
+          <ScrollPane>
+            <SelectedFoldersProvider
+              value={{ selectedFolders, updateSelectedFolders }}
+            >
+              <List>
+                {filteredSections.map((section) => (
+                  <Section key={`section-${section.id}`} section={section} />
+                ))}
+              </List>
+            </SelectedFoldersProvider>
+          </ScrollPane>
+        ) : (
+          <NoSearchResults
+            searchTerm={searchTerm}
+            alertText="Please check the folder exists."
+          />
+        )}
+      </Main>
+      <Footer>
+        <ButtonGroup horizontal align="right">
+          <Button variant="secondary" onClick={onCancel}>
+            Cancel
+          </Button>
+          <Button
+            variant="primary"
+            autoFocus
+            disabled={selectedFolders.length === 0}
+            onClick={() => handleSubmit(selectedFolders)}
+          >
+            Select
+          </Button>
+        </ButtonGroup>
+      </Footer>
+    </StyledModal>
+  );
+};
+FolderPicker.propTypes = {
+  title: PropTypes.string.isRequired,
+  sections: PropTypes.array.isRequired, // eslint-disable-line
+  startingSelectedFolders: PropTypes.array, // eslint-disable-line
+  showSearch: PropTypes.bool,
+  isOpen: PropTypes.bool,
+  onClose: PropTypes.func.isRequired,
+  onCancel: PropTypes.func.isRequired,
+  onSubmit: PropTypes.func.isRequired,
+};
+
+export default FolderPicker;
diff --git a/eq-author/src/graphql/importFolders.graphql b/eq-author/src/graphql/importFolders.graphql
new file mode 100644
index 0000000000..0acd051e72
--- /dev/null
+++ b/eq-author/src/graphql/importFolders.graphql
@@ -0,0 +1,128 @@
+#import "./fragments/folder.graphql"
+#import "./fragments/page.graphql"
+#import "./fragments/answer.graphql"
+#import "./fragments/option.graphql"
+#import "./fragments/comment.graphql"
+
+mutation ImportFolders($input: ImportFoldersInput!) {
+  importFolders(input: $input) {
+    ...Folder
+    pages {
+      ...Page
+      position
+      displayName
+      pageType
+      title
+      ... on QuestionPage {
+        alias
+        description
+        guidance
+        answers {
+          ...Answer
+          ... on BasicAnswer {
+            secondaryQCode
+          }
+          ... on MultipleChoiceAnswer {
+            options {
+              ...Option
+            }
+            mutuallyExclusiveOption {
+              id
+              displayName
+              label
+              description
+              value
+              qCode
+            }
+          }
+        }
+        confirmation {
+          id
+          qCode
+          displayName
+          comments {
+            ...Comment
+          }
+        }
+        comments {
+          ...Comment
+        }
+      }
+      ... on CalculatedSummaryPage {
+        id
+        title
+        alias
+        pageType
+        pageDescription
+        displayName
+        position
+        totalTitle
+        type
+        answers {
+          ...Answer
+          ... on BasicAnswer {
+            secondaryQCode
+          }
+        }
+        summaryAnswers {
+          id
+        }
+        comments {
+          ...Comment
+        }
+      }
+      ... on ListCollectorQualifierPage {
+        id
+        answers {
+          id
+          ... on MultipleChoiceAnswer {
+            ...Answer
+            options {
+              ...Option
+            }
+            mutuallyExclusiveOption {
+              id
+            }
+          }
+        }
+        comments {
+          ...Comment
+        }
+      }
+      ... on ListCollectorAddItemPage {
+        id
+        description
+        descriptionEnabled
+        guidance
+        guidanceEnabled
+        definitionLabel
+        definitionContent
+        definitionEnabled
+        additionalInfoLabel
+        additionalInfoContent
+        additionalInfoEnabled
+        comments {
+          ...Comment
+        }
+      }
+      ... on ListCollectorConfirmationPage {
+        id
+        answers {
+          id
+          ... on MultipleChoiceAnswer {
+            ...Answer
+            options {
+              ...Option
+            }
+            mutuallyExclusiveOption {
+              id
+            }
+          }
+        }
+        comments {
+          ...Comment
+        }
+      }
+    }
+  }
+}

From 055add24a7132ea26253cde0f19a7d191a1a4eb0 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Thu, 18 Apr 2024 13:42:41 +0100
Subject: [PATCH 019/215] Fix folder picker search

---
 .../src/components/FolderPicker/index.js      | 15 +++++++++++---
 .../searchByFolderTitleOrShortCode.js         | 20 +++++++++++++++++++
 2 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 eq-author/src/utils/searchFunctions/searchByFolderTitleOrShortCode.js

diff --git a/eq-author/src/components/FolderPicker/index.js b/eq-author/src/components/FolderPicker/index.js
index 24e35d2cbf..260c595512 100644
--- a/eq-author/src/components/FolderPicker/index.js
+++ b/eq-author/src/components/FolderPicker/index.js
@@ -84,9 +84,6 @@ const Folder = ({ folder }) => {
     />
   );
 };
-Folder.propTypes = {
-  folder: PropTypes.object, // eslint-disable-line
-};
 
 const Section = ({ section }) => {
   const { displayName, folders } = section;
@@ -104,6 +101,9 @@ const Section = ({ section }) => {
       </Item>
     );
   }
+
+  // Handles sections with no folders matching the search term
+  return <React.Fragment />;
 };
 
 const FolderPicker = ({
@@ -186,6 +186,15 @@ const FolderPicker = ({
     </StyledModal>
   );
 };
+
+Folder.propTypes = {
+  folder: PropTypes.object, // eslint-disable-line
+};
+
+Section.propTypes = {
+  section: PropTypes.object, // eslint-disable-line
+};
+
 FolderPicker.propTypes = {
   title: PropTypes.string.isRequired,
   sections: PropTypes.array.isRequired, // eslint-disable-line
diff --git a/eq-author/src/utils/searchFunctions/searchByFolderTitleOrShortCode.js b/eq-author/src/utils/searchFunctions/searchByFolderTitleOrShortCode.js
new file mode 100644
index 0000000000..30606f92f4
--- /dev/null
+++ b/eq-author/src/utils/searchFunctions/searchByFolderTitleOrShortCode.js
@@ -0,0 +1,20 @@
+const searchByFolderTitleOrShortCode = (data, searchTerm) => {
+  if (!searchTerm || searchTerm === "") {
+    return data;
+  }
+
+  const lowerCaseSearchTerm = searchTerm.toLowerCase();
+
+  const filteredData = data.map(({ folders, ...rest }) => ({
+    folders: folders.filter(({ alias, title, displayName }) =>
+      `${alias ? alias : ""} ${title ? title : displayName}`
+        .toLowerCase()
+        .includes(lowerCaseSearchTerm)
+    ),
+    ...rest,
+  }));
+
+  return filteredData;
+};
+
+export default searchByFolderTitleOrShortCode;

From cf2661800e844a05ec5ce1e1052f7da4a9af37db Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Thu, 18 Apr 2024 15:05:47 +0100
Subject: [PATCH 020/215] Add folder review modal

---
 eq-author/src/App/importingContent/index.js   |  29 ++-
 .../src/components/FolderPicker/index.js      |  16 +-
 .../modals/ImportFolderReviewModal/index.js   | 203 ++++++++++++++++++
 3 files changed, 239 insertions(+), 9 deletions(-)
 create mode 100644 eq-author/src/components/modals/ImportFolderReviewModal/index.js

diff --git a/eq-author/src/App/importingContent/index.js b/eq-author/src/App/importingContent/index.js
index c20812ee03..eac712e547 100644
--- a/eq-author/src/App/importingContent/index.js
+++ b/eq-author/src/App/importingContent/index.js
@@ -24,6 +24,7 @@ import IMPORT_SECTIONS from "graphql/importSections.graphql";
 
 import QuestionnaireSelectModal from "components/modals/QuestionnaireSelectModal";
 import ReviewQuestionsModal from "components/modals/ImportQuestionReviewModal";
+import ReviewFoldersModal from "components/modals/ImportFolderReviewModal";
 import ReviewSectionsModal from "components/modals/ImportSectionReviewModal";
 import SelectContentModal from "components/modals/ImportContentModal";
 import QuestionPicker from "components/QuestionPicker";
@@ -176,6 +177,17 @@ const ImportingContent = ({
     setSelectingContent(false);
   };
 
+  const onFolderPickerSubmit = (selection) => {
+    setFoldersToImport(selection);
+    setSelectingQuestions(false);
+    setReviewingQuestions(false);
+    setReviewingSections(false);
+    setSelectingSections(false);
+    setSelectingFolders(false);
+    setReviewingFolders(true);
+    setSelectingContent(false);
+  };
+
   // TODO: Reviewing folders to import
 
   const onRemoveAllSelectedContent = () => {
@@ -580,12 +592,27 @@ const ImportingContent = ({
                 showSearch
                 onClose={onGlobalCancel}
                 // onCancel={onFolderPickerCancel}
-                // onSubmit={onFolderPickerSubmit}
+                onSubmit={onFolderPickerSubmit}
               />
             );
           }}
         </Query>
       )}
+      {reviewingFolders && (
+        <ReviewFoldersModal
+          isOpen={reviewingFolders}
+          questionnaire={questionnaireImportingFrom}
+          startingSelectedFolders={foldersToImport}
+          onCancel={onGlobalCancel}
+          // onConfirm={onReviewFoldersSubmit}
+          // onBack={onBackFromReviewingFolders}
+          onSelectQuestions={onSelectQuestions}
+          onSelectFolders={onSelectFolders}
+          onSelectSections={onSelectSections}
+          // onRemoveAll={onRemoveAllSelectedContent}
+          // onRemoveSingle={onRemoveSingleSelectedContent}
+        />
+      )}
       {reviewingSections && (
         <ReviewSectionsModal
           isOpen={reviewingSections}
diff --git a/eq-author/src/components/FolderPicker/index.js b/eq-author/src/components/FolderPicker/index.js
index 260c595512..5b4fe0165d 100644
--- a/eq-author/src/components/FolderPicker/index.js
+++ b/eq-author/src/components/FolderPicker/index.js
@@ -85,6 +85,10 @@ const Folder = ({ folder }) => {
   );
 };
 
+Folder.propTypes = {
+  folder: PropTypes.object, // eslint-disable-line
+};
+
 const Section = ({ section }) => {
   const { displayName, folders } = section;
 
@@ -106,6 +110,10 @@ const Section = ({ section }) => {
   return <React.Fragment />;
 };
 
+Section.propTypes = {
+  section: PropTypes.object, // eslint-disable-line
+};
+
 const FolderPicker = ({
   title,
   sections,
@@ -187,14 +195,6 @@ const FolderPicker = ({
   );
 };
 
-Folder.propTypes = {
-  folder: PropTypes.object, // eslint-disable-line
-};
-
-Section.propTypes = {
-  section: PropTypes.object, // eslint-disable-line
-};
-
 FolderPicker.propTypes = {
   title: PropTypes.string.isRequired,
   sections: PropTypes.array.isRequired, // eslint-disable-line
diff --git a/eq-author/src/components/modals/ImportFolderReviewModal/index.js b/eq-author/src/components/modals/ImportFolderReviewModal/index.js
new file mode 100644
index 0000000000..079b4fd81f
--- /dev/null
+++ b/eq-author/src/components/modals/ImportFolderReviewModal/index.js
@@ -0,0 +1,203 @@
+import React from "react";
+import PropTypes from "prop-types";
+import styled from "styled-components";
+import { colors, radius, focusStyle, getTextHoverStyle } from "constants/theme";
+
+import Wizard, {
+  Header,
+  Heading,
+  Subheading,
+  Content,
+  Warning,
+  SpacedRow,
+} from "components/modals/Wizard";
+import Button from "components/buttons/Button";
+
+const FoldersPane = styled.div`
+  max-height: 17em;
+  overflow: hidden;
+  overflow-y: scroll;
+  margin-bottom: 0.5em;
+`;
+
+const FolderContainer = styled.div`
+  background-color: ${colors.blue};
+  border-radius: ${radius};
+  margin: 0 0 0.5em;
+  color: ${colors.white};
+  padding: 0.5em 1em;
+  p {
+    margin: 0;
+  }
+`;
+
+const commonButtonStyling = `
+  background: transparent;
+  border: none;
+  cursor: pointer;
+  &:focus {
+    ${focusStyle}
+  }
+`;
+
+const RemoveButton = styled.button`
+  ${commonButtonStyling}
+  color: ${colors.white};
+  ${getTextHoverStyle(colors.white)}
+`;
+
+const RemoveAllButton = styled.button`
+  ${commonButtonStyling}
+  font-weight: bold;
+  color: ${colors.blue};
+  font-size: 1em;
+  ${getTextHoverStyle(colors.blue)}
+`;
+
+const ContentHeading = styled.h4`
+  margin: 1em 0;
+  color: ${colors.textLight};
+`;
+
+const Container = styled.div`
+  display: flex;
+  gap: 0.5em;
+`;
+
+const WarningWrapper = styled.div`
+  .warning-icon {
+    margin-top: -1.1em;
+  }
+  .warning-flex-container {
+    width: 40em;
+  }
+`;
+
+const FolderRow = ({ folder: { alias, title, displayName }, onRemove }) => (
+  <FolderContainer>
+    <SpacedRow>
+      <div>
+        <p>{title && alias}</p>
+        <p>{title || displayName} </p>
+      </div>
+      <RemoveButton onClick={onRemove}>
+        <span role="img" aria-label="Remove">
+          ✕
+        </span>
+      </RemoveButton>
+    </SpacedRow>
+  </FolderContainer>
+);
+
+FolderRow.propTypes = {
+  folder: PropTypes.shape({
+    alias: PropTypes.string,
+    title: PropTypes.string,
+    displayName: PropTypes.string,
+  }),
+  onRemove: PropTypes.func.isRequired,
+};
+
+const ImportFolderReviewModal = ({
+  questionnaire,
+  startingSelectedFolders,
+  isOpen,
+  onConfirm,
+  onCancel,
+  onBack,
+  onSelectQuestions,
+  onSelectFolders,
+  onSelectSections,
+  onRemoveSingle,
+  onRemoveAll,
+}) => (
+  <Wizard
+    isOpen={isOpen}
+    confirmText="Import"
+    onConfirm={() => onConfirm(startingSelectedFolders)}
+    onCancel={onCancel}
+    onBack={onBack}
+    confirmEnabled={Boolean(startingSelectedFolders?.length) || false}
+  >
+    <Header>
+      <Heading> Import content from {questionnaire.title} </Heading>
+      <Subheading>
+        <WarningWrapper>
+          <Warning>
+            Question logic, piping and Qcodes will not be imported. Any extra
+            spaces in lines of text will be removed.
+          </Warning>
+        </WarningWrapper>
+      </Subheading>
+    </Header>
+    <Content>
+      {startingSelectedFolders?.length ? (
+        <>
+          <SpacedRow>
+            <ContentHeading>
+              Folder{startingSelectedFolders.length > 1 && "s"} to import
+            </ContentHeading>
+            <RemoveAllButton onClick={onRemoveAll}>Remove all</RemoveAllButton>
+          </SpacedRow>
+          <FoldersPane>
+            {startingSelectedFolders.map((folder, index) => (
+              <FolderRow
+                folder={folder}
+                key={index}
+                onRemove={() => onRemoveSingle(index)}
+              />
+            ))}
+          </FoldersPane>
+        </>
+      ) : (
+        <ContentHeading>
+          Select sections, folders or question to import
+        </ContentHeading>
+      )}
+      <Container>
+        {startingSelectedFolders?.length === 0 && (
+          <Button
+            onClick={onSelectSections}
+            data-test="folder-review-select-sections-button"
+          >
+            Sections
+          </Button>
+        )}
+        <Button
+          onClick={onSelectFolders}
+          data-test="folder-review-select-folders-button"
+        >
+          {startingSelectedFolders?.length >= 1
+            ? "Select more folders"
+            : "Folders"}
+        </Button>
+        {startingSelectedFolders?.length === 0 && (
+          <Button
+            onClick={onSelectQuestions}
+            data-test="folder-review-select-questions-button"
+          >
+            Questions
+          </Button>
+        )}
+      </Container>
+    </Content>
+  </Wizard>
+);
+
+ImportFolderReviewModal.propTypes = {
+  isOpen: PropTypes.bool.isRequired,
+  onConfirm: PropTypes.func.isRequired,
+  onCancel: PropTypes.func.isRequired,
+  onBack: PropTypes.func.isRequired,
+  onSelectQuestions: PropTypes.func.isRequired,
+  onSelectFolders: PropTypes.func.isRequired,
+  onSelectSections: PropTypes.func.isRequired,
+  onRemoveSingle: PropTypes.func.isRequired,
+  onRemoveAll: PropTypes.func.isRequired,
+  questionnaire: PropTypes.shape({
+    title: PropTypes.string.isRequired,
+  }),
+  startingSelectedFolders: PropTypes.array, // eslint-disable-line
+};
+
+export default ImportFolderReviewModal;

From cbb21c92582204cc613fd7d600fb9e23ae5d502f Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Fri, 19 Apr 2024 08:27:52 +0100
Subject: [PATCH 021/215] Display modal when folder picker cancel button is
 clicked

---
 eq-author/src/App/importingContent/index.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/eq-author/src/App/importingContent/index.js b/eq-author/src/App/importingContent/index.js
index eac712e547..8dcf6300a9 100644
--- a/eq-author/src/App/importingContent/index.js
+++ b/eq-author/src/App/importingContent/index.js
@@ -177,6 +177,16 @@ const ImportingContent = ({
     setSelectingContent(false);
   };
 
+  const onFolderPickerCancel = () => {
+    setSelectingQuestions(false);
+    setReviewingQuestions(false);
+    setReviewingSections(false);
+    setSelectingSections(false);
+    setSelectingFolders(false);
+    setReviewingFolders(true);
+    setSelectingContent(false);
+  };
+
   const onFolderPickerSubmit = (selection) => {
     setFoldersToImport(selection);
     setSelectingQuestions(false);
@@ -591,7 +601,7 @@ const ImportingContent = ({
                 startingSelectedFolders={foldersToImport}
                 showSearch
                 onClose={onGlobalCancel}
-                // onCancel={onFolderPickerCancel}
+                onCancel={onFolderPickerCancel}
                 onSubmit={onFolderPickerSubmit}
               />
             );

From f47e69f8250fcd3fbb97558515af1f511cb0e621 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Fri, 19 Apr 2024 08:41:44 +0100
Subject: [PATCH 022/215] Display import folder button when cancel button
 clicked on select modals

---
 eq-author/src/App/importingContent/index.js   |  2 ++
 .../modals/ImportContentModal/index.js        | 12 +++----
 .../modals/ImportQuestionReviewModal/index.js | 31 ++++++++++++-------
 .../modals/ImportSectionReviewModal/index.js  | 31 ++++++++++++-------
 4 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/eq-author/src/App/importingContent/index.js b/eq-author/src/App/importingContent/index.js
index 8dcf6300a9..86121ba629 100644
--- a/eq-author/src/App/importingContent/index.js
+++ b/eq-author/src/App/importingContent/index.js
@@ -535,6 +535,7 @@ const ImportingContent = ({
           onConfirm={onReviewQuestionsSubmit}
           onBack={onBackFromReviewingQuestions}
           onSelectQuestions={onSelectQuestions}
+          onSelectFolders={onSelectFolders}
           onSelectSections={onSelectSections}
           onRemoveAll={onRemoveAllSelectedContent}
           onRemoveSingle={onRemoveSingleSelectedContent}
@@ -632,6 +633,7 @@ const ImportingContent = ({
           onConfirm={onReviewSectionsSubmit}
           onBack={onBackFromReviewingSections}
           onSelectQuestions={onSelectQuestions}
+          onSelectFolders={onSelectFolders}
           onSelectSections={onSelectSections}
           onRemoveAll={onRemoveAllSelectedContent}
           onRemoveSingle={onRemoveSingleSelectedContent}
diff --git a/eq-author/src/components/modals/ImportContentModal/index.js b/eq-author/src/components/modals/ImportContentModal/index.js
index e990e32458..b70f68caeb 100644
--- a/eq-author/src/components/modals/ImportContentModal/index.js
+++ b/eq-author/src/components/modals/ImportContentModal/index.js
@@ -66,10 +66,10 @@ const ImportQuestionReviewModal = ({
 
       <Container>
         <Button
-          onClick={onSelectQuestions}
-          data-test="content-modal-select-questions-button"
+          onClick={onSelectSections}
+          data-test="content-modal-select-sections-button"
         >
-          Questions
+          Sections
         </Button>
         <Button
           onClick={onSelectFolders}
@@ -78,10 +78,10 @@ const ImportQuestionReviewModal = ({
           Folders
         </Button>
         <Button
-          onClick={onSelectSections}
-          data-test="content-modal-select-sections-button"
+          onClick={onSelectQuestions}
+          data-test="content-modal-select-questions-button"
         >
-          Sections
+          Questions
         </Button>
       </Container>
     </Content>
diff --git a/eq-author/src/components/modals/ImportQuestionReviewModal/index.js b/eq-author/src/components/modals/ImportQuestionReviewModal/index.js
index 0c770087bc..6e6a8af2a1 100644
--- a/eq-author/src/components/modals/ImportQuestionReviewModal/index.js
+++ b/eq-author/src/components/modals/ImportQuestionReviewModal/index.js
@@ -106,6 +106,7 @@ const ImportQuestionReviewModal = ({
   onCancel,
   onBack,
   onSelectQuestions,
+  onSelectFolders,
   onSelectSections,
   onRemoveSingle,
   onRemoveAll,
@@ -151,19 +152,10 @@ const ImportQuestionReviewModal = ({
         </>
       ) : (
         <ContentHeading>
-          *Select individual questions or entire sections to be imported, you
-          cannot choose both*
+          Select sections, folders or question to import
         </ContentHeading>
       )}
       <Container>
-        <Button
-          onClick={onSelectQuestions}
-          data-test="question-review-select-questions-button"
-        >
-          {startingSelectedQuestions?.length >= 1
-            ? "Select more questions"
-            : "Questions"}
-        </Button>
         {startingSelectedQuestions?.length === 0 && (
           <Button
             onClick={onSelectSections}
@@ -172,6 +164,22 @@ const ImportQuestionReviewModal = ({
             Sections
           </Button>
         )}
+        {startingSelectedQuestions?.length === 0 && (
+          <Button
+            onClick={onSelectFolders}
+            data-test="question-review-select-folders-button"
+          >
+            Folders
+          </Button>
+        )}
+        <Button
+          onClick={onSelectQuestions}
+          data-test="question-review-select-questions-button"
+        >
+          {startingSelectedQuestions?.length >= 1
+            ? "Select more questions"
+            : "Questions"}
+        </Button>
       </Container>
     </Content>
   </Wizard>
@@ -182,8 +190,9 @@ ImportQuestionReviewModal.propTypes = {
   onConfirm: PropTypes.func.isRequired,
   onCancel: PropTypes.func.isRequired,
   onBack: PropTypes.func.isRequired,
-  onSelectQuestions: PropTypes.func.isRequired,
   onSelectSections: PropTypes.func.isRequired,
+  onSelectFolders: PropTypes.func.isRequired,
+  onSelectQuestions: PropTypes.func.isRequired,
   onRemoveSingle: PropTypes.func.isRequired,
   onRemoveAll: PropTypes.func.isRequired,
   questionnaire: PropTypes.shape({
diff --git a/eq-author/src/components/modals/ImportSectionReviewModal/index.js b/eq-author/src/components/modals/ImportSectionReviewModal/index.js
index 9dd7f5ba01..a6e4c6a76e 100644
--- a/eq-author/src/components/modals/ImportSectionReviewModal/index.js
+++ b/eq-author/src/components/modals/ImportSectionReviewModal/index.js
@@ -107,6 +107,7 @@ const ImportSectionReviewModal = ({
   onCancel,
   onBack,
   onSelectQuestions,
+  onSelectFolders,
   onSelectSections,
   onRemoveSingle,
   onRemoveAll,
@@ -151,19 +152,10 @@ const ImportSectionReviewModal = ({
         </>
       ) : (
         <ContentHeading>
-          *Select individual questions or entire sections to be imported, you
-          cannot choose both*
+          Select sections, folders or question to import
         </ContentHeading>
       )}
       <Container>
-        {startingSelectedSections?.length === 0 && (
-          <Button
-            onClick={onSelectQuestions}
-            data-test="section-review-select-questions-button"
-          >
-            Questions
-          </Button>
-        )}
         <Button
           onClick={onSelectSections}
           data-test="section-review-select-sections-button"
@@ -172,6 +164,22 @@ const ImportSectionReviewModal = ({
             ? "Select more sections"
             : "Sections"}
         </Button>
+        {startingSelectedSections?.length === 0 && (
+          <Button
+            onClick={onSelectFolders}
+            data-test="section-review-select-folders-button"
+          >
+            Folders
+          </Button>
+        )}
+        {startingSelectedSections?.length === 0 && (
+          <Button
+            onClick={onSelectQuestions}
+            data-test="section-review-select-questions-button"
+          >
+            Questions
+          </Button>
+        )}
       </Container>
     </Content>
   </Wizard>
@@ -182,8 +190,9 @@ ImportSectionReviewModal.propTypes = {
   onConfirm: PropTypes.func.isRequired,
   onCancel: PropTypes.func.isRequired,
   onBack: PropTypes.func.isRequired,
-  onSelectQuestions: PropTypes.func.isRequired,
   onSelectSections: PropTypes.func.isRequired,
+  onSelectFolders: PropTypes.func.isRequired,
+  onSelectQuestions: PropTypes.func.isRequired,
   onRemoveSingle: PropTypes.func.isRequired,
   onRemoveAll: PropTypes.func.isRequired,
   questionnaire: PropTypes.shape({

From 0e5b69e29664c69048269eefe8db2d5ef3c6d728 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Fri, 19 Apr 2024 08:59:13 +0100
Subject: [PATCH 023/215] Enable removing folders from folder review modal

---
 eq-author/src/App/importingContent/index.js | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/eq-author/src/App/importingContent/index.js b/eq-author/src/App/importingContent/index.js
index 86121ba629..5b0b36ce33 100644
--- a/eq-author/src/App/importingContent/index.js
+++ b/eq-author/src/App/importingContent/index.js
@@ -203,7 +203,11 @@ const ImportingContent = ({
   const onRemoveAllSelectedContent = () => {
     if (reviewingQuestions) {
       setQuestionsToImport([]);
-    } else {
+    }
+    if (reviewingFolders) {
+      setFoldersToImport([]);
+    }
+    if (reviewingSections) {
       setSectionsToImport([]);
     }
   };
@@ -212,7 +216,12 @@ const ImportingContent = ({
     if (reviewingQuestions) {
       const filteredQuestions = questionsToImport.filter((_, i) => i !== index);
       setQuestionsToImport(filteredQuestions);
-    } else {
+    }
+    if (reviewingFolders) {
+      const filteredFolders = foldersToImport.filter((_, i) => i !== index);
+      setFoldersToImport(filteredFolders);
+    }
+    if (reviewingSections) {
       const filteredSections = sectionsToImport.filter((_, i) => i !== index);
       setSectionsToImport(filteredSections);
     }
@@ -620,8 +629,8 @@ const ImportingContent = ({
           onSelectQuestions={onSelectQuestions}
           onSelectFolders={onSelectFolders}
           onSelectSections={onSelectSections}
-          // onRemoveAll={onRemoveAllSelectedContent}
-          // onRemoveSingle={onRemoveSingleSelectedContent}
+          onRemoveAll={onRemoveAllSelectedContent}
+          onRemoveSingle={onRemoveSingleSelectedContent}
         />
       )}
       {reviewingSections && (

From bf183443f99331e03334560e1473f9f58bf7f2be Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Fri, 19 Apr 2024 09:12:18 +0100
Subject: [PATCH 024/215] Fix back button for folder review modal

---
 eq-author/src/App/importingContent/index.js | 38 ++++++++++++++-------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/eq-author/src/App/importingContent/index.js b/eq-author/src/App/importingContent/index.js
index 5b0b36ce33..ee0b107e72 100644
--- a/eq-author/src/App/importingContent/index.js
+++ b/eq-author/src/App/importingContent/index.js
@@ -117,6 +117,7 @@ const ImportingContent = ({
     setQuestionnaireImportingFrom(questionnaire);
     setSelectingQuestionnaire(false);
     setReviewingQuestions(false);
+    setReviewingFolders(false);
     setReviewingSections(false);
     setSelectingContent(true);
   };
@@ -160,6 +161,8 @@ const ImportingContent = ({
     setReviewingQuestions(false);
     setSelectingQuestionnaire(true);
     setQuestionsToImport([]);
+    setSelectingFolders(false);
+    setReviewingFolders(false);
     setReviewingSections(false);
     setSelectingSections(false);
     setSelectingContent(false);
@@ -167,16 +170,6 @@ const ImportingContent = ({
 
   // Selecting folders to import
 
-  const onSelectFolders = () => {
-    setReviewingQuestions(false);
-    setSelectingQuestions(false);
-    setSelectingFolders(true);
-    setReviewingFolders(false);
-    setReviewingSections(false);
-    setSelectingSections(false);
-    setSelectingContent(false);
-  };
-
   const onFolderPickerCancel = () => {
     setSelectingQuestions(false);
     setReviewingQuestions(false);
@@ -198,7 +191,28 @@ const ImportingContent = ({
     setSelectingContent(false);
   };
 
-  // TODO: Reviewing folders to import
+  // Reviewing folders to import
+
+  const onSelectFolders = () => {
+    setReviewingQuestions(false);
+    setSelectingQuestions(false);
+    setSelectingFolders(true);
+    setReviewingFolders(false);
+    setReviewingSections(false);
+    setSelectingSections(false);
+    setSelectingContent(false);
+  };
+
+  const onBackFromReviewingFolders = () => {
+    setReviewingQuestions(false);
+    setSelectingQuestionnaire(true);
+    setQuestionsToImport([]);
+    setSelectingFolders(false);
+    setReviewingFolders(false);
+    setReviewingSections(false);
+    setSelectingSections(false);
+    setSelectingContent(false);
+  };
 
   const onRemoveAllSelectedContent = () => {
     if (reviewingQuestions) {
@@ -625,7 +639,7 @@ const ImportingContent = ({
           startingSelectedFolders={foldersToImport}
           onCancel={onGlobalCancel}
           // onConfirm={onReviewFoldersSubmit}
-          // onBack={onBackFromReviewingFolders}
+          onBack={onBackFromReviewingFolders}
           onSelectQuestions={onSelectQuestions}
           onSelectFolders={onSelectFolders}
           onSelectSections={onSelectSections}

From 453376e093f90708f352325f3a48080b2dd7a9f7 Mon Sep 17 00:00:00 2001
From: sudeep <sudeep.kunhikannan@ons.gov.uk>
Date: Fri, 19 Apr 2024 09:34:13 +0100
Subject: [PATCH 025/215] hide array types

Signed-off-by: sudeep <sudeep.kunhikannan@ons.gov.uk>
---
 eq-author/src/components/RichTextEditor/PipingMenu.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/eq-author/src/components/RichTextEditor/PipingMenu.js b/eq-author/src/components/RichTextEditor/PipingMenu.js
index 7b9d2883f7..e7065ba9b6 100644
--- a/eq-author/src/components/RichTextEditor/PipingMenu.js
+++ b/eq-author/src/components/RichTextEditor/PipingMenu.js
@@ -132,7 +132,7 @@ const PipingMenu = ({
     );
   }
 
-  const supplementaryData = allSupplementaryData.flatMap((list) => {
+  let supplementaryData = allSupplementaryData.flatMap((list) => {
     return list.schemaFields.map((schemaField) => {
       return {
         listName: list.listName,
@@ -141,6 +141,10 @@ const PipingMenu = ({
     });
   });
 
+  supplementaryData = supplementaryData.filter(
+    (list) => !(list.listName !== "" && list.type === "array")
+  );
+
   const handlePickerContent = (contentType) => {
     switch (contentType) {
       case METADATA:

From 9b9173edc357025020e649283d2a08be8b3df830 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Fri, 19 Apr 2024 12:54:35 +0100
Subject: [PATCH 026/215] Add import folder functionality

---
 eq-author-api/schema/resolvers/importing.js   |  65 ++++++
 .../schema/resolvers/utils/folderGetters.js   |   4 +
 eq-author-api/schema/typeDefs.js              |   7 +
 eq-author/src/App/importingContent/index.js   | 109 +++++++++-
 eq-author/src/graphql/importFolders.graphql   | 196 +++++++++---------
 5 files changed, 283 insertions(+), 98 deletions(-)

diff --git a/eq-author-api/schema/resolvers/importing.js b/eq-author-api/schema/resolvers/importing.js
index d599f3b1e1..a357044525 100644
--- a/eq-author-api/schema/resolvers/importing.js
+++ b/eq-author-api/schema/resolvers/importing.js
@@ -1,6 +1,7 @@
 const {
   getPagesByIds,
   getFolderById,
+  getFoldersByIds,
   getSectionById,
   getSectionByFolderId,
   stripQCodes,
@@ -98,6 +99,70 @@ module.exports = {
         return section;
       }
     ),
+    importFolders: createMutation(
+      async (_, { input: { questionnaireId, folderIds, position } }, ctx) => {
+        const { sectionId, index: insertionIndex } = position;
+
+        if (!sectionId) {
+          throw new UserInputError("Target section ID must be provided.");
+        }
+
+        const sourceQuestionnaire = await getQuestionnaire(questionnaireId);
+        if (!sourceQuestionnaire) {
+          throw new UserInputError(
+            `Questionnaire with ID ${questionnaireId} does not exist.`
+          );
+        }
+
+        const sourceFolders = getFoldersByIds(
+          { questionnaire: sourceQuestionnaire },
+          folderIds
+        );
+
+        if (sourceFolders.length !== folderIds.length) {
+          throw new UserInputError(
+            `Not all folder IDs in [${folderIds}] exist in source questionnaire ${questionnaireId}.`
+          );
+        }
+
+        sourceFolders.forEach((folder) => {
+          remapAllNestedIds(folder);
+          removeExtraSpaces(folder);
+          folder.skipConditions = null;
+          if (folder.listId) {
+            folder.listId = "";
+          }
+          folder.pages.forEach((page) => {
+            page.routing = null;
+            page.skipConditions = null;
+            if (page.answers !== undefined) {
+              page.answers.forEach((answer) => {
+                return stripQCodes(answer);
+              });
+            }
+
+            if (page.answers?.length === 1) {
+              if (page.answers[0].repeatingLabelAndInputListId) {
+                page.answers[0].repeatingLabelAndInputListId = "";
+              }
+            }
+          });
+        });
+
+        const section = getSectionById(ctx, sectionId);
+
+        if (!section) {
+          throw new UserInputError(
+            `Section with ID ${sectionId} doesn't exist in target questionnaire.`
+          );
+        }
+
+        section.folders.splice(insertionIndex, 0, ...sourceFolders);
+        setDataVersion(ctx);
+
+        return section;
+      }
+    ),
     importSections: createMutation(
       async (_, { input: { questionnaireId, sectionIds, position } }, ctx) => {
         const { sectionId, index: insertionIndex } = position;
diff --git a/eq-author-api/schema/resolvers/utils/folderGetters.js b/eq-author-api/schema/resolvers/utils/folderGetters.js
index 27c685d4e8..a917a3ec50 100644
--- a/eq-author-api/schema/resolvers/utils/folderGetters.js
+++ b/eq-author-api/schema/resolvers/utils/folderGetters.js
@@ -17,10 +17,14 @@ const getFolderByAnswerId = (ctx, id) =>
       pages && some(pages, ({ answers }) => answers && some(answers, { id }))
   );
 
+const getFoldersByIds = (ctx, ids) =>
+  getFolders(ctx).filter(({ id }) => ids.includes(id));
+
 module.exports = {
   getFolders,
   getFoldersBySectionId,
   getFolderById,
   getFolderByPageId,
   getFolderByAnswerId,
+  getFoldersByIds,
 };
diff --git a/eq-author-api/schema/typeDefs.js b/eq-author-api/schema/typeDefs.js
index f77ab93712..1b445c28f1 100644
--- a/eq-author-api/schema/typeDefs.js
+++ b/eq-author-api/schema/typeDefs.js
@@ -985,6 +985,12 @@ input ImportQuestionsInput {
   position: Position!
 }
 
+input ImportFoldersInput {
+  questionnaireId: ID!
+  folderIds: [ID!]!
+  position: Position!
+}
+
 input ImportSectionsInput {
   questionnaireId: ID!
   sectionIds: [ID!]!
@@ -999,6 +1005,7 @@ type Mutation {
   setQuestionnaireLocked(input: SetQuestionnaireLockedInput!): Questionnaire
 
   importQuestions(input: ImportQuestionsInput!): Section
+  importFolders(input: ImportFoldersInput!): Section
   importSections(input: ImportSectionsInput!): [Section]
 
   createHistoryNote(input: createHistoryNoteInput!): [History!]!
diff --git a/eq-author/src/App/importingContent/index.js b/eq-author/src/App/importingContent/index.js
index ee0b107e72..476dec5b58 100644
--- a/eq-author/src/App/importingContent/index.js
+++ b/eq-author/src/App/importingContent/index.js
@@ -63,6 +63,8 @@ const ImportingContent = ({
   const [selectingContent, setSelectingContent] = useState(false);
   const [showQuestionExtraSpaceModal, setShowQuestionExtraSpaceModal] =
     useState(false);
+  const [showFolderExtraSpaceModal, setShowFolderExtraSpaceModal] =
+    useState(false);
   const [showSectionExtraSpaceModal, setShowSectionExtraSpaceModal] =
     useState(false);
 
@@ -385,6 +387,91 @@ const ImportingContent = ({
     }
   };
 
+  const onReviewFoldersSubmit = (selectedFolders) => {
+    const folderIds = selectedFolders.map(({ id }) => id);
+    let folderContainsExtraSpaces = false;
+
+    selectedFolders.forEach((selectedFolder) => {
+      if (containsExtraSpaces(selectedFolder)) {
+        folderContainsExtraSpaces = true;
+      }
+    });
+
+    if (folderContainsExtraSpaces && !showFolderExtraSpaceModal) {
+      setReviewingQuestions(false);
+      setSelectingQuestions(false);
+      setReviewingSections(false);
+      setSelectingSections(false);
+      setSelectingFolders(false);
+      setReviewingFolders(false);
+      setSelectingContent(false);
+      setShowFolderExtraSpaceModal(true);
+    } else {
+      let input = {
+        folderIds,
+        questionnaireId: questionnaireImportingFrom.id,
+      };
+
+      switch (currentEntityName) {
+        case "section": {
+          input.position = {
+            sectionId: currentEntityId,
+            index: 0,
+          };
+
+          break;
+        }
+        case "folder": {
+          const { id: sectionId } = getSectionByFolderId(
+            sourceQuestionnaire,
+            currentEntityId
+          );
+
+          const { position } = getFolderById(
+            sourceQuestionnaire,
+            currentEntityId
+          );
+
+          input.position = {
+            sectionId,
+          };
+
+          input.position.index = position + 1;
+
+          break;
+        }
+        case "page": {
+          const { id: sectionId } = getSectionByPageId(
+            sourceQuestionnaire,
+            currentEntityId
+          );
+
+          input.position = {
+            sectionId,
+          };
+
+          const { position: folderPosition } = getFolderByPageId(
+            sourceQuestionnaire,
+            currentEntityId
+          );
+
+          input.position.index = folderPosition + 1;
+
+          break;
+        }
+        default: {
+          throw new Error("Unknown entity");
+        }
+      }
+
+      importFolders({
+        variables: { input },
+        refetchQueries: ["GetQuestionnaire"],
+      });
+      onGlobalCancel();
+    }
+  };
+
   // Selecting sections to import
 
   const onSectionPickerCancel = () => {
@@ -638,7 +725,7 @@ const ImportingContent = ({
           questionnaire={questionnaireImportingFrom}
           startingSelectedFolders={foldersToImport}
           onCancel={onGlobalCancel}
-          // onConfirm={onReviewFoldersSubmit}
+          onConfirm={onReviewFoldersSubmit}
           onBack={onBackFromReviewingFolders}
           onSelectQuestions={onSelectQuestions}
           onSelectFolders={onSelectFolders}
@@ -716,6 +803,26 @@ const ImportingContent = ({
           </ExtraSpaceConfirmationModal>
         </ExtraSpaceModalWrapper>
       )}
+      {showFolderExtraSpaceModal && (
+        <ExtraSpaceModalWrapper>
+          <ExtraSpaceConfirmationModal
+            title="Confirm the removal of extra spaces from selected content"
+            warningMessage="By cancelling, the content will not be imported"
+            isOpen={showFolderExtraSpaceModal}
+            onConfirm={() => onReviewFoldersSubmit(foldersToImport)}
+            onClose={onGlobalCancel}
+          >
+            <p>
+              The selected content contains extra spaces at the start of lines
+              of text, between words, or at the end of lines of text.
+            </p>
+            <p>
+              Extra spaces need to be removed before this content can be
+              imported.
+            </p>
+          </ExtraSpaceConfirmationModal>
+        </ExtraSpaceModalWrapper>
+      )}
       {showSectionExtraSpaceModal && (
         <ExtraSpaceModalWrapper>
           <ExtraSpaceConfirmationModal
diff --git a/eq-author/src/graphql/importFolders.graphql b/eq-author/src/graphql/importFolders.graphql
index 0acd051e72..26ef870322 100644
--- a/eq-author/src/graphql/importFolders.graphql
+++ b/eq-author/src/graphql/importFolders.graphql
@@ -6,121 +6,123 @@
 
 mutation ImportFolders($input: ImportFoldersInput!) {
   importFolders(input: $input) {
-    ...Folder
-    pages {
-      ...Page
-      position
-      displayName
-      pageType
-      title
-      ... on QuestionPage {
-        alias
-        description
-        guidance
-        answers {
-          ...Answer
-          ... on BasicAnswer {
-            secondaryQCode
-          }
-          ... on MultipleChoiceAnswer {
-            options {
-              ...Option
+    folders {
+      ...Folder
+      pages {
+        ...Page
+        position
+        displayName
+        pageType
+        title
+        ... on QuestionPage {
+          alias
+          description
+          guidance
+          answers {
+            ...Answer
+            ... on BasicAnswer {
+              secondaryQCode
             }
-            mutuallyExclusiveOption {
-              id
-              displayName
-              label
-              description
-              value
-              qCode
+            ... on MultipleChoiceAnswer {
+              options {
+                ...Option
+              }
+              mutuallyExclusiveOption {
+                id
+                displayName
+                label
+                description
+                value
+                qCode
+              }
             }
           }
+          confirmation {
+            id
+            qCode
+            displayName
+            comments {
+              ...Comment
+            }
+          }
+          comments {
+            ...Comment
+          }
         }
-        confirmation {
+        ... on CalculatedSummaryPage {
           id
-          qCode
+          title
+          alias
+          pageType
+          pageDescription
           displayName
+          position
+          totalTitle
+          type
+          answers {
+            ...Answer
+            ... on BasicAnswer {
+              secondaryQCode
+            }
+          }
+          summaryAnswers {
+            id
+          }
           comments {
             ...Comment
           }
         }
-        comments {
-          ...Comment
-        }
-      }
-      ... on CalculatedSummaryPage {
-        id
-        title
-        alias
-        pageType
-        pageDescription
-        displayName
-        position
-        totalTitle
-        type
-        answers {
-          ...Answer
-          ... on BasicAnswer {
-            secondaryQCode
-          }
-        }
-        summaryAnswers {
+        ... on ListCollectorQualifierPage {
           id
-        }
-        comments {
-          ...Comment
-        }
-      }
-      ... on ListCollectorQualifierPage {
-        id
-        answers {
-          id
-          ... on MultipleChoiceAnswer {
-            ...Answer
-            options {
-              ...Option
-            }
-            mutuallyExclusiveOption {
-              id
+          answers {
+            id
+            ... on MultipleChoiceAnswer {
+              ...Answer
+              options {
+                ...Option
+              }
+              mutuallyExclusiveOption {
+                id
+              }
             }
           }
+          comments {
+            ...Comment
+          }
         }
-        comments {
-          ...Comment
-        }
-      }
-      ... on ListCollectorAddItemPage {
-        id
-        description
-        descriptionEnabled
-        guidance
-        guidanceEnabled
-        definitionLabel
-        definitionContent
-        definitionEnabled
-        additionalInfoLabel
-        additionalInfoContent
-        additionalInfoEnabled
-        comments {
-          ...Comment
+        ... on ListCollectorAddItemPage {
+          id
+          description
+          descriptionEnabled
+          guidance
+          guidanceEnabled
+          definitionLabel
+          definitionContent
+          definitionEnabled
+          additionalInfoLabel
+          additionalInfoContent
+          additionalInfoEnabled
+          comments {
+            ...Comment
+          }
         }
-      }
-      ... on ListCollectorConfirmationPage {
-        id
-        answers {
+        ... on ListCollectorConfirmationPage {
           id
-          ... on MultipleChoiceAnswer {
-            ...Answer
-            options {
-              ...Option
-            }
-            mutuallyExclusiveOption {
-              id
+          answers {
+            id
+            ... on MultipleChoiceAnswer {
+              ...Answer
+              options {
+                ...Option
+              }
+              mutuallyExclusiveOption {
+                id
+              }
             }
           }
-        }
-        comments {
-          ...Comment
+          comments {
+            ...Comment
+          }
         }
       }
     }

From 6139a1629713be6bb2c9ade6990b6b5548f317b4 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Fri, 19 Apr 2024 13:04:20 +0100
Subject: [PATCH 027/215] Update text

---
 eq-author/src/components/modals/ImportContentModal/index.js     | 2 +-
 .../src/components/modals/ImportFolderReviewModal/index.js      | 2 +-
 .../src/components/modals/ImportQuestionReviewModal/index.js    | 2 +-
 .../src/components/modals/ImportSectionReviewModal/index.js     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/eq-author/src/components/modals/ImportContentModal/index.js b/eq-author/src/components/modals/ImportContentModal/index.js
index b70f68caeb..636e6dcc84 100644
--- a/eq-author/src/components/modals/ImportContentModal/index.js
+++ b/eq-author/src/components/modals/ImportContentModal/index.js
@@ -61,7 +61,7 @@ const ImportQuestionReviewModal = ({
     </Header>
     <Content>
       <ContentHeading>
-        Select sections, folders or question to import
+        Select sections, folders or questions to import
       </ContentHeading>
 
       <Container>
diff --git a/eq-author/src/components/modals/ImportFolderReviewModal/index.js b/eq-author/src/components/modals/ImportFolderReviewModal/index.js
index 079b4fd81f..25ea0b7c1e 100644
--- a/eq-author/src/components/modals/ImportFolderReviewModal/index.js
+++ b/eq-author/src/components/modals/ImportFolderReviewModal/index.js
@@ -151,7 +151,7 @@ const ImportFolderReviewModal = ({
         </>
       ) : (
         <ContentHeading>
-          Select sections, folders or question to import
+          Select sections, folders or questions to import
         </ContentHeading>
       )}
       <Container>
diff --git a/eq-author/src/components/modals/ImportQuestionReviewModal/index.js b/eq-author/src/components/modals/ImportQuestionReviewModal/index.js
index 6e6a8af2a1..720b28d3fa 100644
--- a/eq-author/src/components/modals/ImportQuestionReviewModal/index.js
+++ b/eq-author/src/components/modals/ImportQuestionReviewModal/index.js
@@ -152,7 +152,7 @@ const ImportQuestionReviewModal = ({
         </>
       ) : (
         <ContentHeading>
-          Select sections, folders or question to import
+          Select sections, folders or questions to import
         </ContentHeading>
       )}
       <Container>
diff --git a/eq-author/src/components/modals/ImportSectionReviewModal/index.js b/eq-author/src/components/modals/ImportSectionReviewModal/index.js
index a6e4c6a76e..8e9a2ddced 100644
--- a/eq-author/src/components/modals/ImportSectionReviewModal/index.js
+++ b/eq-author/src/components/modals/ImportSectionReviewModal/index.js
@@ -152,7 +152,7 @@ const ImportSectionReviewModal = ({
         </>
       ) : (
         <ContentHeading>
-          Select sections, folders or question to import
+          Select sections, folders or questions to import
         </ContentHeading>
       )}
       <Container>

From d507feeb9ef50bdf4b16c45b2bee950e24a56cf7 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Fri, 19 Apr 2024 13:12:49 +0100
Subject: [PATCH 028/215] Remove cannot import folders text

---
 eq-author/src/App/importingContent/index.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/eq-author/src/App/importingContent/index.js b/eq-author/src/App/importingContent/index.js
index 476dec5b58..8df48ff627 100644
--- a/eq-author/src/App/importingContent/index.js
+++ b/eq-author/src/App/importingContent/index.js
@@ -675,7 +675,6 @@ const ImportingContent = ({
                 isOpen={selectingQuestions}
                 sections={sections}
                 startingSelectedQuestions={questionsToImport}
-                warningPanel="You cannot import folders but you can import any questions they contain."
                 showSearch
                 onClose={onGlobalCancel}
                 onCancel={onQuestionPickerCancel}
@@ -773,7 +772,6 @@ const ImportingContent = ({
                 isOpen={selectingSections}
                 sections={sections}
                 startingSelectedSections={sectionsToImport}
-                warningPanel="You cannot import folders but you can import any questions they contain."
                 showSearch
                 onClose={onGlobalCancel}
                 onCancel={onSectionPickerCancel}

From c5b3477a0a6c683778eb3d22b0efc109ddfdd41d Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Fri, 19 Apr 2024 14:57:24 +0100
Subject: [PATCH 029/215] Remove list collector folders when importing into a
 repeating section

---
 eq-author/src/App/importingContent/index.js   | 44 ++++++++++++++++++-
 .../src/graphql/getQuestionnaire.graphql      |  3 ++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/eq-author/src/App/importingContent/index.js b/eq-author/src/App/importingContent/index.js
index 8df48ff627..8cf2dba18f 100644
--- a/eq-author/src/App/importingContent/index.js
+++ b/eq-author/src/App/importingContent/index.js
@@ -279,6 +279,32 @@ const ImportingContent = ({
     }
   };
 
+  const isInsideRepeatingSection = () => {
+    switch (currentEntityName) {
+      case "section": {
+        const section = getSectionById(sourceQuestionnaire, currentEntityId);
+        return section.repeatingSection;
+      }
+      case "folder": {
+        const section = getSectionByFolderId(
+          sourceQuestionnaire,
+          currentEntityId
+        );
+        return section.repeatingSection;
+      }
+      case "page": {
+        const section = getSectionByPageId(
+          sourceQuestionnaire,
+          currentEntityId
+        );
+        return section.repeatingSection;
+      }
+      default: {
+        return false;
+      }
+    }
+  };
+
   const onReviewQuestionsSubmit = (selectedQuestions) => {
     const questionIds = selectedQuestions.map(({ id }) => id);
     let questionContainsExtraSpaces = false;
@@ -702,12 +728,28 @@ const ImportingContent = ({
             }
 
             const { sections } = data.questionnaire;
+            const sectionsToDisplay = [];
+
+            // Removes list collector folders from sections containing selectable folders when importing into a repeating section
+            if (isInsideRepeatingSection()) {
+              sections.forEach((section) => {
+                const foldersWithoutListCollectors = section.folders.filter(
+                  (folder) => folder.listId == null
+                );
+                sectionsToDisplay.push({
+                  ...section,
+                  folders: foldersWithoutListCollectors,
+                });
+              });
+            } else {
+              sectionsToDisplay.push(...sections);
+            }
 
             return (
               <FolderPicker
                 title="Select the folder(s) to import"
                 isOpen={selectingFolders}
-                sections={sections}
+                sections={sectionsToDisplay}
                 startingSelectedFolders={foldersToImport}
                 showSearch
                 onClose={onGlobalCancel}
diff --git a/eq-author/src/graphql/getQuestionnaire.graphql b/eq-author/src/graphql/getQuestionnaire.graphql
index 37f5fc434a..e967424e62 100644
--- a/eq-author/src/graphql/getQuestionnaire.graphql
+++ b/eq-author/src/graphql/getQuestionnaire.graphql
@@ -37,6 +37,9 @@ query GetQuestionnaire($input: QueryInput!) {
         displayName
         title
         position
+        ... on ListCollectorFolder {
+          listId
+        }
         pages {
           id
           title

From 6b58f8b8d8304f05d183bbd9f0f412de9a3a2e7c Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Mon, 22 Apr 2024 07:36:49 +0100
Subject: [PATCH 030/215] Display warning message when importing into repeating
 section

---
 eq-author/src/App/importingContent/index.js   |  4 ++
 .../src/components/FolderPicker/index.js      | 44 ++++++++++++++-----
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/eq-author/src/App/importingContent/index.js b/eq-author/src/App/importingContent/index.js
index 8cf2dba18f..1280425757 100644
--- a/eq-author/src/App/importingContent/index.js
+++ b/eq-author/src/App/importingContent/index.js
@@ -751,6 +751,10 @@ const ImportingContent = ({
                 isOpen={selectingFolders}
                 sections={sectionsToDisplay}
                 startingSelectedFolders={foldersToImport}
+                warningMessage={
+                  isInsideRepeatingSection() &&
+                  "You cannot import list collector folders into a repeating section"
+                }
                 showSearch
                 onClose={onGlobalCancel}
                 onCancel={onFolderPickerCancel}
diff --git a/eq-author/src/components/FolderPicker/index.js b/eq-author/src/components/FolderPicker/index.js
index 5b4fe0165d..6122b41592 100644
--- a/eq-author/src/components/FolderPicker/index.js
+++ b/eq-author/src/components/FolderPicker/index.js
@@ -11,8 +11,11 @@ import SelectedFolderContext, {
   SelectedFoldersProvider,
 } from "./SelectedFoldersContext";
 
+import { ReactComponent as WarningIcon } from "assets/icon-warning-round.svg";
+
 import Modal from "components/modals/Modal";
 import SearchBar from "components/SearchBar";
+import IconText from "components/IconText";
 import Button from "components/buttons/Button";
 import ButtonGroup from "components/buttons/ButtonGroup";
 import ScrollPane from "components/ScrollPane";
@@ -29,12 +32,8 @@ const StyledModal = styled(Modal)`
   }
 `;
 
-const Header = styled.header`
+const Header = styled.div`
   margin: 0 1.5em;
-
-  > * {
-    margin-bottom: 2em;
-  }
 `;
 
 const Main = styled.main`
@@ -53,6 +52,22 @@ const Title = styled.h2`
   margin-bottom: 0.75em;
 `;
 
+const WarningPanel = styled(IconText)`
+  font-weight: bold;
+  font-size: 1.1em;
+  margin-bottom: 0.8em;
+
+  svg {
+    width: 3em;
+    height: 3em;
+    margin-right: 0.5em;
+  }
+`;
+
+const SearchBarWrapper = styled.div`
+  margin-bottom: 1.5em;
+`;
+
 const isSelected = (items, target) => items.find(({ id }) => id === target.id);
 
 const Folder = ({ folder }) => {
@@ -119,6 +134,7 @@ const FolderPicker = ({
   sections,
   showSearch,
   isOpen,
+  warningMessage,
   onClose,
   onCancel,
   onSubmit,
@@ -146,12 +162,19 @@ const FolderPicker = ({
     <StyledModal isOpen={isOpen} onClose={onClose} hasCloseButton>
       <Header>
         <Title>{title}</Title>
+        {warningMessage && (
+          <WarningPanel icon={WarningIcon} left>
+            {warningMessage}
+          </WarningPanel>
+        )}
         {showSearch && (
-          <SearchBar
-            size="large"
-            onChange={({ value }) => setSearchTerm(value)}
-            placeholder="Search folders"
-          />
+          <SearchBarWrapper>
+            <SearchBar
+              size="large"
+              onChange={({ value }) => setSearchTerm(value)}
+              placeholder="Search folders"
+            />
+          </SearchBarWrapper>
         )}
       </Header>
       <Main>
@@ -200,6 +223,7 @@ FolderPicker.propTypes = {
   sections: PropTypes.array.isRequired, // eslint-disable-line
   startingSelectedFolders: PropTypes.array, // eslint-disable-line
   showSearch: PropTypes.bool,
+  warningMessage: PropTypes.string,
   isOpen: PropTypes.bool,
   onClose: PropTypes.func.isRequired,
   onCancel: PropTypes.func.isRequired,

From 298f8ec3660e7f225fb7574424982b086882fd70 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Mon, 22 Apr 2024 13:54:54 +0100
Subject: [PATCH 031/215] Display error message when no folders found matching
 search

---
 eq-author/src/components/FolderPicker/index.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eq-author/src/components/FolderPicker/index.js b/eq-author/src/components/FolderPicker/index.js
index 6122b41592..321f2bed5c 100644
--- a/eq-author/src/components/FolderPicker/index.js
+++ b/eq-author/src/components/FolderPicker/index.js
@@ -180,7 +180,10 @@ const FolderPicker = ({
       <Main>
         {searchTerm === "" ||
         (searchTerm !== "" &&
-          searchByFolderTitleOrShortCode(sections, searchTerm).length > 0) ? (
+          // Checks if there are any sections with folders matching the search term
+          searchByFolderTitleOrShortCode(sections, searchTerm).some(
+            (section) => section.folders.length > 0
+          )) ? (
           <ScrollPane>
             <SelectedFoldersProvider
               value={{ selectedFolders, updateSelectedFolders }}

From e346eceb6453c6523d7bac73423f8cb71628deaf Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Mon, 22 Apr 2024 14:33:57 +0100
Subject: [PATCH 032/215] Fix heading accessibility error

---
 .../components/modals/ImportFolderReviewModal/index.js    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/eq-author/src/components/modals/ImportFolderReviewModal/index.js b/eq-author/src/components/modals/ImportFolderReviewModal/index.js
index 25ea0b7c1e..bf338607ff 100644
--- a/eq-author/src/components/modals/ImportFolderReviewModal/index.js
+++ b/eq-author/src/components/modals/ImportFolderReviewModal/index.js
@@ -6,7 +6,6 @@ import { colors, radius, focusStyle, getTextHoverStyle } from "constants/theme";
 import Wizard, {
   Header,
   Heading,
-  Subheading,
   Content,
   Warning,
   SpacedRow,
@@ -73,6 +72,13 @@ const WarningWrapper = styled.div`
   }
 `;
 
+const Subheading = styled.h3`
+  margin: 0 0.5em 0 0;
+  display: block;
+  font-weight: bold;
+  font-size: 1em;
+`;
+
 const FolderRow = ({ folder: { alias, title, displayName }, onRemove }) => (
   <FolderContainer>
     <SpacedRow>

From 0f820d9493530caee0024850ac65c28587d73e7b Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Tue, 23 Apr 2024 09:33:48 +0100
Subject: [PATCH 033/215] Display list collector badge for list collector
 folders in import menu

---
 eq-author/src/components/FolderPicker/Item/index.js | 12 ++++++++++++
 eq-author/src/components/FolderPicker/index.js      |  3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/eq-author/src/components/FolderPicker/Item/index.js b/eq-author/src/components/FolderPicker/Item/index.js
index 1854539ba7..165ae882e4 100644
--- a/eq-author/src/components/FolderPicker/Item/index.js
+++ b/eq-author/src/components/FolderPicker/Item/index.js
@@ -111,9 +111,19 @@ const Subtitle = styled.span`
   color: ${colors.darkGrey};
 `;
 
+const ContentBadge = styled.span`
+  font-size: 0.8em;
+  position: absolute;
+  padding: 0.3em 0.7em;
+  right: 1.5em;
+  background: ${colors.lightMediumGrey};
+  border-radius: 1em;
+`;
+
 const WrappedItem = ({
   title,
   subtitle,
+  isListCollector,
   variant,
   selected,
   unselectable = false,
@@ -141,6 +151,7 @@ const WrappedItem = ({
       >
         {variant !== "heading" && subtitle && <Subtitle>{subtitle}</Subtitle>}
         {variant !== "heading" && <Title>{title}</Title>}
+        {isListCollector && <ContentBadge>List collector</ContentBadge>}
         {variant === "heading" && <Heading>{title}</Heading>}
       </Item>
       {children}
@@ -152,6 +163,7 @@ WrappedItem.propTypes = {
   unselectable: PropTypes.bool,
   title: PropTypes.string.isRequired,
   subtitle: PropTypes.string,
+  isListCollector: PropTypes.bool,
   variant: PropTypes.string,
   selected: PropTypes.bool,
   onClick: PropTypes.func,
diff --git a/eq-author/src/components/FolderPicker/index.js b/eq-author/src/components/FolderPicker/index.js
index 321f2bed5c..0a253c7740 100644
--- a/eq-author/src/components/FolderPicker/index.js
+++ b/eq-author/src/components/FolderPicker/index.js
@@ -71,7 +71,7 @@ const SearchBarWrapper = styled.div`
 const isSelected = (items, target) => items.find(({ id }) => id === target.id);
 
 const Folder = ({ folder }) => {
-  const { title, alias, displayName } = folder;
+  const { title, alias, displayName, listId } = folder;
   const { selectedFolders, updateSelectedFolders } = useContext(
     SelectedFolderContext
   );
@@ -93,6 +93,7 @@ const Folder = ({ folder }) => {
     <Item
       title={title || alias || displayName}
       subtitle={title && alias}
+      isListCollector={Boolean(listId)}
       onClick={handleClick}
       selected={Boolean(itemSelected)}
       dataTest="folder-picker-item"

From 92cb8ced0637a35536b6a18433955b655fdbe1e3 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Tue, 23 Apr 2024 10:01:29 +0100
Subject: [PATCH 034/215] Fix console errors

---
 eq-author/src/App/importingContent/index.js         | 5 +++--
 eq-author/src/components/FolderPicker/Item/index.js | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/eq-author/src/App/importingContent/index.js b/eq-author/src/App/importingContent/index.js
index 1280425757..9c15175b22 100644
--- a/eq-author/src/App/importingContent/index.js
+++ b/eq-author/src/App/importingContent/index.js
@@ -752,8 +752,9 @@ const ImportingContent = ({
                 sections={sectionsToDisplay}
                 startingSelectedFolders={foldersToImport}
                 warningMessage={
-                  isInsideRepeatingSection() &&
-                  "You cannot import list collector folders into a repeating section"
+                  isInsideRepeatingSection()
+                    ? "You cannot import list collector folders into a repeating section"
+                    : ""
                 }
                 showSearch
                 onClose={onGlobalCancel}
diff --git a/eq-author/src/components/FolderPicker/Item/index.js b/eq-author/src/components/FolderPicker/Item/index.js
index 165ae882e4..fb10988ecb 100644
--- a/eq-author/src/components/FolderPicker/Item/index.js
+++ b/eq-author/src/components/FolderPicker/Item/index.js
@@ -143,7 +143,7 @@ const WrappedItem = ({
         variant={variant}
         className={`${variant}`}
         aria-selected={selected}
-        unselectable={unselectable}
+        $unselectable={unselectable}
         tabIndex={unselectable ? -1 : 0}
         onClick={onClick}
         onKeyUp={({ keyCode }) => onEnterUp(keyCode, onClick)}

From c9ff3abb038a5fa93e5d6e8d3d31e2e11d898bc0 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Tue, 23 Apr 2024 14:04:25 +0100
Subject: [PATCH 035/215] Fix failing tests

---
 eq-author/src/App/importingContent/index.test.js | 16 ++++------------
 .../ImportQuestionReviewModal/index.test.js      |  4 +---
 .../ImportSectionReviewModal/index.test.js       |  4 +---
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/eq-author/src/App/importingContent/index.test.js b/eq-author/src/App/importingContent/index.test.js
index 09ec0eb4eb..f97fa9e78a 100644
--- a/eq-author/src/App/importingContent/index.test.js
+++ b/eq-author/src/App/importingContent/index.test.js
@@ -420,9 +420,7 @@ describe("Importing content", () => {
 
       expect(queryByText("Page 1")).not.toBeInTheDocument();
       expect(
-        queryByText(
-          "*Select individual questions or entire sections to be imported, you cannot choose both*"
-        )
+        queryByText("Select sections, folders or questions to import")
       ).toBeInTheDocument();
     });
 
@@ -478,9 +476,7 @@ describe("Importing content", () => {
       expect(queryByText("Page 1")).not.toBeInTheDocument();
       expect(queryByText("Page 2")).not.toBeInTheDocument();
       expect(
-        getByText(
-          "*Select individual questions or entire sections to be imported, you cannot choose both*"
-        )
+        getByText("Select sections, folders or questions to import")
       ).toBeInTheDocument();
     });
 
@@ -1240,9 +1236,7 @@ describe("Importing content", () => {
 
       expect(queryByText("Section 1")).not.toBeInTheDocument();
       expect(
-        queryByText(
-          "*Select individual questions or entire sections to be imported, you cannot choose both*"
-        )
+        queryByText("Select sections, folders or questions to import")
       ).toBeInTheDocument();
     });
 
@@ -1298,9 +1292,7 @@ describe("Importing content", () => {
       expect(queryByText("Section 1")).not.toBeInTheDocument();
       expect(queryByText("Section 2")).not.toBeInTheDocument();
       expect(
-        getByText(
-          "*Select individual questions or entire sections to be imported, you cannot choose both*"
-        )
+        getByText("Select sections, folders or questions to import")
       ).toBeInTheDocument();
     });
 
diff --git a/eq-author/src/components/modals/ImportQuestionReviewModal/index.test.js b/eq-author/src/components/modals/ImportQuestionReviewModal/index.test.js
index 8d7c95e0ea..d3ab3c4d14 100644
--- a/eq-author/src/components/modals/ImportQuestionReviewModal/index.test.js
+++ b/eq-author/src/components/modals/ImportQuestionReviewModal/index.test.js
@@ -36,9 +36,7 @@ describe("Import questions review modal", () => {
     );
 
     expect(
-      screen.queryByText(
-        /Select individual questions or entire sections to be imported, you cannot choose both/
-      )
+      screen.queryByText(/Select sections, folders or questions to import/)
     ).toBeTruthy();
     // Import button should be disabled when no questions selected
     expect(screen.getByText(/^Import$/)).toBeDisabled();
diff --git a/eq-author/src/components/modals/ImportSectionReviewModal/index.test.js b/eq-author/src/components/modals/ImportSectionReviewModal/index.test.js
index fb6dea9fcc..dc2ea15212 100644
--- a/eq-author/src/components/modals/ImportSectionReviewModal/index.test.js
+++ b/eq-author/src/components/modals/ImportSectionReviewModal/index.test.js
@@ -31,9 +31,7 @@ describe("Import sections review modal", () => {
     );
 
     expect(
-      screen.queryByText(
-        /Select individual questions or entire sections to be imported, you cannot choose both/
-      )
+      screen.queryByText(/Select sections, folders or questions to import/)
     ).toBeTruthy();
     // Import button should be disabled when no questions selected
     expect(screen.getByText(/^Import$/)).toBeDisabled();

From 44df8ede3826431e80ebde772bdd6b39b6245555 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Tue, 23 Apr 2024 15:07:53 +0100
Subject: [PATCH 036/215] Add tests for folder title and short code search

---
 .../searchByFolderTitleOrShortCode.test.js    | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 eq-author/src/utils/searchFunctions/searchByFolderTitleOrShortCode.test.js

diff --git a/eq-author/src/utils/searchFunctions/searchByFolderTitleOrShortCode.test.js b/eq-author/src/utils/searchFunctions/searchByFolderTitleOrShortCode.test.js
new file mode 100644
index 0000000000..ec67ee6e9e
--- /dev/null
+++ b/eq-author/src/utils/searchFunctions/searchByFolderTitleOrShortCode.test.js
@@ -0,0 +1,68 @@
+import searchByFolderTitleOrShortCode from "./searchByFolderTitleOrShortCode";
+
+describe("searchByFolderTitleOrShortCode", () => {
+  let data;
+
+  beforeEach(() => {
+    data = [
+      {
+        folders: [
+          {
+            id: "folder-1",
+            alias: "Folder 1",
+          },
+          {
+            id: "folder-2",
+            alias: "Folder 2",
+          },
+        ],
+      },
+      {
+        folders: [
+          {
+            id: "list-folder-1",
+            listId: "list-1",
+            alias: "List 1",
+            title: "List folder 1",
+          },
+          {
+            id: "list-folder-2",
+            listId: "list-2",
+            title: "List folder 2",
+          },
+        ],
+      },
+    ];
+  });
+
+  it("should return data when searchTerm is empty string", () => {
+    const searchResult = searchByFolderTitleOrShortCode(data, "");
+
+    expect(searchResult).toEqual(data);
+  });
+
+  it("should return filtered data when searchTerm is not empty string", () => {
+    const searchResult = searchByFolderTitleOrShortCode(data, "folder 1");
+
+    expect(searchResult).toEqual([
+      {
+        folders: [
+          {
+            id: "folder-1",
+            alias: "Folder 1",
+          },
+        ],
+      },
+      {
+        folders: [
+          {
+            id: "list-folder-1",
+            listId: "list-1",
+            alias: "List 1",
+            title: "List folder 1",
+          },
+        ],
+      },
+    ]);
+  });
+});

From 464f74a7d62ccd86093d5ce15f6248b747f0113a Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Wed, 24 Apr 2024 12:47:47 +0100
Subject: [PATCH 037/215] Add folder picker item tests

---
 .../src/components/FolderPicker/Item/index.js | 36 +++++---
 .../FolderPicker/Item/index.test.js           | 86 +++++++++++++++++++
 .../src/components/FolderPicker/index.js      |  8 +-
 3 files changed, 114 insertions(+), 16 deletions(-)
 create mode 100644 eq-author/src/components/FolderPicker/Item/index.test.js

diff --git a/eq-author/src/components/FolderPicker/Item/index.js b/eq-author/src/components/FolderPicker/Item/index.js
index fb10988ecb..747367c8a1 100644
--- a/eq-author/src/components/FolderPicker/Item/index.js
+++ b/eq-author/src/components/FolderPicker/Item/index.js
@@ -121,6 +121,7 @@ const ContentBadge = styled.span`
 `;
 
 const WrappedItem = ({
+  id,
   title,
   subtitle,
   isListCollector,
@@ -129,16 +130,15 @@ const WrappedItem = ({
   unselectable = false,
   onClick,
   children,
-  dataTest,
 }) => {
-  const onEnterUp = (keyCode, callback) => {
-    if (keyCode === 13) {
-      callback();
+  const handleEnterUp = (key, onEnter) => {
+    if (key === "Enter") {
+      onEnter();
     }
   };
 
   return (
-    <ListItem data-test={dataTest}>
+    <ListItem>
       <Item
         variant={variant}
         className={`${variant}`}
@@ -146,19 +146,32 @@ const WrappedItem = ({
         $unselectable={unselectable}
         tabIndex={unselectable ? -1 : 0}
         onClick={onClick}
-        onKeyUp={({ keyCode }) => onEnterUp(keyCode, onClick)}
-        data-test="folder-picker-item"
+        onKeyUp={({ key }) => handleEnterUp(key, onClick)}
+        data-test={`folder-picker-item-${id}`}
       >
-        {variant !== "heading" && subtitle && <Subtitle>{subtitle}</Subtitle>}
-        {variant !== "heading" && <Title>{title}</Title>}
-        {isListCollector && <ContentBadge>List collector</ContentBadge>}
-        {variant === "heading" && <Heading>{title}</Heading>}
+        {variant !== "heading" && subtitle && (
+          <Subtitle data-test={`folder-picker-subtitle-${id}`}>
+            {subtitle}
+          </Subtitle>
+        )}
+        {variant !== "heading" && (
+          <Title data-test={`folder-picker-title-${id}`}>{title}</Title>
+        )}
+        {isListCollector && (
+          <ContentBadge data-test={`folder-picker-content-badge-${id}`}>
+            List collector
+          </ContentBadge>
+        )}
+        {variant === "heading" && (
+          <Heading data-test={`folder-picker-heading-${id}`}>{title}</Heading>
+        )}
       </Item>
       {children}
     </ListItem>
   );
 };
 WrappedItem.propTypes = {
+  id: PropTypes.string,
   icon: PropTypes.node,
   unselectable: PropTypes.bool,
   title: PropTypes.string.isRequired,
@@ -168,7 +181,6 @@ WrappedItem.propTypes = {
   selected: PropTypes.bool,
   onClick: PropTypes.func,
   children: PropTypes.node,
-  dataTest: PropTypes.string,
 };
 
 export default WrappedItem;
diff --git a/eq-author/src/components/FolderPicker/Item/index.test.js b/eq-author/src/components/FolderPicker/Item/index.test.js
new file mode 100644
index 0000000000..25cc55c6c1
--- /dev/null
+++ b/eq-author/src/components/FolderPicker/Item/index.test.js
@@ -0,0 +1,86 @@
+import React from "react";
+import { render, fireEvent } from "tests/utils/rtl";
+
+import Item from ".";
+
+import { colors } from "constants/theme";
+
+const renderFolderPickerItem = (props) => {
+  return render(<Item {...props} />);
+};
+
+describe("FolderPicker item", () => {
+  let props;
+
+  beforeEach(() => {
+    props = {
+      id: "folder-1",
+      title: "Folder 1",
+      subtitle: "1",
+    };
+  });
+
+  it("should display heading if variant is heading", () => {
+    const { getByTestId } = renderFolderPickerItem({
+      id: "section-1",
+      title: "Section 1",
+      variant: "heading",
+    });
+
+    expect(getByTestId("folder-picker-item-section-1")).toHaveStyleRule(
+      "background-color",
+      colors.lightMediumGrey
+    );
+    expect(getByTestId("folder-picker-heading-section-1")).toHaveTextContent(
+      "Section 1"
+    );
+  });
+
+  it("should display title and subtitle when both are defined and variant is not heading", () => {
+    const { getByTestId } = renderFolderPickerItem({
+      ...props,
+    });
+
+    expect(getByTestId("folder-picker-title-folder-1")).toHaveTextContent(
+      "Folder 1"
+    );
+    expect(getByTestId("folder-picker-subtitle-folder-1")).toHaveTextContent(
+      "1"
+    );
+  });
+
+  it("should display content badge for list collector folders", () => {
+    const { getByTestId } = renderFolderPickerItem({
+      ...props,
+      isListCollector: true,
+    });
+
+    expect(
+      getByTestId("folder-picker-content-badge-folder-1")
+    ).toHaveTextContent("List collector");
+  });
+
+  it("should call onClick when clicked", () => {
+    const onClick = jest.fn();
+    const { getByTestId } = renderFolderPickerItem({
+      ...props,
+      onClick,
+    });
+
+    fireEvent.click(getByTestId("folder-picker-item-folder-1"));
+    expect(onClick).toHaveBeenCalledTimes(1);
+  });
+
+  it("should call onClick when enter key is pressed", () => {
+    const onClick = jest.fn();
+    const { getByTestId } = renderFolderPickerItem({
+      ...props,
+      onClick,
+    });
+
+    fireEvent.keyUp(getByTestId("folder-picker-item-folder-1"), {
+      key: "Enter",
+    });
+    expect(onClick).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/eq-author/src/components/FolderPicker/index.js b/eq-author/src/components/FolderPicker/index.js
index 0a253c7740..b3257d6286 100644
--- a/eq-author/src/components/FolderPicker/index.js
+++ b/eq-author/src/components/FolderPicker/index.js
@@ -71,7 +71,7 @@ const SearchBarWrapper = styled.div`
 const isSelected = (items, target) => items.find(({ id }) => id === target.id);
 
 const Folder = ({ folder }) => {
-  const { title, alias, displayName, listId } = folder;
+  const { id, title, alias, displayName, listId } = folder;
   const { selectedFolders, updateSelectedFolders } = useContext(
     SelectedFolderContext
   );
@@ -91,12 +91,12 @@ const Folder = ({ folder }) => {
 
   return (
     <Item
+      id={id}
       title={title || alias || displayName}
       subtitle={title && alias}
       isListCollector={Boolean(listId)}
       onClick={handleClick}
       selected={Boolean(itemSelected)}
-      dataTest="folder-picker-item"
     />
   );
 };
@@ -106,13 +106,13 @@ Folder.propTypes = {
 };
 
 const Section = ({ section }) => {
-  const { displayName, folders } = section;
+  const { id, displayName, folders } = section;
 
   const numOfFoldersInSection = getFolders({ sections: [section] }).length;
 
   if (numOfFoldersInSection > 0) {
     return (
-      <Item variant="heading" title={displayName} unselectable>
+      <Item id={id} variant="heading" title={displayName} unselectable>
         <List>
           {folders.map((folder) => {
             return <Folder key={`folder-${folder.id}`} folder={folder} />;

From f99e966c6e9404e6e7bd56287599f5136ac71caa Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Wed, 24 Apr 2024 13:02:51 +0100
Subject: [PATCH 038/215] Add folder picker list test

---
 eq-author/src/components/FolderPicker/List/index.js  |  1 +
 .../src/components/FolderPicker/List/index.test.js   | 12 ++++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 eq-author/src/components/FolderPicker/List/index.test.js

diff --git a/eq-author/src/components/FolderPicker/List/index.js b/eq-author/src/components/FolderPicker/List/index.js
index 0ced1e35cc..babfb16aa7 100644
--- a/eq-author/src/components/FolderPicker/List/index.js
+++ b/eq-author/src/components/FolderPicker/List/index.js
@@ -14,6 +14,7 @@ const List = ({ children, className }) => {
     </OrderedList>
   );
 };
+
 List.propTypes = {
   children: PropTypes.node.isRequired,
   className: PropTypes.string,
diff --git a/eq-author/src/components/FolderPicker/List/index.test.js b/eq-author/src/components/FolderPicker/List/index.test.js
new file mode 100644
index 0000000000..56286f7d80
--- /dev/null
+++ b/eq-author/src/components/FolderPicker/List/index.test.js
@@ -0,0 +1,12 @@
+import React from "react";
+import { render } from "tests/utils/rtl";
+
+import List from ".";
+
+describe("FolderPicker list", () => {
+  it("should render list", () => {
+    const { getByTestId } = render(<List>Test</List>);
+
+    expect(getByTestId("folder-picker-list")).toBeInTheDocument();
+  });
+});

From 25b41f135061c3a8020d400e0d529bddb3034fd6 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Thu, 25 Apr 2024 09:19:22 +0100
Subject: [PATCH 039/215] Add folder picker tests

---
 .../src/components/FolderPicker/index.js      |  19 ++-
 .../src/components/FolderPicker/index.test.js | 131 ++++++++++++++++++
 2 files changed, 143 insertions(+), 7 deletions(-)
 create mode 100644 eq-author/src/components/FolderPicker/index.test.js

diff --git a/eq-author/src/components/FolderPicker/index.js b/eq-author/src/components/FolderPicker/index.js
index b3257d6286..b5f63e2347 100644
--- a/eq-author/src/components/FolderPicker/index.js
+++ b/eq-author/src/components/FolderPicker/index.js
@@ -32,7 +32,7 @@ const StyledModal = styled(Modal)`
   }
 `;
 
-const Header = styled.div`
+const Header = styled.header`
   margin: 0 1.5em;
 `;
 
@@ -161,15 +161,15 @@ const FolderPicker = ({
 
   return (
     <StyledModal isOpen={isOpen} onClose={onClose} hasCloseButton>
-      <Header>
-        <Title>{title}</Title>
+      <Header data-test="folder-picker-header">
+        <Title data-test="folder-picker-title">{title}</Title>
         {warningMessage && (
           <WarningPanel icon={WarningIcon} left>
             {warningMessage}
           </WarningPanel>
         )}
         {showSearch && (
-          <SearchBarWrapper>
+          <SearchBarWrapper data-test="folder-picker-search-bar-wrapper">
             <SearchBar
               size="large"
               onChange={({ value }) => setSearchTerm(value)}
@@ -178,7 +178,7 @@ const FolderPicker = ({
           </SearchBarWrapper>
         )}
       </Header>
-      <Main>
+      <Main data-test="folder-picker-main">
         {searchTerm === "" ||
         (searchTerm !== "" &&
           // Checks if there are any sections with folders matching the search term
@@ -203,9 +203,13 @@ const FolderPicker = ({
           />
         )}
       </Main>
-      <Footer>
+      <Footer data-test="folder-picker-footer">
         <ButtonGroup horizontal align="right">
-          <Button variant="secondary" onClick={onCancel}>
+          <Button
+            variant="secondary"
+            onClick={onCancel}
+            data-test="folder-picker-button-cancel"
+          >
             Cancel
           </Button>
           <Button
@@ -213,6 +217,7 @@ const FolderPicker = ({
             autoFocus
             disabled={selectedFolders.length === 0}
             onClick={() => handleSubmit(selectedFolders)}
+            data-test="folder-picker-button-select"
           >
             Select
           </Button>
diff --git a/eq-author/src/components/FolderPicker/index.test.js b/eq-author/src/components/FolderPicker/index.test.js
new file mode 100644
index 0000000000..12094d262d
--- /dev/null
+++ b/eq-author/src/components/FolderPicker/index.test.js
@@ -0,0 +1,131 @@
+import React from "react";
+import { render, fireEvent } from "tests/utils/rtl";
+
+import FolderPicker from "./";
+
+const sections = [
+  {
+    id: "section-1",
+    title: "Section 1",
+    displayName: "Section 1",
+    folders: [
+      {
+        id: "folder-1",
+        alias: "Folder 1",
+      },
+      {
+        id: "folder-2",
+        alias: "Folder 2",
+      },
+    ],
+  },
+  {
+    id: "section-2",
+    title: "Section 2",
+    displayName: "Section 2",
+    folders: [
+      {
+        id: "list-collector-1",
+        title: "List collector 1",
+        listId: "list-1",
+      },
+      {
+        id: "list-collector-2",
+        title: "List collector 2",
+        alias: "List 2",
+        listId: "list-2",
+      },
+      {
+        id: "untitled-folder",
+        displayName: "Untitled folder",
+      },
+    ],
+  },
+];
+
+describe("FolderPicker", () => {
+  const defaultProps = {
+    title: "Select the folder(s) to import",
+    isOpen: true,
+    showSearch: true,
+    onSubmit: jest.fn(),
+    onClose: jest.fn(),
+    onCancel: jest.fn(),
+    startingSelectedFolders: [],
+    sections,
+  };
+
+  const renderFolderPicker = (args) => {
+    return render(<FolderPicker {...defaultProps} {...args} />);
+  };
+
+  it("should render", () => {
+    const { getByTestId } = renderFolderPicker();
+
+    expect(getByTestId("folder-picker-header")).toBeInTheDocument();
+  });
+
+  it("should call onSubmit when select button is clicked", () => {
+    const { getByTestId, getByText } = renderFolderPicker();
+
+    fireEvent.click(getByText(/Folder 1/));
+
+    const selectButton = getByTestId("folder-picker-button-select");
+    fireEvent.click(selectButton);
+
+    expect(defaultProps.onSubmit).toHaveBeenCalledTimes(1);
+  });
+
+  it("should call onCancel when cancel button is clicked", () => {
+    const { getByTestId } = renderFolderPicker();
+
+    const cancelButton = getByTestId("folder-picker-button-cancel");
+    fireEvent.click(cancelButton);
+
+    expect(defaultProps.onCancel).toHaveBeenCalledTimes(1);
+  });
+
+  it("should render warning message", () => {
+    const { getByText } = renderFolderPicker({
+      warningMessage: "Test message",
+    });
+
+    expect(getByText("Test message")).toBeInTheDocument();
+  });
+
+  it("should update folder selected when clicked", () => {
+    const { getByTestId } = renderFolderPicker();
+
+    const folderItem = getByTestId("folder-picker-item-folder-1");
+    fireEvent.click(folderItem);
+
+    expect(folderItem.getAttribute("aria-selected")).toBe("true");
+
+    fireEvent.click(folderItem);
+    expect(folderItem.getAttribute("aria-selected")).toBe("false");
+  });
+
+  describe("Search bar", () => {
+    it("should filter folders by search term", () => {
+      const { getByTestId, queryByText } = renderFolderPicker();
+
+      const searchBar = getByTestId("search-bar");
+      fireEvent.change(searchBar, { target: { value: "Folder 1" } });
+
+      expect(queryByText("Folder 1")).toBeInTheDocument();
+      expect(queryByText("Folder 2")).not.toBeInTheDocument();
+    });
+
+    it("should display no results message when no folders match search term", () => {
+      const { getByTestId, getByText } = renderFolderPicker();
+
+      const searchBar = getByTestId("search-bar");
+      fireEvent.change(searchBar, { target: { value: "Undefined folder" } });
+
+      expect(
+        getByText(/No results found for 'Undefined folder'/)
+      ).toBeInTheDocument();
+      expect(getByText(/Please check the folder exists/)).toBeInTheDocument();
+    });
+  });
+});

From 34efdb08e3bb87939beb46c2637574c7a43614c4 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Thu, 25 Apr 2024 10:59:17 +0100
Subject: [PATCH 040/215] Add missing props for tests

---
 .../ImportQuestionReviewModal/index.test.js   |  9 +++++++
 .../ImportSectionReviewModal/index.test.js    | 27 ++++++++++++-------
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/eq-author/src/components/modals/ImportQuestionReviewModal/index.test.js b/eq-author/src/components/modals/ImportQuestionReviewModal/index.test.js
index d3ab3c4d14..07a3b7db43 100644
--- a/eq-author/src/components/modals/ImportQuestionReviewModal/index.test.js
+++ b/eq-author/src/components/modals/ImportQuestionReviewModal/index.test.js
@@ -16,6 +16,7 @@ const mockQuestions = [
 const mockOnSelectQuestions = jest.fn();
 const mockOnRemoveSingle = jest.fn();
 const mockOnRemoveAll = jest.fn();
+const mockOnSelectFolders = jest.fn();
 const mockOnSelectSections = jest.fn();
 
 describe("Import questions review modal", () => {
@@ -25,6 +26,7 @@ describe("Import questions review modal", () => {
         questionnaire={mockQuestionnaire}
         isOpen
         onSelectQuestions={mockOnSelectQuestions}
+        onSelectFolders={mockOnSelectFolders}
         onSelectSections={mockOnSelectSections}
         startingSelectedQuestions={[]}
         onConfirm={jest.fn()}
@@ -55,6 +57,7 @@ describe("Import questions review modal", () => {
         isOpen
         startingSelectedQuestions={mockQuestions}
         onSelectQuestions={mockOnSelectQuestions}
+        onSelectFolders={mockOnSelectFolders}
         onSelectSections={mockOnSelectSections}
         onConfirm={jest.fn()}
         onCancel={jest.fn()}
@@ -74,6 +77,7 @@ describe("Import questions review modal", () => {
         isOpen
         startingSelectedQuestions={mockQuestions}
         onSelectQuestions={mockOnSelectQuestions}
+        onSelectFolders={mockOnSelectFolders}
         onSelectSections={mockOnSelectSections}
         onConfirm={jest.fn()}
         onCancel={jest.fn()}
@@ -95,6 +99,7 @@ describe("Import questions review modal", () => {
         isOpen
         startingSelectedQuestions={mockQuestions}
         onSelectSections={mockOnSelectSections}
+        onSelectFolders={mockOnSelectFolders}
         onSelectQuestions={mockOnSelectQuestions}
         onConfirm={jest.fn()}
         onCancel={jest.fn()}
@@ -116,6 +121,7 @@ describe("Import questions review modal", () => {
         questionnaire={mockQuestionnaire}
         isOpen
         onSelectSections={mockOnSelectSections}
+        onSelectFolders={mockOnSelectFolders}
         onSelectQuestions={mockOnSelectQuestions}
         startingSelectedQuestions={mockQuestions}
         onConfirm={mockHandleConfirm}
@@ -139,6 +145,7 @@ describe("Import questions review modal", () => {
           questionnaire={mockQuestionnaire}
           isOpen
           onSelectSections={mockOnSelectSections}
+          onSelectFolders={mockOnSelectFolders}
           onSelectQuestions={mockOnSelectQuestions}
           startingSelectedQuestions={[]}
           onConfirm={jest.fn()}
@@ -160,6 +167,7 @@ describe("Import questions review modal", () => {
           questionnaire={mockQuestionnaire}
           isOpen
           onSelectSections={mockOnSelectSections}
+          onSelectFolders={mockOnSelectFolders}
           onSelectQuestions={mockOnSelectQuestions}
           startingSelectedQuestions={mockQuestions}
           onConfirm={jest.fn()}
@@ -181,6 +189,7 @@ describe("Import questions review modal", () => {
           questionnaire={mockQuestionnaire}
           isOpen
           onSelectSections={mockOnSelectSections}
+          onSelectFolders={mockOnSelectFolders}
           onSelectQuestions={mockOnSelectQuestions}
           startingSelectedQuestions={[]}
           onConfirm={jest.fn()}
diff --git a/eq-author/src/components/modals/ImportSectionReviewModal/index.test.js b/eq-author/src/components/modals/ImportSectionReviewModal/index.test.js
index dc2ea15212..5645443a2e 100644
--- a/eq-author/src/components/modals/ImportSectionReviewModal/index.test.js
+++ b/eq-author/src/components/modals/ImportSectionReviewModal/index.test.js
@@ -1,7 +1,7 @@
 import React from "react";
 import { render, screen } from "tests/utils/rtl";
 import userEvent from "@testing-library/user-event";
-import ImportQuestionReviewModal from ".";
+import ImportSectionReviewModal from ".";
 import mockSections from "../../../tests/mocks/mockSections.json";
 
 const mockQuestionnaire = {
@@ -11,15 +11,17 @@ const mockQuestionnaire = {
 const mockOnSelectSections = jest.fn();
 const mockOnRemoveSingle = jest.fn();
 const mockOnRemoveAll = jest.fn();
+const mockOnSelectFolders = jest.fn();
 const mockOnSelectQuestions = jest.fn();
 
 describe("Import sections review modal", () => {
   it("Should call onSelectSections when the sections button is clicked", () => {
     render(
-      <ImportQuestionReviewModal
+      <ImportSectionReviewModal
         questionnaire={mockQuestionnaire}
         isOpen
         onSelectSections={mockOnSelectSections}
+        onSelectFolders={mockOnSelectFolders}
         onSelectQuestions={mockOnSelectQuestions}
         startingSelectedSections={[]}
         onConfirm={jest.fn()}
@@ -47,11 +49,12 @@ describe("Import sections review modal", () => {
 
   it("Should display the selected sections when there are some", () => {
     render(
-      <ImportQuestionReviewModal
+      <ImportSectionReviewModal
         questionnaire={mockQuestionnaire}
         isOpen
         startingSelectedSections={mockSections}
         onSelectSections={mockOnSelectSections}
+        onSelectFolders={mockOnSelectFolders}
         onSelectQuestions={mockOnSelectQuestions}
         onConfirm={jest.fn()}
         onCancel={jest.fn()}
@@ -70,11 +73,12 @@ describe("Import sections review modal", () => {
 
   it("Should call onRemoveSingle with the index of the item that is signaled to be removed", () => {
     render(
-      <ImportQuestionReviewModal
+      <ImportSectionReviewModal
         questionnaire={mockQuestionnaire}
         isOpen
         startingSelectedSections={mockSections}
         onSelectSections={mockOnSelectSections}
+        onSelectFolders={mockOnSelectFolders}
         onSelectQuestions={mockOnSelectQuestions}
         onConfirm={jest.fn()}
         onCancel={jest.fn()}
@@ -91,11 +95,12 @@ describe("Import sections review modal", () => {
 
   it("Should delete all items", () => {
     render(
-      <ImportQuestionReviewModal
+      <ImportSectionReviewModal
         questionnaire={mockQuestionnaire}
         isOpen
         startingSelectedSections={mockSections}
         onSelectSections={mockOnSelectSections}
+        onSelectFolders={mockOnSelectFolders}
         onSelectQuestions={mockOnSelectQuestions}
         onConfirm={jest.fn()}
         onCancel={jest.fn()}
@@ -113,10 +118,11 @@ describe("Import sections review modal", () => {
     const mockHandleConfirm = jest.fn();
 
     render(
-      <ImportQuestionReviewModal
+      <ImportSectionReviewModal
         questionnaire={mockQuestionnaire}
         isOpen
         onSelectSections={mockOnSelectSections}
+        onSelectFolders={mockOnSelectFolders}
         onSelectQuestions={mockOnSelectQuestions}
         startingSelectedSections={mockSections}
         onConfirm={mockHandleConfirm}
@@ -138,10 +144,11 @@ describe("Import sections review modal", () => {
       const mockHandleConfirm = jest.fn();
 
       render(
-        <ImportQuestionReviewModal
+        <ImportSectionReviewModal
           questionnaire={mockQuestionnaire}
           isOpen
           onSelectSections={mockOnSelectSections}
+          onSelectFolders={mockOnSelectFolders}
           onSelectQuestions={mockOnSelectQuestions}
           startingSelectedSections={[]}
           onConfirm={mockHandleConfirm}
@@ -161,10 +168,11 @@ describe("Import sections review modal", () => {
       const mockHandleConfirm = jest.fn();
 
       render(
-        <ImportQuestionReviewModal
+        <ImportSectionReviewModal
           questionnaire={mockQuestionnaire}
           isOpen
           onSelectSections={mockOnSelectSections}
+          onSelectFolders={mockOnSelectFolders}
           onSelectQuestions={mockOnSelectQuestions}
           startingSelectedSections={mockSections}
           onConfirm={mockHandleConfirm}
@@ -184,10 +192,11 @@ describe("Import sections review modal", () => {
       const mockHandleConfirm = jest.fn();
 
       render(
-        <ImportQuestionReviewModal
+        <ImportSectionReviewModal
           questionnaire={mockQuestionnaire}
           isOpen
           onSelectSections={mockOnSelectSections}
+          onSelectFolders={mockOnSelectFolders}
           onSelectQuestions={mockOnSelectQuestions}
           startingSelectedSections={[]}
           onConfirm={mockHandleConfirm}

From 4b56d6e7e87d1270de45b1e5fd24d493bd2c93af Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Mon, 29 Apr 2024 08:49:25 +0100
Subject: [PATCH 041/215] Add folder review modal tests

---
 .../modals/ImportFolderReviewModal/index.js   |  7 +-
 .../ImportFolderReviewModal/index.test.js     | 95 +++++++++++++++++++
 2 files changed, 100 insertions(+), 2 deletions(-)
 create mode 100644 eq-author/src/components/modals/ImportFolderReviewModal/index.test.js

diff --git a/eq-author/src/components/modals/ImportFolderReviewModal/index.js b/eq-author/src/components/modals/ImportFolderReviewModal/index.js
index bf338607ff..bf93282833 100644
--- a/eq-author/src/components/modals/ImportFolderReviewModal/index.js
+++ b/eq-author/src/components/modals/ImportFolderReviewModal/index.js
@@ -79,14 +79,17 @@ const Subheading = styled.h3`
   font-size: 1em;
 `;
 
-const FolderRow = ({ folder: { alias, title, displayName }, onRemove }) => (
+const FolderRow = ({ folder: { id, alias, title, displayName }, onRemove }) => (
   <FolderContainer>
     <SpacedRow>
       <div>
         <p>{title && alias}</p>
         <p>{title || displayName} </p>
       </div>
-      <RemoveButton onClick={onRemove}>
+      <RemoveButton
+        onClick={onRemove}
+        data-test={`folder-review-item-remove-button-${id}`}
+      >
         <span role="img" aria-label="Remove">
           ✕
         </span>
diff --git a/eq-author/src/components/modals/ImportFolderReviewModal/index.test.js b/eq-author/src/components/modals/ImportFolderReviewModal/index.test.js
new file mode 100644
index 0000000000..193f2e5ffb
--- /dev/null
+++ b/eq-author/src/components/modals/ImportFolderReviewModal/index.test.js
@@ -0,0 +1,95 @@
+import React from "react";
+import { render, fireEvent } from "tests/utils/rtl";
+
+import ImportFolderReviewModal from ".";
+
+const mockQuestionnaire = {
+  title: "Import folders",
+};
+
+describe("Import folder review modal", () => {
+  const defaultProps = {
+    questionnaire: mockQuestionnaire,
+    isOpen: true,
+    startingSelectedFolders: [],
+    onSelectSections: jest.fn(),
+    onSelectFolders: jest.fn(),
+    onSelectQuestions: jest.fn(),
+    onConfirm: jest.fn(),
+    onCancel: jest.fn(),
+    onBack: jest.fn(),
+    onRemoveAll: jest.fn(),
+    onRemoveSingle: jest.fn(),
+  };
+
+  const renderImportFolderReviewModal = (args) => {
+    return render(<ImportFolderReviewModal {...defaultProps} {...args} />);
+  };
+
+  it("should render", () => {
+    const { getByText } = renderImportFolderReviewModal();
+
+    expect(
+      getByText(/Select sections, folders or questions to import/)
+    ).toBeTruthy();
+  });
+
+  it("should call onSelectFolders when the folders button is clicked", () => {
+    const { getByTestId } = renderImportFolderReviewModal();
+
+    expect(defaultProps.onSelectFolders).not.toHaveBeenCalled();
+
+    fireEvent.click(getByTestId("folder-review-select-folders-button"));
+
+    expect(defaultProps.onSelectFolders).toHaveBeenCalledTimes(1);
+  });
+
+  it("should render selected folders", () => {
+    const startingSelectedFolders = [
+      { id: "folder-1", displayName: "Folder 1 display name" },
+      { id: "folder-2", title: "Folder 2 title", alias: "Folder 2 alias" },
+    ];
+    const { getByText } = renderImportFolderReviewModal({
+      startingSelectedFolders,
+    });
+
+    expect(getByText(/Folder 1 display name/)).toBeInTheDocument();
+    expect(getByText(/Folder 2 title/)).toBeInTheDocument();
+    expect(getByText(/Folder 2 alias/)).toBeInTheDocument();
+  });
+
+  it("should call onConfirm when import button is clicked", () => {
+    const startingSelectedFolders = [
+      { id: "folder-1", displayName: "Folder 1" },
+    ];
+    const { getByText } = renderImportFolderReviewModal({
+      startingSelectedFolders,
+    });
+
+    const importButton = getByText(/^Import$/); // Matches exact "Import" text - gets import button
+
+    expect(defaultProps.onConfirm).not.toHaveBeenCalled();
+
+    fireEvent.click(importButton);
+
+    expect(defaultProps.onConfirm).toHaveBeenCalledTimes(1);
+  });
+
+  it("should call onRemoveSingle when folder item remove button is clicked", () => {
+    const startingSelectedFolders = [
+      { id: "folder-1", displayName: "Folder 1" },
+      { id: "folder-2", displayName: "Folder 2" },
+    ];
+
+    const { getByTestId } = renderImportFolderReviewModal({
+      startingSelectedFolders,
+    });
+
+    expect(defaultProps.onRemoveSingle).not.toHaveBeenCalled();
+
+    fireEvent.click(getByTestId("folder-review-item-remove-button-folder-1"));
+
+    expect(defaultProps.onRemoveSingle).toHaveBeenCalledWith(0);
+    expect(defaultProps.onRemoveSingle).toHaveBeenCalledTimes(1);
+  });
+});

From 7fa98e1ca2ba4be99df74251a3ae201abab9da36 Mon Sep 17 00:00:00 2001
From: sudeep <sudeep.kunhikannan@ons.gov.uk>
Date: Mon, 29 Apr 2024 12:18:40 +0100
Subject: [PATCH 042/215] added supplementary data tests

Signed-off-by: sudeep <sudeep.kunhikannan@ons.gov.uk>
---
 .../RichTextEditor/PipingMenu.test.js         | 51 ++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

diff --git a/eq-author/src/components/RichTextEditor/PipingMenu.test.js b/eq-author/src/components/RichTextEditor/PipingMenu.test.js
index f06d0d5697..9a25916daa 100644
--- a/eq-author/src/components/RichTextEditor/PipingMenu.test.js
+++ b/eq-author/src/components/RichTextEditor/PipingMenu.test.js
@@ -34,12 +34,60 @@ const mockMetadata = [
   },
 ];
 
+const mockSupplementaryData = {
+  surveyId: "221",
+  data: [
+    {
+      schemaFields: [
+        {
+          identifier: "employer_paye",
+          description:
+            "The tax office employer reference. This will be between 1 and 10 characters, which can be letters and numbers.",
+          type: "string",
+          example: "AB456",
+          selector: "reference",
+          id: "c5f64732-3bb2-40ba-8b0d-fc3b7e22c834",
+        },
+      ],
+      id: "f0d7091a-44be-4c88-9d78-a807aa7509ec",
+      listName: "",
+    },
+    {
+      schemaFields: [
+        {
+          identifier: "local-units",
+          description: "Name of the local unit",
+          type: "string",
+          example: "STUBBS BUILDING PRODUCTS LTD",
+          selector: "name",
+          id: "673a30af-5197-4d2a-be0c-e5795a998491",
+        },
+        {
+          identifier: "local-units",
+          description: "The “trading as” name for the local unit",
+          type: "string",
+          example: "STUBBS PRODUCTS",
+          selector: "trading_name",
+          id: "af2ff1a6-fc5d-419f-9538-0d052a5e6728",
+        },
+      ],
+      id: "6e901afa-473a-4704-8bbd-de054569379c",
+      listName: "local-units",
+    },
+  ],
+  sdsDateCreated: "2023-12-15T11:21:34Z",
+  sdsGuid: "621c954b-5523-4eda-a3eb-f18bebd20b8d",
+  sdsVersion: "1",
+  id: "b6c84aee-ea11-41e6-8be8-5715b066d297",
+};
+
 const mockQuestionnaire = buildQuestionnaire({
   sectionCount: 1,
   folderCount: 1,
   pageCount: 2,
 });
 mockQuestionnaire.metadata = mockMetadata;
+mockQuestionnaire.supplementaryData = mockSupplementaryData;
 mockQuestionnaire.sections[0].folders[0].pages[0].answers = [
   {
     id: "answer-1",
@@ -101,11 +149,12 @@ describe("PipingMenu", () => {
     expect(wrapper.find(PIPING_BUTTON_VALUE).prop("disabled")).toBe(true);
   });
 
-  it("should render as disabled when there is no answerData and metadataData", () => {
+  it("should render as disabled when there is no answerData, metadataData, and supplementaryData", () => {
     const wrapper = render({
       questionnaire: {
         ...mockQuestionnaire,
         metadata: [],
+        supplementaryData: [],
       },
       currentPageId: "1.1.1",
     });

From 6f6bd349f686f80996db9f36fa90872aa97f7837 Mon Sep 17 00:00:00 2001
From: sudeep <sudeep.kunhikannan@ons.gov.uk>
Date: Mon, 29 Apr 2024 15:09:50 +0100
Subject: [PATCH 043/215] added supplementary data tests

Signed-off-by: sudeep <sudeep.kunhikannan@ons.gov.uk>
---
 .../SupplementaryDataPicker.test.js           | 99 +++++++++++++++++++
 .../RichTextEditor/PipingMenu.test.js         |  3 +-
 2 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 eq-author/src/components/ContentPickerv3/SupplementaryDataPicker.test.js

diff --git a/eq-author/src/components/ContentPickerv3/SupplementaryDataPicker.test.js b/eq-author/src/components/ContentPickerv3/SupplementaryDataPicker.test.js
new file mode 100644
index 0000000000..3f3bcdc2f4
--- /dev/null
+++ b/eq-author/src/components/ContentPickerv3/SupplementaryDataPicker.test.js
@@ -0,0 +1,99 @@
+import React from "react";
+import { render, fireEvent } from "tests/utils/rtl";
+import {
+  ANSWER,
+  METADATA,
+  SUPPLEMENTARY_DATA,
+} from "../ContentPickerSelectv3/content-types";
+import Theme from "contexts/themeContext";
+
+import SupplementaryDataPicker from "./SupplementaryDataPicker";
+
+describe("Supplementary Data Picker", () => {
+  let props;
+  const setContentType = jest.fn();
+
+  beforeEach(() => {
+    props = {
+      data: [
+        {
+          surveyId: "221",
+          data: [
+            {
+              schemaFields: [
+                {
+                  identifier: "employer_paye",
+                  description:
+                    "The tax office employer reference. This will be between 1 and 10 characters, which can be letters and numbers.",
+                  type: "string",
+                  example: "AB456",
+                  selector: "reference",
+                  id: "c5f64732-3bb2-40ba-8b0d-fc3b7e22c834",
+                },
+              ],
+              id: "f0d7091a-44be-4c88-9d78-a807aa7509ec",
+              listName: "",
+            },
+            {
+              schemaFields: [
+                {
+                  identifier: "local-units",
+                  description: "Name of the local unit",
+                  type: "string",
+                  example: "STUBBS BUILDING PRODUCTS LTD",
+                  selector: "name",
+                  id: "673a30af-5197-4d2a-be0c-e5795a998491",
+                },
+                {
+                  identifier: "local-units",
+                  description: "The “trading as” name for the local unit",
+                  type: "string",
+                  example: "STUBBS PRODUCTS",
+                  selector: "trading_name",
+                  id: "af2ff1a6-fc5d-419f-9538-0d052a5e6728",
+                },
+              ],
+              id: "6e901afa-473a-4704-8bbd-de054569379c",
+              listName: "local-units",
+            },
+          ],
+          sdsDateCreated: "2023-12-15T11:21:34Z",
+          sdsGuid: "621c954b-5523-4eda-a3eb-f18bebd20b8d",
+          sdsVersion: "1",
+          id: "b6c84aee-ea11-41e6-8be8-5715b066d297",
+        },
+      ],
+      contentType: ANSWER,
+      contentTypes: [ANSWER, METADATA, SUPPLEMENTARY_DATA],
+      setContentType,
+      isSelected: jest.fn(),
+      onSelected: jest.fn(),
+      isSectionSelected: jest.fn(),
+    };
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  const renderSupplementaryDataPicker = () =>
+    render(
+      <Theme>
+        <SupplementaryDataPicker {...props} />
+      </Theme>
+    );
+
+  it("should render the 'Answer from supplementary data' radio button", () => {
+    const { getByText } = renderSupplementaryDataPicker();
+    expect(getByText("Answer from supplementary data")).toBeTruthy();
+  });
+
+  it("should click the 'Answer from supplementary data' radio button", () => {
+    const { getByTestId } = renderSupplementaryDataPicker();
+    const supplementaryDataRadio = getByTestId(
+      "content-type-selector-supplementaryData"
+    );
+    fireEvent.click(supplementaryDataRadio);
+    expect(setContentType).toHaveBeenCalledWith(SUPPLEMENTARY_DATA);
+  });
+});
diff --git a/eq-author/src/components/RichTextEditor/PipingMenu.test.js b/eq-author/src/components/RichTextEditor/PipingMenu.test.js
index 9a25916daa..30d3691c4e 100644
--- a/eq-author/src/components/RichTextEditor/PipingMenu.test.js
+++ b/eq-author/src/components/RichTextEditor/PipingMenu.test.js
@@ -8,6 +8,7 @@ import PipingMenu, {
 import {
   ANSWER,
   METADATA,
+  SUPPLEMENTARY_DATA,
   VARIABLES,
 } from "components/ContentPickerSelectv3/content-types";
 
@@ -111,7 +112,7 @@ describe("PipingMenu", () => {
     return shallow(
       <PipingMenu
         onItemChosen={handleItemChosen}
-        allowableTypes={[ANSWER, METADATA, VARIABLES]}
+        allowableTypes={[ANSWER, METADATA, SUPPLEMENTARY_DATA, VARIABLES]}
         canFocus
         {...props}
       />

From 025c4978282d0d8785107bc75e976ba4dc4c5c18 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Tue, 30 Apr 2024 14:57:37 +0100
Subject: [PATCH 044/215] Add initial import folder tests

---
 .../src/App/importingContent/index.test.js    | 362 ++++++++++++++++++
 1 file changed, 362 insertions(+)

diff --git a/eq-author/src/App/importingContent/index.test.js b/eq-author/src/App/importingContent/index.test.js
index f97fa9e78a..4afb4a3caf 100644
--- a/eq-author/src/App/importingContent/index.test.js
+++ b/eq-author/src/App/importingContent/index.test.js
@@ -59,6 +59,7 @@ const sourceQuestionnaires = [
         folders: [
           {
             id: "folder-1",
+            displayName: "Folder 1",
             pages: [
               {
                 id: "page-1",
@@ -117,6 +118,7 @@ const sourceQuestionnaires = [
         folders: [
           {
             id: "folder-2",
+            displayName: "Folder 2",
             pages: [
               {
                 id: "page-3",
@@ -152,6 +154,7 @@ const sourceQuestionnaires = [
         folders: [
           {
             id: "folder-3",
+            displayName: "Folder 3",
             pages: [
               {
                 id: "page-5",
@@ -188,6 +191,7 @@ const sourceQuestionnaires = [
         folders: [
           {
             id: "folder-4",
+            displayName: "Folder 4",
             pages: [
               {
                 id: "page-7",
@@ -212,6 +216,7 @@ const sourceQuestionnaires = [
         folders: [
           {
             id: "folder-5",
+            displayName: "Folder 5",
             pages: [
               {
                 id: "page-8",
@@ -236,6 +241,7 @@ const sourceQuestionnaires = [
         folders: [
           {
             id: "folder-6",
+            displayName: "Folder 6",
             pages: [
               {
                 id: "page-9",
@@ -1179,6 +1185,362 @@ describe("Importing content", () => {
     });
   });
 
+  describe("import folders", () => {
+    it("should open the 'Select the folder(s) to import' modal", () => {
+      const { getByTestId, getAllByTestId, getByText } =
+        renderImportingContent();
+      fireEvent.click(getByText(/All/));
+      const allRows = getAllByTestId("table-row");
+      fireEvent.click(allRows[0]);
+      fireEvent.click(getByTestId("confirm-btn"));
+
+      const foldersButton = getByTestId("content-modal-select-folders-button");
+
+      fireEvent.click(foldersButton);
+
+      expect(getByText("Select the folder(s) to import")).toBeInTheDocument();
+    });
+
+    it("should display a selected folder on the review modal", () => {
+      const { getByTestId, getAllByTestId, getByText } =
+        renderImportingContent();
+      fireEvent.click(getByText(/All/));
+      const allRows = getAllByTestId("table-row");
+      fireEvent.click(allRows[0]);
+      fireEvent.click(getByTestId("confirm-btn"));
+
+      const foldersButton = getByTestId("content-modal-select-folders-button");
+
+      fireEvent.click(foldersButton);
+      fireEvent.click(getByText("Folder 1"));
+      fireEvent.click(getByTestId("button-group").children[1]);
+
+      expect(getByText("Folder 1")).toBeInTheDocument();
+      expect(
+        getByText("Import content from Source questionnaire 1")
+      ).toBeInTheDocument();
+    });
+
+    it("should cancel select folder modal", () => {
+      const { getByTestId, getAllByTestId, getByText, queryByText } =
+        renderImportingContent();
+      fireEvent.click(getByText(/All/));
+      const allRows = getAllByTestId("table-row");
+      fireEvent.click(allRows[0]);
+      fireEvent.click(getByTestId("confirm-btn"));
+
+      const foldersButton = getByTestId("content-modal-select-folders-button");
+
+      fireEvent.click(foldersButton);
+      fireEvent.click(getByText("Folder 1"));
+
+      fireEvent.click(getByTestId("button-group").children[0]);
+
+      expect(queryByText("Folder 1")).not.toBeInTheDocument();
+      expect(
+        queryByText("Select sections, folders or questions to import")
+      ).toBeInTheDocument();
+    });
+
+    it("should return to questionnaire selector modal on back button click from folder review modal", () => {
+      const { getByTestId, getAllByTestId, getByText, queryByText } =
+        renderImportingContent();
+      fireEvent.click(getByText(/All/));
+      const allRows = getAllByTestId("table-row");
+      fireEvent.click(allRows[0]);
+      fireEvent.click(getByTestId("confirm-btn"));
+
+      const foldersButton = getByTestId("content-modal-select-folders-button");
+
+      fireEvent.click(foldersButton);
+      fireEvent.click(getByText("Folder 1"));
+      fireEvent.click(getByTestId("button-group").children[1]);
+
+      expect(queryByText("Folder 1")).toBeInTheDocument();
+      expect(
+        getByText("Import content from Source questionnaire 1")
+      ).toBeInTheDocument();
+
+      const backButton = getByText("Back");
+      fireEvent.click(backButton);
+
+      expect(queryByText("Folder 1")).not.toBeInTheDocument();
+      expect(getByTestId("questionnaire-select-modal")).toBeInTheDocument();
+      expect(
+        queryByText("Select the source questionnaire")
+      ).toBeInTheDocument();
+      expect(queryByText("Source questionnaire 1")).toBeInTheDocument();
+    });
+
+    it("should remove all selected folders", () => {
+      const { getByTestId, getAllByTestId, getByText, queryByText } =
+        renderImportingContent();
+      fireEvent.click(getByText(/All/));
+      const allRows = getAllByTestId("table-row");
+      fireEvent.click(allRows[0]);
+      fireEvent.click(getByTestId("confirm-btn"));
+
+      const foldersButton = getByTestId("content-modal-select-folders-button");
+
+      fireEvent.click(foldersButton);
+      fireEvent.click(getByText("Folder 1"));
+      fireEvent.click(getByText("Folder 2"));
+      fireEvent.click(getByTestId("button-group").children[1]);
+
+      expect(queryByText("Folder 1")).toBeInTheDocument();
+      expect(queryByText("Folder 2")).toBeInTheDocument();
+
+      fireEvent.click(getByText("Remove all"));
+
+      expect(queryByText("Folder 1")).not.toBeInTheDocument();
+      expect(queryByText("Folder 2")).not.toBeInTheDocument();
+      expect(
+        getByText("Select sections, folders or questions to import")
+      ).toBeInTheDocument();
+    });
+
+    it("should remove a selected folder using the item's remove button", () => {
+      const { getByTestId, getAllByTestId, getByText, queryByText } =
+        renderImportingContent();
+      fireEvent.click(getByText(/All/));
+      const allRows = getAllByTestId("table-row");
+      fireEvent.click(allRows[0]);
+      fireEvent.click(getByTestId("confirm-btn"));
+
+      const foldersButton = getByTestId("content-modal-select-folders-button");
+
+      fireEvent.click(foldersButton);
+      fireEvent.click(getByText("Folder 1"));
+      fireEvent.click(getByText("Folder 2"));
+      fireEvent.click(getByTestId("button-group").children[1]);
+
+      expect(getByText("Folder 1")).toBeInTheDocument();
+      expect(getByText("Folder 2")).toBeInTheDocument();
+      expect(getByText("Folders to import")).toBeInTheDocument();
+
+      fireEvent.click(getByTestId("folder-review-item-remove-button-folder-1"));
+
+      expect(queryByText("Folder 1")).not.toBeInTheDocument();
+      expect(getByText("Folder 2")).toBeInTheDocument();
+      expect(getByText("Folder to import")).toBeInTheDocument();
+    });
+
+    it("should select multiple folders", () => {
+      const { getByTestId, getAllByTestId, getByText } =
+        renderImportingContent();
+      fireEvent.click(getByText(/All/));
+      const allRows = getAllByTestId("table-row");
+      fireEvent.click(allRows[0]);
+      fireEvent.click(getByTestId("confirm-btn"));
+
+      const foldersButton = getByTestId("content-modal-select-folders-button");
+
+      fireEvent.click(foldersButton);
+      fireEvent.click(getByText("Folder 1"));
+      fireEvent.click(getByTestId("button-group").children[1]);
+      fireEvent.click(getByTestId("folder-review-select-folders-button"));
+      fireEvent.click(getByText("Folder 2"));
+      fireEvent.click(getByTestId("button-group").children[1]);
+
+      expect(getByText("Folder 1")).toBeInTheDocument();
+      expect(getByText("Folder 2")).toBeInTheDocument();
+      expect(getByText("Folders to import")).toBeInTheDocument();
+    });
+
+    it("should render empty fragment for folder list loading", () => {
+      const { queryByText, getByTestId, getByText, getAllByTestId } =
+        renderImportingContent();
+      fireEvent.click(getByText(/All/));
+      const allRows = getAllByTestId("table-row");
+      fireEvent.click(allRows[0]);
+      fireEvent.click(getByTestId("confirm-btn"));
+
+      const foldersButton = getByTestId("content-modal-select-folders-button");
+      useQuery.mockImplementationOnce(() => ({
+        loading: true,
+      }));
+      fireEvent.click(foldersButton);
+
+      expect(
+        queryByText("Select the folder(s) to import")
+      ).not.toBeInTheDocument();
+    });
+
+    it("should render empty fragment for folder list error", () => {
+      const { queryByText, getByTestId, getByText, getAllByTestId } =
+        renderImportingContent();
+      fireEvent.click(getByText(/All/));
+      const allRows = getAllByTestId("table-row");
+      fireEvent.click(allRows[0]);
+      fireEvent.click(getByTestId("confirm-btn"));
+
+      const foldersButton = getByTestId("content-modal-select-folders-button");
+      useQuery.mockImplementationOnce(() => ({
+        error: true,
+      }));
+      fireEvent.click(foldersButton);
+
+      expect(
+        queryByText("Select the folder(s) to import")
+      ).not.toBeInTheDocument();
+    });
+
+    describe("Confirm import folder", () => {
+      it("should import folder to destination questionnaire section", () => {
+        const mockImportFolders = jest.fn();
+        useParams.mockImplementation(() => ({
+          questionnaireId: destinationQuestionnaire.id,
+          entityName: "section",
+          entityId: destinationQuestionnaire.sections[0].id,
+        }));
+
+        useMutation.mockImplementation(jest.fn(() => [mockImportFolders]));
+        const { getByTestId, getAllByTestId, getByText, queryByText } =
+          renderImportingContent();
+        fireEvent.click(getByText(/All/));
+        const allRows = getAllByTestId("table-row");
+        fireEvent.click(allRows[0]);
+        fireEvent.click(getByTestId("confirm-btn"));
+
+        const foldersButton = getByTestId(
+          "content-modal-select-folders-button"
+        );
+
+        fireEvent.click(foldersButton);
+        fireEvent.click(getByText("Folder 1"));
+        // Folder picker's "Select" button
+        fireEvent.click(getByTestId("button-group").children[1]);
+        // Folder review modal's "Import" button
+        fireEvent.click(getByTestId("button-group").children[0]);
+
+        const sourceSection = sourceQuestionnaires[0].sections[0];
+        const destinationSection = destinationQuestionnaire.sections[0];
+
+        // Test modal closes
+        expect(
+          queryByText("Import content from Source questionnaire 1")
+        ).not.toBeInTheDocument();
+
+        expect(mockImportFolders).toHaveBeenCalledTimes(1);
+        expect(mockImportFolders).toHaveBeenCalledWith({
+          variables: {
+            input: {
+              folderIds: [sourceSection.folders[0].id],
+              questionnaireId: sourceQuestionnaires[0].id,
+              position: {
+                sectionId: destinationSection.id,
+                index: 0,
+              },
+            },
+          },
+          refetchQueries: ["GetQuestionnaire"],
+        });
+      });
+
+      it("should import folder to destination questionnaire folder", () => {
+        const mockImportFolders = jest.fn();
+        useParams.mockImplementation(() => ({
+          questionnaireId: destinationQuestionnaire.id,
+          entityName: "folder",
+          entityId: destinationQuestionnaire.sections[0].folders[0].id,
+        }));
+
+        useMutation.mockImplementation(jest.fn(() => [mockImportFolders]));
+        const { getByTestId, getAllByTestId, getByText, queryByText } =
+          renderImportingContent();
+        fireEvent.click(getByText(/All/));
+        const allRows = getAllByTestId("table-row");
+        fireEvent.click(allRows[0]);
+        fireEvent.click(getByTestId("confirm-btn"));
+
+        const foldersButton = getByTestId(
+          "content-modal-select-folders-button"
+        );
+
+        fireEvent.click(foldersButton);
+        fireEvent.click(getByText("Folder 1"));
+        // Folder picker's "Select" button
+        fireEvent.click(getByTestId("button-group").children[1]);
+        // Folder review modal's "Import" button
+        fireEvent.click(getByTestId("button-group").children[0]);
+
+        const sourceSection = sourceQuestionnaires[0].sections[0];
+        const destinationSection = destinationQuestionnaire.sections[0];
+
+        // Test modal closes
+        expect(
+          queryByText("Import content from Source questionnaire 1")
+        ).not.toBeInTheDocument();
+
+        expect(mockImportFolders).toHaveBeenCalledTimes(1);
+        expect(mockImportFolders).toHaveBeenCalledWith({
+          variables: {
+            input: {
+              folderIds: [sourceSection.folders[0].id],
+              questionnaireId: sourceQuestionnaires[0].id,
+              position: {
+                sectionId: destinationSection.id,
+                index: 1,
+              },
+            },
+          },
+          refetchQueries: ["GetQuestionnaire"],
+        });
+      });
+
+      it("should import folder to destination questionnaire page", () => {
+        const mockImportFolders = jest.fn();
+        useParams.mockImplementation(() => ({
+          questionnaireId: destinationQuestionnaire.id,
+          entityName: "page",
+          entityId: destinationQuestionnaire.sections[0].folders[0].pages[0].id,
+        }));
+
+        useMutation.mockImplementation(jest.fn(() => [mockImportFolders]));
+        const { getByTestId, getAllByTestId, getByText, queryByText } =
+          renderImportingContent();
+        fireEvent.click(getByText(/All/));
+        const allRows = getAllByTestId("table-row");
+        fireEvent.click(allRows[0]);
+        fireEvent.click(getByTestId("confirm-btn"));
+
+        const foldersButton = getByTestId(
+          "content-modal-select-folders-button"
+        );
+
+        fireEvent.click(foldersButton);
+        fireEvent.click(getByText("Folder 1"));
+        // Folder picker's "Select" button
+        fireEvent.click(getByTestId("button-group").children[1]);
+        // Folder review modal's "Import" button
+        fireEvent.click(getByTestId("button-group").children[0]);
+
+        const sourceSection = sourceQuestionnaires[0].sections[0];
+        const destinationSection = destinationQuestionnaire.sections[0];
+
+        // Test modal closes
+        expect(
+          queryByText("Import content from Source questionnaire 1")
+        ).not.toBeInTheDocument();
+
+        expect(mockImportFolders).toHaveBeenCalledTimes(1);
+        expect(mockImportFolders).toHaveBeenCalledWith({
+          variables: {
+            input: {
+              folderIds: [sourceSection.folders[0].id],
+              questionnaireId: sourceQuestionnaires[0].id,
+              position: {
+                sectionId: destinationSection.id,
+                index: 1,
+              },
+            },
+          },
+          refetchQueries: ["GetQuestionnaire"],
+        });
+      });
+    });
+  });
+
   describe("import sections", () => {
     it("should open the 'Select the section(s) to import' modal", () => {
       const { getByTestId, getAllByTestId, getByText } =

From 3fe2aedc2706a50799400ff658f80c6a2878bf2b Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Wed, 1 May 2024 12:00:40 +0100
Subject: [PATCH 045/215] Add import folder extra space tests

---
 .../src/App/importingContent/index.test.js    | 333 ++++++++++++++++++
 1 file changed, 333 insertions(+)

diff --git a/eq-author/src/App/importingContent/index.test.js b/eq-author/src/App/importingContent/index.test.js
index 4afb4a3caf..d9c06b343e 100644
--- a/eq-author/src/App/importingContent/index.test.js
+++ b/eq-author/src/App/importingContent/index.test.js
@@ -128,6 +128,7 @@ const sourceQuestionnaires = [
                   {
                     id: "answer-3",
                     type: "Number",
+                    label: "Answer 3 ",
                   },
                 ],
               },
@@ -1538,6 +1539,338 @@ describe("Importing content", () => {
           refetchQueries: ["GetQuestionnaire"],
         });
       });
+
+      describe("Extra spaces", () => {
+        it("should display extra space confirmation modal before importing folders containing extra spaces", () => {
+          const mockImportFolders = jest.fn();
+          useParams.mockImplementation(() => ({
+            questionnaireId: destinationQuestionnaire.id,
+            entityName: "section",
+            entityId: destinationQuestionnaire.sections[0].id,
+          }));
+
+          useMutation.mockImplementation(jest.fn(() => [mockImportFolders]));
+          const { getByTestId, getAllByTestId, getByText, queryByText } =
+            renderImportingContent();
+          fireEvent.click(getByText(/All/));
+          const allRows = getAllByTestId("table-row");
+          fireEvent.click(allRows[0]);
+          fireEvent.click(getByTestId("confirm-btn"));
+
+          const foldersButton = getByTestId(
+            "content-modal-select-folders-button"
+          );
+
+          fireEvent.click(foldersButton);
+          fireEvent.click(getByText("Folder 3"));
+          // Folder picker's "Select" button
+          fireEvent.click(getByTestId("button-group").children[1]);
+
+          expect(
+            queryByText("Import content from Source questionnaire 1")
+          ).toBeInTheDocument();
+
+          // Folder review modal's "Import" button
+          fireEvent.click(getByTestId("button-group").children[0]);
+
+          const sourceSection = sourceQuestionnaires[0].sections[2];
+          const destinationSection = destinationQuestionnaire.sections[0];
+
+          // Test modal closes
+          expect(
+            queryByText("Import content from Source questionnaire 1")
+          ).not.toBeInTheDocument();
+
+          expect(mockImportFolders).toHaveBeenCalledTimes(0);
+
+          // Extra space confirmation modal
+
+          expect(queryByText(extraSpaceModalTitle)).toBeInTheDocument();
+          const extraSpaceModalConfirmButton =
+            getByTestId("btn-modal-positive");
+
+          fireEvent.click(extraSpaceModalConfirmButton);
+          expect(mockImportFolders).toHaveBeenCalledTimes(1);
+
+          expect(mockImportFolders).toHaveBeenCalledWith({
+            variables: {
+              input: {
+                folderIds: [sourceSection.folders[0].id],
+                questionnaireId: sourceQuestionnaires[0].id,
+                position: {
+                  sectionId: destinationSection.id,
+                  index: 0,
+                },
+              },
+            },
+            refetchQueries: ["GetQuestionnaire"],
+          });
+        });
+
+        it("should display extra space confirmation modal before importing folders containing leading spaces", () => {
+          const mockImportFolders = jest.fn();
+          useParams.mockImplementation(() => ({
+            questionnaireId: destinationQuestionnaire.id,
+            entityName: "section",
+            entityId: destinationQuestionnaire.sections[0].id,
+          }));
+
+          useMutation.mockImplementation(jest.fn(() => [mockImportFolders]));
+          const { getByTestId, getAllByTestId, getByText, queryByText } =
+            renderImportingContent();
+          fireEvent.click(getByText(/All/));
+          const allRows = getAllByTestId("table-row");
+          fireEvent.click(allRows[0]);
+          fireEvent.click(getByTestId("confirm-btn"));
+
+          const foldersButton = getByTestId(
+            "content-modal-select-folders-button"
+          );
+
+          fireEvent.click(foldersButton);
+          fireEvent.click(getByText("Folder 4"));
+          // Folder picker's "Select" button
+          fireEvent.click(getByTestId("button-group").children[1]);
+
+          expect(
+            queryByText("Import content from Source questionnaire 1")
+          ).toBeInTheDocument();
+
+          // Folder review modal's "Import" button
+          fireEvent.click(getByTestId("button-group").children[0]);
+
+          const sourceSection = sourceQuestionnaires[0].sections[3];
+          const destinationSection = destinationQuestionnaire.sections[0];
+
+          // Test modal closes
+          expect(
+            queryByText("Import content from Source questionnaire 1")
+          ).not.toBeInTheDocument();
+
+          expect(mockImportFolders).toHaveBeenCalledTimes(0);
+
+          // Extra space confirmation modal
+
+          expect(queryByText(extraSpaceModalTitle)).toBeInTheDocument();
+          const extraSpaceModalConfirmButton =
+            getByTestId("btn-modal-positive");
+
+          fireEvent.click(extraSpaceModalConfirmButton);
+          expect(mockImportFolders).toHaveBeenCalledTimes(1);
+
+          expect(mockImportFolders).toHaveBeenCalledWith({
+            variables: {
+              input: {
+                folderIds: [sourceSection.folders[0].id],
+                questionnaireId: sourceQuestionnaires[0].id,
+                position: {
+                  sectionId: destinationSection.id,
+                  index: 0,
+                },
+              },
+            },
+            refetchQueries: ["GetQuestionnaire"],
+          });
+        });
+
+        it("should display extra space confirmation modal before importing folders containing trailing spaces", () => {
+          const mockImportFolders = jest.fn();
+          useParams.mockImplementation(() => ({
+            questionnaireId: destinationQuestionnaire.id,
+            entityName: "section",
+            entityId: destinationQuestionnaire.sections[0].id,
+          }));
+
+          useMutation.mockImplementation(jest.fn(() => [mockImportFolders]));
+          const { getByTestId, getAllByTestId, getByText, queryByText } =
+            renderImportingContent();
+          fireEvent.click(getByText(/All/));
+          const allRows = getAllByTestId("table-row");
+          fireEvent.click(allRows[0]);
+          fireEvent.click(getByTestId("confirm-btn"));
+
+          const foldersButton = getByTestId(
+            "content-modal-select-folders-button"
+          );
+
+          fireEvent.click(foldersButton);
+          fireEvent.click(getByText("Folder 2"));
+          // Folder picker's "Select" button
+          fireEvent.click(getByTestId("button-group").children[1]);
+
+          expect(
+            queryByText("Import content from Source questionnaire 1")
+          ).toBeInTheDocument();
+
+          // Folder review modal's "Import" button
+          fireEvent.click(getByTestId("button-group").children[0]);
+
+          const sourceSection = sourceQuestionnaires[0].sections[1];
+          const destinationSection = destinationQuestionnaire.sections[0];
+
+          // Test modal closes
+          expect(
+            queryByText("Import content from Source questionnaire 1")
+          ).not.toBeInTheDocument();
+
+          expect(mockImportFolders).toHaveBeenCalledTimes(0);
+
+          // Extra space confirmation modal
+
+          expect(queryByText(extraSpaceModalTitle)).toBeInTheDocument();
+          const extraSpaceModalConfirmButton =
+            getByTestId("btn-modal-positive");
+
+          fireEvent.click(extraSpaceModalConfirmButton);
+          expect(mockImportFolders).toHaveBeenCalledTimes(1);
+
+          expect(mockImportFolders).toHaveBeenCalledWith({
+            variables: {
+              input: {
+                folderIds: [sourceSection.folders[0].id],
+                questionnaireId: sourceQuestionnaires[0].id,
+                position: {
+                  sectionId: destinationSection.id,
+                  index: 0,
+                },
+              },
+            },
+            refetchQueries: ["GetQuestionnaire"],
+          });
+        });
+
+        it("should display extra space confirmation modal before importing folders containing tags with leading spaces", () => {
+          const mockImportFolders = jest.fn();
+          useParams.mockImplementation(() => ({
+            questionnaireId: destinationQuestionnaire.id,
+            entityName: "section",
+            entityId: destinationQuestionnaire.sections[0].id,
+          }));
+
+          useMutation.mockImplementation(jest.fn(() => [mockImportFolders]));
+          const { getByTestId, getAllByTestId, getByText, queryByText } =
+            renderImportingContent();
+          fireEvent.click(getByText(/All/));
+          const allRows = getAllByTestId("table-row");
+          fireEvent.click(allRows[0]);
+          fireEvent.click(getByTestId("confirm-btn"));
+
+          const foldersButton = getByTestId(
+            "content-modal-select-folders-button"
+          );
+
+          fireEvent.click(foldersButton);
+          fireEvent.click(getByText("Folder 6"));
+          // Folder picker's "Select" button
+          fireEvent.click(getByTestId("button-group").children[1]);
+
+          expect(
+            queryByText("Import content from Source questionnaire 1")
+          ).toBeInTheDocument();
+
+          // Folder review modal's "Import" button
+          fireEvent.click(getByTestId("button-group").children[0]);
+
+          const sourceSection = sourceQuestionnaires[0].sections[5];
+          const destinationSection = destinationQuestionnaire.sections[0];
+
+          // Test modal closes
+          expect(
+            queryByText("Import content from Source questionnaire 1")
+          ).not.toBeInTheDocument();
+
+          expect(mockImportFolders).toHaveBeenCalledTimes(0);
+
+          // Extra space confirmation modal
+
+          expect(queryByText(extraSpaceModalTitle)).toBeInTheDocument();
+          const extraSpaceModalConfirmButton =
+            getByTestId("btn-modal-positive");
+
+          fireEvent.click(extraSpaceModalConfirmButton);
+          expect(mockImportFolders).toHaveBeenCalledTimes(1);
+
+          expect(mockImportFolders).toHaveBeenCalledWith({
+            variables: {
+              input: {
+                folderIds: [sourceSection.folders[0].id],
+                questionnaireId: sourceQuestionnaires[0].id,
+                position: {
+                  sectionId: destinationSection.id,
+                  index: 0,
+                },
+              },
+            },
+            refetchQueries: ["GetQuestionnaire"],
+          });
+        });
+
+        it("should display extra space confirmation modal before importing folders containing tags with trailing spaces", () => {
+          const mockImportFolders = jest.fn();
+          useParams.mockImplementation(() => ({
+            questionnaireId: destinationQuestionnaire.id,
+            entityName: "section",
+            entityId: destinationQuestionnaire.sections[0].id,
+          }));
+
+          useMutation.mockImplementation(jest.fn(() => [mockImportFolders]));
+          const { getByTestId, getAllByTestId, getByText, queryByText } =
+            renderImportingContent();
+          fireEvent.click(getByText(/All/));
+          const allRows = getAllByTestId("table-row");
+          fireEvent.click(allRows[0]);
+          fireEvent.click(getByTestId("confirm-btn"));
+
+          const foldersButton = getByTestId(
+            "content-modal-select-folders-button"
+          );
+
+          fireEvent.click(foldersButton);
+          fireEvent.click(getByText("Folder 5"));
+          // Folder picker's "Select" button
+          fireEvent.click(getByTestId("button-group").children[1]);
+
+          expect(
+            queryByText("Import content from Source questionnaire 1")
+          ).toBeInTheDocument();
+
+          // Folder review modal's "Import" button
+          fireEvent.click(getByTestId("button-group").children[0]);
+
+          const sourceSection = sourceQuestionnaires[0].sections[4];
+          const destinationSection = destinationQuestionnaire.sections[0];
+
+          // Test modal closes
+          expect(
+            queryByText("Import content from Source questionnaire 1")
+          ).not.toBeInTheDocument();
+
+          expect(mockImportFolders).toHaveBeenCalledTimes(0);
+
+          // Extra space confirmation modal
+
+          expect(queryByText(extraSpaceModalTitle)).toBeInTheDocument();
+          const extraSpaceModalConfirmButton =
+            getByTestId("btn-modal-positive");
+
+          fireEvent.click(extraSpaceModalConfirmButton);
+          expect(mockImportFolders).toHaveBeenCalledTimes(1);
+
+          expect(mockImportFolders).toHaveBeenCalledWith({
+            variables: {
+              input: {
+                folderIds: [sourceSection.folders[0].id],
+                questionnaireId: sourceQuestionnaires[0].id,
+                position: {
+                  sectionId: destinationSection.id,
+                  index: 0,
+                },
+              },
+            },
+            refetchQueries: ["GetQuestionnaire"],
+          });
+        });
+      });
     });
   });
 

From d4623191de8aef5c819b7b32fc1edc9eea0a2fd6 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Wed, 1 May 2024 13:20:39 +0100
Subject: [PATCH 046/215] Add test for importing into repeating section

---
 .../src/App/importingContent/index.test.js    | 61 ++++++++++++++++++-
 1 file changed, 59 insertions(+), 2 deletions(-)

diff --git a/eq-author/src/App/importingContent/index.test.js b/eq-author/src/App/importingContent/index.test.js
index d9c06b343e..fd6d92253b 100644
--- a/eq-author/src/App/importingContent/index.test.js
+++ b/eq-author/src/App/importingContent/index.test.js
@@ -23,10 +23,18 @@ jest.mock("components/QuestionnaireContext", () => ({
 
 useMutation.mockImplementation(jest.fn(() => [jest.fn()]));
 
-const destinationQuestionnaire = buildQuestionnaire({ answerCount: 1 });
+const destinationQuestionnaire = buildQuestionnaire({
+  answerCount: 1,
+  sectionCount: 2,
+});
 const listCollectorFolder = buildListCollectorFolders()[0];
-destinationQuestionnaire.sections[0].folders[1] = listCollectorFolder;
 listCollectorFolder.position = 1;
+destinationQuestionnaire.sections[0].folders[1] = listCollectorFolder;
+destinationQuestionnaire.sections[1] = {
+  ...destinationQuestionnaire.sections[1],
+  repeatingSection: true,
+  repeatingSectionListId: "list-1",
+};
 
 const extraSpaceModalTitle =
   "Confirm the removal of extra spaces from selected content";
@@ -257,6 +265,24 @@ const sourceQuestionnaires = [
               },
             ],
           },
+          {
+            id: "folder-7",
+            displayName: "Folder 7",
+            listId: "list-1",
+            pages: [
+              {
+                id: "page-10",
+                title: "Page 10",
+                pageType: "QuestionPage",
+                answers: [
+                  {
+                    id: "answer-10",
+                    type: "Number",
+                  },
+                ],
+              },
+            ],
+          },
         ],
       },
     ],
@@ -1200,6 +1226,10 @@ describe("Importing content", () => {
       fireEvent.click(foldersButton);
 
       expect(getByText("Select the folder(s) to import")).toBeInTheDocument();
+      // Tests all folders (folders 1-7) are in the document
+      for (let i = 1; i < 8; i++) {
+        expect(getByText(`Folder ${i}`)).toBeInTheDocument();
+      }
     });
 
     it("should display a selected folder on the review modal", () => {
@@ -1386,6 +1416,33 @@ describe("Importing content", () => {
       ).not.toBeInTheDocument();
     });
 
+    it("should not display list collector folders when importing into a repeating section", () => {
+      useParams.mockImplementation(() => ({
+        questionnaireId: destinationQuestionnaire.id,
+        entityName: "section",
+        entityId: destinationQuestionnaire.sections[1].id,
+      }));
+
+      const { getByTestId, getAllByTestId, getByText, queryByText } =
+        renderImportingContent();
+      fireEvent.click(getByText(/All/));
+      const allRows = getAllByTestId("table-row");
+      fireEvent.click(allRows[0]);
+      fireEvent.click(getByTestId("confirm-btn"));
+
+      const foldersButton = getByTestId("content-modal-select-folders-button");
+
+      fireEvent.click(foldersButton);
+
+      // Tests all basic folders (folders 1-6) are in the document
+      for (let i = 1; i < 7; i++) {
+        expect(getByText(`Folder ${i}`)).toBeInTheDocument();
+      }
+
+      // Tests list collector folder is not in the document
+      expect(queryByText("Folder 7")).not.toBeInTheDocument();
+    });
+
     describe("Confirm import folder", () => {
       it("should import folder to destination questionnaire section", () => {
         const mockImportFolders = jest.fn();

From febb8599a18d89f2b50e6693db39c20cd94cf485 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Thu, 2 May 2024 11:33:33 +0100
Subject: [PATCH 047/215] Add import folder resolver tests

---
 eq-author-api/schema/tests/importing.test.js  | 184 +++++++++++++++++-
 .../contextBuilder/importing/importFolders.js |  40 ++++
 .../utils/contextBuilder/importing/index.js   |   1 +
 3 files changed, 224 insertions(+), 1 deletion(-)
 create mode 100644 eq-author-api/tests/utils/contextBuilder/importing/importFolders.js

diff --git a/eq-author-api/schema/tests/importing.test.js b/eq-author-api/schema/tests/importing.test.js
index f1b9cdb529..4a282172aa 100644
--- a/eq-author-api/schema/tests/importing.test.js
+++ b/eq-author-api/schema/tests/importing.test.js
@@ -1,7 +1,8 @@
 const { buildContext } = require("../../tests/utils/contextBuilder");
-const { getPages, getSections } = require("../resolvers/utils");
+const { getPages, getFolders, getSections } = require("../resolvers/utils");
 const {
   importQuestions,
+  importFolders,
   importSections,
 } = require("../../tests/utils/contextBuilder/importing");
 
@@ -191,6 +192,187 @@ describe("Importing questions", () => {
   });
 });
 
+describe("Importing folders", () => {
+  describe("Error conditions", () => {
+    const defaultInput = {
+      questionnaireId: "questionnaire-id",
+      folderIds: ["folder-1", "folder-2", "folder-3"],
+      position: {
+        index: 0,
+        sectionId: "section-1",
+      },
+    };
+
+    it("should throw error if sectionId is not provided", async () => {
+      expect(
+        importFolders(await buildContext({}), {
+          questionnaireId: "questionnaire-id",
+          folderIds: ["folder-1", "folder-2", "folder-3"],
+          position: {
+            index: 0,
+            sectionId: null,
+          },
+        })
+      ).rejects.toThrow("Target section ID must be provided");
+    });
+
+    it("should throw error if source questionnaireID doesn't exist", async () => {
+      expect(
+        importFolders(await buildContext({}), defaultInput)
+      ).rejects.toThrow(/Questionnaire with ID .+ does not exist/);
+    });
+
+    it("should throw error if not all folders are present in source questionnaire", async () => {
+      const { questionnaire: sourceQuestionnaire } = await buildContext({});
+      const ctx = await buildContext({});
+
+      expect(
+        importFolders(ctx, {
+          ...defaultInput,
+          questionnaireId: sourceQuestionnaire.id,
+        })
+      ).rejects.toThrow(/Not all folder IDs .+ exist in source questionnaire/);
+    });
+
+    it("should throw error if target section doesn't exist", async () => {
+      const { questionnaire: sourceQuestionnaire } = await buildContext({
+        sections: [{ folders: [{ pages: [{}, {}] }] }],
+      });
+      const ctx = await buildContext({});
+      const folderIds = getFolders({ questionnaire: sourceQuestionnaire }).map(
+        ({ id }) => id
+      );
+
+      expect(
+        importFolders(ctx, {
+          questionnaireId: sourceQuestionnaire.id,
+          folderIds,
+          position: {
+            index: 0,
+            sectionId: "undefined-section",
+          },
+        })
+      ).rejects.toThrow(
+        /Section with ID .+ doesn't exist in target questionnaire/
+      );
+    });
+  });
+
+  describe("Success conditions", () => {
+    const setup = async (
+      sourceStructure = {
+        sections: [
+          {
+            folders: [
+              {
+                pages: [{ title: "Page 1" }, { title: "Page 2" }],
+              },
+            ],
+          },
+        ],
+      }
+    ) => {
+      const { questionnaire: sourceQuestionnaire } = await buildContext(
+        sourceStructure
+      );
+
+      const folderIds = getFolders({ questionnaire: sourceQuestionnaire }).map(
+        ({ id }) => id
+      );
+
+      const ctx = await buildContext({
+        sections: [{ folders: [{ pages: [{}, {}] }] }],
+      });
+
+      return { ctx, folderIds, sourceQuestionnaire };
+    };
+
+    it("should import folders into a section", async () => {
+      const { ctx, folderIds, sourceQuestionnaire } = await setup();
+      const destinationSection = ctx.questionnaire.sections[0];
+      expect(destinationSection.folders).toHaveLength(1);
+
+      await importFolders(ctx, {
+        questionnaireId: sourceQuestionnaire.id,
+        folderIds,
+        position: {
+          index: 0,
+          sectionId: destinationSection.id,
+        },
+      });
+
+      expect(destinationSection.folders).toHaveLength(2);
+      expect(destinationSection.folders[0].pages[0]).toMatchObject({
+        ...sourceQuestionnaire.sections[0].folders[0].pages[0],
+        id: expect.any(String),
+      });
+      expect(destinationSection.folders[0].pages[1]).toMatchObject({
+        ...sourceQuestionnaire.sections[0].folders[0].pages[1],
+        id: expect.any(String),
+      });
+    });
+
+    it("should remove qCodes from imported content", async () => {
+      const { ctx, folderIds, sourceQuestionnaire } = await setup({
+        sections: [
+          {
+            folders: [
+              {
+                pages: [
+                  {
+                    answers: [
+                      {
+                        type: "Checkbox",
+                        qCode: "answer-qCode",
+                        options: [
+                          {
+                            qCode: "option-qCode",
+                          },
+                        ],
+                      },
+                    ],
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      });
+      const destinationSection = ctx.questionnaire.sections[0];
+
+      await importFolders(ctx, {
+        questionnaireId: sourceQuestionnaire.id,
+        folderIds,
+        position: {
+          index: 0,
+          sectionId: destinationSection.id,
+        },
+      });
+
+      expect(destinationSection.folders[0].pages[0]).toMatchObject({
+        ...sourceQuestionnaire.sections[0].folders[0].pages[0],
+        id: expect.any(String),
+        answers: [
+          {
+            ...sourceQuestionnaire.sections[0].folders[0].pages[0].answers[0],
+            id: expect.any(String),
+            qCode: null,
+            questionPageId: destinationSection.folders[0].pages[0].id,
+            options: [
+              {
+                ...sourceQuestionnaire.sections[0].folders[0].pages[0]
+                  .answers[0].options[0],
+                id: expect.any(String),
+                qCode: null,
+              },
+            ],
+          },
+        ],
+      });
+    });
+  });
+});
+
 describe("Importing sections", () => {
   describe("Error conditions", () => {
     const defaultInput = {
diff --git a/eq-author-api/tests/utils/contextBuilder/importing/importFolders.js b/eq-author-api/tests/utils/contextBuilder/importing/importFolders.js
new file mode 100644
index 0000000000..123132ccf5
--- /dev/null
+++ b/eq-author-api/tests/utils/contextBuilder/importing/importFolders.js
@@ -0,0 +1,40 @@
+const executeQuery = require("../../executeQuery");
+const { filter } = require("graphql-anywhere");
+const gql = require("graphql-tag");
+
+const mutation = `
+mutation ImportFolders($input: ImportFoldersInput!) {
+  importFolders(input: $input) {
+    id
+  }
+}
+`;
+
+const importFolders = async (ctx, input) => {
+  const result = await executeQuery(
+    mutation,
+    {
+      input: filter(
+        gql`
+          {
+            questionnaireId
+            folderIds
+            position {
+              sectionId
+              index
+            }
+          }
+        `,
+        input
+      ),
+    },
+    ctx
+  );
+
+  return result.data.importFolders;
+};
+
+module.exports = {
+  mutation,
+  importFolders,
+};
diff --git a/eq-author-api/tests/utils/contextBuilder/importing/index.js b/eq-author-api/tests/utils/contextBuilder/importing/index.js
index 67807e0300..b632cedbc1 100644
--- a/eq-author-api/tests/utils/contextBuilder/importing/index.js
+++ b/eq-author-api/tests/utils/contextBuilder/importing/index.js
@@ -1,4 +1,5 @@
 module.exports = {
   ...require("./importQuestions"),
+  ...require("./importFolders"),
   ...require("./importSections"),
 };

From b1cfccfb7661126745b963b49e50f0678d5a2e46 Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Tue, 7 May 2024 10:20:20 +0100
Subject: [PATCH 048/215] Updated the highlight text contrast for design and
 preview

---
 eq-author/src/components/RichTextEditor/index.js       | 4 +++-
 eq-author/src/components/preview/elements/PageTitle.js | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/eq-author/src/components/RichTextEditor/index.js b/eq-author/src/components/RichTextEditor/index.js
index 47e16b64db..d64efb2ef0 100644
--- a/eq-author/src/components/RichTextEditor/index.js
+++ b/eq-author/src/components/RichTextEditor/index.js
@@ -31,10 +31,12 @@ import PasteModal, {
   preserveRichFormatting,
 } from "components/modals/PasteModal";
 
+import { colors } from "../../constants/theme";
+
 const styleMap = (controls) => {
   return {
     BOLD: {
-      backgroundColor: controls.highlight && "#cbe2c8",
+      backgroundColor: controls.highlight && colors.neonYellow,
       fontWeight: controls.bold && "bold",
     },
   };
diff --git a/eq-author/src/components/preview/elements/PageTitle.js b/eq-author/src/components/preview/elements/PageTitle.js
index d77f2589d3..ad8ff4ef6e 100644
--- a/eq-author/src/components/preview/elements/PageTitle.js
+++ b/eq-author/src/components/preview/elements/PageTitle.js
@@ -4,12 +4,14 @@ import styled from "styled-components";
 
 import Error from "components/preview/Error";
 
+import { colors } from "../../../constants/theme";
+
 const Title = styled.h1`
   font-size: 1.4em;
   margin: 0 0 1em;
   word-wrap: break-word;
   strong {
-    background-color: #dce5b0;
+    background-color: ${colors.neonYellow};
     padding: 0 0.125em;
     font-style: normal;
   }

From c1e68a9625c2b8c56a9a65aeba6ee19c2487f2c0 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Tue, 7 May 2024 08:14:55 +0100
Subject: [PATCH 049/215] Add importing list folder test

---
 eq-author-api/schema/tests/importing.test.js | 60 ++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/eq-author-api/schema/tests/importing.test.js b/eq-author-api/schema/tests/importing.test.js
index 4a282172aa..39547897e1 100644
--- a/eq-author-api/schema/tests/importing.test.js
+++ b/eq-author-api/schema/tests/importing.test.js
@@ -1,10 +1,14 @@
 const { buildContext } = require("../../tests/utils/contextBuilder");
 const { getPages, getFolders, getSections } = require("../resolvers/utils");
+
 const {
   importQuestions,
   importFolders,
   importSections,
 } = require("../../tests/utils/contextBuilder/importing");
+const {
+  updateFolder,
+} = require("../../tests/utils/contextBuilder/folder/updateFolder");
 
 describe("Importing questions", () => {
   describe("Error conditions", () => {
@@ -370,6 +374,62 @@ describe("Importing folders", () => {
         ],
       });
     });
+
+    it("should set folder listId to empty string when importing a folder with listId", async () => {
+      const sourceStructure = {
+        sections: [
+          {
+            folders: [
+              {
+                listId: "list-1",
+                pages: [{ title: "Page 1" }, { title: "Page 2" }],
+              },
+            ],
+          },
+        ],
+      };
+
+      const { ctx } = await setup(sourceStructure);
+      const destinationSection = ctx.questionnaire.sections[0];
+      const sourceQuestionnaireCtx = await buildContext(sourceStructure);
+      const { questionnaire: sourceQuestionnaire } = sourceQuestionnaireCtx;
+
+      await updateFolder(sourceQuestionnaireCtx, {
+        folderId: sourceQuestionnaire.sections[0].folders[0].id,
+        listId: "list-1",
+      });
+
+      await importFolders(ctx, {
+        questionnaireId: sourceQuestionnaire.id,
+        folderIds: [sourceQuestionnaire.sections[0].folders[0].id],
+        position: {
+          index: 0,
+          sectionId: destinationSection.id,
+        },
+      });
+
+      expect(sourceQuestionnaire.sections[0].folders[0].listId).not.toEqual("");
+      expect(sourceQuestionnaire.sections[0].folders[0].listId).toEqual(
+        "list-1"
+      );
+
+      expect(destinationSection.folders[0]).toMatchObject({
+        ...sourceQuestionnaire.sections[0].folders[0],
+        id: expect.any(String),
+        folderId: expect.any(String),
+        listId: "",
+        pages: [
+          {
+            ...sourceQuestionnaire.sections[0].folders[0].pages[0],
+            id: expect.any(String),
+          },
+          {
+            ...sourceQuestionnaire.sections[0].folders[0].pages[1],
+            id: expect.any(String),
+          },
+        ],
+      });
+    });
   });
 });
 

From 21392f9eeb5dbf88bdbe4dabce27556d2562ec20 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Wed, 8 May 2024 07:32:02 +0100
Subject: [PATCH 050/215] Add repeating answer import test

---
 eq-author-api/schema/tests/importing.test.js  | 79 ++++++++++++++++++-
 .../contextBuilder/answer/updateAnswer.js     |  2 +
 2 files changed, 80 insertions(+), 1 deletion(-)

diff --git a/eq-author-api/schema/tests/importing.test.js b/eq-author-api/schema/tests/importing.test.js
index 39547897e1..d07c727cde 100644
--- a/eq-author-api/schema/tests/importing.test.js
+++ b/eq-author-api/schema/tests/importing.test.js
@@ -9,6 +9,9 @@ const {
 const {
   updateFolder,
 } = require("../../tests/utils/contextBuilder/folder/updateFolder");
+const {
+  updateAnswer,
+} = require("../../tests/utils/contextBuilder/answer/updateAnswer");
 
 describe("Importing questions", () => {
   describe("Error conditions", () => {
@@ -381,7 +384,6 @@ describe("Importing folders", () => {
           {
             folders: [
               {
-                listId: "list-1",
                 pages: [{ title: "Page 1" }, { title: "Page 2" }],
               },
             ],
@@ -430,6 +432,81 @@ describe("Importing folders", () => {
         ],
       });
     });
+
+    it("should set repeatingLabelAndInputListId to empty string when importing a folder containing a repeating answer", async () => {
+      const sourceStructure = {
+        sections: [
+          {
+            folders: [
+              {
+                pages: [
+                  {
+                    title: "Page 1",
+                    answers: [
+                      {
+                        label: "Answer 1",
+                        repeatingLabelAndInput: true,
+                        type: "TextField",
+                      },
+                    ],
+                  },
+                  { title: "Page 2" },
+                ],
+              },
+            ],
+          },
+        ],
+      };
+
+      const { ctx } = await setup(sourceStructure);
+      const destinationSection = ctx.questionnaire.sections[0];
+
+      const sourceQuestionnaireCtx = await buildContext(sourceStructure);
+      const { questionnaire: sourceQuestionnaire } = sourceQuestionnaireCtx;
+
+      const sourceQuestionnaireFirstPage =
+        sourceQuestionnaire.sections[0].folders[0].pages[0];
+
+      await updateAnswer(sourceQuestionnaireCtx, {
+        id: sourceQuestionnaireFirstPage.answers[0].id,
+        repeatingLabelAndInput: true,
+        repeatingLabelAndInputListId: "list-1",
+      });
+
+      expect(
+        sourceQuestionnaireFirstPage.answers[0].repeatingLabelAndInputListId
+      ).toEqual("list-1");
+      expect(
+        sourceQuestionnaireFirstPage.answers[0].repeatingLabelAndInput
+      ).toEqual(true);
+
+      await importFolders(ctx, {
+        questionnaireId: sourceQuestionnaire.id,
+        folderIds: [sourceQuestionnaire.sections[0].folders[0].id],
+        position: {
+          index: 0,
+          sectionId: destinationSection.id,
+        },
+      });
+
+      expect(destinationSection.folders[0].pages[0]).toMatchObject({
+        ...sourceQuestionnaireFirstPage,
+        id: expect.any(String),
+        answers: [
+          {
+            ...sourceQuestionnaireFirstPage.answers[0],
+            id: expect.any(String),
+            questionPageId: expect.any(String),
+            repeatingLabelAndInput: true,
+            repeatingLabelAndInputListId: "",
+          },
+        ],
+        totalValidation: {
+          ...sourceQuestionnaireFirstPage.totalValidation,
+          id: expect.any(String),
+        },
+      });
+    });
   });
 });
 
diff --git a/eq-author-api/tests/utils/contextBuilder/answer/updateAnswer.js b/eq-author-api/tests/utils/contextBuilder/answer/updateAnswer.js
index dea76702dd..ecc1f90731 100644
--- a/eq-author-api/tests/utils/contextBuilder/answer/updateAnswer.js
+++ b/eq-author-api/tests/utils/contextBuilder/answer/updateAnswer.js
@@ -30,6 +30,8 @@ const updateAnswer = async (ctx, input) => {
             secondaryLabel
             properties
             qCode
+            repeatingLabelAndInput
+            repeatingLabelAndInputListId
           }
         `,
         input

From 839f75305e3b6ef90f1945e3e85508073cc9c718 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Wed, 8 May 2024 08:11:09 +0100
Subject: [PATCH 051/215] Update naming of Q codes in import modals

---
 eq-author/src/components/modals/ImportContentModal/index.js     | 2 +-
 .../src/components/modals/ImportFolderReviewModal/index.js      | 2 +-
 .../src/components/modals/ImportQuestionReviewModal/index.js    | 2 +-
 .../src/components/modals/ImportSectionReviewModal/index.js     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/eq-author/src/components/modals/ImportContentModal/index.js b/eq-author/src/components/modals/ImportContentModal/index.js
index 636e6dcc84..e2aac3ce37 100644
--- a/eq-author/src/components/modals/ImportContentModal/index.js
+++ b/eq-author/src/components/modals/ImportContentModal/index.js
@@ -53,7 +53,7 @@ const ImportQuestionReviewModal = ({
       <Subheading>
         <WarningWrapper>
           <Warning>
-            Question logic, piping and Qcodes will not be imported. Any extra
+            Question logic, piping and Q codes will not be imported. Any extra
             spaces in lines of text will be removed.
           </Warning>
         </WarningWrapper>
diff --git a/eq-author/src/components/modals/ImportFolderReviewModal/index.js b/eq-author/src/components/modals/ImportFolderReviewModal/index.js
index bf93282833..ece9bebea8 100644
--- a/eq-author/src/components/modals/ImportFolderReviewModal/index.js
+++ b/eq-author/src/components/modals/ImportFolderReviewModal/index.js
@@ -133,7 +133,7 @@ const ImportFolderReviewModal = ({
       <Subheading>
         <WarningWrapper>
           <Warning>
-            Question logic, piping and Qcodes will not be imported. Any extra
+            Question logic, piping and Q codes will not be imported. Any extra
             spaces in lines of text will be removed.
           </Warning>
         </WarningWrapper>
diff --git a/eq-author/src/components/modals/ImportQuestionReviewModal/index.js b/eq-author/src/components/modals/ImportQuestionReviewModal/index.js
index 720b28d3fa..f438b1dd77 100644
--- a/eq-author/src/components/modals/ImportQuestionReviewModal/index.js
+++ b/eq-author/src/components/modals/ImportQuestionReviewModal/index.js
@@ -124,7 +124,7 @@ const ImportQuestionReviewModal = ({
       <Subheading>
         <WarningWrapper>
           <Warning>
-            Question logic, piping and Qcodes will not be imported. Any extra
+            Question logic, piping and Q codes will not be imported. Any extra
             spaces in lines of text will be removed.
           </Warning>
         </WarningWrapper>
diff --git a/eq-author/src/components/modals/ImportSectionReviewModal/index.js b/eq-author/src/components/modals/ImportSectionReviewModal/index.js
index 8e9a2ddced..695f93bba8 100644
--- a/eq-author/src/components/modals/ImportSectionReviewModal/index.js
+++ b/eq-author/src/components/modals/ImportSectionReviewModal/index.js
@@ -125,7 +125,7 @@ const ImportSectionReviewModal = ({
       <Subheading>
         <WarningWrapper>
           <Warning>
-            Question logic, piping and Qcodes will not be imported. Any extra
+            Question logic, piping and Q codes will not be imported. Any extra
             spaces in lines of text will be removed.
           </Warning>
         </WarningWrapper>

From 0d3b7575b2f4a89d654fd156398af8303d5840e6 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Wed, 8 May 2024 11:56:21 +0100
Subject: [PATCH 052/215] Unselect folders when back button is clicked on
 folder review modal

---
 eq-author/src/App/importingContent/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eq-author/src/App/importingContent/index.js b/eq-author/src/App/importingContent/index.js
index 9c15175b22..2124b33787 100644
--- a/eq-author/src/App/importingContent/index.js
+++ b/eq-author/src/App/importingContent/index.js
@@ -206,9 +206,9 @@ const ImportingContent = ({
   };
 
   const onBackFromReviewingFolders = () => {
+    setFoldersToImport([]);
     setReviewingQuestions(false);
     setSelectingQuestionnaire(true);
-    setQuestionsToImport([]);
     setSelectingFolders(false);
     setReviewingFolders(false);
     setReviewingSections(false);

From d9214774e5e13c971602cfc78b78cf4eb98290eb Mon Sep 17 00:00:00 2001
From: sudeep <sudeep.kunhikannan@ons.gov.uk>
Date: Wed, 8 May 2024 15:14:11 +0100
Subject: [PATCH 053/215] review changes

Signed-off-by: sudeep <sudeep.kunhikannan@ons.gov.uk>
---
 eq-author/src/components/RichTextEditor/PipingMenu.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eq-author/src/components/RichTextEditor/PipingMenu.js b/eq-author/src/components/RichTextEditor/PipingMenu.js
index e7065ba9b6..5d23e27fe2 100644
--- a/eq-author/src/components/RichTextEditor/PipingMenu.js
+++ b/eq-author/src/components/RichTextEditor/PipingMenu.js
@@ -126,7 +126,7 @@ const PipingMenu = ({
 
   let allSupplementaryData = questionnaire?.supplementaryData?.data || [];
 
-  if (allSupplementaryData && !(pageType === "Introduction")) {
+  if (allSupplementaryData && pageType !== "Introduction") {
     allSupplementaryData = allSupplementaryData.filter(
       (list) => list.listName === "" || list.id === listId
     );
@@ -142,7 +142,7 @@ const PipingMenu = ({
   });
 
   supplementaryData = supplementaryData.filter(
-    (list) => !(list.listName !== "" && list.type === "array")
+    (list) => list.listName === "" || list.type !== "array"
   );
 
   const handlePickerContent = (contentType) => {

From 47c3741d703613e91ff1f69c1e6c6e10ab023669 Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Thu, 9 May 2024 14:20:39 +0100
Subject: [PATCH 054/215] Changed the condition from and to an or statment

---
 .../validation/customKeywords/calculatedSummaryMinAnswers.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eq-author-api/src/validation/customKeywords/calculatedSummaryMinAnswers.js b/eq-author-api/src/validation/customKeywords/calculatedSummaryMinAnswers.js
index 19e724ea69..40919eeff6 100644
--- a/eq-author-api/src/validation/customKeywords/calculatedSummaryMinAnswers.js
+++ b/eq-author-api/src/validation/customKeywords/calculatedSummaryMinAnswers.js
@@ -42,7 +42,7 @@ module.exports = (ajv) =>
           });
         });
 
-        if (parentData.summaryAnswers.length === 1 && selectedFolder?.listId) {
+        if (parentData.summaryAnswers.length === 1 || selectedFolder?.listId) {
           return true;
         } else {
           isValid.errors = [

From 251249a916fbe019b9c437bab7e4312e219e83d8 Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Thu, 9 May 2024 21:28:14 +0100
Subject: [PATCH 055/215] Revert changes

---
 .../validation/customKeywords/calculatedSummaryMinAnswers.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eq-author-api/src/validation/customKeywords/calculatedSummaryMinAnswers.js b/eq-author-api/src/validation/customKeywords/calculatedSummaryMinAnswers.js
index 40919eeff6..19e724ea69 100644
--- a/eq-author-api/src/validation/customKeywords/calculatedSummaryMinAnswers.js
+++ b/eq-author-api/src/validation/customKeywords/calculatedSummaryMinAnswers.js
@@ -42,7 +42,7 @@ module.exports = (ajv) =>
           });
         });
 
-        if (parentData.summaryAnswers.length === 1 || selectedFolder?.listId) {
+        if (parentData.summaryAnswers.length === 1 && selectedFolder?.listId) {
           return true;
         } else {
           isValid.errors = [

From dbd81a98bfda7ec41d17e739b34f0a3e3725a8fe Mon Sep 17 00:00:00 2001
From: martyncolmer <martyc1974@hotmail.com>
Date: Tue, 14 May 2024 11:16:23 +0100
Subject: [PATCH 056/215] Upated code not to use existing functions and not
 question page id from answer

---
 .../calculatedSummaryMinAnswers.js            | 49 +++++++------------
 1 file changed, 17 insertions(+), 32 deletions(-)

diff --git a/eq-author-api/src/validation/customKeywords/calculatedSummaryMinAnswers.js b/eq-author-api/src/validation/customKeywords/calculatedSummaryMinAnswers.js
index 19e724ea69..a8afce76f9 100644
--- a/eq-author-api/src/validation/customKeywords/calculatedSummaryMinAnswers.js
+++ b/eq-author-api/src/validation/customKeywords/calculatedSummaryMinAnswers.js
@@ -1,7 +1,7 @@
 const createValidationError = require("../createValidationError");
 
 const { ERR_NO_ANSWERS } = require("../../../constants/validationErrorCodes");
-const { getPages, getFolders } = require("../../../schema/resolvers/utils");
+const { getFolderByAnswerId } = require("../../../schema/resolvers/utils");
 
 module.exports = (ajv) =>
   ajv.addKeyword({
@@ -20,41 +20,26 @@ module.exports = (ajv) =>
     ) {
       if (parentData.summaryAnswers.length > 1) {
         return true;
-      } else {
-        const folders = getFolders({ questionnaire });
-        const pages = getPages({ questionnaire });
-
-        const allAnswers = pages.reduce(
-          (acc, page) => (page.answers ? [...acc, ...page.answers] : acc),
-          []
-        );
+      }
 
-        const selectedAnswers = allAnswers.filter((answer) =>
-          parentData.summaryAnswers.includes(answer.id)
+      if (parentData.summaryAnswers.length === 1) {
+        let selectedFolder = getFolderByAnswerId(
+          { questionnaire },
+          parentData.summaryAnswers[0]
         );
-
-        let selectedFolder;
-        folders.forEach((folder) => {
-          folder.pages.forEach((page) => {
-            if (page.id === selectedAnswers[0]?.questionPageId) {
-              selectedFolder = folder;
-            }
-          });
-        });
-
-        if (parentData.summaryAnswers.length === 1 && selectedFolder?.listId) {
+        if (selectedFolder?.listId) {
           return true;
-        } else {
-          isValid.errors = [
-            createValidationError(
-              instancePath,
-              fieldName,
-              ERR_NO_ANSWERS,
-              questionnaire
-            ),
-          ];
-          return false;
         }
       }
+
+      isValid.errors = [
+        createValidationError(
+          instancePath,
+          fieldName,
+          ERR_NO_ANSWERS,
+          questionnaire
+        ),
+      ];
+      return false;
     },
   });

From e82713daaadebc7f90a7338282ded663c7f72e8d Mon Sep 17 00:00:00 2001
From: sudeep <sudeep.kunhikannan@ons.gov.uk>
Date: Wed, 15 May 2024 11:29:13 +0100
Subject: [PATCH 057/215] added logs

Signed-off-by: sudeep <sudeep.kunhikannan@ons.gov.uk>
---
 eq-author-api/db/datastore/datastore-firestore.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eq-author-api/db/datastore/datastore-firestore.js b/eq-author-api/db/datastore/datastore-firestore.js
index efa9a49655..3525df8610 100644
--- a/eq-author-api/db/datastore/datastore-firestore.js
+++ b/eq-author-api/db/datastore/datastore-firestore.js
@@ -301,6 +301,8 @@ const saveQuestionnaire = async (changedQuestionnaire) => {
       updatedAt,
     });
 
+    logger.info(updatedQuestionnaire, "Updated questionnaire");
+
     const versionDoc = baseDoc.collection("versions").doc(uuidv4());
 
     await versionDoc.set({

From b5a81d0b629ed50b426bc6758e5fd6ea828951be Mon Sep 17 00:00:00 2001
From: sudeep <sudeep.kunhikannan@ons.gov.uk>
Date: Wed, 15 May 2024 11:45:17 +0100
Subject: [PATCH 058/215] corrected logs

Signed-off-by: sudeep <sudeep.kunhikannan@ons.gov.uk>
---
 eq-author-api/db/datastore/datastore-firestore.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eq-author-api/db/datastore/datastore-firestore.js b/eq-author-api/db/datastore/datastore-firestore.js
index 3525df8610..286eaedc87 100644
--- a/eq-author-api/db/datastore/datastore-firestore.js
+++ b/eq-author-api/db/datastore/datastore-firestore.js
@@ -301,7 +301,10 @@ const saveQuestionnaire = async (changedQuestionnaire) => {
       updatedAt,
     });
 
-    logger.info(updatedQuestionnaire, "Updated questionnaire");
+    logger.info(
+      { updatedQuestionnaire: updatedQuestionnaire },
+      "Updated questionnaire"
+    );
 
     const versionDoc = baseDoc.collection("versions").doc(uuidv4());
 

From e114dd37b2f883f4d9624cfcf0b9afa6dcbcffb1 Mon Sep 17 00:00:00 2001
From: sudeep <sudeep.kunhikannan@ons.gov.uk>
Date: Wed, 15 May 2024 12:37:23 +0100
Subject: [PATCH 059/215] corrected save fields

Signed-off-by: sudeep <sudeep.kunhikannan@ons.gov.uk>
---
 eq-author-api/db/baseQuestionnaireSchema.js       | 13 +++++++++++++
 eq-author-api/db/datastore/datastore-firestore.js | 15 +++++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/eq-author-api/db/baseQuestionnaireSchema.js b/eq-author-api/db/baseQuestionnaireSchema.js
index 074a8408f9..5076379b92 100644
--- a/eq-author-api/db/baseQuestionnaireSchema.js
+++ b/eq-author-api/db/baseQuestionnaireSchema.js
@@ -61,7 +61,20 @@ const baseQuestionnaireFields = {
   locked,
 };
 
+const saveQuestionnaireFields = {
+  id,
+  isPublic,
+  title,
+  type,
+  shortTitle,
+  publishStatus,
+  introduction,
+  editors,
+  locked,
+};
+
 module.exports = {
   baseQuestionnaireFields,
   ...baseQuestionnaireFields,
+  saveQuestionnaireFields,
 };
diff --git a/eq-author-api/db/datastore/datastore-firestore.js b/eq-author-api/db/datastore/datastore-firestore.js
index 286eaedc87..3092bfb209 100644
--- a/eq-author-api/db/datastore/datastore-firestore.js
+++ b/eq-author-api/db/datastore/datastore-firestore.js
@@ -4,7 +4,10 @@ const { logger } = require("../../utils/logger");
 const { pick } = require("lodash/fp");
 const { omit } = require("lodash");
 const { removeEmpty } = require("../../utils/removeEmpty");
-const { baseQuestionnaireFields } = require("../baseQuestionnaireSchema");
+const {
+  baseQuestionnaireFields,
+  saveQuestionnaireFields,
+} = require("../baseQuestionnaireSchema");
 const {
   questionnaireCreationEvent,
   historyCreationForImport,
@@ -32,6 +35,14 @@ const BASE_FIELDS = [
 
 const justListFields = pick(BASE_FIELDS);
 
+const SAVE_FIELDS = [
+  ...Object.keys(saveQuestionnaireFields),
+  "updatedAt",
+  "history",
+];
+
+const justListSaveFields = pick(SAVE_FIELDS);
+
 const saveSections = (parentDoc, sections) =>
   Promise.all(
     sections.map((section, position) =>
@@ -297,7 +308,7 @@ const saveQuestionnaire = async (changedQuestionnaire) => {
 
     const baseDoc = db.collection("questionnaires").doc(id);
     await baseDoc.update({
-      ...justListFields(updatedQuestionnaire),
+      ...justListSaveFields(updatedQuestionnaire),
       updatedAt,
     });
 

From c97fc80a7c521e2cac6738261e36d8e4fa9bac8d Mon Sep 17 00:00:00 2001
From: sudeep <sudeep.kunhikannan@ons.gov.uk>
Date: Wed, 15 May 2024 12:51:59 +0100
Subject: [PATCH 060/215] added logs

Signed-off-by: sudeep <sudeep.kunhikannan@ons.gov.uk>
---
 eq-author-api/db/datastore/datastore-firestore.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/eq-author-api/db/datastore/datastore-firestore.js b/eq-author-api/db/datastore/datastore-firestore.js
index 3092bfb209..df0c8c5b8e 100644
--- a/eq-author-api/db/datastore/datastore-firestore.js
+++ b/eq-author-api/db/datastore/datastore-firestore.js
@@ -312,6 +312,11 @@ const saveQuestionnaire = async (changedQuestionnaire) => {
       updatedAt,
     });
 
+    logger.info(
+      { ...justListSaveFields(updatedQuestionnaire) },
+      "Saved fields"
+    );
+
     logger.info(
       { updatedQuestionnaire: updatedQuestionnaire },
       "Updated questionnaire"

From 3c8f61a4e2ca7e8749f167815916ccb579a2a264 Mon Sep 17 00:00:00 2001
From: sudeep <sudeep.kunhikannan@ons.gov.uk>
Date: Wed, 15 May 2024 12:52:47 +0100
Subject: [PATCH 061/215] check logs

Signed-off-by: sudeep <sudeep.kunhikannan@ons.gov.uk>
---
 eq-author-api/db/datastore/datastore-firestore.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eq-author-api/db/datastore/datastore-firestore.js b/eq-author-api/db/datastore/datastore-firestore.js
index df0c8c5b8e..7aea1f0dda 100644
--- a/eq-author-api/db/datastore/datastore-firestore.js
+++ b/eq-author-api/db/datastore/datastore-firestore.js
@@ -313,7 +313,7 @@ const saveQuestionnaire = async (changedQuestionnaire) => {
     });
 
     logger.info(
-      { ...justListSaveFields(updatedQuestionnaire) },
+      { savedFields: justListSaveFields(updatedQuestionnaire) },
       "Saved fields"
     );
 

From c6d7c889074a7d46c536a90b6d1b9ac6dbda42be Mon Sep 17 00:00:00 2001
From: sudeep <sudeep.kunhikannan@ons.gov.uk>
Date: Wed, 15 May 2024 13:17:46 +0100
Subject: [PATCH 062/215] cleared logs

Signed-off-by: sudeep <sudeep.kunhikannan@ons.gov.uk>
---
 eq-author-api/db/datastore/datastore-firestore.js | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/eq-author-api/db/datastore/datastore-firestore.js b/eq-author-api/db/datastore/datastore-firestore.js
index 7aea1f0dda..3384cbea36 100644
--- a/eq-author-api/db/datastore/datastore-firestore.js
+++ b/eq-author-api/db/datastore/datastore-firestore.js
@@ -312,16 +312,6 @@ const saveQuestionnaire = async (changedQuestionnaire) => {
       updatedAt,
     });
 
-    logger.info(
-      { savedFields: justListSaveFields(updatedQuestionnaire) },
-      "Saved fields"
-    );
-
-    logger.info(
-      { updatedQuestionnaire: updatedQuestionnaire },
-      "Updated questionnaire"
-    );
-
     const versionDoc = baseDoc.collection("versions").doc(uuidv4());
 
     await versionDoc.set({

From c5ae3f5bb76d6f707ddda04f8be9dbccaa69d7fd Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Thu, 16 May 2024 10:28:23 +0100
Subject: [PATCH 063/215] removed the information banner and added button to
 match with EQ

---
 .../App/page/Preview/CalculatedSummaryPreview.js  | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
index 93bbddb0d8..e633018353 100644
--- a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
+++ b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
@@ -32,6 +32,19 @@ const Container = styled.div`
     white-space: pre-wrap;
   }
 `;
+const Button = styled.div`
+  color: white;
+  background-color: ${colors.green};
+  border: 2px solid ${colors.green};
+  padding: 0.75rem 1rem;
+  margin: 0;
+  font-size: 1rem;
+  font-weight: 600;
+  border-radius: 3px;
+  display: inline-block;
+  text-rendering: optimizeLegibility;
+  margin-bottom: 2em;
+`;
 
 const Summary = styled.div`
   border-bottom: 1px solid #999;
@@ -98,7 +111,6 @@ const CalculatedSummaryPagePreview = ({ page }) => {
       <Panel data-test="calSum test page">
         <Container>
           <PageTitle title={page.title} />
-          <Info>Please review your answers and confirm these are correct.</Info>
 
           {page.summaryAnswers.length > 0 ? (
             <Summary>
@@ -148,6 +160,7 @@ const CalculatedSummaryPagePreview = ({ page }) => {
               No answers selected
             </Error>
           )}
+          <Button>Yes, I confirm this is correct</Button>
         </Container>
       </Panel>
     </EditorLayout>

From 131590e2c70a1904fab82bd67fc271fcd7f28f09 Mon Sep 17 00:00:00 2001
From: sudeep <sudeep.kunhikannan@ons.gov.uk>
Date: Thu, 16 May 2024 11:10:57 +0100
Subject: [PATCH 064/215] added tests

Signed-off-by: sudeep <sudeep.kunhikannan@ons.gov.uk>
---
 eq-author-api/db/datastore/datastore-firestore.js      |  3 +--
 eq-author-api/db/datastore/datastore-firestore.test.js | 10 ++++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/eq-author-api/db/datastore/datastore-firestore.js b/eq-author-api/db/datastore/datastore-firestore.js
index 3384cbea36..a99a958298 100644
--- a/eq-author-api/db/datastore/datastore-firestore.js
+++ b/eq-author-api/db/datastore/datastore-firestore.js
@@ -282,8 +282,7 @@ const saveQuestionnaire = async (changedQuestionnaire) => {
         "Unable to save questionnaire; cannot find required field: ID (from saveQuestionnaire)"
       );
     }
-    const createdAt = new Date();
-    const updatedAt = createdAt;
+    const updatedAt = new Date();
 
     const originalQuestionnaire = await getQuestionnaire(id);
 
diff --git a/eq-author-api/db/datastore/datastore-firestore.test.js b/eq-author-api/db/datastore/datastore-firestore.test.js
index 9b92e34d18..787a203300 100644
--- a/eq-author-api/db/datastore/datastore-firestore.test.js
+++ b/eq-author-api/db/datastore/datastore-firestore.test.js
@@ -258,6 +258,16 @@ describe("Firestore Datastore", () => {
       });
       expect(updatedAt !== savedQuestionnaire.updatedAt).toBeTruthy();
     });
+
+    it("Should not update the 'createdAt' property", async () => {
+      const createdAt = questionnaire.createdAt;
+      const savedQuestionnaire = await saveQuestionnaire({
+        id: "123",
+        title: "Updated question title",
+        ...questionnaire,
+      });
+      expect(createdAt === savedQuestionnaire.createdAt).toBeTruthy();
+    });
   });
 
   describe("Getting a list of questionnaires", () => {

From 8d4d38b86fb0e6574cf16ee21feeee0cb5372570 Mon Sep 17 00:00:00 2001
From: sudeep <sudeep.kunhikannan@ons.gov.uk>
Date: Fri, 17 May 2024 13:02:51 +0100
Subject: [PATCH 065/215] increased time out for tests

Signed-off-by: sudeep <sudeep.kunhikannan@ons.gov.uk>
---
 cloudbuild.yaml | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index 1158f038a8..cd6470ed30 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -1,10 +1,10 @@
 steps:
-  - name: 'node:$_NODE_VERSION'
+  - name: "node:$_NODE_VERSION"
     id: yarn_install_and_build
     dir: eq-author
     entrypoint: /bin/bash
     args:
-      - '-c'
+      - "-c"
       - |
         if [ $_ENV = "staging" ]; then
           yarn install
@@ -21,8 +21,8 @@ steps:
     entrypoint: sh
     waitFor:
       - yarn_install_and_build
-    args: 
-      - '-c'
+    args:
+      - "-c"
       - |
         if [ $_ENV = "staging" ]; then
           docker build -t "eu.gcr.io/ons-eqbs-images/eq-author:$SHORT_SHA" .
@@ -38,9 +38,9 @@ steps:
     dir: eq-author-api
     entrypoint: sh
     waitFor:
-      - '-'
-    args: 
-      - '-c'
+      - "-"
+    args:
+      - "-c"
       - |
         if [ $_ENV = "staging" ]; then
           docker build -t "eu.gcr.io/ons-eqbs-images/eq-author-api:$SHORT_SHA" .
@@ -51,11 +51,11 @@ steps:
           echo "*************************************************************"
         fi
 
-  - name: 'gcr.io/google.com/cloudsdktool/cloud-sdk:alpine'
+  - name: "gcr.io/google.com/cloudsdktool/cloud-sdk:alpine"
     id: tag_author_release
     entrypoint: /bin/bash
     args:
-      - '-c'
+      - "-c"
       - |
         if [ $_ENV = "preprod" ]; then
           gcloud container images add-tag \
@@ -67,11 +67,11 @@ steps:
           echo "*************************************************************"
         fi
 
-  - name: 'gcr.io/google.com/cloudsdktool/cloud-sdk:alpine'
+  - name: "gcr.io/google.com/cloudsdktool/cloud-sdk:alpine"
     id: tag_author_api_release
     entrypoint: /bin/bash
     args:
-      - '-c'
+      - "-c"
       - |
         if [ $_ENV = "preprod" ]; then
           gcloud container images add-tag \
@@ -83,11 +83,11 @@ steps:
           echo "*************************************************************"
         fi
 
-  - name: 'gcr.io/google.com/cloudsdktool/cloud-sdk:alpine'
+  - name: "gcr.io/google.com/cloudsdktool/cloud-sdk:alpine"
     id: deploy_author_api
     entrypoint: sh
     args:
-      - '-c'
+      - "-c"
       - |
         if [ $_ENV = "staging" ]; then
           gcloud run deploy eq-author-api \
@@ -100,12 +100,12 @@ steps:
           --region europe-west2 \
           --platform managed
         fi
- 
-  - name: 'gcr.io/google.com/cloudsdktool/cloud-sdk:alpine'
+
+  - name: "gcr.io/google.com/cloudsdktool/cloud-sdk:alpine"
     id: deploy_author
     entrypoint: sh
     args:
-      - '-c'
+      - "-c"
       - |
         if [ $_ENV = "staging" ]; then
           gcloud run deploy eq-author \
@@ -118,4 +118,4 @@ steps:
           --region europe-west2 \
           --platform managed
         fi
-timeout: 1200s
+timeout: 1800s

From cab5f4c5644ecdfd0a66a6b5d007b652cbfb3df3 Mon Sep 17 00:00:00 2001
From: sudeep <sudeep.kunhikannan@ons.gov.uk>
Date: Mon, 20 May 2024 14:25:23 +0100
Subject: [PATCH 066/215] increase timeout

Signed-off-by: sudeep <sudeep.kunhikannan@ons.gov.uk>
---
 cloudbuild.yaml | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index 1158f038a8..cd6470ed30 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -1,10 +1,10 @@
 steps:
-  - name: 'node:$_NODE_VERSION'
+  - name: "node:$_NODE_VERSION"
     id: yarn_install_and_build
     dir: eq-author
     entrypoint: /bin/bash
     args:
-      - '-c'
+      - "-c"
       - |
         if [ $_ENV = "staging" ]; then
           yarn install
@@ -21,8 +21,8 @@ steps:
     entrypoint: sh
     waitFor:
       - yarn_install_and_build
-    args: 
-      - '-c'
+    args:
+      - "-c"
       - |
         if [ $_ENV = "staging" ]; then
           docker build -t "eu.gcr.io/ons-eqbs-images/eq-author:$SHORT_SHA" .
@@ -38,9 +38,9 @@ steps:
     dir: eq-author-api
     entrypoint: sh
     waitFor:
-      - '-'
-    args: 
-      - '-c'
+      - "-"
+    args:
+      - "-c"
       - |
         if [ $_ENV = "staging" ]; then
           docker build -t "eu.gcr.io/ons-eqbs-images/eq-author-api:$SHORT_SHA" .
@@ -51,11 +51,11 @@ steps:
           echo "*************************************************************"
         fi
 
-  - name: 'gcr.io/google.com/cloudsdktool/cloud-sdk:alpine'
+  - name: "gcr.io/google.com/cloudsdktool/cloud-sdk:alpine"
     id: tag_author_release
     entrypoint: /bin/bash
     args:
-      - '-c'
+      - "-c"
       - |
         if [ $_ENV = "preprod" ]; then
           gcloud container images add-tag \
@@ -67,11 +67,11 @@ steps:
           echo "*************************************************************"
         fi
 
-  - name: 'gcr.io/google.com/cloudsdktool/cloud-sdk:alpine'
+  - name: "gcr.io/google.com/cloudsdktool/cloud-sdk:alpine"
     id: tag_author_api_release
     entrypoint: /bin/bash
     args:
-      - '-c'
+      - "-c"
       - |
         if [ $_ENV = "preprod" ]; then
           gcloud container images add-tag \
@@ -83,11 +83,11 @@ steps:
           echo "*************************************************************"
         fi
 
-  - name: 'gcr.io/google.com/cloudsdktool/cloud-sdk:alpine'
+  - name: "gcr.io/google.com/cloudsdktool/cloud-sdk:alpine"
     id: deploy_author_api
     entrypoint: sh
     args:
-      - '-c'
+      - "-c"
       - |
         if [ $_ENV = "staging" ]; then
           gcloud run deploy eq-author-api \
@@ -100,12 +100,12 @@ steps:
           --region europe-west2 \
           --platform managed
         fi
- 
-  - name: 'gcr.io/google.com/cloudsdktool/cloud-sdk:alpine'
+
+  - name: "gcr.io/google.com/cloudsdktool/cloud-sdk:alpine"
     id: deploy_author
     entrypoint: sh
     args:
-      - '-c'
+      - "-c"
       - |
         if [ $_ENV = "staging" ]; then
           gcloud run deploy eq-author \
@@ -118,4 +118,4 @@ steps:
           --region europe-west2 \
           --platform managed
         fi
-timeout: 1200s
+timeout: 1800s

From edd2dcccfbfe54cfe7fc8b5d5a86e1167f029254 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Tue, 21 May 2024 15:03:03 +0100
Subject: [PATCH 067/215] Fix failing tests

---
 .../answerTypeToCondition.test.js             |  4 ++-
 .../RoutingAnswerContentPicker.js             |  1 +
 .../__snapshots__/index.test.js.snap          | 30 +++++++++++++++++++
 eq-author/src/utils/getContentBeforeEntity.js | 11 ++++++-
 4 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/eq-author-api/src/businessLogic/answerTypeToCondition.test.js b/eq-author-api/src/businessLogic/answerTypeToCondition.test.js
index 26367f6e74..99ca546f61 100644
--- a/eq-author-api/src/businessLogic/answerTypeToCondition.test.js
+++ b/eq-author-api/src/businessLogic/answerTypeToCondition.test.js
@@ -16,6 +16,7 @@ const VALID_TYPES = [
   answerTypes.CHECKBOX,
   answerTypes.DATE,
   answerTypes.SELECT,
+  answerTypes.MUTUALLY_EXCLUSIVE,
 ];
 
 describe("AnswerTypeToCondition", () => {
@@ -29,7 +30,7 @@ describe("AnswerTypeToCondition", () => {
   });
 
   describe("getDefault()", () => {
-    it("should return equal for all apart from radio", () => {
+    it("should return correct default condition for all valid answer types", () => {
       const expectedDefaults = {
         [answerTypes.NUMBER]: conditions.SELECT,
         [answerTypes.PERCENTAGE]: conditions.SELECT,
@@ -39,6 +40,7 @@ describe("AnswerTypeToCondition", () => {
         [answerTypes.CHECKBOX]: conditions.ALL_OF,
         [answerTypes.DATE]: conditions.SELECT,
         [answerTypes.SELECT]: conditions.ONE_OF,
+        [answerTypes.MUTUALLY_EXCLUSIVE]: conditions.ONE_OF,
       };
       VALID_TYPES.forEach((type) => {
         expect(getDefault(type)).toEqual(expectedDefaults[type]);
diff --git a/eq-author/src/App/page/Logic/BinaryExpressionEditor/RoutingAnswerContentPicker.js b/eq-author/src/App/page/Logic/BinaryExpressionEditor/RoutingAnswerContentPicker.js
index 30fd0ad2b7..e2d272d970 100644
--- a/eq-author/src/App/page/Logic/BinaryExpressionEditor/RoutingAnswerContentPicker.js
+++ b/eq-author/src/App/page/Logic/BinaryExpressionEditor/RoutingAnswerContentPicker.js
@@ -80,6 +80,7 @@ RoutingAnswerContentPicker.propTypes = {
     PropTypes.object,
     PropTypes.string,
   ]),
+  expressionGroup: PropTypes.object, //eslint-disable-line
 };
 
 export default RoutingAnswerContentPicker;
diff --git a/eq-author/src/App/page/Logic/BinaryExpressionEditor/__snapshots__/index.test.js.snap b/eq-author/src/App/page/Logic/BinaryExpressionEditor/__snapshots__/index.test.js.snap
index a2f212d948..4f0852468d 100644
--- a/eq-author/src/App/page/Logic/BinaryExpressionEditor/__snapshots__/index.test.js.snap
+++ b/eq-author/src/App/page/Logic/BinaryExpressionEditor/__snapshots__/index.test.js.snap
@@ -24,6 +24,36 @@ exports[`BinaryExpressionEditor should render consistently 1`] = `
     >
       <RoutingAnswerContentPicker
         data-test="routing-answer-picker"
+        expressionGroup={
+          Object {
+            "expressions": Array [
+              Object {
+                "condition": "Equal",
+                "expressionGroup": Object {
+                  "__typename": "ExpressionGroup2",
+                  "id": "1",
+                  "validationErrorInfo": Object {
+                    "errors": Array [],
+                    "id": "1",
+                    "totalCount": 0,
+                  },
+                },
+                "id": "1",
+                "left": Object {
+                  "id": "2",
+                  "type": "Radio",
+                },
+                "right": null,
+                "secondaryCondition": null,
+                "validationErrorInfo": Object {
+                  "errors": Array [],
+                  "id": "6dd",
+                  "totalCount": 0,
+                },
+              },
+            ],
+          }
+        }
         hasError={false}
         onSubmit={[Function]}
         selectedId="2"
diff --git a/eq-author/src/utils/getContentBeforeEntity.js b/eq-author/src/utils/getContentBeforeEntity.js
index ab68375d17..7244beabd6 100644
--- a/eq-author/src/utils/getContentBeforeEntity.js
+++ b/eq-author/src/utils/getContentBeforeEntity.js
@@ -44,14 +44,23 @@ const getContentBeforeEntity = (
           !isListCollectorPageType(page.pageType) &&
           (page?.answers?.flatMap(preprocessAnswers) || []);
 
+        /*
+          When expression group's condition is "And":
+            1. Do not include mutually exclusive answers on the same page as the expression's left side answer
+            2. Do not include answers on the same page as the expression's left side answer when the expression's left side answer is mutually exclusive
+        */
         if (expressionGroup?.operator === "And") {
           expressionGroup.expressions.forEach((expression) => {
             if (expression?.left?.page?.id) {
               answers = answers.filter((answer) => {
+                // If the expression's left side answer is on the same page as the looped answer
                 if (expression.left.page.id === answer.page.id) {
+                  // If the expression's left side answer is mutually exclusive, do not include the looped answer (as looped answer and expression answer are on the same page)
                   if (expression.left.type === MUTUALLY_EXCLUSIVE) {
                     return false;
-                  } else {
+                  }
+                  // If the expression's left side answer is not mutually exclusive, only include the looped answer if it is also not mutually exclusive (as looped answer and expression answer are on the same page)
+                  else {
                     return answer.type !== MUTUALLY_EXCLUSIVE;
                   }
                 }

From 8ce3ffaff89b41cfc4176bac40f76dc66a33ad5c Mon Sep 17 00:00:00 2001
From: Paul-Joel <paul.joel@ons.gov.uk>
Date: Wed, 22 May 2024 10:58:59 +0100
Subject: [PATCH 068/215] Fix to RTField paste

---
 .../utils/createQuestionnaireIntroduction.js  |  2 +-
 eq-author/package.json                        |  1 +
 .../src/components/RichTextEditor/index.js    | 76 +++++++++++++------
 eq-author/yarn.lock                           | 25 ++++++
 4 files changed, 81 insertions(+), 23 deletions(-)

diff --git a/eq-author-api/utils/createQuestionnaireIntroduction.js b/eq-author-api/utils/createQuestionnaireIntroduction.js
index dd3a3f5bfd..4ff9cc5371 100644
--- a/eq-author-api/utils/createQuestionnaireIntroduction.js
+++ b/eq-author-api/utils/createQuestionnaireIntroduction.js
@@ -23,7 +23,7 @@ module.exports = (metadata) => {
     additionalGuidancePanelSwitch: false,
     additionalGuidancePanel: "",
     description:
-      "<ul><li>Data should relate to all sites in England, Scotland, Wales and Northern Ireland unless otherwise stated. </li><li>You can provide info estimates if actual figures are not available.</li><li>We will treat your data securely and confidentially.</li></ul>",
+      "<ul><li>Data should relate to all sites in England, Scotland, Wales and Northern Ireland unless otherwise stated.</li><li>You can provide info estimates if actual figures are not available.</li><li>We will treat your data securely and confidentially.</li></ul>",
     legalBasis: NOTICE_1,
     // TODO: previewQuestions
     previewQuestions: false,
diff --git a/eq-author/package.json b/eq-author/package.json
index 2e3b4adf90..1562f6ab95 100644
--- a/eq-author/package.json
+++ b/eq-author/package.json
@@ -107,6 +107,7 @@
     "draft-js-block-breakout-plugin": "latest",
     "draft-js-plugins-editor": "latest",
     "draft-js-raw-content-state": "latest",
+    "draft-js-import-html": "latest",
     "draftjs-filters": "^2.5.0",
     "firebase": "latest",
     "firebaseui": "latest",
diff --git a/eq-author/src/components/RichTextEditor/index.js b/eq-author/src/components/RichTextEditor/index.js
index d64efb2ef0..481337291d 100644
--- a/eq-author/src/components/RichTextEditor/index.js
+++ b/eq-author/src/components/RichTextEditor/index.js
@@ -2,7 +2,14 @@ import React from "react";
 import PropTypes from "prop-types";
 import styled, { css } from "styled-components";
 import Editor from "draft-js-plugins-editor";
-import { EditorState, RichUtils, Modifier, CompositeDecorator } from "draft-js";
+import {
+  EditorState,
+  RichUtils,
+  Modifier,
+  CompositeDecorator,
+  ContentState,
+} from "draft-js";
+import { stateFromHTML } from "draft-js-import-html";
 import "draft-js/dist/Draft.css";
 import createBlockBreakoutPlugin from "draft-js-block-breakout-plugin";
 
@@ -395,12 +402,12 @@ class RichTextEditor extends React.Component {
 
   state = { showPasteModal: false, text: "", multiline: false };
 
-  handlePaste = (text) => {
+  handlePaste = (text, html) => {
     if (/\s{2,}/g.test(text)) {
       this.setState({
         showPasteModal: true,
         multiline: false,
-        text: text,
+        text: html || text,
       });
     } else {
       this.handleChange(
@@ -418,12 +425,12 @@ class RichTextEditor extends React.Component {
     return "handled";
   };
 
-  handlePasteMultiline = (text) => {
+  handlePasteMultiline = (text, html) => {
     if (/\s{2,}/g.test(text)) {
       this.setState({
         showPasteModal: true,
         multiline: true,
-        text: text,
+        text: html || text,
       });
       return "handled";
     } else {
@@ -436,27 +443,52 @@ class RichTextEditor extends React.Component {
     const currentContent = editorState.getCurrentContent();
     const currentSelection = editorState.getSelection();
 
-    let modifiedText;
+    let newEditorState;
+    let processedText = text;
 
     if (multiline) {
-      modifiedText = preserveRichFormatting(text);
-    } else {
-      modifiedText = text.replace(/\n/g, " ").trim().replace(/\s+/g, " ");
-    }
+      // Process the text to remove multiple spaces
+      processedText = processedText.replace(/\s{2,}/g, " ").trim();
+      // Convert processed text from HTML to ContentState
+      const contentState = stateFromHTML(processedText);
+      const fragment = contentState.getBlockMap();
+
+      // Replace the selected text with the pasted content
+      const newContentState = Modifier.replaceWithFragment(
+        currentContent,
+        currentSelection,
+        fragment
+      );
 
-    // Replace the selected text with the pasted content
-    const newContentState = Modifier.replaceText(
-      currentContent,
-      currentSelection,
-      modifiedText
-    );
+      // Create a new EditorState with the updated content
+      newEditorState = EditorState.push(
+        editorState,
+        newContentState,
+        "insert-characters"
+      );
+    } else {
+      // For single line pastes, replace multiple spaces with a single space
+      processedText = processedText
+        .replace(/\n/g, " ")
+        .replace(/\s+/g, " ")
+        .trim();
+      const contentState = stateFromHTML(processedText);
+      const fragment = contentState.getBlockMap();
+
+      // Replace the selected text with the pasted content
+      const newContentState = Modifier.replaceWithFragment(
+        currentContent,
+        currentSelection,
+        fragment
+      );
 
-    // Create a new EditorState with the updated content
-    const newEditorState = EditorState.push(
-      editorState,
-      newContentState,
-      "insert-characters"
-    );
+      // Create a new EditorState with the updated content
+      newEditorState = EditorState.push(
+        editorState,
+        newContentState,
+        "insert-characters"
+      );
+    }
 
     // Set the new editor state and close the paste modal
     this.setState({
diff --git a/eq-author/yarn.lock b/eq-author/yarn.lock
index 7301bd4997..fabdcc8a4f 100644
--- a/eq-author/yarn.lock
+++ b/eq-author/yarn.lock
@@ -7331,6 +7331,21 @@ draft-js-block-breakout-plugin@latest:
   dependencies:
     immutable "~3.7.4"
 
+draft-js-import-element@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/draft-js-import-element/-/draft-js-import-element-1.4.0.tgz#8760acbfeb60ed824a1c8319ec049f702681df66"
+  integrity sha512-WmYT5PrCm47lGL5FkH6sRO3TTAcn7qNHsD3igiPqLG/RXrqyKrqN4+wBgbcT2lhna/yfWTRtgzAbQsSJoS1Meg==
+  dependencies:
+    draft-js-utils "^1.4.0"
+    synthetic-dom "^1.4.0"
+
+draft-js-import-html@latest:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/draft-js-import-html/-/draft-js-import-html-1.4.1.tgz#c222a3a40ab27dee5874fcf78526b64734fe6ea4"
+  integrity sha512-KOZmtgxZriCDgg5Smr3Y09TjubvXe7rHPy/2fuLSsL+aSzwUDwH/aHDA/k47U+WfpmL4qgyg4oZhqx9TYJV0tg==
+  dependencies:
+    draft-js-import-element "^1.4.0"
+
 draft-js-plugins-editor@latest:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/draft-js-plugins-editor/-/draft-js-plugins-editor-3.0.0.tgz#196d1e065e2c29faebaab4ec081b734fdef294a2"
@@ -7346,6 +7361,11 @@ draft-js-raw-content-state@latest:
   dependencies:
     draft-js "^0.10.5"
 
+draft-js-utils@^1.4.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/draft-js-utils/-/draft-js-utils-1.4.1.tgz#a59c792ad621f7050292031a237d524708a6d509"
+  integrity sha512-xE81Y+z/muC5D5z9qWmKfxEW1XyXfsBzSbSBk2JRsoD0yzMGGHQm/0MtuqHl/EUDkaBJJLjJ2EACycoDMY/OOg==
+
 draft-js@^0.10.5:
   version "0.10.5"
   resolved "https://registry.yarnpkg.com/draft-js/-/draft-js-0.10.5.tgz#bfa9beb018fe0533dbb08d6675c371a6b08fa742"
@@ -16753,6 +16773,11 @@ synchronous-promise@latest:
   resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.15.tgz#07ca1822b9de0001f5ff73595f3d08c4f720eb8e"
   integrity sha512-k8uzYIkIVwmT+TcglpdN50pS2y1BDcUnBPK9iJeGu0Pl1lOI8pD6wtzgw91Pjpe+RxtTncw32tLxs/R0yNL2Mg==
 
+synthetic-dom@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/synthetic-dom/-/synthetic-dom-1.4.0.tgz#d988d7a4652458e2fc8706a875417af913e4dd34"
+  integrity sha512-mHv51ZsmZ+ShT/4s5kg+MGUIhY7Ltq4v03xpN1c8T1Krb5pScsh/lzEjyhrVD0soVDbThbd2e+4dD9vnDG4rhg==
+
 tabbable@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-6.0.0.tgz#7f95ea69134e9335979092ba63866fe67b521b01"

From 67062da1e7c74a7828e158d1e7203b55a132cb93 Mon Sep 17 00:00:00 2001
From: Paul-Joel <paul.joel@ons.gov.uk>
Date: Wed, 22 May 2024 11:16:49 +0100
Subject: [PATCH 069/215] Remove redundent preserveRichFormatting

---
 .../src/components/RichTextEditor/index.js     | 12 ++----------
 .../src/components/modals/PasteModal/index.js  | 13 -------------
 .../components/modals/PasteModal/index.test.js | 18 +-----------------
 3 files changed, 3 insertions(+), 40 deletions(-)

diff --git a/eq-author/src/components/RichTextEditor/index.js b/eq-author/src/components/RichTextEditor/index.js
index 481337291d..dc3795d5a5 100644
--- a/eq-author/src/components/RichTextEditor/index.js
+++ b/eq-author/src/components/RichTextEditor/index.js
@@ -2,13 +2,7 @@ import React from "react";
 import PropTypes from "prop-types";
 import styled, { css } from "styled-components";
 import Editor from "draft-js-plugins-editor";
-import {
-  EditorState,
-  RichUtils,
-  Modifier,
-  CompositeDecorator,
-  ContentState,
-} from "draft-js";
+import { EditorState, RichUtils, Modifier, CompositeDecorator } from "draft-js";
 import { stateFromHTML } from "draft-js-import-html";
 import "draft-js/dist/Draft.css";
 import createBlockBreakoutPlugin from "draft-js-block-breakout-plugin";
@@ -34,9 +28,7 @@ import { sharedStyles } from "components/Forms/css";
 import { Field, Label } from "components/Forms";
 import ValidationError from "components/ValidationError";
 
-import PasteModal, {
-  preserveRichFormatting,
-} from "components/modals/PasteModal";
+import PasteModal from "components/modals/PasteModal";
 
 import { colors } from "../../constants/theme";
 
diff --git a/eq-author/src/components/modals/PasteModal/index.js b/eq-author/src/components/modals/PasteModal/index.js
index 4e0ab19885..bb1ba1ab99 100644
--- a/eq-author/src/components/modals/PasteModal/index.js
+++ b/eq-author/src/components/modals/PasteModal/index.js
@@ -5,19 +5,6 @@ import PropTypes from "prop-types";
 
 const Message = styled.div``;
 
-export const preserveRichFormatting = (text) => {
-  // Replace multiple spaces and tabs with a single space
-  let formattedText = text.replace(/[ \t]+/g, " ");
-
-  // Split the text into lines
-  let lines = formattedText.split(/\r?\n/);
-
-  // Remove leading and trailing spaces from each line and join them back with newline characters
-  formattedText = lines.map((line) => line.trim()).join("\n");
-
-  return formattedText;
-};
-
 const ModalWrapper = styled.div`
   .modal-button-container {
     margin-top: 1em;
diff --git a/eq-author/src/components/modals/PasteModal/index.test.js b/eq-author/src/components/modals/PasteModal/index.test.js
index 11f7631f15..1f3b70e8b5 100644
--- a/eq-author/src/components/modals/PasteModal/index.test.js
+++ b/eq-author/src/components/modals/PasteModal/index.test.js
@@ -1,27 +1,11 @@
 import React from "react";
 import { render, fireEvent } from "tests/utils/rtl";
-import PasteModal, { preserveRichFormatting } from ".";
+import PasteModal from ".";
 
 import { keyCodes } from "constants/keyCodes";
 
 const { Escape } = keyCodes;
 
-describe("preserveRichFormatting function", () => {
-  it("should replace multiple spaces and tabs with a single space", () => {
-    const inputText = "   Hello \t\t World    ";
-    const expectedOutput = "Hello World";
-    const result = preserveRichFormatting(inputText);
-    expect(result).toBe(expectedOutput);
-  });
-
-  it("should remove leading and trailing spaces from each line", () => {
-    const inputText = "   Line 1   \n   Line 2   \n   Line 3   ";
-    const expectedOutput = "Line 1\nLine 2\nLine 3";
-    const result = preserveRichFormatting(inputText);
-    expect(result).toBe(expectedOutput);
-  });
-});
-
 describe("PasteModal", () => {
   let onConfirm, onCancel;
   onConfirm = jest.fn();

From a2a30d5bc3f42f77fcbe1b2d83efa40cfa7e7dcb Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Wed, 22 May 2024 12:17:42 +0100
Subject: [PATCH 070/215] Add getContentBeforeEntity tests

---
 .../src/utils/getContentBeforeEntity.test.js  | 140 ++++++++++++++++++
 1 file changed, 140 insertions(+)

diff --git a/eq-author/src/utils/getContentBeforeEntity.test.js b/eq-author/src/utils/getContentBeforeEntity.test.js
index 79aa565593..fbea5ca298 100644
--- a/eq-author/src/utils/getContentBeforeEntity.test.js
+++ b/eq-author/src/utils/getContentBeforeEntity.test.js
@@ -4,6 +4,8 @@ import {
 } from "tests/utils/createMockQuestionnaire";
 import getPreviousContent from "./getContentBeforeEntity";
 
+import { MUTUALLY_EXCLUSIVE } from "constants/answer-types";
+
 let questionnaire = buildQuestionnaire({
   sectionCount: 2,
   folderCount: 2,
@@ -15,10 +17,148 @@ questionnaire.introduction = {
 };
 
 describe("utils/getPreviousAnswers", () => {
+  beforeEach(() => {
+    // Adds page ID to each answer
+    questionnaire.sections.forEach((section) => {
+      section.folders.forEach((folder) => {
+        folder.pages.forEach((page) => {
+          page.answers.forEach((answer) => {
+            answer.page = {
+              id: page.id,
+            };
+          });
+        });
+      });
+    });
+  });
+
   it("should return empty array when questionnaire or ID not provided", () => {
     expect(getPreviousContent()).toHaveLength(0);
   });
 
+  it("should return mutually exclusive answers when expression's left side answer is on a different page", () => {
+    questionnaire.sections[1].folders[0].pages[1].answers[1].type =
+      MUTUALLY_EXCLUSIVE;
+
+    const previousContent = getPreviousContent({
+      questionnaire,
+      id: questionnaire.sections[1].folders[0].pages[1].id,
+      includeTargetPage: true,
+      expressionGroup: {
+        operator: "And",
+        expressions: [
+          {
+            left: {
+              id: questionnaire.sections[1].folders[0].pages[0].answers[0].id,
+              page: {
+                id: questionnaire.sections[1].folders[0].pages[0].id,
+              },
+            },
+          },
+        ],
+      },
+    });
+
+    // Tests previousContent[0] matches the questionnaire's first section
+    expect(previousContent).toHaveLength(2);
+    expect(previousContent[0]).toMatchObject(questionnaire.sections[0]);
+
+    // Tests previousContent[1]'s first folder's first page matches the questionnaire's second section's first folder's first page
+    expect(previousContent[1].folders[0].pages).toHaveLength(2);
+    expect(previousContent[1].folders[0].pages[0].answers).toHaveLength(2);
+    expect(previousContent[1].folders[0].pages[0]).toMatchObject(
+      questionnaire.sections[1].folders[0].pages[0]
+    );
+
+    // Tests previousContent[1]'s first folder's second page matches the questionnaire's second section's first folder's second page
+    expect(previousContent[1].folders[0].pages[1].answers).toHaveLength(2);
+    expect(previousContent[1].folders[0].pages[1]).toMatchObject(
+      questionnaire.sections[1].folders[0].pages[1]
+    );
+  });
+
+  it("should not return mutually exclusive answers on the same page as the expression's left side answer", () => {
+    questionnaire.sections[1].folders[0].pages[1].answers[1].type =
+      MUTUALLY_EXCLUSIVE;
+
+    const previousContent = getPreviousContent({
+      questionnaire,
+      id: questionnaire.sections[1].folders[0].pages[1].id,
+      includeTargetPage: true,
+      expressionGroup: {
+        operator: "And",
+        expressions: [
+          {
+            left: {
+              id: questionnaire.sections[1].folders[0].pages[1].answers[0].id,
+              page: {
+                id: questionnaire.sections[1].folders[0].pages[1].id,
+              },
+            },
+          },
+        ],
+      },
+    });
+
+    // Tests previousContent[0] matches the questionnaire's first section
+    expect(previousContent).toHaveLength(2);
+    expect(previousContent[0]).toMatchObject(questionnaire.sections[0]);
+
+    // Tests previousContent[1]'s first folder's first page matches the questionnaire's second section's first folder's first page
+    expect(previousContent[1].folders[0].pages).toHaveLength(2);
+    expect(previousContent[1].folders[0].pages[0].answers).toHaveLength(2);
+    expect(previousContent[1].folders[0].pages[0]).toMatchObject(
+      questionnaire.sections[1].folders[0].pages[0]
+    );
+
+    // Tests mutually exclusive answer is removed from previousContent[1]'s first folder's second page
+    expect(previousContent[1].folders[0].pages[1].answers).toHaveLength(1);
+    expect(previousContent[1].folders[0].pages[1].answers[0]).toMatchObject(
+      questionnaire.sections[1].folders[0].pages[1].answers[0]
+    );
+    expect(
+      previousContent[1].folders[0].pages[1].answers.some(
+        (answer) => answer.type === MUTUALLY_EXCLUSIVE
+      )
+    ).toBe(false);
+  });
+
+  it("should not return answers on the same page as expression's left side answer when left side answer is mutually exclusive", () => {
+    questionnaire.sections[1].folders[0].pages[1].answers[1].type =
+      MUTUALLY_EXCLUSIVE;
+
+    const previousContent = getPreviousContent({
+      questionnaire,
+      id: questionnaire.sections[1].folders[0].pages[1].id,
+      includeTargetPage: true,
+      expressionGroup: {
+        operator: "And",
+        expressions: [
+          {
+            left: {
+              id: questionnaire.sections[1].folders[0].pages[1].answers[1].id,
+              type: MUTUALLY_EXCLUSIVE,
+              page: {
+                id: questionnaire.sections[1].folders[0].pages[1].id,
+              },
+            },
+          },
+        ],
+      },
+    });
+
+    // Tests previousContent[0] matches the questionnaire's first section
+    expect(previousContent).toHaveLength(2);
+    expect(previousContent[0]).toMatchObject(questionnaire.sections[0]);
+
+    // Tests previousContent[1]'s first folder's first page matches the questionnaire's second section's first folder's first page, and that the second page has been removed
+    expect(previousContent[1].folders[0].pages).toHaveLength(1);
+    expect(previousContent[1].folders[0].pages[0].answers).toHaveLength(2);
+    expect(previousContent[1].folders[0].pages[0]).toMatchObject(
+      questionnaire.sections[1].folders[0].pages[0]
+    );
+  });
+
   it("should return empty array on questionnaire introduction page", () => {
     const previousSections = getPreviousContent({
       questionnaire,

From 4d4209d4091939a5181eda2b9912c837d5cb6d8a Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Thu, 23 May 2024 08:36:53 +0100
Subject: [PATCH 071/215] Update comments

---
 .../src/utils/getContentBeforeEntity.test.js  | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/eq-author/src/utils/getContentBeforeEntity.test.js b/eq-author/src/utils/getContentBeforeEntity.test.js
index fbea5ca298..dc3f6856d6 100644
--- a/eq-author/src/utils/getContentBeforeEntity.test.js
+++ b/eq-author/src/utils/getContentBeforeEntity.test.js
@@ -59,19 +59,23 @@ describe("utils/getPreviousAnswers", () => {
       },
     });
 
-    // Tests previousContent[0] matches the questionnaire's first section
     expect(previousContent).toHaveLength(2);
+
+    // Tests previousContent[0] matches the questionnaire's first section
     expect(previousContent[0]).toMatchObject(questionnaire.sections[0]);
 
-    // Tests previousContent[1]'s first folder's first page matches the questionnaire's second section's first folder's first page
+    // Tests previousContent[1]'s first folder has two pages
     expect(previousContent[1].folders[0].pages).toHaveLength(2);
+    // Tests previousContent[1]'s first folder's first page has two answers
     expect(previousContent[1].folders[0].pages[0].answers).toHaveLength(2);
+    // Tests previousContent[1]'s first folder's first page matches the questionnaire's second section's first folder's first page
     expect(previousContent[1].folders[0].pages[0]).toMatchObject(
       questionnaire.sections[1].folders[0].pages[0]
     );
 
-    // Tests previousContent[1]'s first folder's second page matches the questionnaire's second section's first folder's second page
+    // Tests previousContent[1]'s first folder's second page has two answers
     expect(previousContent[1].folders[0].pages[1].answers).toHaveLength(2);
+    // Tests previousContent[1]'s first folder's second page matches the questionnaire's second section's first folder's second page
     expect(previousContent[1].folders[0].pages[1]).toMatchObject(
       questionnaire.sections[1].folders[0].pages[1]
     );
@@ -100,18 +104,21 @@ describe("utils/getPreviousAnswers", () => {
       },
     });
 
-    // Tests previousContent[0] matches the questionnaire's first section
     expect(previousContent).toHaveLength(2);
+
+    // Tests previousContent[0] matches the questionnaire's first section
     expect(previousContent[0]).toMatchObject(questionnaire.sections[0]);
 
-    // Tests previousContent[1]'s first folder's first page matches the questionnaire's second section's first folder's first page
+    // Tests previousContent[1]'s first folder has two pages
     expect(previousContent[1].folders[0].pages).toHaveLength(2);
+    // Tests previousContent[1]'s first folder's first page has two answers
     expect(previousContent[1].folders[0].pages[0].answers).toHaveLength(2);
+    // Tests previousContent[1]'s first folder's first page matches the questionnaire's second section's first folder's first page
     expect(previousContent[1].folders[0].pages[0]).toMatchObject(
       questionnaire.sections[1].folders[0].pages[0]
     );
 
-    // Tests mutually exclusive answer is removed from previousContent[1]'s first folder's second page
+    // Tests to assert that the mutually exclusive answer is removed from previousContent[1]'s first folder's second page
     expect(previousContent[1].folders[0].pages[1].answers).toHaveLength(1);
     expect(previousContent[1].folders[0].pages[1].answers[0]).toMatchObject(
       questionnaire.sections[1].folders[0].pages[1].answers[0]
@@ -147,13 +154,16 @@ describe("utils/getPreviousAnswers", () => {
       },
     });
 
-    // Tests previousContent[0] matches the questionnaire's first section
     expect(previousContent).toHaveLength(2);
+
+    // Tests previousContent[0] matches the questionnaire's first section
     expect(previousContent[0]).toMatchObject(questionnaire.sections[0]);
 
-    // Tests previousContent[1]'s first folder's first page matches the questionnaire's second section's first folder's first page, and that the second page has been removed
+    // Tests previousContent[1]'s first folder has one page (the second page has been removed as left side answer is mutually exclusive)
     expect(previousContent[1].folders[0].pages).toHaveLength(1);
+    // Tests previousContent[1]'s first folder's first page has two answers
     expect(previousContent[1].folders[0].pages[0].answers).toHaveLength(2);
+    // Tests previousContent[1]'s first folder's first page matches the questionnaire's second section's first folder's first page
     expect(previousContent[1].folders[0].pages[0]).toMatchObject(
       questionnaire.sections[1].folders[0].pages[0]
     );

From 8bf1ca465a68c8280ef701c06b68eac9b143a0e0 Mon Sep 17 00:00:00 2001
From: sudeep <sudeep.kunhikannan@ons.gov.uk>
Date: Thu, 23 May 2024 09:27:21 +0100
Subject: [PATCH 072/215] updated title in test

Signed-off-by: sudeep <sudeep.kunhikannan@ons.gov.uk>
---
 eq-author-api/db/datastore/datastore-firestore.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eq-author-api/db/datastore/datastore-firestore.test.js b/eq-author-api/db/datastore/datastore-firestore.test.js
index 787a203300..1b8625e33d 100644
--- a/eq-author-api/db/datastore/datastore-firestore.test.js
+++ b/eq-author-api/db/datastore/datastore-firestore.test.js
@@ -263,7 +263,7 @@ describe("Firestore Datastore", () => {
       const createdAt = questionnaire.createdAt;
       const savedQuestionnaire = await saveQuestionnaire({
         id: "123",
-        title: "Updated question title",
+        title: "Updated questionnaire title",
         ...questionnaire,
       });
       expect(createdAt === savedQuestionnaire.createdAt).toBeTruthy();

From fe621ea0dabb030d9edb5aec1bd92166d147e28f Mon Sep 17 00:00:00 2001
From: sudeep <sudeep.kunhikannan@ons.gov.uk>
Date: Thu, 23 May 2024 10:24:17 +0100
Subject: [PATCH 073/215] increased timeout

Signed-off-by: sudeep <sudeep.kunhikannan@ons.gov.uk>
---
 cloudbuild-author-tests.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cloudbuild-author-tests.yaml b/cloudbuild-author-tests.yaml
index 477ffd3bb6..fa78e810e7 100644
--- a/cloudbuild-author-tests.yaml
+++ b/cloudbuild-author-tests.yaml
@@ -26,6 +26,6 @@ steps:
         exit $(( 1 - $result ))
     id: unit_tests
     entrypoint: /bin/ash
-timeout: 1200s
+timeout: 1800s
 options:
   machineType: E2_HIGHCPU_8

From 9a30191bc9863a18aebc13e3a4927f54eb1981da Mon Sep 17 00:00:00 2001
From: sudeep <sudeep.kunhikannan@ons.gov.uk>
Date: Thu, 23 May 2024 12:05:39 +0100
Subject: [PATCH 074/215] test build

Signed-off-by: sudeep <sudeep.kunhikannan@ons.gov.uk>
---
 cloudbuild-author-tests.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cloudbuild-author-tests.yaml b/cloudbuild-author-tests.yaml
index fa78e810e7..477ffd3bb6 100644
--- a/cloudbuild-author-tests.yaml
+++ b/cloudbuild-author-tests.yaml
@@ -26,6 +26,6 @@ steps:
         exit $(( 1 - $result ))
     id: unit_tests
     entrypoint: /bin/ash
-timeout: 1800s
+timeout: 1200s
 options:
   machineType: E2_HIGHCPU_8

From 098dfde5545ed7eb450ffbdeb08bc3e5e5699e1f Mon Sep 17 00:00:00 2001
From: sudeep <sudeep.kunhikannan@ons.gov.uk>
Date: Thu, 23 May 2024 13:16:49 +0100
Subject: [PATCH 075/215] test build

Signed-off-by: sudeep <sudeep.kunhikannan@ons.gov.uk>
---
 cloudbuild-author-tests.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cloudbuild-author-tests.yaml b/cloudbuild-author-tests.yaml
index 477ffd3bb6..fa78e810e7 100644
--- a/cloudbuild-author-tests.yaml
+++ b/cloudbuild-author-tests.yaml
@@ -26,6 +26,6 @@ steps:
         exit $(( 1 - $result ))
     id: unit_tests
     entrypoint: /bin/ash
-timeout: 1200s
+timeout: 1800s
 options:
   machineType: E2_HIGHCPU_8

From ce30a1d5ad61b354ff83d9adf2a6c5e3a743c6ab Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Wed, 29 May 2024 12:23:05 +0100
Subject: [PATCH 076/215] Update value to handle the same error across
 different answers in an expression

---
 eq-author-api/src/validation/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eq-author-api/src/validation/index.js b/eq-author-api/src/validation/index.js
index fcc44578a8..f389c927e2 100644
--- a/eq-author-api/src/validation/index.js
+++ b/eq-author-api/src/validation/index.js
@@ -55,7 +55,7 @@ module.exports = (questionnaire) => {
 
   for (const err of validate.errors) {
     if (err.keyword === "errorMessage") {
-      const key = `${err.instancePath} ${err.message}`;
+      const key = `${err.instancePath} ${err.message} ${err.field}`;
 
       if (uniqueErrorMessages[key]) {
         continue;

From 348a5ca7b286585580273442fcf3bf1858a6161b Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Wed, 29 May 2024 14:17:54 +0100
Subject: [PATCH 077/215] added condition to display the question page title

---
 .../page/Preview/CalculatedSummaryPreview.js  | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
index e633018353..6836aaf36f 100644
--- a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
+++ b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
@@ -5,7 +5,6 @@ import { propType } from "graphql-anywhere";
 import styled from "styled-components";
 import Error from "components/preview/Error";
 import PageTitle from "components/preview/elements/PageTitle";
-import Info from "components/preview/elements/Info";
 
 import EditorLayout from "components/EditorLayout";
 import Panel from "components/Panel";
@@ -15,6 +14,9 @@ import CommentsPanel from "App/Comments";
 import { colors } from "constants/theme";
 import CalculatedSummaryPageEditor from "../Design/CalculatedSummaryPageEditor";
 import { useSetNavigationCallbacksForPage } from "components/NavigationCallbacks";
+import { getPageByAnswerId } from "utils/questionnaireUtils";
+import { useQuestionnaire } from "components/QuestionnaireContext";
+import Answers from "../Design/CalculatedSummaryPageEditor/AnswerSelector/Answers";
 
 const Container = styled.div`
   padding: 2em;
@@ -97,6 +99,21 @@ const CalculatedSummaryPagePreview = ({ page }) => {
     section: page?.section,
   });
 
+  const { questionnaire } = useQuestionnaire();
+  const uniqueTitles = new Set();
+
+  const titles = page.summaryAnswers.map((answer) => {
+    const pages = getPageByAnswerId(questionnaire, answer.id);
+    if (pages) {
+      const title = pages.title.replace(/<[^>]*>/g, "");
+      if (!uniqueTitles.has(title)) {
+        uniqueTitles.add(title);
+        return title;
+      }
+    }
+    return null;
+  });
+
   return (
     <EditorLayout
       title={page.displayName}
@@ -114,6 +131,7 @@ const CalculatedSummaryPagePreview = ({ page }) => {
 
           {page.summaryAnswers.length > 0 ? (
             <Summary>
+              <div>{titles}</div>
               {page.summaryAnswers.map((answer) => (
                 <SummaryItem key={answer.id}>
                   <Grid>

From 2bd6b81733b8de8ba7b8734e473a0c9f8022ecbb Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Wed, 29 May 2024 14:19:29 +0100
Subject: [PATCH 078/215] added nhs england theme in the setting page

---
 eq-author-api/constants/themes.js | 1 +
 eq-author/src/constants/themes.js | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/eq-author-api/constants/themes.js b/eq-author-api/constants/themes.js
index 0f6c911271..055a23a271 100644
--- a/eq-author-api/constants/themes.js
+++ b/eq-author-api/constants/themes.js
@@ -13,6 +13,7 @@ const THEME_SHORT_NAMES = [
   "ukhsa-ons",
   "desnz",
   "desnz-ni",
+  "ons-nhs",
 ];
 
 module.exports = { THEME_SHORT_NAMES };
diff --git a/eq-author/src/constants/themes.js b/eq-author/src/constants/themes.js
index 2ded63c971..797cedfe72 100644
--- a/eq-author/src/constants/themes.js
+++ b/eq-author/src/constants/themes.js
@@ -63,6 +63,12 @@ const THEMES = [
     title: "Office of Rail and Road",
     description: "Header includes the Office of Rail and Road logo",
   },
+  {
+    id: "ons-nhs",
+    title: "NHS England",
+    description:
+      "Header includes the logos for NHS England and the Office for National Statistics but does not include the links for 'Help', 'My account' or 'Sign out' ",
+  },
 ];
 
 export default THEMES;

From 6190bbd5fb1c9f6f5afca39d945a4bf893ccc2a9 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Wed, 29 May 2024 16:03:22 +0100
Subject: [PATCH 079/215] Display error for AND logic conditions containing
 mutually exclusive answers on the same page as another answer in the
 expression group

---
 .../validateRoutingLogicalAND.js              | 35 +++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/eq-author-api/src/validation/customKeywords/validateRoutingLogicalAND.js b/eq-author-api/src/validation/customKeywords/validateRoutingLogicalAND.js
index 6ac57084c4..ad3e66979f 100644
--- a/eq-author-api/src/validation/customKeywords/validateRoutingLogicalAND.js
+++ b/eq-author-api/src/validation/customKeywords/validateRoutingLogicalAND.js
@@ -1,11 +1,16 @@
 const { groupBy } = require("lodash");
-const { getAnswerById } = require("../../../schema/resolvers/utils");
+const {
+  getAnswerById,
+  getPageByAnswerId,
+} = require("../../../schema/resolvers/utils");
+
 const {
   CURRENCY,
   NUMBER,
   PERCENTAGE,
   UNIT,
   CHECKBOX,
+  MUTUALLY_EXCLUSIVE,
 } = require("../../../constants/answerTypes");
 const createValidationError = require("../createValidationError");
 const { ERR_LOGICAL_AND } = require("../../../constants/validationErrorCodes");
@@ -21,6 +26,7 @@ module.exports = (ajv) => {
       _parentSchema,
       { rootData: questionnaire, instancePath }
     ) {
+      const allExpressions = expressions;
       const invalidAnswerIds = new Set();
       const expressionsByAnswerId = groupBy(expressions, "left.answerId");
       const potentialConflicts = Object.entries(expressionsByAnswerId).filter(
@@ -38,8 +44,33 @@ module.exports = (ajv) => {
           return addError(answerId);
         }
 
-        // Bail out if answer isn't numerical or checkbox - remaining code validates number-type answers
         const answer = getAnswerById({ questionnaire }, answerId);
+        const expressionsContainMutuallyExclusive = allExpressions.some(
+          (expression) =>
+            getAnswerById({ questionnaire }, expression.left.answerId)?.type ===
+            MUTUALLY_EXCLUSIVE
+        );
+        const allExpressionAnswerIds = allExpressions.map(
+          (expression) => expression.left.answerId
+        );
+        const pageIdsForExpressionAnswers = allExpressionAnswerIds.map(
+          (answerId) => getPageByAnswerId({ questionnaire }, answerId)?.id
+        );
+
+        // Set removes duplicate values from pageIdsForExpressionAnswers array - if the length of the array is different to the size of the set then the array contains duplicates
+        const expressionsContainDuplicatePageIds =
+          new Set(pageIdsForExpressionAnswers).size !==
+          pageIdsForExpressionAnswers.length;
+
+        // If any of the expressions contain a mutually exclusive answer and there are multiple answers from the same page then add an error
+        if (
+          expressionsContainMutuallyExclusive &&
+          expressionsContainDuplicatePageIds
+        ) {
+          return addError(answerId);
+        }
+
+        // Bail out if answer isn't numerical or checkbox - remaining code validates number-type answers
         if (
           !answer ||
           ![CURRENCY, NUMBER, UNIT, PERCENTAGE, CHECKBOX].includes(answer.type)

From ebf05173649b4dc9f960032c005b41b59718880e Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Thu, 30 May 2024 09:34:38 +0100
Subject: [PATCH 080/215] Add test for mutually exclusive answer used in logic
 with answer on the same page error

---
 eq-author-api/schema/tests/routing.test.js | 111 ++++++++++++++++++++-
 1 file changed, 110 insertions(+), 1 deletion(-)

diff --git a/eq-author-api/schema/tests/routing.test.js b/eq-author-api/schema/tests/routing.test.js
index 34f10ea4e4..6eaa5d0f53 100644
--- a/eq-author-api/schema/tests/routing.test.js
+++ b/eq-author-api/schema/tests/routing.test.js
@@ -1,5 +1,10 @@
 const { buildContext } = require("../../tests/utils/contextBuilder");
-const { RADIO, NUMBER, DATE } = require("../../constants/answerTypes");
+const {
+  RADIO,
+  NUMBER,
+  DATE,
+  MUTUALLY_EXCLUSIVE,
+} = require("../../constants/answerTypes");
 
 const executeQuery = require("../../tests/utils/executeQuery");
 const {
@@ -21,6 +26,7 @@ const {
   ERR_ANSWER_NOT_SELECTED,
   ERR_RIGHTSIDE_NO_VALUE,
   ERR_RIGHTSIDE_NO_CONDITION,
+  ERR_LOGICAL_AND,
 } = require("../../constants/validationErrorCodes");
 
 const {
@@ -59,6 +65,10 @@ describe("routing", () => {
                     {
                       type: NUMBER,
                     },
+                    {
+                      id: "mutually-exclusive-answer",
+                      type: MUTUALLY_EXCLUSIVE,
+                    },
                   ],
                   routing: {},
                 },
@@ -276,6 +286,105 @@ describe("routing", () => {
       expect(errors[0].errorCode).toBe(ERR_ANSWER_NOT_SELECTED);
     });
 
+    it("should have validation errors when expression group contains mutually exclusive answer and answer from same page", async () => {
+      config.sections[0].folders[0].pages[0].routing = {
+        rules: [{ expressionGroup: {} }],
+      };
+
+      const ctx = await buildContext(config);
+      const { questionnaire } = ctx;
+
+      const firstPage = questionnaire.sections[0].folders[0].pages[0];
+      const expressionGroup = firstPage.routing.rules[0].expressionGroup;
+      const expressions = expressionGroup.expressions;
+
+      await executeQuery(
+        createBinaryExpressionMutation,
+        {
+          input: {
+            expressionGroupId: expressionGroup.id,
+          },
+        },
+        ctx
+      );
+
+      await executeQuery(
+        updateExpressionGroupMutation,
+        {
+          input: {
+            id: expressionGroup.id,
+            operator: "And",
+          },
+        },
+        ctx
+      );
+
+      await executeQuery(
+        updateLeftSideMutation,
+        {
+          input: {
+            expressionId: expressions[0].id,
+            answerId: firstPage.answers[0].id,
+          },
+        },
+        ctx
+      );
+
+      await executeQuery(
+        updateLeftSideMutation,
+        {
+          input: {
+            expressionId: expressions[1].id,
+            answerId: firstPage.answers[1].id,
+          },
+        },
+        ctx
+      );
+
+      await executeQuery(
+        updateBinaryExpressionMutation,
+        {
+          input: {
+            id: expressions[0].id,
+            condition: "Equal",
+          },
+        },
+        ctx
+      );
+
+      await executeQuery(
+        updateRightSideMutation,
+        {
+          input: {
+            expressionId: expressions[0].id,
+            customValue: {
+              number: 5,
+            },
+          },
+        },
+        ctx
+      );
+
+      await executeQuery(
+        updateRightSideMutation,
+        {
+          input: {
+            expressionId: expressions[1].id,
+            selectedOptions: [firstPage.answers[1].options[0].id],
+          },
+        },
+        ctx
+      );
+
+      const result = await queryPage(ctx, firstPage.id);
+
+      const errors =
+        result.routing.rules[0].expressionGroup.validationErrorInfo.errors;
+      expect(errors).toHaveLength(2);
+      expect(errors[0].errorCode).toBe(ERR_LOGICAL_AND);
+      expect(errors[1].errorCode).toBe(ERR_LOGICAL_AND);
+    });
+
     it("does not have validation errors if there are none", async () => {
       config.sections[0].folders[0].pages[0].routing = {
         rules: [{ expressionGroup: {} }],

From 2583cbbc198ac906aaab04b3e46a4ca67b68b553 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Thu, 30 May 2024 10:42:12 +0100
Subject: [PATCH 081/215] Fix validation error displayed on non-conflicting
 answers when expression group has mutually exclusive answer from same page as
 another answer in expression group

---
 .../customKeywords/validateRoutingLogicalAND.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/eq-author-api/src/validation/customKeywords/validateRoutingLogicalAND.js b/eq-author-api/src/validation/customKeywords/validateRoutingLogicalAND.js
index ad3e66979f..aae8fde325 100644
--- a/eq-author-api/src/validation/customKeywords/validateRoutingLogicalAND.js
+++ b/eq-author-api/src/validation/customKeywords/validateRoutingLogicalAND.js
@@ -45,6 +45,7 @@ module.exports = (ajv) => {
         }
 
         const answer = getAnswerById({ questionnaire }, answerId);
+        const page = getPageByAnswerId({ questionnaire }, answerId);
         const expressionsContainMutuallyExclusive = allExpressions.some(
           (expression) =>
             getAnswerById({ questionnaire }, expression.left.answerId)?.type ===
@@ -57,6 +58,14 @@ module.exports = (ajv) => {
           (answerId) => getPageByAnswerId({ questionnaire }, answerId)?.id
         );
 
+        // Creates an array of all pageIds that are found in pageIdsForExpressionAnswers more than once - self represents the pageIdsForExpressionAnswers array itself
+        // If the index of the looped id is not equal to the looping index then the id is a duplicate
+        const duplicatePageIds = pageIdsForExpressionAnswers.filter(
+          (id, index, self) => {
+            return self.indexOf(id) !== index;
+          }
+        );
+
         // Set removes duplicate values from pageIdsForExpressionAnswers array - if the length of the array is different to the size of the set then the array contains duplicates
         const expressionsContainDuplicatePageIds =
           new Set(pageIdsForExpressionAnswers).size !==
@@ -67,7 +76,13 @@ module.exports = (ajv) => {
           expressionsContainMutuallyExclusive &&
           expressionsContainDuplicatePageIds
         ) {
-          return addError(answerId);
+          // Prevents the error being added to answers that are not on the same page as the mutually exclusive answer
+          if (
+            duplicatePageIds.includes(page.id) &&
+            page.answers.some((answer) => answer.type === MUTUALLY_EXCLUSIVE)
+          ) {
+            return addError(answerId);
+          }
         }
 
         // Bail out if answer isn't numerical or checkbox - remaining code validates number-type answers

From a4ee676f67b26fec5d744fd8e4d5ea09e94c181c Mon Sep 17 00:00:00 2001
From: sudeep <sudeep.kunhikannan@ons.gov.uk>
Date: Thu, 30 May 2024 10:58:07 +0100
Subject: [PATCH 082/215] refetched get page query

Signed-off-by: sudeep <sudeep.kunhikannan@ons.gov.uk>
---
 .../App/QuestionnaireDesignPage/NavigationSidebar/index.js    | 4 +++-
 .../src/App/page/Design/ListCollectorPageEditor/index.js      | 3 +++
 eq-author/src/App/page/Design/QuestionPageEditor/index.js     | 3 +++
 eq-author/src/App/page/Design/index.js                        | 4 ++++
 eq-author/src/graphql/movePage.graphql                        | 4 ++++
 5 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/eq-author/src/App/QuestionnaireDesignPage/NavigationSidebar/index.js b/eq-author/src/App/QuestionnaireDesignPage/NavigationSidebar/index.js
index f23738fe7e..443438faac 100644
--- a/eq-author/src/App/QuestionnaireDesignPage/NavigationSidebar/index.js
+++ b/eq-author/src/App/QuestionnaireDesignPage/NavigationSidebar/index.js
@@ -110,7 +110,9 @@ const NavigationSidebar = ({ questionnaire }) => {
   const [openSections, toggleSections] = useState(true);
   const [entity, setEntity] = useState({}); // Allows data for entity being dragged by user to be used in other droppables
 
-  const [movePage] = useMutation(MOVE_PAGE_MUTATION);
+  const [movePage] = useMutation(MOVE_PAGE_MUTATION, {
+    refetchQueries: ["GetPage"],
+  });
   const [moveFolder] = useMutation(MOVE_FOLDER_MUTATION);
   const [moveSection] = useMutation(MOVE_SECTION_MUTATION);
 
diff --git a/eq-author/src/App/page/Design/ListCollectorPageEditor/index.js b/eq-author/src/App/page/Design/ListCollectorPageEditor/index.js
index cc6f0b8517..02269d5968 100644
--- a/eq-author/src/App/page/Design/ListCollectorPageEditor/index.js
+++ b/eq-author/src/App/page/Design/ListCollectorPageEditor/index.js
@@ -782,6 +782,9 @@ UnwrappedListCollectorPageEditor.fragments = {
       folder {
         id
         position
+        ... on ListCollectorFolder {
+          listId
+        }
       }
       section {
         id
diff --git a/eq-author/src/App/page/Design/QuestionPageEditor/index.js b/eq-author/src/App/page/Design/QuestionPageEditor/index.js
index 2b95e35d54..6445575678 100644
--- a/eq-author/src/App/page/Design/QuestionPageEditor/index.js
+++ b/eq-author/src/App/page/Design/QuestionPageEditor/index.js
@@ -239,6 +239,9 @@ UnwrappedQuestionPageEditor.fragments = {
       folder {
         id
         position
+        ... on ListCollectorFolder {
+          listId
+        }
       }
       section {
         id
diff --git a/eq-author/src/App/page/Design/index.js b/eq-author/src/App/page/Design/index.js
index bb7a561239..094091a084 100644
--- a/eq-author/src/App/page/Design/index.js
+++ b/eq-author/src/App/page/Design/index.js
@@ -63,6 +63,10 @@ export const PAGE_QUERY = gql`
           listId
         }
       }
+      section {
+        id
+        repeatingSectionListId
+      }
     }
   }
   ${CalculatedSummaryPageEditor.fragments.CalculatedSummaryPage}
diff --git a/eq-author/src/graphql/movePage.graphql b/eq-author/src/graphql/movePage.graphql
index d5b38de94a..f8f02b160a 100644
--- a/eq-author/src/graphql/movePage.graphql
+++ b/eq-author/src/graphql/movePage.graphql
@@ -49,6 +49,10 @@ mutation MovePage($input: MovePageInput!) {
               listId
             }
           }
+          section {
+            id
+            repeatingSectionListId
+          }
           ... on QuestionPage {
             answers {
               ...Answer

From 357ce3a4c8eed6f6672d58571c160b0a93ace552 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Thu, 30 May 2024 11:04:27 +0100
Subject: [PATCH 083/215] Replace value to check if expression contains
 duplicate pageIds

---
 .../customKeywords/validateRoutingLogicalAND.js          | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/eq-author-api/src/validation/customKeywords/validateRoutingLogicalAND.js b/eq-author-api/src/validation/customKeywords/validateRoutingLogicalAND.js
index aae8fde325..a8986139f5 100644
--- a/eq-author-api/src/validation/customKeywords/validateRoutingLogicalAND.js
+++ b/eq-author-api/src/validation/customKeywords/validateRoutingLogicalAND.js
@@ -66,15 +66,10 @@ module.exports = (ajv) => {
           }
         );
 
-        // Set removes duplicate values from pageIdsForExpressionAnswers array - if the length of the array is different to the size of the set then the array contains duplicates
-        const expressionsContainDuplicatePageIds =
-          new Set(pageIdsForExpressionAnswers).size !==
-          pageIdsForExpressionAnswers.length;
-
-        // If any of the expressions contain a mutually exclusive answer and there are multiple answers from the same page then add an error
+        // If any of the expressions contain a mutually exclusive answer and there are multiple answers from the same page
         if (
           expressionsContainMutuallyExclusive &&
-          expressionsContainDuplicatePageIds
+          duplicatePageIds.length > 0
         ) {
           // Prevents the error being added to answers that are not on the same page as the mutually exclusive answer
           if (

From 3443deffdbd632bf81492069d6457c7027257d86 Mon Sep 17 00:00:00 2001
From: Paul-Joel <paul.joel@ons.gov.uk>
Date: Fri, 31 May 2024 11:47:46 +0100
Subject: [PATCH 084/215] Add sanitize function

---
 .../src/components/RichTextEditor/index.js    | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/eq-author/src/components/RichTextEditor/index.js b/eq-author/src/components/RichTextEditor/index.js
index dc3795d5a5..7196cab542 100644
--- a/eq-author/src/components/RichTextEditor/index.js
+++ b/eq-author/src/components/RichTextEditor/index.js
@@ -438,9 +438,33 @@ class RichTextEditor extends React.Component {
     let newEditorState;
     let processedText = text;
 
+    // Simple HTML sanitization function
+    const sanitizeHtml = (html) => {
+      const doc = new DOMParser().parseFromString(html, "text/html");
+      return doc.body.innerHTML;
+    };
+
+    // Sanitize the input HTML
+    const sanitizedHtml = sanitizeHtml(processedText);
+
     if (multiline) {
       // Process the text to remove multiple spaces
-      processedText = processedText.replace(/\s{2,}/g, " ").trim();
+      const div = document.createElement("div");
+      div.innerHTML = sanitizedHtml;
+      const walker = document.createTreeWalker(
+        div,
+        NodeFilter.SHOW_TEXT,
+        null,
+        false
+      );
+      while (walker.nextNode()) {
+        walker.currentNode.nodeValue = walker.currentNode.nodeValue.replace(
+          /\s{2,}/g,
+          " "
+        );
+      }
+      processedText = div.innerHTML;
+
       // Convert processed text from HTML to ContentState
       const contentState = stateFromHTML(processedText);
       const fragment = contentState.getBlockMap();

From ec453ec433be9406b1a4bbdfb1df620d523c54dd Mon Sep 17 00:00:00 2001
From: Paul-Joel <paul.joel@ons.gov.uk>
Date: Fri, 31 May 2024 12:57:06 +0100
Subject: [PATCH 085/215] Tweak to ensure 2 spces are replaced from Word

---
 eq-author/src/components/RichTextEditor/index.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/eq-author/src/components/RichTextEditor/index.js b/eq-author/src/components/RichTextEditor/index.js
index 7196cab542..793537ab11 100644
--- a/eq-author/src/components/RichTextEditor/index.js
+++ b/eq-author/src/components/RichTextEditor/index.js
@@ -458,10 +458,9 @@ class RichTextEditor extends React.Component {
         false
       );
       while (walker.nextNode()) {
-        walker.currentNode.nodeValue = walker.currentNode.nodeValue.replace(
-          /\s{2,}/g,
-          " "
-        );
+        walker.currentNode.nodeValue = walker.currentNode.nodeValue
+          .replace(/\s{2,}/g, " ")
+          .replace(/  /g, " ");
       }
       processedText = div.innerHTML;
 
@@ -484,9 +483,10 @@ class RichTextEditor extends React.Component {
       );
     } else {
       // For single line pastes, replace multiple spaces with a single space
-      processedText = processedText
+      processedText = sanitizedHtml
         .replace(/\n/g, " ")
         .replace(/\s+/g, " ")
+        .replace(/  /g, " ")
         .trim();
       const contentState = stateFromHTML(processedText);
       const fragment = contentState.getBlockMap();

From e68269ebebc7dc70e7779586e30f686be04ab1db Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Fri, 31 May 2024 17:02:12 +0100
Subject: [PATCH 086/215] Display question page title when calculated summary
 page uses multiple answers from the same page

---
 .../page/Preview/CalculatedSummaryPreview.js  | 85 ++++++++++++-------
 1 file changed, 52 insertions(+), 33 deletions(-)

diff --git a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
index 6836aaf36f..77ddc3fa0c 100644
--- a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
+++ b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
@@ -16,7 +16,6 @@ import CalculatedSummaryPageEditor from "../Design/CalculatedSummaryPageEditor";
 import { useSetNavigationCallbacksForPage } from "components/NavigationCallbacks";
 import { getPageByAnswerId } from "utils/questionnaireUtils";
 import { useQuestionnaire } from "components/QuestionnaireContext";
-import Answers from "../Design/CalculatedSummaryPageEditor/AnswerSelector/Answers";
 
 const Container = styled.div`
   padding: 2em;
@@ -93,26 +92,30 @@ const SummaryTotalLabel = styled.div`
 `;
 
 const CalculatedSummaryPagePreview = ({ page }) => {
+  const { questionnaire } = useQuestionnaire();
   useSetNavigationCallbacksForPage({
     page: page,
     folder: page?.folder,
     section: page?.section,
   });
 
-  const { questionnaire } = useQuestionnaire();
-  const uniqueTitles = new Set();
-
-  const titles = page.summaryAnswers.map((answer) => {
-    const pages = getPageByAnswerId(questionnaire, answer.id);
-    if (pages) {
-      const title = pages.title.replace(/<[^>]*>/g, "");
-      if (!uniqueTitles.has(title)) {
-        uniqueTitles.add(title);
-        return title;
-      }
-    }
-    return null;
-  });
+  const usedPageIds = [];
+
+  const getDuplicatedPageIds = () => {
+    const allPageIds = [];
+
+    page.summaryAnswers.forEach((summaryAnswer) => {
+      const summaryAnswerPage = getPageByAnswerId(
+        questionnaire,
+        summaryAnswer.id
+      );
+      allPageIds.push(summaryAnswerPage?.id);
+    });
+
+    return allPageIds.filter(
+      (pageId, index) => allPageIds.indexOf(pageId) !== index
+    );
+  };
 
   return (
     <EditorLayout
@@ -131,24 +134,40 @@ const CalculatedSummaryPagePreview = ({ page }) => {
 
           {page.summaryAnswers.length > 0 ? (
             <Summary>
-              <div>{titles}</div>
-              {page.summaryAnswers.map((answer) => (
-                <SummaryItem key={answer.id}>
-                  <Grid>
-                    <Column cols={7}>
-                      <SummaryLabel data-test="answer-item">
-                        {answer.displayName}
-                      </SummaryLabel>
-                    </Column>
-                    <Column cols={3}>
-                      <SummaryValue>Value</SummaryValue>
-                    </Column>
-                    <Column cols={2}>
-                      <SummaryLink>Change</SummaryLink>
-                    </Column>
-                  </Grid>
-                </SummaryItem>
-              ))}
+              {page.summaryAnswers.map((answer) => {
+                const answerPage = getPageByAnswerId(questionnaire, answer.id);
+                const hasAnswerPageIdBeenUsed = usedPageIds.includes(
+                  answerPage?.id
+                );
+                if (!hasAnswerPageIdBeenUsed) {
+                  usedPageIds.push(answerPage?.id);
+                }
+
+                const duplicatedPageIds = getDuplicatedPageIds();
+
+                return (
+                  <>
+                    {!hasAnswerPageIdBeenUsed &&
+                      duplicatedPageIds.includes(answerPage?.id) &&
+                      answerPage?.title.replace(/<p>|<\/p>/g, "")}
+                    <SummaryItem key={answer.id}>
+                      <Grid>
+                        <Column cols={7}>
+                          <SummaryLabel data-test="answer-item">
+                            {answer.displayName}
+                          </SummaryLabel>
+                        </Column>
+                        <Column cols={3}>
+                          <SummaryValue>Value</SummaryValue>
+                        </Column>
+                        <Column cols={2}>
+                          <SummaryLink>Change</SummaryLink>
+                        </Column>
+                      </Grid>
+                    </SummaryItem>
+                  </>
+                );
+              })}
 
               {page.totalTitle ? (
                 <SummaryTotal>

From 564654955bdab1f70ebe951cd58eae6a1b77e223 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Mon, 3 Jun 2024 09:06:07 +0100
Subject: [PATCH 087/215] Fix duplicated content not displayed before refresh

---
 eq-author/src/graphql/fragments/answer.graphql | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eq-author/src/graphql/fragments/answer.graphql b/eq-author/src/graphql/fragments/answer.graphql
index 4cef7afb26..311582ad46 100644
--- a/eq-author/src/graphql/fragments/answer.graphql
+++ b/eq-author/src/graphql/fragments/answer.graphql
@@ -10,4 +10,7 @@ fragment Answer on Answer {
   displayName
   qCode
   advancedProperties
+  page {
+    id
+  }
 }

From fa5d2f28a0438e013be035de477049fd4dccadd6 Mon Sep 17 00:00:00 2001
From: Paul-Joel <paul.joel@ons.gov.uk>
Date: Mon, 3 Jun 2024 10:29:47 +0100
Subject: [PATCH 088/215] Update to s+

---
 eq-author/src/components/RichTextEditor/index.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/eq-author/src/components/RichTextEditor/index.js b/eq-author/src/components/RichTextEditor/index.js
index 793537ab11..ff62438798 100644
--- a/eq-author/src/components/RichTextEditor/index.js
+++ b/eq-author/src/components/RichTextEditor/index.js
@@ -458,9 +458,10 @@ class RichTextEditor extends React.Component {
         false
       );
       while (walker.nextNode()) {
-        walker.currentNode.nodeValue = walker.currentNode.nodeValue
-          .replace(/\s{2,}/g, " ")
-          .replace(/  /g, " ");
+        walker.currentNode.nodeValue = walker.currentNode.nodeValue.replace(
+          /\s+/g,
+          " "
+        );
       }
       processedText = div.innerHTML;
 
@@ -483,10 +484,9 @@ class RichTextEditor extends React.Component {
       );
     } else {
       // For single line pastes, replace multiple spaces with a single space
-      processedText = sanitizedHtml
+      processedText = processedText
         .replace(/\n/g, " ")
         .replace(/\s+/g, " ")
-        .replace(/  /g, " ")
         .trim();
       const contentState = stateFromHTML(processedText);
       const fragment = contentState.getBlockMap();

From 41986b102179e51a703db24797fd1b71d6b245cf Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Mon, 3 Jun 2024 13:16:37 +0100
Subject: [PATCH 089/215] Fix bug preventing switching answer to another answer
 in the same page

---
 .../RoutingAnswerContentPicker.js             |  5 +-
 eq-author/src/utils/getContentBeforeEntity.js | 69 +++++++++++++++----
 2 files changed, 59 insertions(+), 15 deletions(-)

diff --git a/eq-author/src/App/page/Logic/BinaryExpressionEditor/RoutingAnswerContentPicker.js b/eq-author/src/App/page/Logic/BinaryExpressionEditor/RoutingAnswerContentPicker.js
index e2d272d970..f7b7a6240a 100644
--- a/eq-author/src/App/page/Logic/BinaryExpressionEditor/RoutingAnswerContentPicker.js
+++ b/eq-author/src/App/page/Logic/BinaryExpressionEditor/RoutingAnswerContentPicker.js
@@ -27,6 +27,7 @@ const RoutingAnswerContentPicker = ({
   includeSelf,
   selectedContentDisplayName,
   expressionGroup,
+  selectedId,
   ...otherProps
 }) => {
   const { questionnaire } = useQuestionnaire();
@@ -40,8 +41,9 @@ const RoutingAnswerContentPicker = ({
         includeTargetPage: includeSelf,
         preprocessAnswers,
         expressionGroup,
+        selectedId,
       }),
-    [questionnaire, pageId, includeSelf, expressionGroup]
+    [questionnaire, pageId, includeSelf, expressionGroup, selectedId]
   );
 
   const filteredPreviousAnswers = previousAnswers.map((answer) => {
@@ -80,6 +82,7 @@ RoutingAnswerContentPicker.propTypes = {
     PropTypes.object,
     PropTypes.string,
   ]),
+  selectedId: PropTypes.string,
   expressionGroup: PropTypes.object, //eslint-disable-line
 };
 
diff --git a/eq-author/src/utils/getContentBeforeEntity.js b/eq-author/src/utils/getContentBeforeEntity.js
index 7244beabd6..02ebd974ba 100644
--- a/eq-author/src/utils/getContentBeforeEntity.js
+++ b/eq-author/src/utils/getContentBeforeEntity.js
@@ -1,6 +1,7 @@
 import { remove } from "lodash";
 
 import isListCollectorPageType from "utils/isListCollectorPageType";
+import { getPageByAnswerId } from "utils/questionnaireUtils";
 
 import { MUTUALLY_EXCLUSIVE } from "constants/answer-types";
 
@@ -11,9 +12,11 @@ const getContentBeforeEntity = (
   id,
   preprocessAnswers,
   includeTarget,
-  expressionGroup
+  expressionGroup,
+  selectedId
 ) => {
   const sections = [];
+  const selectedAnswerPageId = getPageByAnswerId(questionnaire, selectedId)?.id;
 
   for (const section of questionnaire.sections) {
     if (section.id === id) {
@@ -52,20 +55,50 @@ const getContentBeforeEntity = (
         if (expressionGroup?.operator === "And") {
           expressionGroup.expressions.forEach((expression) => {
             if (expression?.left?.page?.id) {
-              answers = answers.filter((answer) => {
-                // If the expression's left side answer is on the same page as the looped answer
-                if (expression.left.page.id === answer.page.id) {
-                  // If the expression's left side answer is mutually exclusive, do not include the looped answer (as looped answer and expression answer are on the same page)
-                  if (expression.left.type === MUTUALLY_EXCLUSIVE) {
-                    return false;
+              // Filters answers if the expression's left side page is not the selected answer's page - allows selection of answers on the same page as the selected answer
+              if (expression.left.page.id !== selectedAnswerPageId) {
+                answers = answers.filter((answer) => {
+                  // If the expression's left side answer is on the same page as the looped answer
+                  if (expression.left.page.id === answer.page.id) {
+                    // If the expression's left side answer is mutually exclusive, do not include the looped answer (as looped answer and expression answer are on the same page)
+                    if (expression.left.type === MUTUALLY_EXCLUSIVE) {
+                      return false;
+                    }
+                    // If the expression's left side answer is not mutually exclusive, only include the looped answer if it is also not mutually exclusive (as looped answer and expression answer are on the same page)
+                    else {
+                      return answer.type !== MUTUALLY_EXCLUSIVE;
+                    }
                   }
-                  // If the expression's left side answer is not mutually exclusive, only include the looped answer if it is also not mutually exclusive (as looped answer and expression answer are on the same page)
-                  else {
-                    return answer.type !== MUTUALLY_EXCLUSIVE;
+                  return true;
+                });
+              }
+              // Filters answers if the expression's left side page matches the selected answer's page - allows selection of answers on the same page as the selected answer
+              else {
+                // Gets all expressions using answers from the same page as the selected answer
+                const expressionsFromSamePage =
+                  expressionGroup.expressions.filter(
+                    (expression) =>
+                      expression?.left?.page?.id === selectedAnswerPageId
+                  );
+
+                /* 
+                Checks if the expression group includes more than one expression using the selected answer's page 
+                (to allow selection of answers on the same page as the selected answer when it is the only expression using the selected answer's page) 
+                */
+                const expressionGroupIncludesExpressionFromSamePage =
+                  expressionsFromSamePage.length > 1; // Checks length to see if there is more than one expression in the expression group using the selected answer's page
+
+                // Filters out answers on the same page as the selected answer if the expression group includes more than one expression using the selected answer's page
+                answers = answers.filter((answer) => {
+                  if (
+                    answer.page.id === selectedAnswerPageId &&
+                    expressionGroupIncludesExpressionFromSamePage
+                  ) {
+                    return false;
                   }
-                }
-                return true;
-              });
+                  return true;
+                });
+              }
             }
           });
         }
@@ -100,12 +133,19 @@ export const stripEmpty = (sections) => {
   return sections;
 };
 
+// const expressionGroupHasAnswerFromSamePage = (expressionGroup, pageId) => {
+//   expressionGroup.expressions.forEach((expression) =>
+//     console.log("expression", expression)
+//   );
+// };
+
 export default ({
   questionnaire,
   id,
   preprocessAnswers = identity,
   includeTargetPage = false,
   expressionGroup,
+  selectedId,
 } = {}) => {
   if (!questionnaire || !id || questionnaire?.introduction?.id === id) {
     return [];
@@ -117,7 +157,8 @@ export default ({
       id,
       preprocessAnswers,
       includeTargetPage,
-      expressionGroup
+      expressionGroup,
+      selectedId
     ).filter(({ folders }) => folders.length)
   );
 };

From 7c5f9c5fe3faf85607574c541f75e9ea4a9076ac Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Mon, 3 Jun 2024 14:15:56 +0100
Subject: [PATCH 090/215] Add tests for selecting answers on same page as
 selected answer in expression

---
 eq-author/src/utils/getContentBeforeEntity.js |  21 +--
 .../src/utils/getContentBeforeEntity.test.js  | 171 +++++++++++++++++-
 2 files changed, 176 insertions(+), 16 deletions(-)

diff --git a/eq-author/src/utils/getContentBeforeEntity.js b/eq-author/src/utils/getContentBeforeEntity.js
index 02ebd974ba..f623ed053b 100644
--- a/eq-author/src/utils/getContentBeforeEntity.js
+++ b/eq-author/src/utils/getContentBeforeEntity.js
@@ -16,7 +16,7 @@ const getContentBeforeEntity = (
   selectedId
 ) => {
   const sections = [];
-  const selectedAnswerPageId = getPageByAnswerId(questionnaire, selectedId)?.id;
+  const selectedAnswerPage = getPageByAnswerId(questionnaire, selectedId);
 
   for (const section of questionnaire.sections) {
     if (section.id === id) {
@@ -56,7 +56,7 @@ const getContentBeforeEntity = (
           expressionGroup.expressions.forEach((expression) => {
             if (expression?.left?.page?.id) {
               // Filters answers if the expression's left side page is not the selected answer's page - allows selection of answers on the same page as the selected answer
-              if (expression.left.page.id !== selectedAnswerPageId) {
+              if (expression.left.page.id !== selectedAnswerPage?.id) {
                 answers = answers.filter((answer) => {
                   // If the expression's left side answer is on the same page as the looped answer
                   if (expression.left.page.id === answer.page.id) {
@@ -78,7 +78,7 @@ const getContentBeforeEntity = (
                 const expressionsFromSamePage =
                   expressionGroup.expressions.filter(
                     (expression) =>
-                      expression?.left?.page?.id === selectedAnswerPageId
+                      expression?.left?.page?.id === selectedAnswerPage?.id
                   );
 
                 /* 
@@ -88,11 +88,14 @@ const getContentBeforeEntity = (
                 const expressionGroupIncludesExpressionFromSamePage =
                   expressionsFromSamePage.length > 1; // Checks length to see if there is more than one expression in the expression group using the selected answer's page
 
-                // Filters out answers on the same page as the selected answer if the expression group includes more than one expression using the selected answer's page
+                // Filters out answers on the same page as the selected answer if the expression group includes more than one expression using the selected answer's page and the selected answer's page includes a mutually exclusive answer
                 answers = answers.filter((answer) => {
                   if (
-                    answer.page.id === selectedAnswerPageId &&
-                    expressionGroupIncludesExpressionFromSamePage
+                    answer.page.id === selectedAnswerPage?.id &&
+                    expressionGroupIncludesExpressionFromSamePage &&
+                    selectedAnswerPage?.answers.some(
+                      (answer) => answer.type === MUTUALLY_EXCLUSIVE
+                    )
                   ) {
                     return false;
                   }
@@ -133,12 +136,6 @@ export const stripEmpty = (sections) => {
   return sections;
 };
 
-// const expressionGroupHasAnswerFromSamePage = (expressionGroup, pageId) => {
-//   expressionGroup.expressions.forEach((expression) =>
-//     console.log("expression", expression)
-//   );
-// };
-
 export default ({
   questionnaire,
   id,
diff --git a/eq-author/src/utils/getContentBeforeEntity.test.js b/eq-author/src/utils/getContentBeforeEntity.test.js
index dc3f6856d6..21c93d32f9 100644
--- a/eq-author/src/utils/getContentBeforeEntity.test.js
+++ b/eq-author/src/utils/getContentBeforeEntity.test.js
@@ -4,7 +4,7 @@ import {
 } from "tests/utils/createMockQuestionnaire";
 import getPreviousContent from "./getContentBeforeEntity";
 
-import { MUTUALLY_EXCLUSIVE } from "constants/answer-types";
+import { MUTUALLY_EXCLUSIVE, NUMBER } from "constants/answer-types";
 
 let questionnaire = buildQuestionnaire({
   sectionCount: 2,
@@ -49,7 +49,8 @@ describe("utils/getPreviousAnswers", () => {
         expressions: [
           {
             left: {
-              id: questionnaire.sections[1].folders[0].pages[0].answers[0].id,
+              answerId:
+                questionnaire.sections[1].folders[0].pages[0].answers[0].id,
               page: {
                 id: questionnaire.sections[1].folders[0].pages[0].id,
               },
@@ -94,7 +95,8 @@ describe("utils/getPreviousAnswers", () => {
         expressions: [
           {
             left: {
-              id: questionnaire.sections[1].folders[0].pages[1].answers[0].id,
+              answerId:
+                questionnaire.sections[1].folders[0].pages[1].answers[0].id,
               page: {
                 id: questionnaire.sections[1].folders[0].pages[1].id,
               },
@@ -143,7 +145,8 @@ describe("utils/getPreviousAnswers", () => {
         expressions: [
           {
             left: {
-              id: questionnaire.sections[1].folders[0].pages[1].answers[1].id,
+              answerId:
+                questionnaire.sections[1].folders[0].pages[1].answers[1].id,
               type: MUTUALLY_EXCLUSIVE,
               page: {
                 id: questionnaire.sections[1].folders[0].pages[1].id,
@@ -169,6 +172,166 @@ describe("utils/getPreviousAnswers", () => {
     );
   });
 
+  it("should allow selection of answers on the same page as the selected answer when it is the only expression using the selected answer's page", () => {
+    questionnaire.sections[1].folders[0].pages[1].answers[1].type =
+      MUTUALLY_EXCLUSIVE;
+
+    const previousContent = getPreviousContent({
+      questionnaire,
+      id: questionnaire.sections[1].folders[0].pages[1].id,
+      includeTargetPage: true,
+      expressionGroup: {
+        operator: "And",
+        expressions: [
+          {
+            left: {
+              answerId:
+                questionnaire.sections[1].folders[0].pages[1].answers[0].id,
+              page: {
+                id: questionnaire.sections[1].folders[0].pages[1].id,
+              },
+            },
+          },
+          {
+            left: {
+              answerId:
+                questionnaire.sections[1].folders[0].pages[0].answers[0].id,
+              page: {
+                id: questionnaire.sections[1].folders[0].pages[0].id,
+              },
+            },
+          },
+        ],
+      },
+      selectedId: questionnaire.sections[1].folders[0].pages[1].answers[0].id,
+    });
+
+    expect(previousContent).toHaveLength(2);
+
+    // Tests previousContent[0] matches the questionnaire's first section
+    expect(previousContent[0]).toMatchObject(questionnaire.sections[0]);
+
+    // Tests previousContent[1]'s first folder has two pages
+    expect(previousContent[1].folders[0].pages).toHaveLength(2);
+    // Tests previousContent[1]'s first folder's first page has two answers
+    expect(previousContent[1].folders[0].pages[0].answers).toHaveLength(2);
+    // Tests previousContent[1]'s first folder's first page matches the questionnaire's second section's first folder's first page
+    expect(previousContent[1].folders[0].pages[0]).toMatchObject(
+      questionnaire.sections[1].folders[0].pages[0]
+    );
+
+    // Tests previousContent[1]'s first folder's second page has two answers
+    expect(previousContent[1].folders[0].pages[1].answers).toHaveLength(2);
+    // Tests previousContent[1]'s first folder's second page matches the questionnaire's second section's first folder's second page
+    expect(previousContent[1].folders[0].pages[1]).toMatchObject(
+      questionnaire.sections[1].folders[0].pages[1]
+    );
+  });
+
+  it("should not allow selection of answers on the same page as the selected answer when other expressions in expression group use the selected answer's page and selected answer's page includes a mutually exclusive answer", () => {
+    questionnaire.sections[1].folders[0].pages[1].answers[1].type =
+      MUTUALLY_EXCLUSIVE;
+
+    const previousContent = getPreviousContent({
+      questionnaire,
+      id: questionnaire.sections[1].folders[0].pages[1].id,
+      includeTargetPage: true,
+      expressionGroup: {
+        operator: "And",
+        expressions: [
+          {
+            left: {
+              answerId:
+                questionnaire.sections[1].folders[0].pages[1].answers[0].id,
+              page: {
+                id: questionnaire.sections[1].folders[0].pages[1].id,
+              },
+            },
+          },
+          {
+            left: {
+              answerId:
+                questionnaire.sections[1].folders[0].pages[1].answers[1].id,
+              page: {
+                id: questionnaire.sections[1].folders[0].pages[1].id,
+              },
+            },
+          },
+        ],
+      },
+      selectedId: questionnaire.sections[1].folders[0].pages[1].answers[1].id,
+    });
+
+    expect(previousContent).toHaveLength(2);
+
+    // Tests previousContent[0] matches the questionnaire's first section
+    expect(previousContent[0]).toMatchObject(questionnaire.sections[0]);
+
+    // Tests previousContent[1]'s first folder has one page (the second page has been removed as another expression is using an answer from the same page)
+    expect(previousContent[1].folders[0].pages).toHaveLength(1);
+    // Tests previousContent[1]'s first folder's first page has two answers
+    expect(previousContent[1].folders[0].pages[0].answers).toHaveLength(2);
+    // Tests previousContent[1]'s first folder's first page matches the questionnaire's second section's first folder's first page
+    expect(previousContent[1].folders[0].pages[0]).toMatchObject(
+      questionnaire.sections[1].folders[0].pages[0]
+    );
+  });
+
+  it("should allow selection of answers on the same page as the selected answer when other expressions in expression group use the selected answer's page and selected answer's page does not include a mutually exclusive answer", () => {
+    questionnaire.sections[1].folders[0].pages[1].answers[1].type = NUMBER;
+
+    const previousContent = getPreviousContent({
+      questionnaire,
+      id: questionnaire.sections[1].folders[0].pages[1].id,
+      includeTargetPage: true,
+      expressionGroup: {
+        operator: "And",
+        expressions: [
+          {
+            left: {
+              answerId:
+                questionnaire.sections[1].folders[0].pages[1].answers[0].id,
+              page: {
+                id: questionnaire.sections[1].folders[0].pages[1].id,
+              },
+            },
+          },
+          {
+            left: {
+              answerId:
+                questionnaire.sections[1].folders[0].pages[1].answers[1].id,
+              page: {
+                id: questionnaire.sections[1].folders[0].pages[1].id,
+              },
+            },
+          },
+        ],
+      },
+      selectedId: questionnaire.sections[1].folders[0].pages[1].answers[1].id,
+    });
+
+    expect(previousContent).toHaveLength(2);
+
+    // Tests previousContent[0] matches the questionnaire's first section
+    expect(previousContent[0]).toMatchObject(questionnaire.sections[0]);
+
+    // Tests previousContent[1]'s first folder has two pages
+    expect(previousContent[1].folders[0].pages).toHaveLength(2);
+    // Tests previousContent[1]'s first folder's first page has two answers
+    expect(previousContent[1].folders[0].pages[0].answers).toHaveLength(2);
+    // Tests previousContent[1]'s first folder's first page matches the questionnaire's second section's first folder's first page
+    expect(previousContent[1].folders[0].pages[0]).toMatchObject(
+      questionnaire.sections[1].folders[0].pages[0]
+    );
+
+    // Tests previousContent[1]'s first folder's second page has two answers
+    expect(previousContent[1].folders[0].pages[1].answers).toHaveLength(2);
+    // Tests previousContent[1]'s first folder's second page matches the questionnaire's second section's first folder's second page
+    expect(previousContent[1].folders[0].pages[1]).toMatchObject(
+      questionnaire.sections[1].folders[0].pages[1]
+    );
+  });
+
   it("should return empty array on questionnaire introduction page", () => {
     const previousSections = getPreviousContent({
       questionnaire,

From 8b9ff700b80594c4f0c3c3450ebb8c63fc7529da Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Tue, 4 Jun 2024 13:12:12 +0100
Subject: [PATCH 091/215] Sort answers used in calculated summary pages to
 follow the correct page and answer order

---
 .../page/Preview/CalculatedSummaryPreview.js  | 49 +++++++++++++++++--
 1 file changed, 46 insertions(+), 3 deletions(-)

diff --git a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
index 77ddc3fa0c..20c031b692 100644
--- a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
+++ b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
@@ -101,10 +101,53 @@ const CalculatedSummaryPagePreview = ({ page }) => {
 
   const usedPageIds = [];
 
+  const getAnswerIndexInPage = (answer) => {
+    const page = getPageByAnswerId(questionnaire, answer.id);
+
+    // Finds the index of the answer argument within its page
+    return page?.answers?.findIndex(
+      (pageAnswer) => pageAnswer.id === answer.id
+    );
+  };
+
+  /* 
+  Sorts summaryAnswers by page and answers (keeps pages in the order they appear in summaryAnswers, and sorts answers by their order in their page)
+  Ensures answers are always displayed underneath their page, and in the order they appear in the page
+  .slice() creates a copy of page.summaryAnswers to prevent mutating the original page.summaryAnswers array
+  */
+  const sortedSummaryAnswers = page.summaryAnswers.slice().sort((a, b) => {
+    const pageContainingAnswerA = getPageByAnswerId(questionnaire, a.id);
+    const pageContainingAnswerB = getPageByAnswerId(questionnaire, b.id);
+
+    // If the answers are on the same page, sort the answers in the order they appear in the page
+    if (pageContainingAnswerA?.id === pageContainingAnswerB?.id) {
+      return getAnswerIndexInPage(a) - getAnswerIndexInPage(b);
+    }
+
+    // Gets the first answer from page A that appears in summaryAnswers
+    const firstAnswerFromPageA = page.summaryAnswers.find(
+      (answer) =>
+        getPageByAnswerId(questionnaire, answer.id)?.id ===
+        pageContainingAnswerA?.id
+    );
+    // Gets the first answer from page B that appears in summaryAnswers
+    const firstAnswerFromPageB = page.summaryAnswers.find(
+      (answer) =>
+        getPageByAnswerId(questionnaire, answer.id)?.id ===
+        pageContainingAnswerB?.id
+    );
+
+    // Sorts answers based on the order of their pages in summaryAnswers (keeps pages in the order they appear in summaryAnswers)
+    return (
+      page.summaryAnswers.indexOf(firstAnswerFromPageA) -
+      page.summaryAnswers.indexOf(firstAnswerFromPageB)
+    );
+  });
+
   const getDuplicatedPageIds = () => {
     const allPageIds = [];
 
-    page.summaryAnswers.forEach((summaryAnswer) => {
+    sortedSummaryAnswers.forEach((summaryAnswer) => {
       const summaryAnswerPage = getPageByAnswerId(
         questionnaire,
         summaryAnswer.id
@@ -132,9 +175,9 @@ const CalculatedSummaryPagePreview = ({ page }) => {
         <Container>
           <PageTitle title={page.title} />
 
-          {page.summaryAnswers.length > 0 ? (
+          {sortedSummaryAnswers.length > 0 ? (
             <Summary>
-              {page.summaryAnswers.map((answer) => {
+              {sortedSummaryAnswers.map((answer) => {
                 const answerPage = getPageByAnswerId(questionnaire, answer.id);
                 const hasAnswerPageIdBeenUsed = usedPageIds.includes(
                   answerPage?.id

From 868f97b2d81b9d7936deb969937b024f7b2a99da Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Tue, 4 Jun 2024 15:37:06 +0100
Subject: [PATCH 092/215] Fix validation error displayed when expression group
 contains a mutually exclusive answer from a different page

---
 .../validateRoutingLogicalAND.js              | 50 +++++++++++--------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/eq-author-api/src/validation/customKeywords/validateRoutingLogicalAND.js b/eq-author-api/src/validation/customKeywords/validateRoutingLogicalAND.js
index a8986139f5..1d639de540 100644
--- a/eq-author-api/src/validation/customKeywords/validateRoutingLogicalAND.js
+++ b/eq-author-api/src/validation/customKeywords/validateRoutingLogicalAND.js
@@ -46,11 +46,6 @@ module.exports = (ajv) => {
 
         const answer = getAnswerById({ questionnaire }, answerId);
         const page = getPageByAnswerId({ questionnaire }, answerId);
-        const expressionsContainMutuallyExclusive = allExpressions.some(
-          (expression) =>
-            getAnswerById({ questionnaire }, expression.left.answerId)?.type ===
-            MUTUALLY_EXCLUSIVE
-        );
         const allExpressionAnswerIds = allExpressions.map(
           (expression) => expression.left.answerId
         );
@@ -58,28 +53,41 @@ module.exports = (ajv) => {
           (answerId) => getPageByAnswerId({ questionnaire }, answerId)?.id
         );
 
-        // Creates an array of all pageIds that are found in pageIdsForExpressionAnswers more than once - self represents the pageIdsForExpressionAnswers array itself
-        // If the index of the looped id is not equal to the looping index then the id is a duplicate
-        const duplicatePageIds = pageIdsForExpressionAnswers.filter(
-          (id, index, self) => {
-            return self.indexOf(id) !== index;
+        /*
+        Creates an array of all pageIds that are found in pageIdsForExpressionAnswers more than once
+        If the index of the looped id is not equal to the looping index then the id is a duplicate
+        */
+        const duplicatedPageIds = pageIdsForExpressionAnswers.filter(
+          (id, index) => {
+            return pageIdsForExpressionAnswers.indexOf(id) !== index;
           }
         );
 
-        // If any of the expressions contain a mutually exclusive answer and there are multiple answers from the same page
-        if (
-          expressionsContainMutuallyExclusive &&
-          duplicatePageIds.length > 0
-        ) {
-          // Prevents the error being added to answers that are not on the same page as the mutually exclusive answer
-          if (
-            duplicatePageIds.includes(page.id) &&
-            page.answers.some((answer) => answer.type === MUTUALLY_EXCLUSIVE)
-          ) {
+        // If there are multiple answers from the same page
+        if (duplicatedPageIds.length > 0) {
+          /* 
+          Checks if any of the expressions' answers conflict with a mutually exclusive answer
+          Conflicts (returns true) if all of the following are met:
+            - The looping expression's answer in the expression group is a mutually exclusive answer
+            - The same expression's answer is on a page that has other answers from the same page in the logic rule
+            - The same expression's answer is on the same page as the current answer being validated
+          */
+          const conflictsWithMutuallyExclusive = allExpressions.some(
+            (expression) =>
+              getAnswerById({ questionnaire }, expression.left.answerId)
+                ?.type === MUTUALLY_EXCLUSIVE &&
+              duplicatedPageIds.includes(
+                getPageByAnswerId({ questionnaire }, expression.left.answerId)
+                  ?.id
+              ) &&
+              getPageByAnswerId({ questionnaire }, expression.left.answerId)
+                ?.id === page.id
+          );
+
+          if (conflictsWithMutuallyExclusive) {
             return addError(answerId);
           }
         }
-
         // Bail out if answer isn't numerical or checkbox - remaining code validates number-type answers
         if (
           !answer ||

From 8dba232cb11b88a5231b20915aef803d7bf5f5cb Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Thu, 6 Jun 2024 13:53:51 +0100
Subject: [PATCH 093/215] added styling for question title

---
 .../page/Preview/CalculatedSummaryPreview.js  | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
index 20c031b692..759ddf015e 100644
--- a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
+++ b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
@@ -48,17 +48,21 @@ const Button = styled.div`
 `;
 
 const Summary = styled.div`
-  border-bottom: 1px solid #999;
   margin-bottom: 2rem;
 `;
 
 const SummaryItem = styled.div`
-  border-top: 1px solid #999;
   border-radius: 0;
   position: relative;
   padding: 1rem 0;
 `;
 
+const TitleQuestion = styled.div`
+  &:not(:first-of-type) {
+    border-top: ${(props) => (props.questionTitle ? "1px solid #999" : "none")};
+  }
+`;
+
 const SummaryLabel = styled.div`
   font-weight: normal;
   word-break: break-word;
@@ -187,12 +191,18 @@ const CalculatedSummaryPagePreview = ({ page }) => {
                 }
 
                 const duplicatedPageIds = getDuplicatedPageIds();
+                const questionTitle =
+                  !hasAnswerPageIdBeenUsed &&
+                  duplicatedPageIds.includes(answerPage?.id) &&
+                  answerPage?.title.replace(/<p>|<\/p>/g, "");
+
+                console.log("questionpage", questionTitle);
 
                 return (
                   <>
-                    {!hasAnswerPageIdBeenUsed &&
-                      duplicatedPageIds.includes(answerPage?.id) &&
-                      answerPage?.title.replace(/<p>|<\/p>/g, "")}
+                    <TitleQuestion questionTitle={questionTitle}>
+                      {questionTitle}
+                    </TitleQuestion>
                     <SummaryItem key={answer.id}>
                       <Grid>
                         <Column cols={7}>

From 1194de3e07e0aad73253d454fb65185a06c70b80 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Thu, 6 Jun 2024 15:13:29 +0100
Subject: [PATCH 094/215] Find if a looped answer is the last answer from its
 page used in summary answers

---
 .../src/App/page/Preview/CalculatedSummaryPreview.js     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
index 759ddf015e..cb2735be93 100644
--- a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
+++ b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
@@ -196,7 +196,14 @@ const CalculatedSummaryPagePreview = ({ page }) => {
                   duplicatedPageIds.includes(answerPage?.id) &&
                   answerPage?.title.replace(/<p>|<\/p>/g, "");
 
-                console.log("questionpage", questionTitle);
+                const lastSummaryAnswerFromPage = sortedSummaryAnswers.findLast(
+                  (summaryAnswer) =>
+                    getPageByAnswerId(questionnaire, summaryAnswer.id)?.id ===
+                    answerPage?.id
+                );
+
+                const isLastSummaryAnswerFromPage =
+                  answer.id === lastSummaryAnswerFromPage.id;
 
                 return (
                   <>

From 84fcddaa4bbb8282e666300e7d28fc84d82ce3d1 Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Fri, 7 Jun 2024 13:01:54 +0100
Subject: [PATCH 095/215] Added borders to group the summary answer types with
 question page title

---
 .../page/Preview/CalculatedSummaryPreview.js   | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
index cb2735be93..32c67f385c 100644
--- a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
+++ b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
@@ -55,12 +55,13 @@ const SummaryItem = styled.div`
   border-radius: 0;
   position: relative;
   padding: 1rem 0;
+  border-bottom: ${(props) =>
+    props.isLastSummaryAnswerFromPage ? "1px solid #999" : "none"};
 `;
 
-const TitleQuestion = styled.div`
-  &:not(:first-of-type) {
-    border-top: ${(props) => (props.questionTitle ? "1px solid #999" : "none")};
-  }
+const QuestionPageTitle = styled.div`
+  margin-top: 1rem;
+  margin-bottom: 1rem;
 `;
 
 const SummaryLabel = styled.div`
@@ -207,10 +208,13 @@ const CalculatedSummaryPagePreview = ({ page }) => {
 
                 return (
                   <>
-                    <TitleQuestion questionTitle={questionTitle}>
+                    <QuestionPageTitle questionTitle={questionTitle}>
                       {questionTitle}
-                    </TitleQuestion>
-                    <SummaryItem key={answer.id}>
+                    </QuestionPageTitle>
+                    <SummaryItem
+                      key={answer.id}
+                      isLastSummaryAnswerFromPage={isLastSummaryAnswerFromPage}
+                    >
                       <Grid>
                         <Column cols={7}>
                           <SummaryLabel data-test="answer-item">

From d3925b40f025ff2250c977059044c223d5bd0b84 Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Fri, 7 Jun 2024 15:57:26 +0100
Subject: [PATCH 096/215] changed the code to show the unique key so test won't
 fail

---
 .../page/Preview/CalculatedSummaryPreview.js  | 40 +++++++++----------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
index 32c67f385c..2a9fe28efb 100644
--- a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
+++ b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
@@ -60,7 +60,6 @@ const SummaryItem = styled.div`
 `;
 
 const QuestionPageTitle = styled.div`
-  margin-top: 1rem;
   margin-bottom: 1rem;
 `;
 
@@ -207,29 +206,28 @@ const CalculatedSummaryPagePreview = ({ page }) => {
                   answer.id === lastSummaryAnswerFromPage.id;
 
                 return (
-                  <>
+                  <SummaryItem
+                    key={answer.id}
+                    isLastSummaryAnswerFromPage={isLastSummaryAnswerFromPage}
+                  >
                     <QuestionPageTitle questionTitle={questionTitle}>
                       {questionTitle}
                     </QuestionPageTitle>
-                    <SummaryItem
-                      key={answer.id}
-                      isLastSummaryAnswerFromPage={isLastSummaryAnswerFromPage}
-                    >
-                      <Grid>
-                        <Column cols={7}>
-                          <SummaryLabel data-test="answer-item">
-                            {answer.displayName}
-                          </SummaryLabel>
-                        </Column>
-                        <Column cols={3}>
-                          <SummaryValue>Value</SummaryValue>
-                        </Column>
-                        <Column cols={2}>
-                          <SummaryLink>Change</SummaryLink>
-                        </Column>
-                      </Grid>
-                    </SummaryItem>
-                  </>
+
+                    <Grid>
+                      <Column cols={7}>
+                        <SummaryLabel data-test="answer-item">
+                          {answer.displayName}
+                        </SummaryLabel>
+                      </Column>
+                      <Column cols={3}>
+                        <SummaryValue>Value</SummaryValue>
+                      </Column>
+                      <Column cols={2}>
+                        <SummaryLink>Change</SummaryLink>
+                      </Column>
+                    </Grid>
+                  </SummaryItem>
                 );
               })}
 

From f4cca92b14f4f294a529cbfe2dfb31d9b65f52a0 Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Wed, 12 Jun 2024 08:30:51 +0100
Subject: [PATCH 097/215] updated changes for finding the last summary answer
 of the same page

---
 eq-author/src/App/page/Preview/CalculatedSummaryPreview.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
index 2a9fe28efb..9868977619 100644
--- a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
+++ b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
@@ -196,11 +196,13 @@ const CalculatedSummaryPagePreview = ({ page }) => {
                   duplicatedPageIds.includes(answerPage?.id) &&
                   answerPage?.title.replace(/<p>|<\/p>/g, "");
 
-                const lastSummaryAnswerFromPage = sortedSummaryAnswers.findLast(
+                const summaryAnswersOnSamePage = sortedSummaryAnswers.filter(
                   (summaryAnswer) =>
                     getPageByAnswerId(questionnaire, summaryAnswer.id)?.id ===
                     answerPage?.id
                 );
+                const lastSummaryAnswerFromPage =
+                  summaryAnswersOnSamePage[summaryAnswersOnSamePage.length - 1];
 
                 const isLastSummaryAnswerFromPage =
                   answer.id === lastSummaryAnswerFromPage.id;

From 52fa56637ae4ea6f9cd35197ad447787381dd058 Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Wed, 12 Jun 2024 14:23:59 +0100
Subject: [PATCH 098/215] created a mock questionnaie

---
 .../Preview/CalculatedSummaryPreview.test.js  | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js
index 77cd6bfc80..50f0b33300 100644
--- a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js
+++ b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js
@@ -8,6 +8,61 @@ import { byTestAttr } from "tests/utils/selectors";
 
 import CalculatedSummaryPreview from "./CalculatedSummaryPreview";
 import { publishStatusSubscription } from "components/EditorLayout/Header";
+import { useQuestionnaire } from "components/QuestionnaireContext";
+
+jest.mock("components/QuestionnaireContext", () => ({
+  useQuestionnaire: jest.fn(),
+}));
+
+const questionnaire = {
+  id: "questionnaire-1",
+  sections: [
+    {
+      id: "1",
+      folders: [
+        {
+          id: "2",
+          pages: [
+            {
+              id: "3",
+              pageType: "QuestionPage",
+              title: "Page 1",
+              answers: [
+                { id: "4", label: "answer 1", questionPageId: "123" },
+                {
+                  id: "5",
+                  label: "answer 2",
+                  questionPageId: "234",
+                },
+              ],
+            },
+            {
+              id: "6",
+              pageType: "QuestionPage",
+              title: "Page 2",
+              answers: [
+                {
+                  id: "7",
+                  label: "answer 3",
+                  questionPageId: "345",
+                },
+                {
+                  id: "8",
+                  label: "answer 4",
+                  questionPageId: "456",
+                },
+              ],
+            },
+          ],
+        },
+      ],
+    },
+  ],
+};
+
+// useQuestionnaire.mockImplementation(() => ({
+//   questionnaire:
+// }));
 
 describe("CalculatedSummaryPreview", () => {
   let page, me, mocks, questionnaireId;
@@ -133,4 +188,6 @@ describe("CalculatedSummaryPreview", () => {
     );
     expect(wrapper.find(byTestAttr("no-answers-selected"))).toBeTruthy();
   });
+
+  it("should order the summary answers correctly ", () => {});
 });

From a692c4bbccfbd30e8f1b405c377bba2667293d61 Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Wed, 12 Jun 2024 14:49:31 +0100
Subject: [PATCH 099/215] added calculated summary page in the mock
 questionnaire

---
 .../src/App/page/Preview/CalculatedSummaryPreview.test.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js
index 50f0b33300..786c2b4d3f 100644
--- a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js
+++ b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js
@@ -8,7 +8,7 @@ import { byTestAttr } from "tests/utils/selectors";
 
 import CalculatedSummaryPreview from "./CalculatedSummaryPreview";
 import { publishStatusSubscription } from "components/EditorLayout/Header";
-import { useQuestionnaire } from "components/QuestionnaireContext";
+import useQuestionnaire from "components/QuestionnaireContext";
 
 jest.mock("components/QuestionnaireContext", () => ({
   useQuestionnaire: jest.fn(),
@@ -53,6 +53,12 @@ const questionnaire = {
                 },
               ],
             },
+            {
+              id: "9",
+              title: "calculated summary page 1",
+              pageType: "CalculatedSummaryPage",
+              summaryAnswers: ["4", "5", "7", "8"],
+            },
           ],
         },
       ],

From 9b219eebf00aaafa934b8cf4a4b3fb94461ce69b Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Fri, 14 Jun 2024 09:56:23 +0100
Subject: [PATCH 100/215] started rtl structure

---
 .../Preview/CalculatedSummaryPreview.test.js  | 35 ++++++++++++-------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js
index 786c2b4d3f..f36c7bd0d5 100644
--- a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js
+++ b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js
@@ -4,24 +4,21 @@ import { render, flushPromises, act } from "tests/utils/rtl";
 
 import commentsSubscription from "graphql/subscriptions/commentSubscription.graphql";
 import { MeContext } from "App/MeContext";
+
 import { byTestAttr } from "tests/utils/selectors";
 
 import CalculatedSummaryPreview from "./CalculatedSummaryPreview";
 import { publishStatusSubscription } from "components/EditorLayout/Header";
-import useQuestionnaire from "components/QuestionnaireContext";
-
-jest.mock("components/QuestionnaireContext", () => ({
-  useQuestionnaire: jest.fn(),
-}));
+import QuestionnaireContext from "components/QuestionnaireContext";
 
 const questionnaire = {
   id: "questionnaire-1",
   sections: [
     {
-      id: "1",
+      id: "section-1",
       folders: [
         {
-          id: "2",
+          id: "folder-1",
           pages: [
             {
               id: "3",
@@ -57,7 +54,7 @@ const questionnaire = {
               id: "9",
               title: "calculated summary page 1",
               pageType: "CalculatedSummaryPage",
-              summaryAnswers: ["4", "5", "7", "8"],
+              summaryAnswers: ["8", "5", "7", "4"],
             },
           ],
         },
@@ -66,10 +63,6 @@ const questionnaire = {
   ],
 };
 
-// useQuestionnaire.mockImplementation(() => ({
-//   questionnaire:
-// }));
-
 describe("CalculatedSummaryPreview", () => {
   let page, me, mocks, questionnaireId;
 
@@ -195,5 +188,21 @@ describe("CalculatedSummaryPreview", () => {
     expect(wrapper.find(byTestAttr("no-answers-selected"))).toBeTruthy();
   });
 
-  it("should order the summary answers correctly ", () => {});
+  it("should order the summary answers correctly ", () => {
+    const sortedSummaryAnswers = jest.fn();
+    const { getByTestId, getByText, getAllByTestId } = render(
+      <QuestionnaireContext.Provider value={{ questionnaire }}>
+        <MeContext.Provider value={{ me }}>
+          <CalculatedSummaryPreview page={page} />
+        </MeContext.Provider>
+      </QuestionnaireContext.Provider>,
+      {
+        route: `/q/${questionnaireId}/page/9/preview`,
+        urlParamMatcher: "/q/:questionnaireId/page/:pageId",
+        mocks,
+      }
+    );
+
+    expect(sortedSummaryAnswers).toHaveBeenCalled();
+  });
 });

From 95e92c95efb02aa90f70b3bbe534d8d8cc56ec52 Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Fri, 14 Jun 2024 14:11:46 +0100
Subject: [PATCH 101/215] started rendering the answer.displayname

---
 .../Preview/CalculatedSummaryPreview.test.js  | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js
index f36c7bd0d5..5d33eb617e 100644
--- a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js
+++ b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js
@@ -54,7 +54,12 @@ const questionnaire = {
               id: "9",
               title: "calculated summary page 1",
               pageType: "CalculatedSummaryPage",
-              summaryAnswers: ["8", "5", "7", "4"],
+              summaryAnswers: [
+                { id: "8", displayName: "Answer 8" },
+                { id: "5", displayName: "Answer 5" },
+                { id: "7", displayName: "Answer 7" },
+                { id: "4", displayName: "Answer 4" },
+              ],
             },
           ],
         },
@@ -188,9 +193,12 @@ describe("CalculatedSummaryPreview", () => {
     expect(wrapper.find(byTestAttr("no-answers-selected"))).toBeTruthy();
   });
 
+  // test the answer.display name is rendered in the page.
+  // change the code where it test based on the data-test id(data-test id need to be unique for each answer) no functions need to be mock at all.
+  // check the text of answer found from the data test id is equal to the answer.displayName
+
   it("should order the summary answers correctly ", () => {
-    const sortedSummaryAnswers = jest.fn();
-    const { getByTestId, getByText, getAllByTestId } = render(
+    const { getByTestId, getByText } = render(
       <QuestionnaireContext.Provider value={{ questionnaire }}>
         <MeContext.Provider value={{ me }}>
           <CalculatedSummaryPreview page={page} />
@@ -202,7 +210,11 @@ describe("CalculatedSummaryPreview", () => {
         mocks,
       }
     );
-
-    expect(sortedSummaryAnswers).toHaveBeenCalled();
+    questionnaire.sections[0].folders[0].pages[2].summaryAnswers.forEach(
+      (answer) => {
+        const renderDisplayName = getByText(answer.displayName);
+        expect(renderDisplayName).toBeInTheDocument();
+      }
+    );
   });
 });

From 27e35d9412199c4f5ca2627cee7aeb4889b898c8 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Fri, 14 Jun 2024 14:27:59 +0100
Subject: [PATCH 102/215] Add initial filtered questionnaires list

---
 .../db/datastore/datastore-firestore.js       | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/eq-author-api/db/datastore/datastore-firestore.js b/eq-author-api/db/datastore/datastore-firestore.js
index a99a958298..007468e242 100644
--- a/eq-author-api/db/datastore/datastore-firestore.js
+++ b/eq-author-api/db/datastore/datastore-firestore.js
@@ -374,6 +374,64 @@ const listQuestionnaires = async () => {
   }
 };
 
+const listFilteredQuestionnaires = async (limit, currentPage) => {
+  try {
+    // TODO: Replace with limit and current page from GraphQL query's input
+    const limit = 10;
+    const currentPage = 2;
+    // Orders questionnaires by when they were created
+    let questionnairesQuery = db
+      .collection("questionnaires")
+      .orderBy("createdAt");
+
+    // Gets the number of questionnaire documents to skip based on the current page
+    const questionnairesToSkip = (currentPage - 1) * limit;
+
+    if (questionnairesToSkip > 0) {
+      // Based on the number of questionnaires to skip, gets questionnaire documents that need to be skipped to get to the first questionnaire document of the current page
+      const startAtSnapshot = await questionnairesQuery
+        .limit(questionnairesToSkip)
+        .get();
+
+      // Gets the last questionnaire document on the previous page (from the questionnaires to skip)
+      const lastDocumentSnapshot =
+        startAtSnapshot.docs[startAtSnapshot.docs.length - 1];
+
+      // Starts the query after the last questionnaire document on the previous page
+      questionnairesQuery =
+        questionnairesQuery.startAfter(lastDocumentSnapshot);
+    }
+
+    if (limit) {
+      questionnairesQuery = questionnairesQuery.limit(limit);
+    }
+
+    const questionnairesSnapshot = await questionnairesQuery.get();
+
+    if (questionnairesSnapshot.empty) {
+      logger.info("No questionnaires found (from listQuestionnaires)");
+      return [];
+    }
+
+    const questionnaires = questionnairesSnapshot.docs
+      .map((doc) => ({
+        ...doc.data(),
+        editors: doc.data().editors || [],
+        createdAt: doc.data().createdAt.toDate(),
+        updatedAt: doc.data().updatedAt.toDate(),
+      }))
+      .sort((a, b) => (a.createdAt > b.createdAt ? -1 : 1));
+
+    return questionnaires || [];
+  } catch (error) {
+    logger.error(
+      error,
+      "Unable to retrieve questionnaires (from listQuestionnaires)"
+    );
+    return;
+  }
+};
+
 const deleteQuestionnaire = async (id) => {
   try {
     await db.collection("questionnaires").doc(id).delete();
@@ -666,6 +724,7 @@ module.exports = {
   saveQuestionnaire,
   deleteQuestionnaire,
   listQuestionnaires,
+  listFilteredQuestionnaires,
   getQuestionnaire,
   getQuestionnaireMetaById,
   getQuestionnaireByVersionId,

From 9b60d3e63e1e43cd948cb6fc1c13ba5ba4178d5d Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Mon, 17 Jun 2024 12:31:46 +0100
Subject: [PATCH 103/215] updated the data test id and wrote test to check the
 summary answers

---
 .../page/Preview/CalculatedSummaryPreview.js  |  2 +-
 .../Preview/CalculatedSummaryPreview.test.js  | 28 +++++++++++++------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
index 9868977619..37efe13a78 100644
--- a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
+++ b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
@@ -218,7 +218,7 @@ const CalculatedSummaryPagePreview = ({ page }) => {
 
                     <Grid>
                       <Column cols={7}>
-                        <SummaryLabel data-test="answer-item">
+                        <SummaryLabel data-test={`answer-item-${answer.id}`}>
                           {answer.displayName}
                         </SummaryLabel>
                       </Column>
diff --git a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js
index 5d33eb617e..6f8523eb95 100644
--- a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js
+++ b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js
@@ -37,7 +37,7 @@ const questionnaire = {
               id: "6",
               pageType: "QuestionPage",
               title: "Page 2",
-              answers: [
+              answer: [
                 {
                   id: "7",
                   label: "answer 3",
@@ -196,13 +196,17 @@ describe("CalculatedSummaryPreview", () => {
   // test the answer.display name is rendered in the page.
   // change the code where it test based on the data-test id(data-test id need to be unique for each answer) no functions need to be mock at all.
   // check the text of answer found from the data test id is equal to the answer.displayName
+  // check if the question page title appear in the correct order with the answer display name
 
   it("should order the summary answers correctly ", () => {
-    const { getByTestId, getByText } = render(
+    const { getByTestId } = render(
       <QuestionnaireContext.Provider value={{ questionnaire }}>
         <MeContext.Provider value={{ me }}>
-          <CalculatedSummaryPreview page={page} />
+          <CalculatedSummaryPreview
+            page={questionnaire.sections[0].folders[0].pages[2]}
+          />
         </MeContext.Provider>
+        ,
       </QuestionnaireContext.Provider>,
       {
         route: `/q/${questionnaireId}/page/9/preview`,
@@ -210,11 +214,19 @@ describe("CalculatedSummaryPreview", () => {
         mocks,
       }
     );
-    questionnaire.sections[0].folders[0].pages[2].summaryAnswers.forEach(
-      (answer) => {
-        const renderDisplayName = getByText(answer.displayName);
-        expect(renderDisplayName).toBeInTheDocument();
-      }
+
+    const answer = questionnaire.sections[0].folders[0].pages[2].summaryAnswers;
+    expect(getByTestId(`answer-item-${answer[0].id}`)).toHaveTextContent(
+      "Answer 8"
+    );
+    expect(getByTestId(`answer-item-${answer[1].id}`)).toHaveTextContent(
+      "Answer 5"
+    );
+    expect(getByTestId(`answer-item-${answer[2].id}`)).toHaveTextContent(
+      "Answer 7"
+    );
+    expect(getByTestId(`answer-item-${answer[3].id}`)).toHaveTextContent(
+      "Answer 4"
     );
   });
 });

From e937877702d9363502541c41da79e757469dc1d4 Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Tue, 18 Jun 2024 10:49:53 +0100
Subject: [PATCH 104/215] updated the test for sorted answers and added data
 test for question title

---
 .../page/Preview/CalculatedSummaryPreview.js  |  9 +++--
 .../Preview/CalculatedSummaryPreview.test.js  | 38 ++++++++-----------
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
index 37efe13a78..bf12e0bdb1 100644
--- a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
+++ b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
@@ -181,7 +181,7 @@ const CalculatedSummaryPagePreview = ({ page }) => {
 
           {sortedSummaryAnswers.length > 0 ? (
             <Summary>
-              {sortedSummaryAnswers.map((answer) => {
+              {sortedSummaryAnswers.map((answer, index) => {
                 const answerPage = getPageByAnswerId(questionnaire, answer.id);
                 const hasAnswerPageIdBeenUsed = usedPageIds.includes(
                   answerPage?.id
@@ -212,13 +212,16 @@ const CalculatedSummaryPagePreview = ({ page }) => {
                     key={answer.id}
                     isLastSummaryAnswerFromPage={isLastSummaryAnswerFromPage}
                   >
-                    <QuestionPageTitle questionTitle={questionTitle}>
+                    <QuestionPageTitle
+                      data-test="question-page-title"
+                      questionTitle={questionTitle}
+                    >
                       {questionTitle}
                     </QuestionPageTitle>
 
                     <Grid>
                       <Column cols={7}>
-                        <SummaryLabel data-test={`answer-item-${answer.id}`}>
+                        <SummaryLabel data-test={`answer-item-${index}`}>
                           {answer.displayName}
                         </SummaryLabel>
                       </Column>
diff --git a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js
index 6f8523eb95..c6f10bb7b2 100644
--- a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js
+++ b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js
@@ -25,9 +25,9 @@ const questionnaire = {
               pageType: "QuestionPage",
               title: "Page 1",
               answers: [
-                { id: "4", label: "answer 1", questionPageId: "123" },
+                { id: "answer-1", label: "answer 1", questionPageId: "123" },
                 {
-                  id: "5",
+                  id: "answer-2",
                   label: "answer 2",
                   questionPageId: "234",
                 },
@@ -39,12 +39,12 @@ const questionnaire = {
               title: "Page 2",
               answer: [
                 {
-                  id: "7",
+                  id: "answer-3",
                   label: "answer 3",
                   questionPageId: "345",
                 },
                 {
-                  id: "8",
+                  id: "answer-4",
                   label: "answer 4",
                   questionPageId: "456",
                 },
@@ -54,11 +54,13 @@ const questionnaire = {
               id: "9",
               title: "calculated summary page 1",
               pageType: "CalculatedSummaryPage",
+              pageDescription: "Hello",
+              alias: "Who am I?",
               summaryAnswers: [
-                { id: "8", displayName: "Answer 8" },
-                { id: "5", displayName: "Answer 5" },
-                { id: "7", displayName: "Answer 7" },
-                { id: "4", displayName: "Answer 4" },
+                { id: "answer-4", displayName: "Answer 4" },
+                { id: "answer-2", displayName: "Answer 2" },
+                { id: "answer-3", displayName: "Answer 3" },
+                { id: "answer-1", displayName: "Answer 1" },
               ],
             },
           ],
@@ -197,8 +199,9 @@ describe("CalculatedSummaryPreview", () => {
   // change the code where it test based on the data-test id(data-test id need to be unique for each answer) no functions need to be mock at all.
   // check the text of answer found from the data test id is equal to the answer.displayName
   // check if the question page title appear in the correct order with the answer display name
+  // index for each loop
 
-  it("should order the summary answers correctly ", () => {
+  it.only("should order the summary answers correctly ", () => {
     const { getByTestId } = render(
       <QuestionnaireContext.Provider value={{ questionnaire }}>
         <MeContext.Provider value={{ me }}>
@@ -215,18 +218,9 @@ describe("CalculatedSummaryPreview", () => {
       }
     );
 
-    const answer = questionnaire.sections[0].folders[0].pages[2].summaryAnswers;
-    expect(getByTestId(`answer-item-${answer[0].id}`)).toHaveTextContent(
-      "Answer 8"
-    );
-    expect(getByTestId(`answer-item-${answer[1].id}`)).toHaveTextContent(
-      "Answer 5"
-    );
-    expect(getByTestId(`answer-item-${answer[2].id}`)).toHaveTextContent(
-      "Answer 7"
-    );
-    expect(getByTestId(`answer-item-${answer[3].id}`)).toHaveTextContent(
-      "Answer 4"
-    );
+    expect(getByTestId("answer-item-0")).toHaveTextContent("Answer 4");
+    expect(getByTestId("answer-item-1")).toHaveTextContent("Answer 3");
+    expect(getByTestId("answer-item-2")).toHaveTextContent("Answer 1");
+    expect(getByTestId("answer-item-3")).toHaveTextContent("Answer 2");
   });
 });

From 6a8ace793b45653a73eb4d6030337dca96e84f3d Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Tue, 18 Jun 2024 13:07:40 +0100
Subject: [PATCH 105/215] Add query for questionnaires on first page

---
 .../db/datastore/datastore-firestore.js       | 31 +++----------------
 .../schema/resolvers/homepage/index.js        | 17 ++++++++++
 eq-author-api/schema/resolvers/index.js       |  2 ++
 eq-author-api/schema/typeDefs.js              |  5 +++
 4 files changed, 29 insertions(+), 26 deletions(-)
 create mode 100644 eq-author-api/schema/resolvers/homepage/index.js

diff --git a/eq-author-api/db/datastore/datastore-firestore.js b/eq-author-api/db/datastore/datastore-firestore.js
index 007468e242..1025a926aa 100644
--- a/eq-author-api/db/datastore/datastore-firestore.js
+++ b/eq-author-api/db/datastore/datastore-firestore.js
@@ -374,37 +374,16 @@ const listQuestionnaires = async () => {
   }
 };
 
-const listFilteredQuestionnaires = async (limit, currentPage) => {
+const listFirstPageQuestionnaires = async (input) => {
   try {
-    // TODO: Replace with limit and current page from GraphQL query's input
-    const limit = 10;
-    const currentPage = 2;
+    const { limit } = input;
+
     // Orders questionnaires by when they were created
     let questionnairesQuery = db
       .collection("questionnaires")
       .orderBy("createdAt");
 
-    // Gets the number of questionnaire documents to skip based on the current page
-    const questionnairesToSkip = (currentPage - 1) * limit;
-
-    if (questionnairesToSkip > 0) {
-      // Based on the number of questionnaires to skip, gets questionnaire documents that need to be skipped to get to the first questionnaire document of the current page
-      const startAtSnapshot = await questionnairesQuery
-        .limit(questionnairesToSkip)
-        .get();
-
-      // Gets the last questionnaire document on the previous page (from the questionnaires to skip)
-      const lastDocumentSnapshot =
-        startAtSnapshot.docs[startAtSnapshot.docs.length - 1];
-
-      // Starts the query after the last questionnaire document on the previous page
-      questionnairesQuery =
-        questionnairesQuery.startAfter(lastDocumentSnapshot);
-    }
-
-    if (limit) {
-      questionnairesQuery = questionnairesQuery.limit(limit);
-    }
+    questionnairesQuery = questionnairesQuery.limit(limit);
 
     const questionnairesSnapshot = await questionnairesQuery.get();
 
@@ -724,7 +703,7 @@ module.exports = {
   saveQuestionnaire,
   deleteQuestionnaire,
   listQuestionnaires,
-  listFilteredQuestionnaires,
+  listFirstPageQuestionnaires,
   getQuestionnaire,
   getQuestionnaireMetaById,
   getQuestionnaireByVersionId,
diff --git a/eq-author-api/schema/resolvers/homepage/index.js b/eq-author-api/schema/resolvers/homepage/index.js
new file mode 100644
index 0000000000..3e387cb25d
--- /dev/null
+++ b/eq-author-api/schema/resolvers/homepage/index.js
@@ -0,0 +1,17 @@
+const { listFirstPageQuestionnaires } = require("../../../db/datastore");
+
+const Resolvers = {
+  Query: {
+    firstPageQuestionnaires: async (_, { input = {} }, ctx) => {
+      const { limit = 10 } = input;
+
+      const questionnaires = await listFirstPageQuestionnaires({
+        limit,
+      });
+
+      return questionnaires;
+    },
+  },
+};
+
+module.exports = Resolvers;
diff --git a/eq-author-api/schema/resolvers/index.js b/eq-author-api/schema/resolvers/index.js
index b41c34e181..c6a62adefd 100644
--- a/eq-author-api/schema/resolvers/index.js
+++ b/eq-author-api/schema/resolvers/index.js
@@ -4,6 +4,7 @@ const binaryExpression2 = require("./logic/binaryExpression2");
 const page = require("./pages");
 const questionnaireIntroduction = require("./questionnaireIntroduction");
 const importing = require("./importing");
+const homepage = require("./homepage");
 
 module.exports = [
   base,
@@ -12,4 +13,5 @@ module.exports = [
   ...page,
   ...questionnaireIntroduction,
   importing,
+  homepage,
 ];
diff --git a/eq-author-api/schema/typeDefs.js b/eq-author-api/schema/typeDefs.js
index 1b445c28f1..19c56adbc2 100644
--- a/eq-author-api/schema/typeDefs.js
+++ b/eq-author-api/schema/typeDefs.js
@@ -895,6 +895,7 @@ type PublishHistoryEvent {
 
 type Query {
   questionnaires(input: QuestionnairesInput): [Questionnaire]
+  firstPageQuestionnaires(input: FirstPageQuestionnairesInput): [Questionnaire]
   questionnaire(input: QueryInput!): Questionnaire
   history(input: QueryInput!): [History]
   section(input: QueryInput!): Section
@@ -935,6 +936,10 @@ input QuestionnairesInput {
   filter: QuestionnairesFilter
 }
 
+input FirstPageQuestionnairesInput {
+  limit: Int
+}
+
 input QueryInput {
   id: ID
   questionnaireId: ID

From 11926c6f2c86740c7a01b27c66c7d1f22826c82d Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Tue, 18 Jun 2024 13:31:41 +0100
Subject: [PATCH 106/215] fixed the issue with the testing

---
 .../Preview/CalculatedSummaryPreview.test.js  | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js
index c6f10bb7b2..fcd3ae921a 100644
--- a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js
+++ b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js
@@ -11,6 +11,12 @@ import CalculatedSummaryPreview from "./CalculatedSummaryPreview";
 import { publishStatusSubscription } from "components/EditorLayout/Header";
 import QuestionnaireContext from "components/QuestionnaireContext";
 
+jest.mock("@apollo/react-hooks", () => ({
+  ...jest.requireActual("@apollo/react-hooks"),
+  useQuery: jest.fn(),
+  useMutation: jest.fn(() => [() => null]),
+}));
+
 const questionnaire = {
   id: "questionnaire-1",
   sections: [
@@ -25,11 +31,13 @@ const questionnaire = {
               pageType: "QuestionPage",
               title: "Page 1",
               answers: [
-                { id: "answer-1", label: "answer 1", questionPageId: "123" },
+                {
+                  id: "answer-1",
+                  label: "answer 1",
+                },
                 {
                   id: "answer-2",
                   label: "answer 2",
-                  questionPageId: "234",
                 },
               ],
             },
@@ -37,16 +45,14 @@ const questionnaire = {
               id: "6",
               pageType: "QuestionPage",
               title: "Page 2",
-              answer: [
+              answers: [
                 {
                   id: "answer-3",
                   label: "answer 3",
-                  questionPageId: "345",
                 },
                 {
                   id: "answer-4",
                   label: "answer 4",
-                  questionPageId: "456",
                 },
               ],
             },
@@ -56,6 +62,7 @@ const questionnaire = {
               pageType: "CalculatedSummaryPage",
               pageDescription: "Hello",
               alias: "Who am I?",
+
               summaryAnswers: [
                 { id: "answer-4", displayName: "Answer 4" },
                 { id: "answer-2", displayName: "Answer 2" },
@@ -218,8 +225,8 @@ describe("CalculatedSummaryPreview", () => {
       }
     );
 
-    expect(getByTestId("answer-item-0")).toHaveTextContent("Answer 4");
-    expect(getByTestId("answer-item-1")).toHaveTextContent("Answer 3");
+    expect(getByTestId("answer-item-0")).toHaveTextContent("Answer 3");
+    expect(getByTestId("answer-item-1")).toHaveTextContent("Answer 4");
     expect(getByTestId("answer-item-2")).toHaveTextContent("Answer 1");
     expect(getByTestId("answer-item-3")).toHaveTextContent("Answer 2");
   });

From bf79b30d46076574bacf7a5aa0a3da278348a2b0 Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Tue, 18 Jun 2024 20:54:12 +0100
Subject: [PATCH 107/215] added testing for the question page title appear in
 the correct order with the answer display name

---
 eq-author/src/App/page/Preview/CalculatedSummaryPreview.js | 2 +-
 .../src/App/page/Preview/CalculatedSummaryPreview.test.js  | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
index bf12e0bdb1..e74e06ac80 100644
--- a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
+++ b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
@@ -213,7 +213,7 @@ const CalculatedSummaryPagePreview = ({ page }) => {
                     isLastSummaryAnswerFromPage={isLastSummaryAnswerFromPage}
                   >
                     <QuestionPageTitle
-                      data-test="question-page-title"
+                      data-test={`question-title-${index}`}
                       questionTitle={questionTitle}
                     >
                       {questionTitle}
diff --git a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js
index fcd3ae921a..7fc62bc563 100644
--- a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js
+++ b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js
@@ -206,10 +206,9 @@ describe("CalculatedSummaryPreview", () => {
   // change the code where it test based on the data-test id(data-test id need to be unique for each answer) no functions need to be mock at all.
   // check the text of answer found from the data test id is equal to the answer.displayName
   // check if the question page title appear in the correct order with the answer display name
-  // index for each loop
 
   it.only("should order the summary answers correctly ", () => {
-    const { getByTestId } = render(
+    const { getByTestId, getByText } = render(
       <QuestionnaireContext.Provider value={{ questionnaire }}>
         <MeContext.Provider value={{ me }}>
           <CalculatedSummaryPreview
@@ -224,9 +223,13 @@ describe("CalculatedSummaryPreview", () => {
         mocks,
       }
     );
+    expect(getByTestId("question-title-0")).toHaveTextContent("Page 2");
 
     expect(getByTestId("answer-item-0")).toHaveTextContent("Answer 3");
     expect(getByTestId("answer-item-1")).toHaveTextContent("Answer 4");
+
+    expect(getByTestId("question-title-2")).toHaveTextContent("Page 1");
+
     expect(getByTestId("answer-item-2")).toHaveTextContent("Answer 1");
     expect(getByTestId("answer-item-3")).toHaveTextContent("Answer 2");
   });

From 7009b271a1c59bad3a1f1ddb49e7eff9508bcb79 Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Tue, 18 Jun 2024 21:22:23 +0100
Subject: [PATCH 108/215] added the missing props in the calculated summary
 mock data

---
 .../Preview/CalculatedSummaryPreview.test.js  | 38 ++++++++++++++-----
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js
index 7fc62bc563..2ec8e31a75 100644
--- a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js
+++ b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js
@@ -58,10 +58,15 @@ const questionnaire = {
             },
             {
               id: "9",
-              title: "calculated summary page 1",
-              pageType: "CalculatedSummaryPage",
-              pageDescription: "Hello",
+              displayName: "Cal Sum",
+              position: 1,
+              title: "Calculated summary page 1",
+              totalTitle: "Total bills:",
+              pageDescription: "This page calculates the total bills",
               alias: "Who am I?",
+              type: "Number",
+              answers: [],
+              comments: [],
 
               summaryAnswers: [
                 { id: "answer-4", displayName: "Answer 4" },
@@ -69,6 +74,24 @@ const questionnaire = {
                 { id: "answer-3", displayName: "Answer 3" },
                 { id: "answer-1", displayName: "Answer 1" },
               ],
+              pageType: "CalculatedSummaryPage",
+              section: {
+                id: "1",
+                position: 0,
+                questionnaire: {
+                  id: "1",
+                  metadata: [],
+                },
+              },
+              validationErrorInfo: {
+                id: "test",
+                totalCount: 0,
+                errors: [],
+              },
+              folder: {
+                id: "folder-1",
+                position: 0,
+              },
             },
           ],
         },
@@ -202,13 +225,8 @@ describe("CalculatedSummaryPreview", () => {
     expect(wrapper.find(byTestAttr("no-answers-selected"))).toBeTruthy();
   });
 
-  // test the answer.display name is rendered in the page.
-  // change the code where it test based on the data-test id(data-test id need to be unique for each answer) no functions need to be mock at all.
-  // check the text of answer found from the data test id is equal to the answer.displayName
-  // check if the question page title appear in the correct order with the answer display name
-
-  it.only("should order the summary answers correctly ", () => {
-    const { getByTestId, getByText } = render(
+  it("should sort the summary answers based on the first selection and ensure that the display names and question titles match this order ", () => {
+    const { getByTestId } = render(
       <QuestionnaireContext.Provider value={{ questionnaire }}>
         <MeContext.Provider value={{ me }}>
           <CalculatedSummaryPreview

From e2b2764601450c1c27871011ee5bbee6f8c0e724 Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Wed, 19 Jun 2024 09:25:01 +0100
Subject: [PATCH 109/215] updated the data test id and changed the if statement
 within the jsx

---
 .../page/Preview/CalculatedSummaryPreview.js  | 26 ++++++++++++-------
 .../Preview/CalculatedSummaryPreview.test.js  |  4 +--
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
index e74e06ac80..e1888471f9 100644
--- a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
+++ b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.js
@@ -186,15 +186,16 @@ const CalculatedSummaryPagePreview = ({ page }) => {
                 const hasAnswerPageIdBeenUsed = usedPageIds.includes(
                   answerPage?.id
                 );
+
                 if (!hasAnswerPageIdBeenUsed) {
                   usedPageIds.push(answerPage?.id);
                 }
 
                 const duplicatedPageIds = getDuplicatedPageIds();
-                const questionTitle =
-                  !hasAnswerPageIdBeenUsed &&
-                  duplicatedPageIds.includes(answerPage?.id) &&
-                  answerPage?.title.replace(/<p>|<\/p>/g, "");
+                const questionTitle = answerPage?.title.replace(
+                  /<p>|<\/p>/g,
+                  ""
+                );
 
                 const summaryAnswersOnSamePage = sortedSummaryAnswers.filter(
                   (summaryAnswer) =>
@@ -212,12 +213,17 @@ const CalculatedSummaryPagePreview = ({ page }) => {
                     key={answer.id}
                     isLastSummaryAnswerFromPage={isLastSummaryAnswerFromPage}
                   >
-                    <QuestionPageTitle
-                      data-test={`question-title-${index}`}
-                      questionTitle={questionTitle}
-                    >
-                      {questionTitle}
-                    </QuestionPageTitle>
+                    {!hasAnswerPageIdBeenUsed &&
+                      duplicatedPageIds.includes(answerPage?.id) && (
+                        <QuestionPageTitle
+                          data-test={`question-title-${duplicatedPageIds?.findIndex(
+                            (pageId) => pageId === answerPage?.id
+                          )}`}
+                          questionTitle={questionTitle}
+                        >
+                          {questionTitle}
+                        </QuestionPageTitle>
+                      )}
 
                     <Grid>
                       <Column cols={7}>
diff --git a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js
index 2ec8e31a75..03f9a9a283 100644
--- a/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js
+++ b/eq-author/src/App/page/Preview/CalculatedSummaryPreview.test.js
@@ -225,7 +225,7 @@ describe("CalculatedSummaryPreview", () => {
     expect(wrapper.find(byTestAttr("no-answers-selected"))).toBeTruthy();
   });
 
-  it("should sort the summary answers based on the first selection and ensure that the display names and question titles match this order ", () => {
+  it("should sort the summary answers based on the first selection and ensure that the display names and question titles match this order", () => {
     const { getByTestId } = render(
       <QuestionnaireContext.Provider value={{ questionnaire }}>
         <MeContext.Provider value={{ me }}>
@@ -246,7 +246,7 @@ describe("CalculatedSummaryPreview", () => {
     expect(getByTestId("answer-item-0")).toHaveTextContent("Answer 3");
     expect(getByTestId("answer-item-1")).toHaveTextContent("Answer 4");
 
-    expect(getByTestId("question-title-2")).toHaveTextContent("Page 1");
+    expect(getByTestId("question-title-1")).toHaveTextContent("Page 1");
 
     expect(getByTestId("answer-item-2")).toHaveTextContent("Answer 1");
     expect(getByTestId("answer-item-3")).toHaveTextContent("Answer 2");

From 2237b9969f85403cc679fe80eef5eea2b2c973cc Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Wed, 19 Jun 2024 11:32:58 +0100
Subject: [PATCH 110/215] Add query for questionnaires on next page

---
 .../db/datastore/datastore-firestore.js       | 64 +++++++++++++++----
 .../schema/resolvers/homepage/index.js        | 16 ++++-
 eq-author-api/schema/typeDefs.js              |  6 ++
 3 files changed, 74 insertions(+), 12 deletions(-)

diff --git a/eq-author-api/db/datastore/datastore-firestore.js b/eq-author-api/db/datastore/datastore-firestore.js
index 1025a926aa..143392f5e1 100644
--- a/eq-author-api/db/datastore/datastore-firestore.js
+++ b/eq-author-api/db/datastore/datastore-firestore.js
@@ -378,10 +378,10 @@ const listFirstPageQuestionnaires = async (input) => {
   try {
     const { limit } = input;
 
-    // Orders questionnaires by when they were created
+    // Orders questionnaires by when they were created, starting with the newest
     let questionnairesQuery = db
       .collection("questionnaires")
-      .orderBy("createdAt");
+      .orderBy("createdAt", "desc");
 
     questionnairesQuery = questionnairesQuery.limit(limit);
 
@@ -392,20 +392,61 @@ const listFirstPageQuestionnaires = async (input) => {
       return [];
     }
 
-    const questionnaires = questionnairesSnapshot.docs
-      .map((doc) => ({
-        ...doc.data(),
-        editors: doc.data().editors || [],
-        createdAt: doc.data().createdAt.toDate(),
-        updatedAt: doc.data().updatedAt.toDate(),
-      }))
-      .sort((a, b) => (a.createdAt > b.createdAt ? -1 : 1));
+    const questionnaires = questionnairesSnapshot.docs.map((doc) => ({
+      ...doc.data(),
+      editors: doc.data().editors || [],
+      createdAt: doc.data().createdAt.toDate(),
+      updatedAt: doc.data().updatedAt.toDate(),
+    }));
+    return questionnaires || [];
+  } catch (error) {
+    logger.error(
+      error,
+      "Unable to retrieve questionnaires (from listFirstPageQuestionnaires)"
+    );
+    return;
+  }
+};
+
+const listNextPageQuestionnaires = async (input) => {
+  try {
+    const { limit, lastQuestionnaireIdOnPage } = input;
+
+    // Orders questionnaires by when they were created, starting with the newest
+    let questionnairesQuery = db
+      .collection("questionnaires")
+      .orderBy("createdAt", "desc");
+
+    // Gets last questionnaire on current page based on lastQuestionnaireIdOnPage
+    const lastQuestionnaireOnPage = await db
+      .collection("questionnaires")
+      .doc(lastQuestionnaireIdOnPage)
+      .get();
+
+    // Gets next questionnaires after lastQuestionnaireOnPage, limiting the number of questionnaires to limit
+    questionnairesQuery = questionnairesQuery
+      .startAfter(lastQuestionnaireOnPage)
+      .limit(limit);
+
+    const questionnairesSnapshot = await questionnairesQuery.get();
+
+    if (questionnairesSnapshot.empty) {
+      logger.info("No questionnaires found (from listQuestionnaires)");
+      return [];
+    }
+
+    const questionnaires = questionnairesSnapshot.docs.map((doc) => ({
+      ...doc.data(),
+      editors: doc.data().editors || [],
+      createdAt: doc.data().createdAt.toDate(),
+      updatedAt: doc.data().updatedAt.toDate(),
+    }));
 
     return questionnaires || [];
   } catch (error) {
     logger.error(
       error,
-      "Unable to retrieve questionnaires (from listQuestionnaires)"
+      "Unable to retrieve questionnaires (from listNextPageQuestionnaires)"
     );
     return;
   }
@@ -704,6 +745,7 @@ module.exports = {
   deleteQuestionnaire,
   listQuestionnaires,
   listFirstPageQuestionnaires,
+  listNextPageQuestionnaires,
   getQuestionnaire,
   getQuestionnaireMetaById,
   getQuestionnaireByVersionId,
diff --git a/eq-author-api/schema/resolvers/homepage/index.js b/eq-author-api/schema/resolvers/homepage/index.js
index 3e387cb25d..a530c2f6c0 100644
--- a/eq-author-api/schema/resolvers/homepage/index.js
+++ b/eq-author-api/schema/resolvers/homepage/index.js
@@ -1,4 +1,7 @@
-const { listFirstPageQuestionnaires } = require("../../../db/datastore");
+const {
+  listFirstPageQuestionnaires,
+  listNextPageQuestionnaires,
+} = require("../../../db/datastore");
 
 const Resolvers = {
   Query: {
@@ -11,6 +14,17 @@ const Resolvers = {
 
       return questionnaires;
     },
+
+    nextPageQuestionnaires: async (_, { input = {} }, ctx) => {
+      const { limit = 10, lastQuestionnaireIdOnPage } = input;
+
+      const nextQuestionnaires = await listNextPageQuestionnaires({
+        limit,
+        lastQuestionnaireIdOnPage,
+      });
+
+      return nextQuestionnaires;
+    },
   },
 };
 
diff --git a/eq-author-api/schema/typeDefs.js b/eq-author-api/schema/typeDefs.js
index 19c56adbc2..d41c1abff4 100644
--- a/eq-author-api/schema/typeDefs.js
+++ b/eq-author-api/schema/typeDefs.js
@@ -896,6 +896,7 @@ type PublishHistoryEvent {
 type Query {
   questionnaires(input: QuestionnairesInput): [Questionnaire]
   firstPageQuestionnaires(input: FirstPageQuestionnairesInput): [Questionnaire]
+  nextPageQuestionnaires(input: NextPageQuestionnairesInput): [Questionnaire]
   questionnaire(input: QueryInput!): Questionnaire
   history(input: QueryInput!): [History]
   section(input: QueryInput!): Section
@@ -940,6 +941,11 @@ input FirstPageQuestionnairesInput {
   limit: Int
 }
 
+input NextPageQuestionnairesInput {
+  limit: Int
+  lastQuestionnaireIdOnPage: ID!
+}
+
 input QueryInput {
   id: ID
   questionnaireId: ID

From f86faa86162e86545082d2291c27ecdb73a3c534 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Thu, 20 Jun 2024 12:06:50 +0100
Subject: [PATCH 111/215] Update to use filteredQuestionnaires

---
 .../db/datastore/datastore-firestore.js       | 91 +++++++++----------
 .../schema/resolvers/homepage/index.js        | 28 ++----
 eq-author-api/schema/typeDefs.js              | 12 +--
 3 files changed, 55 insertions(+), 76 deletions(-)

diff --git a/eq-author-api/db/datastore/datastore-firestore.js b/eq-author-api/db/datastore/datastore-firestore.js
index 143392f5e1..65be0567ff 100644
--- a/eq-author-api/db/datastore/datastore-firestore.js
+++ b/eq-author-api/db/datastore/datastore-firestore.js
@@ -374,64 +374,57 @@ const listQuestionnaires = async () => {
   }
 };
 
-const listFirstPageQuestionnaires = async (input) => {
+const listFilteredQuestionnaires = async (input) => {
   try {
-    const { limit } = input;
+    const { limit, firstQuestionnaireIdOnPage, lastQuestionnaireIdOnPage } =
+      input;
 
     // Orders questionnaires by when they were created, starting with the newest
     let questionnairesQuery = db
       .collection("questionnaires")
       .orderBy("createdAt", "desc");
 
-    questionnairesQuery = questionnairesQuery.limit(limit);
-
-    const questionnairesSnapshot = await questionnairesQuery.get();
-
-    if (questionnairesSnapshot.empty) {
-      logger.info("No questionnaires found (from listQuestionnaires)");
-      return [];
+    // Gets questionnaires on first page when firstQuestionnaireIdOnPage and lastQuestionnaireIdOnPage are not provided
+    if (!firstQuestionnaireIdOnPage && !lastQuestionnaireIdOnPage) {
+      questionnairesQuery = questionnairesQuery.limit(limit);
+    }
+    // Gets questionnaires on previous page when firstQuestionnaireIdOnPage is provided without lastQuestionnaireIdOnPage
+    else if (firstQuestionnaireIdOnPage && !lastQuestionnaireIdOnPage) {
+      // Gets first questionnaire on current page based on firstQuestionnaireIdOnPage
+      const firstQuestionnaireOnPage = await db
+        .collection("questionnaires")
+        .doc(firstQuestionnaireIdOnPage)
+        .get();
+
+      // Gets previous questionnaires before firstQuestionnaireOnPage, limiting the number of questionnaires to `limit`
+      questionnairesQuery = questionnairesQuery
+        .endBefore(firstQuestionnaireOnPage)
+        .limitToLast(limit);
+    }
+    // Gets questionnaires on next page when lastQuestionnaireIdOnPage is provided without firstQuestionnaireIdOnPage
+    else if (lastQuestionnaireIdOnPage && !firstQuestionnaireIdOnPage) {
+      // Gets last questionnaire on current page based on lastQuestionnaireIdOnPage
+      const lastQuestionnaireOnPage = await db
+        .collection("questionnaires")
+        .doc(lastQuestionnaireIdOnPage)
+        .get();
+
+      // Gets next questionnaires after lastQuestionnaireOnPage, limiting the number of questionnaires to `limit`
+      questionnairesQuery = questionnairesQuery
+        .startAfter(lastQuestionnaireOnPage)
+        .limit(limit);
+    }
+    // Throws an error when both firstQuestionnaireIdOnPage and lastQuestionnaireIdOnPage are provided
+    else {
+      logger.error(
+        "Invalid input - both firstQuestionnaireIdOnPage and lastQuestionnaireIdOnPage have been provided (from listFilteredQuestionnaires)"
+      );
     }
-
-    const questionnaires = questionnairesSnapshot.docs.map((doc) => ({
-      ...doc.data(),
-      editors: doc.data().editors || [],
-      createdAt: doc.data().createdAt.toDate(),
-      updatedAt: doc.data().updatedAt.toDate(),
-    }));
-    return questionnaires || [];
-  } catch (error) {
-    logger.error(
-      error,
-      "Unable to retrieve questionnaires (from listFirstPageQuestionnaires)"
-    );
-    return;
-  }
-};
-
-const listNextPageQuestionnaires = async (input) => {
-  try {
-    const { limit, lastQuestionnaireIdOnPage } = input;
-
-    // Orders questionnaires by when they were created, starting with the newest
-    let questionnairesQuery = db
-      .collection("questionnaires")
-      .orderBy("createdAt", "desc");
-
-    // Gets last questionnaire on current page based on lastQuestionnaireIdOnPage
-    const lastQuestionnaireOnPage = await db
-      .collection("questionnaires")
-      .doc(lastQuestionnaireIdOnPage)
-      .get();
-
-    // Gets next questionnaires after lastQuestionnaireOnPage, limiting the number of questionnaires to limit
-    questionnairesQuery = questionnairesQuery
-      .startAfter(lastQuestionnaireOnPage)
-      .limit(limit);
 
     const questionnairesSnapshot = await questionnairesQuery.get();
 
     if (questionnairesSnapshot.empty) {
-      logger.info("No questionnaires found (from listQuestionnaires)");
+      logger.info("No questionnaires found (from listFilteredQuestionnaires)");
       return [];
     }
 
@@ -441,12 +434,11 @@ const listNextPageQuestionnaires = async (input) => {
       createdAt: doc.data().createdAt.toDate(),
       updatedAt: doc.data().updatedAt.toDate(),
     }));
-
     return questionnaires || [];
   } catch (error) {
     logger.error(
       error,
-      "Unable to retrieve questionnaires (from listNextPageQuestionnaires)"
+      "Unable to retrieve questionnaires (from listQuestionnaires)"
     );
     return;
   }
@@ -744,8 +736,7 @@ module.exports = {
   saveQuestionnaire,
   deleteQuestionnaire,
   listQuestionnaires,
-  listFirstPageQuestionnaires,
-  listNextPageQuestionnaires,
+  listFilteredQuestionnaires,
   getQuestionnaire,
   getQuestionnaireMetaById,
   getQuestionnaireByVersionId,
diff --git a/eq-author-api/schema/resolvers/homepage/index.js b/eq-author-api/schema/resolvers/homepage/index.js
index a530c2f6c0..8d47b5dd0b 100644
--- a/eq-author-api/schema/resolvers/homepage/index.js
+++ b/eq-author-api/schema/resolvers/homepage/index.js
@@ -1,29 +1,21 @@
-const {
-  listFirstPageQuestionnaires,
-  listNextPageQuestionnaires,
-} = require("../../../db/datastore");
+const { listFilteredQuestionnaires } = require("../../../db/datastore");
 
 const Resolvers = {
   Query: {
-    firstPageQuestionnaires: async (_, { input = {} }, ctx) => {
-      const { limit = 10 } = input;
-
-      const questionnaires = await listFirstPageQuestionnaires({
-        limit,
-      });
-
-      return questionnaires;
-    },
-
-    nextPageQuestionnaires: async (_, { input = {} }, ctx) => {
-      const { limit = 10, lastQuestionnaireIdOnPage } = input;
+    filteredQuestionnaires: async (_, { input = {} }, ctx) => {
+      const {
+        limit = 10,
+        firstQuestionnaireIdOnPage,
+        lastQuestionnaireIdOnPage,
+      } = input;
 
-      const nextQuestionnaires = await listNextPageQuestionnaires({
+      const questionnaires = await listFilteredQuestionnaires({
         limit,
+        firstQuestionnaireIdOnPage,
         lastQuestionnaireIdOnPage,
       });
 
-      return nextQuestionnaires;
+      return questionnaires;
     },
   },
 };
diff --git a/eq-author-api/schema/typeDefs.js b/eq-author-api/schema/typeDefs.js
index d41c1abff4..9ee9045429 100644
--- a/eq-author-api/schema/typeDefs.js
+++ b/eq-author-api/schema/typeDefs.js
@@ -895,8 +895,7 @@ type PublishHistoryEvent {
 
 type Query {
   questionnaires(input: QuestionnairesInput): [Questionnaire]
-  firstPageQuestionnaires(input: FirstPageQuestionnairesInput): [Questionnaire]
-  nextPageQuestionnaires(input: NextPageQuestionnairesInput): [Questionnaire]
+  filteredQuestionnaires(input: FilteredQuestionnairesInput): [Questionnaire]
   questionnaire(input: QueryInput!): Questionnaire
   history(input: QueryInput!): [History]
   section(input: QueryInput!): Section
@@ -937,13 +936,10 @@ input QuestionnairesInput {
   filter: QuestionnairesFilter
 }
 
-input FirstPageQuestionnairesInput {
+input FilteredQuestionnairesInput {
   limit: Int
-}
-
-input NextPageQuestionnairesInput {
-  limit: Int
-  lastQuestionnaireIdOnPage: ID!
+  firstQuestionnaireIdOnPage: ID
+  lastQuestionnaireIdOnPage: ID
 }
 
 input QueryInput {

From e2c8ee38bd5685d766cbe7cf5051a5be2c77d76b Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Thu, 20 Jun 2024 12:21:31 +0100
Subject: [PATCH 112/215] fixed the bug where mutually exclusive answer is
 disabled when theres a select answer and select answer is disbaled for
 mutually exclusive

---
 .../AnswerTypeSelector/AnswerTypeButton.js          |  2 ++
 .../components/AnswerTypeSelector/AnswerTypeGrid.js |  3 +++
 .../src/components/AnswerTypeSelector/index.js      | 13 ++++++++++---
 eq-author/src/components/IconGrid/IconGridButton.js |  5 ++++-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/eq-author/src/components/AnswerTypeSelector/AnswerTypeButton.js b/eq-author/src/components/AnswerTypeSelector/AnswerTypeButton.js
index 9f77cadfb9..dcb4a48180 100644
--- a/eq-author/src/components/AnswerTypeSelector/AnswerTypeButton.js
+++ b/eq-author/src/components/AnswerTypeSelector/AnswerTypeButton.js
@@ -46,6 +46,7 @@ export default class AnswerTypeButton extends React.Component {
     doNotShowDR: PropTypes.bool,
     mutuallyExclusiveEnabled: PropTypes.bool,
     radioEnabled: PropTypes.bool,
+    selectEnabled: PropTypes.bool,
   };
 
   handleClick = () => {
@@ -58,6 +59,7 @@ export default class AnswerTypeButton extends React.Component {
         doNotShowDR={this.props.doNotShowDR}
         mutuallyExclusiveEnabled={this.props.mutuallyExclusiveEnabled}
         radioEnabled={this.props.radioEnabled}
+        selectEnabled={this.props.selectEnabled}
         disabled={this.props.disabled}
         iconSrc={icons[this.props.type]}
         onClick={this.handleClick}
diff --git a/eq-author/src/components/AnswerTypeSelector/AnswerTypeGrid.js b/eq-author/src/components/AnswerTypeSelector/AnswerTypeGrid.js
index e52dce2104..1169985edd 100644
--- a/eq-author/src/components/AnswerTypeSelector/AnswerTypeGrid.js
+++ b/eq-author/src/components/AnswerTypeSelector/AnswerTypeGrid.js
@@ -73,6 +73,7 @@ class AnswerTypeGrid extends React.Component {
     doNotShowDR: PropTypes.bool,
     mutuallyExclusiveEnabled: PropTypes.bool,
     radioEnabled: PropTypes.bool,
+    selectEnabled: PropTypes.bool,
   };
 
   handleSelect = (type) => {
@@ -90,6 +91,7 @@ class AnswerTypeGrid extends React.Component {
       doNotShowDR,
       mutuallyExclusiveEnabled,
       radioEnabled,
+      selectEnabled,
       ...otherProps
     } = this.props;
     return (
@@ -111,6 +113,7 @@ class AnswerTypeGrid extends React.Component {
                   doNotShowDR={doNotShowDR}
                   mutuallyExclusiveEnabled={mutuallyExclusiveEnabled}
                   radioEnabled={radioEnabled}
+                  selectEnabled={selectEnabled}
                   {...props}
                 />
               );
diff --git a/eq-author/src/components/AnswerTypeSelector/index.js b/eq-author/src/components/AnswerTypeSelector/index.js
index 7fd65fea5b..02f463116d 100644
--- a/eq-author/src/components/AnswerTypeSelector/index.js
+++ b/eq-author/src/components/AnswerTypeSelector/index.js
@@ -7,7 +7,7 @@ import IconText from "components/IconText";
 import Button from "components/buttons/Button";
 import ValidationError from "components/ValidationError";
 import { QUESTION_ANSWER_NOT_SELECTED } from "constants/validationMessages";
-import { RADIO, MUTUALLY_EXCLUSIVE } from "constants/answer-types";
+import { RADIO, MUTUALLY_EXCLUSIVE, SELECT } from "constants/answer-types";
 
 import answersHaveAnswerType from "utils/answersHaveAnswerType";
 
@@ -49,7 +49,7 @@ const ErrorContext = styled.div`
     `}
 `;
 
-const mutuallyExclusiveEnabled = (answers, hasRadioAnswer) => {
+const mutuallyExclusiveEnabled = (answers, hasRadioAnswer, hasSelectAnswer) => {
   let allowMutuallyExclusive = false;
   // Mutually exclusive button will be disabled when page has no answers, page has a radio answer, or page already has mutually exclusive answer
   // Does not need to handle date range as "Add an answer" button is disabled when page has a date range answer
@@ -57,6 +57,7 @@ const mutuallyExclusiveEnabled = (answers, hasRadioAnswer) => {
     answers.length === 0 ||
     !answers ||
     hasRadioAnswer ||
+    hasSelectAnswer ||
     answersHaveAnswerType(answers, MUTUALLY_EXCLUSIVE) ||
     answers.length > 1 // TODO: (Mutually exclusive) When Runner supports multiple answers with mutually exclusive, answers.length > 1 can be removed
   ) {
@@ -101,6 +102,7 @@ class AnswerTypeSelector extends React.Component {
     let hasDateRange = false;
     let hasOtherAnswerType = false;
     let hasRadioAnswer = false;
+    let hasSelectAnswer = false;
     let hasMutuallyExclusiveAnswer = false;
 
     const answers = Array.from(this.props.page.answers);
@@ -118,6 +120,9 @@ class AnswerTypeSelector extends React.Component {
       if (answersHaveAnswerType(this.props.page.answers, RADIO)) {
         hasRadioAnswer = true;
       }
+      if (answersHaveAnswerType(this.props.page.answers, SELECT)) {
+        hasSelectAnswer = true;
+      }
       if (answersHaveAnswerType(this.props.page.answers, MUTUALLY_EXCLUSIVE)) {
         hasMutuallyExclusiveAnswer = true;
       }
@@ -159,9 +164,11 @@ class AnswerTypeSelector extends React.Component {
               doNotShowDR={hasOtherAnswerType}
               mutuallyExclusiveEnabled={mutuallyExclusiveEnabled(
                 this.props.page.answers,
-                hasRadioAnswer
+                hasRadioAnswer,
+                hasSelectAnswer
               )}
               radioEnabled={!hasMutuallyExclusiveAnswer}
+              selectEnabled={!hasMutuallyExclusiveAnswer}
             />
           </Popout>
         </ErrorContext>
diff --git a/eq-author/src/components/IconGrid/IconGridButton.js b/eq-author/src/components/IconGrid/IconGridButton.js
index 4229b47f1d..4975e503cb 100644
--- a/eq-author/src/components/IconGrid/IconGridButton.js
+++ b/eq-author/src/components/IconGrid/IconGridButton.js
@@ -52,12 +52,14 @@ const IconGridButton = ({
   doNotShowDR,
   mutuallyExclusiveEnabled,
   radioEnabled,
+  selectEnabled,
   ...otherProps
 }) => {
   if (
     (doNotShowDR && title === "Date range") ||
     (!mutuallyExclusiveEnabled && title === "OR answer") ||
-    (!radioEnabled && title === "Radio")
+    (!radioEnabled && title === "Radio") ||
+    (!selectEnabled && title === "Select")
   ) {
     disabled = true;
   }
@@ -87,6 +89,7 @@ IconGridButton.propTypes = {
   doNotShowDR: PropTypes.bool,
   mutuallyExclusiveEnabled: PropTypes.bool,
   radioEnabled: PropTypes.bool,
+  selectEnabled: PropTypes.bool,
 };
 
 export default IconGridButton;

From 8c555ab0fb81e13231a93cc9933e5fb5ea3b9ec8 Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Thu, 20 Jun 2024 12:31:30 +0100
Subject: [PATCH 113/215] added test to check mutually exclusive is disabled
 when there's a select answer

---
 .../src/components/AnswerTypeSelector/index.test.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/eq-author/src/components/AnswerTypeSelector/index.test.js b/eq-author/src/components/AnswerTypeSelector/index.test.js
index 5d62efe76c..8e042cd315 100644
--- a/eq-author/src/components/AnswerTypeSelector/index.test.js
+++ b/eq-author/src/components/AnswerTypeSelector/index.test.js
@@ -3,6 +3,7 @@ import {
   NUMBER,
   CURRENCY,
   RADIO,
+  SELECT,
   // MUTUALLY_EXCLUSIVE,
 } from "constants/answer-types";
 
@@ -14,7 +15,6 @@ import {
 } from "tests/utils/rtl";
 
 import AnswerTypeSelector from ".";
-
 describe("Answer Type Selector", () => {
   let props;
   beforeEach(() => {
@@ -161,6 +161,17 @@ describe("Answer Type Selector", () => {
       );
     });
 
+    it("should disbale mutually exclusive if there is a select answer", () => {
+      props.page.answers[0] = { type: SELECT };
+      const { getByText, getByTestId } = render(
+        <AnswerTypeSelector {...props} />
+      );
+      fireEvent.click(getByText(/Add another answer/));
+      expect(getByTestId("btn-answer-type-mutuallyexclusive")).toHaveAttribute(
+        "disabled"
+      );
+    });
+
     // TODO: (Mutually exclusive) When Runner supports multiple answers with mutually exclusive, the commented tests and MUTUALLY_EXCLUSIVE import can be uncommented
     // it("should disable radio if there is a mutually exclusive answer", () => {
     //   props.page.answers = [{ type: NUMBER }, { type: MUTUALLY_EXCLUSIVE }];

From a607da74393d1660072268b7497802dd00ad1248 Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Mon, 24 Jun 2024 08:56:37 +0100
Subject: [PATCH 114/215] fixed the typo in the test for select answer

---
 eq-author/src/components/AnswerTypeSelector/index.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eq-author/src/components/AnswerTypeSelector/index.test.js b/eq-author/src/components/AnswerTypeSelector/index.test.js
index 8e042cd315..edd044917d 100644
--- a/eq-author/src/components/AnswerTypeSelector/index.test.js
+++ b/eq-author/src/components/AnswerTypeSelector/index.test.js
@@ -161,7 +161,7 @@ describe("Answer Type Selector", () => {
       );
     });
 
-    it("should disbale mutually exclusive if there is a select answer", () => {
+    it("should disable mutually exclusive if there is a select answer", () => {
       props.page.answers[0] = { type: SELECT };
       const { getByText, getByTestId } = render(
         <AnswerTypeSelector {...props} />

From 4e1c7e6b076ed53af39ab7c0711f8d037c261d9a Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Mon, 24 Jun 2024 13:15:24 +0100
Subject: [PATCH 115/215] Filter questionnaires by page for MongoDB

---
 .../db/datastore/datastore-mongodb.js         | 88 +++++++++++++++++++
 1 file changed, 88 insertions(+)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.js b/eq-author-api/db/datastore/datastore-mongodb.js
index 0d05bbc69a..8528b19332 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.js
@@ -290,6 +290,93 @@ const listQuestionnaires = async () => {
   }
 };
 
+const listFilteredQuestionnaires = async (input) => {
+  try {
+    const { limit, firstQuestionnaireIdOnPage, lastQuestionnaireIdOnPage } =
+      input;
+
+    // Gets the questionnaires collection
+    const questionnairesCollection = dbo.collection("questionnaires");
+    let questionnairesQuery;
+
+    // Gets questionnaires on first page when firstQuestionnaireIdOnPage and lastQuestionnaireIdOnPage are not provided
+    if (!firstQuestionnaireIdOnPage && !lastQuestionnaireIdOnPage) {
+      questionnairesQuery = questionnairesCollection
+        .find()
+        .sort({ createdAt: -1 })
+        .limit(limit);
+    }
+    // Gets questionnaires on previous page when firstQuestionnaireIdOnPage is provided without lastQuestionnaireIdOnPage
+    else if (firstQuestionnaireIdOnPage && !lastQuestionnaireIdOnPage) {
+      // Gets first questionnaire on current page based on firstQuestionnaireIdOnPage
+      const firstQuestionnaireOnPage = await questionnairesCollection.findOne({
+        id: firstQuestionnaireIdOnPage,
+      });
+
+      /* 
+        Gets questionnaires on previous page based on firstQuestionnaireOnPage
+        Uses `gt` (greater than) to find questionnaires created after firstQuestionnaireOnPage, sorts from earliest created first, and limits to `limit` number of questionnaires
+      */
+      questionnairesQuery = questionnairesCollection
+        .find({ createdAt: { $gt: firstQuestionnaireOnPage.createdAt } })
+        .sort({ createdAt: 1 })
+        .limit(limit);
+    }
+    // Gets questionnaires on next page when lastQuestionnaireIdOnPage is provided without firstQuestionnaireIdOnPage
+    else if (!firstQuestionnaireIdOnPage && lastQuestionnaireIdOnPage) {
+      // Gets last questionnaire on current page based on lastQuestionnaireIdOnPage
+      const lastQuestionnaireOnPage = await questionnairesCollection.findOne({
+        id: lastQuestionnaireIdOnPage,
+      });
+
+      /* 
+        Gets questionnaires on next page based on lastQuestionnaireOnPage
+        Uses `lt` (less than) to find questionnaires created before lastQuestionnaireOnPage, sorts from most recently created first, and limits to `limit` number of questionnaires
+      */
+      questionnairesQuery = questionnairesCollection
+        .find({ createdAt: { $lt: lastQuestionnaireOnPage.createdAt } })
+        .sort({ createdAt: -1 })
+        .limit(limit);
+    } else {
+      logger.error(
+        "Invalid input - both firstQuestionnaireIdOnPage and lastQuestionnaireIdOnPage have been provided (from listFilteredQuestionnaires)"
+      );
+    }
+
+    const questionnaires = await questionnairesQuery.toArray();
+
+    if (questionnaires.length === 0) {
+      logger.info("No questionnaires found (from listFilteredQuestionnaires)");
+      return [];
+    }
+
+    // Adds empty `editors` to each questionnaire if it does not already have `editors`, otherwise uses existing `editors`
+    let transformedQuestionnaires = questionnaires.map((questionnaire) => ({
+      ...questionnaire,
+      editors: questionnaire.editors || [],
+    }));
+
+    /* 
+      Sorts questionnaires by most recently created first if firstQuestionnaireIdOnPage is provided without lastQuestionnaireIdOnPage 
+      This condition's query previously sorted by earliest created questionnaire first to get the `limit` number of questionnaires created after firstQuestionnaireOnPage
+      This ensures questionnaires are displayed in order from most recently created first in this condition
+    */
+    if (firstQuestionnaireIdOnPage && !lastQuestionnaireIdOnPage) {
+      transformedQuestionnaires = transformedQuestionnaires.sort((a, b) =>
+        a.createdAt > b.createdAt ? -1 : 1
+      );
+    }
+
+    return transformedQuestionnaires;
+  } catch (error) {
+    logger.error(
+      error,
+      "Unable to retrieve questionnaires (from listFilteredQuestionnaires)"
+    );
+    return;
+  }
+};
+
 const createComments = async (questionnaireId) => {
   try {
     if (!questionnaireId) {
@@ -486,6 +573,7 @@ module.exports = {
   saveQuestionnaire,
   deleteQuestionnaire,
   listQuestionnaires,
+  listFilteredQuestionnaires,
   getQuestionnaire,
   getQuestionnaireMetaById,
   createComments,

From 3dfbda48480704b6ff6b424520af088749c4d8f5 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Tue, 25 Jun 2024 09:58:14 +0100
Subject: [PATCH 116/215] Rename limit to resultsPerPage

---
 .../db/datastore/datastore-firestore.js       | 17 ++++++++++-------
 .../db/datastore/datastore-mongodb.js         | 19 +++++++++++--------
 .../schema/resolvers/homepage/index.js        |  4 ++--
 eq-author-api/schema/typeDefs.js              |  2 +-
 4 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/eq-author-api/db/datastore/datastore-firestore.js b/eq-author-api/db/datastore/datastore-firestore.js
index 65be0567ff..4560144801 100644
--- a/eq-author-api/db/datastore/datastore-firestore.js
+++ b/eq-author-api/db/datastore/datastore-firestore.js
@@ -376,8 +376,11 @@ const listQuestionnaires = async () => {
 
 const listFilteredQuestionnaires = async (input) => {
   try {
-    const { limit, firstQuestionnaireIdOnPage, lastQuestionnaireIdOnPage } =
-      input;
+    const {
+      resultsPerPage,
+      firstQuestionnaireIdOnPage,
+      lastQuestionnaireIdOnPage,
+    } = input;
 
     // Orders questionnaires by when they were created, starting with the newest
     let questionnairesQuery = db
@@ -386,7 +389,7 @@ const listFilteredQuestionnaires = async (input) => {
 
     // Gets questionnaires on first page when firstQuestionnaireIdOnPage and lastQuestionnaireIdOnPage are not provided
     if (!firstQuestionnaireIdOnPage && !lastQuestionnaireIdOnPage) {
-      questionnairesQuery = questionnairesQuery.limit(limit);
+      questionnairesQuery = questionnairesQuery.limit(resultsPerPage);
     }
     // Gets questionnaires on previous page when firstQuestionnaireIdOnPage is provided without lastQuestionnaireIdOnPage
     else if (firstQuestionnaireIdOnPage && !lastQuestionnaireIdOnPage) {
@@ -396,10 +399,10 @@ const listFilteredQuestionnaires = async (input) => {
         .doc(firstQuestionnaireIdOnPage)
         .get();
 
-      // Gets previous questionnaires before firstQuestionnaireOnPage, limiting the number of questionnaires to `limit`
+      // Gets previous questionnaires before firstQuestionnaireOnPage, limiting the number of questionnaires to `resultsPerPage`
       questionnairesQuery = questionnairesQuery
         .endBefore(firstQuestionnaireOnPage)
-        .limitToLast(limit);
+        .limitToLast(resultsPerPage);
     }
     // Gets questionnaires on next page when lastQuestionnaireIdOnPage is provided without firstQuestionnaireIdOnPage
     else if (lastQuestionnaireIdOnPage && !firstQuestionnaireIdOnPage) {
@@ -409,10 +412,10 @@ const listFilteredQuestionnaires = async (input) => {
         .doc(lastQuestionnaireIdOnPage)
         .get();
 
-      // Gets next questionnaires after lastQuestionnaireOnPage, limiting the number of questionnaires to `limit`
+      // Gets next questionnaires after lastQuestionnaireOnPage, limiting the number of questionnaires to `resultsPerPage`
       questionnairesQuery = questionnairesQuery
         .startAfter(lastQuestionnaireOnPage)
-        .limit(limit);
+        .limit(resultsPerPage);
     }
     // Throws an error when both firstQuestionnaireIdOnPage and lastQuestionnaireIdOnPage are provided
     else {
diff --git a/eq-author-api/db/datastore/datastore-mongodb.js b/eq-author-api/db/datastore/datastore-mongodb.js
index 8528b19332..bebfc5b013 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.js
@@ -292,8 +292,11 @@ const listQuestionnaires = async () => {
 
 const listFilteredQuestionnaires = async (input) => {
   try {
-    const { limit, firstQuestionnaireIdOnPage, lastQuestionnaireIdOnPage } =
-      input;
+    const {
+      resultsPerPage,
+      firstQuestionnaireIdOnPage,
+      lastQuestionnaireIdOnPage,
+    } = input;
 
     // Gets the questionnaires collection
     const questionnairesCollection = dbo.collection("questionnaires");
@@ -304,7 +307,7 @@ const listFilteredQuestionnaires = async (input) => {
       questionnairesQuery = questionnairesCollection
         .find()
         .sort({ createdAt: -1 })
-        .limit(limit);
+        .limit(resultsPerPage);
     }
     // Gets questionnaires on previous page when firstQuestionnaireIdOnPage is provided without lastQuestionnaireIdOnPage
     else if (firstQuestionnaireIdOnPage && !lastQuestionnaireIdOnPage) {
@@ -315,12 +318,12 @@ const listFilteredQuestionnaires = async (input) => {
 
       /* 
         Gets questionnaires on previous page based on firstQuestionnaireOnPage
-        Uses `gt` (greater than) to find questionnaires created after firstQuestionnaireOnPage, sorts from earliest created first, and limits to `limit` number of questionnaires
+        Uses `gt` (greater than) to find questionnaires created after firstQuestionnaireOnPage, sorts from earliest created first, and limits to `resultsPerPage` number of questionnaires
       */
       questionnairesQuery = questionnairesCollection
         .find({ createdAt: { $gt: firstQuestionnaireOnPage.createdAt } })
         .sort({ createdAt: 1 })
-        .limit(limit);
+        .limit(resultsPerPage);
     }
     // Gets questionnaires on next page when lastQuestionnaireIdOnPage is provided without firstQuestionnaireIdOnPage
     else if (!firstQuestionnaireIdOnPage && lastQuestionnaireIdOnPage) {
@@ -331,12 +334,12 @@ const listFilteredQuestionnaires = async (input) => {
 
       /* 
         Gets questionnaires on next page based on lastQuestionnaireOnPage
-        Uses `lt` (less than) to find questionnaires created before lastQuestionnaireOnPage, sorts from most recently created first, and limits to `limit` number of questionnaires
+        Uses `lt` (less than) to find questionnaires created before lastQuestionnaireOnPage, sorts from most recently created first, and limits to `resultsPerPage` number of questionnaires
       */
       questionnairesQuery = questionnairesCollection
         .find({ createdAt: { $lt: lastQuestionnaireOnPage.createdAt } })
         .sort({ createdAt: -1 })
-        .limit(limit);
+        .limit(resultsPerPage);
     } else {
       logger.error(
         "Invalid input - both firstQuestionnaireIdOnPage and lastQuestionnaireIdOnPage have been provided (from listFilteredQuestionnaires)"
@@ -358,7 +361,7 @@ const listFilteredQuestionnaires = async (input) => {
 
     /* 
       Sorts questionnaires by most recently created first if firstQuestionnaireIdOnPage is provided without lastQuestionnaireIdOnPage 
-      This condition's query previously sorted by earliest created questionnaire first to get the `limit` number of questionnaires created after firstQuestionnaireOnPage
+      This condition's query previously sorted by earliest created questionnaire first to get the `resultsPerPage` number of questionnaires created after firstQuestionnaireOnPage
       This ensures questionnaires are displayed in order from most recently created first in this condition
     */
     if (firstQuestionnaireIdOnPage && !lastQuestionnaireIdOnPage) {
diff --git a/eq-author-api/schema/resolvers/homepage/index.js b/eq-author-api/schema/resolvers/homepage/index.js
index 8d47b5dd0b..0c76265033 100644
--- a/eq-author-api/schema/resolvers/homepage/index.js
+++ b/eq-author-api/schema/resolvers/homepage/index.js
@@ -4,13 +4,13 @@ const Resolvers = {
   Query: {
     filteredQuestionnaires: async (_, { input = {} }, ctx) => {
       const {
-        limit = 10,
+        resultsPerPage = 10,
         firstQuestionnaireIdOnPage,
         lastQuestionnaireIdOnPage,
       } = input;
 
       const questionnaires = await listFilteredQuestionnaires({
-        limit,
+        resultsPerPage,
         firstQuestionnaireIdOnPage,
         lastQuestionnaireIdOnPage,
       });
diff --git a/eq-author-api/schema/typeDefs.js b/eq-author-api/schema/typeDefs.js
index 9ee9045429..1c8f1e21ce 100644
--- a/eq-author-api/schema/typeDefs.js
+++ b/eq-author-api/schema/typeDefs.js
@@ -937,7 +937,7 @@ input QuestionnairesInput {
 }
 
 input FilteredQuestionnairesInput {
-  limit: Int
+  resultsPerPage: Int
   firstQuestionnaireIdOnPage: ID
   lastQuestionnaireIdOnPage: ID
 }

From 43a20859c4b7234459fd1cc2453a1b0b143278b6 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Thu, 27 Jun 2024 11:51:00 +0100
Subject: [PATCH 117/215] Update listFilteredQuestionnaires to search by title
 and short code for MongoDB

---
 .../db/datastore/datastore-mongodb.js         | 37 +++++++++++++++++--
 .../schema/resolvers/homepage/index.js        |  2 +
 eq-author-api/schema/typeDefs.js              |  1 +
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.js b/eq-author-api/db/datastore/datastore-mongodb.js
index bebfc5b013..f3a8efd816 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.js
@@ -296,6 +296,7 @@ const listFilteredQuestionnaires = async (input) => {
       resultsPerPage,
       firstQuestionnaireIdOnPage,
       lastQuestionnaireIdOnPage,
+      search,
     } = input;
 
     // Gets the questionnaires collection
@@ -305,7 +306,13 @@ const listFilteredQuestionnaires = async (input) => {
     // Gets questionnaires on first page when firstQuestionnaireIdOnPage and lastQuestionnaireIdOnPage are not provided
     if (!firstQuestionnaireIdOnPage && !lastQuestionnaireIdOnPage) {
       questionnairesQuery = questionnairesCollection
-        .find()
+        .find({
+          // Searches for questionnaires with title or shortTitle (short code) containing the search term
+          $or: [
+            { title: { $regex: search, $options: "i" } },
+            { shortTitle: { $regex: search, $options: "i" } },
+          ],
+        })
         .sort({ createdAt: -1 })
         .limit(resultsPerPage);
     }
@@ -321,7 +328,19 @@ const listFilteredQuestionnaires = async (input) => {
         Uses `gt` (greater than) to find questionnaires created after firstQuestionnaireOnPage, sorts from earliest created first, and limits to `resultsPerPage` number of questionnaires
       */
       questionnairesQuery = questionnairesCollection
-        .find({ createdAt: { $gt: firstQuestionnaireOnPage.createdAt } })
+        .find({
+          // Searches for questionnaires created after firstQuestionnaireOnPage AND with title or shortTitle (short code) containing the search term
+          $and: [
+            { createdAt: { $gt: firstQuestionnaireOnPage.createdAt } },
+            // Searches for questionnaires with title or shortTitle (short code) containing the search term
+            {
+              $or: [
+                { title: { $regex: search, $options: "i" } },
+                { shortTitle: { $regex: search, $options: "i" } },
+              ],
+            },
+          ],
+        })
         .sort({ createdAt: 1 })
         .limit(resultsPerPage);
     }
@@ -337,7 +356,19 @@ const listFilteredQuestionnaires = async (input) => {
         Uses `lt` (less than) to find questionnaires created before lastQuestionnaireOnPage, sorts from most recently created first, and limits to `resultsPerPage` number of questionnaires
       */
       questionnairesQuery = questionnairesCollection
-        .find({ createdAt: { $lt: lastQuestionnaireOnPage.createdAt } })
+        .find({
+          // Searches for questionnaires created before lastQuestionnaireOnPage AND with title or shortTitle (short code) containing the search term
+          $and: [
+            { createdAt: { $lt: lastQuestionnaireOnPage.createdAt } },
+            // Searches for questionnaires with title or shortTitle (short code) containing the search term
+            {
+              $or: [
+                { title: { $regex: search, $options: "i" } },
+                { shortTitle: { $regex: search, $options: "i" } },
+              ],
+            },
+          ],
+        })
         .sort({ createdAt: -1 })
         .limit(resultsPerPage);
     } else {
diff --git a/eq-author-api/schema/resolvers/homepage/index.js b/eq-author-api/schema/resolvers/homepage/index.js
index 0c76265033..ec70e2f2ed 100644
--- a/eq-author-api/schema/resolvers/homepage/index.js
+++ b/eq-author-api/schema/resolvers/homepage/index.js
@@ -7,12 +7,14 @@ const Resolvers = {
         resultsPerPage = 10,
         firstQuestionnaireIdOnPage,
         lastQuestionnaireIdOnPage,
+        search,
       } = input;
 
       const questionnaires = await listFilteredQuestionnaires({
         resultsPerPage,
         firstQuestionnaireIdOnPage,
         lastQuestionnaireIdOnPage,
+        search,
       });
 
       return questionnaires;
diff --git a/eq-author-api/schema/typeDefs.js b/eq-author-api/schema/typeDefs.js
index 1c8f1e21ce..55aea21a3f 100644
--- a/eq-author-api/schema/typeDefs.js
+++ b/eq-author-api/schema/typeDefs.js
@@ -940,6 +940,7 @@ input FilteredQuestionnairesInput {
   resultsPerPage: Int
   firstQuestionnaireIdOnPage: ID
   lastQuestionnaireIdOnPage: ID
+  search: String
 }
 
 input QueryInput {

From dea12a3395fd0e7e8bf4b61fcfbe70923e9381e2 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Mon, 1 Jul 2024 08:39:58 +0100
Subject: [PATCH 118/215] Update listFilteredQuestionnaires to search by owner
 name for MongoDB

---
 .../db/datastore/datastore-mongodb.js         | 147 ++++++++++++------
 .../schema/resolvers/homepage/index.js        |   2 +
 eq-author-api/schema/typeDefs.js              |   1 +
 3 files changed, 105 insertions(+), 45 deletions(-)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.js b/eq-author-api/db/datastore/datastore-mongodb.js
index f3a8efd816..f1ab213740 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.js
@@ -297,6 +297,7 @@ const listFilteredQuestionnaires = async (input) => {
       firstQuestionnaireIdOnPage,
       lastQuestionnaireIdOnPage,
       search,
+      owner,
     } = input;
 
     // Gets the questionnaires collection
@@ -305,16 +306,34 @@ const listFilteredQuestionnaires = async (input) => {
 
     // Gets questionnaires on first page when firstQuestionnaireIdOnPage and lastQuestionnaireIdOnPage are not provided
     if (!firstQuestionnaireIdOnPage && !lastQuestionnaireIdOnPage) {
-      questionnairesQuery = questionnairesCollection
-        .find({
-          // Searches for questionnaires with title or shortTitle (short code) containing the search term
-          $or: [
-            { title: { $regex: search, $options: "i" } },
-            { shortTitle: { $regex: search, $options: "i" } },
-          ],
-        })
-        .sort({ createdAt: -1 })
-        .limit(resultsPerPage);
+      questionnairesQuery = questionnairesCollection.aggregate([
+        {
+          // From the `users` collection, gets the owner (based on `createdBy`) of each questionnaire by performing a join to match questionnaire `createdBy` with user `id`
+          $lookup: {
+            from: "users",
+            localField: "createdBy",
+            foreignField: "id",
+            as: "owner",
+          },
+        },
+        {
+          $match: {
+            // Searches for questionnaires with owner name (based on `createdBy`) containing the search term
+            "owner.name": { $regex: owner, $options: "i" },
+            // Searches for questionnaires with `title` or `shortTitle` (short code) containing the search term
+            $or: [
+              { title: { $regex: search, $options: "i" } },
+              { shortTitle: { $regex: search, $options: "i" } },
+            ],
+          },
+        },
+        {
+          $sort: { createdAt: -1 },
+        },
+        {
+          $limit: resultsPerPage,
+        },
+      ]);
     }
     // Gets questionnaires on previous page when firstQuestionnaireIdOnPage is provided without lastQuestionnaireIdOnPage
     else if (firstQuestionnaireIdOnPage && !lastQuestionnaireIdOnPage) {
@@ -323,26 +342,45 @@ const listFilteredQuestionnaires = async (input) => {
         id: firstQuestionnaireIdOnPage,
       });
 
-      /* 
+      /*
         Gets questionnaires on previous page based on firstQuestionnaireOnPage
-        Uses `gt` (greater than) to find questionnaires created after firstQuestionnaireOnPage, sorts from earliest created first, and limits to `resultsPerPage` number of questionnaires
+        Only finds questionnaires that meet the search conditions (e.g. owner name matching `owner` search field)
+        Uses `gt` (greater than) to find questionnaires meeting the conditions created after firstQuestionnaireOnPage, sorts from earliest created first, and limits to `resultsPerPage` number of questionnaires
       */
-      questionnairesQuery = questionnairesCollection
-        .find({
-          // Searches for questionnaires created after firstQuestionnaireOnPage AND with title or shortTitle (short code) containing the search term
-          $and: [
-            { createdAt: { $gt: firstQuestionnaireOnPage.createdAt } },
-            // Searches for questionnaires with title or shortTitle (short code) containing the search term
-            {
-              $or: [
-                { title: { $regex: search, $options: "i" } },
-                { shortTitle: { $regex: search, $options: "i" } },
-              ],
-            },
-          ],
-        })
-        .sort({ createdAt: 1 })
-        .limit(resultsPerPage);
+      questionnairesQuery = questionnairesCollection.aggregate([
+        // From the `users` collection, gets the owner (based on `createdBy`) of each questionnaire by performing a join to match questionnaire `createdBy` with user `id`
+        {
+          $lookup: {
+            from: "users",
+            localField: "createdBy",
+            foreignField: "id",
+            as: "owner",
+          },
+        },
+        {
+          $match: {
+            // Searches for questionnaires created after firstQuestionnaireOnPage AND meeting all the search conditions
+            $and: [
+              { createdAt: { $gt: firstQuestionnaireOnPage.createdAt } },
+              // Searches for questionnaires with owner name (based on `createdBy`) containing the search term
+              { "owner.name": { $regex: owner, $options: "i" } },
+              {
+                // Searches for questionnaires with `title` or `shortTitle` (short code) containing the search term
+                $or: [
+                  { title: { $regex: search, $options: "i" } },
+                  { shortTitle: { $regex: search, $options: "i" } },
+                ],
+              },
+            ],
+          },
+        },
+        {
+          $sort: { createdAt: 1 },
+        },
+        {
+          $limit: resultsPerPage,
+        },
+      ]);
     }
     // Gets questionnaires on next page when lastQuestionnaireIdOnPage is provided without firstQuestionnaireIdOnPage
     else if (!firstQuestionnaireIdOnPage && lastQuestionnaireIdOnPage) {
@@ -353,24 +391,43 @@ const listFilteredQuestionnaires = async (input) => {
 
       /* 
         Gets questionnaires on next page based on lastQuestionnaireOnPage
-        Uses `lt` (less than) to find questionnaires created before lastQuestionnaireOnPage, sorts from most recently created first, and limits to `resultsPerPage` number of questionnaires
+        Only finds questionnaires that meet the search conditions (e.g. owner name matching `owner` search field)
+        Uses `lt` (less than) to find questionnaires meeting the conditions created before lastQuestionnaireOnPage, sorts from most recently created first, and limits to `resultsPerPage` number of questionnaires
       */
-      questionnairesQuery = questionnairesCollection
-        .find({
-          // Searches for questionnaires created before lastQuestionnaireOnPage AND with title or shortTitle (short code) containing the search term
-          $and: [
-            { createdAt: { $lt: lastQuestionnaireOnPage.createdAt } },
-            // Searches for questionnaires with title or shortTitle (short code) containing the search term
-            {
-              $or: [
-                { title: { $regex: search, $options: "i" } },
-                { shortTitle: { $regex: search, $options: "i" } },
-              ],
-            },
-          ],
-        })
-        .sort({ createdAt: -1 })
-        .limit(resultsPerPage);
+      questionnairesQuery = questionnairesCollection.aggregate([
+        // From the `users` collection, gets the owner (based on `createdBy`) of each questionnaire by performing a join to match questionnaire `createdBy` with user `id`
+        {
+          $lookup: {
+            from: "users",
+            localField: "createdBy",
+            foreignField: "id",
+            as: "owner",
+          },
+        },
+        {
+          $match: {
+            // Searches for questionnaires created before lastQuestionnaireOnPage AND meeting all the search conditions
+            $and: [
+              { createdAt: { $lt: lastQuestionnaireOnPage.createdAt } },
+              // Searches for questionnaires with owner name (based on `createdBy`) containing the search term
+              { "owner.name": { $regex: owner, $options: "i" } },
+              {
+                // Searches for questionnaires with `title` or `shortTitle` (short code) containing the search term
+                $or: [
+                  { title: { $regex: search, $options: "i" } },
+                  { shortTitle: { $regex: search, $options: "i" } },
+                ],
+              },
+            ],
+          },
+        },
+        {
+          $sort: { createdAt: -1 },
+        },
+        {
+          $limit: resultsPerPage,
+        },
+      ]);
     } else {
       logger.error(
         "Invalid input - both firstQuestionnaireIdOnPage and lastQuestionnaireIdOnPage have been provided (from listFilteredQuestionnaires)"
diff --git a/eq-author-api/schema/resolvers/homepage/index.js b/eq-author-api/schema/resolvers/homepage/index.js
index ec70e2f2ed..5ddb72d4c8 100644
--- a/eq-author-api/schema/resolvers/homepage/index.js
+++ b/eq-author-api/schema/resolvers/homepage/index.js
@@ -8,6 +8,7 @@ const Resolvers = {
         firstQuestionnaireIdOnPage,
         lastQuestionnaireIdOnPage,
         search,
+        owner,
       } = input;
 
       const questionnaires = await listFilteredQuestionnaires({
@@ -15,6 +16,7 @@ const Resolvers = {
         firstQuestionnaireIdOnPage,
         lastQuestionnaireIdOnPage,
         search,
+        owner,
       });
 
       return questionnaires;
diff --git a/eq-author-api/schema/typeDefs.js b/eq-author-api/schema/typeDefs.js
index 55aea21a3f..73a74d73d7 100644
--- a/eq-author-api/schema/typeDefs.js
+++ b/eq-author-api/schema/typeDefs.js
@@ -941,6 +941,7 @@ input FilteredQuestionnairesInput {
   firstQuestionnaireIdOnPage: ID
   lastQuestionnaireIdOnPage: ID
   search: String
+  owner: String
 }
 
 input QueryInput {

From 7aeaf64057a59b7e63cfd26f3ca190d4b43e4347 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Wed, 3 Jul 2024 11:28:43 +0100
Subject: [PATCH 119/215] Add filters for created after and created before

---
 .../db/datastore/datastore-mongodb.js         | 59 ++++++++++---------
 .../schema/resolvers/homepage/index.js        |  4 ++
 eq-author-api/schema/typeDefs.js              |  2 +
 3 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.js b/eq-author-api/db/datastore/datastore-mongodb.js
index f1ab213740..47c0f3ab80 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.js
@@ -298,12 +298,37 @@ const listFilteredQuestionnaires = async (input) => {
       lastQuestionnaireIdOnPage,
       search,
       owner,
+      createdAfter,
+      createdBefore,
     } = input;
 
     // Gets the questionnaires collection
     const questionnairesCollection = dbo.collection("questionnaires");
     let questionnairesQuery;
 
+    const matchQuery = {
+      // Searches for questionnaires with `title` or `shortTitle` (short code) containing the search term
+      $or: [
+        { title: { $regex: search, $options: "i" } },
+        { shortTitle: { $regex: search, $options: "i" } },
+      ],
+      // Searches for questionnaires with owner name (based on `createdBy`) containing the search term
+      "owner.name": { $regex: owner, $options: "i" },
+    };
+
+    // If both `createdAfter` and `createdBefore` are provided, searches for questionnaires created between `createdAfter` and `createdBefore`
+    if (createdAfter && createdBefore) {
+      matchQuery.createdAt = { $gt: createdAfter, $lt: createdBefore };
+    }
+    // If `createdAfter` is provided without `createdBefore`, searches for questionnaires created after `createdAfter`
+    else if (createdAfter) {
+      matchQuery.createdAt = { $gt: createdAfter };
+    }
+    // If `createdBefore` is provided without `createdAfter`, searches for questionnaires created before `createdBefore`
+    else if (createdBefore) {
+      matchQuery.createdAt = { $lt: createdBefore };
+    }
+
     // Gets questionnaires on first page when firstQuestionnaireIdOnPage and lastQuestionnaireIdOnPage are not provided
     if (!firstQuestionnaireIdOnPage && !lastQuestionnaireIdOnPage) {
       questionnairesQuery = questionnairesCollection.aggregate([
@@ -317,15 +342,7 @@ const listFilteredQuestionnaires = async (input) => {
           },
         },
         {
-          $match: {
-            // Searches for questionnaires with owner name (based on `createdBy`) containing the search term
-            "owner.name": { $regex: owner, $options: "i" },
-            // Searches for questionnaires with `title` or `shortTitle` (short code) containing the search term
-            $or: [
-              { title: { $regex: search, $options: "i" } },
-              { shortTitle: { $regex: search, $options: "i" } },
-            ],
-          },
+          $match: matchQuery,
         },
         {
           $sort: { createdAt: -1 },
@@ -359,18 +376,10 @@ const listFilteredQuestionnaires = async (input) => {
         },
         {
           $match: {
-            // Searches for questionnaires created after firstQuestionnaireOnPage AND meeting all the search conditions
+            // Searches for questionnaires created after firstQuestionnaireOnPage AND meeting all the search conditions from `matchQuery`
             $and: [
               { createdAt: { $gt: firstQuestionnaireOnPage.createdAt } },
-              // Searches for questionnaires with owner name (based on `createdBy`) containing the search term
-              { "owner.name": { $regex: owner, $options: "i" } },
-              {
-                // Searches for questionnaires with `title` or `shortTitle` (short code) containing the search term
-                $or: [
-                  { title: { $regex: search, $options: "i" } },
-                  { shortTitle: { $regex: search, $options: "i" } },
-                ],
-              },
+              matchQuery,
             ],
           },
         },
@@ -406,18 +415,10 @@ const listFilteredQuestionnaires = async (input) => {
         },
         {
           $match: {
-            // Searches for questionnaires created before lastQuestionnaireOnPage AND meeting all the search conditions
+            // Searches for questionnaires created before lastQuestionnaireOnPage AND meeting all the search conditions from `matchQuery`
             $and: [
               { createdAt: { $lt: lastQuestionnaireOnPage.createdAt } },
-              // Searches for questionnaires with owner name (based on `createdBy`) containing the search term
-              { "owner.name": { $regex: owner, $options: "i" } },
-              {
-                // Searches for questionnaires with `title` or `shortTitle` (short code) containing the search term
-                $or: [
-                  { title: { $regex: search, $options: "i" } },
-                  { shortTitle: { $regex: search, $options: "i" } },
-                ],
-              },
+              matchQuery,
             ],
           },
         },
diff --git a/eq-author-api/schema/resolvers/homepage/index.js b/eq-author-api/schema/resolvers/homepage/index.js
index 5ddb72d4c8..2118b372e9 100644
--- a/eq-author-api/schema/resolvers/homepage/index.js
+++ b/eq-author-api/schema/resolvers/homepage/index.js
@@ -9,6 +9,8 @@ const Resolvers = {
         lastQuestionnaireIdOnPage,
         search,
         owner,
+        createdAfter,
+        createdBefore,
       } = input;
 
       const questionnaires = await listFilteredQuestionnaires({
@@ -17,6 +19,8 @@ const Resolvers = {
         lastQuestionnaireIdOnPage,
         search,
         owner,
+        createdAfter,
+        createdBefore,
       });
 
       return questionnaires;
diff --git a/eq-author-api/schema/typeDefs.js b/eq-author-api/schema/typeDefs.js
index 73a74d73d7..b978cc30f9 100644
--- a/eq-author-api/schema/typeDefs.js
+++ b/eq-author-api/schema/typeDefs.js
@@ -942,6 +942,8 @@ input FilteredQuestionnairesInput {
   lastQuestionnaireIdOnPage: ID
   search: String
   owner: String
+  createdAfter: DateTime
+  createdBefore: DateTime
 }
 
 input QueryInput {

From 8301eaa08967867e422534fbfc1dfa642ffc0416 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Fri, 5 Jul 2024 07:53:50 +0100
Subject: [PATCH 120/215] Update listFilteredQuestionnaires to search by
 questionnaire access

---
 .../db/datastore/datastore-mongodb.js         | 25 ++++++++++++++++++-
 .../schema/resolvers/homepage/index.js        | 23 ++++++++++-------
 eq-author-api/schema/typeDefs.js              |  2 ++
 3 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.js b/eq-author-api/db/datastore/datastore-mongodb.js
index 47c0f3ab80..45b95be7eb 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.js
@@ -290,7 +290,7 @@ const listQuestionnaires = async () => {
   }
 };
 
-const listFilteredQuestionnaires = async (input) => {
+const listFilteredQuestionnaires = async (input, ctx) => {
   try {
     const {
       resultsPerPage,
@@ -300,8 +300,11 @@ const listFilteredQuestionnaires = async (input) => {
       owner,
       createdAfter,
       createdBefore,
+      access,
     } = input;
 
+    const { id: userId } = ctx.user;
+
     // Gets the questionnaires collection
     const questionnairesCollection = dbo.collection("questionnaires");
     let questionnairesQuery;
@@ -329,6 +332,26 @@ const listFilteredQuestionnaires = async (input) => {
       matchQuery.createdAt = { $lt: createdBefore };
     }
 
+    // TODO: Implement "Read-only for editors" code
+    if (access === "Write") {
+      if (!matchQuery.$and) {
+        matchQuery.$and = [];
+      }
+      matchQuery.$and.push({
+        $or: [{ editors: { $in: [userId] } }, { createdBy: userId }],
+      });
+    } else if (access === "Read") {
+      if (!matchQuery.$and) {
+        matchQuery.$and = [];
+      }
+      matchQuery.$and.push(
+        {
+          editors: { $nin: [userId] },
+        },
+        { createdBy: { $ne: userId } }
+      );
+    }
+
     // Gets questionnaires on first page when firstQuestionnaireIdOnPage and lastQuestionnaireIdOnPage are not provided
     if (!firstQuestionnaireIdOnPage && !lastQuestionnaireIdOnPage) {
       questionnairesQuery = questionnairesCollection.aggregate([
diff --git a/eq-author-api/schema/resolvers/homepage/index.js b/eq-author-api/schema/resolvers/homepage/index.js
index 2118b372e9..fb2e83ef55 100644
--- a/eq-author-api/schema/resolvers/homepage/index.js
+++ b/eq-author-api/schema/resolvers/homepage/index.js
@@ -11,17 +11,22 @@ const Resolvers = {
         owner,
         createdAfter,
         createdBefore,
+        access,
       } = input;
 
-      const questionnaires = await listFilteredQuestionnaires({
-        resultsPerPage,
-        firstQuestionnaireIdOnPage,
-        lastQuestionnaireIdOnPage,
-        search,
-        owner,
-        createdAfter,
-        createdBefore,
-      });
+      const questionnaires = await listFilteredQuestionnaires(
+        {
+          resultsPerPage,
+          firstQuestionnaireIdOnPage,
+          lastQuestionnaireIdOnPage,
+          search,
+          owner,
+          createdAfter,
+          createdBefore,
+          access,
+        },
+        ctx
+      );
 
       return questionnaires;
     },
diff --git a/eq-author-api/schema/typeDefs.js b/eq-author-api/schema/typeDefs.js
index b978cc30f9..2711950646 100644
--- a/eq-author-api/schema/typeDefs.js
+++ b/eq-author-api/schema/typeDefs.js
@@ -44,6 +44,7 @@ enum QuestionnaireType {
 enum Permission {
   Read
   Write
+  ReadOnlyEditor
 }
 
 type Questionnaire {
@@ -944,6 +945,7 @@ input FilteredQuestionnairesInput {
   owner: String
   createdAfter: DateTime
   createdBefore: DateTime
+  access: Permission
 }
 
 input QueryInput {

From 3325a85bfee2c9e564bed32e3b60bcec321bca29 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Mon, 8 Jul 2024 11:38:45 +0100
Subject: [PATCH 121/215] Add initial filters for my questionnaires

---
 eq-author-api/db/datastore/datastore-mongodb.js  | 11 +++++++++++
 eq-author-api/schema/resolvers/homepage/index.js |  2 ++
 eq-author-api/schema/typeDefs.js                 |  1 +
 3 files changed, 14 insertions(+)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.js b/eq-author-api/db/datastore/datastore-mongodb.js
index 45b95be7eb..120e1412db 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.js
@@ -301,6 +301,7 @@ const listFilteredQuestionnaires = async (input, ctx) => {
       createdAfter,
       createdBefore,
       access,
+      myQuestionnaires,
     } = input;
 
     const { id: userId } = ctx.user;
@@ -352,6 +353,16 @@ const listFilteredQuestionnaires = async (input, ctx) => {
       );
     }
 
+    // TODO: When "My questionnaires" feature is implemented, implement code to filter questionnaires based on questionnaires marked as "My questionnaires"
+    if (myQuestionnaires) {
+      if (!matchQuery.$and) {
+        matchQuery.$and = [];
+      }
+      matchQuery.$and.push({
+        $or: [{ editors: { $in: [userId] } }, { createdBy: userId }],
+      });
+    }
+
     // Gets questionnaires on first page when firstQuestionnaireIdOnPage and lastQuestionnaireIdOnPage are not provided
     if (!firstQuestionnaireIdOnPage && !lastQuestionnaireIdOnPage) {
       questionnairesQuery = questionnairesCollection.aggregate([
diff --git a/eq-author-api/schema/resolvers/homepage/index.js b/eq-author-api/schema/resolvers/homepage/index.js
index fb2e83ef55..7341560044 100644
--- a/eq-author-api/schema/resolvers/homepage/index.js
+++ b/eq-author-api/schema/resolvers/homepage/index.js
@@ -12,6 +12,7 @@ const Resolvers = {
         createdAfter,
         createdBefore,
         access,
+        myQuestionnaires,
       } = input;
 
       const questionnaires = await listFilteredQuestionnaires(
@@ -24,6 +25,7 @@ const Resolvers = {
           createdAfter,
           createdBefore,
           access,
+          myQuestionnaires,
         },
         ctx
       );
diff --git a/eq-author-api/schema/typeDefs.js b/eq-author-api/schema/typeDefs.js
index 2711950646..2d2ea54965 100644
--- a/eq-author-api/schema/typeDefs.js
+++ b/eq-author-api/schema/typeDefs.js
@@ -946,6 +946,7 @@ input FilteredQuestionnairesInput {
   createdAfter: DateTime
   createdBefore: DateTime
   access: Permission
+  myQuestionnaires: Boolean
 }
 
 input QueryInput {

From b030ac78085b01df293ee39e2ef1cd8a6ab86ad5 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Tue, 9 Jul 2024 08:08:38 +0100
Subject: [PATCH 122/215] Add sortBy to listFilteredQuestionnaires

---
 .../db/datastore/datastore-mongodb.js         | 52 ++++++++++++++-----
 .../schema/resolvers/homepage/index.js        |  2 +
 eq-author-api/schema/typeDefs.js              |  1 +
 3 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.js b/eq-author-api/db/datastore/datastore-mongodb.js
index 120e1412db..1350d69f4d 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.js
@@ -302,6 +302,7 @@ const listFilteredQuestionnaires = async (input, ctx) => {
       createdBefore,
       access,
       myQuestionnaires,
+      sortBy,
     } = input;
 
     const { id: userId } = ctx.user;
@@ -379,7 +380,7 @@ const listFilteredQuestionnaires = async (input, ctx) => {
           $match: matchQuery,
         },
         {
-          $sort: { createdAt: -1 },
+          $sort: { createdAt: sortBy === "createdDateDesc" ? -1 : 1 }, // Sorts by either most recently created first or earliest created first based on `sortBy`
         },
         {
           $limit: resultsPerPage,
@@ -396,7 +397,8 @@ const listFilteredQuestionnaires = async (input, ctx) => {
       /*
         Gets questionnaires on previous page based on firstQuestionnaireOnPage
         Only finds questionnaires that meet the search conditions (e.g. owner name matching `owner` search field)
-        Uses `gt` (greater than) to find questionnaires meeting the conditions created after firstQuestionnaireOnPage, sorts from earliest created first, and limits to `resultsPerPage` number of questionnaires
+        Uses `gt` (greater than) or `lt` (less than) to find questionnaires created after or before firstQuestionnaireOnPage (based on `sortBy`) meeting the conditions, 
+        sorts from earliest created or most recently created first (based on `sortBy`), and limits to `resultsPerPage` number of questionnaires
       */
       questionnairesQuery = questionnairesCollection.aggregate([
         // From the `users` collection, gets the owner (based on `createdBy`) of each questionnaire by performing a join to match questionnaire `createdBy` with user `id`
@@ -410,15 +412,25 @@ const listFilteredQuestionnaires = async (input, ctx) => {
         },
         {
           $match: {
-            // Searches for questionnaires created after firstQuestionnaireOnPage AND meeting all the search conditions from `matchQuery`
+            // Searches for questionnaires created after or before firstQuestionnaireOnPage (based on `sortBy`) AND meeting all the search conditions from `matchQuery`
             $and: [
-              { createdAt: { $gt: firstQuestionnaireOnPage.createdAt } },
+              {
+                createdAt:
+                  sortBy === "createdDateDesc"
+                    ? { $gt: firstQuestionnaireOnPage.createdAt }
+                    : { $lt: firstQuestionnaireOnPage.createdAt },
+              },
               matchQuery,
             ],
           },
         },
         {
-          $sort: { createdAt: 1 },
+          /* 
+            Sorts by either earliest created first or most recently created first based on `sortBy` 
+            (previous page, so to get the previous questionnaires, sorts by earliest created first when `sortBy` is `createdDateDesc`
+            as otherwise previous page's questionnaires would be the most recently created ones)
+          */
+          $sort: { createdAt: sortBy === "createdDateDesc" ? 1 : -1 },
         },
         {
           $limit: resultsPerPage,
@@ -435,7 +447,8 @@ const listFilteredQuestionnaires = async (input, ctx) => {
       /* 
         Gets questionnaires on next page based on lastQuestionnaireOnPage
         Only finds questionnaires that meet the search conditions (e.g. owner name matching `owner` search field)
-        Uses `lt` (less than) to find questionnaires meeting the conditions created before lastQuestionnaireOnPage, sorts from most recently created first, and limits to `resultsPerPage` number of questionnaires
+        Uses `lt` (less than) or `gt` (greater than) to find questionnaires created before or after lastQuestionnaireOnPage (based on `sortBy`) meeting the conditions, 
+        sorts from most recently created or earliest created first (based on `sortBy`), and limits to `resultsPerPage` number of questionnaires
       */
       questionnairesQuery = questionnairesCollection.aggregate([
         // From the `users` collection, gets the owner (based on `createdBy`) of each questionnaire by performing a join to match questionnaire `createdBy` with user `id`
@@ -449,15 +462,20 @@ const listFilteredQuestionnaires = async (input, ctx) => {
         },
         {
           $match: {
-            // Searches for questionnaires created before lastQuestionnaireOnPage AND meeting all the search conditions from `matchQuery`
+            // Searches for questionnaires created before or after lastQuestionnaireOnPage (based on `sortBy`) AND meeting all the search conditions from `matchQuery`
             $and: [
-              { createdAt: { $lt: lastQuestionnaireOnPage.createdAt } },
+              {
+                createdAt:
+                  sortBy === "createdDateDesc"
+                    ? { $lt: lastQuestionnaireOnPage.createdAt }
+                    : { $gt: lastQuestionnaireOnPage.createdAt },
+              },
               matchQuery,
             ],
           },
         },
         {
-          $sort: { createdAt: -1 },
+          $sort: { createdAt: sortBy === "createdDateDesc" ? -1 : 1 }, // Sorts by either most recently created first or earliest created first based on `sortBy`
         },
         {
           $limit: resultsPerPage,
@@ -484,13 +502,19 @@ const listFilteredQuestionnaires = async (input, ctx) => {
 
     /* 
       Sorts questionnaires by most recently created first if firstQuestionnaireIdOnPage is provided without lastQuestionnaireIdOnPage 
-      This condition's query previously sorted by earliest created questionnaire first to get the `resultsPerPage` number of questionnaires created after firstQuestionnaireOnPage
-      This ensures questionnaires are displayed in order from most recently created first in this condition
+      This condition's query previously sorted in reverse order to get the `resultsPerPage` number of questionnaires created after or before firstQuestionnaireOnPage
+      This ensures questionnaires are displayed in the correct order (based on `sortBy`) in this condition
     */
     if (firstQuestionnaireIdOnPage && !lastQuestionnaireIdOnPage) {
-      transformedQuestionnaires = transformedQuestionnaires.sort((a, b) =>
-        a.createdAt > b.createdAt ? -1 : 1
-      );
+      if (sortBy === "createdDateDesc") {
+        transformedQuestionnaires = transformedQuestionnaires.sort((a, b) =>
+          a.createdAt > b.createdAt ? -1 : 1
+        );
+      } else {
+        transformedQuestionnaires = transformedQuestionnaires.sort((a, b) =>
+          a.createdAt > b.createdAt ? 1 : -1
+        );
+      }
     }
 
     return transformedQuestionnaires;
diff --git a/eq-author-api/schema/resolvers/homepage/index.js b/eq-author-api/schema/resolvers/homepage/index.js
index 7341560044..70300bf9ec 100644
--- a/eq-author-api/schema/resolvers/homepage/index.js
+++ b/eq-author-api/schema/resolvers/homepage/index.js
@@ -13,6 +13,7 @@ const Resolvers = {
         createdBefore,
         access,
         myQuestionnaires,
+        sortBy,
       } = input;
 
       const questionnaires = await listFilteredQuestionnaires(
@@ -26,6 +27,7 @@ const Resolvers = {
           createdBefore,
           access,
           myQuestionnaires,
+          sortBy,
         },
         ctx
       );
diff --git a/eq-author-api/schema/typeDefs.js b/eq-author-api/schema/typeDefs.js
index 2d2ea54965..616da94b00 100644
--- a/eq-author-api/schema/typeDefs.js
+++ b/eq-author-api/schema/typeDefs.js
@@ -947,6 +947,7 @@ input FilteredQuestionnairesInput {
   createdBefore: DateTime
   access: Permission
   myQuestionnaires: Boolean
+  sortBy: String
 }
 
 input QueryInput {

From 1d5cdd8a6f1d9811b05178205da47bb4a2bac479 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Tue, 9 Jul 2024 12:52:09 +0100
Subject: [PATCH 123/215] Add total pages resolver

---
 eq-author-api/db/datastore/datastore-mongodb.js  | 12 ++++++++++++
 eq-author-api/schema/resolvers/homepage/index.js | 11 ++++++++++-
 eq-author-api/schema/typeDefs.js                 |  5 +++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.js b/eq-author-api/db/datastore/datastore-mongodb.js
index 1350d69f4d..55dd6b8ac7 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.js
@@ -527,6 +527,17 @@ const listFilteredQuestionnaires = async (input, ctx) => {
   }
 };
 
+const getTotalPages = async (resultsPerPage) => {
+  try {
+    const collection = dbo.collection("questionnaires");
+    const totalQuestionnaires = await collection.countDocuments();
+    return Math.ceil(totalQuestionnaires / resultsPerPage) - 1;
+  } catch (error) {
+    logger.error(error, "Unable to get total pages");
+    return;
+  }
+};
+
 const createComments = async (questionnaireId) => {
   try {
     if (!questionnaireId) {
@@ -724,6 +735,7 @@ module.exports = {
   deleteQuestionnaire,
   listQuestionnaires,
   listFilteredQuestionnaires,
+  getTotalPages,
   getQuestionnaire,
   getQuestionnaireMetaById,
   createComments,
diff --git a/eq-author-api/schema/resolvers/homepage/index.js b/eq-author-api/schema/resolvers/homepage/index.js
index 70300bf9ec..107aa3ddd1 100644
--- a/eq-author-api/schema/resolvers/homepage/index.js
+++ b/eq-author-api/schema/resolvers/homepage/index.js
@@ -1,4 +1,7 @@
-const { listFilteredQuestionnaires } = require("../../../db/datastore");
+const {
+  listFilteredQuestionnaires,
+  getTotalPages,
+} = require("../../../db/datastore");
 
 const Resolvers = {
   Query: {
@@ -34,6 +37,12 @@ const Resolvers = {
 
       return questionnaires;
     },
+
+    totalPages: async (_, { input = {} }) => {
+      const { resultsPerPage = 10 } = input;
+
+      return getTotalPages(resultsPerPage);
+    },
   },
 };
 
diff --git a/eq-author-api/schema/typeDefs.js b/eq-author-api/schema/typeDefs.js
index 616da94b00..41e7e7cf9b 100644
--- a/eq-author-api/schema/typeDefs.js
+++ b/eq-author-api/schema/typeDefs.js
@@ -923,6 +923,7 @@ type Query {
   listNames: [ListName]
   collectionListNames: [ListName]
   supplementaryDataListNames: [ListName]
+  totalPages(input: TotalPagesInput): Int
 }
 
 input CommonFilters {
@@ -950,6 +951,10 @@ input FilteredQuestionnairesInput {
   sortBy: String
 }
 
+input TotalPagesInput {
+  resultsPerPage: Int
+}
+
 input QueryInput {
   id: ID
   questionnaireId: ID

From b73fdc3ba169642a848016a28d30c37786d9d426 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Tue, 9 Jul 2024 13:36:58 +0100
Subject: [PATCH 124/215] Add all access questionnaires filter

---
 eq-author-api/db/datastore/datastore-mongodb.js | 5 +++++
 eq-author-api/schema/typeDefs.js                | 1 +
 2 files changed, 6 insertions(+)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.js b/eq-author-api/db/datastore/datastore-mongodb.js
index 55dd6b8ac7..5f499f3474 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.js
@@ -335,6 +335,11 @@ const listFilteredQuestionnaires = async (input, ctx) => {
     }
 
     // TODO: Implement "Read-only for editors" code
+    if (access === "All") {
+      if (matchQuery.$and) {
+        delete matchQuery.$and;
+      }
+    }
     if (access === "Write") {
       if (!matchQuery.$and) {
         matchQuery.$and = [];
diff --git a/eq-author-api/schema/typeDefs.js b/eq-author-api/schema/typeDefs.js
index 41e7e7cf9b..2e5abe6086 100644
--- a/eq-author-api/schema/typeDefs.js
+++ b/eq-author-api/schema/typeDefs.js
@@ -42,6 +42,7 @@ enum QuestionnaireType {
 }
 
 enum Permission {
+  All
   Read
   Write
   ReadOnlyEditor

From c1dfb59971923fbb1b13db61d64fbde36b7bfa26 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Tue, 9 Jul 2024 14:48:57 +0100
Subject: [PATCH 125/215] Add private questionnaires filter

---
 eq-author-api/db/datastore/datastore-mongodb.js | 12 ++++++++++--
 eq-author-api/schema/typeDefs.js                |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.js b/eq-author-api/db/datastore/datastore-mongodb.js
index 5f499f3474..fb5ceffd79 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.js
@@ -334,7 +334,6 @@ const listFilteredQuestionnaires = async (input, ctx) => {
       matchQuery.createdAt = { $lt: createdBefore };
     }
 
-    // TODO: Implement "Read-only for editors" code
     if (access === "All") {
       if (matchQuery.$and) {
         delete matchQuery.$and;
@@ -347,7 +346,8 @@ const listFilteredQuestionnaires = async (input, ctx) => {
       matchQuery.$and.push({
         $or: [{ editors: { $in: [userId] } }, { createdBy: userId }],
       });
-    } else if (access === "Read") {
+    }
+    if (access === "Read") {
       if (!matchQuery.$and) {
         matchQuery.$and = [];
       }
@@ -358,6 +358,14 @@ const listFilteredQuestionnaires = async (input, ctx) => {
         { createdBy: { $ne: userId } }
       );
     }
+    if (access === "PrivateQuestionnaires") {
+      if (!matchQuery.$and) {
+        matchQuery.$and = [];
+      }
+      matchQuery.$and.push({
+        isPublic: false,
+      });
+    }
 
     // TODO: When "My questionnaires" feature is implemented, implement code to filter questionnaires based on questionnaires marked as "My questionnaires"
     if (myQuestionnaires) {
diff --git a/eq-author-api/schema/typeDefs.js b/eq-author-api/schema/typeDefs.js
index 2e5abe6086..e441e67916 100644
--- a/eq-author-api/schema/typeDefs.js
+++ b/eq-author-api/schema/typeDefs.js
@@ -45,7 +45,7 @@ enum Permission {
   All
   Read
   Write
-  ReadOnlyEditor
+  PrivateQuestionnaires
 }
 
 type Questionnaire {

From 40c135b0a005c17ce1d5c4b39b8bd4b78bd13465 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Wed, 10 Jul 2024 16:20:54 +0100
Subject: [PATCH 126/215] Fix incorrect total pages when searching for
 questionnaires

---
 .../db/datastore/datastore-mongodb.js         | 95 +++++++++++++++----
 .../schema/resolvers/homepage/index.js        | 26 ++++-
 eq-author-api/schema/typeDefs.js              |  6 ++
 3 files changed, 107 insertions(+), 20 deletions(-)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.js b/eq-author-api/db/datastore/datastore-mongodb.js
index fb5ceffd79..2c5193d4b7 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.js
@@ -290,27 +290,19 @@ const listQuestionnaires = async () => {
   }
 };
 
-const listFilteredQuestionnaires = async (input, ctx) => {
+const getMatchQuery = async (input, ctx) => {
   try {
     const {
-      resultsPerPage,
-      firstQuestionnaireIdOnPage,
-      lastQuestionnaireIdOnPage,
       search,
       owner,
       createdAfter,
       createdBefore,
       access,
       myQuestionnaires,
-      sortBy,
     } = input;
 
     const { id: userId } = ctx.user;
 
-    // Gets the questionnaires collection
-    const questionnairesCollection = dbo.collection("questionnaires");
-    let questionnairesQuery;
-
     const matchQuery = {
       // Searches for questionnaires with `title` or `shortTitle` (short code) containing the search term
       $or: [
@@ -335,10 +327,19 @@ const listFilteredQuestionnaires = async (input, ctx) => {
     }
 
     if (access === "All") {
-      if (matchQuery.$and) {
-        delete matchQuery.$and;
+      if (!matchQuery.$and) {
+        matchQuery.$and = [];
       }
+      // Searches for all questionnaires that are public, the user is an editor of, or the user created (all questionnaires the user has access to)
+      matchQuery.$and.push({
+        $or: [
+          { isPublic: true },
+          { editors: { $in: [userId] } },
+          { createdBy: userId },
+        ],
+      });
     }
+    // Searches for all questionnaires the user can edit (all questionnaires the user is an editor of or the user created)
     if (access === "Write") {
       if (!matchQuery.$and) {
         matchQuery.$and = [];
@@ -347,6 +348,7 @@ const listFilteredQuestionnaires = async (input, ctx) => {
         $or: [{ editors: { $in: [userId] } }, { createdBy: userId }],
       });
     }
+    // Searches for all questionnaires the user can view but not edit (all public questionnaires the user is not an editor of and did not create)
     if (access === "Read") {
       if (!matchQuery.$and) {
         matchQuery.$and = [];
@@ -355,14 +357,17 @@ const listFilteredQuestionnaires = async (input, ctx) => {
         {
           editors: { $nin: [userId] },
         },
-        { createdBy: { $ne: userId } }
+        { createdBy: { $ne: userId } },
+        { isPublic: true }
       );
     }
+    // Searches for all non-public questionnaires the user can edit (all questionnaires the user is an editor of or the user created that are not public)
     if (access === "PrivateQuestionnaires") {
       if (!matchQuery.$and) {
         matchQuery.$and = [];
       }
       matchQuery.$and.push({
+        $or: [{ editors: { $in: [userId] } }, { createdBy: userId }],
         isPublic: false,
       });
     }
@@ -377,6 +382,30 @@ const listFilteredQuestionnaires = async (input, ctx) => {
       });
     }
 
+    return matchQuery;
+  } catch (error) {
+    logger.error(
+      { error, input },
+      "Unable to get match query for filtering questionnaires (from getMatchQuery)"
+    );
+  }
+};
+
+const listFilteredQuestionnaires = async (input, ctx) => {
+  try {
+    const {
+      resultsPerPage,
+      firstQuestionnaireIdOnPage,
+      lastQuestionnaireIdOnPage,
+      sortBy,
+    } = input;
+
+    // Gets the questionnaires collection
+    const questionnairesCollection = dbo.collection("questionnaires");
+    let questionnairesQuery;
+
+    const matchQuery = await getMatchQuery(input, ctx);
+
     // Gets questionnaires on first page when firstQuestionnaireIdOnPage and lastQuestionnaireIdOnPage are not provided
     if (!firstQuestionnaireIdOnPage && !lastQuestionnaireIdOnPage) {
       questionnairesQuery = questionnairesCollection.aggregate([
@@ -503,7 +532,11 @@ const listFilteredQuestionnaires = async (input, ctx) => {
     const questionnaires = await questionnairesQuery.toArray();
 
     if (questionnaires.length === 0) {
-      logger.info("No questionnaires found (from listFilteredQuestionnaires)");
+      logger.debug(
+        `No questionnaires found with input: ${JSON.stringify(
+          input
+        )} (from listFilteredQuestionnaires)`
+      );
       return [];
     }
 
@@ -540,11 +573,39 @@ const listFilteredQuestionnaires = async (input, ctx) => {
   }
 };
 
-const getTotalPages = async (resultsPerPage) => {
+const getTotalPages = async (input, ctx) => {
   try {
-    const collection = dbo.collection("questionnaires");
-    const totalQuestionnaires = await collection.countDocuments();
-    return Math.ceil(totalQuestionnaires / resultsPerPage) - 1;
+    const { resultsPerPage } = input;
+
+    // Gets the questionnaires collection
+    const questionnairesCollection = dbo.collection("questionnaires");
+
+    const matchQuery = await getMatchQuery(input, ctx);
+
+    // Gets the total number of questionnaires that meet the search conditions
+    const { totalFilteredQuestionnaires } = await questionnairesCollection
+      .aggregate([
+        {
+          $lookup: {
+            from: "users",
+            localField: "createdBy",
+            foreignField: "id",
+            as: "owner",
+          },
+        },
+        {
+          $match: matchQuery,
+        },
+        {
+          $count: "totalFilteredQuestionnaires",
+        },
+      ])
+      .next();
+
+    // Calculates the total number of pages by dividing the total number of filtered questionnaires by the number of results per page, and rounding up
+    const totalPages = Math.ceil(totalFilteredQuestionnaires / resultsPerPage);
+
+    return totalPages;
   } catch (error) {
     logger.error(error, "Unable to get total pages");
     return;
diff --git a/eq-author-api/schema/resolvers/homepage/index.js b/eq-author-api/schema/resolvers/homepage/index.js
index 107aa3ddd1..0cbaff6fd6 100644
--- a/eq-author-api/schema/resolvers/homepage/index.js
+++ b/eq-author-api/schema/resolvers/homepage/index.js
@@ -38,10 +38,30 @@ const Resolvers = {
       return questionnaires;
     },
 
-    totalPages: async (_, { input = {} }) => {
-      const { resultsPerPage = 10 } = input;
+    totalPages: async (_, { input = {} }, ctx) => {
+      const {
+        resultsPerPage = 10,
+        search,
+        owner,
+        createdAfter,
+        createdBefore,
+        access,
+        myQuestionnaires,
+      } = input;
 
-      return getTotalPages(resultsPerPage);
+      const totalPages = await getTotalPages(
+        {
+          resultsPerPage,
+          search,
+          owner,
+          createdAfter,
+          createdBefore,
+          access,
+          myQuestionnaires,
+        },
+        ctx
+      );
+      return totalPages;
     },
   },
 };
diff --git a/eq-author-api/schema/typeDefs.js b/eq-author-api/schema/typeDefs.js
index e441e67916..b02b6b38b9 100644
--- a/eq-author-api/schema/typeDefs.js
+++ b/eq-author-api/schema/typeDefs.js
@@ -954,6 +954,12 @@ input FilteredQuestionnairesInput {
 
 input TotalPagesInput {
   resultsPerPage: Int
+  search: String
+  owner: String
+  createdAfter: DateTime
+  createdBefore: DateTime
+  access: Permission
+  myQuestionnaires: Boolean
 }
 
 input QueryInput {

From 44d369f295f105bb147340c8c503751a2cea0cec Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Thu, 11 Jul 2024 09:31:38 +0100
Subject: [PATCH 127/215] Update created after and created before to include
 created on

---
 .../db/datastore/datastore-mongodb.js         | 34 +++++++++++--------
 .../schema/resolvers/homepage/index.js        | 16 ++++-----
 eq-author-api/schema/typeDefs.js              |  8 ++---
 3 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.js b/eq-author-api/db/datastore/datastore-mongodb.js
index 2c5193d4b7..ab3c910171 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.js
@@ -295,8 +295,8 @@ const getMatchQuery = async (input, ctx) => {
     const {
       search,
       owner,
-      createdAfter,
-      createdBefore,
+      createdOnOrAfter,
+      createdOnOrBefore,
       access,
       myQuestionnaires,
     } = input;
@@ -313,17 +313,20 @@ const getMatchQuery = async (input, ctx) => {
       "owner.name": { $regex: owner, $options: "i" },
     };
 
-    // If both `createdAfter` and `createdBefore` are provided, searches for questionnaires created between `createdAfter` and `createdBefore`
-    if (createdAfter && createdBefore) {
-      matchQuery.createdAt = { $gt: createdAfter, $lt: createdBefore };
+    // If both `createdOnOrAfter` and `createdOnOrBefore` are provided, searches for questionnaires created between `createdOnOrAfter` and `createdOnOrBefore` inclusive
+    if (createdOnOrAfter && createdOnOrBefore) {
+      matchQuery.createdAt = {
+        $gte: createdOnOrAfter, // gte: Greater than or equal to
+        $lte: createdOnOrBefore, // lte: Less than or equal to
+      };
     }
-    // If `createdAfter` is provided without `createdBefore`, searches for questionnaires created after `createdAfter`
-    else if (createdAfter) {
-      matchQuery.createdAt = { $gt: createdAfter };
+    // If `createdOnOrAfter` is provided without `createdOnOrBefore`, searches for questionnaires created on or after `createdOnOrAfter`
+    else if (createdOnOrAfter) {
+      matchQuery.createdAt = { $gte: createdOnOrAfter }; // gte: Greater than or equal to
     }
-    // If `createdBefore` is provided without `createdAfter`, searches for questionnaires created before `createdBefore`
-    else if (createdBefore) {
-      matchQuery.createdAt = { $lt: createdBefore };
+    // If `createdOnOrBefore` is provided without `createdOnOrAfter`, searches for questionnaires created on or before `createdOnOrBefore`
+    else if (createdOnOrBefore) {
+      matchQuery.createdAt = { $lte: createdOnOrBefore }; // lte: Less than or equal to
     }
 
     if (access === "All") {
@@ -385,7 +388,7 @@ const getMatchQuery = async (input, ctx) => {
     return matchQuery;
   } catch (error) {
     logger.error(
-      { error, input },
+      { error: error.stack, input },
       "Unable to get match query for filtering questionnaires (from getMatchQuery)"
     );
   }
@@ -566,7 +569,7 @@ const listFilteredQuestionnaires = async (input, ctx) => {
     return transformedQuestionnaires;
   } catch (error) {
     logger.error(
-      error,
+      { error: error.stack, input },
       "Unable to retrieve questionnaires (from listFilteredQuestionnaires)"
     );
     return;
@@ -607,7 +610,10 @@ const getTotalPages = async (input, ctx) => {
 
     return totalPages;
   } catch (error) {
-    logger.error(error, "Unable to get total pages");
+    logger.error(
+      { error: error.stack, input },
+      "Unable to get total pages (from getTotalPages)"
+    );
     return;
   }
 };
diff --git a/eq-author-api/schema/resolvers/homepage/index.js b/eq-author-api/schema/resolvers/homepage/index.js
index 0cbaff6fd6..7a6aa692a0 100644
--- a/eq-author-api/schema/resolvers/homepage/index.js
+++ b/eq-author-api/schema/resolvers/homepage/index.js
@@ -12,8 +12,8 @@ const Resolvers = {
         lastQuestionnaireIdOnPage,
         search,
         owner,
-        createdAfter,
-        createdBefore,
+        createdOnOrAfter,
+        createdOnOrBefore,
         access,
         myQuestionnaires,
         sortBy,
@@ -26,8 +26,8 @@ const Resolvers = {
           lastQuestionnaireIdOnPage,
           search,
           owner,
-          createdAfter,
-          createdBefore,
+          createdOnOrAfter,
+          createdOnOrBefore,
           access,
           myQuestionnaires,
           sortBy,
@@ -43,8 +43,8 @@ const Resolvers = {
         resultsPerPage = 10,
         search,
         owner,
-        createdAfter,
-        createdBefore,
+        createdOnOrAfter,
+        createdOnOrBefore,
         access,
         myQuestionnaires,
       } = input;
@@ -54,8 +54,8 @@ const Resolvers = {
           resultsPerPage,
           search,
           owner,
-          createdAfter,
-          createdBefore,
+          createdOnOrAfter,
+          createdOnOrBefore,
           access,
           myQuestionnaires,
         },
diff --git a/eq-author-api/schema/typeDefs.js b/eq-author-api/schema/typeDefs.js
index b02b6b38b9..ead3db9fdb 100644
--- a/eq-author-api/schema/typeDefs.js
+++ b/eq-author-api/schema/typeDefs.js
@@ -945,8 +945,8 @@ input FilteredQuestionnairesInput {
   lastQuestionnaireIdOnPage: ID
   search: String
   owner: String
-  createdAfter: DateTime
-  createdBefore: DateTime
+  createdOnOrAfter: DateTime
+  createdOnOrBefore: DateTime
   access: Permission
   myQuestionnaires: Boolean
   sortBy: String
@@ -956,8 +956,8 @@ input TotalPagesInput {
   resultsPerPage: Int
   search: String
   owner: String
-  createdAfter: DateTime
-  createdBefore: DateTime
+  createdOnOrAfter: DateTime
+  createdOnOrBefore: DateTime
   access: Permission
   myQuestionnaires: Boolean
 }

From 013549ad89c3d9917e6165b2b561b5a7bce490b9 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Tue, 16 Jul 2024 12:50:49 +0100
Subject: [PATCH 128/215] Add tests for search by questionnaire title and owner

---
 .../db/datastore/datastore-mongodb.test.js    | 89 ++++++++++++++++++-
 .../db/datastore/mock-questionnaire.js        |  5 +-
 2 files changed, 90 insertions(+), 4 deletions(-)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.test.js b/eq-author-api/db/datastore/datastore-mongodb.test.js
index 3de432fc7d..7f9541e74a 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.test.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.test.js
@@ -1,4 +1,4 @@
-const mockQuestionnnaire = require("./mock-questionnaire");
+const mockQuestionnaire = require("./mock-questionnaire");
 const { noteCreationEvent } = require("../../utils/questionnaireEvents");
 const { v4: uuidv4 } = require("uuid");
 
@@ -13,7 +13,7 @@ describe("MongoDB Datastore", () => {
   });
 
   beforeEach(() => {
-    questionnaire = mockQuestionnnaire();
+    questionnaire = mockQuestionnaire({});
     ctx = {
       user: {
         id: 123,
@@ -58,6 +58,10 @@ describe("MongoDB Datastore", () => {
       expect(() => mongoDB.listQuestionnaires()).not.toThrow();
     });
 
+    it("Should not throw error on listFilteredQuestionnaires", async () => {
+      expect(() => mongoDB.listFilteredQuestionnaires({}, ctx)).not.toThrow();
+    });
+
     it("Should not throw error on createQuestionnaire", async () => {
       expect(() =>
         mongoDB.createQuestionnaire(questionnaire, ctx)
@@ -340,6 +344,87 @@ describe("MongoDB Datastore", () => {
       });
     });
 
+    describe("Getting a list of filtered questionnaires", () => {
+      beforeAll(async () => {
+        await mongoDB.createUser({
+          id: "user-1",
+          email: "user1@example.com",
+          name: "Joe Bloggs",
+          externalId: "user-1",
+          picture: "",
+        });
+
+        await mongoDB.createUser({
+          id: "user-2",
+          email: "user2@example.com",
+          name: "Jane Smith",
+          externalId: "user-2",
+          picture: "",
+        });
+
+        await mongoDB.createQuestionnaire(
+          mockQuestionnaire({
+            title: "Test questionnaire 1",
+            ownerId: "user-1",
+          }),
+          ctx
+        );
+        await mongoDB.createQuestionnaire(
+          mockQuestionnaire({
+            title: "Test questionnaire 2",
+            ownerId: "user-1",
+          }),
+          ctx
+        );
+        await mongoDB.createQuestionnaire(
+          mockQuestionnaire({
+            title: "Test questionnaire 3",
+            ownerId: "user-2",
+          }),
+          ctx
+        );
+        await mongoDB.createQuestionnaire(
+          mockQuestionnaire({
+            title: "Test questionnaire 4",
+            ownerId: "user-2",
+          }),
+          ctx
+        );
+      });
+
+      it("Should return questionnaires with title containing the search term", async () => {
+        const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
+          {
+            search: "Test questionnaire",
+            owner: "",
+            resultsPerPage: 10,
+          },
+          ctx
+        );
+
+        expect(listOfQuestionnaires.length).toBe(4);
+        expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 1");
+        expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 2");
+        expect(listOfQuestionnaires[2].title).toEqual("Test questionnaire 3");
+        expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 4");
+      });
+
+      it("Should return questionnaires with owner containing the `owner` search term", async () => {
+        const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
+          {
+            search: "",
+            owner: "Jane",
+            resultsPerPage: 10,
+          },
+          ctx
+        );
+
+        expect(listOfQuestionnaires.length).toBe(2);
+        expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 3");
+        expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 4");
+      });
+    });
+
     describe("Creating a history event", () => {
       let mockHistoryEvent;
       beforeEach(() => {
diff --git a/eq-author-api/db/datastore/mock-questionnaire.js b/eq-author-api/db/datastore/mock-questionnaire.js
index cefbae0be5..a49e3ee69a 100644
--- a/eq-author-api/db/datastore/mock-questionnaire.js
+++ b/eq-author-api/db/datastore/mock-questionnaire.js
@@ -1,8 +1,8 @@
 const { v4: uuidv4 } = require("uuid");
 
-const mockQuestionnaire = () => {
+const mockQuestionnaire = ({ title, ownerId }) => {
   const questionnaire = {
-    title: "Working from home",
+    title: title || "Working from home",
     theme: "business",
     legalBasis: "Voluntary",
     navigation: false,
@@ -36,6 +36,7 @@ const mockQuestionnaire = () => {
     editors: [],
     isPublic: true,
     publishStatus: "Unpublished",
+    createdBy: ownerId || "user-1",
   };
   return questionnaire;
 };

From 90b9cc154ed13dd7438ace1d5e40dade57b5157b Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Tue, 16 Jul 2024 14:25:20 +0100
Subject: [PATCH 129/215] Add test for questionnaires created on or after date

---
 .../db/datastore/datastore-mongodb.test.js    | 31 +++++++++++++++++++
 .../db/datastore/mock-questionnaire.js        |  5 +--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.test.js b/eq-author-api/db/datastore/datastore-mongodb.test.js
index 7f9541e74a..cb31af4dc3 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.test.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.test.js
@@ -366,6 +366,7 @@ describe("MongoDB Datastore", () => {
           mockQuestionnaire({
             title: "Test questionnaire 1",
             ownerId: "user-1",
+            createdAt: new Date(2021, 2, 5, 5, 0, 0, 0),
           }),
           ctx
         );
@@ -373,6 +374,7 @@ describe("MongoDB Datastore", () => {
           mockQuestionnaire({
             title: "Test questionnaire 2",
             ownerId: "user-1",
+            createdAt: new Date(2021, 2, 10, 5, 0, 0, 0),
           }),
           ctx
         );
@@ -380,6 +382,7 @@ describe("MongoDB Datastore", () => {
           mockQuestionnaire({
             title: "Test questionnaire 3",
             ownerId: "user-2",
+            createdAt: new Date(2021, 2, 15, 5, 0, 0, 0),
           }),
           ctx
         );
@@ -387,6 +390,7 @@ describe("MongoDB Datastore", () => {
           mockQuestionnaire({
             title: "Test questionnaire 4",
             ownerId: "user-2",
+            createdAt: new Date(2021, 2, 20, 5, 0, 0, 0),
           }),
           ctx
         );
@@ -423,6 +427,33 @@ describe("MongoDB Datastore", () => {
         expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 3");
         expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 4");
       });
+
+      it("Should return questionnaires created on or after the searched date", async () => {
+        const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
+          {
+            search: "",
+            owner: "",
+            createdOnOrAfter: new Date(2021, 2, 10),
+            resultsPerPage: 10,
+          },
+          ctx
+        );
+
+        expect(listOfQuestionnaires.length).toBe(6);
+        expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 2");
+        expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 3");
+        expect(listOfQuestionnaires[2].title).toEqual("Test questionnaire 4");
+        // Questionnaires created in previous tests
+        expect(listOfQuestionnaires[3].title).toEqual(
+          "Default questionnaire title"
+        );
+        expect(listOfQuestionnaires[4].title).toEqual(
+          "Default questionnaire title"
+        );
+        expect(listOfQuestionnaires[5].title).toEqual(
+          "Default questionnaire title"
+        );
+      });
     });
 
     describe("Creating a history event", () => {
diff --git a/eq-author-api/db/datastore/mock-questionnaire.js b/eq-author-api/db/datastore/mock-questionnaire.js
index a49e3ee69a..0efe17bcaf 100644
--- a/eq-author-api/db/datastore/mock-questionnaire.js
+++ b/eq-author-api/db/datastore/mock-questionnaire.js
@@ -1,8 +1,8 @@
 const { v4: uuidv4 } = require("uuid");
 
-const mockQuestionnaire = ({ title, ownerId }) => {
+const mockQuestionnaire = ({ title, ownerId, createdAt }) => {
   const questionnaire = {
-    title: title || "Working from home",
+    title: title || "Default questionnaire title",
     theme: "business",
     legalBasis: "Voluntary",
     navigation: false,
@@ -37,6 +37,7 @@ const mockQuestionnaire = ({ title, ownerId }) => {
     isPublic: true,
     publishStatus: "Unpublished",
     createdBy: ownerId || "user-1",
+    createdAt,
   };
   return questionnaire;
 };

From b974554476b8f81c2d75385ba0478369e14f6baa Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Tue, 16 Jul 2024 14:47:44 +0100
Subject: [PATCH 130/215] Add test for questionnaires created on or before date

---
 eq-author-api/db/datastore/datastore-mongodb.js  |  3 +++
 .../db/datastore/datastore-mongodb.test.js       | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.js b/eq-author-api/db/datastore/datastore-mongodb.js
index ab3c910171..aea1453be3 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.js
@@ -302,6 +302,9 @@ const getMatchQuery = async (input, ctx) => {
     } = input;
 
     const { id: userId } = ctx.user;
+    if (createdOnOrBefore) {
+      createdOnOrBefore.setHours(23, 59, 59, 999); // Sets `createdOnOrBefore` time to 23:59:59.999 to include all questionnaires created on that day
+    }
 
     const matchQuery = {
       // Searches for questionnaires with `title` or `shortTitle` (short code) containing the search term
diff --git a/eq-author-api/db/datastore/datastore-mongodb.test.js b/eq-author-api/db/datastore/datastore-mongodb.test.js
index cb31af4dc3..ba949413f8 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.test.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.test.js
@@ -454,6 +454,22 @@ describe("MongoDB Datastore", () => {
           "Default questionnaire title"
         );
       });
+
+      it("Should return questionnaires created on or before the searched date", async () => {
+        const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
+          {
+            search: "",
+            owner: "",
+            createdOnOrBefore: new Date(2021, 2, 10),
+            resultsPerPage: 10,
+          },
+          ctx
+        );
+
+        expect(listOfQuestionnaires.length).toBe(2);
+        expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 1");
+        expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 2");
+      });
     });
 
     describe("Creating a history event", () => {

From d0449ef9476bdefdd7799979668aac09e625fd0c Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Tue, 16 Jul 2024 14:50:56 +0100
Subject: [PATCH 131/215] Add test for questionnaires created between specified
 dates

---
 .../db/datastore/datastore-mongodb.test.js     | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.test.js b/eq-author-api/db/datastore/datastore-mongodb.test.js
index ba949413f8..5545bf5fcd 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.test.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.test.js
@@ -470,6 +470,24 @@ describe("MongoDB Datastore", () => {
         expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 1");
         expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 2");
       });
+
+      it("Should return questionnaires created between the searched dates", async () => {
+        const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
+          {
+            search: "",
+            owner: "",
+            createdOnOrAfter: new Date(2021, 2, 10),
+            createdOnOrBefore: new Date(2021, 2, 20),
+            resultsPerPage: 10,
+          },
+          ctx
+        );
+
+        expect(listOfQuestionnaires.length).toBe(3);
+        expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 2");
+        expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 3");
+        expect(listOfQuestionnaires[2].title).toEqual("Test questionnaire 4");
+      });
     });
 
     describe("Creating a history event", () => {

From cfe91fbc24094bd2303fb2b9f6566348b9fc4b4a Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Wed, 17 Jul 2024 09:29:05 +0100
Subject: [PATCH 132/215] Add test to search questionnaires by "All" access

---
 .../db/datastore/datastore-mongodb.test.js    | 44 ++++++++++++++++++-
 .../db/datastore/mock-questionnaire.js        |  4 +-
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.test.js b/eq-author-api/db/datastore/datastore-mongodb.test.js
index 5545bf5fcd..d4e25581e2 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.test.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.test.js
@@ -16,7 +16,7 @@ describe("MongoDB Datastore", () => {
     questionnaire = mockQuestionnaire({});
     ctx = {
       user: {
-        id: 123,
+        id: "user-1",
       },
     };
     user = {
@@ -394,6 +394,15 @@ describe("MongoDB Datastore", () => {
           }),
           ctx
         );
+        await mongoDB.createQuestionnaire(
+          mockQuestionnaire({
+            title: "Test questionnaire 5",
+            ownerId: "user-2",
+            createdAt: new Date(2021, 2, 25, 5, 0, 0, 0),
+            isPublic: false,
+          }),
+          ctx
+        );
       });
 
       it("Should return questionnaires with title containing the search term", async () => {
@@ -401,6 +410,7 @@ describe("MongoDB Datastore", () => {
           {
             search: "Test questionnaire",
             owner: "",
+            access: "All",
             resultsPerPage: 10,
           },
           ctx
@@ -418,6 +428,7 @@ describe("MongoDB Datastore", () => {
           {
             search: "",
             owner: "Jane",
+            access: "All",
             resultsPerPage: 10,
           },
           ctx
@@ -434,6 +445,7 @@ describe("MongoDB Datastore", () => {
             search: "",
             owner: "",
             createdOnOrAfter: new Date(2021, 2, 10),
+            access: "All",
             resultsPerPage: 10,
           },
           ctx
@@ -461,6 +473,7 @@ describe("MongoDB Datastore", () => {
             search: "",
             owner: "",
             createdOnOrBefore: new Date(2021, 2, 10),
+            access: "All",
             resultsPerPage: 10,
           },
           ctx
@@ -478,6 +491,7 @@ describe("MongoDB Datastore", () => {
             owner: "",
             createdOnOrAfter: new Date(2021, 2, 10),
             createdOnOrBefore: new Date(2021, 2, 20),
+            access: "All",
             resultsPerPage: 10,
           },
           ctx
@@ -488,6 +502,34 @@ describe("MongoDB Datastore", () => {
         expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 3");
         expect(listOfQuestionnaires[2].title).toEqual("Test questionnaire 4");
       });
+
+      it("Should return relevant questionnaires when searching by access `All`", async () => {
+        const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
+          {
+            search: "",
+            owner: "",
+            access: "All",
+            resultsPerPage: 10,
+          },
+          ctx
+        );
+
+        expect(listOfQuestionnaires.length).toBe(7);
+        expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 1");
+        expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 2");
+        expect(listOfQuestionnaires[2].title).toEqual("Test questionnaire 3");
+        expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 4");
+        // Questionnaires created in previous tests
+        expect(listOfQuestionnaires[4].title).toEqual(
+          "Default questionnaire title"
+        );
+        expect(listOfQuestionnaires[5].title).toEqual(
+          "Default questionnaire title"
+        );
+        expect(listOfQuestionnaires[6].title).toEqual(
+          "Default questionnaire title"
+        );
+      });
     });
 
     describe("Creating a history event", () => {
diff --git a/eq-author-api/db/datastore/mock-questionnaire.js b/eq-author-api/db/datastore/mock-questionnaire.js
index 0efe17bcaf..2f60c1acd6 100644
--- a/eq-author-api/db/datastore/mock-questionnaire.js
+++ b/eq-author-api/db/datastore/mock-questionnaire.js
@@ -1,6 +1,6 @@
 const { v4: uuidv4 } = require("uuid");
 
-const mockQuestionnaire = ({ title, ownerId, createdAt }) => {
+const mockQuestionnaire = ({ title, ownerId, createdAt, isPublic }) => {
   const questionnaire = {
     title: title || "Default questionnaire title",
     theme: "business",
@@ -34,7 +34,7 @@ const mockQuestionnaire = ({ title, ownerId, createdAt }) => {
     version: 13,
     surveyVersion: 1,
     editors: [],
-    isPublic: true,
+    isPublic: isPublic ?? true,
     publishStatus: "Unpublished",
     createdBy: ownerId || "user-1",
     createdAt,

From b0695d236890a942646bfb4eccd21f6f2a8da025 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Wed, 17 Jul 2024 09:54:03 +0100
Subject: [PATCH 133/215] Add test to search questionnaires by editor access

---
 .../db/datastore/datastore-mongodb.test.js    | 27 +++++++++++++++++++
 .../db/datastore/mock-questionnaire.js        | 12 ++++++---
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.test.js b/eq-author-api/db/datastore/datastore-mongodb.test.js
index d4e25581e2..eafeddd253 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.test.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.test.js
@@ -362,6 +362,14 @@ describe("MongoDB Datastore", () => {
           picture: "",
         });
 
+        await mongoDB.createUser({
+          id: "test-user",
+          email: "test-user@example.com",
+          name: "Test User",
+          externalId: "test-user",
+          picture: "",
+        });
+
         await mongoDB.createQuestionnaire(
           mockQuestionnaire({
             title: "Test questionnaire 1",
@@ -382,6 +390,7 @@ describe("MongoDB Datastore", () => {
           mockQuestionnaire({
             title: "Test questionnaire 3",
             ownerId: "user-2",
+            editors: ["user-1"],
             createdAt: new Date(2021, 2, 15, 5, 0, 0, 0),
           }),
           ctx
@@ -530,6 +539,24 @@ describe("MongoDB Datastore", () => {
           "Default questionnaire title"
         );
       });
+
+      it("Should return relevant questionnaires when searching by access `Write`", async () => {
+        const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
+          {
+            search: "",
+            owner: "",
+            access: "Write",
+            resultsPerPage: 10,
+          },
+          ctx
+        );
+
+        // Expects all questionnaires where `ctx.user` is the owner (`ctx.user` created the questionnaire) or an editor
+        expect(listOfQuestionnaires.length).toBe(3);
+        expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 1"); // "user-1" created the questionnaire
+        expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 2"); // "user-1" created the questionnaire
+        expect(listOfQuestionnaires[2].title).toEqual("Test questionnaire 3"); // "user-1" is an editor
+      });
     });
 
     describe("Creating a history event", () => {
diff --git a/eq-author-api/db/datastore/mock-questionnaire.js b/eq-author-api/db/datastore/mock-questionnaire.js
index 2f60c1acd6..ffd7089bff 100644
--- a/eq-author-api/db/datastore/mock-questionnaire.js
+++ b/eq-author-api/db/datastore/mock-questionnaire.js
@@ -1,6 +1,12 @@
 const { v4: uuidv4 } = require("uuid");
 
-const mockQuestionnaire = ({ title, ownerId, createdAt, isPublic }) => {
+const mockQuestionnaire = ({
+  title,
+  ownerId,
+  createdAt,
+  isPublic,
+  editors,
+}) => {
   const questionnaire = {
     title: title || "Default questionnaire title",
     theme: "business",
@@ -33,10 +39,10 @@ const mockQuestionnaire = ({ title, ownerId, createdAt, isPublic }) => {
     summary: false,
     version: 13,
     surveyVersion: 1,
-    editors: [],
+    editors: editors || [],
     isPublic: isPublic ?? true,
     publishStatus: "Unpublished",
-    createdBy: ownerId || "user-1",
+    createdBy: ownerId || "test-user",
     createdAt,
   };
   return questionnaire;

From ee2328cdde7a2d2e03b7dbc9218a9f970f766b38 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Wed, 17 Jul 2024 11:15:49 +0100
Subject: [PATCH 134/215] Add test to search questionnaires by read access

---
 .../db/datastore/datastore-mongodb.test.js    | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.test.js b/eq-author-api/db/datastore/datastore-mongodb.test.js
index eafeddd253..8b8878bbab 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.test.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.test.js
@@ -557,6 +557,31 @@ describe("MongoDB Datastore", () => {
         expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 2"); // "user-1" created the questionnaire
         expect(listOfQuestionnaires[2].title).toEqual("Test questionnaire 3"); // "user-1" is an editor
       });
+
+      it("Should return relevant questionnaires when searching by access `Read`", async () => {
+        const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
+          {
+            search: "",
+            owner: "",
+            access: "Read",
+            resultsPerPage: 10,
+          },
+          ctx
+        );
+
+        expect(listOfQuestionnaires.length).toBe(4);
+        expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 4");
+        // Questionnaires created in previous tests
+        expect(listOfQuestionnaires[1].title).toEqual(
+          "Default questionnaire title"
+        );
+        expect(listOfQuestionnaires[2].title).toEqual(
+          "Default questionnaire title"
+        );
+        expect(listOfQuestionnaires[3].title).toEqual(
+          "Default questionnaire title"
+        );
+      });
     });
 
     describe("Creating a history event", () => {

From 9ac4539096288af45be417c564485dc3572c657e Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Wed, 17 Jul 2024 12:56:23 +0100
Subject: [PATCH 135/215] Add test to search for non-public questionnaires

---
 .../db/datastore/datastore-mongodb.test.js    | 49 +++++++++++++++----
 1 file changed, 39 insertions(+), 10 deletions(-)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.test.js b/eq-author-api/db/datastore/datastore-mongodb.test.js
index 8b8878bbab..8f720f2d1c 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.test.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.test.js
@@ -403,6 +403,7 @@ describe("MongoDB Datastore", () => {
           }),
           ctx
         );
+        // ** "Test questionnaire 5" is not included in several test assertions as it is not public and `ctx.user` is not owner/editor
         await mongoDB.createQuestionnaire(
           mockQuestionnaire({
             title: "Test questionnaire 5",
@@ -412,6 +413,15 @@ describe("MongoDB Datastore", () => {
           }),
           ctx
         );
+        await mongoDB.createQuestionnaire(
+          mockQuestionnaire({
+            title: "Test questionnaire 6",
+            ownerId: "user-1",
+            createdAt: new Date(2021, 2, 30, 5, 0, 0, 0),
+            isPublic: false,
+          }),
+          ctx
+        );
       });
 
       it("Should return questionnaires with title containing the search term", async () => {
@@ -425,11 +435,12 @@ describe("MongoDB Datastore", () => {
           ctx
         );
 
-        expect(listOfQuestionnaires.length).toBe(4);
+        expect(listOfQuestionnaires.length).toBe(5);
         expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 1");
         expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 2");
         expect(listOfQuestionnaires[2].title).toEqual("Test questionnaire 3");
         expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 4");
+        expect(listOfQuestionnaires[4].title).toEqual("Test questionnaire 6");
       });
 
       it("Should return questionnaires with owner containing the `owner` search term", async () => {
@@ -460,20 +471,21 @@ describe("MongoDB Datastore", () => {
           ctx
         );
 
-        expect(listOfQuestionnaires.length).toBe(6);
+        expect(listOfQuestionnaires.length).toBe(7);
         expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 2");
         expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 3");
         expect(listOfQuestionnaires[2].title).toEqual("Test questionnaire 4");
+        expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 6");
         // Questionnaires created in previous tests
-        expect(listOfQuestionnaires[3].title).toEqual(
-          "Default questionnaire title"
-        );
         expect(listOfQuestionnaires[4].title).toEqual(
           "Default questionnaire title"
         );
         expect(listOfQuestionnaires[5].title).toEqual(
           "Default questionnaire title"
         );
+        expect(listOfQuestionnaires[6].title).toEqual(
+          "Default questionnaire title"
+        );
       });
 
       it("Should return questionnaires created on or before the searched date", async () => {
@@ -523,21 +535,22 @@ describe("MongoDB Datastore", () => {
           ctx
         );
 
-        expect(listOfQuestionnaires.length).toBe(7);
+        expect(listOfQuestionnaires.length).toBe(8);
         expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 1");
         expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 2");
         expect(listOfQuestionnaires[2].title).toEqual("Test questionnaire 3");
         expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 4");
+        expect(listOfQuestionnaires[4].title).toEqual("Test questionnaire 6");
         // Questionnaires created in previous tests
-        expect(listOfQuestionnaires[4].title).toEqual(
-          "Default questionnaire title"
-        );
         expect(listOfQuestionnaires[5].title).toEqual(
           "Default questionnaire title"
         );
         expect(listOfQuestionnaires[6].title).toEqual(
           "Default questionnaire title"
         );
+        expect(listOfQuestionnaires[7].title).toEqual(
+          "Default questionnaire title"
+        );
       });
 
       it("Should return relevant questionnaires when searching by access `Write`", async () => {
@@ -552,10 +565,11 @@ describe("MongoDB Datastore", () => {
         );
 
         // Expects all questionnaires where `ctx.user` is the owner (`ctx.user` created the questionnaire) or an editor
-        expect(listOfQuestionnaires.length).toBe(3);
+        expect(listOfQuestionnaires.length).toBe(4);
         expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 1"); // "user-1" created the questionnaire
         expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 2"); // "user-1" created the questionnaire
         expect(listOfQuestionnaires[2].title).toEqual("Test questionnaire 3"); // "user-1" is an editor
+        expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 6"); // "user-1" created the questionnaire
       });
 
       it("Should return relevant questionnaires when searching by access `Read`", async () => {
@@ -582,6 +596,21 @@ describe("MongoDB Datastore", () => {
           "Default questionnaire title"
         );
       });
+
+      it("Should return relevant questionnaires when searching by access `PrivateQuestionnaires`", async () => {
+        const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
+          {
+            search: "",
+            owner: "",
+            access: "PrivateQuestionnaires",
+            resultsPerPage: 10,
+          },
+          ctx
+        );
+
+        expect(listOfQuestionnaires.length).toBe(1);
+        expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 6");
+      });
     });
 
     describe("Creating a history event", () => {

From 1fb16676511e424327f52f287b4c1a6b38bef5bd Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Wed, 17 Jul 2024 13:06:38 +0100
Subject: [PATCH 136/215] Add test to filter my questionnaires

---
 .../db/datastore/datastore-mongodb.test.js    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.test.js b/eq-author-api/db/datastore/datastore-mongodb.test.js
index 8f720f2d1c..5577556876 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.test.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.test.js
@@ -611,6 +611,25 @@ describe("MongoDB Datastore", () => {
         expect(listOfQuestionnaires.length).toBe(1);
         expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 6");
       });
+
+      it("Should return relevant questionnaires when `myQuestionnaires` is true", async () => {
+        const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
+          {
+            search: "",
+            owner: "",
+            access: "All",
+            resultsPerPage: 10,
+            myQuestionnaires: true,
+          },
+          ctx
+        );
+
+        expect(listOfQuestionnaires.length).toBe(4);
+        expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 1");
+        expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 2");
+        expect(listOfQuestionnaires[2].title).toEqual("Test questionnaire 3");
+        expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 6");
+      });
     });
 
     describe("Creating a history event", () => {

From 80ee25e4bbcd5e82e1e904a89ff81299c4c74bbd Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Wed, 17 Jul 2024 13:19:36 +0100
Subject: [PATCH 137/215] Add test for questionnaires on previous page

---
 .../db/datastore/datastore-mongodb.test.js    | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.test.js b/eq-author-api/db/datastore/datastore-mongodb.test.js
index 5577556876..8f276fc8f5 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.test.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.test.js
@@ -630,6 +630,39 @@ describe("MongoDB Datastore", () => {
         expect(listOfQuestionnaires[2].title).toEqual("Test questionnaire 3");
         expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 6");
       });
+
+      it("Should return questionnaires on previous page when `firstQuestionnaireIdOnPage` is provided without `lastQuestionnaireIdOnPage`", async () => {
+        // Gets questionnaires with "All" access to get a questionnaire ID to use as `firstQuestionnaireIdOnPage`
+        const allQuestionnaires = await mongoDB.listFilteredQuestionnaires(
+          {
+            search: "",
+            owner: "",
+            access: "All",
+            resultsPerPage: 10,
+          },
+          ctx
+        );
+
+        const listOfPreviousPageQuestionnaires =
+          await mongoDB.listFilteredQuestionnaires(
+            {
+              search: "",
+              owner: "",
+              access: "All",
+              resultsPerPage: 2, // Limits to 2 questionnaires per page to test a small number of questionnaires on previous page
+              firstQuestionnaireIdOnPage: allQuestionnaires[2].id,
+            },
+            ctx
+          );
+
+        expect(listOfPreviousPageQuestionnaires.length).toBe(2);
+        expect(listOfPreviousPageQuestionnaires[0].title).toEqual(
+          "Test questionnaire 1"
+        );
+        expect(listOfPreviousPageQuestionnaires[1].title).toEqual(
+          "Test questionnaire 2"
+        );
+      });
     });
 
     describe("Creating a history event", () => {

From 97c3b69eb4e1b80966770261b549bb0ac563c296 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Wed, 17 Jul 2024 13:26:20 +0100
Subject: [PATCH 138/215] Add test for questionnaires on next page

---
 .../db/datastore/datastore-mongodb.test.js    | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.test.js b/eq-author-api/db/datastore/datastore-mongodb.test.js
index 8f276fc8f5..644eacaa62 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.test.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.test.js
@@ -656,6 +656,7 @@ describe("MongoDB Datastore", () => {
           );
 
         expect(listOfPreviousPageQuestionnaires.length).toBe(2);
+        // The two questionnaires before the first questionnaire on the page (based on firstQuestionnaireIdOnPage)
         expect(listOfPreviousPageQuestionnaires[0].title).toEqual(
           "Test questionnaire 1"
         );
@@ -663,6 +664,40 @@ describe("MongoDB Datastore", () => {
           "Test questionnaire 2"
         );
       });
+
+      it("Should return questionnaires on next page when `lastQuestionnaireIdOnPage` is provided without `firstQuestionnaireIdOnPage`", async () => {
+        // Gets questionnaires with "All" access to get a questionnaire ID to use as `lastQuestionnaireIdOnPage`
+        const allQuestionnaires = await mongoDB.listFilteredQuestionnaires(
+          {
+            search: "",
+            owner: "",
+            access: "All",
+            resultsPerPage: 10,
+          },
+          ctx
+        );
+
+        const listOfNextPageQuestionnaires =
+          await mongoDB.listFilteredQuestionnaires(
+            {
+              search: "",
+              owner: "",
+              access: "All",
+              resultsPerPage: 2, // Limits to 2 questionnaires per page to test a small number of questionnaires on next page
+              lastQuestionnaireIdOnPage: allQuestionnaires[3].id,
+            },
+            ctx
+          );
+
+        expect(listOfNextPageQuestionnaires.length).toBe(2);
+        // The two questionnaires after the last questionnaire on the page (based on lastQuestionnaireIdOnPage)
+        expect(listOfNextPageQuestionnaires[0].title).toEqual(
+          "Test questionnaire 6"
+        );
+        expect(listOfNextPageQuestionnaires[1].title).toEqual(
+          "Default questionnaire title"
+        );
+      });
     });
 
     describe("Creating a history event", () => {

From f3e6b93b308ec046a3455df1593027f6bceb6dbd Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Wed, 17 Jul 2024 15:00:10 +0100
Subject: [PATCH 139/215] Add test for error log when both
 firstQuestionnaireIdOnPage and lastQuestionnaireIdOnPage are provided

---
 .../db/datastore/datastore-mongodb.js         |  4 +-
 .../db/datastore/datastore-mongodb.test.js    | 40 +++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.js b/eq-author-api/db/datastore/datastore-mongodb.js
index aea1453be3..930ca914ec 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.js
@@ -531,8 +531,10 @@ const listFilteredQuestionnaires = async (input, ctx) => {
       ]);
     } else {
       logger.error(
-        "Invalid input - both firstQuestionnaireIdOnPage and lastQuestionnaireIdOnPage have been provided (from listFilteredQuestionnaires)"
+        { input },
+        "Invalid input - received both firstQuestionnaireIdOnPage and lastQuestionnaireIdOnPage, expected only one of these values or neither (from listFilteredQuestionnaires)"
       );
+      return;
     }
 
     const questionnaires = await questionnairesQuery.toArray();
diff --git a/eq-author-api/db/datastore/datastore-mongodb.test.js b/eq-author-api/db/datastore/datastore-mongodb.test.js
index 644eacaa62..9f08ed0d60 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.test.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.test.js
@@ -2,6 +2,10 @@ const mockQuestionnaire = require("./mock-questionnaire");
 const { noteCreationEvent } = require("../../utils/questionnaireEvents");
 const { v4: uuidv4 } = require("uuid");
 
+const mockLoggerDebug = jest.fn();
+const mockLoggerInfo = jest.fn();
+const mockLoggerError = jest.fn();
+
 describe("MongoDB Datastore", () => {
   let questionnaire, user, firstUser, mockComment, ctx;
   let mongoDB;
@@ -12,6 +16,18 @@ describe("MongoDB Datastore", () => {
     jest.resetModules();
   });
 
+  jest.mock("../../utils/logger", () => ({
+    logger: {
+      debug: mockLoggerDebug,
+      info: mockLoggerInfo,
+      error: mockLoggerError,
+    },
+  }));
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
   beforeEach(() => {
     questionnaire = mockQuestionnaire({});
     ctx = {
@@ -698,6 +714,30 @@ describe("MongoDB Datastore", () => {
           "Default questionnaire title"
         );
       });
+
+      it("Should log an error when both `firstQuestionnaireIdOnPage` and `lastQuestionnaireIdOnPage` are provided", async () => {
+        const listFilteredQuestionnairesInput = {
+          search: "",
+          owner: "",
+          access: "All",
+          resultsPerPage: 10,
+          firstQuestionnaireIdOnPage: "123",
+          lastQuestionnaireIdOnPage: "456",
+        };
+
+        await mongoDB.listFilteredQuestionnaires(
+          listFilteredQuestionnairesInput,
+          ctx
+        );
+
+        expect(mockLoggerError).toHaveBeenCalledTimes(1);
+        expect(mockLoggerError).toHaveBeenCalledWith(
+          {
+            input: listFilteredQuestionnairesInput,
+          },
+          "Invalid input - received both firstQuestionnaireIdOnPage and lastQuestionnaireIdOnPage, expected only one of these values or neither (from listFilteredQuestionnaires)"
+        );
+      });
     });
 
     describe("Creating a history event", () => {

From 79abc37c502252ea893b4c43487f86933245dc06 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Wed, 17 Jul 2024 15:12:24 +0100
Subject: [PATCH 140/215] Add test for no questionnaires found

---
 .../db/datastore/datastore-mongodb.test.js    | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.test.js b/eq-author-api/db/datastore/datastore-mongodb.test.js
index 9f08ed0d60..fca7a6f6ce 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.test.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.test.js
@@ -715,7 +715,7 @@ describe("MongoDB Datastore", () => {
         );
       });
 
-      it("Should log an error when both `firstQuestionnaireIdOnPage` and `lastQuestionnaireIdOnPage` are provided", async () => {
+      it("Should log an error message when both `firstQuestionnaireIdOnPage` and `lastQuestionnaireIdOnPage` are provided", async () => {
         const listFilteredQuestionnairesInput = {
           search: "",
           owner: "",
@@ -738,6 +738,29 @@ describe("MongoDB Datastore", () => {
           "Invalid input - received both firstQuestionnaireIdOnPage and lastQuestionnaireIdOnPage, expected only one of these values or neither (from listFilteredQuestionnaires)"
         );
       });
+
+      it("Should log a debug message when no questionnaires are found", async () => {
+        const listFilteredQuestionnairesInput = {
+          search: "Lorem ipsum", // Search term contained in no questionnaires
+          owner: "",
+          access: "All",
+          resultsPerPage: 10,
+        };
+
+        // `listOfQuestionnaires` should be an empty array as no questionnaires contain the search term
+        const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
+          listFilteredQuestionnairesInput,
+          ctx
+        );
+
+        expect(mockLoggerDebug).toHaveBeenCalledTimes(1);
+        expect(mockLoggerDebug).toHaveBeenCalledWith(
+          `No questionnaires found with input: ${JSON.stringify(
+            listFilteredQuestionnairesInput
+          )} (from listFilteredQuestionnaires)`
+        );
+        expect(listOfQuestionnaires).toEqual([]);
+      });
     });
 
     describe("Creating a history event", () => {

From 4c8ba12f826afd2b7d833c5601315b7781f3dd18 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Thu, 18 Jul 2024 09:24:47 +0100
Subject: [PATCH 141/215] Add test for sorting questionnaires on first page

---
 .../db/datastore/datastore-mongodb.test.js    | 38 +++++++++++++++++--
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.test.js b/eq-author-api/db/datastore/datastore-mongodb.test.js
index fca7a6f6ce..026617daca 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.test.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.test.js
@@ -12,9 +12,6 @@ describe("MongoDB Datastore", () => {
   jest.isolateModules(() => {
     mongoDB = require("./datastore-mongodb");
   });
-  beforeAll(() => {
-    jest.resetModules();
-  });
 
   jest.mock("../../utils/logger", () => ({
     logger: {
@@ -24,6 +21,10 @@ describe("MongoDB Datastore", () => {
     },
   }));
 
+  beforeAll(() => {
+    jest.resetModules();
+  });
+
   afterEach(() => {
     jest.clearAllMocks();
   });
@@ -761,6 +762,37 @@ describe("MongoDB Datastore", () => {
         );
         expect(listOfQuestionnaires).toEqual([]);
       });
+
+      it("Should sort questionnaires on first page from newest to oldest when `sortBy` is `createdDateDesc`", async () => {
+        const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
+          {
+            search: "",
+            owner: "",
+            access: "All",
+            resultsPerPage: 10,
+            sortBy: "createdDateDesc",
+          },
+          ctx
+        );
+
+        expect(listOfQuestionnaires.length).toBe(8);
+        // First created are questionnaires created in previous tests as all `Test questionnaires` have `createdAt` dates in the past
+        expect(listOfQuestionnaires[0].title).toEqual(
+          "Default questionnaire title"
+        );
+        expect(listOfQuestionnaires[1].title).toEqual(
+          "Default questionnaire title"
+        );
+        expect(listOfQuestionnaires[2].title).toEqual(
+          "Default questionnaire title"
+        );
+        // `Test questionnaire 6` has the most recent `createdAt` date of the `Test questionnaires`
+        expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 6");
+        expect(listOfQuestionnaires[4].title).toEqual("Test questionnaire 4");
+        expect(listOfQuestionnaires[5].title).toEqual("Test questionnaire 3");
+        expect(listOfQuestionnaires[6].title).toEqual("Test questionnaire 2");
+        expect(listOfQuestionnaires[7].title).toEqual("Test questionnaire 1");
+      });
     });
 
     describe("Creating a history event", () => {

From 06e76993f8d8c7c820e7eb93ae4dc2c690f30c3c Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Thu, 18 Jul 2024 09:43:55 +0100
Subject: [PATCH 142/215] Add test for sorting questionnaires on next page

---
 .../db/datastore/datastore-mongodb.test.js    | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.test.js b/eq-author-api/db/datastore/datastore-mongodb.test.js
index 026617daca..c670db8602 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.test.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.test.js
@@ -793,6 +793,42 @@ describe("MongoDB Datastore", () => {
         expect(listOfQuestionnaires[6].title).toEqual("Test questionnaire 2");
         expect(listOfQuestionnaires[7].title).toEqual("Test questionnaire 1");
       });
+
+      it("Should sort questionnaires on next page from newest to oldest when `sortBy` is `createdDateDesc`", async () => {
+        // Gets questionnaires with "All" access to get a questionnaire ID to use as `lastQuestionnaireIdOnPage`
+        const allQuestionnaires = await mongoDB.listFilteredQuestionnaires(
+          {
+            search: "",
+            owner: "",
+            access: "All",
+            resultsPerPage: 10,
+            sortBy: "createdDateDesc",
+          },
+          ctx
+        );
+
+        const listOfNextPageQuestionnaires =
+          await mongoDB.listFilteredQuestionnaires(
+            {
+              search: "",
+              owner: "",
+              access: "All",
+              resultsPerPage: 2,
+              lastQuestionnaireIdOnPage: allQuestionnaires[3].id,
+              sortBy: "createdDateDesc",
+            },
+            ctx
+          );
+
+        expect(listOfNextPageQuestionnaires.length).toBe(2);
+        // The two questionnaires after the last questionnaire on the page (based on lastQuestionnaireIdOnPage)
+        expect(listOfNextPageQuestionnaires[0].title).toEqual(
+          "Test questionnaire 4"
+        );
+        expect(listOfNextPageQuestionnaires[1].title).toEqual(
+          "Test questionnaire 3"
+        );
+      });
     });
 
     describe("Creating a history event", () => {

From 52b40cfe99e81cfe24c033e63d8f42dbf3232c3b Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Thu, 18 Jul 2024 09:55:36 +0100
Subject: [PATCH 143/215] Add test for sorting questionnaires on previous page

---
 .../db/datastore/datastore-mongodb.test.js    | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.test.js b/eq-author-api/db/datastore/datastore-mongodb.test.js
index c670db8602..3b7392def8 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.test.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.test.js
@@ -794,6 +794,42 @@ describe("MongoDB Datastore", () => {
         expect(listOfQuestionnaires[7].title).toEqual("Test questionnaire 1");
       });
 
+      it("Should sort questionnaires on previous page from newest to oldest when `sortBy` is `createdDateDesc`", async () => {
+        // Gets questionnaires with "All" access to get a questionnaire ID to use as `firstQuestionnaireIdOnPage`
+        const allQuestionnaires = await mongoDB.listFilteredQuestionnaires(
+          {
+            search: "",
+            owner: "",
+            access: "All",
+            resultsPerPage: 10,
+            sortBy: "createdDateDesc",
+          },
+          ctx
+        );
+
+        const listOfPreviousPageQuestionnaires =
+          await mongoDB.listFilteredQuestionnaires(
+            {
+              search: "",
+              owner: "",
+              access: "All",
+              resultsPerPage: 2,
+              firstQuestionnaireIdOnPage: allQuestionnaires[6].id,
+              sortBy: "createdDateDesc",
+            },
+            ctx
+          );
+
+        expect(listOfPreviousPageQuestionnaires.length).toBe(2);
+        // The two questionnaires before the first questionnaire on the page (based on firstQuestionnaireIdOnPage)
+        expect(listOfPreviousPageQuestionnaires[0].title).toEqual(
+          "Test questionnaire 4"
+        );
+        expect(listOfPreviousPageQuestionnaires[1].title).toEqual(
+          "Test questionnaire 3"
+        );
+      });
+
       it("Should sort questionnaires on next page from newest to oldest when `sortBy` is `createdDateDesc`", async () => {
         // Gets questionnaires with "All" access to get a questionnaire ID to use as `lastQuestionnaireIdOnPage`
         const allQuestionnaires = await mongoDB.listFilteredQuestionnaires(

From 74dec59f15a85f04e73a0177d946895cf44ac102 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Thu, 18 Jul 2024 11:49:20 +0100
Subject: [PATCH 144/215] Add test for getting total page count

---
 .../db/datastore/datastore-mongodb.test.js       | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.test.js b/eq-author-api/db/datastore/datastore-mongodb.test.js
index 3b7392def8..5e4f1c5938 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.test.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.test.js
@@ -867,6 +867,22 @@ describe("MongoDB Datastore", () => {
       });
     });
 
+    describe("Getting total page count", () => {
+      it("Should get the total number of pages based on the number of questionnaires and results per page", async () => {
+        const totalPageCount = await mongoDB.getTotalPages(
+          {
+            resultsPerPage: 3, // As 8 questionnaires should be returned (from previously created questionnaires), uses 3 questionnaires per page to test total page count is rounded up
+            search: "",
+            owner: "",
+            access: "All",
+          },
+          ctx
+        );
+
+        expect(totalPageCount).toBe(3); // (8 questionnaires) / (3 results per page) gives 3 total pages after rounding up
+      });
+    });
+
     describe("Creating a history event", () => {
       let mockHistoryEvent;
       beforeEach(() => {

From 75c2cb2bdb85b0eb308997bc782eb2ddc3bcf6d1 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Thu, 18 Jul 2024 13:49:09 +0100
Subject: [PATCH 145/215] Add test for getTotalPages error

---
 .../db/datastore/datastore-mongodb.test.js          | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.test.js b/eq-author-api/db/datastore/datastore-mongodb.test.js
index 5e4f1c5938..a734fa462d 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.test.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.test.js
@@ -881,6 +881,19 @@ describe("MongoDB Datastore", () => {
 
         expect(totalPageCount).toBe(3); // (8 questionnaires) / (3 results per page) gives 3 total pages after rounding up
       });
+
+      it("Should log an error message on exception", async () => {
+        await mongoDB.getTotalPages(); // No arguments to trigger exception
+
+        expect(mockLoggerError).toHaveBeenCalledTimes(1);
+        expect(mockLoggerError).toHaveBeenCalledWith(
+          {
+            input: undefined,
+            error: expect.any(String),
+          },
+          "Unable to get total pages (from getTotalPages)"
+        );
+      });
     });
 
     describe("Creating a history event", () => {

From c86257e2956886383818e006c4ad842a0545ed8b Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Mon, 22 Jul 2024 11:04:12 +0100
Subject: [PATCH 146/215] Add test for filtered questionnaires resolver

---
 .../schema/resolvers/homepage/index.test.js   | 65 +++++++++++++++++++
 .../utils/contextBuilder/homepage/index.js    |  3 +
 .../homepage/queryFilteredQuestionnaires.js   | 37 +++++++++++
 3 files changed, 105 insertions(+)
 create mode 100644 eq-author-api/schema/resolvers/homepage/index.test.js
 create mode 100644 eq-author-api/tests/utils/contextBuilder/homepage/index.js
 create mode 100644 eq-author-api/tests/utils/contextBuilder/homepage/queryFilteredQuestionnaires.js

diff --git a/eq-author-api/schema/resolvers/homepage/index.test.js b/eq-author-api/schema/resolvers/homepage/index.test.js
new file mode 100644
index 0000000000..910c751e18
--- /dev/null
+++ b/eq-author-api/schema/resolvers/homepage/index.test.js
@@ -0,0 +1,65 @@
+const {
+  createQuestionnaire,
+} = require("../../../tests/utils/contextBuilder/questionnaire");
+const {
+  queryFilteredQuestionnaires,
+} = require("../../../tests/utils/contextBuilder/homepage");
+
+const { buildContext } = require("../../../tests/utils/contextBuilder");
+
+describe("filteredQuestionnaires", () => {
+  let ctx;
+
+  beforeEach(async () => {
+    ctx = await buildContext();
+
+    await createQuestionnaire(ctx, {
+      title: "Test Questionnaire 1",
+      theme: "business",
+      surveyId: "",
+    });
+    await createQuestionnaire(ctx, {
+      title: "Test Questionnaire 2",
+      theme: "business",
+      surveyId: "",
+    });
+    await createQuestionnaire(ctx, {
+      title: "Test Questionnaire 10",
+      theme: "business",
+      surveyId: "",
+    });
+    await createQuestionnaire(ctx, {
+      title: "Test Questionnaire 11",
+      theme: "business",
+      surveyId: "",
+    });
+  });
+
+  it("should return filtered questionnaires", async () => {
+    const user = {
+      id: "user-1",
+    };
+
+    const input = {
+      search: "Test Questionnaire 1",
+      owner: "",
+    };
+
+    const filteredQuestionnaires = await queryFilteredQuestionnaires(
+      user,
+      input
+    );
+
+    expect(filteredQuestionnaires).toEqual([
+      expect.objectContaining({
+        title: "Test Questionnaire 1",
+      }),
+      expect.objectContaining({
+        title: "Test Questionnaire 10",
+      }),
+      expect.objectContaining({
+        title: "Test Questionnaire 11",
+      }),
+    ]);
+  });
+});
diff --git a/eq-author-api/tests/utils/contextBuilder/homepage/index.js b/eq-author-api/tests/utils/contextBuilder/homepage/index.js
new file mode 100644
index 0000000000..7e37a00f7e
--- /dev/null
+++ b/eq-author-api/tests/utils/contextBuilder/homepage/index.js
@@ -0,0 +1,3 @@
+module.exports = {
+  ...require("./queryFilteredQuestionnaires"),
+};
diff --git a/eq-author-api/tests/utils/contextBuilder/homepage/queryFilteredQuestionnaires.js b/eq-author-api/tests/utils/contextBuilder/homepage/queryFilteredQuestionnaires.js
new file mode 100644
index 0000000000..df75382b16
--- /dev/null
+++ b/eq-author-api/tests/utils/contextBuilder/homepage/queryFilteredQuestionnaires.js
@@ -0,0 +1,37 @@
+const executeQuery = require("../../executeQuery");
+
+const getFilteredQuestionnairesQuery = `
+    query GetFilteredQuestionnaires($input: FilteredQuestionnairesInput) {
+        filteredQuestionnaires(input: $input) {
+            id
+            title
+            shortTitle
+            createdBy {
+                id
+                name
+            }
+            createdAt
+            editors {
+                id
+            }
+            permission
+        }
+    }
+`;
+
+const queryFilteredQuestionnaires = async (user, input) => {
+  const result = await executeQuery(
+    getFilteredQuestionnairesQuery,
+    { input },
+    {
+      user,
+    }
+  );
+
+  return result.data.filteredQuestionnaires;
+};
+
+module.exports = {
+  getFilteredQuestionnairesQuery,
+  queryFilteredQuestionnaires,
+};

From 74a5d98a48d1eac4b99541e0893eea3364a47203 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Mon, 22 Jul 2024 14:48:04 +0100
Subject: [PATCH 147/215] Add test for total pages resolver

---
 .../schema/resolvers/homepage/index.test.js   | 71 ++++++++++++-------
 .../utils/contextBuilder/homepage/index.js    |  1 +
 .../homepage/queryTotalPages.js               | 24 +++++++
 3 files changed, 71 insertions(+), 25 deletions(-)
 create mode 100644 eq-author-api/tests/utils/contextBuilder/homepage/queryTotalPages.js

diff --git a/eq-author-api/schema/resolvers/homepage/index.test.js b/eq-author-api/schema/resolvers/homepage/index.test.js
index 910c751e18..461374f004 100644
--- a/eq-author-api/schema/resolvers/homepage/index.test.js
+++ b/eq-author-api/schema/resolvers/homepage/index.test.js
@@ -3,14 +3,15 @@ const {
 } = require("../../../tests/utils/contextBuilder/questionnaire");
 const {
   queryFilteredQuestionnaires,
+  queryTotalPages,
 } = require("../../../tests/utils/contextBuilder/homepage");
 
 const { buildContext } = require("../../../tests/utils/contextBuilder");
 
-describe("filteredQuestionnaires", () => {
+describe("homepage", () => {
   let ctx;
 
-  beforeEach(async () => {
+  beforeAll(async () => {
     ctx = await buildContext();
 
     await createQuestionnaire(ctx, {
@@ -35,31 +36,51 @@ describe("filteredQuestionnaires", () => {
     });
   });
 
-  it("should return filtered questionnaires", async () => {
-    const user = {
-      id: "user-1",
-    };
+  describe("filteredQuestionnaires", () => {
+    it("should return filtered questionnaires", async () => {
+      const user = {
+        id: "user-1",
+      };
 
-    const input = {
-      search: "Test Questionnaire 1",
-      owner: "",
-    };
+      const input = {
+        search: "Test Questionnaire 1",
+        owner: "",
+      };
 
-    const filteredQuestionnaires = await queryFilteredQuestionnaires(
-      user,
-      input
-    );
+      const filteredQuestionnaires = await queryFilteredQuestionnaires(
+        user,
+        input
+      );
 
-    expect(filteredQuestionnaires).toEqual([
-      expect.objectContaining({
-        title: "Test Questionnaire 1",
-      }),
-      expect.objectContaining({
-        title: "Test Questionnaire 10",
-      }),
-      expect.objectContaining({
-        title: "Test Questionnaire 11",
-      }),
-    ]);
+      expect(filteredQuestionnaires).toEqual([
+        expect.objectContaining({
+          title: "Test Questionnaire 1",
+        }),
+        expect.objectContaining({
+          title: "Test Questionnaire 10",
+        }),
+        expect.objectContaining({
+          title: "Test Questionnaire 11",
+        }),
+      ]);
+    });
+  });
+
+  describe("totalPages", () => {
+    it("should return total pages", async () => {
+      const user = {
+        id: "user-1",
+      };
+
+      const input = {
+        resultsPerPage: 2,
+        search: "Test Questionnaire",
+        owner: "",
+      };
+
+      const totalPages = await queryTotalPages(user, input);
+
+      expect(totalPages).toEqual(2);
+    });
   });
 });
diff --git a/eq-author-api/tests/utils/contextBuilder/homepage/index.js b/eq-author-api/tests/utils/contextBuilder/homepage/index.js
index 7e37a00f7e..b8c2601a13 100644
--- a/eq-author-api/tests/utils/contextBuilder/homepage/index.js
+++ b/eq-author-api/tests/utils/contextBuilder/homepage/index.js
@@ -1,3 +1,4 @@
 module.exports = {
   ...require("./queryFilteredQuestionnaires"),
+  ...require("./queryTotalPages"),
 };
diff --git a/eq-author-api/tests/utils/contextBuilder/homepage/queryTotalPages.js b/eq-author-api/tests/utils/contextBuilder/homepage/queryTotalPages.js
new file mode 100644
index 0000000000..65345fb1d1
--- /dev/null
+++ b/eq-author-api/tests/utils/contextBuilder/homepage/queryTotalPages.js
@@ -0,0 +1,24 @@
+const executeQuery = require("../../executeQuery");
+
+const getTotalPagesQuery = `
+    query GetTotalPages($input: TotalPagesInput) {
+        totalPages(input: $input)
+    }
+`;
+
+const queryTotalPages = async (user, input) => {
+  const result = await executeQuery(
+    getTotalPagesQuery,
+    { input },
+    {
+      user,
+    }
+  );
+
+  return result.data.totalPages;
+};
+
+module.exports = {
+  getTotalPagesQuery,
+  queryTotalPages,
+};

From 010aa33fd0fd2ebae7f5d35150e467b0f2c6a747 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Mon, 22 Jul 2024 15:15:45 +0100
Subject: [PATCH 148/215] Add filtered questionnaires test for when input is
 not provided

---
 .../schema/resolvers/homepage/index.js        |  4 +--
 .../schema/resolvers/homepage/index.test.js   | 25 ++++++++++++++++++-
 .../homepage/queryFilteredQuestionnaires.js   |  2 +-
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/eq-author-api/schema/resolvers/homepage/index.js b/eq-author-api/schema/resolvers/homepage/index.js
index 7a6aa692a0..596b3aa1f7 100644
--- a/eq-author-api/schema/resolvers/homepage/index.js
+++ b/eq-author-api/schema/resolvers/homepage/index.js
@@ -10,8 +10,8 @@ const Resolvers = {
         resultsPerPage = 10,
         firstQuestionnaireIdOnPage,
         lastQuestionnaireIdOnPage,
-        search,
-        owner,
+        search = "",
+        owner = "",
         createdOnOrAfter,
         createdOnOrBefore,
         access,
diff --git a/eq-author-api/schema/resolvers/homepage/index.test.js b/eq-author-api/schema/resolvers/homepage/index.test.js
index 461374f004..e60283b755 100644
--- a/eq-author-api/schema/resolvers/homepage/index.test.js
+++ b/eq-author-api/schema/resolvers/homepage/index.test.js
@@ -37,7 +37,30 @@ describe("homepage", () => {
   });
 
   describe("filteredQuestionnaires", () => {
-    it("should return filtered questionnaires", async () => {
+    it("should return all questionnaires when input is not provided", async () => {
+      const user = {
+        id: "user-1",
+      };
+
+      const filteredQuestionnaires = await queryFilteredQuestionnaires(user);
+
+      expect(filteredQuestionnaires).toEqual([
+        expect.objectContaining({
+          title: "Test Questionnaire 1",
+        }),
+        expect.objectContaining({
+          title: "Test Questionnaire 2",
+        }),
+        expect.objectContaining({
+          title: "Test Questionnaire 10",
+        }),
+        expect.objectContaining({
+          title: "Test Questionnaire 11",
+        }),
+      ]);
+    });
+
+    it("should filter questionnaires when input is provided", async () => {
       const user = {
         id: "user-1",
       };
diff --git a/eq-author-api/tests/utils/contextBuilder/homepage/queryFilteredQuestionnaires.js b/eq-author-api/tests/utils/contextBuilder/homepage/queryFilteredQuestionnaires.js
index df75382b16..2b134d8532 100644
--- a/eq-author-api/tests/utils/contextBuilder/homepage/queryFilteredQuestionnaires.js
+++ b/eq-author-api/tests/utils/contextBuilder/homepage/queryFilteredQuestionnaires.js
@@ -22,7 +22,7 @@ const getFilteredQuestionnairesQuery = `
 const queryFilteredQuestionnaires = async (user, input) => {
   const result = await executeQuery(
     getFilteredQuestionnairesQuery,
-    { input },
+    input ? { input } : undefined, // Passes `undefined` when `input` is falsy to test when `input` is not provided
     {
       user,
     }

From b75c93ed9ea5b730bc856f07433f1bfeb247b7fa Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Tue, 23 Jul 2024 07:48:39 +0100
Subject: [PATCH 149/215] Add total pages test for when input is not provided

---
 eq-author-api/schema/resolvers/homepage/index.js  |  4 ++--
 .../schema/resolvers/homepage/index.test.js       | 15 +++++++++++++++
 .../contextBuilder/homepage/queryTotalPages.js    |  2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/eq-author-api/schema/resolvers/homepage/index.js b/eq-author-api/schema/resolvers/homepage/index.js
index 596b3aa1f7..3e182b56e7 100644
--- a/eq-author-api/schema/resolvers/homepage/index.js
+++ b/eq-author-api/schema/resolvers/homepage/index.js
@@ -41,8 +41,8 @@ const Resolvers = {
     totalPages: async (_, { input = {} }, ctx) => {
       const {
         resultsPerPage = 10,
-        search,
-        owner,
+        search = "",
+        owner = "",
         createdOnOrAfter,
         createdOnOrBefore,
         access,
diff --git a/eq-author-api/schema/resolvers/homepage/index.test.js b/eq-author-api/schema/resolvers/homepage/index.test.js
index e60283b755..4b1ed01496 100644
--- a/eq-author-api/schema/resolvers/homepage/index.test.js
+++ b/eq-author-api/schema/resolvers/homepage/index.test.js
@@ -86,10 +86,25 @@ describe("homepage", () => {
           title: "Test Questionnaire 11",
         }),
       ]);
+      expect(filteredQuestionnaires).not.toContainEqual(
+        expect.objectContaining({
+          title: "Test Questionnaire 2",
+        })
+      );
     });
   });
 
   describe("totalPages", () => {
+    it("should return total pages for all questionnaires when input is not provided", async () => {
+      const user = {
+        id: "user-1",
+      };
+
+      const totalPages = await queryTotalPages(user);
+
+      expect(totalPages).toEqual(1);
+    });
+
     it("should return total pages", async () => {
       const user = {
         id: "user-1",
diff --git a/eq-author-api/tests/utils/contextBuilder/homepage/queryTotalPages.js b/eq-author-api/tests/utils/contextBuilder/homepage/queryTotalPages.js
index 65345fb1d1..c14e09a28a 100644
--- a/eq-author-api/tests/utils/contextBuilder/homepage/queryTotalPages.js
+++ b/eq-author-api/tests/utils/contextBuilder/homepage/queryTotalPages.js
@@ -9,7 +9,7 @@ const getTotalPagesQuery = `
 const queryTotalPages = async (user, input) => {
   const result = await executeQuery(
     getTotalPagesQuery,
-    { input },
+    input ? { input } : undefined, // Passes `undefined` when `input` is falsy to test when `input` is not provided
     {
       user,
     }

From 5a883d41672a44d7c1a51eed4f6a00ccba8d79ce Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Fri, 26 Jul 2024 10:36:27 +0100
Subject: [PATCH 150/215] Fix error thrown by getTotalPages when no
 questionnaires returned

---
 eq-author-api/db/datastore/datastore-mongodb.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.js b/eq-author-api/db/datastore/datastore-mongodb.js
index 930ca914ec..93d2723caa 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.js
@@ -591,7 +591,7 @@ const getTotalPages = async (input, ctx) => {
     const matchQuery = await getMatchQuery(input, ctx);
 
     // Gets the total number of questionnaires that meet the search conditions
-    const { totalFilteredQuestionnaires } = await questionnairesCollection
+    const aggregationResult = await questionnairesCollection
       .aggregate([
         {
           $lookup: {
@@ -610,6 +610,9 @@ const getTotalPages = async (input, ctx) => {
       ])
       .next();
 
+    // Sets default `totalFilteredQuestionnaires` to 0 if no questionnaires are returned - prevents error when destructuring `totalFilteredQuestionnaires` with no results
+    const { totalFilteredQuestionnaires = 0 } = aggregationResult || {};
+
     // Calculates the total number of pages by dividing the total number of filtered questionnaires by the number of results per page, and rounding up
     const totalPages = Math.ceil(totalFilteredQuestionnaires / resultsPerPage);
 

From 624d3ce1d2c1ca53477734123c47e547db1efc06 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Fri, 26 Jul 2024 10:46:26 +0100
Subject: [PATCH 151/215] Add test for total pages when no questionnaires
 returned

---
 .../db/datastore/datastore-mongodb.test.js        | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.test.js b/eq-author-api/db/datastore/datastore-mongodb.test.js
index a734fa462d..c3ca3bec3e 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.test.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.test.js
@@ -882,6 +882,21 @@ describe("MongoDB Datastore", () => {
         expect(totalPageCount).toBe(3); // (8 questionnaires) / (3 results per page) gives 3 total pages after rounding up
       });
 
+      it("Should return 0 when no questionnaires are found", async () => {
+        const totalPageCount = await mongoDB.getTotalPages(
+          {
+            resultsPerPage: 10,
+            search: "Lorem ipsum", // Search term contained in no questionnaires
+            owner: "",
+            access: "All",
+          },
+          ctx
+        );
+
+        expect(mockLoggerError).not.toHaveBeenCalled();
+        expect(totalPageCount).toBe(0);
+      });
+
       it("Should log an error message on exception", async () => {
         await mongoDB.getTotalPages(); // No arguments to trigger exception
 

From 508d7f077080d4dfc46babe5473e700b7207048c Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Wed, 31 Jul 2024 11:32:51 +0100
Subject: [PATCH 152/215] Refactor filteredQuestionnaires resolver

---
 .../db/datastore/datastore-mongodb.js         | 10 +++----
 .../schema/resolvers/homepage/index.js        | 29 +------------------
 2 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.js b/eq-author-api/db/datastore/datastore-mongodb.js
index 93d2723caa..4e76664f63 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.js
@@ -290,11 +290,11 @@ const listQuestionnaires = async () => {
   }
 };
 
-const getMatchQuery = async (input, ctx) => {
+const getMatchQuery = async (input = {}, ctx) => {
   try {
     const {
-      search,
-      owner,
+      search = "",
+      owner = "",
       createdOnOrAfter,
       createdOnOrBefore,
       access,
@@ -397,10 +397,10 @@ const getMatchQuery = async (input, ctx) => {
   }
 };
 
-const listFilteredQuestionnaires = async (input, ctx) => {
+const listFilteredQuestionnaires = async (input = {}, ctx) => {
   try {
     const {
-      resultsPerPage,
+      resultsPerPage = 10,
       firstQuestionnaireIdOnPage,
       lastQuestionnaireIdOnPage,
       sortBy,
diff --git a/eq-author-api/schema/resolvers/homepage/index.js b/eq-author-api/schema/resolvers/homepage/index.js
index 3e182b56e7..7fa2a98045 100644
--- a/eq-author-api/schema/resolvers/homepage/index.js
+++ b/eq-author-api/schema/resolvers/homepage/index.js
@@ -6,34 +6,7 @@ const {
 const Resolvers = {
   Query: {
     filteredQuestionnaires: async (_, { input = {} }, ctx) => {
-      const {
-        resultsPerPage = 10,
-        firstQuestionnaireIdOnPage,
-        lastQuestionnaireIdOnPage,
-        search = "",
-        owner = "",
-        createdOnOrAfter,
-        createdOnOrBefore,
-        access,
-        myQuestionnaires,
-        sortBy,
-      } = input;
-
-      const questionnaires = await listFilteredQuestionnaires(
-        {
-          resultsPerPage,
-          firstQuestionnaireIdOnPage,
-          lastQuestionnaireIdOnPage,
-          search,
-          owner,
-          createdOnOrAfter,
-          createdOnOrBefore,
-          access,
-          myQuestionnaires,
-          sortBy,
-        },
-        ctx
-      );
+      const questionnaires = await listFilteredQuestionnaires(input, ctx);
 
       return questionnaires;
     },

From b1d78af8153c3979a409b422ce576f27cfe8ff0b Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Wed, 31 Jul 2024 14:14:23 +0100
Subject: [PATCH 153/215] Refactor getTotalPages resolver

---
 .../db/datastore/datastore-mongodb.js         |  4 +--
 .../db/datastore/datastore-mongodb.test.js    | 12 +++++++--
 .../schema/resolvers/homepage/index.js        | 26 +++----------------
 3 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.js b/eq-author-api/db/datastore/datastore-mongodb.js
index 4e76664f63..6b3901194c 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.js
@@ -581,9 +581,9 @@ const listFilteredQuestionnaires = async (input = {}, ctx) => {
   }
 };
 
-const getTotalPages = async (input, ctx) => {
+const getTotalPages = async (input = {}, ctx) => {
   try {
-    const { resultsPerPage } = input;
+    const { resultsPerPage = 10 } = input;
 
     // Gets the questionnaires collection
     const questionnairesCollection = dbo.collection("questionnaires");
diff --git a/eq-author-api/db/datastore/datastore-mongodb.test.js b/eq-author-api/db/datastore/datastore-mongodb.test.js
index c3ca3bec3e..d8a5b6c10c 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.test.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.test.js
@@ -900,10 +900,18 @@ describe("MongoDB Datastore", () => {
       it("Should log an error message on exception", async () => {
         await mongoDB.getTotalPages(); // No arguments to trigger exception
 
-        expect(mockLoggerError).toHaveBeenCalledTimes(1);
+        // Two calls as `getMatchQuery` also throws an error due to no context object
+        expect(mockLoggerError).toHaveBeenCalledTimes(2);
+        expect(mockLoggerError).toHaveBeenCalledWith(
+          {
+            input: {},
+            error: expect.any(String),
+          },
+          "Unable to get match query for filtering questionnaires (from getMatchQuery)"
+        );
         expect(mockLoggerError).toHaveBeenCalledWith(
           {
-            input: undefined,
+            input: {},
             error: expect.any(String),
           },
           "Unable to get total pages (from getTotalPages)"
diff --git a/eq-author-api/schema/resolvers/homepage/index.js b/eq-author-api/schema/resolvers/homepage/index.js
index 7fa2a98045..72d8d27497 100644
--- a/eq-author-api/schema/resolvers/homepage/index.js
+++ b/eq-author-api/schema/resolvers/homepage/index.js
@@ -5,35 +5,15 @@ const {
 
 const Resolvers = {
   Query: {
-    filteredQuestionnaires: async (_, { input = {} }, ctx) => {
+    filteredQuestionnaires: async (_, { input }, ctx) => {
       const questionnaires = await listFilteredQuestionnaires(input, ctx);
 
       return questionnaires;
     },
 
-    totalPages: async (_, { input = {} }, ctx) => {
-      const {
-        resultsPerPage = 10,
-        search = "",
-        owner = "",
-        createdOnOrAfter,
-        createdOnOrBefore,
-        access,
-        myQuestionnaires,
-      } = input;
+    totalPages: async (_, { input }, ctx) => {
+      const totalPages = await getTotalPages(input, ctx);
 
-      const totalPages = await getTotalPages(
-        {
-          resultsPerPage,
-          search,
-          owner,
-          createdOnOrAfter,
-          createdOnOrBefore,
-          access,
-          myQuestionnaires,
-        },
-        ctx
-      );
       return totalPages;
     },
   },

From 8567b8dd6d8bfa2947928c02a1441c055e71da7e Mon Sep 17 00:00:00 2001
From: martyncolmer <martyc1974@hotmail.com>
Date: Wed, 31 Jul 2024 14:41:23 +0100
Subject: [PATCH 154/215] updated id to guid

---
 eq-author-api/schema/resolvers/base.js           | 4 ++--
 eq-author-api/schema/tests/publishSchema.test.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eq-author-api/schema/resolvers/base.js b/eq-author-api/schema/resolvers/base.js
index c77225062d..deb8e25fea 100644
--- a/eq-author-api/schema/resolvers/base.js
+++ b/eq-author-api/schema/resolvers/base.js
@@ -1636,8 +1636,8 @@ const Resolvers = {
         .then(async (res) => {
           if (res.status === 200) {
             const responseJson = res.data;
-
-            publishResult.cirId = responseJson.id;
+            console.log(responseJson);
+            publishResult.cirId = responseJson.guid;
             publishResult.cirVersion = responseJson.ci_version;
             publishResult.success = true;
           } else {
diff --git a/eq-author-api/schema/tests/publishSchema.test.js b/eq-author-api/schema/tests/publishSchema.test.js
index b76e3d7a2c..bca4d74219 100644
--- a/eq-author-api/schema/tests/publishSchema.test.js
+++ b/eq-author-api/schema/tests/publishSchema.test.js
@@ -15,7 +15,7 @@ fetch.mockImplementation(() =>
   Promise.resolve({
     status: 200,
     json: () => ({
-      id: "cir-id-1",
+      guid: "cir-id-1",
       // eslint-disable-next-line camelcase
       ci_version: "1",
     }),

From db6dd8ab78b3369a5de26bb1241e2066c1bfcc93 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Wed, 31 Jul 2024 14:48:31 +0100
Subject: [PATCH 155/215] Refactor access if statements to switch statement

---
 .../db/datastore/datastore-mongodb.js         | 84 +++++++++----------
 1 file changed, 41 insertions(+), 43 deletions(-)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.js b/eq-author-api/db/datastore/datastore-mongodb.js
index 6b3901194c..0bf6c12339 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.js
@@ -332,50 +332,48 @@ const getMatchQuery = async (input = {}, ctx) => {
       matchQuery.createdAt = { $lte: createdOnOrBefore }; // lte: Less than or equal to
     }
 
-    if (access === "All") {
-      if (!matchQuery.$and) {
-        matchQuery.$and = [];
-      }
+    switch (access) {
       // Searches for all questionnaires that are public, the user is an editor of, or the user created (all questionnaires the user has access to)
-      matchQuery.$and.push({
-        $or: [
-          { isPublic: true },
-          { editors: { $in: [userId] } },
-          { createdBy: userId },
-        ],
-      });
-    }
-    // Searches for all questionnaires the user can edit (all questionnaires the user is an editor of or the user created)
-    if (access === "Write") {
-      if (!matchQuery.$and) {
-        matchQuery.$and = [];
-      }
-      matchQuery.$and.push({
-        $or: [{ editors: { $in: [userId] } }, { createdBy: userId }],
-      });
-    }
-    // Searches for all questionnaires the user can view but not edit (all public questionnaires the user is not an editor of and did not create)
-    if (access === "Read") {
-      if (!matchQuery.$and) {
-        matchQuery.$and = [];
-      }
-      matchQuery.$and.push(
-        {
-          editors: { $nin: [userId] },
-        },
-        { createdBy: { $ne: userId } },
-        { isPublic: true }
-      );
-    }
-    // Searches for all non-public questionnaires the user can edit (all questionnaires the user is an editor of or the user created that are not public)
-    if (access === "PrivateQuestionnaires") {
-      if (!matchQuery.$and) {
-        matchQuery.$and = [];
-      }
-      matchQuery.$and.push({
-        $or: [{ editors: { $in: [userId] } }, { createdBy: userId }],
-        isPublic: false,
-      });
+      case "All":
+        matchQuery.$and = matchQuery.$and || [];
+        matchQuery.$and.push({
+          $or: [
+            { isPublic: true },
+            { editors: { $in: [userId] } },
+            { createdBy: userId },
+          ],
+        });
+
+        break;
+      // Searches for all questionnaires the user can edit (all questionnaires the user is an editor of or the user created)
+      case "Write":
+        matchQuery.$and = matchQuery.$and || [];
+        matchQuery.$and.push({
+          $or: [{ editors: { $in: [userId] } }, { createdBy: userId }],
+        });
+
+        break;
+      // Searches for all questionnaires the user can view but not edit (all public questionnaires the user is not an editor of and did not create)
+      case "Read":
+        matchQuery.$and = matchQuery.$and || [];
+        matchQuery.$and.push(
+          {
+            editors: { $nin: [userId] },
+          },
+          { createdBy: { $ne: userId } },
+          { isPublic: true }
+        );
+
+        break;
+      // Searches for all non-public questionnaires the user can edit (all questionnaires the user is an editor of or the user created that are not public)
+      case "PrivateQuestionnaires":
+        matchQuery.$and = matchQuery.$and || [];
+        matchQuery.$and.push({
+          $or: [{ editors: { $in: [userId] } }, { createdBy: userId }],
+          isPublic: false,
+        });
+
+        break;
     }
 
     // TODO: When "My questionnaires" feature is implemented, implement code to filter questionnaires based on questionnaires marked as "My questionnaires"

From 0adb8b68e8612a33f5532f23ba5f18bdaeb79a53 Mon Sep 17 00:00:00 2001
From: martyncolmer <martyc1974@hotmail.com>
Date: Wed, 31 Jul 2024 14:48:43 +0100
Subject: [PATCH 156/215] remove console log

---
 eq-author-api/schema/resolvers/base.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eq-author-api/schema/resolvers/base.js b/eq-author-api/schema/resolvers/base.js
index deb8e25fea..e694571a53 100644
--- a/eq-author-api/schema/resolvers/base.js
+++ b/eq-author-api/schema/resolvers/base.js
@@ -1636,7 +1636,6 @@ const Resolvers = {
         .then(async (res) => {
           if (res.status === 200) {
             const responseJson = res.data;
-            console.log(responseJson);
             publishResult.cirId = responseJson.guid;
             publishResult.cirVersion = responseJson.ci_version;
             publishResult.success = true;

From 1da97cfe455cffd9be73c325a292ac6b27f43ba2 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Wed, 31 Jul 2024 15:59:58 +0100
Subject: [PATCH 157/215] Update default sort for listFilteredQuestionnaires to
 "createdDateDesc"

---
 .../db/datastore/datastore-mongodb.js         |   2 +-
 .../db/datastore/datastore-mongodb.test.js    | 150 ++++++++++--------
 .../schema/resolvers/homepage/index.test.js   |  15 +-
 3 files changed, 90 insertions(+), 77 deletions(-)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.js b/eq-author-api/db/datastore/datastore-mongodb.js
index 0bf6c12339..026d05ef0e 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.js
@@ -401,7 +401,7 @@ const listFilteredQuestionnaires = async (input = {}, ctx) => {
       resultsPerPage = 10,
       firstQuestionnaireIdOnPage,
       lastQuestionnaireIdOnPage,
-      sortBy,
+      sortBy = "createdDateDesc",
     } = input;
 
     // Gets the questionnaires collection
diff --git a/eq-author-api/db/datastore/datastore-mongodb.test.js b/eq-author-api/db/datastore/datastore-mongodb.test.js
index d8a5b6c10c..805e859078 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.test.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.test.js
@@ -453,11 +453,12 @@ describe("MongoDB Datastore", () => {
         );
 
         expect(listOfQuestionnaires.length).toBe(5);
-        expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 1");
-        expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 2");
+        // "Test questionnaire 6" is first as default sort is newest to oldest
+        expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 6");
+        expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 4");
         expect(listOfQuestionnaires[2].title).toEqual("Test questionnaire 3");
-        expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 4");
-        expect(listOfQuestionnaires[4].title).toEqual("Test questionnaire 6");
+        expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 2");
+        expect(listOfQuestionnaires[4].title).toEqual("Test questionnaire 1");
       });
 
       it("Should return questionnaires with owner containing the `owner` search term", async () => {
@@ -472,8 +473,8 @@ describe("MongoDB Datastore", () => {
         );
 
         expect(listOfQuestionnaires.length).toBe(2);
-        expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 3");
-        expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 4");
+        expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 4");
+        expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 3");
       });
 
       it("Should return questionnaires created on or after the searched date", async () => {
@@ -489,20 +490,23 @@ describe("MongoDB Datastore", () => {
         );
 
         expect(listOfQuestionnaires.length).toBe(7);
-        expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 2");
-        expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 3");
-        expect(listOfQuestionnaires[2].title).toEqual("Test questionnaire 4");
-        expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 6");
-        // Questionnaires created in previous tests
-        expect(listOfQuestionnaires[4].title).toEqual(
+        /* 
+          Questionnaires with titles "Default questionnaire title" are created in previous tests.
+          These appear first when sorted by newest to oldest as their `createdAt` dates are most recent.
+        */
+        expect(listOfQuestionnaires[0].title).toEqual(
           "Default questionnaire title"
         );
-        expect(listOfQuestionnaires[5].title).toEqual(
+        expect(listOfQuestionnaires[1].title).toEqual(
           "Default questionnaire title"
         );
-        expect(listOfQuestionnaires[6].title).toEqual(
+        expect(listOfQuestionnaires[2].title).toEqual(
           "Default questionnaire title"
         );
+        expect(listOfQuestionnaires[6].title).toEqual("Test questionnaire 2");
+        expect(listOfQuestionnaires[5].title).toEqual("Test questionnaire 3");
+        expect(listOfQuestionnaires[4].title).toEqual("Test questionnaire 4");
+        expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 6");
       });
 
       it("Should return questionnaires created on or before the searched date", async () => {
@@ -518,8 +522,8 @@ describe("MongoDB Datastore", () => {
         );
 
         expect(listOfQuestionnaires.length).toBe(2);
-        expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 1");
-        expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 2");
+        expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 2");
+        expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 1");
       });
 
       it("Should return questionnaires created between the searched dates", async () => {
@@ -536,9 +540,9 @@ describe("MongoDB Datastore", () => {
         );
 
         expect(listOfQuestionnaires.length).toBe(3);
-        expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 2");
+        expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 4");
         expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 3");
-        expect(listOfQuestionnaires[2].title).toEqual("Test questionnaire 4");
+        expect(listOfQuestionnaires[2].title).toEqual("Test questionnaire 2");
       });
 
       it("Should return relevant questionnaires when searching by access `All`", async () => {
@@ -553,21 +557,24 @@ describe("MongoDB Datastore", () => {
         );
 
         expect(listOfQuestionnaires.length).toBe(8);
-        expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 1");
-        expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 2");
-        expect(listOfQuestionnaires[2].title).toEqual("Test questionnaire 3");
-        expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 4");
-        expect(listOfQuestionnaires[4].title).toEqual("Test questionnaire 6");
-        // Questionnaires created in previous tests
-        expect(listOfQuestionnaires[5].title).toEqual(
+        /* 
+          Questionnaires with titles "Default questionnaire title" are created in previous tests.
+          These appear first when sorted by newest to oldest as their `createdAt` dates are most recent.
+        */
+        expect(listOfQuestionnaires[0].title).toEqual(
           "Default questionnaire title"
         );
-        expect(listOfQuestionnaires[6].title).toEqual(
+        expect(listOfQuestionnaires[1].title).toEqual(
           "Default questionnaire title"
         );
-        expect(listOfQuestionnaires[7].title).toEqual(
+        expect(listOfQuestionnaires[2].title).toEqual(
           "Default questionnaire title"
         );
+        expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 6");
+        expect(listOfQuestionnaires[4].title).toEqual("Test questionnaire 4");
+        expect(listOfQuestionnaires[5].title).toEqual("Test questionnaire 3");
+        expect(listOfQuestionnaires[6].title).toEqual("Test questionnaire 2");
+        expect(listOfQuestionnaires[7].title).toEqual("Test questionnaire 1");
       });
 
       it("Should return relevant questionnaires when searching by access `Write`", async () => {
@@ -583,10 +590,10 @@ describe("MongoDB Datastore", () => {
 
         // Expects all questionnaires where `ctx.user` is the owner (`ctx.user` created the questionnaire) or an editor
         expect(listOfQuestionnaires.length).toBe(4);
-        expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 1"); // "user-1" created the questionnaire
-        expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 2"); // "user-1" created the questionnaire
-        expect(listOfQuestionnaires[2].title).toEqual("Test questionnaire 3"); // "user-1" is an editor
-        expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 6"); // "user-1" created the questionnaire
+        expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 6"); // "user-1" created the questionnaire
+        expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 3"); // "user-1" is an editor
+        expect(listOfQuestionnaires[2].title).toEqual("Test questionnaire 2"); // "user-1" created the questionnaire
+        expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 1"); // "user-1" created the questionnaire
       });
 
       it("Should return relevant questionnaires when searching by access `Read`", async () => {
@@ -601,17 +608,20 @@ describe("MongoDB Datastore", () => {
         );
 
         expect(listOfQuestionnaires.length).toBe(4);
-        expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 4");
-        // Questionnaires created in previous tests
-        expect(listOfQuestionnaires[1].title).toEqual(
+        /* 
+          Questionnaires with titles "Default questionnaire title" are created in previous tests.
+          These appear first when sorted by newest to oldest as their `createdAt` dates are most recent.
+        */
+        expect(listOfQuestionnaires[0].title).toEqual(
           "Default questionnaire title"
         );
-        expect(listOfQuestionnaires[2].title).toEqual(
+        expect(listOfQuestionnaires[1].title).toEqual(
           "Default questionnaire title"
         );
-        expect(listOfQuestionnaires[3].title).toEqual(
+        expect(listOfQuestionnaires[2].title).toEqual(
           "Default questionnaire title"
         );
+        expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 4");
       });
 
       it("Should return relevant questionnaires when searching by access `PrivateQuestionnaires`", async () => {
@@ -642,10 +652,10 @@ describe("MongoDB Datastore", () => {
         );
 
         expect(listOfQuestionnaires.length).toBe(4);
-        expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 1");
-        expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 2");
-        expect(listOfQuestionnaires[2].title).toEqual("Test questionnaire 3");
-        expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 6");
+        expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 6");
+        expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 3");
+        expect(listOfQuestionnaires[2].title).toEqual("Test questionnaire 2");
+        expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 1");
       });
 
       it("Should return questionnaires on previous page when `firstQuestionnaireIdOnPage` is provided without `lastQuestionnaireIdOnPage`", async () => {
@@ -667,7 +677,7 @@ describe("MongoDB Datastore", () => {
               owner: "",
               access: "All",
               resultsPerPage: 2, // Limits to 2 questionnaires per page to test a small number of questionnaires on previous page
-              firstQuestionnaireIdOnPage: allQuestionnaires[2].id,
+              firstQuestionnaireIdOnPage: allQuestionnaires[6].id,
             },
             ctx
           );
@@ -675,10 +685,10 @@ describe("MongoDB Datastore", () => {
         expect(listOfPreviousPageQuestionnaires.length).toBe(2);
         // The two questionnaires before the first questionnaire on the page (based on firstQuestionnaireIdOnPage)
         expect(listOfPreviousPageQuestionnaires[0].title).toEqual(
-          "Test questionnaire 1"
+          "Test questionnaire 4"
         );
         expect(listOfPreviousPageQuestionnaires[1].title).toEqual(
-          "Test questionnaire 2"
+          "Test questionnaire 3"
         );
       });
 
@@ -709,10 +719,10 @@ describe("MongoDB Datastore", () => {
         expect(listOfNextPageQuestionnaires.length).toBe(2);
         // The two questionnaires after the last questionnaire on the page (based on lastQuestionnaireIdOnPage)
         expect(listOfNextPageQuestionnaires[0].title).toEqual(
-          "Test questionnaire 6"
+          "Test questionnaire 4"
         );
         expect(listOfNextPageQuestionnaires[1].title).toEqual(
-          "Default questionnaire title"
+          "Test questionnaire 3"
         );
       });
 
@@ -763,38 +773,40 @@ describe("MongoDB Datastore", () => {
         expect(listOfQuestionnaires).toEqual([]);
       });
 
-      it("Should sort questionnaires on first page from newest to oldest when `sortBy` is `createdDateDesc`", async () => {
+      it("Should sort questionnaires on first page from oldest to newest when `sortBy` is `createdDateAsc`", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
             search: "",
             owner: "",
             access: "All",
             resultsPerPage: 10,
-            sortBy: "createdDateDesc",
+            sortBy: "createdDateAsc",
           },
           ctx
         );
 
         expect(listOfQuestionnaires.length).toBe(8);
-        // First created are questionnaires created in previous tests as all `Test questionnaires` have `createdAt` dates in the past
-        expect(listOfQuestionnaires[0].title).toEqual(
+        expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 1");
+        expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 2");
+        expect(listOfQuestionnaires[2].title).toEqual("Test questionnaire 3");
+        expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 4");
+        expect(listOfQuestionnaires[4].title).toEqual("Test questionnaire 6");
+        /* 
+          Questionnaires with titles "Default questionnaire title" are created in previous tests.
+          These appear last when sorted by oldest to newest as their `createdAt` dates are most recent.
+        */
+        expect(listOfQuestionnaires[5].title).toEqual(
           "Default questionnaire title"
         );
-        expect(listOfQuestionnaires[1].title).toEqual(
+        expect(listOfQuestionnaires[6].title).toEqual(
           "Default questionnaire title"
         );
-        expect(listOfQuestionnaires[2].title).toEqual(
+        expect(listOfQuestionnaires[7].title).toEqual(
           "Default questionnaire title"
         );
-        // `Test questionnaire 6` has the most recent `createdAt` date of the `Test questionnaires`
-        expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 6");
-        expect(listOfQuestionnaires[4].title).toEqual("Test questionnaire 4");
-        expect(listOfQuestionnaires[5].title).toEqual("Test questionnaire 3");
-        expect(listOfQuestionnaires[6].title).toEqual("Test questionnaire 2");
-        expect(listOfQuestionnaires[7].title).toEqual("Test questionnaire 1");
       });
 
-      it("Should sort questionnaires on previous page from newest to oldest when `sortBy` is `createdDateDesc`", async () => {
+      it("Should sort questionnaires on previous page from oldest to newest when `sortBy` is `createdDateAsc`", async () => {
         // Gets questionnaires with "All" access to get a questionnaire ID to use as `firstQuestionnaireIdOnPage`
         const allQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
@@ -802,7 +814,7 @@ describe("MongoDB Datastore", () => {
             owner: "",
             access: "All",
             resultsPerPage: 10,
-            sortBy: "createdDateDesc",
+            sortBy: "createdDateAsc",
           },
           ctx
         );
@@ -814,8 +826,8 @@ describe("MongoDB Datastore", () => {
               owner: "",
               access: "All",
               resultsPerPage: 2,
-              firstQuestionnaireIdOnPage: allQuestionnaires[6].id,
-              sortBy: "createdDateDesc",
+              firstQuestionnaireIdOnPage: allQuestionnaires[4].id,
+              sortBy: "createdDateAsc",
             },
             ctx
           );
@@ -823,14 +835,14 @@ describe("MongoDB Datastore", () => {
         expect(listOfPreviousPageQuestionnaires.length).toBe(2);
         // The two questionnaires before the first questionnaire on the page (based on firstQuestionnaireIdOnPage)
         expect(listOfPreviousPageQuestionnaires[0].title).toEqual(
-          "Test questionnaire 4"
+          "Test questionnaire 3"
         );
         expect(listOfPreviousPageQuestionnaires[1].title).toEqual(
-          "Test questionnaire 3"
+          "Test questionnaire 4"
         );
       });
 
-      it("Should sort questionnaires on next page from newest to oldest when `sortBy` is `createdDateDesc`", async () => {
+      it("Should sort questionnaires on next page from oldest to newest when `sortBy` is `createdDateAsc`", async () => {
         // Gets questionnaires with "All" access to get a questionnaire ID to use as `lastQuestionnaireIdOnPage`
         const allQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
@@ -838,7 +850,7 @@ describe("MongoDB Datastore", () => {
             owner: "",
             access: "All",
             resultsPerPage: 10,
-            sortBy: "createdDateDesc",
+            sortBy: "createdDateAsc",
           },
           ctx
         );
@@ -850,8 +862,8 @@ describe("MongoDB Datastore", () => {
               owner: "",
               access: "All",
               resultsPerPage: 2,
-              lastQuestionnaireIdOnPage: allQuestionnaires[3].id,
-              sortBy: "createdDateDesc",
+              lastQuestionnaireIdOnPage: allQuestionnaires[1].id,
+              sortBy: "createdDateAsc",
             },
             ctx
           );
@@ -859,10 +871,10 @@ describe("MongoDB Datastore", () => {
         expect(listOfNextPageQuestionnaires.length).toBe(2);
         // The two questionnaires after the last questionnaire on the page (based on lastQuestionnaireIdOnPage)
         expect(listOfNextPageQuestionnaires[0].title).toEqual(
-          "Test questionnaire 4"
+          "Test questionnaire 3"
         );
         expect(listOfNextPageQuestionnaires[1].title).toEqual(
-          "Test questionnaire 3"
+          "Test questionnaire 4"
         );
       });
     });
diff --git a/eq-author-api/schema/resolvers/homepage/index.test.js b/eq-author-api/schema/resolvers/homepage/index.test.js
index 7700cb6bfe..9cee8b13c6 100644
--- a/eq-author-api/schema/resolvers/homepage/index.test.js
+++ b/eq-author-api/schema/resolvers/homepage/index.test.js
@@ -49,21 +49,22 @@ describe("homepage", () => {
 
       const filteredQuestionnaires = await queryFilteredQuestionnaires(user);
 
+      // Sorted from newest created first to oldest created last as `listFilteredQuestionnaires` is sorted in this order by default
       expect(filteredQuestionnaires).toEqual([
         expect.objectContaining({
-          title: "Test Questionnaire 1",
+          title: "Test Questionnaire 11",
         }),
         expect.objectContaining({
-          title: "Test Questionnaire 2",
+          title: "Test Questionnaire 10",
         }),
         expect.objectContaining({
           title: "Test Questionnaire 3",
         }),
         expect.objectContaining({
-          title: "Test Questionnaire 10",
+          title: "Test Questionnaire 2",
         }),
         expect.objectContaining({
-          title: "Test Questionnaire 11",
+          title: "Test Questionnaire 1",
         }),
       ]);
     });
@@ -84,15 +85,15 @@ describe("homepage", () => {
       );
 
       expect(filteredQuestionnaires).toEqual([
+        // `filteredQuestionnaires` should contain `Test Questionnaire 11` and `Test Questionnaire 10` as these contain the string `Test Questionnaire 1`
         expect.objectContaining({
-          title: "Test Questionnaire 1",
+          title: "Test Questionnaire 11",
         }),
-        // `filteredQuestionnaires` should contain `Test Questionnaire 10` and `Test Questionnaire 11` as these contain the string `Test Questionnaire 1`
         expect.objectContaining({
           title: "Test Questionnaire 10",
         }),
         expect.objectContaining({
-          title: "Test Questionnaire 11",
+          title: "Test Questionnaire 1",
         }),
       ]);
       // `filteredQuestionnaires` should not contain `Test Questionnaire 2` and `Test Questionnaire 3` as these do not contain the string `Test Questionnaire 1`

From 2dad7110d73ada33bc44a2c70c9c623777f040b1 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Thu, 1 Aug 2024 15:48:29 +0100
Subject: [PATCH 158/215] Separate Access from Permission

---
 eq-author-api/db/datastore/datastore-mongodb.js       |  4 ++--
 eq-author-api/db/datastore/datastore-mongodb.test.js  |  8 ++++----
 eq-author-api/schema/resolvers/homepage/index.test.js |  2 ++
 eq-author-api/schema/typeDefs.js                      | 11 ++++++++---
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.js b/eq-author-api/db/datastore/datastore-mongodb.js
index 026d05ef0e..bf33ad327a 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.js
@@ -346,7 +346,7 @@ const getMatchQuery = async (input = {}, ctx) => {
 
         break;
       // Searches for all questionnaires the user can edit (all questionnaires the user is an editor of or the user created)
-      case "Write":
+      case "Editor":
         matchQuery.$and = matchQuery.$and || [];
         matchQuery.$and.push({
           $or: [{ editors: { $in: [userId] } }, { createdBy: userId }],
@@ -354,7 +354,7 @@ const getMatchQuery = async (input = {}, ctx) => {
 
         break;
       // Searches for all questionnaires the user can view but not edit (all public questionnaires the user is not an editor of and did not create)
-      case "Read":
+      case "ViewOnly":
         matchQuery.$and = matchQuery.$and || [];
         matchQuery.$and.push(
           {
diff --git a/eq-author-api/db/datastore/datastore-mongodb.test.js b/eq-author-api/db/datastore/datastore-mongodb.test.js
index 805e859078..0fc5fa97e5 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.test.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.test.js
@@ -577,12 +577,12 @@ describe("MongoDB Datastore", () => {
         expect(listOfQuestionnaires[7].title).toEqual("Test questionnaire 1");
       });
 
-      it("Should return relevant questionnaires when searching by access `Write`", async () => {
+      it("Should return relevant questionnaires when searching by access `Editor`", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
             search: "",
             owner: "",
-            access: "Write",
+            access: "Editor",
             resultsPerPage: 10,
           },
           ctx
@@ -596,12 +596,12 @@ describe("MongoDB Datastore", () => {
         expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 1"); // "user-1" created the questionnaire
       });
 
-      it("Should return relevant questionnaires when searching by access `Read`", async () => {
+      it("Should return relevant questionnaires when searching by access `ViewOnly`", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
             search: "",
             owner: "",
-            access: "Read",
+            access: "ViewOnly",
             resultsPerPage: 10,
           },
           ctx
diff --git a/eq-author-api/schema/resolvers/homepage/index.test.js b/eq-author-api/schema/resolvers/homepage/index.test.js
index 9cee8b13c6..1c7a3997ca 100644
--- a/eq-author-api/schema/resolvers/homepage/index.test.js
+++ b/eq-author-api/schema/resolvers/homepage/index.test.js
@@ -77,6 +77,7 @@ describe("homepage", () => {
       const input = {
         search: "Test Questionnaire 1",
         owner: "",
+        access: "All",
       };
 
       const filteredQuestionnaires = await queryFilteredQuestionnaires(
@@ -131,6 +132,7 @@ describe("homepage", () => {
         resultsPerPage: 2,
         search: "Test Questionnaire",
         owner: "",
+        access: "All",
       };
 
       const totalPages = await queryTotalPages(user, input);
diff --git a/eq-author-api/schema/typeDefs.js b/eq-author-api/schema/typeDefs.js
index ead3db9fdb..c2094dd391 100644
--- a/eq-author-api/schema/typeDefs.js
+++ b/eq-author-api/schema/typeDefs.js
@@ -42,9 +42,14 @@ enum QuestionnaireType {
 }
 
 enum Permission {
-  All
   Read
   Write
+}
+
+enum Access {
+  All
+  Editor
+  ViewOnly
   PrivateQuestionnaires
 }
 
@@ -947,7 +952,7 @@ input FilteredQuestionnairesInput {
   owner: String
   createdOnOrAfter: DateTime
   createdOnOrBefore: DateTime
-  access: Permission
+  access: Access!
   myQuestionnaires: Boolean
   sortBy: String
 }
@@ -958,7 +963,7 @@ input TotalPagesInput {
   owner: String
   createdOnOrAfter: DateTime
   createdOnOrBefore: DateTime
-  access: Permission
+  access: Access!
   myQuestionnaires: Boolean
 }
 

From d98a4233c17a62532a2d676fa83da0810836d67f Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Fri, 2 Aug 2024 09:13:30 +0100
Subject: [PATCH 159/215] Update datastore error tests

---
 .../db/datastore/datastore-mongodb.test.js    | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.test.js b/eq-author-api/db/datastore/datastore-mongodb.test.js
index 0fc5fa97e5..6e6456c7dd 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.test.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.test.js
@@ -75,8 +75,26 @@ describe("MongoDB Datastore", () => {
       expect(() => mongoDB.listQuestionnaires()).not.toThrow();
     });
 
-    it("Should not throw error on listFilteredQuestionnaires", async () => {
+    it("Should log error message without throwing error on listFilteredQuestionnaires", async () => {
       expect(() => mongoDB.listFilteredQuestionnaires({}, ctx)).not.toThrow();
+      expect(mockLoggerError).toHaveBeenCalledWith(
+        {
+          error: expect.any(String),
+          input: {},
+        },
+        "Unable to retrieve questionnaires (from listFilteredQuestionnaires)"
+      );
+    });
+
+    it("Should log error message without throwing error on getTotalPages", async () => {
+      expect(() => mongoDB.getTotalPages({}, ctx)).not.toThrow();
+      expect(mockLoggerError).toHaveBeenCalledWith(
+        {
+          error: expect.any(String),
+          input: {},
+        },
+        "Unable to get total pages (from getTotalPages)"
+      );
     });
 
     it("Should not throw error on createQuestionnaire", async () => {

From 2f830abd81b17d915ed537e03926cee193e24471 Mon Sep 17 00:00:00 2001
From: sanjeevz3009 <sanjeevz1717@gmail.com>
Date: Wed, 7 Aug 2024 15:14:42 +0100
Subject: [PATCH 160/215] Added session timeout

---
 eq-author/src/App/MeContext.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/eq-author/src/App/MeContext.js b/eq-author/src/App/MeContext.js
index 38a7c38e4f..c7a3c34256 100644
--- a/eq-author/src/App/MeContext.js
+++ b/eq-author/src/App/MeContext.js
@@ -93,6 +93,24 @@ const ContextProvider = ({ history, client, children }) => {
     auth.onAuthStateChanged((user) => {
       setFirebaseUser(user);
       setAwaitingFirebase(false);
+      auth.onAuthStateChanged((user) => {
+        let sessionTimeout = null;
+        if (user === null || user === undefined) {
+          sessionTimeout && clearTimeout(sessionTimeout);
+          sessionTimeout = null;
+        } else {
+          user.getIdTokenResult().then((idTokenResult) => {
+            const authTime = idTokenResult.claims.auth_time * 1000;
+            const sessionDuration = 10000; // 10 seconds
+            const millisecondsUntilExpiration =
+              sessionDuration - (Date.now() - authTime);
+            sessionTimeout = setTimeout(
+              () => auth.signOut(),
+              millisecondsUntilExpiration
+            );
+          });
+        }
+      });
     });
   }, []);
 

From 4fc57b1f396d9a058b218fc7d1e3e5f2dbb2b9c4 Mon Sep 17 00:00:00 2001
From: sanjeevz3009 <sanjeevz1717@gmail.com>
Date: Thu, 8 Aug 2024 12:28:22 +0100
Subject: [PATCH 161/215] Session duration of 7 days added

---
 eq-author/src/App/MeContext.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eq-author/src/App/MeContext.js b/eq-author/src/App/MeContext.js
index c7a3c34256..1571604849 100644
--- a/eq-author/src/App/MeContext.js
+++ b/eq-author/src/App/MeContext.js
@@ -101,9 +101,12 @@ const ContextProvider = ({ history, client, children }) => {
         } else {
           user.getIdTokenResult().then((idTokenResult) => {
             const authTime = idTokenResult.claims.auth_time * 1000;
-            const sessionDuration = 10000; // 10 seconds
+            // Seven days in milliseconds
+            // const sessionDuration = 1000 * 60 * 60 * 24 * 7;
+            const sessionDuration = 20000; // 10 seconds
             const millisecondsUntilExpiration =
               sessionDuration - (Date.now() - authTime);
+            console.log(millisecondsUntilExpiration);
             sessionTimeout = setTimeout(
               () => auth.signOut(),
               millisecondsUntilExpiration

From bd5b3865ea06a3f572d163182e5fe6151a757af9 Mon Sep 17 00:00:00 2001
From: sanjeevz3009 <sanjeevz1717@gmail.com>
Date: Thu, 8 Aug 2024 12:31:26 +0100
Subject: [PATCH 162/215] Session duration set to 7 days

---
 eq-author/src/App/MeContext.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eq-author/src/App/MeContext.js b/eq-author/src/App/MeContext.js
index 1571604849..ab393a7c57 100644
--- a/eq-author/src/App/MeContext.js
+++ b/eq-author/src/App/MeContext.js
@@ -102,11 +102,11 @@ const ContextProvider = ({ history, client, children }) => {
           user.getIdTokenResult().then((idTokenResult) => {
             const authTime = idTokenResult.claims.auth_time * 1000;
             // Seven days in milliseconds
-            // const sessionDuration = 1000 * 60 * 60 * 24 * 7;
-            const sessionDuration = 20000; // 10 seconds
+            const sessionDuration = 1000 * 60 * 60 * 24 * 7;
+            // const sessionDuration = 20000; // 10 seconds
             const millisecondsUntilExpiration =
               sessionDuration - (Date.now() - authTime);
-            console.log(millisecondsUntilExpiration);
+            // console.log(millisecondsUntilExpiration);
             sessionTimeout = setTimeout(
               () => auth.signOut(),
               millisecondsUntilExpiration

From a7e41a4ea181ac1178214dca3d39fda80a1e4265 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Fri, 9 Aug 2024 08:44:36 +0100
Subject: [PATCH 163/215] Add search for questionnaire owner email

---
 .../db/datastore/datastore-mongodb.js         | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.js b/eq-author-api/db/datastore/datastore-mongodb.js
index bf33ad327a..9ac22354dd 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.js
@@ -307,13 +307,22 @@ const getMatchQuery = async (input = {}, ctx) => {
     }
 
     const matchQuery = {
-      // Searches for questionnaires with `title` or `shortTitle` (short code) containing the search term
-      $or: [
-        { title: { $regex: search, $options: "i" } },
-        { shortTitle: { $regex: search, $options: "i" } },
+      $and: [
+        // Searches for questionnaires with `title` or `shortTitle` (short code) containing the search term
+        {
+          $or: [
+            { title: { $regex: search, $options: "i" } },
+            { shortTitle: { $regex: search, $options: "i" } },
+          ],
+        },
+        // Searches for questionnaires with owner name OR email containing the search term - email also handles owner name being null
+        {
+          $or: [
+            { "owner.name": { $regex: owner, $options: "i" } },
+            { "owner.email": { $regex: owner, $options: "i" } },
+          ],
+        },
       ],
-      // Searches for questionnaires with owner name (based on `createdBy`) containing the search term
-      "owner.name": { $regex: owner, $options: "i" },
     };
 
     // If both `createdOnOrAfter` and `createdOnOrBefore` are provided, searches for questionnaires created between `createdOnOrAfter` and `createdOnOrBefore` inclusive

From 68c6afe4acb41ef2083d7d7c633abc478dc9b8f1 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Fri, 9 Aug 2024 09:16:31 +0100
Subject: [PATCH 164/215] Add questionnaire created by user with null name to
 tests

---
 .../db/datastore/datastore-mongodb.test.js    | 77 ++++++++++++-------
 1 file changed, 49 insertions(+), 28 deletions(-)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.test.js b/eq-author-api/db/datastore/datastore-mongodb.test.js
index 6e6456c7dd..90bde9628b 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.test.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.test.js
@@ -405,6 +405,14 @@ describe("MongoDB Datastore", () => {
           picture: "",
         });
 
+        await mongoDB.createUser({
+          id: "user-4",
+          email: "null@example.com",
+          name: null, // `name` is null to test questionnaires created by users with null `name` are returned
+          externalId: "user-4",
+          picture: "",
+        });
+
         await mongoDB.createQuestionnaire(
           mockQuestionnaire({
             title: "Test questionnaire 1",
@@ -457,6 +465,14 @@ describe("MongoDB Datastore", () => {
           }),
           ctx
         );
+        await mongoDB.createQuestionnaire(
+          mockQuestionnaire({
+            title: "Test questionnaire 7",
+            ownerId: "user-4",
+            createdAt: new Date(2021, 4, 10, 5, 0, 0, 0),
+          }),
+          ctx
+        );
       });
 
       it("Should return questionnaires with title containing the search term", async () => {
@@ -470,13 +486,14 @@ describe("MongoDB Datastore", () => {
           ctx
         );
 
-        expect(listOfQuestionnaires.length).toBe(5);
-        // "Test questionnaire 6" is first as default sort is newest to oldest
-        expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 6");
-        expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 4");
-        expect(listOfQuestionnaires[2].title).toEqual("Test questionnaire 3");
-        expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 2");
-        expect(listOfQuestionnaires[4].title).toEqual("Test questionnaire 1");
+        expect(listOfQuestionnaires.length).toBe(6);
+        // "Test questionnaire 7" is first as default sort is newest to oldest
+        expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 7");
+        expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 6");
+        expect(listOfQuestionnaires[2].title).toEqual("Test questionnaire 4");
+        expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 3");
+        expect(listOfQuestionnaires[4].title).toEqual("Test questionnaire 2");
+        expect(listOfQuestionnaires[5].title).toEqual("Test questionnaire 1");
       });
 
       it("Should return questionnaires with owner containing the `owner` search term", async () => {
@@ -507,7 +524,7 @@ describe("MongoDB Datastore", () => {
           ctx
         );
 
-        expect(listOfQuestionnaires.length).toBe(7);
+        expect(listOfQuestionnaires.length).toBe(8);
         /* 
           Questionnaires with titles "Default questionnaire title" are created in previous tests.
           These appear first when sorted by newest to oldest as their `createdAt` dates are most recent.
@@ -521,10 +538,11 @@ describe("MongoDB Datastore", () => {
         expect(listOfQuestionnaires[2].title).toEqual(
           "Default questionnaire title"
         );
-        expect(listOfQuestionnaires[6].title).toEqual("Test questionnaire 2");
-        expect(listOfQuestionnaires[5].title).toEqual("Test questionnaire 3");
-        expect(listOfQuestionnaires[4].title).toEqual("Test questionnaire 4");
-        expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 6");
+        expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 7");
+        expect(listOfQuestionnaires[4].title).toEqual("Test questionnaire 6");
+        expect(listOfQuestionnaires[5].title).toEqual("Test questionnaire 4");
+        expect(listOfQuestionnaires[6].title).toEqual("Test questionnaire 3");
+        expect(listOfQuestionnaires[7].title).toEqual("Test questionnaire 2");
       });
 
       it("Should return questionnaires created on or before the searched date", async () => {
@@ -574,7 +592,7 @@ describe("MongoDB Datastore", () => {
           ctx
         );
 
-        expect(listOfQuestionnaires.length).toBe(8);
+        expect(listOfQuestionnaires.length).toBe(9);
         /* 
           Questionnaires with titles "Default questionnaire title" are created in previous tests.
           These appear first when sorted by newest to oldest as their `createdAt` dates are most recent.
@@ -588,11 +606,12 @@ describe("MongoDB Datastore", () => {
         expect(listOfQuestionnaires[2].title).toEqual(
           "Default questionnaire title"
         );
-        expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 6");
-        expect(listOfQuestionnaires[4].title).toEqual("Test questionnaire 4");
-        expect(listOfQuestionnaires[5].title).toEqual("Test questionnaire 3");
-        expect(listOfQuestionnaires[6].title).toEqual("Test questionnaire 2");
-        expect(listOfQuestionnaires[7].title).toEqual("Test questionnaire 1");
+        expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 7");
+        expect(listOfQuestionnaires[4].title).toEqual("Test questionnaire 6");
+        expect(listOfQuestionnaires[5].title).toEqual("Test questionnaire 4");
+        expect(listOfQuestionnaires[6].title).toEqual("Test questionnaire 3");
+        expect(listOfQuestionnaires[7].title).toEqual("Test questionnaire 2");
+        expect(listOfQuestionnaires[8].title).toEqual("Test questionnaire 1");
       });
 
       it("Should return relevant questionnaires when searching by access `Editor`", async () => {
@@ -625,7 +644,7 @@ describe("MongoDB Datastore", () => {
           ctx
         );
 
-        expect(listOfQuestionnaires.length).toBe(4);
+        expect(listOfQuestionnaires.length).toBe(5);
         /* 
           Questionnaires with titles "Default questionnaire title" are created in previous tests.
           These appear first when sorted by newest to oldest as their `createdAt` dates are most recent.
@@ -639,7 +658,8 @@ describe("MongoDB Datastore", () => {
         expect(listOfQuestionnaires[2].title).toEqual(
           "Default questionnaire title"
         );
-        expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 4");
+        expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 7");
+        expect(listOfQuestionnaires[4].title).toEqual("Test questionnaire 4");
       });
 
       it("Should return relevant questionnaires when searching by access `PrivateQuestionnaires`", async () => {
@@ -703,10 +723,10 @@ describe("MongoDB Datastore", () => {
         expect(listOfPreviousPageQuestionnaires.length).toBe(2);
         // The two questionnaires before the first questionnaire on the page (based on firstQuestionnaireIdOnPage)
         expect(listOfPreviousPageQuestionnaires[0].title).toEqual(
-          "Test questionnaire 4"
+          "Test questionnaire 6"
         );
         expect(listOfPreviousPageQuestionnaires[1].title).toEqual(
-          "Test questionnaire 3"
+          "Test questionnaire 4"
         );
       });
 
@@ -737,10 +757,10 @@ describe("MongoDB Datastore", () => {
         expect(listOfNextPageQuestionnaires.length).toBe(2);
         // The two questionnaires after the last questionnaire on the page (based on lastQuestionnaireIdOnPage)
         expect(listOfNextPageQuestionnaires[0].title).toEqual(
-          "Test questionnaire 4"
+          "Test questionnaire 6"
         );
         expect(listOfNextPageQuestionnaires[1].title).toEqual(
-          "Test questionnaire 3"
+          "Test questionnaire 4"
         );
       });
 
@@ -803,25 +823,26 @@ describe("MongoDB Datastore", () => {
           ctx
         );
 
-        expect(listOfQuestionnaires.length).toBe(8);
+        expect(listOfQuestionnaires.length).toBe(9);
         expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 1");
         expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 2");
         expect(listOfQuestionnaires[2].title).toEqual("Test questionnaire 3");
         expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 4");
         expect(listOfQuestionnaires[4].title).toEqual("Test questionnaire 6");
+        expect(listOfQuestionnaires[5].title).toEqual("Test questionnaire 7");
         /* 
           Questionnaires with titles "Default questionnaire title" are created in previous tests.
           These appear last when sorted by oldest to newest as their `createdAt` dates are most recent.
         */
-        expect(listOfQuestionnaires[5].title).toEqual(
-          "Default questionnaire title"
-        );
         expect(listOfQuestionnaires[6].title).toEqual(
           "Default questionnaire title"
         );
         expect(listOfQuestionnaires[7].title).toEqual(
           "Default questionnaire title"
         );
+        expect(listOfQuestionnaires[8].title).toEqual(
+          "Default questionnaire title"
+        );
       });
 
       it("Should sort questionnaires on previous page from oldest to newest when `sortBy` is `createdDateAsc`", async () => {

From 44fb53d3fc4b0d32e050d06aa44c7a18495d767f Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Fri, 9 Aug 2024 09:26:20 +0100
Subject: [PATCH 165/215] Add test for owner email

---
 .../db/datastore/datastore-mongodb.test.js     | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.test.js b/eq-author-api/db/datastore/datastore-mongodb.test.js
index 90bde9628b..d474c5865f 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.test.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.test.js
@@ -496,7 +496,7 @@ describe("MongoDB Datastore", () => {
         expect(listOfQuestionnaires[5].title).toEqual("Test questionnaire 1");
       });
 
-      it("Should return questionnaires with owner containing the `owner` search term", async () => {
+      it("Should return questionnaires with owner name containing the `owner` search term", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
             search: "",
@@ -512,6 +512,22 @@ describe("MongoDB Datastore", () => {
         expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 3");
       });
 
+      it("Should return questionnaires with owner email containing the `owner` search term", async () => {
+        const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
+          {
+            search: "",
+            owner: "user2@example.com",
+            access: "All",
+            resultsPerPage: 10,
+          },
+          ctx
+        );
+
+        expect(listOfQuestionnaires.length).toBe(2);
+        expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 4");
+        expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 3");
+      });
+
       it("Should return questionnaires created on or after the searched date", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {

From f5981069bdfd95ee0e0308f45ebec2c134ee5ea2 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Fri, 9 Aug 2024 09:33:55 +0100
Subject: [PATCH 166/215] Add test for short title search

---
 .../db/datastore/datastore-mongodb.test.js       | 16 ++++++++++++++++
 eq-author-api/db/datastore/mock-questionnaire.js |  2 ++
 2 files changed, 18 insertions(+)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.test.js b/eq-author-api/db/datastore/datastore-mongodb.test.js
index d474c5865f..95fb274962 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.test.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.test.js
@@ -417,6 +417,7 @@ describe("MongoDB Datastore", () => {
           mockQuestionnaire({
             title: "Test questionnaire 1",
             ownerId: "user-1",
+            shortTitle: "Alias 1",
             createdAt: new Date(2021, 2, 5, 5, 0, 0, 0),
           }),
           ctx
@@ -496,6 +497,21 @@ describe("MongoDB Datastore", () => {
         expect(listOfQuestionnaires[5].title).toEqual("Test questionnaire 1");
       });
 
+      it("Should return questionnaires with shortTitle containing the search term", async () => {
+        const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
+          {
+            search: "Alias",
+            owner: "",
+            access: "All",
+            resultsPerPage: 10,
+          },
+          ctx
+        );
+
+        expect(listOfQuestionnaires.length).toBe(1);
+        expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 1"); // "Test questionnaire 1" has `shortTitle` "Alias 1" - this `shortTitle` contains the search term
+      });
+
       it("Should return questionnaires with owner name containing the `owner` search term", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
diff --git a/eq-author-api/db/datastore/mock-questionnaire.js b/eq-author-api/db/datastore/mock-questionnaire.js
index ffd7089bff..7099d850e8 100644
--- a/eq-author-api/db/datastore/mock-questionnaire.js
+++ b/eq-author-api/db/datastore/mock-questionnaire.js
@@ -6,9 +6,11 @@ const mockQuestionnaire = ({
   createdAt,
   isPublic,
   editors,
+  shortTitle,
 }) => {
   const questionnaire = {
     title: title || "Default questionnaire title",
+    shortTitle,
     theme: "business",
     legalBasis: "Voluntary",
     navigation: false,

From 7684d893c755c4a9d265de4f43de2ff9850dca15 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Fri, 9 Aug 2024 09:55:39 +0100
Subject: [PATCH 167/215] Add test for multiple filters

---
 .../db/datastore/datastore-mongodb.test.js    | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.test.js b/eq-author-api/db/datastore/datastore-mongodb.test.js
index 95fb274962..522e205702 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.test.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.test.js
@@ -948,6 +948,26 @@ describe("MongoDB Datastore", () => {
           "Test questionnaire 4"
         );
       });
+
+      it("Should return relevant questionnaires when searching with multiple filters", async () => {
+        const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
+          {
+            search: "Test questionnaire",
+            owner: "Joe",
+            access: "Editor",
+            createdOnOrBefore: new Date(2021, 2, 15),
+            createdOnOrAfter: new Date(2021, 2, 5),
+            resultsPerPage: 10,
+            sortBy: "createdDateAsc",
+          },
+          ctx
+        );
+
+        expect(listOfQuestionnaires.length).toBe(2);
+        // These questionnaires meet all of the filter conditions
+        expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 1");
+        expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 2");
+      });
     });
 
     describe("Getting total page count", () => {

From 9bb8528a7961bc37d5e5251bc73167ff15788818 Mon Sep 17 00:00:00 2001
From: sanjeevz3009 <sanjeevz1717@gmail.com>
Date: Fri, 9 Aug 2024 13:20:25 +0100
Subject: [PATCH 168/215] Duplicate code line removed

---
 eq-author/src/App/MeContext.js | 40 ++++++++++++++++------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/eq-author/src/App/MeContext.js b/eq-author/src/App/MeContext.js
index ab393a7c57..a3e151e911 100644
--- a/eq-author/src/App/MeContext.js
+++ b/eq-author/src/App/MeContext.js
@@ -93,27 +93,25 @@ const ContextProvider = ({ history, client, children }) => {
     auth.onAuthStateChanged((user) => {
       setFirebaseUser(user);
       setAwaitingFirebase(false);
-      auth.onAuthStateChanged((user) => {
-        let sessionTimeout = null;
-        if (user === null || user === undefined) {
-          sessionTimeout && clearTimeout(sessionTimeout);
-          sessionTimeout = null;
-        } else {
-          user.getIdTokenResult().then((idTokenResult) => {
-            const authTime = idTokenResult.claims.auth_time * 1000;
-            // Seven days in milliseconds
-            const sessionDuration = 1000 * 60 * 60 * 24 * 7;
-            // const sessionDuration = 20000; // 10 seconds
-            const millisecondsUntilExpiration =
-              sessionDuration - (Date.now() - authTime);
-            // console.log(millisecondsUntilExpiration);
-            sessionTimeout = setTimeout(
-              () => auth.signOut(),
-              millisecondsUntilExpiration
-            );
-          });
-        }
-      });
+      let sessionTimeout = null;
+      if (user === null || user === undefined) {
+        sessionTimeout && clearTimeout(sessionTimeout);
+        sessionTimeout = null;
+      } else {
+        user.getIdTokenResult().then((idTokenResult) => {
+          const authTime = idTokenResult.claims.auth_time * 1000;
+          // Seven days in milliseconds
+          // const sessionDuration = 1000 * 60 * 60 * 24 * 7;
+          const sessionDuration = 10000; // 10 seconds
+          const millisecondsUntilExpiration =
+            sessionDuration - (Date.now() - authTime);
+          // console.log(millisecondsUntilExpiration);
+          sessionTimeout = setTimeout(
+            () => auth.signOut(),
+            millisecondsUntilExpiration
+          );
+        });
+      }
     });
   }, []);
 

From b641242d7b1a45d79109c22f38ec4ad4f74b6e42 Mon Sep 17 00:00:00 2001
From: sanjeevz3009 <sanjeevz1717@gmail.com>
Date: Fri, 9 Aug 2024 13:35:35 +0100
Subject: [PATCH 169/215] Code cleaned up and comments added

---
 eq-author/src/App/MeContext.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/eq-author/src/App/MeContext.js b/eq-author/src/App/MeContext.js
index a3e151e911..5a52878d58 100644
--- a/eq-author/src/App/MeContext.js
+++ b/eq-author/src/App/MeContext.js
@@ -89,23 +89,28 @@ const ContextProvider = ({ history, client, children }) => {
 
   useEffect(() => {
     // be aware that the return from auth.onAuthStateChanged will change on firebase ver 4.0
-    // https://firebase.google.com/docs/reference/js/v8/firebase.auth.Auth#onauthstatechanged
+    // https://firebase.google.com/docs/reference/js/v8/firebase.auth.Auth#onauthstatechanged]
+    // This useEffect hook is responsible for handling the authentication state changes in Firebase.
+    // It listens for changes in the authentication state using the onAuthStateChanged method.
+    // When the authentication state changes, it updates the firebaseUser state and sets awaitingFirebase to false.
     auth.onAuthStateChanged((user) => {
       setFirebaseUser(user);
       setAwaitingFirebase(false);
+      // It also sets up a session timeout for the user if they are authenticated.
+      // If the user is not authenticated, the session timeout is cleared using clearTimeout.
       let sessionTimeout = null;
       if (user === null || user === undefined) {
         sessionTimeout && clearTimeout(sessionTimeout);
         sessionTimeout = null;
       } else {
+        // If the user is authenticated, it retrieves the ID token result and calculates the session duration.
         user.getIdTokenResult().then((idTokenResult) => {
           const authTime = idTokenResult.claims.auth_time * 1000;
-          // Seven days in milliseconds
-          // const sessionDuration = 1000 * 60 * 60 * 24 * 7;
-          const sessionDuration = 10000; // 10 seconds
+          // The session duration is set to 7 days in this example.
+          const sessionDuration = 1000 * 60 * 60 * 24 * 7;
           const millisecondsUntilExpiration =
             sessionDuration - (Date.now() - authTime);
-          // console.log(millisecondsUntilExpiration);
+          // It then sets up a session timeout using setTimeout, which will automatically sign out the user after the session duration expires.
           sessionTimeout = setTimeout(
             () => auth.signOut(),
             millisecondsUntilExpiration

From ca0f14d09402f8933259c4435672cb432273cdef Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Mon, 12 Aug 2024 15:52:11 +0100
Subject: [PATCH 170/215] Rename homepage to questionnaires

---
 eq-author-api/schema/resolvers/index.js                       | 4 ++--
 .../schema/resolvers/{homepage => questionnaires}/index.js    | 0
 .../resolvers/{homepage => questionnaires}/index.test.js      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename eq-author-api/schema/resolvers/{homepage => questionnaires}/index.js (100%)
 rename eq-author-api/schema/resolvers/{homepage => questionnaires}/index.test.js (97%)

diff --git a/eq-author-api/schema/resolvers/index.js b/eq-author-api/schema/resolvers/index.js
index c6a62adefd..e09458ef1b 100644
--- a/eq-author-api/schema/resolvers/index.js
+++ b/eq-author-api/schema/resolvers/index.js
@@ -4,7 +4,7 @@ const binaryExpression2 = require("./logic/binaryExpression2");
 const page = require("./pages");
 const questionnaireIntroduction = require("./questionnaireIntroduction");
 const importing = require("./importing");
-const homepage = require("./homepage");
+const questionnaires = require("./questionnaires");
 
 module.exports = [
   base,
@@ -13,5 +13,5 @@ module.exports = [
   ...page,
   ...questionnaireIntroduction,
   importing,
-  homepage,
+  questionnaires,
 ];
diff --git a/eq-author-api/schema/resolvers/homepage/index.js b/eq-author-api/schema/resolvers/questionnaires/index.js
similarity index 100%
rename from eq-author-api/schema/resolvers/homepage/index.js
rename to eq-author-api/schema/resolvers/questionnaires/index.js
diff --git a/eq-author-api/schema/resolvers/homepage/index.test.js b/eq-author-api/schema/resolvers/questionnaires/index.test.js
similarity index 97%
rename from eq-author-api/schema/resolvers/homepage/index.test.js
rename to eq-author-api/schema/resolvers/questionnaires/index.test.js
index 1c7a3997ca..c35d48194a 100644
--- a/eq-author-api/schema/resolvers/homepage/index.test.js
+++ b/eq-author-api/schema/resolvers/questionnaires/index.test.js
@@ -4,11 +4,11 @@ const {
 const {
   queryFilteredQuestionnaires,
   queryTotalPages,
-} = require("../../../tests/utils/contextBuilder/homepage");
+} = require("../../../tests/utils/contextBuilder/questionnaires");
 
 const { buildContext } = require("../../../tests/utils/contextBuilder");
 
-describe("homepage", () => {
+describe("questionnaires", () => {
   let ctx;
 
   beforeAll(async () => {

From b9e5f8e3ef469e6aa8514349bded46e41649ac8f Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Mon, 12 Aug 2024 16:18:30 +0100
Subject: [PATCH 171/215] Rename "homepage" to "questionnaires" for context
 builder

---
 .../utils/contextBuilder/{homepage => questionnaires}/index.js    | 0
 .../{homepage => questionnaires}/queryFilteredQuestionnaires.js   | 0
 .../{homepage => questionnaires}/queryTotalPages.js               | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename eq-author-api/tests/utils/contextBuilder/{homepage => questionnaires}/index.js (100%)
 rename eq-author-api/tests/utils/contextBuilder/{homepage => questionnaires}/queryFilteredQuestionnaires.js (100%)
 rename eq-author-api/tests/utils/contextBuilder/{homepage => questionnaires}/queryTotalPages.js (100%)

diff --git a/eq-author-api/tests/utils/contextBuilder/homepage/index.js b/eq-author-api/tests/utils/contextBuilder/questionnaires/index.js
similarity index 100%
rename from eq-author-api/tests/utils/contextBuilder/homepage/index.js
rename to eq-author-api/tests/utils/contextBuilder/questionnaires/index.js
diff --git a/eq-author-api/tests/utils/contextBuilder/homepage/queryFilteredQuestionnaires.js b/eq-author-api/tests/utils/contextBuilder/questionnaires/queryFilteredQuestionnaires.js
similarity index 100%
rename from eq-author-api/tests/utils/contextBuilder/homepage/queryFilteredQuestionnaires.js
rename to eq-author-api/tests/utils/contextBuilder/questionnaires/queryFilteredQuestionnaires.js
diff --git a/eq-author-api/tests/utils/contextBuilder/homepage/queryTotalPages.js b/eq-author-api/tests/utils/contextBuilder/questionnaires/queryTotalPages.js
similarity index 100%
rename from eq-author-api/tests/utils/contextBuilder/homepage/queryTotalPages.js
rename to eq-author-api/tests/utils/contextBuilder/questionnaires/queryTotalPages.js

From 8a2990ea81841daca57b112244b60e02863ff74f Mon Sep 17 00:00:00 2001
From: sanjeevz3009 <sanjeevz1717@gmail.com>
Date: Mon, 12 Aug 2024 16:48:57 +0100
Subject: [PATCH 172/215] Rewritten the sessionDuration calculation for 7 days
 in milliseconds (it now multiplies from days, hours, minutes, seconds and
 then milliseconds)

---
 eq-author/src/App/MeContext.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eq-author/src/App/MeContext.js b/eq-author/src/App/MeContext.js
index 5a52878d58..508c6019ac 100644
--- a/eq-author/src/App/MeContext.js
+++ b/eq-author/src/App/MeContext.js
@@ -107,7 +107,7 @@ const ContextProvider = ({ history, client, children }) => {
         user.getIdTokenResult().then((idTokenResult) => {
           const authTime = idTokenResult.claims.auth_time * 1000;
           // The session duration is set to 7 days in this example.
-          const sessionDuration = 1000 * 60 * 60 * 24 * 7;
+          const sessionDuration = 7 * 24 * 60 * 60 * 1000;
           const millisecondsUntilExpiration =
             sessionDuration - (Date.now() - authTime);
           // It then sets up a session timeout using setTimeout, which will automatically sign out the user after the session duration expires.

From ed8a55acf0412c77df28cead355030ed3bb63b33 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Tue, 13 Aug 2024 13:13:24 +0100
Subject: [PATCH 173/215] Update format to "should" in datastore tests

---
 .../db/datastore/datastore-mongodb.test.js    | 162 +++++++++---------
 1 file changed, 81 insertions(+), 81 deletions(-)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.test.js b/eq-author-api/db/datastore/datastore-mongodb.test.js
index 522e205702..c572604c3f 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.test.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.test.js
@@ -65,17 +65,17 @@ describe("MongoDB Datastore", () => {
   });
 
   describe("Error handling for failed DB connection", () => {
-    it("Should throw error on connect to db", async () => {
+    it("should throw error on connect to db", async () => {
       expect(() =>
         mongoDB.connectDB("BrokenConnectionString")
       ).rejects.toThrow();
     });
 
-    it("Should not throw error on listQuestionnaires", async () => {
+    it("should not throw error on listQuestionnaires", async () => {
       expect(() => mongoDB.listQuestionnaires()).not.toThrow();
     });
 
-    it("Should log error message without throwing error on listFilteredQuestionnaires", async () => {
+    it("should log error message without throwing error on listFilteredQuestionnaires", async () => {
       expect(() => mongoDB.listFilteredQuestionnaires({}, ctx)).not.toThrow();
       expect(mockLoggerError).toHaveBeenCalledWith(
         {
@@ -86,7 +86,7 @@ describe("MongoDB Datastore", () => {
       );
     });
 
-    it("Should log error message without throwing error on getTotalPages", async () => {
+    it("should log error message without throwing error on getTotalPages", async () => {
       expect(() => mongoDB.getTotalPages({}, ctx)).not.toThrow();
       expect(mockLoggerError).toHaveBeenCalledWith(
         {
@@ -97,68 +97,68 @@ describe("MongoDB Datastore", () => {
       );
     });
 
-    it("Should not throw error on createQuestionnaire", async () => {
+    it("should not throw error on createQuestionnaire", async () => {
       expect(() =>
         mongoDB.createQuestionnaire(questionnaire, ctx)
       ).not.toThrow();
     });
 
-    it("Should not throw error on getQuestionnaire", async () => {
+    it("should not throw error on getQuestionnaire", async () => {
       expect(() => mongoDB.getQuestionnaire("567")).not.toThrow();
     });
 
-    it("Should not throw error on getQuestionnaireMetaById ", async () => {
+    it("should not throw error on getQuestionnaireMetaById ", async () => {
       expect(() => mongoDB.getQuestionnaireMetaById("567")).not.toThrow();
     });
 
-    it("Should not throw error on saveQuestionnaire", async () => {
+    it("should not throw error on saveQuestionnaire", async () => {
       expect(() => mongoDB.saveQuestionnaire(questionnaire)).not.toThrow();
     });
 
-    it("Should not throw error on saveMetadata", async () => {
+    it("should not throw error on saveMetadata", async () => {
       questionnaire.id = "567";
       expect(() => mongoDB.saveMetadata(questionnaire)).not.toThrow();
     });
 
-    it("Should not throw error on deleteQuestionnaire", async () => {
+    it("should not throw error on deleteQuestionnaire", async () => {
       expect(() => mongoDB.deleteQuestionnaire("567")).not.toThrow();
     });
 
-    it("Should not throw error on listUsers", async () => {
+    it("should not throw error on listUsers", async () => {
       expect(() => mongoDB.listUsers()).not.toThrow();
     });
 
-    it("Should not throw error on createUser", async () => {
+    it("should not throw error on createUser", async () => {
       expect(() => mongoDB.createUser(user)).not.toThrow();
     });
 
-    it("Should not throw error on getUserByExternalId", async () => {
+    it("should not throw error on getUserByExternalId", async () => {
       expect(() => mongoDB.deleteQuestionnaire("567")).not.toThrow();
     });
 
-    it("Should not throw error on getUserById", async () => {
+    it("should not throw error on getUserById", async () => {
       expect(() => mongoDB.getUserById("567")).not.toThrow();
     });
 
-    it("Should not throw error on updateUser", async () => {
+    it("should not throw error on updateUser", async () => {
       expect(() => mongoDB.updateUser(user)).not.toThrow();
     });
 
-    it("Should not throw error on createComments", async () => {
+    it("should not throw error on createComments", async () => {
       expect(() => mongoDB.createComments("567")).not.toThrow();
     });
 
-    it("Should not throw error on saveComments", async () => {
+    it("should not throw error on saveComments", async () => {
       expect(() =>
         mongoDB.saveComments({ questionnaireId: "567" })
       ).not.toThrow();
     });
 
-    it("Should not throw error on getCommentsForQuestionnaire", async () => {
+    it("should not throw error on getCommentsForQuestionnaire", async () => {
       expect(() => mongoDB.getCommentsForQuestionnaire("567")).not.toThrow();
     });
 
-    it("Should not throw error on createHistoryEvent", async () => {
+    it("should not throw error on createHistoryEvent", async () => {
       expect(() => mongoDB.createHistoryEvent("567", {})).not.toThrow();
     });
   });
@@ -169,7 +169,7 @@ describe("MongoDB Datastore", () => {
     });
 
     describe("Getting a list of questionnaires when empty", () => {
-      it("Should return an empty array if no questionnaires are found", async () => {
+      it("should return an empty array if no questionnaires are found", async () => {
         const listOfQuestionnaires = await mongoDB.listQuestionnaires();
         expect(listOfQuestionnaires.length).toBe(0);
         expect(Array.isArray(listOfQuestionnaires)).toBeTruthy();
@@ -177,7 +177,7 @@ describe("MongoDB Datastore", () => {
     });
 
     describe("Creating a questionnaire", () => {
-      it("Should give the questionnaire an ID if one is not given", async () => {
+      it("should give the questionnaire an ID if one is not given", async () => {
         const uuidRegex =
           /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
         expect(questionnaire.id).toBeFalsy();
@@ -189,7 +189,7 @@ describe("MongoDB Datastore", () => {
         expect(questionnaireFromDb.id).toMatch(uuidRegex);
       });
 
-      it("Should leave the questionnaire ID as is if one is given", async () => {
+      it("should leave the questionnaire ID as is if one is given", async () => {
         expect(questionnaire.id).toBeFalsy();
         questionnaire.id = "123";
         expect(questionnaire.id).toBeTruthy();
@@ -202,23 +202,23 @@ describe("MongoDB Datastore", () => {
     });
 
     describe("Getting the latest questionnaire version", () => {
-      it("Should should handle when an ID is not provided", () => {
+      it("should should handle when an ID is not provided", () => {
         expect(() => mongoDB.getQuestionnaire()).not.toThrow();
       });
 
-      it("Should return null when it cannot find the questionnaire", async () => {
+      it("should return null when it cannot find the questionnaire", async () => {
         const questionnaireFromDb = await mongoDB.getQuestionnaire("567");
         expect(questionnaireFromDb).toBeNull();
         expect(mongoDB.getQuestionnaire("567")).resolves.toBeNull();
       });
 
-      it("Should transform Timestamps into JS Date objects", async () => {
+      it("should transform Timestamps into JS Date objects", async () => {
         const questionnaireFromDb = await mongoDB.getQuestionnaire("123");
         expect(questionnaireFromDb.createdAt instanceof Date).toBeTruthy();
         expect(questionnaireFromDb.updatedAt instanceof Date).toBeTruthy();
       });
 
-      it("Should get a questionnaire with missing section, metadata and editors", async () => {
+      it("should get a questionnaire with missing section, metadata and editors", async () => {
         delete questionnaire.sections;
         delete questionnaire.metadata;
         delete questionnaire.editors;
@@ -230,11 +230,11 @@ describe("MongoDB Datastore", () => {
     });
 
     describe("Getting the base questionnaire", () => {
-      it("Should handle when an ID is not provided", () => {
+      it("should handle when an ID is not provided", () => {
         expect(() => mongoDB.getQuestionnaireMetaById()).not.toThrow();
       });
 
-      it("Should return null when it cannot find the questionnaire", async () => {
+      it("should return null when it cannot find the questionnaire", async () => {
         const baseQuestionnaireFromDb = await mongoDB.getQuestionnaireMetaById(
           "567"
         );
@@ -242,7 +242,7 @@ describe("MongoDB Datastore", () => {
         expect(mongoDB.getQuestionnaire("567")).resolves.toBeNull();
       });
 
-      it("Should transform Timestamps into JS Data objects", async () => {
+      it("should transform Timestamps into JS Data objects", async () => {
         const baseQuestionnaireFromDb = await mongoDB.getQuestionnaireMetaById(
           "123"
         );
@@ -256,11 +256,11 @@ describe("MongoDB Datastore", () => {
     });
 
     describe("Saving a questionnaire", () => {
-      it("Should handle when an ID cannot be found within the given questionnaire", () => {
+      it("should handle when an ID cannot be found within the given questionnaire", () => {
         expect(() => mongoDB.saveQuestionnaire(questionnaire)).not.toThrow();
       });
 
-      it("Should update the 'updatedAt' property", async () => {
+      it("should update the 'updatedAt' property", async () => {
         const updatedAt = new Date();
         const savedQuestionnaire = await mongoDB.saveQuestionnaire({
           id: "123",
@@ -272,7 +272,7 @@ describe("MongoDB Datastore", () => {
     });
 
     describe("Getting a list of questionnaires", () => {
-      it("Should transform Timestamps into JS Date objects", async () => {
+      it("should transform Timestamps into JS Date objects", async () => {
         const listOfQuestionnaires = await mongoDB.listQuestionnaires();
 
         expect(listOfQuestionnaires[0].updatedAt instanceof Date).toBeTruthy();
@@ -281,13 +281,13 @@ describe("MongoDB Datastore", () => {
     });
 
     describe("Deleting a questionnaire", () => {
-      it("Should handle when an ID has not been given", () => {
+      it("should handle when an ID has not been given", () => {
         expect(() => mongoDB.deleteQuestionnaire()).not.toThrow();
       });
     });
 
     describe("Getting a list of users", () => {
-      it("Should return an empty array if no users are found", async () => {
+      it("should return an empty array if no users are found", async () => {
         const listOfUsers = await mongoDB.listUsers();
         expect(listOfUsers.length).toBe(0);
         expect(Array.isArray(listOfUsers)).toBeTruthy();
@@ -295,14 +295,14 @@ describe("MongoDB Datastore", () => {
     });
 
     describe("Creating a user", () => {
-      it("Should create a user with a provided id", async () => {
+      it("should create a user with a provided id", async () => {
         const userFromDb = await mongoDB.createUser(firstUser);
         expect(userFromDb.id).toBeTruthy();
         expect(userFromDb.id).toMatch("999-999");
         expect(userFromDb.updatedAt instanceof Date).toBeTruthy();
       });
 
-      it("Should give the user an ID if one is not given", async () => {
+      it("should give the user an ID if one is not given", async () => {
         const uuidRegex =
           /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
         const userFromDb = await mongoDB.createUser(user);
@@ -310,30 +310,30 @@ describe("MongoDB Datastore", () => {
         expect(userFromDb.id).toMatch(uuidRegex);
       });
 
-      it("Should use the email as the users name if one is not given", async () => {
+      it("should use the email as the users name if one is not given", async () => {
         delete user.name;
         const userFromDb = await mongoDB.createUser(user);
         expect(userFromDb.name).toBeTruthy();
         expect(userFromDb.name).toMatch(userFromDb.email);
       });
 
-      it("Should handle any errors that may occur", () => {
+      it("should handle any errors that may occur", () => {
         delete user.email;
         expect(() => mongoDB.createUser(user)).not.toThrow();
       });
     });
 
     describe("Getting a user by their external ID", () => {
-      it("Should handle when an ID is not provided", () => {
+      it("should handle when an ID is not provided", () => {
         expect(() => mongoDB.getUserByExternalId()).not.toThrow();
       });
 
-      it("Should return nothing if the user cannot be found", async () => {
+      it("should return nothing if the user cannot be found", async () => {
         const user = await mongoDB.getUserByExternalId("123");
         expect(user).toBeUndefined();
       });
 
-      it("Should return the user from the externalId", async () => {
+      it("should return the user from the externalId", async () => {
         const userFromDb = await mongoDB.getUserByExternalId(
           firstUser.externalId
         );
@@ -342,31 +342,31 @@ describe("MongoDB Datastore", () => {
     });
 
     describe("Getting a user by their ID", () => {
-      it("Should handle when an ID is not provided", () => {
+      it("should handle when an ID is not provided", () => {
         expect(() => mongoDB.getUserById()).not.toThrow();
       });
-      it("Should return nothing if the user cannot be found", async () => {
+      it("should return nothing if the user cannot be found", async () => {
         const user = await mongoDB.getUserById("123");
         expect(user).toBeUndefined();
       });
-      it("Should return user from the ID", async () => {
+      it("should return user from the ID", async () => {
         const userFromDb = await mongoDB.getUserById(firstUser.id);
         expect(userFromDb.id).toBe(firstUser.id);
       });
     });
 
     describe("Getting a list of users 2", () => {
-      it("Should use the Firestore document ID as the ID for each user", async () => {
+      it("should use the Firestore document ID as the ID for each user", async () => {
         const usersFromDb = await mongoDB.listUsers();
         expect(usersFromDb[0].id).toBe(firstUser.id);
       });
     });
 
     describe("Updating a user", () => {
-      it("Should handle not finding an ID within the given user object", () => {
+      it("should handle not finding an ID within the given user object", () => {
         expect(() => mongoDB.updateUser(user)).not.toThrow();
       });
-      it("Should return the updated user object", async () => {
+      it("should return the updated user object", async () => {
         const changedUser = {
           ...user,
           name: "Harry James Potter",
@@ -476,7 +476,7 @@ describe("MongoDB Datastore", () => {
         );
       });
 
-      it("Should return questionnaires with title containing the search term", async () => {
+      it("should return questionnaires with title containing the search term", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
             search: "Test questionnaire",
@@ -497,7 +497,7 @@ describe("MongoDB Datastore", () => {
         expect(listOfQuestionnaires[5].title).toEqual("Test questionnaire 1");
       });
 
-      it("Should return questionnaires with shortTitle containing the search term", async () => {
+      it("should return questionnaires with shortTitle containing the search term", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
             search: "Alias",
@@ -512,7 +512,7 @@ describe("MongoDB Datastore", () => {
         expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 1"); // "Test questionnaire 1" has `shortTitle` "Alias 1" - this `shortTitle` contains the search term
       });
 
-      it("Should return questionnaires with owner name containing the `owner` search term", async () => {
+      it("should return questionnaires with owner name containing the `owner` search term", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
             search: "",
@@ -528,7 +528,7 @@ describe("MongoDB Datastore", () => {
         expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 3");
       });
 
-      it("Should return questionnaires with owner email containing the `owner` search term", async () => {
+      it("should return questionnaires with owner email containing the `owner` search term", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
             search: "",
@@ -544,7 +544,7 @@ describe("MongoDB Datastore", () => {
         expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 3");
       });
 
-      it("Should return questionnaires created on or after the searched date", async () => {
+      it("should return questionnaires created on or after the searched date", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
             search: "",
@@ -577,7 +577,7 @@ describe("MongoDB Datastore", () => {
         expect(listOfQuestionnaires[7].title).toEqual("Test questionnaire 2");
       });
 
-      it("Should return questionnaires created on or before the searched date", async () => {
+      it("should return questionnaires created on or before the searched date", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
             search: "",
@@ -594,7 +594,7 @@ describe("MongoDB Datastore", () => {
         expect(listOfQuestionnaires[1].title).toEqual("Test questionnaire 1");
       });
 
-      it("Should return questionnaires created between the searched dates", async () => {
+      it("should return questionnaires created between the searched dates", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
             search: "",
@@ -613,7 +613,7 @@ describe("MongoDB Datastore", () => {
         expect(listOfQuestionnaires[2].title).toEqual("Test questionnaire 2");
       });
 
-      it("Should return relevant questionnaires when searching by access `All`", async () => {
+      it("should return relevant questionnaires when searching by access `All`", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
             search: "",
@@ -646,7 +646,7 @@ describe("MongoDB Datastore", () => {
         expect(listOfQuestionnaires[8].title).toEqual("Test questionnaire 1");
       });
 
-      it("Should return relevant questionnaires when searching by access `Editor`", async () => {
+      it("should return relevant questionnaires when searching by access `Editor`", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
             search: "",
@@ -665,7 +665,7 @@ describe("MongoDB Datastore", () => {
         expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 1"); // "user-1" created the questionnaire
       });
 
-      it("Should return relevant questionnaires when searching by access `ViewOnly`", async () => {
+      it("should return relevant questionnaires when searching by access `ViewOnly`", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
             search: "",
@@ -694,7 +694,7 @@ describe("MongoDB Datastore", () => {
         expect(listOfQuestionnaires[4].title).toEqual("Test questionnaire 4");
       });
 
-      it("Should return relevant questionnaires when searching by access `PrivateQuestionnaires`", async () => {
+      it("should return relevant questionnaires when searching by access `PrivateQuestionnaires`", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
             search: "",
@@ -709,7 +709,7 @@ describe("MongoDB Datastore", () => {
         expect(listOfQuestionnaires[0].title).toEqual("Test questionnaire 6");
       });
 
-      it("Should return relevant questionnaires when `myQuestionnaires` is true", async () => {
+      it("should return relevant questionnaires when `myQuestionnaires` is true", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
             search: "",
@@ -728,7 +728,7 @@ describe("MongoDB Datastore", () => {
         expect(listOfQuestionnaires[3].title).toEqual("Test questionnaire 1");
       });
 
-      it("Should return questionnaires on previous page when `firstQuestionnaireIdOnPage` is provided without `lastQuestionnaireIdOnPage`", async () => {
+      it("should return questionnaires on previous page when `firstQuestionnaireIdOnPage` is provided without `lastQuestionnaireIdOnPage`", async () => {
         // Gets questionnaires with "All" access to get a questionnaire ID to use as `firstQuestionnaireIdOnPage`
         const allQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
@@ -762,7 +762,7 @@ describe("MongoDB Datastore", () => {
         );
       });
 
-      it("Should return questionnaires on next page when `lastQuestionnaireIdOnPage` is provided without `firstQuestionnaireIdOnPage`", async () => {
+      it("should return questionnaires on next page when `lastQuestionnaireIdOnPage` is provided without `firstQuestionnaireIdOnPage`", async () => {
         // Gets questionnaires with "All" access to get a questionnaire ID to use as `lastQuestionnaireIdOnPage`
         const allQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
@@ -796,7 +796,7 @@ describe("MongoDB Datastore", () => {
         );
       });
 
-      it("Should log an error message when both `firstQuestionnaireIdOnPage` and `lastQuestionnaireIdOnPage` are provided", async () => {
+      it("should log an error message when both `firstQuestionnaireIdOnPage` and `lastQuestionnaireIdOnPage` are provided", async () => {
         const listFilteredQuestionnairesInput = {
           search: "",
           owner: "",
@@ -820,7 +820,7 @@ describe("MongoDB Datastore", () => {
         );
       });
 
-      it("Should log a debug message when no questionnaires are found", async () => {
+      it("should log a debug message when no questionnaires are found", async () => {
         const listFilteredQuestionnairesInput = {
           search: "Lorem ipsum", // Search term contained in no questionnaires
           owner: "",
@@ -843,7 +843,7 @@ describe("MongoDB Datastore", () => {
         expect(listOfQuestionnaires).toEqual([]);
       });
 
-      it("Should sort questionnaires on first page from oldest to newest when `sortBy` is `createdDateAsc`", async () => {
+      it("should sort questionnaires on first page from oldest to newest when `sortBy` is `createdDateAsc`", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
             search: "",
@@ -877,7 +877,7 @@ describe("MongoDB Datastore", () => {
         );
       });
 
-      it("Should sort questionnaires on previous page from oldest to newest when `sortBy` is `createdDateAsc`", async () => {
+      it("should sort questionnaires on previous page from oldest to newest when `sortBy` is `createdDateAsc`", async () => {
         // Gets questionnaires with "All" access to get a questionnaire ID to use as `firstQuestionnaireIdOnPage`
         const allQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
@@ -913,7 +913,7 @@ describe("MongoDB Datastore", () => {
         );
       });
 
-      it("Should sort questionnaires on next page from oldest to newest when `sortBy` is `createdDateAsc`", async () => {
+      it("should sort questionnaires on next page from oldest to newest when `sortBy` is `createdDateAsc`", async () => {
         // Gets questionnaires with "All" access to get a questionnaire ID to use as `lastQuestionnaireIdOnPage`
         const allQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
@@ -949,7 +949,7 @@ describe("MongoDB Datastore", () => {
         );
       });
 
-      it("Should return relevant questionnaires when searching with multiple filters", async () => {
+      it("should return relevant questionnaires when searching with multiple filters", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
             search: "Test questionnaire",
@@ -971,7 +971,7 @@ describe("MongoDB Datastore", () => {
     });
 
     describe("Getting total page count", () => {
-      it("Should get the total number of pages based on the number of questionnaires and results per page", async () => {
+      it("should get the total number of pages based on the number of questionnaires and results per page", async () => {
         const totalPageCount = await mongoDB.getTotalPages(
           {
             resultsPerPage: 3, // As 8 questionnaires should be returned (from previously created questionnaires), uses 3 questionnaires per page to test total page count is rounded up
@@ -985,7 +985,7 @@ describe("MongoDB Datastore", () => {
         expect(totalPageCount).toBe(3); // (8 questionnaires) / (3 results per page) gives 3 total pages after rounding up
       });
 
-      it("Should return 0 when no questionnaires are found", async () => {
+      it("should return 0 when no questionnaires are found", async () => {
         const totalPageCount = await mongoDB.getTotalPages(
           {
             resultsPerPage: 10,
@@ -1000,7 +1000,7 @@ describe("MongoDB Datastore", () => {
         expect(totalPageCount).toBe(0);
       });
 
-      it("Should log an error message on exception", async () => {
+      it("should log an error message on exception", async () => {
         await mongoDB.getTotalPages(); // No arguments to trigger exception
 
         // Two calls as `getMatchQuery` also throws an error due to no context object
@@ -1034,15 +1034,15 @@ describe("MongoDB Datastore", () => {
           "He defeated the dark lord!"
         );
       });
-      it("Should handle when a qid has not been given", () => {
+      it("should handle when a qid has not been given", () => {
         expect(() =>
           mongoDB.createHistoryEvent(null, mockHistoryEvent)
         ).not.toThrow();
       });
-      it("Should handle when an event has not been given", () => {
+      it("should handle when an event has not been given", () => {
         expect(() => mongoDB.createHistoryEvent("123", null)).not.toThrow();
       });
-      it("Should put the new history event at the front of the list", async () => {
+      it("should put the new history event at the front of the list", async () => {
         const questionnaireHistory = await mongoDB.createHistoryEvent(
           "123",
           mockHistoryEvent
@@ -1053,11 +1053,11 @@ describe("MongoDB Datastore", () => {
     });
 
     describe("Saving a base questionnaire", () => {
-      it("Should handle when an ID cannot be found within the given base questionnaire", async () => {
+      it("should handle when an ID cannot be found within the given base questionnaire", async () => {
         await expect(mongoDB.saveMetadata({})).rejects.toThrow();
       });
 
-      it("Should update the 'updatedAt' property", async () => {
+      it("should update the 'updatedAt' property", async () => {
         const baseQuestionnaire = await mongoDB.getQuestionnaireMetaById("123");
         baseQuestionnaire.updatedAt = new Date();
         const updatedBaseQuestionnaire = await mongoDB.saveMetadata(
@@ -1071,10 +1071,10 @@ describe("MongoDB Datastore", () => {
     });
 
     describe("Creating default comments", () => {
-      it("Should handle when a questionnaireId has not been given", () => {
+      it("should handle when a questionnaireId has not been given", () => {
         expect(() => mongoDB.createComments()).not.toThrow();
       });
-      it("Should return a default comments object", async () => {
+      it("should return a default comments object", async () => {
         const commentsFromDb = await mongoDB.createComments("123");
         expect(commentsFromDb).toMatchObject({
           comments: {},
@@ -1084,12 +1084,12 @@ describe("MongoDB Datastore", () => {
     });
 
     describe("Saving a comment", () => {
-      it("Should handle a questionnaireId not being found within the given comments object", () => {
+      it("should handle a questionnaireId not being found within the given comments object", () => {
         expect(() =>
           mongoDB.saveComments({ comments: [mockComment] })
         ).not.toThrow();
       });
-      it("Should return the questionnaire comments object", async () => {
+      it("should return the questionnaire comments object", async () => {
         const mockCommentObj = {
           "123-456-789": [mockComment],
         };
@@ -1103,10 +1103,10 @@ describe("MongoDB Datastore", () => {
     });
 
     describe("Getting the comments for a questionnaire", () => {
-      it("Should handle when a questionnareId has not been given", () => {
+      it("should handle when a questionnareId has not been given", () => {
         expect(() => mongoDB.getCommentsForQuestionnaire()).not.toThrow();
       });
-      it("Should transform Firestore Timestamps into JS Date objects", async () => {
+      it("should transform Firestore Timestamps into JS Date objects", async () => {
         const listOfComments = await mongoDB.getCommentsForQuestionnaire("123");
         expect(
           listOfComments.comments["123-456-789"][0].createdTime instanceof Date

From c9e5fcdea832a2e0961cb375a972829bf8953e0a Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Tue, 13 Aug 2024 17:10:11 +0100
Subject: [PATCH 174/215] Rename search to searchByTitleOrShortCode

---
 .../db/datastore/datastore-mongodb.js         |  6 +-
 .../db/datastore/datastore-mongodb.test.js    | 56 +++++++++----------
 .../resolvers/questionnaires/index.test.js    |  4 +-
 eq-author-api/schema/typeDefs.js              |  4 +-
 4 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.js b/eq-author-api/db/datastore/datastore-mongodb.js
index 9ac22354dd..5bc70b17b0 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.js
@@ -293,7 +293,7 @@ const listQuestionnaires = async () => {
 const getMatchQuery = async (input = {}, ctx) => {
   try {
     const {
-      search = "",
+      searchByTitleOrShortCode = "",
       owner = "",
       createdOnOrAfter,
       createdOnOrBefore,
@@ -311,8 +311,8 @@ const getMatchQuery = async (input = {}, ctx) => {
         // Searches for questionnaires with `title` or `shortTitle` (short code) containing the search term
         {
           $or: [
-            { title: { $regex: search, $options: "i" } },
-            { shortTitle: { $regex: search, $options: "i" } },
+            { title: { $regex: searchByTitleOrShortCode, $options: "i" } },
+            { shortTitle: { $regex: searchByTitleOrShortCode, $options: "i" } },
           ],
         },
         // Searches for questionnaires with owner name OR email containing the search term - email also handles owner name being null
diff --git a/eq-author-api/db/datastore/datastore-mongodb.test.js b/eq-author-api/db/datastore/datastore-mongodb.test.js
index c572604c3f..70fa523b68 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.test.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.test.js
@@ -476,10 +476,10 @@ describe("MongoDB Datastore", () => {
         );
       });
 
-      it("should return questionnaires with title containing the search term", async () => {
+      it("should return questionnaires with title containing the `searchByTitleOrShortCode` search term", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
-            search: "Test questionnaire",
+            searchByTitleOrShortCode: "Test questionnaire",
             owner: "",
             access: "All",
             resultsPerPage: 10,
@@ -497,10 +497,10 @@ describe("MongoDB Datastore", () => {
         expect(listOfQuestionnaires[5].title).toEqual("Test questionnaire 1");
       });
 
-      it("should return questionnaires with shortTitle containing the search term", async () => {
+      it("should return questionnaires with shortTitle containing the `searchByTitleOrShortCode` search term", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
-            search: "Alias",
+            searchByTitleOrShortCode: "Alias",
             owner: "",
             access: "All",
             resultsPerPage: 10,
@@ -515,7 +515,7 @@ describe("MongoDB Datastore", () => {
       it("should return questionnaires with owner name containing the `owner` search term", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
-            search: "",
+            searchByTitleOrShortCode: "",
             owner: "Jane",
             access: "All",
             resultsPerPage: 10,
@@ -531,7 +531,7 @@ describe("MongoDB Datastore", () => {
       it("should return questionnaires with owner email containing the `owner` search term", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
-            search: "",
+            searchByTitleOrShortCode: "",
             owner: "user2@example.com",
             access: "All",
             resultsPerPage: 10,
@@ -547,7 +547,7 @@ describe("MongoDB Datastore", () => {
       it("should return questionnaires created on or after the searched date", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
-            search: "",
+            searchByTitleOrShortCode: "",
             owner: "",
             createdOnOrAfter: new Date(2021, 2, 10),
             access: "All",
@@ -580,7 +580,7 @@ describe("MongoDB Datastore", () => {
       it("should return questionnaires created on or before the searched date", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
-            search: "",
+            searchByTitleOrShortCode: "",
             owner: "",
             createdOnOrBefore: new Date(2021, 2, 10),
             access: "All",
@@ -597,7 +597,7 @@ describe("MongoDB Datastore", () => {
       it("should return questionnaires created between the searched dates", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
-            search: "",
+            searchByTitleOrShortCode: "",
             owner: "",
             createdOnOrAfter: new Date(2021, 2, 10),
             createdOnOrBefore: new Date(2021, 2, 20),
@@ -616,7 +616,7 @@ describe("MongoDB Datastore", () => {
       it("should return relevant questionnaires when searching by access `All`", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
-            search: "",
+            searchByTitleOrShortCode: "",
             owner: "",
             access: "All",
             resultsPerPage: 10,
@@ -649,7 +649,7 @@ describe("MongoDB Datastore", () => {
       it("should return relevant questionnaires when searching by access `Editor`", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
-            search: "",
+            searchByTitleOrShortCode: "",
             owner: "",
             access: "Editor",
             resultsPerPage: 10,
@@ -668,7 +668,7 @@ describe("MongoDB Datastore", () => {
       it("should return relevant questionnaires when searching by access `ViewOnly`", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
-            search: "",
+            searchByTitleOrShortCode: "",
             owner: "",
             access: "ViewOnly",
             resultsPerPage: 10,
@@ -697,7 +697,7 @@ describe("MongoDB Datastore", () => {
       it("should return relevant questionnaires when searching by access `PrivateQuestionnaires`", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
-            search: "",
+            searchByTitleOrShortCode: "",
             owner: "",
             access: "PrivateQuestionnaires",
             resultsPerPage: 10,
@@ -712,7 +712,7 @@ describe("MongoDB Datastore", () => {
       it("should return relevant questionnaires when `myQuestionnaires` is true", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
-            search: "",
+            searchByTitleOrShortCode: "",
             owner: "",
             access: "All",
             resultsPerPage: 10,
@@ -732,7 +732,7 @@ describe("MongoDB Datastore", () => {
         // Gets questionnaires with "All" access to get a questionnaire ID to use as `firstQuestionnaireIdOnPage`
         const allQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
-            search: "",
+            searchByTitleOrShortCode: "",
             owner: "",
             access: "All",
             resultsPerPage: 10,
@@ -743,7 +743,7 @@ describe("MongoDB Datastore", () => {
         const listOfPreviousPageQuestionnaires =
           await mongoDB.listFilteredQuestionnaires(
             {
-              search: "",
+              searchByTitleOrShortCode: "",
               owner: "",
               access: "All",
               resultsPerPage: 2, // Limits to 2 questionnaires per page to test a small number of questionnaires on previous page
@@ -766,7 +766,7 @@ describe("MongoDB Datastore", () => {
         // Gets questionnaires with "All" access to get a questionnaire ID to use as `lastQuestionnaireIdOnPage`
         const allQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
-            search: "",
+            searchByTitleOrShortCode: "",
             owner: "",
             access: "All",
             resultsPerPage: 10,
@@ -777,7 +777,7 @@ describe("MongoDB Datastore", () => {
         const listOfNextPageQuestionnaires =
           await mongoDB.listFilteredQuestionnaires(
             {
-              search: "",
+              searchByTitleOrShortCode: "",
               owner: "",
               access: "All",
               resultsPerPage: 2, // Limits to 2 questionnaires per page to test a small number of questionnaires on next page
@@ -798,7 +798,7 @@ describe("MongoDB Datastore", () => {
 
       it("should log an error message when both `firstQuestionnaireIdOnPage` and `lastQuestionnaireIdOnPage` are provided", async () => {
         const listFilteredQuestionnairesInput = {
-          search: "",
+          searchByTitleOrShortCode: "",
           owner: "",
           access: "All",
           resultsPerPage: 10,
@@ -822,7 +822,7 @@ describe("MongoDB Datastore", () => {
 
       it("should log a debug message when no questionnaires are found", async () => {
         const listFilteredQuestionnairesInput = {
-          search: "Lorem ipsum", // Search term contained in no questionnaires
+          searchByTitleOrShortCode: "Lorem ipsum", // Search term contained in no questionnaires
           owner: "",
           access: "All",
           resultsPerPage: 10,
@@ -846,7 +846,7 @@ describe("MongoDB Datastore", () => {
       it("should sort questionnaires on first page from oldest to newest when `sortBy` is `createdDateAsc`", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
-            search: "",
+            searchByTitleOrShortCode: "",
             owner: "",
             access: "All",
             resultsPerPage: 10,
@@ -881,7 +881,7 @@ describe("MongoDB Datastore", () => {
         // Gets questionnaires with "All" access to get a questionnaire ID to use as `firstQuestionnaireIdOnPage`
         const allQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
-            search: "",
+            searchByTitleOrShortCode: "",
             owner: "",
             access: "All",
             resultsPerPage: 10,
@@ -893,7 +893,7 @@ describe("MongoDB Datastore", () => {
         const listOfPreviousPageQuestionnaires =
           await mongoDB.listFilteredQuestionnaires(
             {
-              search: "",
+              searchByTitleOrShortCode: "",
               owner: "",
               access: "All",
               resultsPerPage: 2,
@@ -917,7 +917,7 @@ describe("MongoDB Datastore", () => {
         // Gets questionnaires with "All" access to get a questionnaire ID to use as `lastQuestionnaireIdOnPage`
         const allQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
-            search: "",
+            searchByTitleOrShortCode: "",
             owner: "",
             access: "All",
             resultsPerPage: 10,
@@ -929,7 +929,7 @@ describe("MongoDB Datastore", () => {
         const listOfNextPageQuestionnaires =
           await mongoDB.listFilteredQuestionnaires(
             {
-              search: "",
+              searchByTitleOrShortCode: "",
               owner: "",
               access: "All",
               resultsPerPage: 2,
@@ -952,7 +952,7 @@ describe("MongoDB Datastore", () => {
       it("should return relevant questionnaires when searching with multiple filters", async () => {
         const listOfQuestionnaires = await mongoDB.listFilteredQuestionnaires(
           {
-            search: "Test questionnaire",
+            searchByTitleOrShortCode: "Test questionnaire",
             owner: "Joe",
             access: "Editor",
             createdOnOrBefore: new Date(2021, 2, 15),
@@ -975,7 +975,7 @@ describe("MongoDB Datastore", () => {
         const totalPageCount = await mongoDB.getTotalPages(
           {
             resultsPerPage: 3, // As 8 questionnaires should be returned (from previously created questionnaires), uses 3 questionnaires per page to test total page count is rounded up
-            search: "",
+            searchByTitleOrShortCode: "",
             owner: "",
             access: "All",
           },
@@ -989,7 +989,7 @@ describe("MongoDB Datastore", () => {
         const totalPageCount = await mongoDB.getTotalPages(
           {
             resultsPerPage: 10,
-            search: "Lorem ipsum", // Search term contained in no questionnaires
+            searchByTitleOrShortCode: "Lorem ipsum", // Search term contained in no questionnaires
             owner: "",
             access: "All",
           },
diff --git a/eq-author-api/schema/resolvers/questionnaires/index.test.js b/eq-author-api/schema/resolvers/questionnaires/index.test.js
index c35d48194a..99f40eb8a4 100644
--- a/eq-author-api/schema/resolvers/questionnaires/index.test.js
+++ b/eq-author-api/schema/resolvers/questionnaires/index.test.js
@@ -75,7 +75,7 @@ describe("questionnaires", () => {
       };
 
       const input = {
-        search: "Test Questionnaire 1",
+        searchByTitleOrShortCode: "Test Questionnaire 1",
         owner: "",
         access: "All",
       };
@@ -130,7 +130,7 @@ describe("questionnaires", () => {
 
       const input = {
         resultsPerPage: 2,
-        search: "Test Questionnaire",
+        searchByTitleOrShortCode: "Test Questionnaire",
         owner: "",
         access: "All",
       };
diff --git a/eq-author-api/schema/typeDefs.js b/eq-author-api/schema/typeDefs.js
index c2094dd391..93c4b0a1a1 100644
--- a/eq-author-api/schema/typeDefs.js
+++ b/eq-author-api/schema/typeDefs.js
@@ -948,7 +948,7 @@ input FilteredQuestionnairesInput {
   resultsPerPage: Int
   firstQuestionnaireIdOnPage: ID
   lastQuestionnaireIdOnPage: ID
-  search: String
+  searchByTitleOrShortCode: String
   owner: String
   createdOnOrAfter: DateTime
   createdOnOrBefore: DateTime
@@ -959,7 +959,7 @@ input FilteredQuestionnairesInput {
 
 input TotalPagesInput {
   resultsPerPage: Int
-  search: String
+  searchByTitleOrShortCode: String
   owner: String
   createdOnOrAfter: DateTime
   createdOnOrBefore: DateTime

From 93da657b52cd494f2ee2ae522af9d619e87b890a Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Tue, 13 Aug 2024 17:45:16 +0100
Subject: [PATCH 175/215] Add total filtered questionnaires

---
 .../db/datastore/datastore-mongodb.js         | 24 ++++++++++++++++---
 .../schema/resolvers/questionnaires/index.js  | 10 ++++++++
 eq-author-api/schema/typeDefs.js              | 10 ++++++++
 3 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.js b/eq-author-api/db/datastore/datastore-mongodb.js
index 5bc70b17b0..7297802a82 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.js
@@ -588,10 +588,8 @@ const listFilteredQuestionnaires = async (input = {}, ctx) => {
   }
 };
 
-const getTotalPages = async (input = {}, ctx) => {
+const getTotalFilteredQuestionnaires = async (input = {}, ctx) => {
   try {
-    const { resultsPerPage = 10 } = input;
-
     // Gets the questionnaires collection
     const questionnairesCollection = dbo.collection("questionnaires");
 
@@ -620,6 +618,25 @@ const getTotalPages = async (input = {}, ctx) => {
     // Sets default `totalFilteredQuestionnaires` to 0 if no questionnaires are returned - prevents error when destructuring `totalFilteredQuestionnaires` with no results
     const { totalFilteredQuestionnaires = 0 } = aggregationResult || {};
 
+    return totalFilteredQuestionnaires;
+  } catch (error) {
+    logger.error(
+      { error: error.stack, input },
+      "Unable to get total filtered questionnaires (from getTotalFilteredQuestionnaires)"
+    );
+    return;
+  }
+};
+
+const getTotalPages = async (input = {}, ctx) => {
+  try {
+    const { resultsPerPage = 10 } = input;
+
+    const totalFilteredQuestionnaires = await getTotalFilteredQuestionnaires(
+      input,
+      ctx
+    );
+
     // Calculates the total number of pages by dividing the total number of filtered questionnaires by the number of results per page, and rounding up
     const totalPages = Math.ceil(totalFilteredQuestionnaires / resultsPerPage);
 
@@ -830,6 +847,7 @@ module.exports = {
   deleteQuestionnaire,
   listQuestionnaires,
   listFilteredQuestionnaires,
+  getTotalFilteredQuestionnaires,
   getTotalPages,
   getQuestionnaire,
   getQuestionnaireMetaById,
diff --git a/eq-author-api/schema/resolvers/questionnaires/index.js b/eq-author-api/schema/resolvers/questionnaires/index.js
index 72d8d27497..67fd6ac272 100644
--- a/eq-author-api/schema/resolvers/questionnaires/index.js
+++ b/eq-author-api/schema/resolvers/questionnaires/index.js
@@ -1,5 +1,6 @@
 const {
   listFilteredQuestionnaires,
+  getTotalFilteredQuestionnaires,
   getTotalPages,
 } = require("../../../db/datastore");
 
@@ -11,6 +12,15 @@ const Resolvers = {
       return questionnaires;
     },
 
+    totalFilteredQuestionnaires: async (_, { input }, ctx) => {
+      const totalFilteredQuestionnaires = await getTotalFilteredQuestionnaires(
+        input,
+        ctx
+      );
+
+      return totalFilteredQuestionnaires;
+    },
+
     totalPages: async (_, { input }, ctx) => {
       const totalPages = await getTotalPages(input, ctx);
 
diff --git a/eq-author-api/schema/typeDefs.js b/eq-author-api/schema/typeDefs.js
index 93c4b0a1a1..81c410b989 100644
--- a/eq-author-api/schema/typeDefs.js
+++ b/eq-author-api/schema/typeDefs.js
@@ -929,6 +929,7 @@ type Query {
   listNames: [ListName]
   collectionListNames: [ListName]
   supplementaryDataListNames: [ListName]
+  totalFilteredQuestionnaires(input: TotalFilteredQuestionnairesInput): Int
   totalPages(input: TotalPagesInput): Int
 }
 
@@ -957,6 +958,15 @@ input FilteredQuestionnairesInput {
   sortBy: String
 }
 
+input TotalFilteredQuestionnairesInput {
+    searchByTitleOrShortCode: String
+    owner: String
+    createdOnOrAfter: DateTime
+    createdOnOrBefore: DateTime
+    access: Access!
+    myQuestionnaires: Boolean
+}
+
 input TotalPagesInput {
   resultsPerPage: Int
   searchByTitleOrShortCode: String

From 6a8c3237ed24ef0c32e63c9b05a3daadbcbc512f Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Wed, 14 Aug 2024 13:02:06 +0100
Subject: [PATCH 176/215] Fix failing tests

---
 eq-author-api/db/datastore/datastore-mongodb.test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.test.js b/eq-author-api/db/datastore/datastore-mongodb.test.js
index 70fa523b68..608a600fc3 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.test.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.test.js
@@ -93,7 +93,7 @@ describe("MongoDB Datastore", () => {
           error: expect.any(String),
           input: {},
         },
-        "Unable to get total pages (from getTotalPages)"
+        "Unable to get total filtered questionnaires (from getTotalFilteredQuestionnaires)" // The error from `getTotalFilteredQuestionnaires` is triggered by `getTotalPages`
       );
     });
 
@@ -1017,7 +1017,7 @@ describe("MongoDB Datastore", () => {
             input: {},
             error: expect.any(String),
           },
-          "Unable to get total pages (from getTotalPages)"
+          "Unable to get total filtered questionnaires (from getTotalFilteredQuestionnaires)" // The error from `getTotalFilteredQuestionnaires` is triggered by `getTotalPages`
         );
       });
     });

From 20315ac5bd3eaec9dc8e6e90ff47535408e985b1 Mon Sep 17 00:00:00 2001
From: sanjeevz3009 <sanjeevz1717@gmail.com>
Date: Wed, 14 Aug 2024 14:45:13 +0100
Subject: [PATCH 177/215] Comments updated and the session duration calculation
 format is rearranged

---
 eq-author/src/App/MeContext.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/eq-author/src/App/MeContext.js b/eq-author/src/App/MeContext.js
index 508c6019ac..58855fc070 100644
--- a/eq-author/src/App/MeContext.js
+++ b/eq-author/src/App/MeContext.js
@@ -89,7 +89,7 @@ const ContextProvider = ({ history, client, children }) => {
 
   useEffect(() => {
     // be aware that the return from auth.onAuthStateChanged will change on firebase ver 4.0
-    // https://firebase.google.com/docs/reference/js/v8/firebase.auth.Auth#onauthstatechanged]
+    // https://firebase.google.com/docs/reference/js/v8/firebase.auth.Auth#onauthstatechanged
     // This useEffect hook is responsible for handling the authentication state changes in Firebase.
     // It listens for changes in the authentication state using the onAuthStateChanged method.
     // When the authentication state changes, it updates the firebaseUser state and sets awaitingFirebase to false.
@@ -106,8 +106,9 @@ const ContextProvider = ({ history, client, children }) => {
         // If the user is authenticated, it retrieves the ID token result and calculates the session duration.
         user.getIdTokenResult().then((idTokenResult) => {
           const authTime = idTokenResult.claims.auth_time * 1000;
-          // The session duration is set to 7 days in this example.
-          const sessionDuration = 7 * 24 * 60 * 60 * 1000;
+          // The session duration is set to 7 days.
+          // The format of the session duration calculation is in milliseconds/seconds/minutes/hours/days.
+          const sessionDuration = 1000 * 60 * 60 * 24 * 7; // 604,800,000 milliseconds
           const millisecondsUntilExpiration =
             sessionDuration - (Date.now() - authTime);
           // It then sets up a session timeout using setTimeout, which will automatically sign out the user after the session duration expires.

From 2bec23b5e80ee70e3e4a594b9d506d5cc29609d8 Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Thu, 15 Aug 2024 11:47:10 +0100
Subject: [PATCH 178/215] Add datastore tests for total filtered questionnaires

---
 .../db/datastore/datastore-mongodb.test.js    | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.test.js b/eq-author-api/db/datastore/datastore-mongodb.test.js
index 608a600fc3..89fdc3988a 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.test.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.test.js
@@ -970,6 +970,41 @@ describe("MongoDB Datastore", () => {
       });
     });
 
+    describe("Getting total filtered questionnaires", () => {
+      it("should get the total number of questionnaires with no filters applied", async () => {
+        const totalFilteredQuestionnaires =
+          await mongoDB.getTotalFilteredQuestionnaires(
+            {
+              searchByTitleOrShortCode: "",
+              owner: "",
+              access: "All",
+              resultsPerPage: 2, // Limits to 2 questionnaires per page to test the total includes questionnaires on other pages
+            },
+            ctx
+          );
+
+        expect(totalFilteredQuestionnaires).toBe(9); // 9 questionnaires created in previous tests
+      });
+
+      it("should get the total number of questionnaires with filters applied", async () => {
+        const totalFilteredQuestionnaires =
+          await mongoDB.getTotalFilteredQuestionnaires(
+            {
+              searchByTitleOrShortCode: "Test questionnaire",
+              owner: "Joe",
+              access: "Editor",
+              createdOnOrBefore: new Date(2021, 2, 15),
+              createdOnOrAfter: new Date(2021, 2, 5),
+              resultsPerPage: 1, // Limits to 1 questionnaire per page to test the total includes questionnaires on other pages
+              sortBy: "createdDateAsc",
+            },
+            ctx
+          );
+
+        expect(totalFilteredQuestionnaires).toBe(2);
+      });
+    });
+
     describe("Getting total page count", () => {
       it("should get the total number of pages based on the number of questionnaires and results per page", async () => {
         const totalPageCount = await mongoDB.getTotalPages(

From 90a6c0b9be49801f9b366d1e072fce437527e45f Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Thu, 15 Aug 2024 11:51:03 +0100
Subject: [PATCH 179/215] Replace numbers for testing total page count

---
 eq-author-api/db/datastore/datastore-mongodb.test.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/eq-author-api/db/datastore/datastore-mongodb.test.js b/eq-author-api/db/datastore/datastore-mongodb.test.js
index 89fdc3988a..eb23f7c130 100644
--- a/eq-author-api/db/datastore/datastore-mongodb.test.js
+++ b/eq-author-api/db/datastore/datastore-mongodb.test.js
@@ -978,7 +978,6 @@ describe("MongoDB Datastore", () => {
               searchByTitleOrShortCode: "",
               owner: "",
               access: "All",
-              resultsPerPage: 2, // Limits to 2 questionnaires per page to test the total includes questionnaires on other pages
             },
             ctx
           );
@@ -995,7 +994,6 @@ describe("MongoDB Datastore", () => {
               access: "Editor",
               createdOnOrBefore: new Date(2021, 2, 15),
               createdOnOrAfter: new Date(2021, 2, 5),
-              resultsPerPage: 1, // Limits to 1 questionnaire per page to test the total includes questionnaires on other pages
               sortBy: "createdDateAsc",
             },
             ctx
@@ -1009,7 +1007,7 @@ describe("MongoDB Datastore", () => {
       it("should get the total number of pages based on the number of questionnaires and results per page", async () => {
         const totalPageCount = await mongoDB.getTotalPages(
           {
-            resultsPerPage: 3, // As 8 questionnaires should be returned (from previously created questionnaires), uses 3 questionnaires per page to test total page count is rounded up
+            resultsPerPage: 2, // As 9 questionnaires should be returned (from previously created questionnaires), uses 2 questionnaires per page to test total page count is rounded up
             searchByTitleOrShortCode: "",
             owner: "",
             access: "All",
@@ -1017,7 +1015,7 @@ describe("MongoDB Datastore", () => {
           ctx
         );
 
-        expect(totalPageCount).toBe(3); // (8 questionnaires) / (3 results per page) gives 3 total pages after rounding up
+        expect(totalPageCount).toBe(5); // (9 questionnaires) / (2 results per page) gives 5 total pages after rounding up
       });
 
       it("should return 0 when no questionnaires are found", async () => {

From 79b5fd3c5b77f98e07321002b0f51fa6b2b2f02e Mon Sep 17 00:00:00 2001
From: farres1 <sam.farrell@ons.gov.uk>
Date: Thu, 15 Aug 2024 12:16:21 +0100
Subject: [PATCH 180/215] Add totalFilteredQuestionnaires resolver test

---
 .../resolvers/questionnaires/index.test.js    | 34 ++++++++++++++++++-
 .../contextBuilder/questionnaires/index.js    |  1 +
 .../queryTotalFilteredQuestionnaires.js       | 24 +++++++++++++
 3 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 eq-author-api/tests/utils/contextBuilder/questionnaires/queryTotalFilteredQuestionnaires.js

diff --git a/eq-author-api/schema/resolvers/questionnaires/index.test.js b/eq-author-api/schema/resolvers/questionnaires/index.test.js
index 99f40eb8a4..a8a0bf8228 100644
--- a/eq-author-api/schema/resolvers/questionnaires/index.test.js
+++ b/eq-author-api/schema/resolvers/questionnaires/index.test.js
@@ -3,6 +3,7 @@ const {
 } = require("../../../tests/utils/contextBuilder/questionnaire");
 const {
   queryFilteredQuestionnaires,
+  queryTotalFilteredQuestionnaires,
   queryTotalPages,
 } = require("../../../tests/utils/contextBuilder/questionnaires");
 
@@ -111,6 +112,37 @@ describe("questionnaires", () => {
     });
   });
 
+  describe("totalFilteredQuestionnaires", () => {
+    it("should return total questionnaires when input is not provided", async () => {
+      const user = {
+        id: "user-1",
+      };
+
+      const totalFilteredQuestionnaires =
+        await queryTotalFilteredQuestionnaires(user);
+
+      expect(totalFilteredQuestionnaires).toEqual(5);
+    });
+
+    it("should return total filtered questionnaires", async () => {
+      const user = {
+        id: "user-1",
+      };
+
+      const input = {
+        searchByTitleOrShortCode: "Test Questionnaire 1",
+        owner: "",
+        access: "All",
+      };
+
+      const totalFilteredQuestionnaires =
+        await queryTotalFilteredQuestionnaires(user, input);
+
+      // `totalFilteredQuestionnaires` should be 3 as there are 3 questionnaires containing the string `Test Questionnaire 1`
+      expect(totalFilteredQuestionnaires).toEqual(3);
+    });
+  });
+
   describe("totalPages", () => {
     it("should return total pages for all questionnaires when input is not provided", async () => {
       const user = {
@@ -137,7 +169,7 @@ describe("questionnaires", () => {
 
       const totalPages = await queryTotalPages(user, input);
 
-      // `totalPages` should be 3 - (5 questionnaires) / (2 resultsPerPage) gives 3 total pages after rounding up
+      // `totalPages` should be 3: (5 questionnaires) / (2 resultsPerPage) gives 3 total pages after rounding up
       expect(totalPages).toEqual(3);
     });
   });
diff --git a/eq-author-api/tests/utils/contextBuilder/questionnaires/index.js b/eq-author-api/tests/utils/contextBuilder/questionnaires/index.js
index b8c2601a13..76bbb7350f 100644
--- a/eq-author-api/tests/utils/contextBuilder/questionnaires/index.js
+++ b/eq-author-api/tests/utils/contextBuilder/questionnaires/index.js
@@ -1,4 +1,5 @@
 module.exports = {
   ...require("./queryFilteredQuestionnaires"),
   ...require("./queryTotalPages"),
+  ...require("./queryTotalFilteredQuestionnaires"),
 };
diff --git a/eq-author-api/tests/utils/contextBuilder/questionnaires/queryTotalFilteredQuestionnaires.js b/eq-author-api/tests/utils/contextBuilder/questionnaires/queryTotalFilteredQuestionnaires.js
new file mode 100644
index 0000000000..af348dacb9
--- /dev/null
+++ b/eq-author-api/tests/utils/contextBuilder/questionnaires/queryTotalFilteredQuestionnaires.js
@@ -0,0 +1,24 @@
+const executeQuery = require("../../executeQuery");
+
+const getTotalFilteredQuestionnairesQuery = `
+    query GetTotalFilteredQuestionnaires($input: TotalFilteredQuestionnairesInput) {
+        totalFilteredQuestionnaires(input: $input)
+    }
+`;
+
+const queryTotalFilteredQuestionnaires = async (user, input) => {
+  const result = await executeQuery(
+    getTotalFilteredQuestionnairesQuery,
+    input ? { input } : undefined, // Passes `undefined` when `input` is falsy to test when `input` is not provided
+    {
+      user,
+    }
+  );
+
+  return result.data.totalFilteredQuestionnaires;
+};
+
+module.exports = {
+  getTotalFilteredQuestionnairesQuery,
+  queryTotalFilteredQuestionnaires,
+};

From e3ea36b810fd93decc5b4c37ea3e99b8f975f7f9 Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Thu, 29 Aug 2024 12:06:47 +0100
Subject: [PATCH 181/215] 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 && (
                           <>
                             <Common.TabTitle>
-                              Select a supplementary dataset to link to
+                              Select a supplementary schema to link to
                             </Common.TabTitle>
                             <Common.TabContent>
-                              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.
                             </Common.TabContent>
                             <Common.TabContent>
-                              Only one dataset can be linked per questionnaire.
+                              Only one schema can be linked per questionnaire.
                             </Common.TabContent>
                             <StyledTitle>Select a survey ID</StyledTitle>
                             <CustomSelect
diff --git a/eq-author/src/App/dataSettings/SupplementaryDataPage/schemaVersionsTable.js b/eq-author/src/App/dataSettings/SupplementaryDataPage/schemaVersionsTable.js
index 0cd8bb6a3e..670ee4e008 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 (
     <>
-      <Title>Datasets for survey ID {surveyId}</Title>
+      <Title>Schemas for survey ID {surveyId}</Title>
       <Table data-test="datasets-table">
         <TableHead>
           <TableRow>
@@ -77,7 +77,7 @@ const SchemaVersionTable = ({ surveyId, linkSupplementaryData }) => {
               Date created
             </StyledTableHeadColumn>
             <StyledTableHeadColumn width="20%">
-              Link dataset
+              Link schema
             </StyledTableHeadColumn>
           </TableRow>
         </TableHead>

From 446376cde1373da657efd98fc6982c85d09def7e Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Thu, 29 Aug 2024 14:38:59 +0100
Subject: [PATCH 182/215] 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 <farhanna700@gmail.com>
Date: Fri, 30 Aug 2024 10:51:53 +0100
Subject: [PATCH 183/215] 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 && (
                           <>
                             <Common.TabTitle>
-                              Select a supplementary schema to link to
+                              Select a supplementary dataset schema to link to
                             </Common.TabTitle>
                             <Common.TabContent>
-                              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.
                             </Common.TabContent>
                             <Common.TabContent>
-                              Only one schema can be linked per questionnaire.
+                              Only one dataset schema can be linked per
+                              questionnaire.
                             </Common.TabContent>
                             <StyledTitle>Select a survey ID</StyledTitle>
                             <CustomSelect
diff --git a/eq-author/src/App/dataSettings/SupplementaryDataPage/index.test.js b/eq-author/src/App/dataSettings/SupplementaryDataPage/index.test.js
index 8f054b1bd4..3a7db4d36b 100644
--- a/eq-author/src/App/dataSettings/SupplementaryDataPage/index.test.js
+++ b/eq-author/src/App/dataSettings/SupplementaryDataPage/index.test.js
@@ -139,9 +139,11 @@ describe("Supplementary dataset page", () => {
       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 (
     <>
-      <Title>Schemas for survey ID {surveyId}</Title>
+      <Title>Datasets schema for survey ID {surveyId}</Title>
       <Table data-test="datasets-table">
         <TableHead>
           <TableRow>
@@ -77,7 +77,7 @@ const SchemaVersionTable = ({ surveyId, linkSupplementaryData }) => {
               Date created
             </StyledTableHeadColumn>
             <StyledTableHeadColumn width="20%">
-              Link schema
+              Link dataset schema
             </StyledTableHeadColumn>
           </TableRow>
         </TableHead>

From 8afabc512884c7e4fe46ccab350c0f943dc1564c Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Wed, 4 Sep 2024 10:38:45 +0100
Subject: [PATCH 184/215] Created the validation message and imported to
 setting page

---
 eq-author/src/App/settings/SettingsPage.js    | 1 +
 eq-author/src/constants/validationMessages.js | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/eq-author/src/App/settings/SettingsPage.js b/eq-author/src/App/settings/SettingsPage.js
index eb78cd1675..02b0649811 100644
--- a/eq-author/src/App/settings/SettingsPage.js
+++ b/eq-author/src/App/settings/SettingsPage.js
@@ -24,6 +24,7 @@ import {
   SURVEY_ID_ERRORS,
   FORM_TYPE_ERRORS,
   EQ_ID_ERRORS,
+  SURVEY_ID_VALIDATION_ERRORS,
 } from "constants/validationMessages";
 
 import { reduceMultipleSpaces } from "utils/reduceMultipleSpaces";
diff --git a/eq-author/src/constants/validationMessages.js b/eq-author/src/constants/validationMessages.js
index 5c8013063a..f047302d97 100644
--- a/eq-author/src/constants/validationMessages.js
+++ b/eq-author/src/constants/validationMessages.js
@@ -348,6 +348,11 @@ export const SURVEY_ID_ERRORS = {
   ERR_INVALID: "Enter a survey ID in the correct format",
 };
 
+export const SURVEY_ID_VALIDATION_ERRORS = {
+  ERR_INVALID:
+    "The Survey ID does not match the linked supplementary data schema",
+};
+
 export const FORM_TYPE_ERRORS = {
   ERR_VALID_REQUIRED: "Enter a form type",
   ERR_INVALID: "Enter a form type in the correct format",

From 40f8ea604da34031eb95e16ccaffcac9efd61155 Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Fri, 6 Sep 2024 10:42:21 +0100
Subject: [PATCH 185/215] added validation error codes for the survey ID

---
 eq-author-api/constants/validationErrorCodes.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eq-author-api/constants/validationErrorCodes.js b/eq-author-api/constants/validationErrorCodes.js
index 1b549dd0a4..203646e079 100644
--- a/eq-author-api/constants/validationErrorCodes.js
+++ b/eq-author-api/constants/validationErrorCodes.js
@@ -38,6 +38,7 @@ const ERR_COUNT_OF_GREATER_THAN_AVAILABLE_OPTIONS =
 const ERR_VALID_PIPED_ANSWER_REQUIRED = "ERR_VALID_PIPED_ANSWER_REQUIRED";
 const ERR_UNIQUE_PAGE_DESCRIPTION = "ERR_UNIQUE_PAGE_DESCRIPTION";
 const ERR_NO_ANSWERS = "ERR_NO_ANSWERS";
+const ERR_INVALID_SURVEY_ID = "ERR_INVALID_SURVEY_ID";
 
 module.exports = {
   ERR_INVALID,
@@ -76,4 +77,5 @@ module.exports = {
   ERR_VALID_PIPED_ANSWER_REQUIRED,
   ERR_UNIQUE_PAGE_DESCRIPTION,
   ERR_NO_ANSWERS,
+  ERR_INVALID_SURVEY_ID,
 };

From 41e99866e39d3e16b8190c81959bd5e581238596 Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Fri, 6 Sep 2024 11:00:09 +0100
Subject: [PATCH 186/215] changes the validation message for checking the
 surveyID

---
 eq-author/src/constants/validationMessages.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eq-author/src/constants/validationMessages.js b/eq-author/src/constants/validationMessages.js
index f047302d97..484652bcb9 100644
--- a/eq-author/src/constants/validationMessages.js
+++ b/eq-author/src/constants/validationMessages.js
@@ -349,8 +349,8 @@ export const SURVEY_ID_ERRORS = {
 };
 
 export const SURVEY_ID_VALIDATION_ERRORS = {
-  ERR_INVALID:
-    "The Survey ID does not match the linked supplementary data schema",
+  errorCode: "ERR_INVALID_SURVEY_ID",
+  message: "The Survey ID does not match the linked supplementary data schema",
 };
 
 export const FORM_TYPE_ERRORS = {

From f861e0eded629172b4bc80dc97a58d890e36d5a0 Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Fri, 6 Sep 2024 14:17:02 +0100
Subject: [PATCH 187/215] added ajv code for surveyId

---
 .../customKeywords/validateSurveyID.js        | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 eq-author-api/src/validation/customKeywords/validateSurveyID.js

diff --git a/eq-author-api/src/validation/customKeywords/validateSurveyID.js b/eq-author-api/src/validation/customKeywords/validateSurveyID.js
new file mode 100644
index 0000000000..58ff18bd49
--- /dev/null
+++ b/eq-author-api/src/validation/customKeywords/validateSurveyID.js
@@ -0,0 +1,39 @@
+const {
+  ERR_INVALID_SURVEY_ID,
+} = require("../../../constants/validationErrorCodes");
+const createValidationError = require("../createValidationError");
+
+module.exports = (ajv) =>
+  ajv.addKeyword({
+    keyword: "validateSurveyID",
+    $data: true,
+    validate: function isValid(
+      _schema,
+      surveyId,
+      _parentSchema,
+      { parentDataProperty: fieldName, instancePath, rootData: questionnaire }
+    ) {
+      const ctx = {
+        questionnaire,
+      };
+      const surveyID = ctx.questionnaire.surveyId;
+      const SDS = ctx.questionnaire.supplementaryData;
+      const sdsSurveyID = ctx.questionnaire.supplementaryData.surveyId;
+
+      if (SDS) {
+        if (surveyID !== sdsSurveyID) {
+          isValid.errors = [
+            createValidationError(
+              instancePath,
+              fieldName,
+              ERR_INVALID_SURVEY_ID,
+              questionnaire
+            ),
+          ];
+          return false;
+        } else {
+          return true;
+        }
+      }
+    },
+  });

From cb28f4418cb37a22373dba3cc3a883d764f9c967 Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Fri, 6 Sep 2024 14:29:55 +0100
Subject: [PATCH 188/215] debugging the surveyIDs error

---
 eq-author/src/App/settings/SettingsPage.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/eq-author/src/App/settings/SettingsPage.js b/eq-author/src/App/settings/SettingsPage.js
index 02b0649811..4c21e7a83b 100644
--- a/eq-author/src/App/settings/SettingsPage.js
+++ b/eq-author/src/App/settings/SettingsPage.js
@@ -148,6 +148,12 @@ const SettingsPage = ({ questionnaire }) => {
 
   const getValidationErrorMessage = (contentType) => {
     if (contentType === "surveyId") {
+      console.log(contentType);
+      const error = questionnaire.validationErrorInfo.errors;
+      console.log(error);
+
+      error?.find(({ errorCode }) => errorCode);
+
       return SURVEY_ID_ERRORS[
         questionnaire?.validationErrorInfo?.errors?.find(
           ({ field }) => field === "surveyId"

From 4e81937174fa7b0c22fd9a42fa5feb8fa51532e2 Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Fri, 6 Sep 2024 15:31:06 +0100
Subject: [PATCH 189/215] added the error code in the survey id errors

---
 eq-author/src/App/settings/SettingsPage.js    | 7 -------
 eq-author/src/constants/validationMessages.js | 7 ++-----
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/eq-author/src/App/settings/SettingsPage.js b/eq-author/src/App/settings/SettingsPage.js
index 4c21e7a83b..eb78cd1675 100644
--- a/eq-author/src/App/settings/SettingsPage.js
+++ b/eq-author/src/App/settings/SettingsPage.js
@@ -24,7 +24,6 @@ import {
   SURVEY_ID_ERRORS,
   FORM_TYPE_ERRORS,
   EQ_ID_ERRORS,
-  SURVEY_ID_VALIDATION_ERRORS,
 } from "constants/validationMessages";
 
 import { reduceMultipleSpaces } from "utils/reduceMultipleSpaces";
@@ -148,12 +147,6 @@ const SettingsPage = ({ questionnaire }) => {
 
   const getValidationErrorMessage = (contentType) => {
     if (contentType === "surveyId") {
-      console.log(contentType);
-      const error = questionnaire.validationErrorInfo.errors;
-      console.log(error);
-
-      error?.find(({ errorCode }) => errorCode);
-
       return SURVEY_ID_ERRORS[
         questionnaire?.validationErrorInfo?.errors?.find(
           ({ field }) => field === "surveyId"
diff --git a/eq-author/src/constants/validationMessages.js b/eq-author/src/constants/validationMessages.js
index 484652bcb9..6e1a419290 100644
--- a/eq-author/src/constants/validationMessages.js
+++ b/eq-author/src/constants/validationMessages.js
@@ -346,11 +346,8 @@ export const destinationErrors = {
 export const SURVEY_ID_ERRORS = {
   ERR_VALID_REQUIRED: "Enter a survey ID",
   ERR_INVALID: "Enter a survey ID in the correct format",
-};
-
-export const SURVEY_ID_VALIDATION_ERRORS = {
-  errorCode: "ERR_INVALID_SURVEY_ID",
-  message: "The Survey ID does not match the linked supplementary data schema",
+  ERR_INVALID_SURVEY_ID:
+    "The Survey ID does not match the linked supplementary data schema",
 };
 
 export const FORM_TYPE_ERRORS = {

From f714edb3cbd9db466b7f8ca068f95db995f2a506 Mon Sep 17 00:00:00 2001
From: sanjeevz3009 <sanjeevz1717@gmail.com>
Date: Fri, 6 Sep 2024 16:45:51 +0100
Subject: [PATCH 190/215] validateSurveyID Keyword added to the json schema

---
 .../constants/validationErrorCodes.js         |  4 +-
 .../src/validation/customKeywords/index.js    |  1 +
 .../customKeywords/validateSurveyID.js        | 57 +++++++++----------
 .../src/validation/schemas/questionnaire.json | 31 ++++++----
 eq-author/src/constants/validationMessages.js |  2 +-
 5 files changed, 51 insertions(+), 44 deletions(-)

diff --git a/eq-author-api/constants/validationErrorCodes.js b/eq-author-api/constants/validationErrorCodes.js
index 203646e079..880f769b32 100644
--- a/eq-author-api/constants/validationErrorCodes.js
+++ b/eq-author-api/constants/validationErrorCodes.js
@@ -38,7 +38,7 @@ const ERR_COUNT_OF_GREATER_THAN_AVAILABLE_OPTIONS =
 const ERR_VALID_PIPED_ANSWER_REQUIRED = "ERR_VALID_PIPED_ANSWER_REQUIRED";
 const ERR_UNIQUE_PAGE_DESCRIPTION = "ERR_UNIQUE_PAGE_DESCRIPTION";
 const ERR_NO_ANSWERS = "ERR_NO_ANSWERS";
-const ERR_INVALID_SURVEY_ID = "ERR_INVALID_SURVEY_ID";
+const ERR_SURVEY_ID_MISMATCH = "ERR_SURVEY_ID_MISMATCH";
 
 module.exports = {
   ERR_INVALID,
@@ -77,5 +77,5 @@ module.exports = {
   ERR_VALID_PIPED_ANSWER_REQUIRED,
   ERR_UNIQUE_PAGE_DESCRIPTION,
   ERR_NO_ANSWERS,
-  ERR_INVALID_SURVEY_ID,
+  ERR_SURVEY_ID_MISMATCH,
 };
diff --git a/eq-author-api/src/validation/customKeywords/index.js b/eq-author-api/src/validation/customKeywords/index.js
index 4c325b9007..374983bc98 100644
--- a/eq-author-api/src/validation/customKeywords/index.js
+++ b/eq-author-api/src/validation/customKeywords/index.js
@@ -5,6 +5,7 @@ module.exports = (ajv) => {
   require("./calculatedSummaryPosition")(ajv);
   require("./validateLatestAfterEarliest")(ajv);
   require("./validateDuration")(ajv);
+  require("./validateSurveyID")(ajv);
   require("./validateMultipleChoiceCondition")(ajv);
   require("./validateExpression")(ajv);
   require("./validateRoutingDestination")(ajv);
diff --git a/eq-author-api/src/validation/customKeywords/validateSurveyID.js b/eq-author-api/src/validation/customKeywords/validateSurveyID.js
index 58ff18bd49..865f25398e 100644
--- a/eq-author-api/src/validation/customKeywords/validateSurveyID.js
+++ b/eq-author-api/src/validation/customKeywords/validateSurveyID.js
@@ -1,39 +1,38 @@
+const createValidationError = require("../createValidationError");
 const {
-  ERR_INVALID_SURVEY_ID,
+  ERR_SURVEY_ID_MISMATCH,
 } = require("../../../constants/validationErrorCodes");
-const createValidationError = require("../createValidationError");
 
 module.exports = (ajv) =>
   ajv.addKeyword({
     keyword: "validateSurveyID",
-    $data: true,
-    validate: function isValid(
-      _schema,
-      surveyId,
-      _parentSchema,
-      { parentDataProperty: fieldName, instancePath, rootData: questionnaire }
-    ) {
-      const ctx = {
-        questionnaire,
-      };
-      const surveyID = ctx.questionnaire.surveyId;
-      const SDS = ctx.questionnaire.supplementaryData;
-      const sdsSurveyID = ctx.questionnaire.supplementaryData.surveyId;
+    validate: function isValid(_schema, data, _parentSchema, ctx) {
+      const {
+        instancePath,
+        parentDataProperty: fieldName,
+        rootData: questionnaire,
+      } = ctx;
+
+      const surveyID = questionnaire.surveyId;
+      const SDS = questionnaire.supplementaryData;
 
-      if (SDS) {
-        if (surveyID !== sdsSurveyID) {
-          isValid.errors = [
-            createValidationError(
-              instancePath,
-              fieldName,
-              ERR_INVALID_SURVEY_ID,
-              questionnaire
-            ),
-          ];
-          return false;
-        } else {
-          return true;
-        }
+      // If supplementaryData exists, retrieve its surveyId
+      const sdsSurveyID = SDS ? SDS.surveyId : null;
+
+      // If supplementaryData exists, compare surveyId values
+      if (SDS && surveyID !== sdsSurveyID) {
+        isValid.errors = [
+          createValidationError(
+            instancePath,
+            fieldName,
+            ERR_SURVEY_ID_MISMATCH,
+            questionnaire
+          ),
+        ];
+        return false;
       }
+
+      // If supplementaryData is missing or surveyIds match, return true
+      return true;
     },
   });
diff --git a/eq-author-api/src/validation/schemas/questionnaire.json b/eq-author-api/src/validation/schemas/questionnaire.json
index 77a6bde3d1..c22782cd1f 100644
--- a/eq-author-api/src/validation/schemas/questionnaire.json
+++ b/eq-author-api/src/validation/schemas/questionnaire.json
@@ -26,18 +26,25 @@
       "$ref": "submission.json"
     },
     "surveyId": {
-      "if": {
-        "type": "string",
-        "minLength": 1
-      },
-      "then": {
-        "type": "string",
-        "pattern": "^\\d{3}$",
-        "errorMessage": "ERR_INVALID"
-      },
-      "else": {
-        "$ref": "definitions.json#/definitions/populatedString"
-      }
+      "allOf": [
+        {
+          "if": {
+            "type": "string",
+            "minLength": 1
+          },
+          "then": {
+            "type": "string",
+            "pattern": "^\\d{3}$",
+            "errorMessage": "ERR_INVALID"
+          },
+          "else": {
+            "$ref": "definitions.json#/definitions/populatedString"
+          }
+        },
+        {
+          "validateSurveyID": true
+        }
+      ]
     },
     "formType": {
       "if": {
diff --git a/eq-author/src/constants/validationMessages.js b/eq-author/src/constants/validationMessages.js
index 484652bcb9..5894b8d0ef 100644
--- a/eq-author/src/constants/validationMessages.js
+++ b/eq-author/src/constants/validationMessages.js
@@ -349,7 +349,7 @@ export const SURVEY_ID_ERRORS = {
 };
 
 export const SURVEY_ID_VALIDATION_ERRORS = {
-  errorCode: "ERR_INVALID_SURVEY_ID",
+  errorCode: "ERR_SURVEY_ID_MISMATCH",
   message: "The Survey ID does not match the linked supplementary data schema",
 };
 

From b59bae874007b0f17a4fcb7f0ef89455297da05a Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Fri, 6 Sep 2024 17:07:29 +0100
Subject: [PATCH 191/215] added validation message in the survey id errors

---
 eq-author/src/constants/validationMessages.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/eq-author/src/constants/validationMessages.js b/eq-author/src/constants/validationMessages.js
index 5894b8d0ef..6c73cef311 100644
--- a/eq-author/src/constants/validationMessages.js
+++ b/eq-author/src/constants/validationMessages.js
@@ -346,11 +346,8 @@ export const destinationErrors = {
 export const SURVEY_ID_ERRORS = {
   ERR_VALID_REQUIRED: "Enter a survey ID",
   ERR_INVALID: "Enter a survey ID in the correct format",
-};
-
-export const SURVEY_ID_VALIDATION_ERRORS = {
-  errorCode: "ERR_SURVEY_ID_MISMATCH",
-  message: "The Survey ID does not match the linked supplementary data schema",
+  ERR_SURVEY_ID_MISMATCH:
+    "The Survey ID does not match the linked supplementary data schema",
 };
 
 export const FORM_TYPE_ERRORS = {

From cd593a4ad8e9f5c62db17680b6a4d769599ab45b Mon Sep 17 00:00:00 2001
From: sanjeevz3009 <sanjeevz1717@gmail.com>
Date: Fri, 6 Sep 2024 17:15:28 +0100
Subject: [PATCH 192/215] Error messages updated

---
 eq-author/src/constants/validationMessages.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/eq-author/src/constants/validationMessages.js b/eq-author/src/constants/validationMessages.js
index 5894b8d0ef..6c73cef311 100644
--- a/eq-author/src/constants/validationMessages.js
+++ b/eq-author/src/constants/validationMessages.js
@@ -346,11 +346,8 @@ export const destinationErrors = {
 export const SURVEY_ID_ERRORS = {
   ERR_VALID_REQUIRED: "Enter a survey ID",
   ERR_INVALID: "Enter a survey ID in the correct format",
-};
-
-export const SURVEY_ID_VALIDATION_ERRORS = {
-  errorCode: "ERR_SURVEY_ID_MISMATCH",
-  message: "The Survey ID does not match the linked supplementary data schema",
+  ERR_SURVEY_ID_MISMATCH:
+    "The Survey ID does not match the linked supplementary data schema",
 };
 
 export const FORM_TYPE_ERRORS = {

From 9d73b7c45b4b9adcfea72c0c9dcd06dd78ea6b75 Mon Sep 17 00:00:00 2001
From: sanjeevz3009 <sanjeevz1717@gmail.com>
Date: Fri, 6 Sep 2024 23:13:53 +0100
Subject: [PATCH 193/215] Ajv code updated and debug statements added

---
 .../src/validation/createValidationError.js   |  1 +
 .../customKeywords/validateSurveyID.js        | 44 +++++++++++++------
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/eq-author-api/src/validation/createValidationError.js b/eq-author-api/src/validation/createValidationError.js
index 43622e419a..e2ec5cb6a3 100644
--- a/eq-author-api/src/validation/createValidationError.js
+++ b/eq-author-api/src/validation/createValidationError.js
@@ -4,6 +4,7 @@ module.exports = (dataPath, field, errorCode, questionnaire, errMessage) => {
   if (!dataPath || (typeof dataPath !== "string" && !Array.isArray(dataPath))) {
     throw new Error("Parameter 'dataPath' must be one of: String, Array");
   }
+  console.log("errorcode", errorCode);
 
   if (!field) {
     throw new Error("Parameter 'field' must be supplied");
diff --git a/eq-author-api/src/validation/customKeywords/validateSurveyID.js b/eq-author-api/src/validation/customKeywords/validateSurveyID.js
index 865f25398e..70462f1332 100644
--- a/eq-author-api/src/validation/customKeywords/validateSurveyID.js
+++ b/eq-author-api/src/validation/customKeywords/validateSurveyID.js
@@ -6,21 +6,40 @@ const {
 module.exports = (ajv) =>
   ajv.addKeyword({
     keyword: "validateSurveyID",
-    validate: function isValid(_schema, data, _parentSchema, ctx) {
-      const {
-        instancePath,
-        parentDataProperty: fieldName,
-        rootData: questionnaire,
-      } = ctx;
+    $data: true,
+    validate: function isValid(
+      schema, // schema true
+      data, // gives the data entered into the survey ID field
+      parentSchema, // parentSchema { validateSurveyID: true }
+      {
+        instancePath, // gives the path /surveyId
+        rootData: questionnaire, // gives the whole object of questionnaire
+        parentData, // gives the whole object of questionnaire
+        parentDataProperty: fieldName, // gives the field name surveyId
+      }
+    ) {
+      // console.log("instancePath", instancePath);
+      // console.log("schema", schema);
+      // console.log("parentSchema", parentSchema);
+      // console.log("data", data);
+      // console.log("questionnaire", questionnaire.supplementaryData.surveyId);
+      // Get the supplementary data from rootData
+      const supplementaryData = questionnaire.supplementaryData; // gives the supplementary data field
+      // console.log("supplementaryData", supplementaryData.surveyID);
 
-      const surveyID = questionnaire.surveyId;
-      const SDS = questionnaire.supplementaryData;
+      // const questionnaireSurveyId = questionnaire.surveyId; // gives the data entered into the survey ID field
+      // console.log("questionnaireSurveyId", questionnaireSurveyId);
 
-      // If supplementaryData exists, retrieve its surveyId
-      const sdsSurveyID = SDS ? SDS.surveyId : null;
+      // console.log("data", data); // gives the data entered into the survey ID field
+      // console.log("parentdata", parentData); // the whole questionnaire object
 
-      // If supplementaryData exists, compare surveyId values
-      if (SDS && surveyID !== sdsSurveyID) {
+      // If supplementaryData is not available or doesn't contain surveyId, or if surveyId doesn't match, throw an error
+      if (
+        supplementaryData &&
+        supplementaryData.surveyId &&
+        data !== supplementaryData.surveyId
+      ) {
+        console.log("meow", ERR_SURVEY_ID_MISMATCH);
         isValid.errors = [
           createValidationError(
             instancePath,
@@ -32,7 +51,6 @@ module.exports = (ajv) =>
         return false;
       }
 
-      // If supplementaryData is missing or surveyIds match, return true
       return true;
     },
   });

From a0e7b150f43ae77e1f6e4012c23e941a773d4464 Mon Sep 17 00:00:00 2001
From: sanjeevz3009 <sanjeevz1717@gmail.com>
Date: Sun, 8 Sep 2024 13:24:43 +0100
Subject: [PATCH 194/215] More debug statements added and the survey ID and
 supplementary data survey ID mismatch error being thrown working

---
 eq-author-api/src/validation/createValidationError.js    | 2 +-
 .../src/validation/customKeywords/validateSurveyID.js    | 9 +++++----
 eq-author/src/App/settings/SettingsPage.js               | 8 ++++++++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/eq-author-api/src/validation/createValidationError.js b/eq-author-api/src/validation/createValidationError.js
index e2ec5cb6a3..ec53463803 100644
--- a/eq-author-api/src/validation/createValidationError.js
+++ b/eq-author-api/src/validation/createValidationError.js
@@ -4,7 +4,7 @@ module.exports = (dataPath, field, errorCode, questionnaire, errMessage) => {
   if (!dataPath || (typeof dataPath !== "string" && !Array.isArray(dataPath))) {
     throw new Error("Parameter 'dataPath' must be one of: String, Array");
   }
-  console.log("errorcode", errorCode);
+  console.log("errorcode", dataPath, errorCode, field, errMessage);
 
   if (!field) {
     throw new Error("Parameter 'field' must be supplied");
diff --git a/eq-author-api/src/validation/customKeywords/validateSurveyID.js b/eq-author-api/src/validation/customKeywords/validateSurveyID.js
index 70462f1332..ab4692f6c5 100644
--- a/eq-author-api/src/validation/customKeywords/validateSurveyID.js
+++ b/eq-author-api/src/validation/customKeywords/validateSurveyID.js
@@ -21,11 +21,11 @@ module.exports = (ajv) =>
       // console.log("instancePath", instancePath);
       // console.log("schema", schema);
       // console.log("parentSchema", parentSchema);
-      // console.log("data", data);
+      console.log("data", data);
       // console.log("questionnaire", questionnaire.supplementaryData.surveyId);
       // Get the supplementary data from rootData
       const supplementaryData = questionnaire.supplementaryData; // gives the supplementary data field
-      // console.log("supplementaryData", supplementaryData.surveyID);
+      console.log("supplementaryData", supplementaryData.surveyId);
 
       // const questionnaireSurveyId = questionnaire.surveyId; // gives the data entered into the survey ID field
       // console.log("questionnaireSurveyId", questionnaireSurveyId);
@@ -39,13 +39,14 @@ module.exports = (ajv) =>
         supplementaryData.surveyId &&
         data !== supplementaryData.surveyId
       ) {
-        console.log("meow", ERR_SURVEY_ID_MISMATCH);
+        // console.log("meow", ERR_SURVEY_ID_MISMATCH);
         isValid.errors = [
           createValidationError(
             instancePath,
             fieldName,
             ERR_SURVEY_ID_MISMATCH,
-            questionnaire
+            questionnaire,
+            "ERR_SURVEY_ID_MISMATCH"
           ),
         ];
         return false;
diff --git a/eq-author/src/App/settings/SettingsPage.js b/eq-author/src/App/settings/SettingsPage.js
index eb78cd1675..2e134bd098 100644
--- a/eq-author/src/App/settings/SettingsPage.js
+++ b/eq-author/src/App/settings/SettingsPage.js
@@ -147,6 +147,14 @@ const SettingsPage = ({ questionnaire }) => {
 
   const getValidationErrorMessage = (contentType) => {
     if (contentType === "surveyId") {
+      console.log(
+        SURVEY_ID_ERRORS[
+          questionnaire?.validationErrorInfo?.errors?.find(
+            ({ field }) => field === "surveyId"
+          )?.errorCode
+        ]
+      );
+
       return SURVEY_ID_ERRORS[
         questionnaire?.validationErrorInfo?.errors?.find(
           ({ field }) => field === "surveyId"

From 3ccb4f2f73ed1af1389026f1e8cc9e706fd5a20d Mon Sep 17 00:00:00 2001
From: sanjeevz3009 <sanjeevz1717@gmail.com>
Date: Sun, 8 Sep 2024 17:12:34 +0100
Subject: [PATCH 195/215] Code refactored

---
 eq-author-api/src/validation/customKeywords/validateSurveyID.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eq-author-api/src/validation/customKeywords/validateSurveyID.js b/eq-author-api/src/validation/customKeywords/validateSurveyID.js
index ab4692f6c5..f38fb4e4d0 100644
--- a/eq-author-api/src/validation/customKeywords/validateSurveyID.js
+++ b/eq-author-api/src/validation/customKeywords/validateSurveyID.js
@@ -46,7 +46,7 @@ module.exports = (ajv) =>
             fieldName,
             ERR_SURVEY_ID_MISMATCH,
             questionnaire,
-            "ERR_SURVEY_ID_MISMATCH"
+            ERR_SURVEY_ID_MISMATCH
           ),
         ];
         return false;

From 38bc8b979f506a433e2286efe002855bf3c8f647 Mon Sep 17 00:00:00 2001
From: sanjeevz3009 <sanjeevz1717@gmail.com>
Date: Mon, 9 Sep 2024 13:49:56 +0100
Subject: [PATCH 196/215] Code cleaned up

---
 .../customKeywords/validateSurveyID.js         | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/eq-author-api/src/validation/customKeywords/validateSurveyID.js b/eq-author-api/src/validation/customKeywords/validateSurveyID.js
index f38fb4e4d0..8ae94f4865 100644
--- a/eq-author-api/src/validation/customKeywords/validateSurveyID.js
+++ b/eq-author-api/src/validation/customKeywords/validateSurveyID.js
@@ -14,24 +14,13 @@ module.exports = (ajv) =>
       {
         instancePath, // gives the path /surveyId
         rootData: questionnaire, // gives the whole object of questionnaire
-        parentData, // gives the whole object of questionnaire
+        // parentData, // gives the whole object of questionnaire
         parentDataProperty: fieldName, // gives the field name surveyId
       }
     ) {
-      // console.log("instancePath", instancePath);
-      // console.log("schema", schema);
-      // console.log("parentSchema", parentSchema);
       console.log("data", data);
-      // console.log("questionnaire", questionnaire.supplementaryData.surveyId);
-      // Get the supplementary data from rootData
-      const supplementaryData = questionnaire.supplementaryData; // gives the supplementary data field
-      console.log("supplementaryData", supplementaryData.surveyId);
-
-      // const questionnaireSurveyId = questionnaire.surveyId; // gives the data entered into the survey ID field
-      // console.log("questionnaireSurveyId", questionnaireSurveyId);
-
-      // console.log("data", data); // gives the data entered into the survey ID field
-      // console.log("parentdata", parentData); // the whole questionnaire object
+      // Get the supplementary data from the questionnaire object
+      const supplementaryData = questionnaire.supplementaryData;
 
       // If supplementaryData is not available or doesn't contain surveyId, or if surveyId doesn't match, throw an error
       if (
@@ -39,7 +28,6 @@ module.exports = (ajv) =>
         supplementaryData.surveyId &&
         data !== supplementaryData.surveyId
       ) {
-        // console.log("meow", ERR_SURVEY_ID_MISMATCH);
         isValid.errors = [
           createValidationError(
             instancePath,

From 58e73638964e528a8a84783b7e993f6a89943127 Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Tue, 10 Sep 2024 10:48:28 +0100
Subject: [PATCH 197/215] 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 (
     <>
-      <Title>Datasets schema for survey ID {surveyId}</Title>
+      <Title>Datasets schemas for survey ID {surveyId}</Title>
       <Table data-test="datasets-table">
         <TableHead>
           <TableRow>

From 436c13723d41b6ef4116db12f2a4c1b007584c0b Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Tue, 10 Sep 2024 14:30:33 +0100
Subject: [PATCH 198/215] 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 (
     <>
-      <Title>Datasets schemas for survey ID {surveyId}</Title>
+      <Title>Dataset schemas for survey ID {surveyId}</Title>
       <Table data-test="datasets-table">
         <TableHead>
           <TableRow>

From 98259fcfe72b67be31cd0bd48b3d33207cef94f2 Mon Sep 17 00:00:00 2001
From: sanjeevz3009 <sanjeevz1717@gmail.com>
Date: Thu, 12 Sep 2024 19:19:01 +0100
Subject: [PATCH 199/215] Debugging statements removed

---
 eq-author-api/src/validation/createValidationError.js           | 1 -
 eq-author-api/src/validation/customKeywords/validateSurveyID.js | 2 --
 2 files changed, 3 deletions(-)

diff --git a/eq-author-api/src/validation/createValidationError.js b/eq-author-api/src/validation/createValidationError.js
index ec53463803..43622e419a 100644
--- a/eq-author-api/src/validation/createValidationError.js
+++ b/eq-author-api/src/validation/createValidationError.js
@@ -4,7 +4,6 @@ module.exports = (dataPath, field, errorCode, questionnaire, errMessage) => {
   if (!dataPath || (typeof dataPath !== "string" && !Array.isArray(dataPath))) {
     throw new Error("Parameter 'dataPath' must be one of: String, Array");
   }
-  console.log("errorcode", dataPath, errorCode, field, errMessage);
 
   if (!field) {
     throw new Error("Parameter 'field' must be supplied");
diff --git a/eq-author-api/src/validation/customKeywords/validateSurveyID.js b/eq-author-api/src/validation/customKeywords/validateSurveyID.js
index 8ae94f4865..e7877d1966 100644
--- a/eq-author-api/src/validation/customKeywords/validateSurveyID.js
+++ b/eq-author-api/src/validation/customKeywords/validateSurveyID.js
@@ -14,11 +14,9 @@ module.exports = (ajv) =>
       {
         instancePath, // gives the path /surveyId
         rootData: questionnaire, // gives the whole object of questionnaire
-        // parentData, // gives the whole object of questionnaire
         parentDataProperty: fieldName, // gives the field name surveyId
       }
     ) {
-      console.log("data", data);
       // Get the supplementary data from the questionnaire object
       const supplementaryData = questionnaire.supplementaryData;
 

From f455436dadaa3c592bd7d092459feb5e9643aef0 Mon Sep 17 00:00:00 2001
From: sanjeevz3009 <sanjeevz1717@gmail.com>
Date: Fri, 13 Sep 2024 12:31:11 +0100
Subject: [PATCH 200/215] Debug statement removed and comments removed

---
 .../src/validation/customKeywords/validateSurveyID.js     | 6 +++---
 eq-author/src/App/settings/SettingsPage.js                | 8 --------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/eq-author-api/src/validation/customKeywords/validateSurveyID.js b/eq-author-api/src/validation/customKeywords/validateSurveyID.js
index e7877d1966..962598b541 100644
--- a/eq-author-api/src/validation/customKeywords/validateSurveyID.js
+++ b/eq-author-api/src/validation/customKeywords/validateSurveyID.js
@@ -8,12 +8,12 @@ module.exports = (ajv) =>
     keyword: "validateSurveyID",
     $data: true,
     validate: function isValid(
-      schema, // schema true
+      schema,
       data, // gives the data entered into the survey ID field
-      parentSchema, // parentSchema { validateSurveyID: true }
+      parentSchema,
       {
         instancePath, // gives the path /surveyId
-        rootData: questionnaire, // gives the whole object of questionnaire
+        rootData: questionnaire, // gives the whole questionnaire object of
         parentDataProperty: fieldName, // gives the field name surveyId
       }
     ) {
diff --git a/eq-author/src/App/settings/SettingsPage.js b/eq-author/src/App/settings/SettingsPage.js
index 2e134bd098..eb78cd1675 100644
--- a/eq-author/src/App/settings/SettingsPage.js
+++ b/eq-author/src/App/settings/SettingsPage.js
@@ -147,14 +147,6 @@ const SettingsPage = ({ questionnaire }) => {
 
   const getValidationErrorMessage = (contentType) => {
     if (contentType === "surveyId") {
-      console.log(
-        SURVEY_ID_ERRORS[
-          questionnaire?.validationErrorInfo?.errors?.find(
-            ({ field }) => field === "surveyId"
-          )?.errorCode
-        ]
-      );
-
       return SURVEY_ID_ERRORS[
         questionnaire?.validationErrorInfo?.errors?.find(
           ({ field }) => field === "surveyId"

From cd57b4c5c2fe2c31426b9afbd03cd9ba00d0b1a9 Mon Sep 17 00:00:00 2001
From: sanjeevz3009 <sanjeevz1717@gmail.com>
Date: Fri, 13 Sep 2024 12:31:26 +0100
Subject: [PATCH 201/215] Comment updated

---
 eq-author-api/src/validation/customKeywords/validateSurveyID.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eq-author-api/src/validation/customKeywords/validateSurveyID.js b/eq-author-api/src/validation/customKeywords/validateSurveyID.js
index 962598b541..c46f6c9678 100644
--- a/eq-author-api/src/validation/customKeywords/validateSurveyID.js
+++ b/eq-author-api/src/validation/customKeywords/validateSurveyID.js
@@ -13,7 +13,7 @@ module.exports = (ajv) =>
       parentSchema,
       {
         instancePath, // gives the path /surveyId
-        rootData: questionnaire, // gives the whole questionnaire object of
+        rootData: questionnaire, // gives the whole questionnaire object
         parentDataProperty: fieldName, // gives the field name surveyId
       }
     ) {

From 46dd2f4f132d4327090c9064167ab75bb9b20113 Mon Sep 17 00:00:00 2001
From: sanjeevz3009 <sanjeevz1717@gmail.com>
Date: Fri, 13 Sep 2024 14:07:04 +0100
Subject: [PATCH 202/215] $data: true option removed, schema, data and
 parentSchema made private/ internal

---
 .../src/validation/customKeywords/validateSurveyID.js    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/eq-author-api/src/validation/customKeywords/validateSurveyID.js b/eq-author-api/src/validation/customKeywords/validateSurveyID.js
index c46f6c9678..748e8d0a52 100644
--- a/eq-author-api/src/validation/customKeywords/validateSurveyID.js
+++ b/eq-author-api/src/validation/customKeywords/validateSurveyID.js
@@ -6,11 +6,10 @@ const {
 module.exports = (ajv) =>
   ajv.addKeyword({
     keyword: "validateSurveyID",
-    $data: true,
     validate: function isValid(
-      schema,
-      data, // gives the data entered into the survey ID field
-      parentSchema,
+      _schema,
+      _data, // gives the data entered into the survey ID field
+      _parentSchema,
       {
         instancePath, // gives the path /surveyId
         rootData: questionnaire, // gives the whole questionnaire object
@@ -24,7 +23,7 @@ module.exports = (ajv) =>
       if (
         supplementaryData &&
         supplementaryData.surveyId &&
-        data !== supplementaryData.surveyId
+        _data !== supplementaryData.surveyId
       ) {
         isValid.errors = [
           createValidationError(

From b150107c55563fc9f58926c5bb07264030658e96 Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Mon, 16 Sep 2024 11:50:19 +0100
Subject: [PATCH 203/215] changed the survery with lowercase 's'

---
 eq-author/src/constants/validationMessages.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eq-author/src/constants/validationMessages.js b/eq-author/src/constants/validationMessages.js
index 6c73cef311..c305e700b6 100644
--- a/eq-author/src/constants/validationMessages.js
+++ b/eq-author/src/constants/validationMessages.js
@@ -347,7 +347,7 @@ export const SURVEY_ID_ERRORS = {
   ERR_VALID_REQUIRED: "Enter a survey ID",
   ERR_INVALID: "Enter a survey ID in the correct format",
   ERR_SURVEY_ID_MISMATCH:
-    "The Survey ID does not match the linked supplementary data schema",
+    "The survey ID does not match the linked supplementary data schema",
 };
 
 export const FORM_TYPE_ERRORS = {

From b77f25f2d79db8cf4a3ecd5b86297cdace9d3fdc Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Mon, 16 Sep 2024 13:19:25 +0100
Subject: [PATCH 204/215] file name change

---
 eq-author-api/src/validation/customKeywords/validateSurveyID.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eq-author-api/src/validation/customKeywords/validateSurveyID.js b/eq-author-api/src/validation/customKeywords/validateSurveyID.js
index 748e8d0a52..10364fd7ca 100644
--- a/eq-author-api/src/validation/customKeywords/validateSurveyID.js
+++ b/eq-author-api/src/validation/customKeywords/validateSurveyID.js
@@ -34,6 +34,7 @@ module.exports = (ajv) =>
             ERR_SURVEY_ID_MISMATCH
           ),
         ];
+
         return false;
       }
 

From a128d14741d6d520b78e50b01da7aa96c748bd1f Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Mon, 16 Sep 2024 13:22:35 +0100
Subject: [PATCH 205/215] rename file

---
 eq-author-api/src/validation/customKeywords/validateSurveyID.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eq-author-api/src/validation/customKeywords/validateSurveyID.js b/eq-author-api/src/validation/customKeywords/validateSurveyID.js
index 10364fd7ca..748e8d0a52 100644
--- a/eq-author-api/src/validation/customKeywords/validateSurveyID.js
+++ b/eq-author-api/src/validation/customKeywords/validateSurveyID.js
@@ -34,7 +34,6 @@ module.exports = (ajv) =>
             ERR_SURVEY_ID_MISMATCH
           ),
         ];
-
         return false;
       }
 

From 795a2ce8beef94369b47c3fc00d25a644d800cd8 Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Mon, 16 Sep 2024 13:29:06 +0100
Subject: [PATCH 206/215] attempt of file name change

---
 eq-author-api/src/validation/customKeywords/validateSurveyID.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eq-author-api/src/validation/customKeywords/validateSurveyID.js b/eq-author-api/src/validation/customKeywords/validateSurveyID.js
index 748e8d0a52..ced7968557 100644
--- a/eq-author-api/src/validation/customKeywords/validateSurveyID.js
+++ b/eq-author-api/src/validation/customKeywords/validateSurveyID.js
@@ -35,6 +35,7 @@ module.exports = (ajv) =>
           ),
         ];
         return false;
+        console.log("hello");
       }
 
       return true;

From ce0343601fd3e66b8dc1cfecc0d8fdeef33ed239 Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Mon, 16 Sep 2024 13:36:28 +0100
Subject: [PATCH 207/215] remove debug statements

---
 eq-author-api/src/validation/customKeywords/validateSurveyID.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eq-author-api/src/validation/customKeywords/validateSurveyID.js b/eq-author-api/src/validation/customKeywords/validateSurveyID.js
index ced7968557..748e8d0a52 100644
--- a/eq-author-api/src/validation/customKeywords/validateSurveyID.js
+++ b/eq-author-api/src/validation/customKeywords/validateSurveyID.js
@@ -35,7 +35,6 @@ module.exports = (ajv) =>
           ),
         ];
         return false;
-        console.log("hello");
       }
 
       return true;

From 95f43d022247781bc62dbd4f8e05b0974db4298a Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Mon, 16 Sep 2024 13:41:10 +0100
Subject: [PATCH 208/215] renamed file

---
 .../customKeywords/{validateSurveyID.js => validateSurveyId.js}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename eq-author-api/src/validation/customKeywords/{validateSurveyID.js => validateSurveyId.js} (100%)

diff --git a/eq-author-api/src/validation/customKeywords/validateSurveyID.js b/eq-author-api/src/validation/customKeywords/validateSurveyId.js
similarity index 100%
rename from eq-author-api/src/validation/customKeywords/validateSurveyID.js
rename to eq-author-api/src/validation/customKeywords/validateSurveyId.js

From 998a0da808b4c9309649841fa03e7888424f9d68 Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Mon, 16 Sep 2024 13:44:36 +0100
Subject: [PATCH 209/215] .

---
 .../customKeywords/{validateSurveyId.js => validateSurveyID.js}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename eq-author-api/src/validation/customKeywords/{validateSurveyId.js => validateSurveyID.js} (100%)

diff --git a/eq-author-api/src/validation/customKeywords/validateSurveyId.js b/eq-author-api/src/validation/customKeywords/validateSurveyID.js
similarity index 100%
rename from eq-author-api/src/validation/customKeywords/validateSurveyId.js
rename to eq-author-api/src/validation/customKeywords/validateSurveyID.js

From 1c8c40e0e941ced88196531ef3a13e5b2b9b7575 Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Mon, 16 Sep 2024 13:45:23 +0100
Subject: [PATCH 210/215] .

---
 .../customKeywords/{validateSurveyID.js => validateSurveyId.js}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename eq-author-api/src/validation/customKeywords/{validateSurveyID.js => validateSurveyId.js} (100%)

diff --git a/eq-author-api/src/validation/customKeywords/validateSurveyID.js b/eq-author-api/src/validation/customKeywords/validateSurveyId.js
similarity index 100%
rename from eq-author-api/src/validation/customKeywords/validateSurveyID.js
rename to eq-author-api/src/validation/customKeywords/validateSurveyId.js

From 5c9b9628485181ce2abfb0a3c0eb06e5f7617cc0 Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Mon, 16 Sep 2024 13:53:48 +0100
Subject: [PATCH 211/215] changed the _data to questionnaireSurveyId

---
 .../src/validation/customKeywords/validateSurveyId.js         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eq-author-api/src/validation/customKeywords/validateSurveyId.js b/eq-author-api/src/validation/customKeywords/validateSurveyId.js
index 748e8d0a52..1e789e7ee6 100644
--- a/eq-author-api/src/validation/customKeywords/validateSurveyId.js
+++ b/eq-author-api/src/validation/customKeywords/validateSurveyId.js
@@ -8,7 +8,7 @@ module.exports = (ajv) =>
     keyword: "validateSurveyID",
     validate: function isValid(
       _schema,
-      _data, // gives the data entered into the survey ID field
+      _questionnaireSurveyId, // gives the data entered into the survey ID field
       _parentSchema,
       {
         instancePath, // gives the path /surveyId
@@ -23,7 +23,7 @@ module.exports = (ajv) =>
       if (
         supplementaryData &&
         supplementaryData.surveyId &&
-        _data !== supplementaryData.surveyId
+        _questionnaireSurveyId !== supplementaryData.surveyId
       ) {
         isValid.errors = [
           createValidationError(

From 32391a34ef98a5517f145fcc724a860ea4b53d40 Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Mon, 16 Sep 2024 14:23:34 +0100
Subject: [PATCH 212/215] updated the comment in the ajv file

---
 eq-author-api/src/validation/customKeywords/validateSurveyId.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eq-author-api/src/validation/customKeywords/validateSurveyId.js b/eq-author-api/src/validation/customKeywords/validateSurveyId.js
index 1e789e7ee6..5ad3b75b7f 100644
--- a/eq-author-api/src/validation/customKeywords/validateSurveyId.js
+++ b/eq-author-api/src/validation/customKeywords/validateSurveyId.js
@@ -19,7 +19,7 @@ module.exports = (ajv) =>
       // Get the supplementary data from the questionnaire object
       const supplementaryData = questionnaire.supplementaryData;
 
-      // If supplementaryData is not available or doesn't contain surveyId, or if surveyId doesn't match, throw an error
+      // If supplementaryData exists and contains a surveyId, and supplementaryData's surveyId doesn't match the questionnaire's surveyId, throw a validation error
       if (
         supplementaryData &&
         supplementaryData.surveyId &&

From ec8fa19e50981d5fec62763e24f27046450f54e6 Mon Sep 17 00:00:00 2001
From: sanjeevz3009 <sanjeevz1717@gmail.com>
Date: Mon, 16 Sep 2024 19:15:45 +0100
Subject: [PATCH 213/215] validateSurveyId file casing corrected

---
 eq-author-api/src/validation/customKeywords/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eq-author-api/src/validation/customKeywords/index.js b/eq-author-api/src/validation/customKeywords/index.js
index 374983bc98..ec77ba8e42 100644
--- a/eq-author-api/src/validation/customKeywords/index.js
+++ b/eq-author-api/src/validation/customKeywords/index.js
@@ -5,7 +5,7 @@ module.exports = (ajv) => {
   require("./calculatedSummaryPosition")(ajv);
   require("./validateLatestAfterEarliest")(ajv);
   require("./validateDuration")(ajv);
-  require("./validateSurveyID")(ajv);
+  require("./validateSurveyId")(ajv);
   require("./validateMultipleChoiceCondition")(ajv);
   require("./validateExpression")(ajv);
   require("./validateRoutingDestination")(ajv);

From 98af1c35f86ced8ee1a502fca97391b8a74bf7bd Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Tue, 17 Sep 2024 11:28:58 +0100
Subject: [PATCH 214/215] removed underscore and changed ID to lowercase 'd'

---
 .../src/validation/customKeywords/validateSurveyId.js       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eq-author-api/src/validation/customKeywords/validateSurveyId.js b/eq-author-api/src/validation/customKeywords/validateSurveyId.js
index 5ad3b75b7f..c3853d86ad 100644
--- a/eq-author-api/src/validation/customKeywords/validateSurveyId.js
+++ b/eq-author-api/src/validation/customKeywords/validateSurveyId.js
@@ -5,10 +5,10 @@ const {
 
 module.exports = (ajv) =>
   ajv.addKeyword({
-    keyword: "validateSurveyID",
+    keyword: "validateSurveyId",
     validate: function isValid(
       _schema,
-      _questionnaireSurveyId, // gives the data entered into the survey ID field
+      questionnaireSurveyId, // gives the data entered into the survey ID field
       _parentSchema,
       {
         instancePath, // gives the path /surveyId
@@ -23,7 +23,7 @@ module.exports = (ajv) =>
       if (
         supplementaryData &&
         supplementaryData.surveyId &&
-        _questionnaireSurveyId !== supplementaryData.surveyId
+        questionnaireSurveyId !== supplementaryData.surveyId
       ) {
         isValid.errors = [
           createValidationError(

From bb231f16c341f347eb1014ed4ac600ff82d9fc2c Mon Sep 17 00:00:00 2001
From: Farhanam76 <farhanna700@gmail.com>
Date: Tue, 17 Sep 2024 12:35:37 +0100
Subject: [PATCH 215/215] updated the questionnire json

---
 eq-author-api/src/validation/schemas/questionnaire.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eq-author-api/src/validation/schemas/questionnaire.json b/eq-author-api/src/validation/schemas/questionnaire.json
index c22782cd1f..85b46ca871 100644
--- a/eq-author-api/src/validation/schemas/questionnaire.json
+++ b/eq-author-api/src/validation/schemas/questionnaire.json
@@ -42,7 +42,7 @@
           }
         },
         {
-          "validateSurveyID": true
+          "validateSurveyId": true
         }
       ]
     },